Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

7 files changed, 11 insertions, 29 deletions

diff --git a/pcr/libav-static/avconv-static b/pcr/libav-static/avconv-static
deleted file mode 100644
index 5f632bec0..000000000
--- a/pcr/libav-static/avconv-static
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/libav-static/lib /opt/libav-static/bin/avconv $*
diff --git a/pcr/libav-static/avplay-static b/pcr/libav-static/avplay-static
deleted file mode 100644
index 8db2da816..000000000
--- a/pcr/libav-static/avplay-static
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/libav-static/lib /opt/libav-static/bin/avplay $*
diff --git a/pcr/libav-static/avprobe-static b/pcr/libav-static/avprobe-static
deleted file mode 100644
index 44b730287..000000000
--- a/pcr/libav-static/avprobe-static
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/libav-static/lib /opt/libav-static/bin/avprobe $*
diff --git a/pcr/libav-static/avserver-static b/pcr/libav-static/avserver-static
deleted file mode 100644
index 642d4722c..000000000
--- a/pcr/libav-static/avserver-static
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/libav-static/lib /opt/libav-static/bin/avserver $*
diff --git a/pcr/libav-static/ffmpeg-libav-static b/pcr/libav-static/ffmpeg-libav-static
deleted file mode 100644
index 3f9ef6d52..000000000
--- a/pcr/libav-static/ffmpeg-libav-static
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/libav-static/lib /opt/libav-static/bin/ffmpeg $*
diff --git a/pcr/libav-static/qt-faststart-libav-static b/pcr/libav-static/qt-faststart-libav-static
deleted file mode 100644
index 8613091c4..000000000
--- a/pcr/libav-static/qt-faststart-libav-static
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/libav-static/lib /opt/libav-static/bin/qt-faststart $*
diff --git a/pcr/libav-static/PKGBUILD b/pcr/libav/PKGBUILD
index 932213a3e..6da6f14bd 100644
--- a/pcr/libav-static/PKGBUILD
+++ b/pcr/libav/PKGBUILD
@@ -4,12 +4,18 @@
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
+static=false
 pkgbase=libav
-pkgname=libav-static
-pkgflag=-static
+if [[ $static == true ]] || [[ $static == 1 ]] || [[ $static == enable ]]; then
+  pkgname=libav-static
+  pkgflag=-static
+  staticdesc=', with static library'
+elif [[ $static == false ]] || [[ $static == 0 ]] || [[ $static == disable ]]; then
+  pkgname=libav
+fi
 pkgver=0.8.4
-pkgrel=2
-pkgdesc='Complete and free Internet live audio and video broadcasting solution for GNU/Linux, with static library'
+pkgrel=3
+pkgdesc="Complete and free Internet live audio and video broadcasting solution for GNU/Linux$staticdesc"
 arch=(
   i686
   x86_64
@@ -45,21 +51,9 @@ makedepends=(
 )
 source=(
   http://$pkgbase.org/releases/$pkgbase-$pkgver.tar.gz
-  avconv$pkgflag
-  avplay$pkgflag
-  avprobe$pkgflag
-  avserver$pkgflag
-  ffmpeg-$pkgname
-  qt-faststart-$pkgname
 )
 sha512sums=(
   d402c7d586708e29b92340c4d03d8431fe607f0b88c2762cc95671786cdb9a7221968164b571e11086b53b2169f3a657c6106dc769c04a1a035429d011e72610
-  4a98c459df5f5bc5e42580b5f2081509719c057fdf55693b3554006b21adcaa29ee59ac0debfe0486fe1df8b9a937135d99e4ccc2df894a2634dd314eed93114
-  afd2eadd0a0522cd3665ccd2b819f06a99cc50e3bdac3a0ef200861664c7084cc5990a3c1a860f2f0cc9f835c33c09cb5c57a25dbab0673eb74ba0f4c980e539
-  4e557c9eab6a97a3206df1dd49a516ae7be9490c894ff212cb5286ee097ae606c0b7a650c75278a71e4c91d0325eaee729937e1ae659ce0887c3c20ea8fe6333
-  f0fa50711d19babf3f485189fb37b17a87f31849dad9cf6a7324601bdde0856fe47d55a4d82c6839c93f39e970edcbeecfbcb70a8b4e7570250fa4c7bb6975fb
-  8101ec9c3e0a945ea89f85f81ace52ce67159661e3440668726a5767ba6250a91533494f1aa8fc30ee97ff9af5d64636d0f0dbcb2da862124d35b6b5ec571f5b
-  0133fae31e1df586317deb7235f5e74d22abd007038f82b9df10ea3eea6748945c50a0bbe8f588e8a5d1b7874b3fa2639430e1efa32b0cfe16383a32751d3245
 )
 
 build() {
@@ -114,7 +108,7 @@ package() {
   ln -s /opt/$pkgname/share/man/man1/avprobe.1  $pkgdir/usr/share/man/man1/avprobe$pkgflag.1
   ln -s /opt/$pkgname/share/man/man1/avserver.1 $pkgdir/usr/share/man/man1/avserver$pkgflag.1
   ln -s /opt/$pkgname/share/man/man1/ffmpeg.1   $pkgdir/usr/share/man/man1/ffmpeg-$pkgname.1
-  echo /opt/libav-static/lib                  > $pkgdir/etc/ld.so.conf.d/libav-static.conf
+  echo /opt/libav$pkgflag/lib                  > $pkgdir/etc/ld.so.conf.d/libav$pkgflag.conf
 }
 
 # vim:set ts=2 sw=2 et: