xbmc-pvr:

- update to xbmc-pvr-27594
This commit is contained in:
Stephan Raue 2010-02-09 09:14:45 +01:00
parent 6c6a3df7ff
commit cd7e7c6b8e
9 changed files with 4799 additions and 369 deletions

View File

@ -35,7 +35,6 @@ $SCRIPTS/build freetype
$SCRIPTS/build jasper
# $SCRIPTS/build libass
# $SCRIPTS/build a52dec
$SCRIPTS/build libmad
$SCRIPTS/build libsamplerate
$SCRIPTS/build libogg
@ -105,6 +104,8 @@ cd -
--disable-ccache \
--disable-pulse \
--enable-faac \
--disable-libdts \
--disable-liba52 \
--enable-dvdcss \
--disable-mid \
--disable-goom \
@ -116,7 +117,6 @@ cd -
--disable-external-liba52 \
--disable-external-libdts \
--disable-external-libass \
--enable-external-libogg \
--enable-external-python \
make externals

View File

@ -78,7 +78,7 @@ mkdir -p $INSTALL/usr/share/xbmc/media/Fonts
cp -PR $PKG_DIR/fonts/*.ttf $INSTALL/usr/share/xbmc/media/Fonts
mkdir -p $INSTALL/usr/share/xbmc/media
cp -PR $PKG_BUILD/media/weather.rar $INSTALL/usr/share/xbmc/media/
cp -PR $PKG_BUILD/media/weather.zip $INSTALL/usr/share/xbmc/media/
cp -PR $PKG_BUILD/media/icon.png $INSTALL/usr/share/xbmc/media/
cp -PR $PKG_DIR/splash/Splash.png $INSTALL/usr/share/xbmc/media/
@ -94,7 +94,6 @@ mkdir -p $INSTALL/usr/share/xbmc/sounds
cp -PR $PKG_BUILD/sounds/* $INSTALL/usr/share/xbmc/sounds
mkdir -p $INSTALL/usr/share/xbmc/system
cp -PR $PKG_BUILD/system/*linux.so $INSTALL/usr/share/xbmc/system
cp -PR $PKG_BUILD/system/*.xml $INSTALL/usr/share/xbmc/system
cp -PR $PKG_BUILD/system/*.conf $INSTALL/usr/share/xbmc/system

View File

@ -1,24 +0,0 @@
diff -Naur xbmc-pvr-27135/xbmc/lib/libPython/xbmcmodule/player.cpp xbmc-pvr-27135.patch/xbmc/lib/libPython/xbmcmodule/player.cpp
--- xbmc-pvr-27135/xbmc/lib/libPython/xbmcmodule/player.cpp 2010-01-24 11:53:57.108631848 +0100
+++ xbmc-pvr-27135.patch/xbmc/lib/libPython/xbmcmodule/player.cpp 2010-01-24 17:57:58.453446334 +0100
@@ -470,12 +470,15 @@
char *cLine = NULL;
if (!PyArg_ParseTuple(args, (char*)"s", &cLine)) return NULL;
- int nStream = g_application.m_pPlayer->GetSubtitleCount();
+ if (g_application.m_pPlayer)
+ {
+ int nStream = g_application.m_pPlayer->GetSubtitleCount();
- g_settings.m_currentVideoSettings.m_SubtitleOn = true;
- g_application.m_pPlayer->SetSubtitleVisible(true);
- g_application.m_pPlayer->AddSubtitle(cLine);
- g_application.m_pPlayer->SetSubtitle(nStream);
+ g_settings.m_currentVideoSettings.m_SubtitleOn = true;
+ g_application.m_pPlayer->SetSubtitleVisible(true);
+ g_application.m_pPlayer->AddSubtitle(cLine);
+ g_application.m_pPlayer->SetSubtitle(nStream);
+ }
Py_INCREF(Py_None);
return Py_None;

View File

@ -1,195 +0,0 @@
diff -Naur xbmc-pvr-27135/configure.in xbmc-pvr-27135.patch/configure.in
--- xbmc-pvr-27135/configure.in 2010-01-24 11:53:00.868755115 +0100
+++ xbmc-pvr-27135.patch/configure.in 2010-01-24 17:59:15.923594722 +0100
@@ -55,8 +55,6 @@
external_liba52_disabled="== Use of external liba52 disabled. =="
external_libdts_enabled="== Use of external libdts enabled. =="
external_libdts_disabled="== Use of external libdts disabled. =="
-external_libmpeg2_enabled="== Use of external libmpeg2 enabled. =="
-external_libmpeg2_disabled="== Use of external libmpeg2 disabled. =="
external_libass_enabled="== Use of external libass enabled. =="
external_libass_disabled="== Use of external libass disabled. =="
external_libogg_enabled="== Use of external libogg enabled. =="
@@ -218,12 +216,6 @@
[use_external_libdts=$enableval],
[use_external_libdts=no])
-AC_ARG_ENABLE([external-libmpeg2],
- [AS_HELP_STRING([--enable-external-libmpeg2],
- [enable use of external libmpeg2 library (default is no) 'Linux only'])],
- [use_external_libmpeg2=$enableval],
- [use_external_libmpeg2=no])
-
AC_ARG_ENABLE([external-libass],
[AS_HELP_STRING([--enable-external-libass],
[enable use of external libass library (default is no) 'Linux only'])],
@@ -328,6 +320,8 @@
AC_CHECK_LIB([ssl], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([crypto], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([wavpack], [main],, AC_MSG_ERROR($missing_library))
+AC_CHECK_LIB([mpeg2], [main],, AC_MSG_ERROR($missing_library))
+AC_CHECK_LIB([mpeg2convert],[main],, AC_MSG_ERROR($missing_library))
PKG_CHECK_MODULES([MAD], [mad],
[INCLUDES+=" $MAD_CFLAGS"; LIBS+=" $MAD_LIBS"],
AC_MSG_ERROR($missing_library))
@@ -592,19 +586,6 @@
USE_EXTERNAL_LIBDTS=0
fi
-# External libmpeg2
-if test "$use_external_libraries" = "yes" || test "$use_external_libmpeg2" = "yes"; then
- AC_CHECK_LIB([mpeg2], [main],, AC_MSG_ERROR($missing_library))
- AC_CHECK_LIB([mpeg2convert], [main],, AC_MSG_ERROR($missing_library))
-
- AC_MSG_NOTICE($external_libmpeg2_enabled)
- USE_EXTERNAL_LIBMPEG2=1
- AC_DEFINE([USE_EXTERNAL_LIBMPEG2], [1], [Whether to use external libmpeg2 library.])
-else
- AC_MSG_NOTICE($external_libmpeg2_disabled)
- USE_EXTERNAL_LIBMPEG2=0
-fi
-
# External libass
if test "$use_external_libraries" = "yes" || test "$use_external_libass" = "yes"; then
# We need libass >= 0.9.7.
@@ -984,11 +965,6 @@
else
final_message="$final_message\n External libdts:\tNo"
fi
- if test "$use_external_libmpeg2" = "yes"; then
- final_message="$final_message\n External libmpeg2:\tYes"
- else
- final_message="$final_message\n External libmpeg2:\tNo"
- fi
if test "$use_external_libass" = "yes"; then
final_message="$final_message\n External libass:\tYes"
else
@@ -1354,27 +1330,6 @@
fi
], [$USE_EXTERNAL_LIBA52])
-XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libmpeg2], [
- 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 \
- --with-pic \
- --disable-static \
- --enable-shared \
- --disable-directx \
- --disable-sdl \
- --without-x
- else
- ./configure \
- --with-pic \
- --disable-static \
- --enable-shared \
- --disable-directx \
- --disable-sdl \
- --without-x
- fi
-], [$USE_EXTERNAL_LIBMPEG2])
-
XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libmad], [
if test "$host_vendor" = "apple" ; then
CFLAGS="-fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
diff -Naur xbmc-pvr-27135/README.ubuntu xbmc-pvr-27135.patch/README.ubuntu
--- xbmc-pvr-27135/README.ubuntu 2010-01-24 11:53:28.003696562 +0100
+++ xbmc-pvr-27135.patch/README.ubuntu 2010-01-24 17:59:15.923594722 +0100
@@ -41,7 +41,7 @@
For Ubuntu (all versions >= 7.04):
- # sudo aptitude install subversion make g++ gcc gawk pmount libtool nasm automake cmake gperf unzip bison libsdl-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libfribidi-dev liblzo2-dev libfreetype6-dev libsqlite3-dev libogg-dev libasound-dev python-sqlite libglew-dev libcurl3 libcurl4-openssl-dev x11proto-xinerama-dev libxinerama-dev libxrandr-dev libxrender-dev libmad0-dev libogg-dev libvorbis-dev libsmbclient-dev libmysqlclient-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper-dev libfontconfig-dev libbz2-dev libboost-dev libfaac-dev libenca-dev libxt-dev libxtst-dev libxmu-dev libpng-dev libjpeg-dev libpulse-dev mesa-utils libcdio-dev libsamplerate-dev libmms-dev libmpeg3-dev libfaad-dev libflac-dev libiso9660-dev libass-dev libssl-dev fp-compiler gdc libwavpack-dev
+ # sudo aptitude install subversion make g++ gcc gawk pmount libtool nasm automake cmake gperf unzip bison libsdl-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libfribidi-dev liblzo2-dev libfreetype6-dev libsqlite3-dev libogg-dev libasound-dev python-sqlite libglew-dev libcurl3 libcurl4-openssl-dev x11proto-xinerama-dev libxinerama-dev libxrandr-dev libxrender-dev libmad0-dev libogg-dev libvorbis-dev libsmbclient-dev libmysqlclient-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper-dev libfontconfig-dev libbz2-dev libboost-dev libfaac-dev libenca-dev libxt-dev libxtst-dev libxmu-dev libpng-dev libjpeg-dev libpulse-dev mesa-utils libcdio-dev libsamplerate-dev libmms-dev libmpeg3-dev libfaad-dev libflac-dev libiso9660-dev libass-dev libssl-dev fp-compiler gdc libwavpack-dev libmpeg2-4-dev
On 8.04 and older versions, libmms is outdated and thus XBMC will not compile properly.
In this case you will have to manually compile the latest version.
diff -Naur xbmc-pvr-27135/xbmc/cores/dvdplayer/Codecs/Makefile.in xbmc-pvr-27135.patch/xbmc/cores/dvdplayer/Codecs/Makefile.in
--- xbmc-pvr-27135/xbmc/cores/dvdplayer/Codecs/Makefile.in 2010-01-24 11:54:24.100638872 +0100
+++ xbmc-pvr-27135.patch/xbmc/cores/dvdplayer/Codecs/Makefile.in 2010-01-24 17:59:15.921599160 +0100
@@ -16,9 +16,6 @@
ifneq (@USE_EXTERNAL_LIBDTS@,1)
DIRS+=libdts
endif
-ifneq (@USE_EXTERNAL_LIBMPEG2@,1)
- DIRS+=libmpeg2
-endif
LIBS=
ifneq (@USE_EXTERNAL_FFMPEG@,1)
@@ -35,9 +32,6 @@
ifneq (@USE_EXTERNAL_LIBDTS@,1)
LIBS+=libdts-$(ARCH).so
endif
-ifneq (@USE_EXTERNAL_LIBMPEG2@,1)
- LIBS+=libmpeg2-$(ARCH).so
-endif
ifeq ($(findstring osx,$(ARCH)),osx)
DIRS+=libmad
@@ -131,11 +125,6 @@
liba52/libao/libao.a $(BUNDLE1_O)
#$(WRAPPER_OSX) $@;mv output.so $@
-$(SYSDIR)/libmpeg2-$(ARCH).so: $(WRAPPER_OSX) libmpeg2/libmpeg2/libmpeg2.la
- ld -bundle -flat_namespace -undefined suppress -o $@ \
- libmpeg2/libmpeg2/.libs/*.o $(BUNDLE1_O)
- $(WRAPPER_OSX) $@;mv output.so $@
-
libdts/libdts/libdts.a : libdts;
libdts:
$(MAKE) -C $@
@@ -153,10 +142,6 @@
liba52:
$(MAKE) -C $@
-libmpeg2/libmpeg2/libmpeg2.la: libmpeg2
-libmpeg2:
- $(MAKE) -C $@
-
else
$(SYSDIR)/avutil-50-$(ARCH).so: ffmpeg/libavutil/libavutil.so
@@ -203,10 +188,6 @@
$(CC) -o $@ $(LDFLAGS) --soname,$@ liba52/libao/libao.a \
-Wl`cat $(WRAPPER:.o=.def)` $(WRAPPER)
-$(SYSDIR)/libmpeg2-$(ARCH).so: $(WRAPPER) libmpeg2/libmpeg2/libmpeg2.la
- $(CC) -o $@ $(LDFLAGS) --soname,$@ libmpeg2/libmpeg2/.libs/*.o \
- -Wl`cat $(WRAPPER:.o=.def)` $(WRAPPER)
-
libdts/libdts/libdts.a : libdts;
libdts:
$(MAKE) -C $@
@@ -216,10 +197,6 @@
liba52:
$(MAKE) -C $@
-libmpeg2/libmpeg2/libmpeg2.la: libmpeg2
-libmpeg2:
- $(MAKE) -C $@
-
endif
clean:
diff -Naur xbmc-pvr-27135/xbmc/cores/dvdplayer/DVDCodecs/Video/DllLibMpeg2.h xbmc-pvr-27135.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/DllLibMpeg2.h
--- xbmc-pvr-27135/xbmc/cores/dvdplayer/DVDCodecs/Video/DllLibMpeg2.h 2010-01-24 11:54:33.299754754 +0100
+++ xbmc-pvr-27135.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/DllLibMpeg2.h 2010-01-24 17:59:15.921599160 +0100
@@ -25,7 +25,7 @@
#include "config.h"
#endif
extern "C" {
-#if (defined USE_EXTERNAL_LIBMPEG2)
+#if (!defined WIN32)
#include <mpeg2dec/mpeg2.h>
#include <mpeg2dec/mpeg2convert.h>
#else
@@ -54,7 +54,7 @@
virtual void mpeg2_skip(mpeg2dec_t * mpeg2dec, int skip)=0;
};
-#if (defined USE_EXTERNAL_LIBMPEG2)
+#if (!defined WIN32)
class DllLibMpeg2 : public DllDynamic, DllLibMpeg2Interface
{

View File

@ -1,40 +0,0 @@
diff -Naur xbmc-pvr-27135/xbmc/utils/SystemInfo.cpp xbmc-pvr-27135.patch/xbmc/utils/SystemInfo.cpp
--- xbmc-pvr-27135/xbmc/utils/SystemInfo.cpp 2010-01-24 11:54:23.303629749 +0100
+++ xbmc-pvr-27135.patch/xbmc/utils/SystemInfo.cpp 2010-01-24 18:00:16.991476525 +0100
@@ -577,9 +577,27 @@
#if defined(_LINUX) && !defined(__APPLE__)
CStdString CSysInfo::GetLinuxDistro()
{
- CStdString result = "";
+ static const char* release_file[] = { "/etc/debian_version",
+ "/etc/SuSE-release",
+ "/etc/mandrake-release",
+ "/etc/fedora-release",
+ "/etc/redhat-release",
+ "/etc/gentoo-release",
+ "/etc/slackware-version",
+ "/etc/arch-release",
+ NULL };
FILE* pipe = popen("unset PYTHONHOME; unset PYTHONPATH; lsb_release -d | cut -f2", "r");
+
+ for (int i = 0; !pipe && release_file[i]; i++)
+ {
+ CStdString cmd = "cat ";
+ cmd += release_file[i];
+
+ pipe = popen(cmd.c_str(), "r");
+ }
+
+ CStdString result = "";
if (pipe)
{
char buffer[256] = {'\0'};
@@ -589,7 +607,6 @@
CLog::Log(LOGWARNING, "Unable to determine Linux distribution");
pclose(pipe);
}
-
return result.Trim();
}
#endif

View File

@ -1,57 +0,0 @@
diff -Naur xbmc-pvr-27135/xbmc/FileItem.cpp xbmc-pvr-27135.patch/xbmc/FileItem.cpp
--- xbmc-pvr-27135/xbmc/FileItem.cpp 2010-01-24 11:53:29.580755057 +0100
+++ xbmc-pvr-27135.patch/xbmc/FileItem.cpp 2010-01-24 18:02:09.346444342 +0100
@@ -33,11 +33,9 @@
#include "FileSystem/MultiPathDirectory.h"
#include "FileSystem/MusicDatabaseDirectory.h"
#include "FileSystem/VideoDatabaseDirectory.h"
-#include "FileSystem/IDirectory.h"
#include "FileSystem/FactoryDirectory.h"
#include "MusicInfoTagLoaderFactory.h"
#include "CueDocument.h"
-#include "utils/fstrcmp.h"
#include "VideoDatabase.h"
#include "MusicDatabase.h"
#include "SortFileItem.h"
@@ -57,7 +55,6 @@
#include "GUISettings.h"
#include "AdvancedSettings.h"
#include "Settings.h"
-#include "utils/TimeUtils.h"
#include "utils/RegExp.h"
#include "utils/log.h"
#include "karaoke/karaokelyricsfactory.h"
diff -Naur xbmc-pvr-27135/xbmc/FileItem.cpp.orig xbmc-pvr-27135.patch/xbmc/FileItem.cpp.orig
diff -Naur xbmc-pvr-27135/xbmc/GUIWindowVideoBase.cpp xbmc-pvr-27135.patch/xbmc/GUIWindowVideoBase.cpp
--- xbmc-pvr-27135/xbmc/GUIWindowVideoBase.cpp 2010-01-24 11:54:22.566755297 +0100
+++ xbmc-pvr-27135.patch/xbmc/GUIWindowVideoBase.cpp 2010-01-24 18:02:09.343444194 +0100
@@ -36,7 +36,6 @@
#include "Application.h"
#include "NfoFile.h"
#include "Picture.h"
-#include "utils/fstrcmp.h"
#include "PlayListPlayer.h"
#include "GUIPassword.h"
#include "FileSystem/ZipManager.h"
diff -Naur xbmc-pvr-27135/xbmc/ProgramDatabase.cpp xbmc-pvr-27135.patch/xbmc/ProgramDatabase.cpp
--- xbmc-pvr-27135/xbmc/ProgramDatabase.cpp 2010-01-24 11:53:30.581257422 +0100
+++ xbmc-pvr-27135.patch/xbmc/ProgramDatabase.cpp 2010-01-24 18:02:09.344444453 +0100
@@ -20,7 +20,6 @@
*/
#include "ProgramDatabase.h"
-#include "utils/fstrcmp.h"
#include "Util.h"
#include "GUIWindowFileManager.h"
#include "FileItem.h"
diff -Naur xbmc-pvr-27135/xbmc/VideoDatabase.cpp xbmc-pvr-27135.patch/xbmc/VideoDatabase.cpp
--- xbmc-pvr-27135/xbmc/VideoDatabase.cpp 2010-01-24 11:53:29.525632072 +0100
+++ xbmc-pvr-27135.patch/xbmc/VideoDatabase.cpp 2010-01-24 18:02:09.342444075 +0100
@@ -21,7 +21,6 @@
#include "VideoDatabase.h"
#include "GUIWindowVideoBase.h"
-#include "utils/fstrcmp.h"
#include "utils/RegExp.h"
#include "utils/GUIInfoManager.h"
#include "Util.h"

