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

1 files changed, 36 insertions, 37 deletions

diff --git a/pcr/libav/PKGBUILD b/pcr/libav/PKGBUILD
index 6da6f14bd..05dd756c0 100644
--- a/pcr/libav/PKGBUILD
+++ b/pcr/libav/PKGBUILD
@@ -13,8 +13,8 @@ if [[ $static == true ]] || [[ $static == 1 ]] || [[ $static == enable ]]; then
 elif [[ $static == false ]] || [[ $static == 0 ]] || [[ $static == disable ]]; then
   pkgname=libav
 fi
-pkgver=0.8.4
-pkgrel=3
+pkgver=9.3
+pkgrel=1
 pkgdesc="Complete and free Internet live audio and video broadcasting solution for GNU/Linux$staticdesc"
 arch=(
   i686
@@ -28,6 +28,7 @@ license=(
 depends=(
   alsa-lib
   bzip2
+  freetype2
   gsm
   lame
   libpulse
@@ -53,46 +54,48 @@ source=(
   http://$pkgbase.org/releases/$pkgbase-$pkgver.tar.gz
 )
 sha512sums=(
-  d402c7d586708e29b92340c4d03d8431fe607f0b88c2762cc95671786cdb9a7221968164b571e11086b53b2169f3a657c6106dc769c04a1a035429d011e72610
+  de3aaa571fed67d22ec2a0c53599af56684afa38445cf67fd09d26c23eeded5a184d045f472d414815d17783b421f937fd3d9565637e20f2050aaaf0081164fe
 )
 
 build() {
   cd $pkgbase-$pkgver
 
-  ./configure \
-    --prefix=/opt/$pkgname \
-    --enable-libmp3lame \
-    --enable-libvorbis \
-    --enable-libxvid \
-    --enable-libx264 \
-    --enable-libvpx \
-    --enable-libtheora \
-    --enable-libgsm \
-    --enable-libspeex \
-    --enable-postproc \
-    --enable-shared \
-    --enable-x11grab \
-    --enable-libopencore_amrnb \
-    --enable-libopencore_amrwb \
-    --enable-libschroedinger \
-    --enable-libopenjpeg \
-    --enable-librtmp \
-    --enable-libpulse \
-    --enable-gpl \
-    --enable-version3 \
-    --enable-runtime-cpudetect \
-    --disable-debug \
-    --enable-static
+  [[ $static == false ]] && sttcv=disable || sttcv=enable
 
-  make
-  make tools/qt-faststart
-  make doc/ffmpeg.1
-  make doc/av{play,server}.1
+  ./configure\
+    --prefix=/opt/$pkgname\
+    --disable-debug\
+    --$sttcv-static\
+    --enable-avresample\
+    --enable-gpl\
+    --enable-libfreetype\
+    --enable-libgsm\
+    --enable-libmp3lame\
+    --enable-libopencore_amrnb\
+    --enable-libopencore_amrwb\
+    --enable-libopenjpeg\
+    --enable-libpulse\
+    --enable-librtmp\
+    --enable-libschroedinger\
+    --enable-libspeex\
+    --enable-libtheora\
+    --enable-libvorbis\
+    --enable-libvpx\
+    --enable-libx264\
+    --enable-libxvid\
+    --enable-runtime-cpudetect\
+    --enable-shared\
+    --enable-version3\
+    --enable-x11grab
+
+  setarch $CARCH make
+  setarch $CARCH make tools/qt-faststart
+  setarch $CARCH make doc/av{conv,play,server}.1
 }
 
 package() {
   cd $pkgbase-$pkgver
-  make DESTDIR=$pkgdir install install-man
+  setarch $CARCH make DESTDIR=$pkgdir install install-man
   install -m755 -d                              $pkgdir/etc/ld.so.conf.d
   install -m755 -d                              $pkgdir/usr/bin
   install -m755 -d                              $pkgdir/usr/share/man/man1
@@ -100,15 +103,11 @@ package() {
   ln -s /opt/$pkgname/bin/avconv                $pkgdir/usr/bin/avconv$pkgflag
   ln -s /opt/$pkgname/bin/avplay                $pkgdir/usr/bin/avplay$pkgflag
   ln -s /opt/$pkgname/bin/avprobe               $pkgdir/usr/bin/avprobe$pkgflag
-  ln -s /opt/$pkgname/bin/avserver              $pkgdir/usr/bin/avserver$pkgflag
-  ln -s /opt/$pkgname/bin/ffmpeg                $pkgdir/usr/bin/ffmpeg-$pkgname
   ln -s /opt/$pkgname/bin/qt-faststart          $pkgdir/usr/bin/qt-faststart-$pkgname
   ln -s /opt/$pkgname/share/man/man1/avconv.1   $pkgdir/usr/share/man/man1/avconv$pkgflag.1
   ln -s /opt/$pkgname/share/man/man1/avplay.1   $pkgdir/usr/share/man/man1/avplay$pkgflag.1
   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$pkgflag/lib                  > $pkgdir/etc/ld.so.conf.d/libav$pkgflag.conf
+  echo /opt/libav$pkgflag/lib                 > $pkgdir/etc/ld.so.conf.d/libav$pkgflag.conf
 }
 
 # vim:set ts=2 sw=2 et: