summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
Diffstat (limited to 'libre')
-rw-r--r--libre/handbrake/PKGBUILD18
-rw-r--r--libre/handbrake/libav-fix_libvpxenc.patch22
2 files changed, 33 insertions, 7 deletions
diff --git a/libre/handbrake/PKGBUILD b/libre/handbrake/PKGBUILD
index cace5f357..3b401a70e 100644
--- a/libre/handbrake/PKGBUILD
+++ b/libre/handbrake/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=('handbrake' 'handbrake-cli')
pkgver=0.10.2
-pkgrel=3.parabola1
+pkgrel=4.parabola1
url="http://handbrake.fr/"
license=('GPL')
@@ -13,7 +13,8 @@ arch=('i686' 'x86_64' 'armv7h')
depends=('gcc-libs')
_gui_depends=('libnotify' 'dbus-glib' 'gtk3' 'gst-plugins-base')
makedepends=('intltool' 'python2' "${_gui_depends[@]}")
-source=(https://handbrake.fr/mirror/HandBrake-$pkgver.tar.bz2)
+source=(https://handbrake.fr/mirror/HandBrake-$pkgver.tar.bz2
+ libav-fix_libvpxenc.patch)
# HandBrake has a bunch of dependencies that may be either pacman
# packages, or built in the contrib/ directory as "modules". This is
@@ -62,15 +63,20 @@ makedepends+=('yasm') # module if FEATURE.local_yasm
depends+=("${_depends[@]#*:}")
source+=("${_modules[@]/#*:/http://download.handbrake.fr/handbrake/contrib/}")
-noextract+=("${_modules[@]#*:}")
+#noextract+=("${_modules[@]#*:}")
# Lock the specific version of libx264, as it changes often.
depends+=('libx264.so')
sha256sums=('4cc3828393b26a982dbe00febd700c5090d3443c1d45492e0b373e02da73c699'
+ 'fabf99d9492345af058c502e83b613b23f939c7f9092c9e80aa260b72cbed595'
'bc3807426d4e73fe8c245730b0df4ba95766cf7e17e47c738ee302f73d066ac9')
prepare() {
+ # Fixing libav
+ cd "$srcdir/libav-v10.1"
+ patch -Np1 -i ../libav-fix_libvpxenc.patch
+
cd "$srcdir/HandBrake-$pkgver"
local dep
@@ -83,11 +89,9 @@ prepare() {
done
echo 'TEST.GCC.l += fdk-aac x265' >> test/module.defs
- # Use the pre-downloaded files
+ # Use the libav patched
mkdir -p download
- for dep in "${_modules[@]}"; do
- ln -srf "${srcdir}/${dep[@]#*:}" download/
- done
+ bsdtar -cjf download/libav-v10.1.tar.bz2 -C .. libav-v10.1
}
build() {
diff --git a/libre/handbrake/libav-fix_libvpxenc.patch b/libre/handbrake/libav-fix_libvpxenc.patch
new file mode 100644
index 000000000..01536ab41
--- /dev/null
+++ b/libre/handbrake/libav-fix_libvpxenc.patch
@@ -0,0 +1,22 @@
+--- libav-v10.1.orig/libavcodec/libvpxenc.c 2014-05-10 11:03:46.000000000 -0500
++++ libav-v10.1/libavcodec/libvpxenc.c 2015-12-12 05:20:25.659521508 -0500
+@@ -70,19 +70,11 @@
+
+ /** 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",