diff options
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/libbluray/A00-automake.patch | 12 | ||||
-rw-r--r-- | contrib/libbluray/A02-gnu99.patch | 42 | ||||
-rw-r--r-- | contrib/libbluray/A02-m2ts-trace.patch | 15 | ||||
-rw-r--r-- | contrib/libbluray/module.defs | 4 |
4 files changed, 16 insertions, 57 deletions
diff --git a/contrib/libbluray/A00-automake.patch b/contrib/libbluray/A00-automake.patch deleted file mode 100644 index 20f7d8805..000000000 --- a/contrib/libbluray/A00-automake.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur libbluray-0.2.3.orig/configure.ac libbluray-0.2.3/configure.ac ---- libbluray-0.2.3.orig/configure.ac 2012-08-17 07:27:32.000000000 -0400 -+++ libbluray-0.2.3/configure.ac 2013-01-28 23:52:04.000000000 -0500 -@@ -22,7 +22,7 @@ - AC_CONFIG_MACRO_DIR([m4]) - AC_CANONICAL_SYSTEM - AM_INIT_AUTOMAKE([foreign tar-ustar]) --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADER(config.h) - - case "${host_os}" in - "") diff --git a/contrib/libbluray/A02-gnu99.patch b/contrib/libbluray/A02-gnu99.patch deleted file mode 100644 index 0ac5a655f..000000000 --- a/contrib/libbluray/A02-gnu99.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- libbluray-0.2.3/src/Makefile.am.bak Fri Aug 17 07:27:32 2012 -+++ libbluray-0.2.3/src/Makefile.am Thu Nov 28 00:46:47 2013 -@@ -8,7 +8,7 @@ - SET_DEBUG_OPTS = @SET_DEBUG_OPTS@ - SET_INCLUDES = -I$(top_srcdir) -Ifile -Ilibbluray/bdnav - --AM_CFLAGS = -std=c99 $(SET_FEATURES) $(SET_WARNINGS) $(SET_OPTIMIZATIONS) \ -+AM_CFLAGS = -std=gnu99 $(SET_FEATURES) $(SET_WARNINGS) $(SET_OPTIMIZATIONS) \ - $(SET_DEBUG_OPTS) $(SET_INCLUDES) $(LIBXML2_CFLAGS) - CFLAGS=$(shell test -z "$$CFLAGS" || echo "$$CFLAGS") - ---- libbluray-0.2.3/src/Makefile.in.bak Fri Aug 17 07:31:46 2012 -+++ libbluray-0.2.3/src/Makefile.in Thu Nov 28 00:46:47 2013 -@@ -353,7 +353,7 @@ - SUBDIRS = . examples - SET_FEATURES = -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200809L -D_REENTRANT - SET_INCLUDES = -I$(top_srcdir) -Ifile -Ilibbluray/bdnav --AM_CFLAGS = -std=c99 $(SET_FEATURES) $(SET_WARNINGS) \ -+AM_CFLAGS = -std=gnu99 $(SET_FEATURES) $(SET_WARNINGS) \ - $(SET_OPTIMIZATIONS) $(SET_DEBUG_OPTS) $(SET_INCLUDES) \ - $(LIBXML2_CFLAGS) $(am__append_2) - SOURCES_bdj = libbluray/bdj/bdj.h \ ---- libbluray-0.2.3/configure.ac.bak Fri Aug 17 07:27:32 2012 -+++ libbluray-0.2.3/configure.ac Thu Nov 28 01:18:14 2013 -@@ -163,13 +163,13 @@ - # function testing for supported compiler options - check_cc_options() - { -- local tmpfile=$(mktemp XXXXXXXXXX) -- local tmpcfile="$tmpfile.c" -+ tmpfile=$(mktemp XXXXXXXXXX) -+ tmpcfile="$tmpfile.c" - mv $tmpfile $tmpcfile -- local retval=1 -+ retval=1 - printf "Checking if compiler supports $@... " - if $CC -c $@ $tmpcfile -o /dev/null >/dev/null 2>&1; then -- local retval=0 -+ retval=0 - fi - rm $tmpcfile - if [[ $retval = "0" ]]; then diff --git a/contrib/libbluray/A02-m2ts-trace.patch b/contrib/libbluray/A02-m2ts-trace.patch new file mode 100644 index 000000000..8f98689b2 --- /dev/null +++ b/contrib/libbluray/A02-m2ts-trace.patch @@ -0,0 +1,15 @@ +diff --git a/src/libbluray/decoders/m2ts_filter.c b/src/libbluray/decoders/m2ts_filter.c +index 38fa37c..200f9cd 100644 +--- a/src/libbluray/decoders/m2ts_filter.c ++++ b/src/libbluray/decoders/m2ts_filter.c +@@ -30,8 +30,8 @@ + #include <stdlib.h> + #include <string.h> + +-#define M2TS_TRACE(...) BD_DEBUG(DBG_CRIT,__VA_ARGS__) +-//#define M2TS_TRACE(...) do {} while(0) ++//#define M2TS_TRACE(...) BD_DEBUG(DBG_CRIT,__VA_ARGS__) ++#define M2TS_TRACE(...) do {} while(0) + + /* + * diff --git a/contrib/libbluray/module.defs b/contrib/libbluray/module.defs index df51564c9..cdffe8515 100644 --- a/contrib/libbluray/module.defs +++ b/contrib/libbluray/module.defs @@ -1,9 +1,7 @@ $(eval $(call import.MODULE.defs,LIBBLURAY,libbluray,LIBXML2)) $(eval $(call import.CONTRIB.defs,LIBBLURAY)) -LIBBLURAY.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libbluray-0.2.3.tar.bz2 - -LIBBLURAY.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache; ./bootstrap; +LIBBLURAY.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libbluray-0.5.0.tar.bz2 ifneq (max,$(LIBBLURAY.GCC.g)) LIBBLURAY.CONFIGURE.extra += --disable-debug |