jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-08-01 15:07:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

xbmc:

Browse Source 
- reorganization and splitting of all patches
This commit is contained in:
Stephan Raue 2010-03-28 21:30:25 +02:00
parent d30bf35dba
commit cf7ef68efa
27 changed files with 374 additions and 331 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

187
packages/mediacenter/xbmc/patches/010_xbmc-crosscompile_add_host_and_build_to_configures-0.3.1.diff
View File

@ -1,187 +0,0 @@
diff -Naur xbmc-28745/configure.in xbmc-28745.patch/configure.in
--- xbmc-28745/configure.in 2010-03-22 06:50:58.000000000 +0100
+++ xbmc-28745.patch/configure.in 2010-03-22 13:17:49.917999744 +0100
@@ -24,6 +24,10 @@
AC_CANONICAL_HOST
+tolower(){
+ echo "$@" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz
+}
+
# General message strings
configure_debug="ERROR: this is a configure debug statement"
missing_library="Could not find a required library. Please see the README for your platform."
@@ -102,6 +106,18 @@
[use_debug=$enableval],
[use_debug=yes])
+AC_ARG_WITH([arch],
+ [AS_HELP_STRING([--with-arch],
+ [build with given arch passing to internal ffmpeg (default is no, needed for crosscompiling)])],
+ [use_arch=$withval],
+ [use_arch=no])
+
+AC_ARG_WITH([cpu],
+ [AS_HELP_STRING([--with-cpu],
+ [build with given cpu passing to ffmpeg (default is no)])],
+ [use_cpu=$withval],
+ [use_cpu=no])
+
AC_ARG_ENABLE([optimizations],
[AS_HELP_STRING([--enable-optimizations],
[enable optimization (default is yes)])],
@@ -805,6 +821,15 @@
fi
fi
+if test "$cross_compiling" = "yes"; then
+ final_message="$final_message\n Crosscomp.:\tYes"
+else
+ final_message="$final_message\n Crosscomp.:\tNo"
+fi
+
+final_message="$final_message\n target ARCH:\t$use_arch"
+final_message="$final_message\n target CPU:\t$use_cpu"
+
if test "$use_optimizations" = "yes"; then
final_message="$final_message\n Optimization:\tYes"
CXXFLAGS="$CXXFLAGS -O2"
@@ -1154,7 +1179,9 @@
cp pyconfig.h Include
else
./configure \
- --enable-ipv6 \
+ --host=$host_alias \
+ --build=$build_alias \
+ --disable-ipv6 \
--enable-unicode=ucs4 \
--without-cxx \
--enable-shared \
@@ -1217,6 +1244,10 @@
./configure \
--disable-static \
`if test "$use_debug" = "no"; then echo --disable-debug; fi` \
+ `if test "$cross_compiling" = "yes"; then echo --enable-cross-compile; fi` \
+ `if test "$use_arch" != "no"; then echo --arch=$use_arch; fi`\
+ `if test "$use_cpu" != "no"; then echo --cpu=$use_cpu; fi`\
+ --target-os=$(tolower $(uname -s)) \
--disable-muxers \
--enable-muxer=spdif \
--enable-muxer=adts \
@@ -1233,6 +1264,7 @@
--enable-postproc \
--enable-gpl \
`if test "$use_vdpau" = "yes"; then echo --enable-vdpau; else echo --disable-vdpau; fi` \
+ --disable-vaapi \
--enable-libfaad \
--enable-protocol=http \
--enable-pthreads \
@@ -1252,6 +1284,8 @@
--disable-win
else
./configure \
+ --host=$host_alias \
+ --build=$build_alias \
--disable-oss \
--disable-solaris-audio \
--disable-al-audio \
@@ -1269,6 +1303,8 @@
--with-pic
else
./configure \
+ --host=$host_alias \
+ --build=$build_alias \
--disable-doc \
--enable-static \
--with-pic
@@ -1287,6 +1323,8 @@
cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
else
./configure2 \
+ --host=$host_alias \
+ --build=$build_alias \
--extra-cflags="$CFLAGS $DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../libdvdcss/src" \
--prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
--enable-static \
@@ -1312,6 +1350,8 @@
--cc="$CC"
else
./configure2 \
+ --host=$host_alias \
+ --build=$build_alias \
--extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../includes" \
--extra-ldflags="-L`pwd`/../libdvdread/obj" \
--with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \
@@ -1344,6 +1384,8 @@
--disable-al-audio
else
./configure \
+ --host=$host_alias \
+ --build=$build_alias \
--with-pic \
--disable-static \
--enable-shared \
@@ -1379,7 +1421,9 @@
./configure MACOSX_DEPLOYMENT_TARGET=10.4
else
CFLAGS="$CFLAGS -fPIC" \
- ./configure
+ ./configure \
+ --host=$host_alias \
+ --build=$build_alias
fi
], [$USE_EXTERNAL_LIBASS])
@@ -1393,6 +1437,8 @@
--with-pic
else
./configure \
+ --host=$host_alias \
+ --build=$build_alias \
CPPFLAGS="$CPPFLAGS" \
CFLAGS="$CFLAGS -fPIC" \
CXXFLAGS="$CXXFLAGS -fPIC" \
@@ -1419,6 +1465,8 @@
XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
if test "$host_vendor" != "apple" ; then
./configure \
+ --host=$host_alias \
+ --build=$build_alias \
CPPFLAGS="$CPPFLAGS" \
CFLAGS="$CFLAGS -fPIC" \
CXXFLAGS="$CXXFLAGS -fPIC" \
@@ -1449,6 +1497,8 @@
--disable-skyrocket
else
./configure \
+ --host=$host_alias \
+ --build=$build_alias \
CPPFLAGS="$CPPFLAGS" \
CFLAGS="$CFLAGS -fPIC" \
CXXFLAGS="$CXXFLAGS -fPIC" \
@@ -1468,9 +1518,11 @@
XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [
if test "$host_vendor" = "apple" ; then
- ./configure --with-ssl-dir=/opt/local/include
+ ./configure --with-ssl-dir=/opt/local/include
else
- ./configure --without-openssl
+ ./configure --without-openssl \
+ --host=$host_alias \
+ --build=$build_alias
fi
], [0])
@@ -1479,7 +1531,9 @@
CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -fno-common" \
./configure MACOSX_DEPLOYMENT_TARGET=10.4 --disable-shared
else
- ./configure
+ ./configure \
+ --host=$host_alias \
+ --build=$build_alias
fi
], [0])

49
packages/mediacenter/xbmc/patches/010_xbmc-crosscompile_add_option_to_set_and_use_ARCH_and_CPU-0.1.diff Normal file
View File

