libre: handbrake: update to 1.3.0

The current handbrake 1.1.2 package stopped working:
  $ ghb
  ghb: error while loading shared libraries: libdvdread.so.4: cannot open
  shared object file: No such file or directory

As handbrake 1.1.2 failed with compilation issue it could not be
fixed by rebuilding it.

Handbrake 1.2.2 and 1.3.0 also had build issues and it seemed easier
to fix 1.3.0's issues.

While the patches are not good enough quality to be upstreamed, it's
still a good start as they could be cleaned up or rewriten and
submited later.

Ideally the patches should enable the autodetection of libbluray
and libx264 like it is done for various libraries in libhb/module.defs:
  ifneq ($(HAS.iconv),1)
  LIBHB.dll.libs += $(CONTRIB.build/)lib/libiconv.a
  else
      LIBHB.GCC.l += iconv
  endif

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>

1 files changed, 38 insertions, 26 deletions

diff --git a/libre/handbrake/PKGBUILD b/libre/handbrake/PKGBUILD
index bb291b6e7..6a868070a 100644
--- a/libre/handbrake/PKGBUILD
+++ b/libre/handbrake/PKGBUILD
@@ -2,48 +2,57 @@
 # Contributor (Arch): Giovanni Scafora <giovanni@archlinux.org>
 # Contributor (Arch): Sebastien Piccand <sebcactus gmail com>
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+# Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 
 pkgname=('handbrake' 'handbrake-cli')
-pkgver=1.1.2
+pkgver=1.3.0
 pkgrel=1
-pkgrel+=.par3
+pkgrel+=.par1
 arch=('x86_64')
 arch+=('i686' 'armv7h')
 url="https://handbrake.fr/"
 license=('GPL')
-makedepends=('intltool' 'python2' 'yasm' 'wget' 'cmake' 'bzip2' 'gcc-libs'
+makedepends=('intltool' 'python2' 'nasm' 'wget' 'cmake' 'bzip2' 'gcc-libs' 'xz'
              'zlib' 'libnotify' 'gst-plugins-base' 'gtk3' 'dbus-glib' 'libass'
              'lame' 'libxml2' 'opus' 'libvorbis' 'libtheora' 'libsamplerate'
-             'x264' 'jansson' 'librsvg' 'libgudev')
+             'speex' 'x264' 'jansson' 'librsvg' 'libgudev')
+makedepends+=('dav1d' 'libbluray' 'numactl' 'meson' 'x265')
 makedepends+=('ffmpeg' 'libdvdnav')
 source=(https://download.handbrake.fr/releases/$pkgver/HandBrake-$pkgver-source.tar.bz2
         https://github.com/HandBrake/HandBrake/releases/download/$pkgver/HandBrake-$pkgver-source.tar.bz2.sig
-        handbrake-fix-missing-x265-link-flag.patch
-        handbrake-no-download.patch
-        handbrake-supress-clip_id.patch
-        switch-libav-to-ffmpeg.patch)
-sha256sums=('ba9a4a90a7657720f04e4ba0a2880ed055be3bd855e99c0c13af944c3904de2e'
+        0001-Fix-linking-issue-when-disabling-internal-libbluray.patch
+        0002-Fix-linking-issue-when-disabling-internal-x265.patch)
+sha256sums=('a9a82eb5ca04a793705b3d7d11cefa29946694eeb13b40161446aaca35b31d96'
             'SKIP'
-            '05e212e76b6e0b94a04de02cbeb7bf9db607059e19297b5bd3d0d143135285c4'
-            'd8116caa83f870803581f0d02e1302b3b8990479d446e4c73bedd35bed531042'
-            '6407a96c59baa030a4e5fa46c53ddb3e841c7d4787613d391e032a62600d527f'
-            '7f82adce83d41552e19cdd74268db4084190f201be549b45802817f80fbc37bb')
+            '8a2818c31815764227d52ea99f7291acacec16c62487f5ae7ea64fedd52546fd'
+            'a1181cba4d83a20ead3e1d92649f8f25add000ebc3293829b9604cfc6ed79326')
 validpgpkeys+=('1629C061B3DDE7EB4AE34B81021DB8B44E4A8645') # HandBrake Team <developers@handbrake.fr>
 
 prepare() {
   cd "$srcdir/HandBrake-$pkgver"
 
-  # https://bugs.gentoo.org/show_bug.cgi?id=552792
-  patch -Np1 -i ../handbrake-fix-missing-x265-link-flag.patch
+  # Prevent fetching and use system libraries instead
+  _libs="\
+    ffmpeg \
+    libbluray \
+    libdav1d \
+    libdvdnav \
+    libdvdread \
+    libvpx \
+    nvenc \
+    x264 \
+    x265 \
+    x265_8bit \
+    x265_10bit \
+    x265_12bit \
+  "
 
-  patch -Np1 -i ../handbrake-no-download.patch
-  patch -Np1 -i ../handbrake-supress-clip_id.patch
-  patch -Np1 -i ../switch-libav-to-ffmpeg.patch
+  patch -Np1 -i ../0001-Fix-linking-issue-when-disabling-internal-libbluray.patch
+  patch -Np1 -i ../0002-Fix-linking-issue-when-disabling-internal-x265.patch
 
-  # Use more system libs
-  # Bundled libbluray is kept because it is patched locally
-  for _lib in ffmpeg x265 libvpx libdvdnav libdvdread; do
+  for _lib in $_libs ; do
     sed -i "/MODULES += contrib\/$_lib/d" make/include/main.defs
+    rm -rf contrib/$_lib
   done
 }
 
@@ -51,15 +60,18 @@ build() {
   cd "$srcdir/HandBrake-$pkgver"
 
   ./configure --prefix=/usr \
-    --disable-gtk-update-checks
+    --disable-df-fetch \
+    --disable-gtk-update-checks \
+    --disable-nvenc \
+
   make -C build
 }
 
 package_handbrake() {
   pkgdesc="Multithreaded video transcoder"
   depends=('bzip2' 'gcc-libs' 'zlib' 'gst-plugins-base' 'libnotify' 'dbus-glib'
-           'gtk3' 'libass' 'lame' 'libxml2' 'opus' 'libvorbis' 'libtheora'
-           'libsamplerate' 'x264' 'jansson' 'librsvg' 'libgudev'
+           'gtk3' 'xz' 'libass' 'lame' 'libxml2' 'opus' 'libvorbis' 'libtheora'
+           'libsamplerate' 'speex' 'x264' 'jansson' 'librsvg' 'libgudev'
            'desktop-file-utils' 'hicolor-icon-theme')
   depends+=('ffmpeg' 'libdvdnav')
   optdepends=('gst-plugins-good: for video previews'
@@ -74,8 +86,8 @@ package_handbrake() {
 
 package_handbrake-cli() {
   pkgdesc="Multithreaded video transcoder (CLI)"
-  depends=('bzip2' 'gcc-libs' 'zlib' 'libass' 'lame' 'libxml2' 'opus'
-           'libvorbis' 'libtheora' 'libsamplerate' 'x264' 'jansson')
+  depends=('bzip2' 'gcc-libs' 'zlib' 'xz' 'libass' 'lame' 'libxml2' 'opus'
+           'libvorbis' 'libtheora' 'libsamplerate' 'speex' 'x264' 'jansson')
   depends+=('ffmpeg' 'libdvdnav')
   optdepends=('libdvdcss: for decoding encrypted DVDs')