removed gstreamer0.10-base in deps

2 files changed, 48 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4049cf27d472..5044ab4294f6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,15 @@
 # Generated by makepkg 5.0.2
-# Fri Dec 22 13:13:12 UTC 2017
+# Fri Dec 22 14:08:35 UTC 2017
 pkgbase = rstudio-desktop-bin
 	pkgdesc = An integrated development environment (IDE) for R (binary version from RStudio official repository)
 	pkgver = 1.1.383
-	pkgrel = 3
+	pkgrel = 4
 	url = http://www.rstudio.org/
 	install = rstudio-desktop-bin.install
 	arch = i686
 	arch = x86_64
 	license = GPL
 	depends = r
-	depends = gstreamer0.10-base
 	depends = hicolor-icon-theme
 	depends = libxcomposite
 	depends = libxslt
@@ -24,9 +23,17 @@ pkgbase = rstudio-desktop-bin
 	conflicts = rstudio-desktop-preview-bin
 	options = !strip
 	source_i686 = https://download1.rstudio.org/rstudio-1.1.383-i386.deb
+	source_i686 = http://archive.ubuntu.com/ubuntu/pool/main/g/gstreamer0.10/libgstreamer0.10-0_0.10.36-1.2ubuntu3_i386.deb
+	source_i686 = http://security.ubuntu.com/ubuntu/pool/main/g/gst-plugins-base0.10/libgstreamer-plugins-base0.10-0_0.10.36-1.1ubuntu2.1_i386.deb
 	md5sums_i686 = 9588bce746f2a5e8da299c4a8b35d4fa
+	md5sums_i686 = 795a3ca3f2048c4dc32d25560e191c35
+	md5sums_i686 = eca697b2b8efbed3d2241f6b0c8c15e4
 	source_x86_64 = https://download1.rstudio.org/rstudio-1.1.383-amd64.deb
+	source_x86_64 = http://archive.ubuntu.com/ubuntu/pool/main/g/gstreamer0.10/libgstreamer0.10-0_0.10.36-1.2ubuntu3_amd64.deb
+	source_x86_64 = http://security.ubuntu.com/ubuntu/pool/main/g/gst-plugins-base0.10/libgstreamer-plugins-base0.10-0_0.10.36-1.1ubuntu2.1_amd64.deb
 	md5sums_x86_64 = 3eede231b7206a7eebbf090f4991358f
+	md5sums_x86_64 = 84e61f5eda991b978fa168d6762f7990
+	md5sums_x86_64 = 391ba54997d6faddbfe41a185a823ee4
 
 pkgname = rstudio-desktop-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index 46d5dcf25e47..70149a5af17f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,12 +13,12 @@
 
 pkgname=rstudio-desktop-bin
 pkgver=1.1.383
-pkgrel=3
+pkgrel=4
 pkgdesc="An integrated development environment (IDE) for R (binary version from RStudio official repository)"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.rstudio.org/"
-depends=('r' 'gstreamer0.10-base' 'hicolor-icon-theme' 'libxcomposite' 'libxslt' 'shared-mime-info' 'libxrandr')
+depends=('r' 'hicolor-icon-theme' 'libxcomposite' 'libxslt' 'shared-mime-info' 'libxrandr')
 #makedepends=('patchelf')
 optdepends=('pandoc: markdown support'
             'pandoc-citeproc: markdown support')
@@ -26,11 +26,21 @@ conflicts=('rstudio-desktop' 'rstudio-desktop-git' 'rstudio-desktop-preview-bin'
 provides=("rstudio-desktop=${pkgver}")
 options=(!strip)
 
-md5sums_i686=(9588bce746f2a5e8da299c4a8b35d4fa)
-md5sums_x86_64=(3eede231b7206a7eebbf090f4991358f)
-
-source_i686=("https://download1.rstudio.org/rstudio-${pkgver}-i386.deb")
-source_x86_64=("https://download1.rstudio.org/rstudio-${pkgver}-amd64.deb")
+md5sums_i686=(
+9588bce746f2a5e8da299c4a8b35d4fa
+795a3ca3f2048c4dc32d25560e191c35
+eca697b2b8efbed3d2241f6b0c8c15e4)
+md5sums_x86_64=(
+3eede231b7206a7eebbf090f4991358f
+84e61f5eda991b978fa168d6762f7990
+391ba54997d6faddbfe41a185a823ee4)
+
+source_i686=("https://download1.rstudio.org/rstudio-${pkgver}-i386.deb"
+"http://archive.ubuntu.com/ubuntu/pool/main/g/gstreamer0.10/libgstreamer0.10-0_0.10.36-1.2ubuntu3_i386.deb"
+"http://security.ubuntu.com/ubuntu/pool/main/g/gst-plugins-base0.10/libgstreamer-plugins-base0.10-0_0.10.36-1.1ubuntu2.1_i386.deb")
+source_x86_64=("https://download1.rstudio.org/rstudio-${pkgver}-amd64.deb"
+"http://archive.ubuntu.com/ubuntu/pool/main/g/gstreamer0.10/libgstreamer0.10-0_0.10.36-1.2ubuntu3_amd64.deb"
+"http://security.ubuntu.com/ubuntu/pool/main/g/gst-plugins-base0.10/libgstreamer-plugins-base0.10-0_0.10.36-1.1ubuntu2.1_amd64.deb")
 
 install="$pkgname".install
 
@@ -44,6 +54,27 @@ package() {
   tar zxpf data.tar.gz -C "$pkgdir"
   install -dm755 "$pkgdir/usr/bin"
 
+  ARCH=${CARCH/686/386/}
+  ARCH=${ARCH/x86_64/amd64}
+
+  ar x libgstreamer0.10-0_0.10.36-1.2ubuntu3_${ARCH}.deb
+  tar Jxf data.tar.xz \
+      --wildcards \
+      -C "${pkgdir}/usr/lib/rstudio/bin" \
+      ./usr/lib/${CARCH/686/386}-linux-gnu/libgstreamer-0.10.so.\* \
+      ./usr/lib/${CARCH/686/386}-linux-gnu/libgstbase-0.10.so.\* \
+      --strip-components=4
+
+  ar x libgstreamer-plugins-base0.10-0_0.10.36-1.1ubuntu2.1_${ARCH}.deb
+  tar Jxf data.tar.xz \
+      --wildcards \
+      -C "${pkgdir}/usr/lib/rstudio/bin" \
+      ./usr/lib/${CARCH/686/386/}-linux-gnu/libgstapp-0.10.so.\* \
+      ./usr/lib/${CARCH/686/386/}-linux-gnu/libgstinterfaces-0.10.so.\* \
+      ./usr/lib/${CARCH/686/386/}-linux-gnu/libgstpbutils-0.10.so.\* \
+      ./usr/lib/${CARCH/686/386/}-linux-gnu/libgstvideo-0.10.so.\* \
+      --strip-components=4
+
   #cd "$pkgdir/usr/lib/rstudio/bin"
   #ln -sf /usr/lib/libncursesw.so.6 libtinfo.so.5
   #ln -sf /usr/lib/libedit.so.0  libedit.so.2