@ -0,0 +1,49 @@
diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in
--- xbmc-28910/configure.in 2010-03-28 17:12:32.000000000 +0200
+++ xbmc-28910.patch/configure.in 2010-03-28 19:39:55.720627540 +0200
@@ -10,6 +10,10 @@
AM_INIT_AUTOMAKE([foreign])
AC_CANONICAL_HOST
+tolower(){
+ echo "$@" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz
+}
+
# General message strings
configure_debug="ERROR: this is a configure debug statement"
missing_library="Could not find a required library. Please see the README for your platform."
@@ -88,6 +92,18 @@
[use_debug=$enableval],
[use_debug=yes])
+AC_ARG_WITH([arch],
+ [AS_HELP_STRING([--with-arch],
+ [build with given arch passing to internal ffmpeg (default is no, needed for crosscompiling)])],
+ [use_arch=$withval],
+ [use_arch=no])
+
+AC_ARG_WITH([cpu],
+ [AS_HELP_STRING([--with-cpu],
+ [build with given cpu passing to ffmpeg (default is no)])],
+ [use_cpu=$withval],
+ [use_cpu=no])
+
AC_ARG_ENABLE([optimizations],
[AS_HELP_STRING([--enable-optimizations],
[enable optimization (default is yes)])],
@@ -791,6 +807,15 @@
fi
fi
+if test "$cross_compiling" = "yes"; then
+ final_message="$final_message\n Crosscomp.:\tYes"
+else
+ final_message="$final_message\n Crosscomp.:\tNo"
+fi
+
+final_message="$final_message\n target ARCH:\t$use_arch"
+final_message="$final_message\n target CPU:\t$use_cpu"
+
if test "$use_optimizations" = "yes"; then
final_message="$final_message\n Optimization:\tYes"
CXXFLAGS="$CXXFLAGS -O2"

29
packages/mediacenter/xbmc/patches/013_xbmc-correct_lzo_include-0.1.diff
View File

@ -1,29 +0,0 @@
diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
--- xbmc-27135/configure.in 2010-01-24 13:07:18.024733190 +0100
+++ xbmc-27135.patch/configure.in 2010-01-24 13:07:39.324609701 +0100
@@ -894,12 +894,6 @@
final_message="$final_message\n MID Support:\tNo"
fi
-if test -d "/usr/include/lzo"; then
- INCLUDES="$INCLUDES -I/usr/include/lzo"
-else
- INCLUDES="$INCLUDES"
-fi
-
if test "$use_ccache" = "yes"; then
if test "$ac_cv_path_CCACHE" = "none"; then
echo "ccache not found. Falling back to default CC"
diff -Naur xbmc-27135/configure.in.orig xbmc-27135.patch/configure.in.orig
diff -Naur xbmc-27135/tools/TexturePacker/XBMCTex.cpp xbmc-27135.patch/tools/TexturePacker/XBMCTex.cpp
--- xbmc-27135/tools/TexturePacker/XBMCTex.cpp 2010-01-24 11:48:16.696641003 +0100
+++ xbmc-27135.patch/tools/TexturePacker/XBMCTex.cpp 2010-01-24 13:07:39.325705415 +0100
@@ -37,7 +37,7 @@
#endif
#ifdef _LINUX
-#include <lzo1x.h>
+#include <lzo/lzo1x.h>
#else
#include "../../xbmc/lib/liblzo/LZO1X.H"
#endif

14
packages/mediacenter/xbmc/patches/101_xbmc-crosscompile_add_support_to_crosscompile_internal_Python-0.1.diff Normal file
View File

@ -0,0 +1,14 @@
diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in
--- xbmc-28910/configure.in 2010-03-28 18:08:22.992628860 +0200
+++ xbmc-28910.patch/configure.in 2010-03-28 18:09:49.166752941 +0200
@@ -1171,7 +1171,9 @@
cp pyconfig.h Include
else
./configure \
- --enable-ipv6 \
+ --host=$host_alias \
+ --build=$build_alias \
+ --disable-ipv6 \
--enable-unicode=ucs4 \
--without-cxx \
--enable-shared \

14
packages/mediacenter/xbmc/patches/111_xbmc-crosscompile_add_support_to_crosscompile_internal_ffmpeg-0.1.diff Normal file
View File

@ -0,0 +1,14 @@
diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in
--- xbmc-28910/configure.in 2010-03-28 18:12:19.728751863 +0200
+++ xbmc-28910.patch/configure.in 2010-03-28 18:21:43.927662015 +0200
@@ -1236,6 +1236,10 @@
./configure \
--disable-static \
`if test "$use_debug" = "no"; then echo --disable-debug; fi` \
+ `if test "$cross_compiling" = "yes"; then echo --enable-cross-compile; fi` \
+ `if test "$use_arch" != "no"; then echo --arch=$use_arch; fi`\
+ `if test "$use_cpu" != "no"; then echo --cpu=$use_cpu; fi`\
+ --target-os=$(tolower $(uname -s)) \
--disable-muxers \
--enable-muxer=spdif \
--enable-muxer=adts \

12
packages/mediacenter/xbmc/patches/112_xbmc-crosscompile_add_support_to_crosscompile_internal_libdts-0.1.diff Normal file
View File

@ -0,0 +1,12 @@
diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in
--- xbmc-28910/configure.in 2010-03-28 18:24:56.419753331 +0200
+++ xbmc-28910.patch/configure.in 2010-03-28 18:25:57.248628460 +0200
@@ -1275,6 +1275,8 @@
--disable-win
else
./configure \
+ --host=$host_alias \
+ --build=$build_alias \
--disable-oss \
--disable-solaris-audio \
--disable-al-audio \

12
packages/mediacenter/xbmc/patches/113_xbmc-crosscompile_add_support_to_crosscompile_internal_libdvdcss-0.1.diff Normal file
View File

@ -0,0 +1,12 @@
diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in
--- xbmc-28910/configure.in 2010-03-28 18:30:55.221751668 +0200
+++ xbmc-28910.patch/configure.in 2010-03-28 18:31:27.299751431 +0200
@@ -1294,6 +1294,8 @@
--with-pic
else
./configure \
+ --host=$host_alias \
+ --build=$build_alias \
--disable-doc \
--enable-static \
--with-pic

12
packages/mediacenter/xbmc/patches/114_xbmc-crosscompile_add_support_to_crosscompile_internal_libdvdread-0.1.diff Normal file
View File

@ -0,0 +1,12 @@
diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in
--- xbmc-28910/configure.in 2010-03-28 18:35:03.335660103 +0200
+++ xbmc-28910.patch/configure.in 2010-03-28 18:36:09.419753169 +0200
@@ -1316,6 +1316,8 @@
./configure2 \
--extra-cflags="$CFLAGS $DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../libdvdcss/src" \
--prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
+ --host=$host_alias \
+ --build=$build_alias \
--enable-static \
--disable-shared \
--disable-strip \

12
packages/mediacenter/xbmc/patches/115_xbmc-crosscompile_add_support_to_crosscompile_internal_libdvdnav-0.1.diff Normal file
View File

@ -0,0 +1,12 @@
diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in
--- xbmc-28910/configure.in 2010-03-28 18:39:54.548661415 +0200
+++ xbmc-28910.patch/configure.in 2010-03-28 18:40:31.570753522 +0200
@@ -1344,6 +1344,8 @@
--extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../includes" \
--extra-ldflags="-L`pwd`/../libdvdread/obj" \
--with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \
+ --host=$host_alias \
+ --build=$build_alias \
--enable-static \
--disable-shared \
--cc="$CC"

12
packages/mediacenter/xbmc/patches/116_xbmc-crosscompile_add_support_to_crosscompile_internal_liba52-0.1.diff Normal file
View File

@ -0,0 +1,12 @@
diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in
--- xbmc-28910/configure.in 2010-03-28 18:43:26.857628415 +0200
+++ xbmc-28910.patch/configure.in 2010-03-28 18:44:02.530754199 +0200
@@ -1375,6 +1375,8 @@
--disable-al-audio
else
./configure \
+ --host=$host_alias \
+ --build=$build_alias \
--with-pic \
--disable-static \
--enable-shared \

14
packages/mediacenter/xbmc/patches/117_xbmc-crosscompile_add_support_to_crosscompile_internal_libass-0.1.diff Normal file
View File

@ -0,0 +1,14 @@
diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in
--- xbmc-28910/configure.in 2010-03-28 18:46:17.449635092 +0200
+++ xbmc-28910.patch/configure.in 2010-03-28 18:46:54.862753477 +0200
@@ -1412,7 +1412,9 @@
./configure MACOSX_DEPLOYMENT_TARGET=10.4
else
CFLAGS="$CFLAGS -fPIC" \
- ./configure
+ ./configure \
+ --host=$host_alias \
+ --build=$build_alias
fi
], [$USE_EXTERNAL_LIBASS])

