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

1 files changed, 13 insertions, 16 deletions

diff --git a/libre/handbrake-svn/PKGBUILD b/libre/handbrake-svn/PKGBUILD
index 5166674d2..19803de3c 100644
--- a/libre/handbrake-svn/PKGBUILD
+++ b/libre/handbrake-svn/PKGBUILD
@@ -5,11 +5,11 @@
 
 pkgname=('handbrake-svn' 'handbrake-cli-svn')
 _pkgver=0.9.9.1
-pkgver=6019
+pkgver=6103
 url="http://handbrake.fr/"
 license=('GPL')
 
-pkgrel=5
+pkgrel=1
 arch=('i686' 'x86_64')
 makedepends=('intltool' 'python2' 'gcc-libs' 'libnotify'
              'gst-plugins-base' 'gtk3' 'dbus-glib')
@@ -36,8 +36,6 @@ _contrib_loc+=('autoconf' # FEATURE.local_autotools
                'automake'
                'libtool'
                'm4')
-# a52dec is patched to make private things public
-_contrib_mod+=('a52dec:a52dec-0.7.4.tar.gz') # always
 _contrib_loc+=('bzip2') # HAS.bz2
 _contrib_loc+=('fontconfig'
                'freetype:freetype2'
@@ -48,21 +46,21 @@ _contrib_loc+=('fontconfig'
                'libvorbis'
                'libtheora'
                'libsamplerate')
-#_contrib_sys+=('fdk-aac:libfdk-aac') # FEATURE.fdk_aac
-_contrib_mod+=('fdk-aac:fdk-aac-v0.1.1-6-gbae4553.tar.bz2') # FEATURE.fdk_aac
-_contrib_ign+=('faac') # FEATURE.faac
-#_contrib_sys+=('mp4v2:libmp4v2') # FEATURE.mp4v2
-_contrib_mod+=('mp4v2:mp4v2-trunk-r355.tar.bz2') # FEATURE.mp4v2
+# XXX: I can't get it to set LDFLAGS right to use system fdk-aac
+_contrib_mod+=('fdk-aac:fdk-aac-v0.1.1-6-gbae4553.tar.bz2') # FEATURE.fdk_aac (sys:libfdk-aac)
+# XXX: I can't get it to set LDFLAGS right to use system mp4v2
+_contrib_mod+=('mp4v2:mp4v2-trunk-r355.tar.bz2') # FEATURE.mp4v2 (sys:libmp4v2)
 # libmkv is patched to add features
 _contrib_mod+=('libmkv:libmkv-0.6.5-0-g82075ae.tar.gz') # FEATURE.libmkv
+_contrib_ign+=('x265') # FEATURE.x265
 _contrib_sys+=('lame') # always
 # Using system ffmpeg will break PGS subtitle processing
 # https://forum.handbrake.fr/viewtopic.php?f=13&t=27581
-_contrib_mod+=('ffmpeg:libav-v10_alpha2.tar.bz2') # always
+_contrib_mod+=('ffmpeg:libav-v10_beta1.tar.bz2') # always
 _contrib_sys+=('libdvdread') # always
-# I don't even know, but system libdvdnav doesn't work
+# XXX: I don't even know, but system libdvdnav doesn't work
 _contrib_mod+=('libdvdnav:libdvdnav-a5c1325.tar.bz2') # always
-_contrib_sys+=('libbluray') # # always
+_contrib_sys+=('libbluray') # always
 _contrib_ign+=('libmfx') # FEATURE.qsv
 _contrib_sys+=('x264') # always
 _contrib_loc+=('zlib') # HAS.libz
@@ -70,17 +68,16 @@ _contrib_loc+=('yasm') # FEATURE.local_yasm
 
 makedepends+=("${_contrib_loc[@]#*:}" "${_contrib_sys[@]#*:}")
 
-source=("https://repo.parabolagnulinux.org/other/$pkgname/HandBrake-svn${pkgver}.tar.gz")
+source=("https://repo.parabolagnulinux.org/other/handbrake/HandBrake-svn${pkgver}.tar.gz")
 for _f in "${_contrib_mod[@]#*:}"; do
   source+=("http://download.handbrake.fr/handbrake/contrib/${_f}")
   noextract+=("${_f}")
 done; unset _f
-sha256sums=('098c2e5cad18784d3b9ac164891c87770eba055e6508bbc70d73680862473208'
-            '54981ab08fc09a675b9924372cf0cca5aa5363b918c4c19065c2d40e2858be47'
+sha256sums=('59aac48702c8b55d78e8cba3f94b4cc42f8077bce6d775d1560891628ed532a1'
             'f08584d59a02db5facf548ae860c64d2870db63477f605af763c161a1508dcbc'
             '5b7d4e62df506b1246463da82cc2f02415eb462e6ccd5848f98f5cdcfc1f3d4f'
             '7314a296c68f42b826164074a96e247e52d8ef9287c21ebc5fe1bf9e73643e97'
-            '83e7f34585160a90f3c218a485e02a22a54b2fd4f1b025589bd210820dcf637e'
+            '41e7b81c4bf49acf4f5e74a61ffe2a593d22df5326997aa4fb253b5de1410773'
             'd190ce2ca4d1d9878145acd9c1b8ac76636c3b6d12066e8cc87ee674f943fb2a')
 
 mksource=("HandBrake-svn${pkgver}::svn://svn.handbrake.fr/HandBrake/trunk")