mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
new package:
- add new mediacenter XBMC (builds but not working)
This commit is contained in:
Stephan Raue
parent
4f793c2a9a
commit
d2ebd5e806
118
packages/mediacenter/xbmc/build
Executable file
118
packages/mediacenter/xbmc/build
Executable file
@ -0,0 +1,118 @@
|
||||
#!/bin/sh
|
||||
|
||||
. config/options
|
||||
|
||||
$SCRIPTS/build toolchain
|
||||
$SCRIPTS/build boost
|
||||
$SCRIPTS/build Python
|
||||
$SCRIPTS/build zlib
|
||||
$SCRIPTS/build bzip2
|
||||
$SCRIPTS/build lzo
|
||||
$SCRIPTS/build pcre
|
||||
|
||||
$SCRIPTS/build alsa-lib
|
||||
$SCRIPTS/build enca
|
||||
$SCRIPTS/build curl
|
||||
|
||||
$SCRIPTS/build dbus
|
||||
$SCRIPTS/build hal
|
||||
|
||||
$SCRIPTS/build libXt
|
||||
$SCRIPTS/build libXtst
|
||||
$SCRIPTS/build libXmu
|
||||
$SCRIPTS/build libXinerama
|
||||
$SCRIPTS/build libXrandr
|
||||
|
||||
$SCRIPTS/build $MESA #GL/GLU
|
||||
$SCRIPTS/build glew
|
||||
$SCRIPTS/build fontconfig
|
||||
$SCRIPTS/build fribidi
|
||||
|
||||
$SCRIPTS/build jpeg
|
||||
$SCRIPTS/build libpng
|
||||
$SCRIPTS/build tiff
|
||||
$SCRIPTS/build freetype
|
||||
$SCRIPTS/build jasper
|
||||
# $SCRIPTS/build libass
|
||||
|
||||
# $SCRIPTS/build a52dec
|
||||
$SCRIPTS/build libmad
|
||||
$SCRIPTS/build libsamplerate
|
||||
$SCRIPTS/build libogg
|
||||
$SCRIPTS/build libvorbis
|
||||
$SCRIPTS/build libcdio
|
||||
$SCRIPTS/build libmms
|
||||
# $SCRIPTS/build faac
|
||||
$SCRIPTS/build faad2
|
||||
$SCRIPTS/build flac
|
||||
# $SCRIPTS/build libmpeg2
|
||||
# $SCRIPTS/build musepack
|
||||
# $SCRIPTS/build ffmpeg
|
||||
|
||||
$SCRIPTS/build SDL #?
|
||||
$SCRIPTS/build SDL_mixer #?
|
||||
|
||||
$SCRIPTS/build avahi
|
||||
$SCRIPTS/build sqlite
|
||||
$SCRIPTS/build mysql #lib #?
|
||||
$SCRIPTS/build samba #lib
|
||||
|
||||
|
||||
# export CMAKE_INSTALL_PREFIX=/usr
|
||||
# export CMAKE_FIND_ROOT_PATH=$SYSROOT_PREFIX
|
||||
|
||||
cd $PKG_BUILD
|
||||
autoheader
|
||||
autoconf
|
||||
|
||||
CC_FOR_BUILD=$HOST_CC \
|
||||
CXX_FOR_BUILD=$HOST_CXX \
|
||||
LDFLAGS="$LDFLAGS -lutil" \
|
||||
./configure --host=$TARGET_NAME \
|
||||
--build=$HOST_NAME \
|
||||
--prefix=/usr \
|
||||
--exec-prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--datadir=/usr/share \
|
||||
--enable-debug \
|
||||
--enable-optimizations \
|
||||
--enable-gl \
|
||||
--disable-vdpau \
|
||||
--disable-profiling \
|
||||
--disable-joystick \
|
||||
--enable-xrandr \
|
||||
--disable-ccache \
|
||||
--disable-pulse \
|
||||
--enable-faac \
|
||||
--enable-dvdcss \
|
||||
--disable-mid \
|
||||
--disable-goom \
|
||||
--disable-xbmcprojectm \
|
||||
--disable-rsxs \
|
||||
--enable-avahi \
|
||||
--disable-external-ffmpeg \
|
||||
--disable-external-liba52 \
|
||||
--disable-external-libdts \
|
||||
--disable-external-libmpeg2 \
|
||||
--disable-external-libass \
|
||||
--disable-external-libogg \
|
||||
--enable-external-python \
|
||||
|
||||
# --disable-external-libmad \
|
||||
# --disable-external-libfaad \
|
||||
# --disable-external-libvorbis \
|
||||
# --disable-external-libmpcdec \
|
||||
# --disable-external-libflac \
|
||||
|
||||
# --enable-external-libraries \
|
||||
|
||||
# make
|
||||
|
||||
make externals
|
||||
make xbmc.bin
|
||||
make xbmc-xrandr
|
||||
|
||||
setup_toolchain host
|
||||
make skins
|
||||
|
||||
make prefix=`pwd`/.install-data install-datas
|
||||
77
packages/mediacenter/xbmc/install
Executable file
77
packages/mediacenter/xbmc/install
Executable file
@ -0,0 +1,77 @@
|
||||
#!/bin/sh
|
||||
|
||||
. config/options
|
||||
|
||||
$SCRIPTS/install Python
|
||||
$SCRIPTS/install zlib
|
||||
$SCRIPTS/install bzip2
|
||||
$SCRIPTS/install lzo
|
||||
$SCRIPTS/install pcre
|
||||
|
||||
$SCRIPTS/install alsa-lib
|
||||
$SCRIPTS/install enca
|
||||
$SCRIPTS/install curl
|
||||
|
||||
$SCRIPTS/install dbus
|
||||
$SCRIPTS/install hal
|
||||
|
||||
$SCRIPTS/install libXt
|
||||
$SCRIPTS/install libXtst
|
||||
$SCRIPTS/install libXmu
|
||||
$SCRIPTS/install libXinerama
|
||||
$SCRIPTS/install libXrandr
|
||||
|
||||
$SCRIPTS/install $MESA
|
||||
$SCRIPTS/install glew
|
||||
$SCRIPTS/install fontconfig
|
||||
$SCRIPTS/install fribidi
|
||||
|
||||
$SCRIPTS/install jpeg
|
||||
$SCRIPTS/install libpng
|
||||
$SCRIPTS/install tiff
|
||||
$SCRIPTS/install freetype
|
||||
$SCRIPTS/install jasper
|
||||
$SCRIPTS/install libass
|
||||
|
||||
# $SCRIPTS/install a52dec # static
|
||||
$SCRIPTS/install libmad
|
||||
$SCRIPTS/install libsamplerate
|
||||
$SCRIPTS/install libogg
|
||||
$SCRIPTS/install libvorbis
|
||||
$SCRIPTS/install libcdio
|
||||
$SCRIPTS/install libmms
|
||||
$SCRIPTS/install faac
|
||||
$SCRIPTS/install faad2
|
||||
$SCRIPTS/install flac
|
||||
$SCRIPTS/install libmpeg2
|
||||
$SCRIPTS/install musepack
|
||||
$SCRIPTS/install ffmpeg
|
||||
|
||||
$SCRIPTS/install SDL
|
||||
$SCRIPTS/install SDL_mixer
|
||||
|
||||
$SCRIPTS/install avahi
|
||||
$SCRIPTS/install sqlite
|
||||
$SCRIPTS/install mysql
|
||||
$SCRIPTS/install samba
|
||||
|
||||
$SCRIPTS/install xrandr
|
||||
|
||||
PKG_DIR=`find $PACKAGES -type d -name $1`
|
||||
|
||||
mkdir -p $INSTALL/usr/bin
|
||||
# cp $PKG_BUILD/tools/Linux/xbmc.sh $INSTALL/usr/bin/xbmc
|
||||
# cp $PKG_BUILD/tools/Linux/xbmc-standalone.sh $INSTALL/usr/bin/xbmc-standalone
|
||||
ln -s /usr/share/xbmc/xbmc.bin $INSTALL/usr/bin/xbmc
|
||||
|
||||
mkdir -p $INSTALL/usr/share/xbmc
|
||||
cp -PR $PKG_BUILD/xbmc.bin $INSTALL/usr/share/xbmc/xbmc.bin
|
||||
cp -PR $PKG_BUILD/xbmc-xrandr $INSTALL/usr/share/xbmc/xbmc-xrandr
|
||||
# cp -PR $PKG_BUILD/tools/Linux/FEH.py $INSTALL/usr/share/xbmc/FEH.py
|
||||
cp -PR $PKG_BUILD/.install-data/share/xbmc/* $INSTALL/usr/share/xbmc/
|
||||
|
||||
mkdir -p $INSTALL/usr/share/xbmc/web
|
||||
cp -R $PKG_BUILD/web/Project_Mayhem_III/* $INSTALL/usr/share/xbmc/web
|
||||
find $INSTALL/usr/share/xbmc/web -depth -name .svn -exec rm -rf {} \;
|
||||
|
||||
#ln -s /usr/bin/xrandr $INSTALL/usr/share/xbmc/xbmc-xrandr
|
||||
@ -0,0 +1,271 @@
|
||||
diff -Naur xbmc-23782/configure.in xbmc-23782.patch/configure.in
|
||||
--- xbmc-23782/configure.in 2009-10-17 07:13:04.000000000 +0200
|
||||
+++ xbmc-23782.patch/configure.in 2009-10-18 04:39:04.288321342 +0200
|
||||
@@ -69,6 +69,9 @@
|
||||
i*86*-linux-gnu*)
|
||||
ARCH="i486-linux"
|
||||
;;
|
||||
+ i*86*-linux-uclibc*)
|
||||
+ ARCH="i486-uclibc"
|
||||
+ ;;
|
||||
x86_64-*-linux-gnu*)
|
||||
ARCH="x86_64-linux"
|
||||
;;
|
||||
@@ -1071,6 +1074,8 @@
|
||||
cp pyconfig.h Include
|
||||
else
|
||||
./configure \
|
||||
+ --host=$host_alias \
|
||||
+ --build=$build_alias \
|
||||
--enable-ipv6 \
|
||||
--enable-unicode=ucs4 \
|
||||
--without-cxx \
|
||||
@@ -1088,6 +1093,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 \
|
||||
+ --host=$host_alias \
|
||||
+ --build=$build_alias \
|
||||
--with-pic \
|
||||
--disable-asm-optimizations \
|
||||
--disable-xmms-plugin \
|
||||
@@ -1102,7 +1109,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
|
||||
@@ -1111,7 +1120,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
|
||||
@@ -1120,6 +1131,7 @@
|
||||
XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/ffmpeg], [
|
||||
if test "$host_vendor" = "apple" ; then
|
||||
./configure \
|
||||
+ `if test "$cross_compiling" = "yes"; then echo --enable-cross-compile; fi` \
|
||||
--extra-cflags="-w -D_DARWIN_C_SOURCE -isysroot /Developer/SDKs/MacOSX10.4u.sdk" \
|
||||
--disable-static \
|
||||
`if test "$use_debug" = "no"; then echo --disable-debug; fi` \
|
||||
@@ -1144,6 +1156,7 @@
|
||||
|
||||
else
|
||||
./configure \
|
||||
+ `if test "$cross_compiling" = "yes"; then echo --enable-cross-compile; fi` \
|
||||
--disable-static \
|
||||
--disable-ipv6 \
|
||||
`if test "$use_debug" = "no"; then echo --disable-debug; fi` \
|
||||
@@ -1171,12 +1184,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 \
|
||||
+ --host=$host_alias \
|
||||
+ --build=$build_alias \
|
||||
--disable-oss \
|
||||
--disable-solaris-audio \
|
||||
--disable-al-audio \
|
||||
--disable-win
|
||||
else
|
||||
./configure \
|
||||
+ --host=$host_alias \
|
||||
+ --build=$build_alias \
|
||||
--disable-oss \
|
||||
--disable-solaris-audio \
|
||||
--disable-al-audio \
|
||||
@@ -1189,11 +1206,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" \
|
||||
+ --host=$host_alias \
|
||||
+ --build=$build_alias \
|
||||
--disable-doc \
|
||||
--enable-static \
|
||||
--with-pic
|
||||
else
|
||||
./configure \
|
||||
+ --host=$host_alias \
|
||||
+ --build=$build_alias \
|
||||
--disable-doc \
|
||||
--enable-static \
|
||||
--with-pic
|
||||
@@ -1204,6 +1225,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" \
|
||||
+ --host=$host_alias \
|
||||
+ --build=$build_alias \
|
||||
--enable-static \
|
||||
--disable-shared \
|
||||
--cc="$CC" &&
|
||||
@@ -1213,6 +1236,8 @@
|
||||
else
|
||||
./configure2 \
|
||||
--extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../libdvdcss/src" \
|
||||
+ --host=$host_alias \
|
||||
+ --build=$build_alias \
|
||||
--enable-static \
|
||||
--disable-shared \
|
||||
--cc="$CC" &&
|
||||
@@ -1226,6 +1251,8 @@
|
||||
XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav], [
|
||||
if test "$host_vendor" = "apple" ; then
|
||||
./configure2 MACOSX_DEPLOYMENT_TARGET=10.4 \
|
||||
+ --host=$host_alias \
|
||||
+ --build=$build_alias \
|
||||
--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" \
|
||||
--with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \
|
||||
@@ -1234,6 +1261,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" \
|
||||
@@ -1247,6 +1276,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 \
|
||||
+ --host=$host_alias \
|
||||
+ --build=$build_alias \
|
||||
--with-pic \
|
||||
--with-mp4v2
|
||||
else
|
||||
@@ -1258,6 +1289,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 \
|
||||
--with-pic \
|
||||
--disable-static \
|
||||
--enable-shared \
|
||||
@@ -1267,6 +1300,8 @@
|
||||
--disable-al-audio
|
||||
else
|
||||
./configure \
|
||||
+ --host=$host_alias \
|
||||
+ --build=$build_alias \
|
||||
--with-pic \
|
||||
--disable-static \
|
||||
--enable-shared \
|
||||
@@ -1282,6 +1317,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 \
|
||||
--with-pic \
|
||||
--disable-static \
|
||||
--enable-shared \
|
||||
@@ -1290,6 +1327,8 @@
|
||||
--without-x
|
||||
else
|
||||
./configure \
|
||||
+ --host=$host_alias \
|
||||
+ --build=$build_alias \
|
||||
--with-pic \
|
||||
--disable-static \
|
||||
--enable-shared \
|
||||
@@ -1303,6 +1342,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 \
|
||||
+ --host=$host_alias \
|
||||
+ --build=$build_alias \
|
||||
--with-pic
|
||||
else
|
||||
true
|
||||
@@ -1313,17 +1354,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" \
|
||||
- ./configure
|
||||
+ ./configure \
|
||||
+ --host=$host_alias \
|
||||
+ --build=$build_alias
|
||||
fi
|
||||
], [0])
|
||||
|
||||
XB_CONFIG_MODULE([xbmc/lib/libass], [
|
||||
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
|
||||
+ ./configure MACOSX_DEPLOYMENT_TARGET=10.4 \
|
||||
+ --host=$host_alias \
|
||||
+ --build=$build_alias
|
||||
else
|
||||
CFLAGS="$CFLAGS -fPIC" \
|
||||
- ./configure
|
||||
+ ./configure \
|
||||
+ --host=$host_alias \
|
||||
+ --build=$build_alias
|
||||
fi
|
||||
], [$USE_EXTERNAL_LIBASS])
|
||||
|
||||
@@ -1332,12 +1379,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 \
|
||||
+ --host=$host_alias \
|
||||
+ --build=$build_alias \
|
||||
--disable-static \
|
||||
--disable-debugging \
|
||||
--with-pic
|
||||
else
|
||||
CFLAGS=-O3 \
|
||||
./configure \
|
||||
+ --host=$host_alias \
|
||||
+ --build=$build_alias \
|
||||
--disable-static \
|
||||
--disable-debugging \
|
||||
--with-pic
|
||||
@@ -1357,12 +1408,16 @@
|
||||
./configure \
|
||||
CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
|
||||
CXXFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"\
|
||||
+ --host=$host_alias \
|
||||
+ --build=$build_alias \
|
||||
--disable-shared \
|
||||
--enable-static \
|
||||
--with-pic
|
||||
|
||||
else
|
||||
./configure \
|
||||
+ --host=$host_alias \
|
||||
+ --build=$build_alias \
|
||||
--disable-shared \
|
||||
--enable-static \
|
||||
--with-pic
|
||||
@@ -1378,6 +1433,8 @@
|
||||
LDFLAGS="-L/opt/local/lib" \
|
||||
LIBS="-lz" \
|
||||
--x-includes=/usr/X11/include --x-libraries=/usr/X11/lib \
|
||||
+ --host=$host_alias \
|
||||
+ --build=$build_alias \
|
||||
--without-xscreensaver \
|
||||
--disable-sound \
|
||||
--disable-cyclone \
|
||||
@@ -1392,6 +1449,8 @@
|
||||
./configure \
|
||||
CFLAGS="-fPIC" \
|
||||
CXXFLAGS="-fPIC" \
|
||||
+ --host=$host_alias \
|
||||
+ --build=$build_alias \
|
||||
--without-xscreensaver \
|
||||
--disable-sound \
|
||||
--disable-cyclone \
|
||||
@ -0,0 +1,64 @@
|
||||
diff -Naur xbmc-23757/configure.in xbmc-23757.patch/configure.in
|
||||
--- xbmc-23757/configure.in 2009-10-17 01:37:17.452517140 +0200
|
||||
+++ xbmc-23757.patch/configure.in 2009-10-17 01:31:52.602517899 +0200
|
||||
@@ -263,6 +263,25 @@
|
||||
PASSED_CFLAGS=$CFLAGS # Hack to override autoconf default values
|
||||
AC_PROG_CC
|
||||
CFLAGS=$PASSED_CFLAGS
|
||||
+
|
||||
+if test x"$CC_FOR_BUILD" = x; then
|
||||
+ if test x"$cross_compiling" = xyes; then
|
||||
+ AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc)
|
||||
+ else
|
||||
+ CC_FOR_BUILD="$CC"
|
||||
+ fi
|
||||
+fi
|
||||
+AC_SUBST([CC_FOR_BUILD])
|
||||
+
|
||||
+if test x"$CXX_FOR_BUILD" = x; then
|
||||
+ if test x"$cross_compiling" = xyes; then
|
||||
+ AC_CHECK_PROGS(CXX_FOR_BUILD, g++ cpp)
|
||||
+ else
|
||||
+ CXX_FOR_BUILD="$CXX"
|
||||
+ fi
|
||||
+fi
|
||||
+AC_SUBST([CXX_FOR_BUILD])
|
||||
+
|
||||
AC_PROG_AWK
|
||||
AC_PROG_LN_S
|
||||
AC_PROG_MAKE_SET
|
||||
diff -Naur xbmc-23757/Makefile.include.in xbmc-23757.patch/Makefile.include.in
|
||||
--- xbmc-23757/Makefile.include.in 2009-10-16 18:45:26.000000000 +0200
|
||||
+++ xbmc-23757.patch/Makefile.include.in 2009-10-17 03:52:35.461519121 +0200
|
||||
@@ -5,8 +5,10 @@
|
||||
ARCH=@ARCH@
|
||||
abs_top_srcdir=@abs_top_srcdir@
|
||||
prefix=@prefix@
|
||||
-CXX=@CXX@
|
||||
-CC=@CC@
|
||||
+CXX?=@CXX@
|
||||
+CC?=@CC@
|
||||
+CXX_FOR_BUILD?=@CXX_FOR_BUILD@
|
||||
+CC_FOR_BUILD?=@CC_FOR_BUILD@
|
||||
CXXFLAGS+=@CXXFLAGS@
|
||||
CXXFLAGS+=@DEBUG_FLAGS@
|
||||
CFLAGS+=@CFLAGS@
|
||||
diff -Naur xbmc-23757/tools/TexturePacker/Makefile.in xbmc-23757.patch/tools/TexturePacker/Makefile.in
|
||||
--- xbmc-23757/tools/TexturePacker/Makefile.in 2009-10-16 18:45:41.000000000 +0200
|
||||
+++ xbmc-23757.patch/tools/TexturePacker/Makefile.in 2009-10-17 03:54:09.299518353 +0200
|
||||
@@ -7,6 +7,9 @@
|
||||
LIBS = ../../xbmc/lib/libsquish/libsquish-@ARCH@.a -lSDL_image -lSDL -llzo2
|
||||
endif
|
||||
|
||||
+CC=$(CC_FOR_BUILD)
|
||||
+CXX=$(CXX_FOR_BUILD)
|
||||
+
|
||||
OBJS = \
|
||||
SDL_anigif.o \
|
||||
XBTFWriter.o \
|
||||
@@ -21,4 +24,4 @@
|
||||
include ../../Makefile.include
|
||||
|
||||
$(TARGET): $(OBJS)
|
||||
- $(CXX) $(OBJS) $(LDFLAGS) $(LIBS) -o $(TARGET)
|
||||
+ $(CXX_FOR_BUILD) $(OBJS) $(LDFLAGS) $(LIBS) -o $(TARGET)
|
||||
@ -0,0 +1,97 @@
|
||||
diff -Naur xbmc-23757/configure.in xbmc-23757.patch/configure.in
|
||||
--- xbmc-23757/configure.in 2009-10-16 21:49:02.827519056 +0200
|
||||
+++ xbmc-23757.patch/configure.in 2009-10-16 21:49:23.616641888 +0200
|
||||
@@ -43,6 +43,8 @@
|
||||
avahi_disabled="== Avahi support disabled. =="
|
||||
vdpau_not_found="== Could not find libvdpau. VDPAU support disabled. =="
|
||||
vdpau_disabled="== VDPAU support manually disabled. =="
|
||||
+xbmcprojectm_enabled="== XBMCProjectM enabled. =="
|
||||
+xbmxprojectm_disabled="== XBMCProjectM disabled. =="
|
||||
|
||||
# External library message strings
|
||||
external_libraries_enabled="== Use of all supported external libraries enabled. =="
|
||||
@@ -144,6 +146,12 @@
|
||||
[use_goom=$enableval],
|
||||
[use_goom=no])
|
||||
|
||||
+AC_ARG_ENABLE([xbmcprojectm],
|
||||
+ [AS_HELP_STRING([--enable-xbmcprojectm],
|
||||
+ [enable XBMCProjectM visualisation (default is yes)])],
|
||||
+ [use_xbmcprojectm=$enableval],
|
||||
+ [use_xbmcprojectm=yes])
|
||||
+
|
||||
AC_PATH_PROG(CCACHE,ccache,none)
|
||||
AC_ARG_ENABLE([ccache],
|
||||
[AS_HELP_STRING([--enable-ccache],
|
||||
@@ -499,6 +507,15 @@
|
||||
fi
|
||||
fi
|
||||
|
||||
+# XBMCPROJECTM
|
||||
+if test "$use_xbmcprojectm" = "yes"; then
|
||||
+ AC_MSG_NOTICE($xbmcprojectm_enabled)
|
||||
+ BUILD_XBMCPROJECTM=0
|
||||
+else
|
||||
+ AC_MSG_NOTICE($xbmcprojectm_disabled)
|
||||
+ BUILD_XBMCPROJECTM=1
|
||||
+fi
|
||||
+
|
||||
### External libraries checks
|
||||
if test "$use_external_libraries" = "yes"; then
|
||||
AC_MSG_NOTICE($external_libraries_enabled)
|
||||
@@ -823,6 +840,12 @@
|
||||
final_message="$final_message\n GOOM:\t\tNo"
|
||||
fi
|
||||
|
||||
+if test "$use_xbmcprojectm" = "yes"; then
|
||||
+ final_message="$final_message\n XBMCProjectM:\tYes"
|
||||
+else
|
||||
+ final_message="$final_message\n XBMCProjectM:\tNo"
|
||||
+fi
|
||||
+
|
||||
if test "$use_pcre" = "yes"; then
|
||||
final_message="$final_message\n PCRE Support:\tYes"
|
||||
SDL_DEFINES="$SDL_DEFINES -DHAS_PCRE"
|
||||
@@ -1010,6 +1033,7 @@
|
||||
AC_SUBST(SDL_DEFINES)
|
||||
AC_SUBST(BUILD_DVDCSS)
|
||||
AC_SUBST(BUILD_GOOM)
|
||||
+AC_SUBST(BUILD_XBMCPROJECTM)
|
||||
AC_SUBST(USE_EXTERNAL_LIBRARIES)
|
||||
AC_SUBST(USE_EXTERNAL_FFMPEG)
|
||||
AC_SUBST(USE_EXTERNAL_LIBA52)
|
||||
@@ -1403,7 +1427,7 @@
|
||||
else
|
||||
rm -f CMakeCache.txt && CC="" CXX="" cmake -D CMAKE_BUILD_TYPE:STRING=RelWithDebInfo -D USE_FTGL:BOOL=OFF .
|
||||
fi
|
||||
-], [0])
|
||||
+], [$BUILD_XBMCPROJECTM])
|
||||
|
||||
XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
|
||||
if test "$host_vendor" = "apple" ; then
|
||||
diff -Naur xbmc-23757/Makefile.in xbmc-23757.patch/Makefile.in
|
||||
--- xbmc-23757/Makefile.in 2009-10-16 18:46:07.000000000 +0200
|
||||
+++ xbmc-23757.patch/Makefile.in 2009-10-16 21:49:44.335517603 +0200
|
||||
@@ -95,8 +95,10 @@
|
||||
|
||||
VIS_DIRS=\
|
||||
xbmc/visualizations/OpenGLSpectrum \
|
||||
- xbmc/visualizations/WaveForm \
|
||||
- xbmc/visualizations/XBMCProjectM
|
||||
+ xbmc/visualizations/WaveForm
|
||||
+ifneq (@BUILD_XBMCPROJECTM@,1)
|
||||
+VIS_DIRS+=xbmc/visualizations/XBMCProjectM
|
||||
+endif
|
||||
ifneq (@BUILD_GOOM@,1)
|
||||
VIS_DIRS+=xbmc/visualizations/Goom
|
||||
endif
|
||||
@@ -255,7 +257,9 @@
|
||||
visualizations: exports
|
||||
$(MAKE) -C xbmc/visualizations/OpenGLSpectrum
|
||||
$(MAKE) -C xbmc/visualizations/WaveForm
|
||||
+ifneq (@BUILD_XBMCPROJECTM@,1)
|
||||
$(MAKE) -C xbmc/visualizations/XBMCProjectM
|
||||
+endif
|
||||
ifneq (@BUILD_GOOM@,1)
|
||||
ifeq ($(or $(findstring powerpc-linux,$(ARCH)),$(findstring powerpc64-linux,$(ARCH))),)
|
||||
$(MAKE) -C xbmc/visualizations/Goom
|
||||
@ -0,0 +1,97 @@
|
||||
diff -Naur xbmc-23782/configure.in xbmc-23782.patch/configure.in
|
||||
--- xbmc-23782/configure.in 2009-10-17 23:10:17.764644091 +0200
|
||||
+++ xbmc-23782.patch/configure.in 2009-10-17 23:11:34.893517566 +0200
|
||||
@@ -45,6 +45,8 @@
|
||||
vdpau_disabled="== VDPAU support manually disabled. =="
|
||||
xbmcprojectm_enabled="== XBMCProjectM enabled. =="
|
||||
xbmxprojectm_disabled="== XBMCProjectM disabled. =="
|
||||
+rsxs_enabled="== RSXS enabled. =="
|
||||
+rsxs_disabled="== RSXS disabled. =="
|
||||
|
||||
# External library message strings
|
||||
external_libraries_enabled="== Use of all supported external libraries enabled. =="
|
||||
@@ -149,6 +151,12 @@
|
||||
[use_xbmcprojectm=$enableval],
|
||||
[use_xbmcprojectm=yes])
|
||||
|
||||
+AC_ARG_ENABLE([rsxs],
|
||||
+ [AS_HELP_STRING([--enable-rsxs],
|
||||
+ [enable RSXS Screensaver (default is yes)])],
|
||||
+ [use_rsxs=$enableval],
|
||||
+ [use_rsxs=yes])
|
||||
+
|
||||
AC_PATH_PROG(CCACHE,ccache,none)
|
||||
AC_ARG_ENABLE([ccache],
|
||||
[AS_HELP_STRING([--enable-ccache],
|
||||
@@ -513,6 +521,15 @@
|
||||
BUILD_XBMCPROJECTM=1
|
||||
fi
|
||||
|
||||
+# RSXS
|
||||
+if test "$use_rsxs" = "yes"; then
|
||||
+ AC_MSG_NOTICE($rsxs_enabled)
|
||||
+ BUILD_RSXS=0
|
||||
+else
|
||||
+ AC_MSG_NOTICE($rsxs_disabled)
|
||||
+ BUILD_RSXS=1
|
||||
+fi
|
||||
+
|
||||
### External libraries checks
|
||||
if test "$use_external_libraries" = "yes"; then
|
||||
AC_MSG_NOTICE($external_libraries_enabled)
|
||||
@@ -843,6 +860,12 @@
|
||||
final_message="$final_message\n XBMCProjectM:\tNo"
|
||||
fi
|
||||
|
||||
+if test "$use_rsxs" = "yes"; then
|
||||
+ final_message="$final_message\n RSXS:\t\tYes"
|
||||
+else
|
||||
+ final_message="$final_message\n RSXS:\t\tNo"
|
||||
+fi
|
||||
+
|
||||
if test "$use_pcre" = "yes"; then
|
||||
final_message="$final_message\n PCRE Support:\tYes"
|
||||
SDL_DEFINES="$SDL_DEFINES -DHAS_PCRE"
|
||||
@@ -1031,6 +1054,7 @@
|
||||
AC_SUBST(BUILD_DVDCSS)
|
||||
AC_SUBST(BUILD_GOOM)
|
||||
AC_SUBST(BUILD_XBMCPROJECTM)
|
||||
+AC_SUBST(BUILD_RSXS)
|
||||
AC_SUBST(USE_EXTERNAL_LIBRARIES)
|
||||
AC_SUBST(USE_EXTERNAL_FFMPEG)
|
||||
AC_SUBST(USE_EXTERNAL_LIBA52)
|
||||
@@ -1427,7 +1451,7 @@
|
||||
--disable-lattice \
|
||||
--disable-skyrocket
|
||||
fi
|
||||
-], [0])
|
||||
+], [$BUILD_RSXS])
|
||||
|
||||
AC_OUTPUT
|
||||
|
||||
diff -Naur xbmc-23782/Makefile.in xbmc-23782.patch/Makefile.in
|
||||
--- xbmc-23782/Makefile.in 2009-10-17 23:10:17.769644442 +0200
|
||||
+++ xbmc-23782.patch/Makefile.in 2009-10-17 23:10:30.315519233 +0200
|
||||
@@ -90,8 +90,10 @@
|
||||
xbmc/lib/libid3tag \
|
||||
xbmc/lib/libPython/linux
|
||||
|
||||
-SS_DIRS=\
|
||||
- xbmc/screensavers/rsxs-0.9/xbmc
|
||||
+SS_DIRS=
|
||||
+ifneq (@BUILD_RSXS@,1)
|
||||
+SS_DIRS=+xbmc/screensavers/rsxs-0.9/xbmc
|
||||
+endif
|
||||
|
||||
VIS_DIRS=\
|
||||
xbmc/visualizations/OpenGLSpectrum \
|
||||
@@ -266,7 +268,9 @@
|
||||
endif
|
||||
endif
|
||||
screensavers: exports
|
||||
+ifneq (@BUILD_RSXS@,1)
|
||||
$(MAKE) -C xbmc/screensavers/rsxs-0.9/xbmc
|
||||
+endif
|
||||
libpython: dllloader
|
||||
$(MAKE) -C xbmc/lib/libPython
|
||||
$(MAKE) -C xbmc/lib/libPython/xbmcmodule
|
||||
@ -0,0 +1,28 @@
|
||||
diff -Naur xbmc-23782/configure.in xbmc-23782.patch/configure.in
|
||||
--- xbmc-23782/configure.in 2009-10-17 07:13:04.000000000 +0200
|
||||
+++ xbmc-23782.patch/configure.in 2009-10-17 22:14:49.071516998 +0200
|
||||
@@ -834,12 +834,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-23782/tools/TexturePacker/XBMCTex.cpp xbmc-23782.patch/tools/TexturePacker/XBMCTex.cpp
|
||||
--- xbmc-23782/tools/TexturePacker/XBMCTex.cpp 2009-10-17 07:12:41.000000000 +0200
|
||||
+++ xbmc-23782.patch/tools/TexturePacker/XBMCTex.cpp 2009-10-17 22:14:04.015641625 +0200
|
||||
@@ -36,7 +36,7 @@
|
||||
#endif
|
||||
|
||||
#ifdef _LINUX
|
||||
-#include <lzo1x.h>
|
||||
+#include <lzo/lzo1x.h>
|
||||
#else
|
||||
#include "../../xbmc/lib/liblzo/LZO1X.H"
|
||||
#endif
|
||||
@ -0,0 +1,27 @@
|
||||
diff -Naur xbmc-23782/guilib/Makefile xbmc-23782.patch/guilib/Makefile
|
||||
--- xbmc-23782/guilib/Makefile 2009-10-17 07:13:16.000000000 +0200
|
||||
+++ xbmc-23782.patch/guilib/Makefile 2009-10-17 22:26:41.936517267 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-INCLUDES=-I. -I../ -Icommon -I../xbmc -I../xbmc/cores -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 -I../xbmc/linux -I../xbmc/utils -I../xbmc/lib/libsquish
|
||||
|
||||
SRCS=AnimatedGif.cpp \
|
||||
AudioContext.cpp \
|
||||
diff -Naur xbmc-23782/xbmc/FileSystem/Makefile xbmc-23782.patch/xbmc/FileSystem/Makefile
|
||||
--- xbmc-23782/xbmc/FileSystem/Makefile 2009-10-17 07:09:13.000000000 +0200
|
||||
+++ xbmc-23782.patch/xbmc/FileSystem/Makefile 2009-10-17 22:26:38.683529959 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-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
|
||||
+INCLUDES=-I. -I../ -I../cores -I../linux -I../../guilib -I../lib/UnrarXLib -I../utils
|
||||
INCLUDES+=-I../lib/libcdio/libcdio/include
|
||||
|
||||
CXXFLAGS+=-D__STDC_FORMAT_MACROS \
|
||||
diff -Naur xbmc-23782/xbmc/Makefile xbmc-23782.patch/xbmc/Makefile
|
||||
--- xbmc-23782/xbmc/Makefile 2009-10-17 07:09:12.000000000 +0200
|
||||
+++ xbmc-23782.patch/xbmc/Makefile 2009-10-17 22:25:18.953643441 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-INCLUDES+=-I. -Ilinux -Icores -I../guilib -Iutils -IFileSystem -I/usr/include/freetype2 -Icores/dvdplayer -Icores/ffmpeg
|
||||
+INCLUDES+=-I. -Ilinux -Icores -I../guilib -Iutils -IFileSystem -Icores/dvdplayer -Icores/ffmpeg
|
||||
|
||||
INCLUDES+=-Ilib/libUPnP/Platinum/Source/Core \
|
||||
-Ilib/libUPnP/Platinum/Source/Platinum \
|
||||
@ -0,0 +1,67 @@
|
||||
diff -Naur xbmc-23757/xbmc-xrandr.c xbmc-23757.patch/xbmc-xrandr.c
|
||||
--- xbmc-23757/xbmc-xrandr.c 2009-10-16 18:41:57.000000000 +0200
|
||||
+++ xbmc-23757.patch/xbmc-xrandr.c 2009-10-17 05:15:34.000000000 +0200
|
||||
@@ -2257,7 +2257,7 @@
|
||||
mode_height (mode, output->rotation),
|
||||
output->x, output->y);
|
||||
if (verbose)
|
||||
- printf (" id=\"%x\"", mode->id);
|
||||
+ printf (" id=\"%x\"", (int)mode->id);
|
||||
if (output->rotation != RR_Rotate_0 || verbose)
|
||||
{
|
||||
printf (" rotation=\"%s\"",
|
||||
@@ -2294,14 +2294,14 @@
|
||||
if (mode)
|
||||
{
|
||||
printf (" wmm=\"%d\" hmm=\"%d\"",
|
||||
- output_info->mm_width, output_info->mm_height);
|
||||
+ (int)output_info->mm_width, (int)output_info->mm_height);
|
||||
}
|
||||
printf (">\n");
|
||||
|
||||
if (verbose)
|
||||
{
|
||||
- printf ("\tIdentifier: 0x%x\n", output->output.xid);
|
||||
- printf ("\tTimestamp: %d\n", output_info->timestamp);
|
||||
+ printf ("\tIdentifier: 0x%x\n", (int)output->output.xid);
|
||||
+ printf ("\tTimestamp: %d\n", (int)output_info->timestamp);
|
||||
printf ("\tSubpixel: %s\n", order[output_info->subpixel_order]);
|
||||
printf ("\tClones: ");
|
||||
for (j = 0; j < output_info->nclone; j++)
|
||||
@@ -2358,15 +2358,15 @@
|
||||
{
|
||||
printf("\t%s: %d (0x%08x)",
|
||||
XGetAtomName (dpy, props[j]),
|
||||
- *(INT32 *)prop, *(INT32 *)prop);
|
||||
+ (int)(INT32 *)prop, (int)(INT32 *)prop);
|
||||
|
||||
if (propinfo->range && propinfo->num_values > 0) {
|
||||
printf(" range%s: ",
|
||||
(propinfo->num_values == 2) ? "" : "s");
|
||||
|
||||
for (k = 0; k < propinfo->num_values / 2; k++)
|
||||
- printf(" (%d,%d)", propinfo->values[k * 2],
|
||||
- propinfo->values[k * 2 + 1]);
|
||||
+ printf(" (%d,%d)", (int)propinfo->values[k * 2],
|
||||
+ (int)propinfo->values[k * 2 + 1]);
|
||||
}
|
||||
|
||||
printf("\n");
|
||||
@@ -2410,7 +2410,7 @@
|
||||
int f;
|
||||
|
||||
printf (" %s (0x%x) %6.1fMHz",
|
||||
- mode->name, mode->id,
|
||||
+ mode->name, (int)mode->id,
|
||||
(float)mode->dotClock / 1000000.0);
|
||||
for (f = 0; mode_flags[f].flag; f++)
|
||||
if (mode->modeFlags & mode_flags[f].flag)
|
||||
@@ -2443,7 +2443,7 @@
|
||||
if (strcmp (jmode->name, kmode->name) != 0) continue;
|
||||
mode_shown[k] = True;
|
||||
kmode->modeFlags |= ModeShown;
|
||||
- printf (" <mode id=\"0x%x\" name=\"%s\" w=\"%d\" h=\"%d\" hz=\"%.5f\"", kmode->id, kmode->name, kmode->width, kmode->height, mode_refresh (kmode));
|
||||
+ printf (" <mode id=\"0x%x\" name=\"%s\" w=\"%d\" h=\"%d\" hz=\"%.5f\"", (int)kmode->id, kmode->name, kmode->width, kmode->height, mode_refresh (kmode));
|
||||
if (kmode == output->mode_info)
|
||||
printf (" current=\"true\"");
|
||||
else
|
||||
@ -0,0 +1,74 @@
|
||||
diff -Naur xbmc-23782/Makefile.include.in xbmc-23782.patch/Makefile.include.in
|
||||
--- xbmc-23782/Makefile.include.in 2009-10-17 07:12:34.000000000 +0200
|
||||
+++ xbmc-23782.patch/Makefile.include.in 2009-10-18 00:22:42.195445274 +0200
|
||||
@@ -11,6 +11,7 @@
|
||||
CXXFLAGS+=@DEBUG_FLAGS@
|
||||
CFLAGS+=@CFLAGS@
|
||||
CFLAGS+=@DEBUG_FLAGS@
|
||||
+LDFLAGS+=@LDFLAGS@
|
||||
INCLUDES+=@INCLUDES@
|
||||
DEFINES+= \
|
||||
-D_LINUX \
|
||||
@@ -33,7 +34,7 @@
|
||||
|
||||
.cpp.o:
|
||||
@rm -f ${<:.cpp=.o}
|
||||
- $(CXX) -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o ${<:.cpp=.o}
|
||||
+ $(CXX) -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(LDFLAGS) $< -o ${<:.cpp=.o}
|
||||
@cp $*.d $*.P; \
|
||||
sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
|
||||
-e '/^$$/ d' -e 's/$$/ :/' < $*.d >> $*.P; \
|
||||
@@ -41,7 +42,7 @@
|
||||
|
||||
.cc.o:
|
||||
@rm -f ${<:.cc=.o}
|
||||
- $(CXX) -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o ${<:.cc=.o}
|
||||
+ $(CXX) -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(LDFLAGS) $< -o ${<:.cc=.o}
|
||||
@cp $*.d $*.P; \
|
||||
sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
|
||||
-e '/^$$/ d' -e 's/$$/ :/' < $*.d >> $*.P; \
|
||||
@@ -49,7 +50,7 @@
|
||||
|
||||
.c.o:
|
||||
@rm -f ${<:.c=.o}
|
||||
- $(CC) -MD -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o ${<:.c=.o}
|
||||
+ $(CC) -MD -c $(CFLAGS) $(DEFINES) $(INCLUDES) $(LDFLAGS) $< -o ${<:.c=.o}
|
||||
@cp $*.d $*.P; \
|
||||
sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
|
||||
-e '/^$$/ d' -e 's/$$/ :/' < $*.d >> $*.P; \
|
||||
@@ -57,7 +58,7 @@
|
||||
|
||||
.C.o:
|
||||
@rm -f ${<:.C=.o}
|
||||
- $(CC) -MD -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o ${<:.C=.o}
|
||||
+ $(CC) -MD -c $(CFLAGS) $(DEFINES) $(INCLUDES) $(LDFLAGS) $< -o ${<:.C=.o}
|
||||
@cp $*.d $*.P; \
|
||||
sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
|
||||
-e '/^$$/ d' -e 's/$$/ :/' < $*.d >> $*.P; \
|
||||
@@ -65,14 +66,14 @@
|
||||
|
||||
.S.o:
|
||||
rm -f ${<:.S=.o}
|
||||
- $(CC) -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o ${<:.S=.o}
|
||||
+ $(CC) -c $(CFLAGS) $(DEFINES) $(INCLUDES) $(LDFLAGS) $< -o ${<:.S=.o}
|
||||
|
||||
%.h.gch : %.h
|
||||
- $(CXX) -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o $@
|
||||
+ $(CXX) -c $(CFLAGS) $(DEFINES) $(INCLUDES) $(LDFLAGS) $< -o $@
|
||||
|
||||
.m.o:
|
||||
@rm -f ${<:.m=.o}
|
||||
- $(CXX) -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o ${<:.m=.o}
|
||||
+ $(CXX) -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(LDFLAGS) $< -o ${<:.m=.o}
|
||||
@cp $*.d $*.P; \
|
||||
sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
|
||||
-e '/^$$/ d' -e 's/$$/ :/' < $*.d >> $*.P; \
|
||||
@@ -80,7 +81,7 @@
|
||||
|
||||
.mm.o:
|
||||
@rm -f ${<:.mm=.o}
|
||||
- $(CXX) -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o ${<:.mm=.o}
|
||||
+ $(CXX) -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(LDFLAGS) $< -o ${<:.mm=.o}
|
||||
@cp $*.d $*.P; \
|
||||
sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
|
||||
-e '/^$$/ d' -e 's/$$/ :/' < $*.d >> $*.P; \
|
||||
@ -0,0 +1,42 @@
|
||||
diff -Naur xbmc-23757/xbmc-xrandr.c xbmc-23757.patch/xbmc-xrandr.c
|
||||
--- xbmc-23757/xbmc-xrandr.c 2009-10-17 05:39:09.651516826 +0200
|
||||
+++ xbmc-23757.patch/xbmc-xrandr.c 2009-10-17 05:38:31.000000000 +0200
|
||||
@@ -189,7 +189,7 @@
|
||||
|
||||
#if HAS_RANDR_1_2
|
||||
typedef enum _policy {
|
||||
- clone, extend
|
||||
+ cloned, extend
|
||||
} policy_t;
|
||||
|
||||
typedef enum _relation {
|
||||
@@ -1611,7 +1611,7 @@
|
||||
int ret = 0;
|
||||
#if HAS_RANDR_1_2
|
||||
output_t *output = NULL;
|
||||
- policy_t policy = clone;
|
||||
+ policy_t policy = cloned;
|
||||
Bool setit_1_2 = False;
|
||||
Bool query_1_2 = False;
|
||||
Bool modeit = False;
|
||||
@@ -1872,7 +1872,7 @@
|
||||
continue;
|
||||
}
|
||||
if (!strcmp ("--clone", argv[i])) {
|
||||
- policy = clone;
|
||||
+ policy = cloned;
|
||||
setit_1_2 = True;
|
||||
continue;
|
||||
}
|
||||
@@ -2306,9 +2306,9 @@
|
||||
printf ("\tClones: ");
|
||||
for (j = 0; j < output_info->nclone; j++)
|
||||
{
|
||||
- output_t *clone = find_output_by_xid (output_info->clones[j]);
|
||||
+ output_t *cloned = find_output_by_xid (output_info->clones[j]);
|
||||
|
||||
- if (clone) printf (" %s", clone->output.string);
|
||||
+ if (cloned) printf (" %s", cloned->output.string);
|
||||
}
|
||||
printf ("\n");
|
||||
if (output->crtc_info)
|
||||
@ -0,0 +1,19 @@
|
||||
diff -Naur xbmc-23757/xbmc/cores/DllLoader/exports/util/EmuFileWrapper.h xbmc-23757.patch/xbmc/cores/DllLoader/exports/util/EmuFileWrapper.h
|
||||
--- xbmc-23757/xbmc/cores/DllLoader/exports/util/EmuFileWrapper.h 2009-10-16 18:44:08.000000000 +0200
|
||||
+++ xbmc-23757.patch/xbmc/cores/DllLoader/exports/util/EmuFileWrapper.h 2009-10-16 20:08:13.747643850 +0200
|
||||
@@ -29,10 +29,14 @@
|
||||
|
||||
class CMutex;
|
||||
|
||||
-#if defined(_LINUX) && !defined(__APPLE__)
|
||||
+#if defined(_LINUX) && !defined(__APPLE__) && !defined(__UCLIBC__)
|
||||
#define _file _fileno
|
||||
#endif
|
||||
|
||||
+#if defined(__UCLIBC__)
|
||||
+#define _file __filedes
|
||||
+#endif
|
||||
+
|
||||
#define MAX_EMULATED_FILES 50
|
||||
#define FILE_WRAPPER_OFFSET 0x00000100
|
||||
|
||||
@ -0,0 +1,45 @@
|
||||
diff -Naur xbmc-23782/configure.in xbmc-23782.patch/configure.in
|
||||
--- xbmc-23782/configure.in 2009-10-17 07:13:04.000000000 +0200
|
||||
+++ xbmc-23782.patch/configure.in 2009-10-18 19:30:30.994320947 +0200
|
||||
@@ -327,6 +327,15 @@
|
||||
AC_CHECK_LIB([lzo2], [main],, AC_MSG_ERROR($missing_library))
|
||||
AC_CHECK_LIB([z], [main],, AC_MSG_ERROR($missing_library))
|
||||
|
||||
+AC_CHECK_LIB([pthread],[pthread_yield],
|
||||
+ AC_DEFINE([HAVE_PTHREAD_YIELD], [1],
|
||||
+ [Define to 1 if you have the 'pthread_yield' function]))
|
||||
+
|
||||
+AC_CHECK_LIB([pthread],[sched_yield],
|
||||
+ AC_DEFINE([HAVE_SCHED_YIELD], [1],
|
||||
+ [Define to 1 if you have the 'sched_yield' function]))
|
||||
+
|
||||
+
|
||||
PKG_CHECK_MODULES([MAD], [mad],
|
||||
[INCLUDES+=" $MAD_CFLAGS"; LIBS+=" $MAD_LIBS"],
|
||||
AC_MSG_ERROR($missing_library))
|
||||
diff -Naur xbmc-23782/xbmc/FileSystem/FileCurl.cpp xbmc-23782.patch/xbmc/FileSystem/FileCurl.cpp
|
||||
--- xbmc-23782/xbmc/FileSystem/FileCurl.cpp 2009-10-17 07:09:13.000000000 +0200
|
||||
+++ xbmc-23782.patch/xbmc/FileSystem/FileCurl.cpp 2009-10-18 19:24:45.938445349 +0200
|
||||
@@ -19,6 +19,8 @@
|
||||
*
|
||||
*/
|
||||
|
||||
+#include "config.h"
|
||||
+
|
||||
#include "FileCurl.h"
|
||||
#include "Util.h"
|
||||
#include "URL.h"
|
||||
@@ -1178,10 +1180,10 @@
|
||||
// happens especially on ftp during initial connection
|
||||
#ifndef _LINUX
|
||||
SwitchToThread();
|
||||
-#elif __APPLE__
|
||||
- sched_yield();
|
||||
-#else
|
||||
+#elif HAVE_PTHREAD_YIELD
|
||||
pthread_yield();
|
||||
+#elif HAVE_SCHED_YIELD
|
||||
+ sched_yield();
|
||||
#endif
|
||||
|
||||
FD_ZERO(&fdread);
|
||||
@ -0,0 +1,34 @@
|
||||
diff -Naur xbmc-23782/configure.in xbmc-23782.patch/configure.in
|
||||
--- xbmc-23782/configure.in 2009-10-18 19:54:36.828319917 +0200
|
||||
+++ xbmc-23782.patch/configure.in 2009-10-18 19:55:57.901319613 +0200
|
||||
@@ -335,6 +335,9 @@
|
||||
AC_DEFINE([HAVE_SCHED_YIELD], [1],
|
||||
[Define to 1 if you have the 'sched_yield' function]))
|
||||
|
||||
+AC_CHECK_LIB([pthread],[pthread_getcpuclockid],
|
||||
+ AC_DEFINE([HAVE_PTHREAD_GETCPUCLOCKID], [1],
|
||||
+ [Define to 1 if you have the 'pthread_getcpuclockid' function]))
|
||||
|
||||
PKG_CHECK_MODULES([MAD], [mad],
|
||||
[INCLUDES+=" $MAD_CFLAGS"; LIBS+=" $MAD_LIBS"],
|
||||
diff -Naur xbmc-23782/xbmc/linux/XThreadUtils.cpp xbmc-23782.patch/xbmc/linux/XThreadUtils.cpp
|
||||
--- xbmc-23782/xbmc/linux/XThreadUtils.cpp 2009-10-17 07:09:25.000000000 +0200
|
||||
+++ xbmc-23782.patch/xbmc/linux/XThreadUtils.cpp 2009-10-18 20:01:02.496322443 +0200
|
||||
@@ -19,6 +19,8 @@
|
||||
*
|
||||
*/
|
||||
|
||||
+#include "config.h"
|
||||
+
|
||||
#include "PlatformDefs.h"
|
||||
#include "XHandle.h"
|
||||
#include "XThreadUtils.h"
|
||||
@@ -189,7 +191,7 @@
|
||||
if (lpKernelTime)
|
||||
lpKernelTime->dwLowDateTime = lpKernelTime->dwHighDateTime = 0;
|
||||
}
|
||||
-#elif _POSIX_THREAD_CPUTIME != -1
|
||||
+#elif HAVE_PTHREAD_GETCPUCLOCKID && _POSIX_THREAD_CPUTIME != -1
|
||||
if(lpUserTime)
|
||||
{
|
||||
lpUserTime->dwLowDateTime = 0;
|
||||
@ -0,0 +1,76 @@
|
||||
diff -Naur xbmc-23782/configure.in xbmc-23782.patch/configure.in
|
||||
--- xbmc-23782/configure.in 2009-10-18 20:25:59.990447343 +0200
|
||||
+++ xbmc-23782.patch/configure.in 2009-10-18 21:19:15.187446224 +0200
|
||||
@@ -339,6 +339,14 @@
|
||||
AC_DEFINE([HAVE_PTHREAD_GETCPUCLOCKID], [1],
|
||||
[Define to 1 if you have the 'pthread_getcpuclockid' function]))
|
||||
|
||||
+AC_CHECK_LIB([c],[__xstat64],
|
||||
+ AC_DEFINE([HAVE_XSTAT64], [1],
|
||||
+ [Define to 1 if you have the '__xstat64' function]))
|
||||
+
|
||||
+AC_CHECK_LIB([c],[__lxstat64],
|
||||
+ AC_DEFINE([HAVE_LXSTAT64], [1],
|
||||
+ [Define to 1 if you have the '__lxstat64' function]))
|
||||
+
|
||||
PKG_CHECK_MODULES([MAD], [mad],
|
||||
[INCLUDES+=" $MAD_CFLAGS"; LIBS+=" $MAD_LIBS"],
|
||||
AC_MSG_ERROR($missing_library))
|
||||
diff -Naur xbmc-23782/xbmc/cores/DllLoader/exports/exports_python_linux.cpp xbmc-23782.patch/xbmc/cores/DllLoader/exports/exports_python_linux.cpp
|
||||
--- xbmc-23782/xbmc/cores/DllLoader/exports/exports_python_linux.cpp 2009-10-17 07:11:17.000000000 +0200
|
||||
+++ xbmc-23782.patch/xbmc/cores/DllLoader/exports/exports_python_linux.cpp 2009-10-18 21:22:22.135447782 +0200
|
||||
@@ -19,6 +19,8 @@
|
||||
*
|
||||
*/
|
||||
|
||||
+#include "config.h"
|
||||
+
|
||||
#include "system.h"
|
||||
#include <sys/types.h>
|
||||
#include <utime.h>
|
||||
@@ -224,32 +226,32 @@
|
||||
return opendir(strName.c_str());
|
||||
}
|
||||
|
||||
-#ifdef __APPLE__
|
||||
+#ifdef HAVE_XSTAT64 && HAVE_LXSTAT64
|
||||
|
||||
-int xbp_stat(const char * path, struct stat * buf)
|
||||
+int xbp__xstat64(int ver, const char *filename, struct stat64 *stat_buf)
|
||||
{
|
||||
- CStdString strName = _P(path);
|
||||
- return stat(strName.c_str(), buf);
|
||||
+ CStdString strName = _P(filename);
|
||||
+ return __xstat64(ver, strName.c_str(), stat_buf);
|
||||
}
|
||||
|
||||
-int xbp_lstat(const char * path, struct stat * buf)
|
||||
+int xbp__lxstat64(int ver, const char *filename, struct stat64 *stat_buf)
|
||||
{
|
||||
- CStdString strName = _P(path);
|
||||
- return lstat(strName.c_str(), buf);
|
||||
+ CStdString strName = _P(filename);
|
||||
+ return __lxstat64(ver, strName.c_str(), stat_buf);
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
-int xbp__xstat64(int ver, const char *filename, struct stat64 *stat_buf)
|
||||
+int xbp_stat(const char * path, struct stat * buf)
|
||||
{
|
||||
- CStdString strName = _P(filename);
|
||||
- return __xstat64(ver, strName.c_str(), stat_buf);
|
||||
+ CStdString strName = _P(path);
|
||||
+ return stat(strName.c_str(), buf);
|
||||
}
|
||||
|
||||
-int xbp__lxstat64(int ver, const char *filename, struct stat64 *stat_buf)
|
||||
+int xbp_lstat(const char * path, struct stat * buf)
|
||||
{
|
||||
- CStdString strName = _P(filename);
|
||||
- return __lxstat64(ver, strName.c_str(), stat_buf);
|
||||
+ CStdString strName = _P(path);
|
||||
+ return lstat(strName.c_str(), buf);
|
||||
}
|
||||
|
||||
#endif
|
||||
1
packages/mediacenter/xbmc/url
Normal file
1
packages/mediacenter/xbmc/url
Normal file
@ -0,0 +1 @@
|
||||
http://sources.openelec.tv/svn/xbmc-23841.tar.bz2
|
||||
Loading…
x
Reference in New Issue
Block a user