Update to 1.0.1, use static linking as upstream

5 files changed, 14 insertions, 132 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0ac662efd7bf..ec6cac07d5b4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu Dec 29 11:35:34 UTC 2016
+# Sat Dec 31 14:29:52 UTC 2016
 pkgbase = handbrake-fdkaac
-	pkgver = 1.0.0
-	pkgrel = 4
+	pkgver = 1.0.1
+	pkgrel = 1
 	url = https://handbrake.fr/
 	arch = i686
 	arch = x86_64
@@ -28,24 +28,13 @@ pkgbase = handbrake-fdkaac
 	makedepends = cmake
 	makedepends = libtheora
 	makedepends = libsamplerate
-	makedepends = ffmpeg
 	makedepends = x264
 	makedepends = libx264
-	makedepends = x265
-	makedepends = libvpx
-	makedepends = libdvdnav
 	makedepends = jansson
 	makedepends = librsvg
 	makedepends = libgudev
-	makedepends = libfdk-aac
-	source = https://handbrake.fr/mirror/HandBrake-1.0.0.tar.bz2
-	source = handbarke-fix-crash-during-2-pass-encode.patch
-	source = handbrake-fix-2-pass-vp8-and-vp9-encoding.patch
-	source = handbrake-fix-missing-x265-link-flag.patch
-	sha256sums = 15fb4593c70d75621212e4499f018c3c93d7ce39f1083bf527d4616ded0044c5
-	sha256sums = aaa09e9b3dbad54024f02afe8ace5390b281c7cc6aae80cf26d43f773b2d19f7
-	sha256sums = 1b6d800acde0cc2c7e6080f23f2ddd435257c5a2d853acdeb4e4a6fada856310
-	sha256sums = 05e212e76b6e0b94a04de02cbeb7bf9db607059e19297b5bd3d0d143135285c4
+	source = https://handbrake.fr/mirror/HandBrake-1.0.1.tar.bz2
+	sha256sums = af4badcdf56465abc798e5e11fe0e437e23ea89bbee20798408980a34c4d5876
 
 pkgname = handbrake-fdkaac
 	pkgdesc = Multithreaded video transcoder
@@ -65,17 +54,12 @@ pkgname = handbrake-fdkaac
 	depends = libvorbis
 	depends = libtheora
 	depends = libsamplerate
-	depends = ffmpeg
 	depends = libx264
-	depends = x265
-	depends = libvpx
-	depends = libdvdnav
 	depends = jansson
 	depends = librsvg
 	depends = libgudev
 	depends = desktop-file-utils
 	depends = hicolor-icon-theme
-	depends = libfdk-aac
 	optdepends = gst-plugins-good: for video previews
 	optdepends = gst-libav: for video previews
 	conflicts = handbrake
@@ -91,12 +75,7 @@ pkgname = handbrake-cli-fdkaac
 	depends = libxml2
 	depends = libtheora
 	depends = libsamplerate
-	depends = ffmpeg
 	depends = libx264
-	depends = x265
-	depends = libvpx
-	depends = libdvdnav
 	depends = jansson
-	depends = libfdk-aac
 	conflicts = handbrake-cli
 
diff --git a/PKGBUILD b/PKGBUILD
index 9672d1cc8f40..8f062ad883c8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,42 +4,18 @@
 # Contributor: Sebastien Piccand <sebcactus gmail com>
 
 pkgname=('handbrake-fdkaac' 'handbrake-cli-fdkaac')