View File

@ -1,7 +1,7 @@
diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
--- xbmc-27135/configure.in 2010-01-24 11:46:42.037632392 +0100
+++ xbmc-27135.patch/configure.in 2010-01-24 13:02:45.482579215 +0100
@@ -1098,6 +1098,8 @@
diff -Naur xbmc-27191/configure.in xbmc-27191.patch/configure.in
--- xbmc-27191/configure.in 2010-01-26 10:56:15.897804152 +0100
+++ xbmc-27191.patch/configure.in 2010-01-26 11:32:58.096953871 +0100
@@ -1073,6 +1073,8 @@
XB_CONFIG_MODULE([xbmc/lib/libPython/Python], [
if test "$host_vendor" = "apple" ; then
./configure \
@ -10,7 +10,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
--enable-ipv6 \
--enable-unicode=ucs4 \
--without-cxx \
@@ -1120,6 +1122,8 @@
@@ -1095,6 +1097,8 @@
cp pyconfig.h Include
else
./configure \
@ -19,7 +19,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
--enable-ipv6 \
--enable-unicode=ucs4 \
--without-cxx \
@@ -1137,6 +1141,8 @@
@@ -1112,6 +1116,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,29 +28,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
--with-pic \
--disable-asm-optimizations \
--disable-xmms-plugin \
@@ -1151,7 +1157,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" \
- ./configure MACOSX_DEPLOYMENT_TARGET=10.4 --with-pic
+ ./configure MACOSX_DEPLOYMENT_TARGET=10.4 --with-pic \
+ --host=$host_alias \
+ --build=$build_alias
else
true
fi
@@ -1160,7 +1168,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" \
- ./configure MACOSX_DEPLOYMENT_TARGET=10.4 --with-pic
+ ./configure MACOSX_DEPLOYMENT_TARGET=10.4 --with-pic \
+ --host=$host_alias \
+ --build=$build_alias
else
true
fi
@@ -1173,6 +1183,7 @@
@@ -1130,6 +1136,7 @@
--disable-amd3dnow \
--disable-static \
`if test "$use_debug" = "no"; then echo --disable-debug; fi` \
@ -58,7 +36,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
--disable-muxers \
--disable-encoders \
--disable-devices \
@@ -1199,6 +1210,7 @@
@@ -1156,6 +1163,7 @@
--disable-static \
--disable-ipv6 \
`if test "$use_debug" = "no"; then echo --disable-debug; fi` \
@ -66,7 +44,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
--disable-muxers \
--disable-encoders \
--disable-decoder=mpeg_xvmc \
@@ -1211,6 +1223,7 @@
@@ -1168,6 +1176,7 @@
--enable-postproc \
--enable-gpl \
`if test "$use_vdpau" = "yes"; then echo --enable-vdpau; else echo --disable-vdpau; fi` \
@ -74,7 +52,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
--enable-libfaad \
--enable-protocol=http \
--enable-pthreads \
@@ -1224,12 +1237,16 @@
@@ -1181,12 +1190,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 +69,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
--disable-oss \
--disable-solaris-audio \
--disable-al-audio \
@@ -1242,11 +1259,15 @@
@@ -1199,11 +1212,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 +85,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
--disable-doc \
--enable-static \
--with-pic
@@ -1257,6 +1278,8 @@
@@ -1214,6 +1231,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 +94,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
--enable-static \
--disable-shared \
--cc="$CC" &&
@@ -1266,6 +1289,8 @@
@@ -1223,6 +1242,8 @@
else
./configure2 \
--extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../libdvdcss/src" \
@ -125,7 +103,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
--enable-static \
--disable-shared \
--cc="$CC" &&
@@ -1281,6 +1306,8 @@
@@ -1238,6 +1259,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 +112,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
--with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \
--enable-static \
--disable-shared \
@@ -1289,6 +1316,8 @@
@@ -1246,6 +1269,8 @@
./configure2 \
--extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../includes" \
--extra-ldflags="-L`pwd`/../libdvdread/obj" \
@ -143,7 +121,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
--with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \
--enable-static \
--disable-shared \
@@ -1300,6 +1329,8 @@
@@ -1257,6 +1282,8 @@
if test "$host_vendor" = "apple" ; then
CFLAGS="-O3 -fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
./configure MACOSX_DEPLOYMENT_TARGET=10.4 \
@ -152,7 +130,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
--with-pic
else
true
@@ -1310,6 +1341,8 @@
@@ -1267,6 +1294,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 \
@ -161,7 +139,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
--with-pic \
--disable-static \
--enable-shared \
@@ -1319,6 +1352,8 @@
@@ -1276,6 +1305,8 @@
--disable-al-audio
else
./configure \
@ -170,7 +148,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
--with-pic \
--disable-static \
--enable-shared \
@@ -1334,6 +1369,8 @@
@@ -1291,6 +1322,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 \
@ -179,7 +157,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
--with-pic
else
true
@@ -1344,17 +1381,23 @@
@@ -1301,17 +1334,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" \
@ -206,7 +184,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
fi
], [$USE_EXTERNAL_LIBASS])
@@ -1363,12 +1406,16 @@
@@ -1320,12 +1359,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 \
@ -223,7 +201,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
--disable-static \
--disable-debugging \
--with-pic
@@ -1386,6 +1433,8 @@
@@ -1343,6 +1386,8 @@
XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
if test "$host_vendor" != "apple" ; then
./configure \
@ -232,7 +210,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
--disable-shared \
--enable-static \
--with-pic
@@ -1400,6 +1449,8 @@
@@ -1357,6 +1402,8 @@
CXXFLAGS="-fPIC -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
LDFLAGS="-L/opt/local/lib" \
LIBS="-lz" \
@ -241,7 +219,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
--x-includes=/usr/X11/include --x-libraries=/usr/X11/lib \
--without-xscreensaver \
--disable-sound \
@@ -1415,6 +1466,8 @@
@@ -1372,6 +1419,8 @@
./configure \
CFLAGS="-fPIC" \
CXXFLAGS="-fPIC" \
@ -250,7 +228,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
--without-xscreensaver \
--disable-sound \
--disable-cyclone \
@@ -1430,18 +1483,26 @@
@@ -1387,18 +1436,26 @@
XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [
if test "$host_vendor" = "apple" ; then
@ -282,7 +260,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
fi
], [0])
@@ -1449,9 +1510,13 @@
@@ -1406,9 +1463,13 @@
if test "$host_vendor" = "apple" ; then
CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -fno-common" \
CXXFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -fno-common" \

File diff suppressed because it is too large Load Diff

View File

@ -1 +1 @@
http://sources.openelec.tv/svn/xbmc-pvr-27135.tar.bz2
http://sources.openelec.tv/svn/xbmc-pvr-27594.tar.bz2