main/ffmpeg: upgrade to 3.0

ref #5334

4 files changed, 91 insertions, 40 deletions

diff --git a/main/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch b/main/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch
new file mode 100644
index 0000000000..93e3ac9957
--- /dev/null
+++ b/main/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch
@@ -0,0 +1,55 @@
+From ab11be0becb90542f10d5713659b559842c53af2 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Tue, 29 Mar 2016 15:15:17 +0200
+Subject: [PATCH] libavutil: clean up unused FF_SYMVER macro
+
+There is nothing using it since commit d63443b9 (lavc: drop the
+av_fast_{re,m}alloc compatibility wrappers).
+
+Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
+---
+ libavutil/internal.h | 28 ----------------------------
+ 1 file changed, 28 deletions(-)
+
+diff --git a/libavutil/internal.h b/libavutil/internal.h
+index 61784b5..69d63d5 100644
+--- a/libavutil/internal.h
++++ b/libavutil/internal.h
+@@ -177,34 +177,6 @@
+ #endif
+ 
+ /**
+- * Define a function with only the non-default version specified.
+- *
+- * On systems with ELF shared libraries, all symbols exported from
+- * FFmpeg libraries are tagged with the name and major version of the
+- * library to which they belong.  If a function is moved from one
+- * library to another, a wrapper must be retained in the original
+- * location to preserve binary compatibility.
+- *
+- * Functions defined with this macro will never be used to resolve
+- * symbols by the build-time linker.
+- *
+- * @param type return type of function
+- * @param name name of function
+- * @param args argument list of function
+- * @param ver  version tag to assign function
+- */
+-#if HAVE_SYMVER_ASM_LABEL
+-#   define FF_SYMVER(type, name, args, ver)                     \
+-    type ff_##name args __asm__ (EXTERN_PREFIX #name "@" ver);  \
+-    type ff_##name args
+-#elif HAVE_SYMVER_GNU_ASM
+-#   define FF_SYMVER(type, name, args, ver)                             \
+-    __asm__ (".symver ff_" #name "," EXTERN_PREFIX #name "@" ver);      \
+-    type ff_##name args;                                                \
+-    type ff_##name args
+-#endif
+-
+-/**
+  * Return NULL if a threading library has not been enabled.
+  * Used to disable threading functions in AVCodec definitions
+  * when not needed.
+-- 
+2.7.4
+
diff --git a/main/ffmpeg/APKBUILD b/main/ffmpeg/APKBUILD
index b13275142d..c2ee9d145d 100644
--- a/main/ffmpeg/APKBUILD
+++ b/main/ffmpeg/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ffmpeg
-pkgver=2.8.5
+pkgver=3.0.1
 pkgrel=0
 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
 url="http://ffmpeg.org/"
@@ -14,8 +14,8 @@ makedepends="gnutls-dev lame-dev libvorbis-dev xvidcore-dev zlib-dev
 	v4l-utils-dev yasm opus-dev x265-dev"
 depends=
 source="http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2
-	configure-dlvsym.patch
-	fix-flv-extradata.patch
+	0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch
+	cflags-speed-O2.patch
 	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -83,12 +83,12 @@ libs() {
 	mv "$pkgdir"/usr/lib "$subpkgdir"/usr
 }
 
-md5sums="989d9024313c2b7e2eeaed58b751c0ee  ffmpeg-2.8.5.tar.bz2
-d041c60890392d80f74a567523f4c54d  configure-dlvsym.patch
-5f39e099cd7dfe71bb2f6b6615623d67  fix-flv-extradata.patch"
-sha256sums="3b6d9951533323ee64a21d0aa7667a780b3470bfe4e0fb7c1b33307ce290615a  ffmpeg-2.8.5.tar.bz2
-ffd6beadaea4cdbc1326fe396d8cd34b3efb791a865a32f64b3fe998b679c1d0  configure-dlvsym.patch
-8324bd3e154c151e64df36afd1edf05b8dc2dcd8e520208be0355a34b4209ad5  fix-flv-extradata.patch"
-sha512sums="2a46bef5ac99d114be7d3ece561ae71d09b87eaecba5da3c02ff1fe7e5cf4913e1b6feecca405540d1d70f9126591c209055edd7df1ad1d8bbf02f107701929e  ffmpeg-2.8.5.tar.bz2
-d9bb652093b1c2d03cead78bcafd59fc8305f36fe5359ac5d7caf038889f1239829e288c07e77a11bbef89de5fe54a5eae50a1c4718ec77137bb677ef9069e54  configure-dlvsym.patch
-d4d369055ef9ec8742f971786b05b89a5748a32cee711f623b71e8aea54b004bebda4e618017a351162647360632b13bcc7f09059938734e692ec841fe769c46  fix-flv-extradata.patch"
+md5sums="51ca580a64c0d2ecb6dba721b2744815  ffmpeg-3.0.1.tar.bz2
+627bb0f8b28063cd5d6a090b07bd3754  0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch
+91167b4f601db28836dcc3de9f756ed7  cflags-speed-O2.patch"
+sha256sums="f7f7052c120f494dd501f96becff9b5a4ae10cfbde97bc2f1e9f0fd6613a4984  ffmpeg-3.0.1.tar.bz2
+011f8beaf81074c9f4e522b699d27ee0ab74ec43f800286244a5b63b82ec5e8c  0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch
+ed75cdc99acb83b660a9e40b908adec896a9421228a620b016a22e7f647bd92b  cflags-speed-O2.patch"
+sha512sums="417ceba9ca3e179ee0c3c4fead7c55f4b6f074bc156516dd61dae0bee0f8f7b2fe79c06c7aa7a748fecba48b8ff96cc4c24d395a833064f1962698ac5fd5a9ad  ffmpeg-3.0.1.tar.bz2
+32652e18d4eb231a2e32ad1cacffdf33264aac9d459e0e2e6dd91484fced4e1ca5a62886057b1f0b4b1589c014bbe793d17c78adbaffec195f9a75733b5b18cb  0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch
+5ff940abb4265401eebb0f2fd486b51a004d62a480c5a64bc279149731b577b5c95f0b7ff2d73429ec10b1f0b76ecf7fa466b02ba3a0bf79d9b7ac2ae87ee5d5  cflags-speed-O2.patch"
diff --git a/main/ffmpeg/cflags-speed-O2.patch b/main/ffmpeg/cflags-speed-O2.patch
new file mode 100644
index 0000000000..d09ca1cbe3
--- /dev/null
+++ b/main/ffmpeg/cflags-speed-O2.patch
@@ -0,0 +1,24 @@
+gcc fails if we compile with -O3
+
+libavcodec/sbrdsp.c: In function 'sbr_neg_odd_64_c':
+libavcodec/sbrdsp.c:47:13: internal compiler error: in vect_analyze_data_ref_accesses, at tree-vect-data-refs.c:2596
+ static void sbr_neg_odd_64_c(float *x)
+             ^
+
+We work around it by using -O2 which is more sane.
+
+http://bugs.alpinelinux.org/issues/5334
+
+diff --git a/configure b/configure
+index 5e788ac..aa34f9b 100755
+--- a/configure
++++ b/configure
+@@ -3795,7 +3795,7 @@ probe_cc(){
+                 warn "gcc 4.2 is outdated and may miscompile FFmpeg. Please use a newer compiler." ;;
+             esac
+         fi
+-        _cflags_speed='-O3'
++        _cflags_speed='-O2'
+         _cflags_size='-Os'
+     elif $_cc --version 2>/dev/null | grep -q ^icc; then
+         _type=icc
diff --git a/main/ffmpeg/configure-dlvsym.patch b/main/ffmpeg/configure-dlvsym.patch
deleted file mode 100644
index 0e74e45b5c..0000000000
--- a/main/ffmpeg/configure-dlvsym.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- ./configure.orig
-+++ ./configure
-@@ -1680,6 +1680,7 @@
-     CoTaskMemFree
-     CryptGenRandom
-     dlopen
-+    dlvsym
-     fcntl
-     flt_lim
-     fork
-@@ -4997,14 +4998,15 @@
-                   -Wl,--wrap,sws_scale ||
-     disable xmm_clobber_test
- 
-+check_func dlvsym -lld
- echo "X{};" > $TMPV
- if test_ldflags -Wl,--version-script,$TMPV; then
-     append SHFLAGS '-Wl,--version-script,\$(SUBDIR)lib\$(NAME).ver'
--    check_cc <<EOF && enable symver_asm_label
-+    enabled dlvsym && check_cc <<EOF && enable symver_asm_label
- void ff_foo(void) __asm__ ("av_foo@VERSION");
- void ff_foo(void) { ${inline_asm+__asm__($quotes);} }
- EOF
--    check_cc <<EOF && enable symver_gnu_asm
-+    enabled dlvsym && check_cc <<EOF && enable symver_gnu_asm
- __asm__(".symver ff_foo,av_foo@VERSION");
- void ff_foo(void) {}
- EOF