From fc347de5b61445cfee0ba08de225536e8d812dec Mon Sep 17 00:00:00 2001 From: Leo Date: Fri, 22 Nov 2019 21:00:31 +0100 Subject: testing/handbrake: upgrade to 1.3.0 --- testing/handbrake/APKBUILD | 32 ++++++++++------------ testing/handbrake/disable-nvenc.patch | 10 ------- ...handbrake-9999-fix-missing-x265-link-flag.patch | 13 --------- 3 files changed, 14 insertions(+), 41 deletions(-) delete mode 100644 testing/handbrake/disable-nvenc.patch delete mode 100644 testing/handbrake/handbrake-9999-fix-missing-x265-link-flag.patch diff --git a/testing/handbrake/APKBUILD b/testing/handbrake/APKBUILD index bb68f51875..5d59e80674 100644 --- a/testing/handbrake/APKBUILD +++ b/testing/handbrake/APKBUILD @@ -1,30 +1,26 @@ # Maintainer: Nathan Angelacos pkgname=handbrake _pkgname=HandBrake -pkgver=1.2.2 -pkgrel=1 +pkgver=1.3.0 +pkgrel=0 pkgdesc="Handbrake video transcoder" url="https://handbrake.fr" -# arch="x86_64 x86 armhf armv7 ppc64le" -arch="" # Fails to build with new harfbuzz +arch="x86_64 x86 armhf armv7 ppc64le" license="GPL-2.0-only" makedepends="yasm autoconf libtool zlib-dev libbz2 libogg-dev libtheora-dev - libvorbis-dev libsamplerate-dev fribidi-dev freetype-dev - tinyxml-dev fontconfig-dev libass-dev intltool glib-dev dbus-glib-dev - gtk+3.0-dev libgudev-dev libnotify-dev libdvdread-dev - gst-plugins-base-dev x264-dev lame-dev linux-headers cmake - automake ffmpeg-dev coreutils libdvdnav-dev libbluray-dev - x265-dev libvpx-dev fdk-aac-dev jansson-dev opus-dev python2 - speex-dev xz-dev" + libvorbis-dev fribidi-dev freetype-dev tinyxml-dev fontconfig-dev + libass-dev intltool glib-dev dbus-glib-dev gtk+3.0-dev libgudev-dev + libnotify-dev libdvdread-dev gst-plugins-base-dev x264-dev lame-dev + linux-headers cmake automake ffmpeg-dev coreutils libdvdnav-dev + libbluray-dev libvpx-dev fdk-aac-dev jansson-dev opus-dev python2 + speex-dev xz-dev meson nasm dav1d-dev" subpackages="$pkgname-lang $pkgname-gtk" source="https://download.handbrake.fr/releases/$pkgver/HandBrake-$pkgver-source.tar.bz2 - handbrake-9999-fix-missing-x265-link-flag.patch handbrake-9999-remove-dvdnav-dup.patch handbrake-9999-remove-faac-dependency.patch - disable-nvenc.patch " options="!check" -builddir="$srcdir"/${_pkgname}-${pkgver} +builddir="$srcdir"/$_pkgname-$pkgver prepare() { default_prepare @@ -39,6 +35,8 @@ build() { --force \ --verbose \ --disable-nvenc \ + --disable-numa \ + --disable-x265 \ --disable-gtk-update-checks cd build @@ -59,8 +57,6 @@ gtk() { } -sha512sums="434e6db1acbe01771aeefd2f257bdc58ad84e63ba441f4977f634b9ccb3c708176b928adf1dfa9e20d4948b65876ae9b4dfdc35f9c56f03f34858380090ab29c HandBrake-1.2.2-source.tar.bz2 -9ca716b290f384db839609d176b6883c4dc1aaf31206b206cfd1f29c85bb134e29fbf72bda1a8589f76e1885019dbdee5a39d8299f7f0a20a6ef8a01868f4845 handbrake-9999-fix-missing-x265-link-flag.patch +sha512sums="40801a5a3756feb33f374e68e7ed743841d33f7a6b22dd2361034f182b32cdcead3ff02a7a6e16f0ffbc7b693541747b048dc606deadf7a8e490aad193e07c4d HandBrake-1.3.0-source.tar.bz2 a3d57dd37d518286a62554cfcc4722d6fd588a0c3966d30785100edc4476febb2b48fc4f9b2a7eb5b5dc049043fabd4398e1e190e10cbd63c25b2936824977d3 handbrake-9999-remove-dvdnav-dup.patch -9d070e50a9b7d4b8ac25b7d56bd341aca6dc979ba506c84f4b95109909f70020723915cd120bed24e84a8fc242ee3c3a5775f43a78b7995e53cd499444c9f6dc handbrake-9999-remove-faac-dependency.patch -d1dbd3f884c5619efba28b5dbf4c90e7f0386cb6e7a2bb016eb5f6220207e2c1826095d7240a67861061a828da95261fdca1729de0e2359c1ee7dae66293a8c5 disable-nvenc.patch" +9d070e50a9b7d4b8ac25b7d56bd341aca6dc979ba506c84f4b95109909f70020723915cd120bed24e84a8fc242ee3c3a5775f43a78b7995e53cd499444c9f6dc handbrake-9999-remove-faac-dependency.patch" diff --git a/testing/handbrake/disable-nvenc.patch b/testing/handbrake/disable-nvenc.patch deleted file mode 100644 index d062b9cefd..0000000000 --- a/testing/handbrake/disable-nvenc.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/make/configure.py -+++ b/make/configure.py -@@ -1321,6 +1321,7 @@ def createCLI(): - - h = IfHost( 'enable Nvidia NVEnc video encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value - grp.add_option( '--enable-nvenc', dest="enable_nvenc", default=not (host.match( '*-*-darwin*' ) or host.match( '*-*-freebsd*' )), action='store_true', help=h ) -+ grp.add_option( '--disable-nvenc', dest="enable_nvenc", action='store_false' ) - - - cli.add_option_group( grp ) diff --git a/testing/handbrake/handbrake-9999-fix-missing-x265-link-flag.patch b/testing/handbrake/handbrake-9999-fix-missing-x265-link-flag.patch deleted file mode 100644 index a999fc3256..0000000000 --- a/testing/handbrake/handbrake-9999-fix-missing-x265-link-flag.patch +++ /dev/null @@ -1,13 +0,0 @@ -Written by: Peter Foley -Gentoo Bug: #552792 - ---- ./test/module.defs.bak 2015-06-21 13:19:40.626249439 -0400 -+++ ./test/module.defs 2015-06-21 13:19:54.919757726 -0400 -@@ -25,6 +25,7 @@ - - ifeq (1,$(FEATURE.x265)) - TEST.GCC.D += USE_X265 -+ TEST.GCC.l += x265 - endif - - TEST.GCC.l += $(foreach m,$(MODULES.NAMES),$($m.OSL.libs)) -- cgit v1.2.3