From 9fd4d4b0dc86057adcf96bc72dda35d9360769d7 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Fri, 10 Jun 2016 18:53:52 +0200 Subject: [PATCH] handbrake: update to 0.10.5 Use system x265 (patch from Gentoo). Use system libvpx (patch from FreeBSD). Use system ffmpeg (patch from upstream). Add fdk_acc build option (off). Close #3987. --- ...handbrake-fix-missing-x265-link-flag.patch | 13 ++++++ ...esence_of_AV_PKT_DATA_FALLBACK_TRACK.patch | 41 ++++++++++++++++++ ...atch-contrib_ffmpeg_A90-libvpx-1.5.0.patch | 42 +++++++++++++++++++ srcpkgs/handbrake/template | 26 ++++++------ 4 files changed, 109 insertions(+), 13 deletions(-) create mode 100644 srcpkgs/handbrake/patches/handbrake-fix-missing-x265-link-flag.patch create mode 100644 srcpkgs/handbrake/patches/muxavformat_check_for_presence_of_AV_PKT_DATA_FALLBACK_TRACK.patch create mode 100644 srcpkgs/handbrake/patches/patch-contrib_ffmpeg_A90-libvpx-1.5.0.patch diff --git a/srcpkgs/handbrake/patches/handbrake-fix-missing-x265-link-flag.patch b/srcpkgs/handbrake/patches/handbrake-fix-missing-x265-link-flag.patch new file mode 100644 index 00000000000..9daa0ce857f --- /dev/null +++ b/srcpkgs/handbrake/patches/handbrake-fix-missing-x265-link-flag.patch @@ -0,0 +1,13 @@ +Written by: Peter Foley +Gentoo Bug: #552792 + +--- test/module.defs ++++ test/module.defs +@@ -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)) diff --git a/srcpkgs/handbrake/patches/muxavformat_check_for_presence_of_AV_PKT_DATA_FALLBACK_TRACK.patch b/srcpkgs/handbrake/patches/muxavformat_check_for_presence_of_AV_PKT_DATA_FALLBACK_TRACK.patch new file mode 100644 index 00000000000..d7bb52343d4 --- /dev/null +++ b/srcpkgs/handbrake/patches/muxavformat_check_for_presence_of_AV_PKT_DATA_FALLBACK_TRACK.patch @@ -0,0 +1,41 @@ +From d5bdc7e2590faa0a397d13730491761410ca24fb Mon Sep 17 00:00:00 2001 +From: Sean McGovern +Date: Wed, 11 Nov 2015 17:26:49 -0500 +Subject: [PATCH] muxavformat: check for presence of AV_PKT_DATA_FALLBACK_TRACK + +--- + libhmuxavformat.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git libhb/muxavformat.c libhb/muxavformat.c +index aac09b7..7879d70 100644 +--- libhb/muxavformat.c ++++ libhb/muxavformat.c +@@ -121,7 +121,10 @@ static int avformatInit( hb_mux_object_t * m ) + hb_mux_data_t * track; + int meta_mux; + int max_tracks; +- int ii, jj, ret; ++ int ii, ret; ++#ifdef AV_PKT_DATA_FALLBACK_TRACK ++ int jj; ++#endif + + int clock_min, clock_max, clock; + hb_video_framerate_get_limits(&clock_min, &clock_max, &clock); +@@ -593,6 +596,7 @@ static int avformatInit( hb_mux_object_t * m ) + } + } + ++#ifdef AV_PKT_DATA_FALLBACK_TRACK + // Check for audio track associations + for (ii = 0; ii < hb_list_count(job->list_audio); ii++) + { +@@ -642,6 +646,7 @@ static int avformatInit( hb_mux_object_t * m ) + } break; + } + } ++#endif + + char * subidx_fmt = + "size: %dx%d\n" diff --git a/srcpkgs/handbrake/patches/patch-contrib_ffmpeg_A90-libvpx-1.5.0.patch b/srcpkgs/handbrake/patches/patch-contrib_ffmpeg_A90-libvpx-1.5.0.patch new file mode 100644 index 00000000000..ae79f99920d --- /dev/null +++ b/srcpkgs/handbrake/patches/patch-contrib_ffmpeg_A90-libvpx-1.5.0.patch @@ -0,0 +1,42 @@ +--- /dev/null 1970-01-01 00:00:00 UTC ++++ contrib/ffmpeg/A90-libvpx-1.5.0.patch +@@ -0,0 +1,39 @@ ++commit 6540fe0 ++Author: James Zern ++Date: Mon Oct 19 22:44:11 2015 -0700 ++ ++ libvpxenc: remove some unused ctrl id mappings ++ ++ VP8E_UPD_ENTROPY, VP8E_UPD_REFERENCE, VP8E_USE_REFERENCE were removed ++ from libvpx and the remaining values were never used here ++ ++ Reviewed-by: Michael Niedermayer ++ Signed-off-by: James Zern ++--- ++ libavcodec/libvpxenc.c | 8 -------- ++ 1 file changed, 8 deletions(-) ++ ++diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c ++index 5f39783..992122c 100644 ++--- a/libavcodec/libvpxenc.c +++++ b/libavcodec/libvpxenc.c ++@@ -104,19 +104,11 @@ typedef struct VP8EncoderContext { ++ ++ /** String mappings for enum vp8e_enc_control_id */ ++ static const char *const ctlidstr[] = { ++- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY", ++- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE", ++- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE", ++- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP", ++- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP", ++- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE", ++ [VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED", ++ [VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF", ++ [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY", ++- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS", ++ [VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD", ++ [VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS", ++- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER", ++ [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES", ++ [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH", ++ [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE", diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template index 0dbd0615a20..576d03d37aa 100644 --- a/srcpkgs/handbrake/template +++ b/srcpkgs/handbrake/template @@ -2,36 +2,36 @@ only_for_archs="i686 i686-musl x86_64 x86_64-musl" pkgname=handbrake -version=0.10.2 -revision=2 +version=0.10.5 +revision=1 wrksrc="HandBrake-${version}" +build_options="fdk_aac" hostmakedepends="automake libtool cmake pkg-config intltool - python yasm wget m4 gettext-devel" + python yasm wget m4 gettext-devel glib-devel" makedepends="zlib-devel bzip2-devel libnotify-devel gtk+3-devel ncurses-devel - gst-plugins-base1-devel webkitgtk-devel libgudev-devel x264-devel + gst-plugins-base1-devel webkitgtk-devel libgudev-devel x264-devel x265-devel dbus-glib-devel fribidi-devel libass-devel fontconfig-devel libxml2-devel libogg-devel libdvdnav-devel libdvdread-devel libtheora-devel lame-devel - libsamplerate-devel libbluray-devel librsvg-devel" + libsamplerate-devel libbluray-devel librsvg-devel libvpx-devel ffmpeg-devel + $(vopt_if fdk_aac fdk-aac-devel)" depends="gst-plugins-good1 desktop-file-utils hicolor-icon-theme" short_desc="Multithreaded video transcoder" maintainer="Juan RP " license="GPL-2" homepage="http://handbrake.fr/" distfiles="https://handbrake.fr/rotation.php?file=HandBrake-${version}.tar.bz2>HandBrake-${version}.tar.bz2" -checksum=4cc3828393b26a982dbe00febd700c5090d3443c1d45492e0b373e02da73c699 +checksum=fb9230dd121b456f6829d1d25ac8bbf76e503b51c4efc70f0a7fd2bb8607e2f0 CFLAGS="-msse" pre_configure() { - # Use more system libs - sed -i \ - -e '/MODULES += contrib\/libbluray/d' \ - -e '/MODULES += contrib\/libdvdnav/d' \ - -e '/MODULES += contrib\/libdvdread/d' \ - make/include/main.defs + # use system libraries in place of bundled ones + for module in ffmpeg libvpx libdvdread libdvdnav libbluray x265 fdk-aac; do + sed -i "/MODULES += contrib\/${module}/d" make/include/main.defs + done } do_configure() { - ./configure --prefix=/usr --force --disable-gtk-update-checks + ./configure --prefix=/usr --force --disable-gtk-update-checks $(vopt_enable fdk_aac fdk-aac) } do_build() { unset AS LD