12
packages/mediacenter/xbmc/patches/118_xbmc-crosscompile_add_support_to_crosscompile_internal_libid3tag-0.1.diff Normal file
View File

@ -0,0 +1,12 @@
diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in
--- xbmc-28910/configure.in 2010-03-28 18:47:39.398628679 +0200
+++ xbmc-28910.patch/configure.in 2010-03-28 18:48:18.635753312 +0200
@@ -1432,6 +1432,8 @@
CFLAGS="$CFLAGS -fPIC" \
CXXFLAGS="$CXXFLAGS -fPIC" \
--prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
+ --host=$host_alias \
+ --build=$build_alias \
--disable-static \
--with-pic
fi

12
packages/mediacenter/xbmc/patches/119_xbmc-crosscompile_add_support_to_crosscompile_internal_goom-0.1.diff Normal file
View File

@ -0,0 +1,12 @@
diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in
--- xbmc-28910/configure.in 2010-03-28 18:48:58.963753796 +0200
+++ xbmc-28910.patch/configure.in 2010-03-28 18:49:38.035627532 +0200
@@ -1460,6 +1460,8 @@
CFLAGS="$CFLAGS -fPIC" \
CXXFLAGS="$CXXFLAGS -fPIC" \
--prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
+ --host=$host_alias \
+ --build=$build_alias \
--disable-shared \
--enable-static \
--with-pic

12
packages/mediacenter/xbmc/patches/120_xbmc-crosscompile_add_support_to_crosscompile_internal_rsxs-0.1.diff Normal file
View File

@ -0,0 +1,12 @@
diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in
--- xbmc-28910/configure.in 2010-03-28 18:50:17.774753500 +0200
+++ xbmc-28910.patch/configure.in 2010-03-28 18:50:47.902628564 +0200
@@ -1492,6 +1492,8 @@
CFLAGS="$CFLAGS -fPIC" \
CXXFLAGS="$CXXFLAGS -fPIC" \
--prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
+ --host=$host_alias \
+ --build=$build_alias \
--without-xscreensaver \
--disable-sound \
--disable-cyclone \

17
packages/mediacenter/xbmc/patches/121_xbmc-crosscompile_add_support_to_crosscompile_internal_libbdnav-0.1.diff Normal file
View File

@ -0,0 +1,17 @@
diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in
--- xbmc-28910/configure.in 2010-03-28 18:51:28.016629554 +0200
+++ xbmc-28910.patch/configure.in 2010-03-28 18:52:26.372628570 +0200
@@ -1509,9 +1509,11 @@
XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [
if test "$host_vendor" = "apple" ; then
- ./configure --with-ssl-dir=/opt/local/include
+ ./configure --with-ssl-dir=/opt/local/include
else
- ./configure --without-openssl
+ ./configure --without-openssl \
+ --host=$host_alias \
+ --build=$build_alias
fi
], [0])

14
packages/mediacenter/xbmc/patches/122_xbmc-crosscompile_add_support_to_crosscompile_internal_libapetag-0.1.diff Normal file
View File

@ -0,0 +1,14 @@
diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in
--- xbmc-28910/configure.in 2010-03-28 18:53:11.478628728 +0200
+++ xbmc-28910.patch/configure.in 2010-03-28 18:53:46.132627622 +0200
@@ -1522,7 +1522,9 @@
CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -fno-common" \
./configure MACOSX_DEPLOYMENT_TARGET=10.4 --disable-shared
else
- ./configure
+ ./configure \
+ --host=$host_alias \
+ --build=$build_alias
fi
], [0])

14
packages/mediacenter/xbmc/patches/123_xbmc-crosscompile_add_support_to_crosscompile_internal_cpluff-0.1.diff Normal file
View File

@ -0,0 +1,14 @@
diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in
--- xbmc-28910/configure.in 2010-03-28 18:54:17.023663284 +0200
+++ xbmc-28910.patch/configure.in 2010-03-28 18:55:01.867627572 +0200
@@ -1552,7 +1552,9 @@
if test "$host_vendor" = "apple" ; then
./configure --disable-nls --with-libiconv-prefix=/opt/local --with-libintl-prefix=/opt/local --without-readline
else
- ./configure --disable-nls
+ ./configure --disable-nls \
+ --host=$host_alias \
+ --build=$build_alias
fi
], [0])

28
packages/mediacenter/xbmc/patches/011_xbmc-let_select_XBMCProjectM-0.1.diff → packages/mediacenter/xbmc/patches/201_xbmc-let_select_XBMCProjectM-0.1.diff
View File

