Initial revision

4 files changed, 120 insertions, 0 deletions

diff --git a/vlc/build/ffmpeg_vpx_removed_ids.patch b/vlc/build/ffmpeg_vpx_removed_ids.patch
new file mode 100644
index 00000000..15d2600d
--- /dev/null
+++ b/vlc/build/ffmpeg_vpx_removed_ids.patch
@@ -0,0 +1,41 @@
+From 6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab Mon Sep 17 00:00:00 2001
+From: James Zern <jzern@google.com>
+Date: Mon, 19 Oct 2015 22:44:11 -0700
+Subject: [PATCH] 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 <michael@niedermayer.cc>
+Signed-off-by: James Zern <jzern@google.com>
+---
+ 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",
+-- 
+1.7.10.4
+
diff --git a/vlc/build/goom-2k4-0.noxmms.patch b/vlc/build/goom-2k4-0.noxmms.patch
new file mode 100644
index 00000000..c33bfbcc
--- /dev/null
+++ b/vlc/build/goom-2k4-0.noxmms.patch
@@ -0,0 +1,10 @@
+--- goom2k4-0/configure.in.orig	2005-02-07 14:46:41.000000000 +0100
++++ goom2k4-0/configure.in	2016-02-11 12:43:04.245261717 +0100
+@@ -20,6 +20,7 @@
+ dnl *** check for xmms ***

+ 

+ AM_PATH_XMMS2(0.9.5.1, HAVE_XMMS="yes", HAVE_XMMS="no")

++HAVE_XMMS="no"

+ AM_CONDITIONAL(HAVE_XMMS,test "x$HAVE_XMMS" = "xyes")

+ 

+ 

diff --git a/vlc/build/lame_x86-xmmintrin.patch b/vlc/build/lame_x86-xmmintrin.patch
new file mode 100644
index 00000000..a30ea157
--- /dev/null
+++ b/vlc/build/lame_x86-xmmintrin.patch
@@ -0,0 +1,31 @@
+#
+# Slightly modified version of handbrake's contrib/lame/A00-xmmintrin.patch
+# https://github.com/HandBrake/HandBrake/blob/master/contrib/lame/A00-xmmintrin.patch
+#
+--- lame-3.99.5/configure.orig	2012-02-28 19:54:37.000000000 +0100
++++ lame-3.99.5/configure	2015-10-06 23:18:10.377733885 +0200
+@@ -11913,6 +11913,15 @@
+ 
+ fi
+ 
++case $host_cpu in
++powerpc*|i?86*)
++    check_xmmintrin=
++    ;;
++*)
++    check_xmmintrin="xmmintrin.h"
++    ;;
++esac
++
+ for ac_header in \
+ 		 errno.h \
+ 		 fcntl.h \
+@@ -11922,7 +11931,7 @@
+ 		 sys/soundcard.h \
+ 		 sys/time.h \
+ 		 unistd.h \
+-		 xmmintrin.h \
++		 $check_xmmintrin \
+ 		 linux/soundcard.h
+ do :
+   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
diff --git a/vlc/build/libass_fix_iconv.patch b/vlc/build/libass_fix_iconv.patch
new file mode 100644
index 00000000..419e38e8
--- /dev/null
+++ b/vlc/build/libass_fix_iconv.patch
@@ -0,0 +1,38 @@
+Downloaded from http://git.videolan.org/?p=vlc/vlc-2.2.git;a=blob_plain;f=contrib/src/ass/e572a26.patch;hb=HEAD
+
+From e572a26d29ddff883880ef7b1c295acaa62a8a2f Mon Sep 17 00:00:00 2001
+From: wm4 <wm4@nowhere>
+Date: Tue, 13 Oct 2015 22:18:30 +0200
+Subject: [PATCH] configure: include -liconv if that is found
+
+---
+ configure.ac | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index d6fbe34..6bd96b6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -22,8 +22,9 @@ AC_CHECK_HEADERS([stdint.h iconv.h])
+ AC_CHECK_FUNCS([strdup strndup])
+ 
+ # Checks for libraries.
+-AC_SEARCH_LIBS([libiconv_open], [iconv], AC_DEFINE(CONFIG_ICONV, 1, [use iconv]))
+-AC_SEARCH_LIBS([iconv_open], [iconv], AC_DEFINE(CONFIG_ICONV, 1, [use iconv]))
++use_libiconv=false
++AC_SEARCH_LIBS([libiconv_open], [iconv], use_libiconv=true)
++AC_SEARCH_LIBS([iconv_open], [iconv], use_libiconv=true)
+ AC_CHECK_LIB([m], [fabs])
+ 
+ # Check for libraries via pkg-config
+@@ -220,6 +221,10 @@ AM_CONDITIONAL([ENABLE_PROFILE], [test x$enable_profile = xyes])
+ 
+ # add libraries/packages to pkg-config for static linking
+ pkg_libs="-lm"
++if test "$use_libiconv" = true; then
++    AC_DEFINE(CONFIG_ICONV, 1, [use iconv])
++    pkg_libs="${pkg_libs} -liconv"
++fi
+ pkg_requires="freetype2 >= 9.10.3"
+ pkg_requires="fribidi >= 0.19.0, ${pkg_requires}"
+ if test x$fontconfig = xtrue; then