aboutsummaryrefslogtreecommitdiffstats
path: root/testing/handbrake
diff options
context:
space:
mode:
authorCarlo Landmeter <clandmeter@gmail.com>2015-10-27 13:31:36 +0100
committerCarlo Landmeter <clandmeter@gmail.com>2015-10-27 13:31:41 +0100
commit373000a7cb551d1c548743161734be61b8512bd6 (patch)
tree49511cd2ef002501b9b0e72890fae1d5c6ce6ff3 /testing/handbrake
parent89da83b3f8aaf70cb9ab8511991c2fae4bd6ec45 (diff)
downloadaports-373000a7cb551d1c548743161734be61b8512bd6.tar.bz2
aports-373000a7cb551d1c548743161734be61b8512bd6.tar.xz
testing/handbrake: use external libs
Diffstat (limited to 'testing/handbrake')
-rw-r--r--testing/handbrake/APKBUILD53
-rw-r--r--testing/handbrake/handbrake-9999-fix-missing-x265-link-flag.patch13
-rw-r--r--testing/handbrake/handbrake-9999-remove-dvdnav-dup.patch20
-rw-r--r--testing/handbrake/handbrake-9999-remove-faac-dependency.patch84
4 files changed, 156 insertions, 14 deletions
diff --git a/testing/handbrake/APKBUILD b/testing/handbrake/APKBUILD
index 14565976ec..1f8735df09 100644
--- a/testing/handbrake/APKBUILD
+++ b/testing/handbrake/APKBUILD
@@ -2,7 +2,7 @@
pkgname=handbrake
_pkgname=HandBrake
pkgver=0.10.2
-pkgrel=1
+pkgrel=2
pkgdesc="Handbrake video transcoder"
url="https://handbrake.fr"
arch="x86_64 armhf"
@@ -14,28 +14,44 @@ makedepends="yasm autoconf libtool zlib-dev libbz2 libogg-dev libtheora-dev
tinyxml-dev fontconfig-dev libass-dev intltool glib-dev dbus-glib-dev
gtk+3.0-dev webkitgtk-dev eudev-dev libnotify-dev libdvdread-dev
gstreamer0.10-dev x264-dev lame-dev linux-headers cmake
- autoconf automake"
+ autoconf automake ffmpeg-dev coreutils libdvdnav-dev
+ libbluray-dev x265-dev libvpx-dev fdk-aac-dev"
subpackages="$pkgname-lang $pkgname-gtk"
-source="${_pkgname}-${pkgver}.tar.bz2::https://handbrake.fr/rotation.php?file=${_pkgname}-${pkgver}.tar.bz2"
+source="${_pkgname}-${pkgver}.tar.bz2::https://handbrake.fr/rotation.php?file=${_pkgname}-${pkgver}.tar.bz2
+ handbrake-9999-fix-missing-x265-link-flag.patch
+ handbrake-9999-remove-dvdnav-dup.patch
+ handbrake-9999-remove-faac-dependency.patch"
_builddir="$srcdir"/${_pkgname}-${pkgver}
+prepare() {
+ local i
+ cd "$_builddir"
+ for i in $source; do
+ case $i in
+ *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+ esac
+ done
+ # build against external libs
+ sed -i 's:.*contrib/.*::g' \
+ make/include/main.defs \
+ || die "Contrib removal failed."
+}
+
build() {
cd "$_builddir"
- ./configure --prefix=/usr || return 1
+ ./configure --prefix=/usr \
+ --force \
+ --verbose \
+ --disable-gtk-update-checks \
+ || return 1
cd build
- # This is retarded, but handbrake's "custom.defs" doesn't seem to work
- make ffmpeg.configure || return 1
- make ffmpeg.build CFLAGS="-D_GNU_SOURCE -I${_builddir}/build/contrib/include -I." || return 1
-
- make build CFLAGS="-I${_builddir}/build/contrib/include -I." || return 1
-
+ make || return 1
}
package() {
cd "$_builddir"/build
-
make -j1 install DESTDIR="$pkgdir"
}
@@ -49,6 +65,15 @@ gtk() {
}
-md5sums="db0a71147463664c4230ed3f1caf4fe8 HandBrake-0.10.2.tar.bz2"
-sha256sums="4cc3828393b26a982dbe00febd700c5090d3443c1d45492e0b373e02da73c699 HandBrake-0.10.2.tar.bz2"
-sha512sums="7059a88fac1e4810c54880eb4afe58716af7ac81e5b098e34f3a68c19d7c03e51b57e1a196603e2c8d377e94bb3a910d20f1d9ed62d3eab6422031e62730d4a2 HandBrake-0.10.2.tar.bz2"
+md5sums="db0a71147463664c4230ed3f1caf4fe8 HandBrake-0.10.2.tar.bz2
+9adb0a65dbdd959a07d903387046d9d6 handbrake-9999-fix-missing-x265-link-flag.patch
+b9aeb4db4da07d9966d4861d75de5fe7 handbrake-9999-remove-dvdnav-dup.patch
+48a93cb08aba88568fcfc43e16892621 handbrake-9999-remove-faac-dependency.patch"
+sha256sums="4cc3828393b26a982dbe00febd700c5090d3443c1d45492e0b373e02da73c699 HandBrake-0.10.2.tar.bz2
+b96fc610c716e13c2c5071d33a59861d6679f14c60d3cb8e475cb2d7cbb3829a handbrake-9999-fix-missing-x265-link-flag.patch
+1418b164818d5c17a0dd87f13773cadad7c05827e38ea884e7a8a10750401ceb handbrake-9999-remove-dvdnav-dup.patch
+05af966252b8b6e50d3c79c5dc258d8db95574335ca10d31b9f87af9a23b049b handbrake-9999-remove-faac-dependency.patch"
+sha512sums="7059a88fac1e4810c54880eb4afe58716af7ac81e5b098e34f3a68c19d7c03e51b57e1a196603e2c8d377e94bb3a910d20f1d9ed62d3eab6422031e62730d4a2 HandBrake-0.10.2.tar.bz2
+9ca716b290f384db839609d176b6883c4dc1aaf31206b206cfd1f29c85bb134e29fbf72bda1a8589f76e1885019dbdee5a39d8299f7f0a20a6ef8a01868f4845 handbrake-9999-fix-missing-x265-link-flag.patch
+a3d57dd37d518286a62554cfcc4722d6fd588a0c3966d30785100edc4476febb2b48fc4f9b2a7eb5b5dc049043fabd4398e1e190e10cbd63c25b2936824977d3 handbrake-9999-remove-dvdnav-dup.patch
+9d070e50a9b7d4b8ac25b7d56bd341aca6dc979ba506c84f4b95109909f70020723915cd120bed24e84a8fc242ee3c3a5775f43a78b7995e53cd499444c9f6dc handbrake-9999-remove-faac-dependency.patch"
diff --git a/testing/handbrake/handbrake-9999-fix-missing-x265-link-flag.patch b/testing/handbrake/handbrake-9999-fix-missing-x265-link-flag.patch
new file mode 100644
index 0000000000..a999fc3256
--- /dev/null
+++ b/testing/handbrake/handbrake-9999-fix-missing-x265-link-flag.patch
@@ -0,0 +1,13 @@
+Written by: Peter Foley <pefoley2@pefoley.com>
+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))
diff --git a/testing/handbrake/handbrake-9999-remove-dvdnav-dup.patch b/testing/handbrake/handbrake-9999-remove-dvdnav-dup.patch
new file mode 100644
index 0000000000..8f4ddbb3bb
--- /dev/null
+++ b/testing/handbrake/handbrake-9999-remove-dvdnav-dup.patch
@@ -0,0 +1,20 @@
+--- ./libhb/dvdnav.c 2013-05-05 16:14:10.265388521 +0200
++++ ./libhb/dvdnav.c.2 2013-05-05 16:14:18.325388471 +0200
+@@ -1225,16 +1225,7 @@
+ {
+ for (kk = 0; kk < buttons; kk++)
+ {
+- dvdnav_t *dvdnav_copy;
+-
+- result = dvdnav_dup( &dvdnav_copy, d->dvdnav );
+- if (result != DVDNAV_STATUS_OK)
+- {
+- hb_log("dvdnav dup failed: %s", dvdnav_err_to_string(d->dvdnav));
+- goto done;
+- }
+- title = try_button( dvdnav_copy, kk, list_title );
+- dvdnav_free_dup( dvdnav_copy );
++ title = try_button( d->dvdnav, kk, list_title );
+
+ if ( title >= 0 )
+ {
diff --git a/testing/handbrake/handbrake-9999-remove-faac-dependency.patch b/testing/handbrake/handbrake-9999-remove-faac-dependency.patch
new file mode 100644
index 0000000000..7e8ab99730
--- /dev/null
+++ b/testing/handbrake/handbrake-9999-remove-faac-dependency.patch
@@ -0,0 +1,84 @@
+--- a/libhb/common.c
++++ b/libhb/common.c
+@@ -243,7 +243,6 @@
+ {
+ // legacy encoders, back to HB 0.9.4 whenever possible (disabled)
+ { { "", "dts", NULL, HB_ACODEC_DCA_PASS, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_DTS_PASS, },
+- { { "AAC (faac)", "faac", NULL, 0, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AAC, },
+ { { "AAC (ffmpeg)", "ffaac", NULL, HB_ACODEC_FFAAC, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AAC, },
+ { { "AC3 (ffmpeg)", "ffac3", NULL, HB_ACODEC_AC3, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AC3, },
+ { { "MP3 (lame)", "lame", NULL, HB_ACODEC_LAME, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_MP3, },
+--- a/scripts/manicure.rb
++++ b/scripts/manicure.rb
+@@ -349,7 +349,7 @@
+ audioEncoders << "copy:dtshd"
+ when /AAC Pass/
+ audioEncoders << "copy:aac"
+- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
++ when "AAC (ffmpeg)", "AAC (avcodec)"
+ audioEncoders << "av_aac"
+ when "AAC (FDK)"
+ audioEncoders << "fdk_aac"
+@@ -466,7 +466,7 @@
+ case hash["AudioEncoderFallback"]
+ when /AC3/
+ audioEncoderFallback << "ac3"
+- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
++ when "AAC (ffmpeg)", "AAC (avcodec)"
+ audioEncoderFallback << "av_aac"
+ when "AAC (FDK)"
+ audioEncoderFallback << "fdk_aac"
+@@ -753,7 +753,7 @@
+ audioEncoders << "copy:dtshd"
+ when /AAC Pass/
+ audioEncoders << "copy:aac"
+- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
++ when "AAC (ffmpeg)", "AAC (avcodec)"
+ audioEncoders << "av_aac"
+ when "AAC (FDK)"
+ audioEncoders << "fdk_aac"
+@@ -870,7 +870,7 @@
+ case hash["AudioEncoderFallback"]
+ when /AC3/
+ audioEncoderFallback << "ac3"
+- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
++ when "AAC (ffmpeg)", "AAC (avcodec)"
+ audioEncoderFallback << "av_aac"
+ when "AAC (FDK)"
+ audioEncoderFallback << "fdk_aac"
+@@ -1163,7 +1163,7 @@
+ audioEncoders << "copy:dtshd"
+ when /AAC Pass/
+ audioEncoders << "copy:aac"
+- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
++ when "AAC (ffmpeg)", "AAC (avcodec)"
+ audioEncoders << "av_aac"
+ when "AAC (FDK)"
+ audioEncoders << "fdk_aac"
+@@ -1298,7 +1298,7 @@
+ case hash["AudioEncoderFallback"]
+ when /AC3/
+ audioEncoderFallback << "ac3"
+- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
++ when "AAC (ffmpeg)", "AAC (avcodec)"
+ audioEncoderFallback << "av_aac"
+ when "AAC (FDK)"
+ audioEncoderFallback << "fdk_aac"
+@@ -1615,7 +1615,7 @@
+ audioEncoders << "copy:dtshd"
+ when /AAC Pass/
+ audioEncoders << "copy:aac"
+- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
++ when "AAC (ffmpeg)", "AAC (avcodec)"
+ audioEncoders << "av_aac"
+ when "AAC (FDK)"
+ audioEncoders << "fdk_aac"
+@@ -1732,7 +1732,7 @@
+ case hash["AudioEncoderFallback"]
+ when /AC3/
+ audioEncoderFallback << "ac3"
+- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
++ when "AAC (ffmpeg)", "AAC (avcodec)"
+ audioEncoderFallback << "av_aac"
+ when "AAC (FDK)"
+ audioEncoderFallback << "fdk_aac"
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 00:42:30 +0000