@ -1,7 +1,7 @@
diff -Naur xbmc-28584/configure.in xbmc-28584.patch/configure.in
--- xbmc-28584/configure.in 2010-03-15 00:51:45.481151345 +0100
+++ xbmc-28584.patch/configure.in 2010-03-15 00:52:15.206151488 +0100
@@ -33,6 +33,8 @@
diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in
--- xbmc-28910/configure.in 2010-03-28 18:55:35.040753605 +0200
+++ xbmc-28910.patch/configure.in 2010-03-28 18:58:11.605628523 +0200
@@ -23,6 +23,8 @@
xrandr_disabled="== XRandR support disabled. SDL will be used for resolution support. =="
goom_enabled="== GOOM enabled. =="
goom_disabled="== GOOM disabled. =="
@ -10,7 +10,7 @@ diff -Naur xbmc-28584/configure.in xbmc-28584.patch/configure.in
pulse_not_found="== Could not find libpulse. PulseAudio support disabled. =="
pulse_disabled="== PulseAudio support manually disabled. =="
faac_not_found="== Could not find libfaac. FAAC support disabled. =="
@@ -150,6 +152,12 @@
@@ -152,6 +154,12 @@
[use_goom=$enableval],
[use_goom=no])
@ -23,7 +23,7 @@ diff -Naur xbmc-28584/configure.in xbmc-28584.patch/configure.in
AC_PATH_PROG(CCACHE,ccache,none)
AC_ARG_ENABLE([ccache],
[AS_HELP_STRING([--enable-ccache],
@@ -529,6 +537,15 @@
@@ -531,6 +539,15 @@
fi
fi
@ -39,7 +39,7 @@ diff -Naur xbmc-28584/configure.in xbmc-28584.patch/configure.in
### External libraries checks
if test "$use_external_libraries" = "yes"; then
AC_MSG_NOTICE($external_libraries_enabled)
@@ -851,6 +868,12 @@
@@ -862,6 +879,12 @@
final_message="$final_message\n GOOM:\t\tNo"
fi
@ -52,7 +52,7 @@ diff -Naur xbmc-28584/configure.in xbmc-28584.patch/configure.in
if test "$use_pcre" = "yes"; then
final_message="$final_message\n PCRE Support:\tYes"
else
@@ -1089,6 +1112,7 @@
@@ -1106,6 +1129,7 @@
AC_SUBST(SDL_DEFINES)
AC_SUBST(BUILD_DVDCSS)
AC_SUBST(BUILD_GOOM)
@ -60,7 +60,7 @@ diff -Naur xbmc-28584/configure.in xbmc-28584.patch/configure.in
AC_SUBST(USE_EXTERNAL_LIBRARIES)
AC_SUBST(USE_EXTERNAL_FFMPEG)
AC_SUBST(USE_EXTERNAL_LIBA52)
@@ -1434,7 +1458,7 @@
@@ -1451,7 +1475,7 @@
-DSYSCONF_INSTALL_DIR:PATH="${sysconfdir}" -DSHARE_INSTALL_PREFIX:PATH="${datadir}" .
set +x
fi
@ -69,10 +69,10 @@ diff -Naur xbmc-28584/configure.in xbmc-28584.patch/configure.in
XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
if test "$host_vendor" != "apple" ; then
diff -Naur xbmc-28584/Makefile.in xbmc-28584.patch/Makefile.in
--- xbmc-28584/Makefile.in 2010-03-14 21:06:24.000000000 +0100
+++ xbmc-28584.patch/Makefile.in 2010-03-15 00:55:14.471274664 +0100
@@ -104,8 +104,10 @@
diff -Naur xbmc-28910/Makefile.in xbmc-28910.patch/Makefile.in
--- xbmc-28910/Makefile.in 2010-03-28 17:12:32.000000000 +0200
+++ xbmc-28910.patch/Makefile.in 2010-03-28 18:58:11.636752616 +0200
@@ -105,8 +105,10 @@
VIS_DIRS=\
xbmc/visualizations/OpenGLSpectrum \
@ -85,7 +85,7 @@ diff -Naur xbmc-28584/Makefile.in xbmc-28584.patch/Makefile.in
ifeq ($(findstring osx,$(ARCH)), osx)
VIS_DIRS+=xbmc/visualizations/iTunes
endif
@@ -294,7 +296,9 @@
@@ -303,7 +305,9 @@
visualizations: exports
$(MAKE) -C xbmc/visualizations/OpenGLSpectrum
$(MAKE) -C xbmc/visualizations/WaveForm

28
packages/mediacenter/xbmc/patches/012_xbmc-let_select_RSXS-0.1.diff → packages/mediacenter/xbmc/patches/202_xbmc-let_select_RSXS-0.1.diff
View File

@ -1,7 +1,7 @@
diff -Naur xbmc-28584/configure.in xbmc-28584.patch/configure.in
--- xbmc-28584/configure.in 2010-03-15 00:58:21.345276911 +0100
+++ xbmc-28584.patch/configure.in 2010-03-15 00:58:38.170152082 +0100
@@ -35,6 +35,8 @@
diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in
--- xbmc-28910/configure.in 2010-03-28 19:01:27.995753591 +0200
+++ xbmc-28910.patch/configure.in 2010-03-28 19:02:17.307753519 +0200
@@ -25,6 +25,8 @@
goom_disabled="== GOOM disabled. =="
xbmcprojectm_enabled="== XBMCProjectM enabled. =="
xbmxprojectm_disabled="== XBMCProjectM disabled. =="
@ -10,7 +10,7 @@ diff -Naur xbmc-28584/configure.in xbmc-28584.patch/configure.in
pulse_not_found="== Could not find libpulse. PulseAudio support disabled. =="
pulse_disabled="== PulseAudio support manually disabled. =="
faac_not_found="== Could not find libfaac. FAAC support disabled. =="
@@ -158,6 +160,12 @@
@@ -160,6 +162,12 @@
[use_xbmcprojectm=$enableval],
[use_xbmcprojectm=yes])
@ -23,7 +23,7 @@ diff -Naur xbmc-28584/configure.in xbmc-28584.patch/configure.in
AC_PATH_PROG(CCACHE,ccache,none)
AC_ARG_ENABLE([ccache],
[AS_HELP_STRING([--enable-ccache],
@@ -546,6 +554,15 @@
@@ -548,6 +556,15 @@
BUILD_XBMCPROJECTM=1
fi
@ -39,7 +39,7 @@ diff -Naur xbmc-28584/configure.in xbmc-28584.patch/configure.in
### External libraries checks
if test "$use_external_libraries" = "yes"; then
AC_MSG_NOTICE($external_libraries_enabled)
@@ -874,6 +891,12 @@
@@ -885,6 +902,12 @@
final_message="$final_message\n XBMCProjectM:\tNo"
fi
@ -52,7 +52,7 @@ diff -Naur xbmc-28584/configure.in xbmc-28584.patch/configure.in
if test "$use_pcre" = "yes"; then
final_message="$final_message\n PCRE Support:\tYes"
else
@@ -1113,6 +1136,7 @@
@@ -1130,6 +1153,7 @@
AC_SUBST(BUILD_DVDCSS)
AC_SUBST(BUILD_GOOM)
AC_SUBST(BUILD_XBMCPROJECTM)
@ -60,7 +60,7 @@ diff -Naur xbmc-28584/configure.in xbmc-28584.patch/configure.in
AC_SUBST(USE_EXTERNAL_LIBRARIES)
AC_SUBST(USE_EXTERNAL_FFMPEG)
AC_SUBST(USE_EXTERNAL_LIBA52)
@@ -1512,7 +1536,7 @@
@@ -1529,7 +1553,7 @@
--disable-lattice \
--disable-skyrocket
fi
@ -69,10 +69,10 @@ diff -Naur xbmc-28584/configure.in xbmc-28584.patch/configure.in
XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [
if test "$host_vendor" = "apple" ; then
diff -Naur xbmc-28584/Makefile.in xbmc-28584.patch/Makefile.in
--- xbmc-28584/Makefile.in 2010-03-15 00:58:21.346276544 +0100
+++ xbmc-28584.patch/Makefile.in 2010-03-15 00:58:38.176152470 +0100
@@ -99,8 +99,10 @@
diff -Naur xbmc-28910/Makefile.in xbmc-28910.patch/Makefile.in
--- xbmc-28910/Makefile.in 2010-03-28 19:01:27.997753604 +0200
+++ xbmc-28910.patch/Makefile.in 2010-03-28 19:02:17.308751221 +0200
@@ -100,8 +100,10 @@
lib/xbmc-dll-symbols \
lib/jsoncpp/jsoncpp/src/lib_json
@ -85,7 +85,7 @@ diff -Naur xbmc-28584/Makefile.in xbmc-28584.patch/Makefile.in
VIS_DIRS=\
xbmc/visualizations/OpenGLSpectrum \
@@ -308,7 +310,9 @@
@@ -317,7 +319,9 @@
endif
endif
screensavers: exports

24
packages/mediacenter/xbmc/patches/016_xmbc-let_select_HAL-0.1.diff → packages/mediacenter/xbmc/patches/211_xmbc-let_select_HAL-0.1.diff
View File

@ -1,7 +1,7 @@
diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
--- xbmc-27135/configure.in 2010-01-24 13:08:23.126603769 +0100
+++ xbmc-27135.patch/configure.in 2010-01-24 13:16:12.459703838 +0100
@@ -39,6 +39,8 @@
diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in
--- xbmc-28910/configure.in 2010-03-28 19:11:12.041628640 +0200
+++ xbmc-28910.patch/configure.in 2010-03-28 19:11:28.334628763 +0200
@@ -33,6 +33,8 @@
faac_disabled="== FAAC support manually disabled. =="
dvdcss_enabled="== DVDCSS support enabled. =="
dvdcss_disabled="== DVDCSS support disabled. =="
@ -10,7 +10,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
avahi_not_found="== Could not find libavahi-common or libavahi-client. Avahi support disabled. =="
avahi_disabled="== Avahi support disabled. =="
vdpau_not_found="== Could not find libvdpau. VDPAU support disabled. =="
@@ -191,6 +193,11 @@
@@ -198,6 +200,11 @@
[enable MID support (default is no)])],
[use_mid=$enableval],
[use_mid=no])
@ -22,7 +22,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
AC_ARG_ENABLE([avahi],
[AS_HELP_STRING([--disable-avahi],
[disable Avahi support (default is enabled if libavahi-common and libavahi-client is found)])],
@@ -437,15 +444,9 @@
@@ -465,15 +472,9 @@
PKG_CHECK_MODULES([DBUS], [dbus-1],
[INCLUDES+=" $DBUS_CFLAGS"; LIBS+=" $DBUS_LIBS"],
AC_MSG_ERROR($missing_library))
@ -38,7 +38,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
fi
# PulseAudio
@@ -474,6 +475,24 @@
@@ -502,6 +503,24 @@
fi
fi
@ -63,11 +63,10 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
# avahi
if test "$host_vendor" = "apple" ; then
use_avahi="no"
diff -Naur xbmc-27135/configure.in.orig xbmc-27135.patch/configure.in.orig
diff -Naur xbmc-27135/guilib/system.h xbmc-27135.patch/guilib/system.h
--- xbmc-27135/guilib/system.h 2010-01-24 11:46:42.047669779 +0100
+++ xbmc-27135.patch/guilib/system.h 2010-01-24 13:16:12.460703245 +0100
@@ -117,7 +117,6 @@
diff -Naur xbmc-28910/guilib/system.h xbmc-28910.patch/guilib/system.h
--- xbmc-28910/guilib/system.h 2010-03-28 17:12:32.000000000 +0200
+++ xbmc-28910.patch/guilib/system.h 2010-03-28 19:11:28.336628838 +0200
@@ -126,7 +126,6 @@
#define HAS_AVAHI
#endif
#define HAS_LCD
@ -75,4 +74,3 @@ diff -Naur xbmc-27135/guilib/system.h xbmc-27135.patch/guilib/system.h
#define HAS_DBUS
#define HAS_DBUS_SERVER
#define HAS_GL
diff -Naur xbmc-27135/guilib/system.h.orig xbmc-27135.patch/guilib/system.h.orig

29
packages/mediacenter/xbmc/patches/301_xbmc-correct_lzo_include-0.1.diff Normal file
View File

@ -0,0 +1,29 @@
diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in
--- xbmc-28910/configure.in 2010-03-28 19:09:49.355628909 +0200
+++ xbmc-28910.patch/configure.in 2010-03-28 19:08:34.601754086 +0200
@@ -921,12 +921,6 @@
final_message="$final_message\n MID Support:\tNo"
fi
-if test -d "/usr/include/lzo"; then
- INCLUDES="$INCLUDES -I/usr/include/lzo"
-else
- INCLUDES="$INCLUDES"
-fi
-
if test "$use_ccache" = "yes"; then
if test "$ac_cv_path_CCACHE" = "none"; then
echo "ccache not found. Falling back to default CC"
diff -Naur xbmc-28910/configure.in.orig xbmc-28910.patch/configure.in.orig
diff -Naur xbmc-28910/tools/TexturePacker/XBMCTex.cpp xbmc-28910.patch/tools/TexturePacker/XBMCTex.cpp
--- xbmc-28910/tools/TexturePacker/XBMCTex.cpp 2010-03-28 17:16:22.000000000 +0200
+++ xbmc-28910.patch/tools/TexturePacker/XBMCTex.cpp 2010-03-28 19:08:34.602753740 +0200
@@ -37,7 +37,7 @@
#endif
#ifdef _LINUX
-#include <lzo1x.h>
+#include <lzo/lzo1x.h>
#else
#include "../../xbmc/lib/liblzo/LZO1X.H"
#endif

18
packages/mediacenter/xbmc/patches/014_xbmc-dont_hardcode_usr_include-0.1.diff → packages/mediacenter/xbmc/patches/302_xbmc-dont_hardcode_usr_include-0.1.diff
View File

@ -1,15 +1,15 @@
diff -Naur xbmc-27135/guilib/Makefile.in xbmc-27135.patch/guilib/Makefile.in
--- xbmc-27135/guilib/Makefile.in 2010-01-24 11:46:42.066643776 +0100
+++ xbmc-27135.patch/guilib/Makefile.in 2010-01-24 13:14:01.800579073 +0100
diff -Naur xbmc-28910/guilib/Makefile.in xbmc-28910.patch/guilib/Makefile.in
--- xbmc-28910/guilib/Makefile.in 2010-03-28 17:12:32.000000000 +0200
+++ xbmc-28910.patch/guilib/Makefile.in 2010-03-28 19:13:23.816629379 +0200
@@ -1,4 +1,4 @@
-INCLUDES=-I. -I../ -Icommon -I../xbmc -I../xbmc/linux -I../xbmc/utils -I/usr/include/freetype2 -I/usr/include/SDL -I../xbmc/lib/libsquish
+INCLUDES=-I. -I../ -Icommon -I../xbmc -I../xbmc/linux -I../xbmc/utils -I../xbmc/lib/libsquish
ifneq (@USE_EXTERNAL_FFMPEG@,1)
INCLUDES+=-I../xbmc/cores/dvdplayer/Codecs/ffmpeg
endif
diff -Naur xbmc-27135/xbmc/FileSystem/Makefile.in xbmc-27135.patch/xbmc/FileSystem/Makefile.in
--- xbmc-27135/xbmc/FileSystem/Makefile.in 2010-01-24 11:47:36.842631867 +0100
+++ xbmc-27135.patch/xbmc/FileSystem/Makefile.in 2010-01-24 13:14:59.573578187 +0100
diff -Naur xbmc-28910/xbmc/FileSystem/Makefile.in xbmc-28910.patch/xbmc/FileSystem/Makefile.in
--- xbmc-28910/xbmc/FileSystem/Makefile.in 2010-03-28 17:14:55.000000000 +0200
+++ xbmc-28910.patch/xbmc/FileSystem/Makefile.in 2010-03-28 19:13:23.834753245 +0200
@@ -1,6 +1,6 @@
ARCH=@ARCH@
@ -18,9 +18,9 @@ diff -Naur xbmc-27135/xbmc/FileSystem/Makefile.in xbmc-27135.patch/xbmc/FileSyst
INCLUDES+=-I../lib/libcdio/libcdio/include
ifeq ($(findstring osx,$(ARCH)), osx)
INCLUDES+=-I../../lib/libcurl-OSX/include
diff -Naur xbmc-27135/xbmc/Makefile.in xbmc-27135.patch/xbmc/Makefile.in
--- xbmc-27135/xbmc/Makefile.in 2010-01-24 11:47:03.973632064 +0100
+++ xbmc-27135.patch/xbmc/Makefile.in 2010-01-24 13:14:32.079579280 +0100
diff -Naur xbmc-28910/xbmc/Makefile.in xbmc-28910.patch/xbmc/Makefile.in
--- xbmc-28910/xbmc/Makefile.in 2010-03-28 17:13:35.000000000 +0200
+++ xbmc-28910.patch/xbmc/Makefile.in 2010-03-28 19:13:23.837752973 +0200
@@ -1,4 +1,4 @@
-INCLUDES+=-I../ -I. -Ilinux -Icores -I../guilib -Iutils -IFileSystem -I/usr/include/freetype2 -Icores/dvdplayer
+INCLUDES+=-I../ -I. -Ilinux -Icores -I../guilib -Iutils -IFileSystem -Icores/dvdplayer

8
packages/mediacenter/xbmc/patches/201-xbmc-we_dont_need_libXinerama-0.1.diff → packages/mediacenter/xbmc/patches/401-xbmc-we_dont_need_libXinerama-0.1.diff
View File

@ -1,7 +1,7 @@
diff -Naur xbmc-pvr-28391/configure.in xbmc-pvr-28391.patch/configure.in
--- xbmc-pvr-28391/configure.in 2010-03-06 13:44:06.000000000 +0100
+++ xbmc-pvr-28391.patch/configure.in 2010-03-07 23:26:55.998017036 +0100
@@ -438,9 +438,6 @@
diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in
--- xbmc-28910/configure.in 2010-03-28 19:12:51.211753728 +0200
+++ xbmc-28910.patch/configure.in 2010-03-28 19:24:46.921753713 +0200
@@ -463,9 +463,6 @@
PKG_CHECK_MODULES([XMU], [xmu],
[INCLUDES+=" $XMU_CFLAGS"; LIBS+=" $XMU_LIBS"],
AC_MSG_ERROR($missing_library))

10
packages/mediacenter/xbmc/patches/091-xbmc-enable_yasm_in_ffmpeg-0.1.diff → packages/mediacenter/xbmc/patches/402-xbmc-enable_yasm_in_ffmpeg-0.1.diff
View File

@ -1,7 +1,7 @@
diff -Naur xbmc-28745/configure.in xbmc-28745.patch/configure.in
--- xbmc-28745/configure.in 2010-03-23 04:05:13.476967336 +0100
+++ xbmc-28745.patch/configure.in 2010-03-23 04:07:49.166967342 +0100
@@ -728,6 +728,7 @@
diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in
--- xbmc-28910/configure.in 2010-03-28 19:26:02.516628518 +0200
+++ xbmc-28910.patch/configure.in 2010-03-28 19:26:44.961754003 +0200
@@ -764,6 +764,7 @@
fi
fi
@ -9,7 +9,7 @@ diff -Naur xbmc-28745/configure.in xbmc-28745.patch/configure.in
AC_CHECK_PROG(HAVE_SVNVERSION,svnversion,"yes","no",)
AC_CHECK_PROG(HAVE_GIT,git,"yes","no",)
@@ -1269,6 +1270,7 @@
@@ -1318,6 +1319,7 @@
--enable-protocol=http \
--enable-pthreads \
`if test "$host_cpu" = "powerpc" || test "$host_cpu" = "powerpc64"; then echo --enable-pic; fi` \

10
packages/mediacenter/xbmc/patches/xbmc-add_DESTDIR_support_to_make_install-0.1.diff → packages/mediacenter/xbmc/patches/403-xbmc-add_DESTDIR_support_to_make_install-0.1.diff
View File

@ -1,7 +1,7 @@
diff -Naur xbmc-28584/Makefile.in xbmc-28584.patch/Makefile.in
--- xbmc-28584/Makefile.in 2010-03-15 01:06:53.490151727 +0100
+++ xbmc-28584.patch/Makefile.in 2010-03-15 01:06:07.685150760 +0100
@@ -486,7 +486,7 @@
diff -Naur xbmc-28910/Makefile.in xbmc-28910.patch/Makefile.in
--- xbmc-28910/Makefile.in 2010-03-28 19:09:49.356628842 +0200
+++ xbmc-28910.patch/Makefile.in 2010-03-28 19:28:17.265753408 +0200
@@ -495,7 +495,7 @@
$(MAKE) -C tools/TexturePacker/
install-bin: xbmc.bin # developement convenience target
@ -10,7 +10,7 @@ diff -Naur xbmc-28584/Makefile.in xbmc-28584.patch/Makefile.in
ifeq ($(findstring osx,$(ARCH)), osx)
# TODO: add osx install
@@ -494,55 +494,55 @@
@@ -503,55 +503,55 @@
install: install-binaries install-arch install-datas install-web
install-binaries: install-scripts

6
packages/mediacenter/xbmc/patches/074-xbmc-full_splash-0.1.diff → packages/mediacenter/xbmc/patches/451-xbmc-full_splash-0.1.diff
View File

@ -1,6 +1,6 @@
diff -Naur xbmc-24572/xbmc/utils/Splash.cpp xbmc-24572.patch/xbmc/utils/Splash.cpp
--- xbmc-24572/xbmc/utils/Splash.cpp 2009-11-13 18:19:48.374746147 +0100
+++ xbmc-24572.patch/xbmc/utils/Splash.cpp 2009-11-14 16:58:52.677231191 +0100
diff -Naur xbmc-28910/xbmc/utils/Splash.cpp xbmc-28910.patch/xbmc/utils/Splash.cpp
--- xbmc-28910/xbmc/utils/Splash.cpp 2010-03-28 17:14:58.000000000 +0200
+++ xbmc-28910.patch/xbmc/utils/Splash.cpp 2010-03-28 19:29:51.138661142 +0200
@@ -53,9 +53,9 @@
g_graphicsContext.Clear();

96
packages/mediacenter/xbmc/patches/092-xbmc-fix_libdvdcss_autotools-0.1.diff → packages/mediacenter/xbmc/patches/501-xbmc-fix_libdvdcss_autotools-0.1.diff
View File

@ -1,6 +1,6 @@
diff -Naur xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/aclocal.m4 xbmc-23883.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/aclocal.m4
--- xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/aclocal.m4 2009-10-21 08:21:57.696148571 +0200
+++ xbmc-23883.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/aclocal.m4 2009-10-21 08:24:57.930021992 +0200
diff -Naur xbmc-28910/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/aclocal.m4 xbmc-28910.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/aclocal.m4
--- xbmc-28910/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/aclocal.m4 2010-03-28 17:15:33.000000000 +0200
+++ xbmc-28910.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/aclocal.m4 2010-03-28 19:31:11.361626849 +0200
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.11 -*- Autoconf -*-
@ -12214,9 +12214,9 @@ diff -Naur xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/aclocal.m4 xb
# Check how to create a tarball. -*- Autoconf -*-
# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
diff -Naur xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/.auto/compile xbmc-23883.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/.auto/compile
--- xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/.auto/compile 1970-01-01 01:00:00.000000000 +0100
+++ xbmc-23883.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/.auto/compile 2009-06-11 11:29:50.000000000 +0200
diff -Naur xbmc-28910/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/.auto/compile xbmc-28910.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/.auto/compile
--- xbmc-28910/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/.auto/compile 1970-01-01 01:00:00.000000000 +0100
+++ xbmc-28910.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/.auto/compile 2010-03-28 19:31:11.362627126 +0200
@@ -0,0 +1,143 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand `-c -o'.
@ -12361,9 +12361,9 @@ diff -Naur xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/.auto/compile
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff -Naur xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/.auto/ltmain.sh xbmc-23883.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/.auto/ltmain.sh
--- xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/.auto/ltmain.sh 2009-10-21 08:21:58.452030953 +0200
+++ xbmc-23883.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/.auto/ltmain.sh 2009-07-30 18:46:57.000000000 +0200
diff -Naur xbmc-28910/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/.auto/ltmain.sh xbmc-28910.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/.auto/ltmain.sh
--- xbmc-28910/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/.auto/ltmain.sh 2010-03-28 17:15:34.000000000 +0200
+++ xbmc-28910.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/.auto/ltmain.sh 2010-03-28 19:31:11.379626721 +0200
@@ -1,52 +1,83 @@
-# ltmain.sh - Provide generalized library-building support services.
-# NOTE: Changing this file will not affect anything until you rerun configure.
@ -26568,9 +26568,9 @@ diff -Naur xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/.auto/ltmain.
# End:
+# vi:sw=2
+
diff -Naur xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/config.h.in xbmc-23883.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/config.h.in
--- xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/config.h.in 2009-10-21 08:21:57.668147533 +0200
+++ xbmc-23883.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/config.h.in 2009-10-21 08:25:00.000000000 +0200
diff -Naur xbmc-28910/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/config.h.in xbmc-28910.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/config.h.in
--- xbmc-28910/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/config.h.in 2010-03-28 17:15:34.000000000 +0200
+++ xbmc-28910.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/config.h.in 2010-03-28 19:31:11.382626642 +0200
@@ -99,6 +99,13 @@
/* Define if <sys/scsi.h> defines sctl_io. */
#undef HPUX_SCTL_IO
@ -26585,9 +26585,9 @@ diff -Naur xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/config.h.in x
/* Name of package */
#undef PACKAGE
diff -Naur xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/configure xbmc-23883.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/configure
--- xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/configure 2009-10-21 08:21:57.754148636 +0200
+++ xbmc-23883.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/configure 2009-10-21 08:25:16.337146095 +0200
diff -Naur xbmc-28910/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/configure xbmc-28910.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/configure
--- xbmc-28910/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/configure 2010-03-28 17:15:33.000000000 +0200
+++ xbmc-28910.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/configure 2010-03-28 19:31:11.423626649 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@ -57693,9 +57693,9 @@ diff -Naur xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/configure xbm
+fi
diff -Naur xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/configure.ac xbmc-23883.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/configure.ac
--- xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/configure.ac 2009-10-21 08:21:58.561148085 +0200
+++ xbmc-23883.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/configure.ac 2009-10-21 06:12:16.000000000 +0200
diff -Naur xbmc-28910/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/configure.ac xbmc-28910.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/configure.ac
--- xbmc-28910/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/configure.ac 2010-03-28 17:15:33.000000000 +0200
+++ xbmc-28910.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/configure.ac 2010-03-28 19:31:11.427663443 +0200
@@ -3,11 +3,13 @@
AC_PREREQ(2.50)
AC_CONFIG_AUX_DIR(.auto)
@ -57710,9 +57710,9 @@ diff -Naur xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/configure.ac
AC_STDC_HEADERS
AC_LIBTOOL_WIN32_DLL
diff -Naur xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/doc/Makefile.in xbmc-23883.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/doc/Makefile.in
--- xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/doc/Makefile.in 2009-10-21 08:21:58.556151542 +0200
+++ xbmc-23883.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/doc/Makefile.in 2009-10-21 08:25:09.265146278 +0200
diff -Naur xbmc-28910/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/doc/Makefile.in xbmc-28910.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/doc/Makefile.in
--- xbmc-28910/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/doc/Makefile.in 2010-03-28 17:15:33.000000000 +0200
+++ xbmc-28910.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/doc/Makefile.in 2010-03-28 19:31:11.428626564 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@ -57925,9 +57925,9 @@ diff -Naur xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/doc/Makefile.
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff -Naur xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/libtool.m4 xbmc-23883.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/libtool.m4
--- xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/libtool.m4 1970-01-01 01:00:00.000000000 +0100
+++ xbmc-23883.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/libtool.m4 2009-07-30 18:46:57.000000000 +0200
diff -Naur xbmc-28910/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/libtool.m4 xbmc-28910.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/libtool.m4
--- xbmc-28910/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/libtool.m4 1970-01-01 01:00:00.000000000 +0100
+++ xbmc-28910.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/libtool.m4 2010-03-28 19:31:11.438626811 +0200
@@ -0,0 +1,7360 @@
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
@ -65289,9 +65289,9 @@ diff -Naur xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/libtool.m4
+ ;;
+ esac
+])
diff -Naur xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/lt~obsolete.m4 xbmc-23883.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/lt~obsolete.m4
--- xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/lt~obsolete.m4 1970-01-01 01:00:00.000000000 +0100
+++ xbmc-23883.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/lt~obsolete.m4 2009-07-30 18:46:57.000000000 +0200
diff -Naur xbmc-28910/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/lt~obsolete.m4 xbmc-28910.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/lt~obsolete.m4
--- xbmc-28910/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/lt~obsolete.m4 1970-01-01 01:00:00.000000000 +0100
+++ xbmc-28910.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/lt~obsolete.m4 2010-03-28 19:31:11.445794757 +0200
@@ -0,0 +1,92 @@
+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
+#
@ -65385,9 +65385,9 @@ diff -Naur xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/lt~obsolet
+m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
+m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
+m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
diff -Naur xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/ltoptions.m4 xbmc-23883.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/ltoptions.m4
--- xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/ltoptions.m4 1970-01-01 01:00:00.000000000 +0100
+++ xbmc-23883.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/ltoptions.m4 2009-07-30 18:46:57.000000000 +0200
diff -Naur xbmc-28910/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/ltoptions.m4 xbmc-28910.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/ltoptions.m4
--- xbmc-28910/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/ltoptions.m4 1970-01-01 01:00:00.000000000 +0100
+++ xbmc-28910.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/ltoptions.m4 2010-03-28 19:31:11.446649413 +0200
@@ -0,0 +1,368 @@
+# Helper functions for option handling. -*- Autoconf -*-
+#
@ -65757,9 +65757,9 @@ diff -Naur xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/ltoptions.
+ [m4_define([_LTDL_TYPE], [installable])])
+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
+ [m4_define([_LTDL_TYPE], [convenience])])
diff -Naur xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/ltsugar.m4 xbmc-23883.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/ltsugar.m4
--- xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/ltsugar.m4 1970-01-01 01:00:00.000000000 +0100
+++ xbmc-23883.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/ltsugar.m4 2009-07-30 18:46:57.000000000 +0200
diff -Naur xbmc-28910/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/ltsugar.m4 xbmc-28910.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/ltsugar.m4
--- xbmc-28910/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/ltsugar.m4 1970-01-01 01:00:00.000000000 +0100
+++ xbmc-28910.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/ltsugar.m4 2010-03-28 19:31:11.447637816 +0200
@@ -0,0 +1,123 @@
+# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
+#
@ -65884,9 +65884,9 @@ diff -Naur xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/ltsugar.m4
+ lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
+ [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
+])
diff -Naur xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/ltversion.m4 xbmc-23883.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/ltversion.m4
--- xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/ltversion.m4 1970-01-01 01:00:00.000000000 +0100
+++ xbmc-23883.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/ltversion.m4 2009-07-30 18:46:57.000000000 +0200
diff -Naur xbmc-28910/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/ltversion.m4 xbmc-28910.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/ltversion.m4
--- xbmc-28910/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/ltversion.m4 1970-01-01 01:00:00.000000000 +0100
+++ xbmc-28910.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/ltversion.m4 2010-03-28 19:31:11.448626359 +0200
@@ -0,0 +1,23 @@
+# ltversion.m4 -- version numbers -*- Autoconf -*-
+#
@ -65911,9 +65911,9 @@ diff -Naur xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/m4/ltversion.
+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+_LT_DECL(, macro_revision, 0)
+])
diff -Naur xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/Makefile.in xbmc-23883.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/Makefile.in
--- xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/Makefile.in 2009-10-21 08:21:58.298056411 +0200
+++ xbmc-23883.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/Makefile.in 2009-10-21 08:25:09.584146340 +0200
diff -Naur xbmc-28910/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/Makefile.in xbmc-28910.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/Makefile.in
--- xbmc-28910/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/Makefile.in 2010-03-28 17:15:33.000000000 +0200
+++ xbmc-28910.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/Makefile.in 2010-03-28 19:31:11.449626495 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@ -66451,9 +66451,9 @@ diff -Naur xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/Makefile.in x
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff -Naur xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/dvdcss/Makefile.in xbmc-23883.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/dvdcss/Makefile.in
--- xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/dvdcss/Makefile.in 2009-10-21 08:21:57.857159218 +0200
+++ xbmc-23883.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/dvdcss/Makefile.in 2009-10-21 08:25:09.430146417 +0200
diff -Naur xbmc-28910/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/dvdcss/Makefile.in xbmc-28910.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/dvdcss/Makefile.in
--- xbmc-28910/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/dvdcss/Makefile.in 2010-03-28 17:15:33.000000000 +0200
+++ xbmc-28910.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/dvdcss/Makefile.in 2010-03-28 19:31:11.450660645 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@ -66781,9 +66781,9 @@ diff -Naur xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/dvdcss/Ma
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff -Naur xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/Makefile.in xbmc-23883.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/Makefile.in
--- xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/Makefile.in 2009-10-21 08:21:57.960029909 +0200
+++ xbmc-23883.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/Makefile.in 2009-10-21 08:25:09.366146377 +0200
diff -Naur xbmc-28910/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/Makefile.in xbmc-28910.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/Makefile.in
--- xbmc-28910/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/Makefile.in 2010-03-28 17:15:33.000000000 +0200
+++ xbmc-28910.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/Makefile.in 2010-03-28 19:31:11.452626765 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@ -67303,9 +67303,9 @@ diff -Naur xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/Makefile.
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff -Naur xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/test/Makefile.in xbmc-23883.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/test/Makefile.in
--- xbmc-23883/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/test/Makefile.in 2009-10-21 08:21:58.181035461 +0200
+++ xbmc-23883.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/test/Makefile.in 2009-10-21 08:25:09.514146744 +0200
diff -Naur xbmc-28910/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/test/Makefile.in xbmc-28910.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/test/Makefile.in
--- xbmc-28910/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/test/Makefile.in 2010-03-28 17:15:34.000000000 +0200
+++ xbmc-28910.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/test/Makefile.in 2010-03-28 19:31:11.453626622 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.