mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
xbmc-pvr:
- update to xbmc-pvr-26925
This commit is contained in:
parent
64b04a8b17
commit
775eb76988
@ -1,7 +1,7 @@
|
||||
diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in
|
||||
--- xbmc-pvr-26651/configure.in 2010-01-11 03:33:19.645347327 +0100
|
||||
+++ xbmc-pvr-26651.patch/configure.in 2010-01-11 04:20:15.677347493 +0100
|
||||
@@ -1116,6 +1116,8 @@
|
||||
diff -Naur xbmc-26784/configure.in xbmc-26784.patch/configure.in
|
||||
--- xbmc-26784/configure.in 2010-01-14 06:01:36.002732210 +0100
|
||||
+++ xbmc-26784.patch/configure.in 2010-01-14 07:36:53.996945233 +0100
|
||||
@@ -1125,6 +1125,8 @@
|
||||
XB_CONFIG_MODULE([xbmc/lib/libPython/Python], [
|
||||
if test "$host_vendor" = "apple" ; then
|
||||
./configure \
|
||||
@ -10,7 +10,7 @@ diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in
|
||||
--enable-ipv6 \
|
||||
--enable-unicode=ucs4 \
|
||||
--without-cxx \
|
||||
@@ -1138,6 +1140,8 @@
|
||||
@@ -1147,6 +1149,8 @@
|
||||
cp pyconfig.h Include
|
||||
else
|
||||
./configure \
|
||||
@ -19,7 +19,7 @@ diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in
|
||||
--enable-ipv6 \
|
||||
--enable-unicode=ucs4 \
|
||||
--without-cxx \
|
||||
@@ -1155,6 +1159,8 @@
|
||||
@@ -1164,6 +1168,8 @@
|
||||
if test "$host_vendor" = "apple" ; then
|
||||
CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
||||
./configure MACOSX_DEPLOYMENT_TARGET=10.4 -C \
|
||||
@ -28,7 +28,7 @@ diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in
|
||||
--with-pic \
|
||||
--disable-asm-optimizations \
|
||||
--disable-xmms-plugin \
|
||||
@@ -1169,7 +1175,9 @@
|
||||
@@ -1178,7 +1184,9 @@
|
||||
XB_CONFIG_MODULE([xbmc/cores/paplayer/vorbisfile/libvorbis], [
|
||||
if test "$host_vendor" = "apple" ; then
|
||||
CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
||||
@ -39,7 +39,7 @@ diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in
|
||||
else
|
||||
true
|
||||
fi
|
||||
@@ -1178,7 +1186,9 @@
|
||||
@@ -1187,7 +1195,9 @@
|
||||
XB_CONFIG_MODULE([xbmc/cores/paplayer/vorbisfile/ogg], [
|
||||
if test "$host_vendor" = "apple" ; then
|
||||
CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
||||
@ -50,7 +50,7 @@ diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in
|
||||
else
|
||||
true
|
||||
fi
|
||||
@@ -1191,6 +1201,7 @@
|
||||
@@ -1200,6 +1210,7 @@
|
||||
--disable-amd3dnow \
|
||||
--disable-static \
|
||||
`if test "$use_debug" = "no"; then echo --disable-debug; fi` \
|
||||
@ -58,7 +58,7 @@ diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in
|
||||
--disable-muxers \
|
||||
--disable-encoders \
|
||||
--disable-devices \
|
||||
@@ -1217,6 +1228,7 @@
|
||||
@@ -1226,6 +1237,7 @@
|
||||
--disable-static \
|
||||
--disable-ipv6 \
|
||||
`if test "$use_debug" = "no"; then echo --disable-debug; fi` \
|
||||
@ -66,7 +66,7 @@ diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in
|
||||
--disable-muxers \
|
||||
--disable-encoders \
|
||||
--disable-decoder=mpeg_xvmc \
|
||||
@@ -1229,6 +1241,7 @@
|
||||
@@ -1238,6 +1250,7 @@
|
||||
--enable-postproc \
|
||||
--enable-gpl \
|
||||
`if test "$use_vdpau" = "yes"; then echo --enable-vdpau; else echo --disable-vdpau; fi` \
|
||||
@ -74,7 +74,7 @@ diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in
|
||||
--enable-libfaad \
|
||||
--enable-protocol=http \
|
||||
--enable-pthreads \
|
||||
@@ -1242,12 +1255,16 @@
|
||||
@@ -1251,12 +1264,16 @@
|
||||
CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
||||
LDFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
||||
./configure \
|
||||
@ -91,7 +91,7 @@ diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in
|
||||
--disable-oss \
|
||||
--disable-solaris-audio \
|
||||
--disable-al-audio \
|
||||
@@ -1260,11 +1277,15 @@
|
||||
@@ -1269,11 +1286,15 @@
|
||||
if test "$host_vendor" = "apple" ; then
|
||||
./configure MACOSX_DEPLOYMENT_TARGET=10.4 \
|
||||
CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
||||
@ -107,7 +107,7 @@ diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in
|
||||
--disable-doc \
|
||||
--enable-static \
|
||||
--with-pic
|
||||
@@ -1275,6 +1296,8 @@
|
||||
@@ -1284,6 +1305,8 @@
|
||||
if test "$host_vendor" = "apple" ; then
|
||||
./configure2 MACOSX_DEPLOYMENT_TARGET=10.4 \
|
||||
--extra-cflags="$DVDREAD_CFLAGS -D__DARWIN__ -fPIC -DPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -I`pwd`/../libdvdcss/src" \
|
||||
@ -116,7 +116,7 @@ diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in
|
||||
--enable-static \
|
||||
--disable-shared \
|
||||
--cc="$CC" &&
|
||||
@@ -1284,6 +1307,8 @@
|
||||
@@ -1293,6 +1316,8 @@
|
||||
else
|
||||
./configure2 \
|
||||
--extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../libdvdcss/src" \
|
||||
@ -125,7 +125,7 @@ diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in
|
||||
--enable-static \
|
||||
--disable-shared \
|
||||
--cc="$CC" &&
|
||||
@@ -1299,6 +1324,8 @@
|
||||
@@ -1308,6 +1333,8 @@
|
||||
./configure2 MACOSX_DEPLOYMENT_TARGET=10.4 \
|
||||
--extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -I`pwd`/../includes" \
|
||||
--extra-ldflags="-L`pwd`/../libdvdread/obj" \
|
||||
@ -134,7 +134,7 @@ diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in
|
||||
--with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \
|
||||
--enable-static \
|
||||
--disable-shared \
|
||||
@@ -1307,6 +1334,8 @@
|
||||
@@ -1316,6 +1343,8 @@
|
||||
./configure2 \
|
||||
--extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../includes" \
|
||||
--extra-ldflags="-L`pwd`/../libdvdread/obj" \
|
||||
@ -143,18 +143,16 @@ diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in
|
||||
--with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \
|
||||
--enable-static \
|
||||
--disable-shared \
|
||||
@@ -1328,6 +1357,10 @@
|
||||
@@ -1337,6 +1366,8 @@
|
||||
if test "$host_vendor" = "apple" ; then
|
||||
CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
||||
./configure MACOSX_DEPLOYMENT_TARGET=10.4 \
|
||||
+ --host=$host_alias \
|
||||
+ --build=$build_alias \
|
||||
+ --host=$host_alias \
|
||||
+ --build=$build_alias \
|
||||
--with-pic \
|
||||
--disable-static \
|
||||
--enable-shared \
|
||||
@@ -1337,6 +1370,8 @@
|
||||
@@ -1346,6 +1377,8 @@
|
||||
--disable-al-audio
|
||||
else
|
||||
./configure \
|
||||
@ -163,7 +161,7 @@ diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in
|
||||
--with-pic \
|
||||
--disable-static \
|
||||
--enable-shared \
|
||||
@@ -1352,6 +1387,8 @@
|
||||
@@ -1361,6 +1394,8 @@
|
||||
if test "$host_vendor" = "apple" ; then
|
||||
CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
||||
./configure MACOSX_DEPLOYMENT_TARGET=10.4 \
|
||||
@ -172,7 +170,7 @@ diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in
|
||||
--with-pic \
|
||||
--disable-static \
|
||||
--enable-shared \
|
||||
@@ -1360,6 +1397,8 @@
|
||||
@@ -1369,6 +1404,8 @@
|
||||
--without-x
|
||||
else
|
||||
./configure \
|
||||
@ -181,7 +179,7 @@ diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in
|
||||
--with-pic \
|
||||
--disable-static \
|
||||
--enable-shared \
|
||||
@@ -1373,6 +1412,8 @@
|
||||
@@ -1382,6 +1419,8 @@
|
||||
if test "$host_vendor" = "apple" ; then
|
||||
CFLAGS="-fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
||||
./configure MACOSX_DEPLOYMENT_TARGET=10.4 \
|
||||
@ -190,7 +188,7 @@ diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in
|
||||
--with-pic
|
||||
else
|
||||
true
|
||||
@@ -1383,17 +1424,23 @@
|
||||
@@ -1392,17 +1431,23 @@
|
||||
if test "$host_vendor" = "apple" ; then
|
||||
export MACOSX_DEPLOYMENT_TARGET=10.4
|
||||
CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
||||
@ -217,7 +215,7 @@ diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in
|
||||
fi
|
||||
], [$USE_EXTERNAL_LIBASS])
|
||||
|
||||
@@ -1402,12 +1449,16 @@
|
||||
@@ -1411,12 +1456,16 @@
|
||||
CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -fno-common" \
|
||||
CPPFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -fno-common" \
|
||||
./configure MACOSX_DEPLOYMENT_TARGET=10.4 \
|
||||
@ -234,7 +232,7 @@ diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in
|
||||
--disable-static \
|
||||
--disable-debugging \
|
||||
--with-pic
|
||||
@@ -1425,6 +1476,8 @@
|
||||
@@ -1434,6 +1483,8 @@
|
||||
XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
|
||||
if test "$host_vendor" != "apple" ; then
|
||||
./configure \
|
||||
@ -243,7 +241,7 @@ diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in
|
||||
--disable-shared \
|
||||
--enable-static \
|
||||
--with-pic
|
||||
@@ -1439,6 +1492,8 @@
|
||||
@@ -1448,6 +1499,8 @@
|
||||
CXXFLAGS="-fPIC -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
||||
LDFLAGS="-L/opt/local/lib" \
|
||||
LIBS="-lz" \
|
||||
@ -252,7 +250,7 @@ diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in
|
||||
--x-includes=/usr/X11/include --x-libraries=/usr/X11/lib \
|
||||
--without-xscreensaver \
|
||||
--disable-sound \
|
||||
@@ -1454,6 +1509,8 @@
|
||||
@@ -1463,6 +1516,8 @@
|
||||
./configure \
|
||||
CFLAGS="-fPIC" \
|
||||
CXXFLAGS="-fPIC" \
|
||||
@ -261,21 +259,22 @@ diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in
|
||||
--without-xscreensaver \
|
||||
--disable-sound \
|
||||
--disable-cyclone \
|
||||
@@ -1469,9 +1526,13 @@
|
||||
@@ -1478,9 +1533,13 @@
|
||||
|
||||
XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [
|
||||
if test "$host_vendor" = "apple" ; then
|
||||
- ./configure --with-ssl-dir=/opt/local/include
|
||||
- else
|
||||
- ./configure
|
||||
+ ./configure --with-ssl-dir=/opt/local/include \
|
||||
- ./configure --without-openssl
|
||||
+ ./configure --with-ssl-dir=/opt/local/include \
|
||||
+ --host=$host_alias \
|
||||
+ --build=$build_alias
|
||||
+ else
|
||||
+ ./configure \
|
||||
+ ./configure --without-openssl \
|
||||
+ --host=$host_alias \
|
||||
+ --build=$build_alias
|
||||
fi
|
||||
], [0])
|
||||
|
||||
diff -Naur xbmc-pvr-26651/configure.in.orig xbmc-pvr-26651.patch/configure.in.orig
|
||||
diff -Naur xbmc-26784/configure.in.orig xbmc-26784.patch/configure.in.orig
|
||||
diff -Naur xbmc-26784/configure.in.rej xbmc-26784.patch/configure.in.rej
|
||||
|
@ -1,24 +1,26 @@
|
||||
diff -Naur xbmc-pvr-26651/guilib/Makefile xbmc-pvr-26651.patch/guilib/Makefile
|
||||
--- xbmc-pvr-26651/guilib/Makefile 2010-01-11 03:33:19.802350966 +0100
|
||||
+++ xbmc-pvr-26651.patch/guilib/Makefile 2010-01-11 04:38:11.069345520 +0100
|
||||
diff -Naur xbmc-pvr-26925.patch/guilib/Makefile xbmc-pvr-26925/guilib/Makefile
|
||||
--- xbmc-pvr-26925.patch/guilib/Makefile 2010-01-17 00:52:32.000000000 +0100
|
||||
+++ xbmc-pvr-26925/guilib/Makefile 2010-01-17 03:36:21.848605153 +0100
|
||||
@@ -1,4 +1,4 @@
|
||||
-INCLUDES=-I. -I../ -Icommon -I../xbmc -I../xbmc/cores/dvdplayer/Codecs/ffmpeg -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/cores/dvdplayer/Codecs/ffmpeg -I../xbmc/linux -I../xbmc/utils -I../xbmc/lib/libsquish
|
||||
|
||||
SRCS=AnimatedGif.cpp \
|
||||
AudioContext.cpp \
|
||||
diff -Naur xbmc-pvr-26651/xbmc/FileSystem/Makefile xbmc-pvr-26651.patch/xbmc/FileSystem/Makefile
|
||||
--- xbmc-pvr-26651/xbmc/FileSystem/Makefile 2010-01-11 03:41:38.093347308 +0100
|
||||
+++ xbmc-pvr-26651.patch/xbmc/FileSystem/Makefile 2010-01-11 04:38:11.069345520 +0100
|
||||
@@ -1,4 +1,4 @@
|
||||
diff -Naur xbmc-pvr-26925.patch/xbmc/FileSystem/Makefile.in xbmc-pvr-26925/xbmc/FileSystem/Makefile.in
|
||||
--- xbmc-pvr-26925.patch/xbmc/FileSystem/Makefile.in 2010-01-17 00:55:02.000000000 +0100
|
||||
+++ xbmc-pvr-26925/xbmc/FileSystem/Makefile.in 2010-01-17 03:37:31.530272600 +0100
|
||||
@@ -1,6 +1,6 @@
|
||||
ARCH=@ARCH@
|
||||
|
||||
-INCLUDES=-I. -I../ -I../cores -I../linux -I../../guilib -I../lib/UnrarXLib -I../utils -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I../lib
|
||||
+INCLUDES=-I. -I../ -I../cores -I../linux -I../../guilib -I../lib/UnrarXLib -I../utils -I../lib
|
||||
INCLUDES+=-I../lib/libcdio/libcdio/include
|
||||
|
||||
CXXFLAGS+=-D__STDC_FORMAT_MACROS \
|
||||
diff -Naur xbmc-pvr-26651/xbmc/Makefile xbmc-pvr-26651.patch/xbmc/Makefile
|
||||
--- xbmc-pvr-26651/xbmc/Makefile 2010-01-11 03:34:23.448346973 +0100
|
||||
+++ xbmc-pvr-26651.patch/xbmc/Makefile 2010-01-11 04:38:11.076345842 +0100
|
||||
ifeq ($(findstring osx,$(ARCH)), osx)
|
||||
INCLUDES+=-I../../lib/libcurl-OSX/include
|
||||
diff -Naur xbmc-pvr-26925.patch/xbmc/Makefile xbmc-pvr-26925/xbmc/Makefile
|
||||
--- xbmc-pvr-26925.patch/xbmc/Makefile 2010-01-17 00:53:34.000000000 +0100
|
||||
+++ xbmc-pvr-26925/xbmc/Makefile 2010-01-17 03:36:59.145199453 +0100
|
||||
@@ -1,4 +1,4 @@
|
||||
-INCLUDES+=-I../ -I. -Ilinux -Icores -I../guilib -Iutils -IFileSystem -I/usr/include/freetype2 -Icores/dvdplayer -Icores/dvdplayer/Codecs/ffmpeg
|
||||
+INCLUDES+=-I../ -I. -Ilinux -Icores -I../guilib -Iutils -IFileSystem -Icores/dvdplayer -Icores/dvdplayer/Codecs/ffmpeg
|
||||
|
@ -1,12 +0,0 @@
|
||||
diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in
|
||||
--- xbmc-pvr-26651/configure.in 2010-01-11 04:37:50.978472580 +0100
|
||||
+++ xbmc-pvr-26651.patch/configure.in 2010-01-11 04:38:58.055345557 +0100
|
||||
@@ -1573,6 +1573,7 @@
|
||||
--build=$build_alias
|
||||
else
|
||||
./configure \
|
||||
+ `if test "$cross_compiling" = "yes"; then echo ac_cv_openssl_linker_option=no; fi` \
|
||||
--host=$host_alias \
|
||||
--build=$build_alias
|
||||
fi
|
||||
diff -Naur xbmc-pvr-26651/configure.in.orig xbmc-pvr-26651.patch/configure.in.orig
|
@ -1 +1 @@
|
||||
http://sources.openelec.tv/svn/xbmc-pvr-26784.tar.bz2
|
||||
http://sources.openelec.tv/svn/xbmc-pvr-26925.tar.bz2
|
||||
|
Loading…
x
Reference in New Issue
Block a user