-pkgver=1.0.0
-pkgrel=4
+pkgver=1.0.1
+pkgrel=1
 arch=('i686' 'x86_64')
 url="https://handbrake.fr/"
 license=('GPL')
 makedepends=('intltool' 'python2' 'yasm' 'wget' 'bzip2' 'gcc-libs' 'libnotify'
              'gst-plugins-base' 'gtk3' 'dbus-glib' 'fribidi' 'libass' 'lame'
              'fontconfig' 'freetype2' 'libxml2' 'libogg' 'libvorbis' 'cmake'
-             'libtheora' 'libsamplerate' 'ffmpeg' 'x264' 'libx264' 'x265'
-             'libvpx' 'libdvdnav' 'jansson' 'librsvg' 'libgudev' 'libfdk-aac')
-source=(https://handbrake.fr/mirror/HandBrake-$pkgver.tar.bz2
-        handbarke-fix-crash-during-2-pass-encode.patch
-        handbrake-fix-2-pass-vp8-and-vp9-encoding.patch
-        handbrake-fix-missing-x265-link-flag.patch)
-sha256sums=('15fb4593c70d75621212e4499f018c3c93d7ce39f1083bf527d4616ded0044c5'
-            'aaa09e9b3dbad54024f02afe8ace5390b281c7cc6aae80cf26d43f773b2d19f7'
-            '1b6d800acde0cc2c7e6080f23f2ddd435257c5a2d853acdeb4e4a6fada856310'
-            '05e212e76b6e0b94a04de02cbeb7bf9db607059e19297b5bd3d0d143135285c4')
-
-prepare() {
-  cd "$srcdir/HandBrake-$pkgver"
-
-  # https://github.com/HandBrake/HandBrake/commit/e159ab1662ba#commitcomment-20303756
-  patch -Np1 -i ../handbarke-fix-crash-during-2-pass-encode.patch
-  # https://github.com/HandBrake/HandBrake/issues/449#issuecomment-269352579
-  patch -Np1 -i ../handbrake-fix-2-pass-vp8-and-vp9-encoding.patch
-
-  # https://bugs.gentoo.org/show_bug.cgi?id=552792
-  patch -Np1 -i ../handbrake-fix-missing-x265-link-flag.patch
-
-  # Use more system libs
-  # Bundled libbluray is kept because it is patched locally
-  for _lib in ffmpeg x265 libvpx libdvdnav libdvdread; do
-    sed -i "/MODULES += contrib\/$_lib/d" make/include/main.defs
-  done
-}
+             'libtheora' 'libsamplerate' 'x264' 'libx264' 'jansson' 'librsvg'
+             'libgudev')
+source=(https://handbrake.fr/mirror/HandBrake-$pkgver.tar.bz2)
+sha256sums=('af4badcdf56465abc798e5e11fe0e437e23ea89bbee20798408980a34c4d5876')
 
 build() {
   cd "$srcdir/HandBrake-$pkgver"
@@ -56,9 +32,8 @@ package_handbrake-fdkaac() {
   conflicts=('handbrake')
   depends=('bzip2' 'gcc-libs' 'gst-plugins-base' 'libnotify' 'dbus-glib'
            'fribidi' 'libass' 'lame' 'gtk3' 'fontconfig' 'freetype2' 'libxml2'
-           'libogg' 'libvorbis' 'libtheora' 'libsamplerate' 'ffmpeg' 'libx264'
-           'x265' 'libvpx' 'libdvdnav' 'jansson' 'librsvg' 'libgudev'
-           'desktop-file-utils' 'hicolor-icon-theme' 'libfdk-aac')
+           'libogg' 'libvorbis' 'libtheora' 'libsamplerate' 'libx264' 'jansson'
+           'librsvg' 'libgudev' 'desktop-file-utils' 'hicolor-icon-theme')
   optdepends=('gst-plugins-good: for video previews'
               'gst-libav: for video previews')
 
@@ -72,8 +47,7 @@ package_handbrake-cli-fdkaac() {
   pkgdesc="Multithreaded video transcoder (CLI)"
   conflicts=('handbrake-cli')
   depends=('bzip2' 'gcc-libs' 'zlib' 'fribidi' 'libass' 'lame' 'libxml2'
-           'libtheora' 'libsamplerate' 'ffmpeg' 'libx264' 'x265' 'libvpx'
-           'libdvdnav' 'jansson' 'libfdk-aac')
+           'libtheora' 'libsamplerate' 'libx264' 'jansson')
 
   cd "$srcdir/HandBrake-$pkgver/build"
   install -D HandBrakeCLI "$pkgdir/usr/bin/HandBrakeCLI"
diff --git a/handbarke-fix-crash-during-2-pass-encode.patch b/handbarke-fix-crash-during-2-pass-encode.patch
deleted file mode 100644
index 7fe101045038..000000000000
--- a/handbarke-fix-crash-during-2-pass-encode.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 3b9c9a263f7ffa959d56d914c62df18c9567c0db Mon Sep 17 00:00:00 2001
-From: John Stebbins <jstebbins.hb@gmail.com>
-Date: Tue, 27 Dec 2016 08:56:25 -0800
-Subject: [PATCH] encavcodec: fix crash during 2 pass encode
-
-This affect mpeg4, mpeg2, vp8 and vp9 encoding
----
- libhb/encavcodec.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libhb/encavcodec.c b/libhb/encavcodec.c
-index d7a751e..0543fe4 100644
---- a/libhb/encavcodec.c
-+++ b/libhb/encavcodec.c
-@@ -352,10 +352,10 @@ int encavcodecInit( hb_work_object_t * w, hb_job_t * job )
-     }
- 
-     if (job->pass_id == HB_PASS_ENCODE_1ST &&
--        pv->context->stats_out != NULL)
-+        context->stats_out != NULL)
-     {
-         // Some encoders may write stats during init in avcodec_open
--        fprintf(pv->file, "%s", pv->context->stats_out);
-+        fprintf(pv->file, "%s", context->stats_out);
-     }
- 
-     // avcodec_open populates the opts dictionary with the
diff --git a/handbrake-fix-2-pass-vp8-and-vp9-encoding.patch b/handbrake-fix-2-pass-vp8-and-vp9-encoding.patch
deleted file mode 100644
index cd506bc82fe7..000000000000
--- a/handbrake-fix-2-pass-vp8-and-vp9-encoding.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d64dba737d0136b58545be33c50db093df1880c1 Mon Sep 17 00:00:00 2001
-From: John Stebbins <jstebbins.hb@gmail.com>
-Date: Tue, 27 Dec 2016 08:57:06 -0800
-Subject: [PATCH] encavcodec: fix 2 pass vp8 and vp9 encoding
-
-libvpx only supplies the stats upon the final flush of the encoder.  So
-we must also write stats after final flush.
----
- libhb/encavcodec.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/libhb/encavcodec.c b/libhb/encavcodec.c
-index 0543fe4..591aa4f 100644
---- a/libhb/encavcodec.c
-+++ b/libhb/encavcodec.c
-@@ -610,6 +610,15 @@ static void Flush( hb_work_object_t * w, hb_buffer_list_t * list )
-     hb_work_private_t * pv = w->private_data;
- 
-     avcodec_send_frame(pv->context, NULL);
-+
-+    // Write stats
-+    // vpx only writes stats at final flush
-+    if (pv->job->pass_id == HB_PASS_ENCODE_1ST &&
-+        pv->context->stats_out != NULL)
-+    {
-+        fprintf( pv->file, "%s", pv->context->stats_out );
-+    }
-+
-     get_packets(w, list);
- }
- 
diff --git a/handbrake-fix-missing-x265-link-flag.patch b/handbrake-fix-missing-x265-link-flag.patch
deleted file mode 100644
index a963fe0af216..000000000000
--- a/handbrake-fix-missing-x265-link-flag.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Written by: Peter Foley <pefoley2@pefoley.com>
-Gentoo Bug: #552792
-
---- a/test/module.defs
-+++ b/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))