jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 05:36:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

xbmc:

Browse Source 
- update to xbmc-28425
This commit is contained in:
Stephan Raue 2010-03-06 16:14:53 +01:00
parent 043d38a9d6
commit b97cf4d44b
11 changed files with 314 additions and 440 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
packages/mediacenter/xbmc/build
View File

@ -13,6 +13,7 @@ $SCRIPTS/build pcre
$SCRIPTS/build alsa-lib $SCRIPTS/build alsa-lib
$SCRIPTS/build enca $SCRIPTS/build enca
$SCRIPTS/build curl $SCRIPTS/build curl
$SCRIPTS/build libmicrohttpd
$SCRIPTS/build dbus $SCRIPTS/build dbus
$SCRIPTS/build hal $SCRIPTS/build hal
@ -41,6 +42,7 @@ $SCRIPTS/build libogg
$SCRIPTS/build libvorbis $SCRIPTS/build libvorbis
$SCRIPTS/build libcdio $SCRIPTS/build libcdio
$SCRIPTS/build libmms $SCRIPTS/build libmms
$SCRIPTS/build libmodplug
$SCRIPTS/build faac $SCRIPTS/build faac
$SCRIPTS/build faad2 $SCRIPTS/build faad2
$SCRIPTS/build flac $SCRIPTS/build flac
@ -96,8 +98,6 @@ cd -
--disable-debug \ --disable-debug \
--enable-optimizations \ --enable-optimizations \
--enable-gl \ --enable-gl \
$XBMC_VDPAU \
$XBMC_CRYSTALHD \
--disable-profiling \ --disable-profiling \
--disable-joystick \ --disable-joystick \
--enable-xrandr \ --enable-xrandr \
@ -113,6 +113,9 @@ cd -
--disable-rsxs \ --disable-rsxs \
--enable-avahi \ --enable-avahi \
--enable-hal \ --enable-hal \
--enable-webserver \
$XBMC_VDPAU \
$XBMC_CRYSTALHD \
$XBMC_FFMPEG \ $XBMC_FFMPEG \
--disable-external-liba52 \ --disable-external-liba52 \
--disable-external-libdts \ --disable-external-libdts \
@ -122,17 +125,3 @@ cd -
make externals make externals
make xbmc.bin make xbmc.bin
make xbmc-xrandr make xbmc-xrandr
# make -C tools/TexturePacker \
# CC=$HOST_CC \
# CXX=$HOST_CXX \
# INCLUDES="-I../../xbmc/utils -I../../guilib -I../../xbmc/linux -I../../xbmc/lib/libsquish" \
# CFLAGS="" \
# LDFLAGS=""
# mkdir -p $ROOT/$TOOLCHAIN/bin
# cp -PR tools/TexturePacker $ROOT/$TOOLCHAIN/bin
# make XBMXTEX=$ROOT/$TOOLCHAIN/bin/TexturePacker skins
# make prefix=`pwd`/.install-data install-datas

4
packages/mediacenter/xbmc/conf.d/xbmc
View File

@ -5,7 +5,7 @@
# evironment variables that are not user defined. # evironment variables that are not user defined.
################################################################################ ################################################################################
XBMC_CACHING="yes" XBMC_CACHING="no"
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# do not change anything below # do not change anything below
@ -18,7 +18,7 @@ export XBMC_HOME
cache_xbmc () { cache_xbmc () {
progress "caching XBMC" progress "caching XBMC"
mkdir -p /var/cache/bin mkdir -p /var/cache/bin
cp -PR /usr/share/xbmc/xbmc.bin /var/cache/bin ionice -c 1 -n 0 cp -PR /usr/share/xbmc/xbmc.bin /var/cache/bin
touch /var/cache/xbmc.cache touch /var/cache/xbmc.cache
} }

27
packages/mediacenter/xbmc/install
View File

@ -11,11 +11,12 @@ $SCRIPTS/install pcre
$SCRIPTS/install alsa-lib $SCRIPTS/install alsa-lib
$SCRIPTS/install enca $SCRIPTS/install enca
$SCRIPTS/install curl $SCRIPTS/install curl
$SCRIPTS/install libmicrohttpd
$SCRIPTS/install dbus $SCRIPTS/install dbus
$SCRIPTS/install hal $SCRIPTS/install hal
#$SCRIPTS/install DeviceKit-disks $SCRIPTS/install DeviceKit-disks
#$SCRIPTS/install ConsoleKit $SCRIPTS/install ConsoleKit
$SCRIPTS/install libXt $SCRIPTS/install libXt
$SCRIPTS/install libXtst $SCRIPTS/install libXtst
@ -44,6 +45,7 @@ $SCRIPTS/install libogg
$SCRIPTS/install libvorbis $SCRIPTS/install libvorbis
$SCRIPTS/install libcdio $SCRIPTS/install libcdio
$SCRIPTS/install libmms $SCRIPTS/install libmms
$SCRIPTS/install libmodplug
$SCRIPTS/install faac $SCRIPTS/install faac
$SCRIPTS/install faad2 $SCRIPTS/install faad2
$SCRIPTS/install flac $SCRIPTS/install flac
@ -63,9 +65,12 @@ $SCRIPTS/install samba
PKG_DIR=`find $PACKAGES -type d -name $1` PKG_DIR=`find $PACKAGES -type d -name $1`
mkdir -p $INSTALL/usr/bin
cp -PR $PKG_DIR/scripts/xbmc $INSTALL/usr/bin
mkdir -p $INSTALL/usr/share/xbmc mkdir -p $INSTALL/usr/share/xbmc
cp -PR $PKG_BUILD/xbmc-xrandr $INSTALL/usr/share/xbmc
cp -PR $PKG_BUILD/xbmc.bin $INSTALL/usr/share/xbmc cp -PR $PKG_BUILD/xbmc.bin $INSTALL/usr/share/xbmc
cp -PR $PKG_BUILD/xbmc-xrandr $INSTALL/usr/share/xbmc
mkdir -p $INSTALL/usr/share/xbmc/language mkdir -p $INSTALL/usr/share/xbmc/language
cp -PR $PKG_BUILD/language/* $INSTALL/usr/share/xbmc/language cp -PR $PKG_BUILD/language/* $INSTALL/usr/share/xbmc/language
@ -78,9 +83,6 @@ mkdir -p $INSTALL/usr/share/xbmc/media
cp -PR $PKG_BUILD/media/weather.zip $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_BUILD/media/icon.png $INSTALL/usr/share/xbmc/media/
mkdir -p $INSTALL/usr/share/xbmc/scripts
cp -PR $PKG_BUILD/scripts/*.zip $INSTALL/usr/share/xbmc/scripts/
mkdir -p $INSTALL/usr/share/xbmc/skin mkdir -p $INSTALL/usr/share/xbmc/skin
mkdir -p $INSTALL/usr/share/xbmc/sounds mkdir -p $INSTALL/usr/share/xbmc/sounds
@ -103,7 +105,6 @@ mkdir -p $INSTALL/usr/share/xbmc/system/players/paplayer
mkdir -p $INSTALL/usr/share/xbmc/system/python mkdir -p $INSTALL/usr/share/xbmc/system/python
cp -PR $PKG_BUILD/system/python/*.so $INSTALL/usr/share/xbmc/system/python cp -PR $PKG_BUILD/system/python/*.so $INSTALL/usr/share/xbmc/system/python
cp -PR $PKG_BUILD/system/python/spyce $INSTALL/usr/share/xbmc/system/python
mkdir -p $INSTALL/usr/share/xbmc/system/scrapers mkdir -p $INSTALL/usr/share/xbmc/system/scrapers
cp -PR $PKG_BUILD/system/scrapers/* $INSTALL/usr/share/xbmc/system/scrapers cp -PR $PKG_BUILD/system/scrapers/* $INSTALL/usr/share/xbmc/system/scrapers
@ -114,14 +115,12 @@ mkdir -p $INSTALL/usr/share/xbmc/system/shaders
mkdir -p $INSTALL/usr/share/xbmc/userdata mkdir -p $INSTALL/usr/share/xbmc/userdata
cp -PR $PKG_BUILD/userdata/* $INSTALL/usr/share/xbmc/userdata cp -PR $PKG_BUILD/userdata/* $INSTALL/usr/share/xbmc/userdata
mkdir -p $INSTALL/usr/share/xbmc/visualisations
cp -PR $PKG_BUILD/visualisations/Waveform.vis $INSTALL/usr/share/xbmc/visualisations
cp -PR $PKG_BUILD/visualisations/opengl_spectrum.vis $INSTALL/usr/share/xbmc/visualisations
# cp -PR $PKG_BUILD/visualisations/Milkdrop $INSTALL/usr/share/xbmc/visualisations #not need
# cp -PR $PKG_BUILD/visualisations/projectM $INSTALL/usr/share/xbmc/visualisations #not need
mkdir -p $INSTALL/usr/share/xbmc/web mkdir -p $INSTALL/usr/share/xbmc/web
cp -R $PKG_BUILD/web/Project_Mayhem_III/* $INSTALL/usr/share/xbmc/web cp -R $PKG_BUILD/web/poc_jsonrpc/* $INSTALL/usr/share/xbmc/web
mkdir -p $INSTALL/usr/share/xbmc/addons
cp -PR $PKG_BUILD/addons/* $INSTALL/usr/share/xbmc/addons
find $INSTALL/usr/share/xbmc/addons -name *.h -exec rm -rf {} ";"
# other programs needed to run # other programs needed to run
$SCRIPTS/install alsa $SCRIPTS/install alsa

138
packages/mediacenter/xbmc/patches/010_xbmc-crosscompile_add_host_and_build_to_configures-0.2.1.diff Normal file
View File

@ -0,0 +1,138 @@
diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
--- xbmc-28425/configure.in 2010-03-06 13:48:42.000000000 +0100
+++ xbmc-28425.patch/configure.in 2010-03-06 15:45:45.758328458 +0100
@@ -1153,7 +1153,9 @@
cp pyconfig.h Include
else
./configure \
- --enable-ipv6 \
+ --host=$host_alias \
+ --build=$build_alias \
+ --disable-ipv6 \
--enable-unicode=ucs4 \
--without-cxx \
--enable-shared \
@@ -1218,6 +1220,7 @@
--disable-static \
--disable-ipv6 \
`if test "$use_debug" = "no"; then echo --disable-debug; fi` \
+ `if test "$cross_compiling" = "yes"; then echo --enable-cross-compile; fi` \
--disable-muxers \
--enable-muxer=spdif \
--enable-muxer=adts \
@@ -1234,6 +1237,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 \
@@ -1253,6 +1257,8 @@
--disable-win
else
./configure \
+ --host=$host_alias \
+ --build=$build_alias \
--disable-oss \
--disable-solaris-audio \
--disable-al-audio \
@@ -1270,6 +1276,8 @@
--with-pic
else
./configure \
+ --host=$host_alias \
+ --build=$build_alias \
--disable-doc \
--enable-static \
--with-pic
@@ -1288,6 +1296,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 \
@@ -1313,6 +1323,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" \
@@ -1345,6 +1357,8 @@
--disable-al-audio
else
./configure \
+ --host=$host_alias \
+ --build=$build_alias \
--with-pic \
--disable-static \
--enable-shared \
@@ -1380,7 +1394,9 @@
./configure MACOSX_DEPLOYMENT_TARGET=10.4
else
CFLAGS="$CFLAGS -fPIC" \
- ./configure
+ ./configure \
+ --host=$host_alias \
+ --build=$build_alias
fi
], [$USE_EXTERNAL_LIBASS])
@@ -1394,6 +1410,8 @@
--with-pic
else
./configure \
+ --host=$host_alias \
+ --build=$build_alias \
CPPFLAGS="$CPPFLAGS" \
CFLAGS="$CFLAGS -fPIC" \
CXXFLAGS="$CXXFLAGS -fPIC" \
@@ -1420,6 +1438,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" \
@@ -1450,6 +1470,8 @@
--disable-skyrocket
else
./configure \
+ --host=$host_alias \
+ --build=$build_alias \
CPPFLAGS="$CPPFLAGS" \
CFLAGS="$CFLAGS -fPIC" \
CXXFLAGS="$CXXFLAGS -fPIC" \
@@ -1469,9 +1491,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])
@@ -1480,7 +1504,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])

279
packages/mediacenter/xbmc/patches/010_xbmc-crosscompile_add_host_and_build_to_configures-0.2.diff
View File

@ -1,279 +0,0 @@
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 \
+ --host=$host_alias \
+ --build=$build_alias \
--enable-ipv6 \
--enable-unicode=ucs4 \
--without-cxx \
@@ -1095,6 +1097,8 @@
cp pyconfig.h Include
else
./configure \
+ --host=$host_alias \
+ --build=$build_alias \
--enable-ipv6 \
--enable-unicode=ucs4 \
--without-cxx \
@@ -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 \
+ --host=$host_alias \
+ --build=$build_alias \
--with-pic \
--disable-asm-optimizations \
--disable-xmms-plugin \
@@ -1130,6 +1136,7 @@
--disable-amd3dnow \
--disable-static \
`if test "$use_debug" = "no"; then echo --disable-debug; fi` \
+ `if test "$cross_compiling" = "yes"; then echo --enable-cross-compile; fi` \
--disable-muxers \
--disable-encoders \
--disable-devices \
@@ -1156,6 +1163,7 @@
--disable-static \
--disable-ipv6 \
`if test "$use_debug" = "no"; then echo --disable-debug; fi` \
+ `if test "$cross_compiling" = "yes"; then echo --enable-cross-compile; fi` \
--disable-muxers \
--disable-encoders \
--disable-decoder=mpeg_xvmc \
@@ -1168,6 +1176,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 \
@@ -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 \
+ --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 \
@@ -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" \
+ --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
@@ -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" \
+ --host=$host_alias \
+ --build=$build_alias \
--enable-static \
--disable-shared \
--cc="$CC" &&
@@ -1223,6 +1242,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" &&
@@ -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" \
+ --host=$host_alias \
+ --build=$build_alias \
--with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \
--enable-static \
--disable-shared \
@@ -1246,6 +1269,8 @@
./configure2 \
--extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../includes" \
--extra-ldflags="-L`pwd`/../libdvdread/obj" \
+ --host=$host_alias \
+ --build=$build_alias \
--with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \
--enable-static \
--disable-shared \
@@ -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 \
+ --host=$host_alias \
+ --build=$build_alias \
--with-pic
else
true
@@ -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 \
+ --host=$host_alias \
+ --build=$build_alias \
--with-pic \
--disable-static \
--enable-shared \
@@ -1276,6 +1305,8 @@
--disable-al-audio
else
./configure \
+ --host=$host_alias \
+ --build=$build_alias \
--with-pic \
--disable-static \
--enable-shared \
@@ -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 \
+ --host=$host_alias \
+ --build=$build_alias \
--with-pic
else
true
@@ -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" \
- ./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])
@@ -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 \
+ --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
@@ -1343,6 +1386,8 @@
XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
if test "$host_vendor" != "apple" ; then
./configure \
+ --host=$host_alias \
+ --build=$build_alias \
--disable-shared \
--enable-static \
--with-pic
@@ -1357,6 +1402,8 @@
CXXFLAGS="-fPIC -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
LDFLAGS="-L/opt/local/lib" \
LIBS="-lz" \
+ --host=$host_alias \
+ --build=$build_alias \
--x-includes=/usr/X11/include --x-libraries=/usr/X11/lib \
--without-xscreensaver \
--disable-sound \
@@ -1372,6 +1419,8 @@
./configure \
CFLAGS="-fPIC" \
CXXFLAGS="-fPIC" \
+ --host=$host_alias \
+ --build=$build_alias \
--without-xscreensaver \
--disable-sound \
--disable-cyclone \
@@ -1387,18 +1436,26 @@
XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [
if test "$host_vendor" = "apple" ; then
- ./configure --with-ssl-dir=/opt/local/include
- else
- ./configure --without-openssl
+ ./configure --with-ssl-dir=/opt/local/include \
+ --host=$host_alias \
+ --build=$build_alias
+ else
+ ./configure --without-openssl \
+ --host=$host_alias \
+ --build=$build_alias
fi
], [0])
XB_CONFIG_MODULE([xbmc/lib/libapetag], [
if test "$host_vendor" = "apple" ; then
CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -fno-common" \
- ./configure MACOSX_DEPLOYMENT_TARGET=10.4 --disable-shared
+ ./configure MACOSX_DEPLOYMENT_TARGET=10.4 --disable-shared \
+ --host=$host_alias \
+ --build=$build_alias
else
- ./configure
+ ./configure \
+ --host=$host_alias \
+ --build=$build_alias
fi
], [0])
@@ -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" \
- ./configure MACOSX_DEPLOYMENT_TARGET=10.4 --with-pic --disable-shared --enable-static
- else
- ./configure --with-pic --enable-static
+ ./configure MACOSX_DEPLOYMENT_TARGET=10.4 --with-pic --disable-shared --enable-static \
+ --host=$host_alias \
+ --build=$build_alias
+ else
+ ./configure --with-pic --enable-static \
+ --host=$host_alias \
+ --build=$build_alias
fi
], [0])

46
packages/mediacenter/xbmc/patches/011_xbmc-let_select_XBMCProjectM-0.1.diff
View File

@ -1,16 +1,16 @@
diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
--- xbmc-27135/configure.in 2010-01-24 13:04:51.758580580 +0100 --- xbmc-28425/configure.in 2010-03-06 15:46:30.970324985 +0100
+++ xbmc-27135.patch/configure.in 2010-01-24 13:05:08.779612534 +0100 +++ xbmc-28425.patch/configure.in 2010-03-06 15:46:44.355431403 +0100
@@ -45,6 +45,8 @@ @@ -33,6 +33,8 @@
vdpau_disabled="== VDPAU support manually disabled. ==" xrandr_disabled="== XRandR support disabled. SDL will be used for resolution support. =="
crystalhd_not_found="== Could not find libldil. CrystalHD support disabled. ==" goom_enabled="== GOOM enabled. =="
crystalhd_disabled="== CrystalHD support manually disabled. ==" goom_disabled="== GOOM disabled. =="
+xbmcprojectm_enabled="== XBMCProjectM enabled. ==" +xbmcprojectm_enabled="== XBMCProjectM enabled. =="
+xbmxprojectm_disabled="== XBMCProjectM disabled. ==" +xbmxprojectm_disabled="== XBMCProjectM disabled. =="
pulse_not_found="== Could not find libpulse. PulseAudio support disabled. =="
# External library message strings pulse_disabled="== PulseAudio support manually disabled. =="
external_libraries_enabled="== Use of all supported external libraries enabled. ==" faac_not_found="== Could not find libfaac. FAAC support disabled. =="
@@ -145,6 +147,12 @@ @@ -150,6 +152,12 @@
[use_goom=$enableval], [use_goom=$enableval],
[use_goom=no]) [use_goom=no])
@ -23,7 +23,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
AC_PATH_PROG(CCACHE,ccache,none) AC_PATH_PROG(CCACHE,ccache,none)
AC_ARG_ENABLE([ccache], AC_ARG_ENABLE([ccache],
[AS_HELP_STRING([--enable-ccache], [AS_HELP_STRING([--enable-ccache],
@@ -503,6 +511,15 @@ @@ -529,6 +537,15 @@
fi fi
fi fi
@ -39,7 +39,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
### External libraries checks ### External libraries checks
if test "$use_external_libraries" = "yes"; then if test "$use_external_libraries" = "yes"; then
AC_MSG_NOTICE($external_libraries_enabled) AC_MSG_NOTICE($external_libraries_enabled)
@@ -835,6 +852,12 @@ @@ -851,6 +868,12 @@
final_message="$final_message\n GOOM:\t\tNo" final_message="$final_message\n GOOM:\t\tNo"
fi fi
@ -52,7 +52,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
if test "$use_pcre" = "yes"; then if test "$use_pcre" = "yes"; then
final_message="$final_message\n PCRE Support:\tYes" final_message="$final_message\n PCRE Support:\tYes"
else else
@@ -1054,6 +1077,7 @@ @@ -1089,6 +1112,7 @@
AC_SUBST(SDL_DEFINES) AC_SUBST(SDL_DEFINES)
AC_SUBST(BUILD_DVDCSS) AC_SUBST(BUILD_DVDCSS)
AC_SUBST(BUILD_GOOM) AC_SUBST(BUILD_GOOM)
@ -60,20 +60,19 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
AC_SUBST(USE_EXTERNAL_LIBRARIES) AC_SUBST(USE_EXTERNAL_LIBRARIES)
AC_SUBST(USE_EXTERNAL_FFMPEG) AC_SUBST(USE_EXTERNAL_FFMPEG)
AC_SUBST(USE_EXTERNAL_LIBA52) AC_SUBST(USE_EXTERNAL_LIBA52)
@@ -1428,7 +1452,7 @@ @@ -1433,7 +1457,7 @@
else -DSYSCONF_INSTALL_DIR:PATH="${sysconfdir}" -DSHARE_INSTALL_PREFIX:PATH="${datadir}" .
rm -f CMakeCache.txt && CC="" CXX="" cmake -D CMAKE_BUILD_TYPE:STRING=RelWithDebInfo -D USE_FTGL:BOOL=OFF . set +x
fi fi
-], [0]) -], [0])
+], [$BUILD_XBMCPROJECTM]) +], [$BUILD_XBMCPROJECTM])
XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[ XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
if test "$host_vendor" != "apple" ; then if test "$host_vendor" != "apple" ; then
diff -Naur xbmc-27135/configure.in.orig xbmc-27135.patch/configure.in.orig diff -Naur xbmc-28425/Makefile.in xbmc-28425.patch/Makefile.in
diff -Naur xbmc-27135/Makefile.in xbmc-27135.patch/Makefile.in --- xbmc-28425/Makefile.in 2010-03-06 13:48:42.000000000 +0100
--- xbmc-27135/Makefile.in 2010-01-24 11:46:42.037632392 +0100 +++ xbmc-28425.patch/Makefile.in 2010-03-06 15:46:44.356451434 +0100
+++ xbmc-27135.patch/Makefile.in 2010-01-24 13:05:08.781706071 +0100 @@ -104,8 +104,10 @@
@@ -101,8 +101,10 @@
VIS_DIRS=\ VIS_DIRS=\
xbmc/visualizations/OpenGLSpectrum \ xbmc/visualizations/OpenGLSpectrum \
@ -86,7 +85,7 @@ diff -Naur xbmc-27135/Makefile.in xbmc-27135.patch/Makefile.in
ifneq (@BUILD_GOOM@,1) ifneq (@BUILD_GOOM@,1)
VIS_DIRS+=xbmc/visualizations/Goom VIS_DIRS+=xbmc/visualizations/Goom
endif endif
@@ -274,7 +276,9 @@ @@ -291,7 +293,9 @@
visualizations: exports visualizations: exports
$(MAKE) -C xbmc/visualizations/OpenGLSpectrum $(MAKE) -C xbmc/visualizations/OpenGLSpectrum
$(MAKE) -C xbmc/visualizations/WaveForm $(MAKE) -C xbmc/visualizations/WaveForm
@ -96,4 +95,3 @@ diff -Naur xbmc-27135/Makefile.in xbmc-27135.patch/Makefile.in
ifneq (@BUILD_GOOM@,1) ifneq (@BUILD_GOOM@,1)
ifeq ($(or $(findstring powerpc-linux,$(ARCH)),$(findstring powerpc64-linux,$(ARCH))),) ifeq ($(or $(findstring powerpc-linux,$(ARCH)),$(findstring powerpc64-linux,$(ARCH))),)
$(MAKE) -C xbmc/visualizations/Goom $(MAKE) -C xbmc/visualizations/Goom
diff -Naur xbmc-27135/Makefile.in.orig xbmc-27135.patch/Makefile.in.orig

40
packages/mediacenter/xbmc/patches/012_xbmc-let_select_RSXS-0.1.diff
View File

@ -1,16 +1,16 @@
diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
--- xbmc-27135/configure.in 2010-01-24 13:06:04.053736811 +0100 --- xbmc-28425/configure.in 2010-03-06 15:47:49.217295596 +0100
+++ xbmc-27135.patch/configure.in 2010-01-24 13:06:32.203610970 +0100 +++ xbmc-28425.patch/configure.in 2010-03-06 15:48:00.615295765 +0100
@@ -47,6 +47,8 @@ @@ -35,6 +35,8 @@
crystalhd_disabled="== CrystalHD support manually disabled. ==" goom_disabled="== GOOM disabled. =="
xbmcprojectm_enabled="== XBMCProjectM enabled. ==" xbmcprojectm_enabled="== XBMCProjectM enabled. =="
xbmxprojectm_disabled="== XBMCProjectM disabled. ==" xbmxprojectm_disabled="== XBMCProjectM disabled. =="
+rsxs_enabled="== RSXS enabled. ==" +rsxs_enabled="== RSXS enabled. =="
+rsxs_disabled="== RSXS disabled. ==" +rsxs_disabled="== RSXS disabled. =="
pulse_not_found="== Could not find libpulse. PulseAudio support disabled. =="
# External library message strings pulse_disabled="== PulseAudio support manually disabled. =="
external_libraries_enabled="== Use of all supported external libraries enabled. ==" faac_not_found="== Could not find libfaac. FAAC support disabled. =="
@@ -153,6 +155,12 @@ @@ -158,6 +160,12 @@
[use_xbmcprojectm=$enableval], [use_xbmcprojectm=$enableval],
[use_xbmcprojectm=yes]) [use_xbmcprojectm=yes])
@ -23,7 +23,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
AC_PATH_PROG(CCACHE,ccache,none) AC_PATH_PROG(CCACHE,ccache,none)
AC_ARG_ENABLE([ccache], AC_ARG_ENABLE([ccache],
[AS_HELP_STRING([--enable-ccache], [AS_HELP_STRING([--enable-ccache],
@@ -520,6 +528,15 @@ @@ -546,6 +554,15 @@
BUILD_XBMCPROJECTM=1 BUILD_XBMCPROJECTM=1
fi fi
@ -39,7 +39,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
### External libraries checks ### External libraries checks
if test "$use_external_libraries" = "yes"; then if test "$use_external_libraries" = "yes"; then
AC_MSG_NOTICE($external_libraries_enabled) AC_MSG_NOTICE($external_libraries_enabled)
@@ -858,6 +875,12 @@ @@ -874,6 +891,12 @@
final_message="$final_message\n XBMCProjectM:\tNo" final_message="$final_message\n XBMCProjectM:\tNo"
fi fi
@ -52,7 +52,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
if test "$use_pcre" = "yes"; then if test "$use_pcre" = "yes"; then
final_message="$final_message\n PCRE Support:\tYes" final_message="$final_message\n PCRE Support:\tYes"
else else
@@ -1078,6 +1101,7 @@ @@ -1113,6 +1136,7 @@
AC_SUBST(BUILD_DVDCSS) AC_SUBST(BUILD_DVDCSS)
AC_SUBST(BUILD_GOOM) AC_SUBST(BUILD_GOOM)
AC_SUBST(BUILD_XBMCPROJECTM) AC_SUBST(BUILD_XBMCPROJECTM)
@ -60,7 +60,7 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
AC_SUBST(USE_EXTERNAL_LIBRARIES) AC_SUBST(USE_EXTERNAL_LIBRARIES)
AC_SUBST(USE_EXTERNAL_FFMPEG) AC_SUBST(USE_EXTERNAL_FFMPEG)
AC_SUBST(USE_EXTERNAL_LIBA52) AC_SUBST(USE_EXTERNAL_LIBA52)
@@ -1503,7 +1527,7 @@ @@ -1511,7 +1535,7 @@
--disable-lattice \ --disable-lattice \
--disable-skyrocket --disable-skyrocket
fi fi
@ -69,12 +69,12 @@ diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [ XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [
if test "$host_vendor" = "apple" ; then if test "$host_vendor" = "apple" ; then
diff -Naur xbmc-27135/Makefile.in xbmc-27135.patch/Makefile.in diff -Naur xbmc-28425/Makefile.in xbmc-28425.patch/Makefile.in
--- xbmc-27135/Makefile.in 2010-01-24 13:06:04.055580383 +0100 --- xbmc-28425/Makefile.in 2010-03-06 15:47:49.218295582 +0100
+++ xbmc-27135.patch/Makefile.in 2010-01-24 13:06:32.205705821 +0100 +++ xbmc-28425.patch/Makefile.in 2010-03-06 15:48:45.399294520 +0100
@@ -96,8 +96,10 @@ @@ -99,8 +99,10 @@
xbmc/lib/libPython/linux \ lib/xbmc-dll-symbols \
lib/libmodplug lib/jsoncpp/jsoncpp/src/lib_json
-SS_DIRS=\ -SS_DIRS=\
- xbmc/screensavers/rsxs-0.9/xbmc - xbmc/screensavers/rsxs-0.9/xbmc
@ -85,7 +85,7 @@ diff -Naur xbmc-27135/Makefile.in xbmc-27135.patch/Makefile.in
VIS_DIRS=\ VIS_DIRS=\
xbmc/visualizations/OpenGLSpectrum \ xbmc/visualizations/OpenGLSpectrum \
@@ -285,7 +287,9 @@ @@ -302,7 +304,9 @@
endif endif
endif endif
screensavers: exports screensavers: exports

95
packages/mediacenter/xbmc/patches/xbmc-add_DESTDIR_support_to_make_install-0.1.diff Normal file
View File

@ -0,0 +1,95 @@
diff -Naur xbmc-28425/Makefile.in xbmc-28425.patch/Makefile.in
--- xbmc-28425/Makefile.in 2010-03-06 15:49:58.203323655 +0100
+++ xbmc-28425.patch/Makefile.in 2010-03-06 15:53:21.236294350 +0100
@@ -480,7 +480,7 @@
$(MAKE) -C tools/TexturePacker/
install-bin: xbmc.bin # developement convenience target
- sudo install -D xbmc.bin $(prefix)/share/xbmc
+ sudo install -D xbmc.bin $(DESTDIR)/$(prefix)/share/xbmc
ifeq ($(findstring osx,$(ARCH)), osx)
# TODO: add osx install
@@ -488,55 +488,55 @@
install: install-binaries install-arch install-datas install-web
install-binaries: install-scripts
- @echo "Copying XBMC binary to $(prefix)/share/xbmc/xbmc.bin"
- @install -D xbmc.bin $(prefix)/share/xbmc/xbmc.bin
- @install -D xbmc-xrandr $(prefix)/share/xbmc/xbmc-xrandr
+ @echo "Copying XBMC binary to $(DESTDIR)/$(prefix)/share/xbmc/xbmc.bin"
+ @install -D xbmc.bin $(DESTDIR)/$(prefix)/share/xbmc/xbmc.bin
+ @install -D xbmc-xrandr $(DESTDIR)/$(prefix)/share/xbmc/xbmc-xrandr
@echo "You can run XBMC with the command 'xbmc'"
endif
install-arch:
@# Arch dependent files
- @find system screensavers visualisations -regextype posix-extended -type f -not -iregex ".*svn.*|.*win32(dx)?\.vis|.*osx\.vis" -iregex ".*$(ARCH).*|.*\.vis|.*\.xbs" -exec install -D "{}" $(prefix)/share/xbmc/"{}" \; -printf " -- %-75.75f\r"
+ @find system screensavers visualisations -regextype posix-extended -type f -not -iregex ".*svn.*|.*win32(dx)?\.vis|.*osx\.vis" -iregex ".*$(ARCH).*|.*\.vis|.*\.xbs" -exec install -D "{}" $(DESTDIR)/$(prefix)/share/xbmc/"{}" \; -printf " -- %-75.75f\r"
install-scripts:
- @install -D tools/Linux/xbmc.sh $(prefix)/bin/xbmc
- @install -D tools/Linux/xbmc-standalone.sh $(prefix)/bin/xbmc-standalone
- @install -D -m 0644 tools/Linux/FEH.py $(prefix)/share/xbmc/FEH.py
- @install -D -m 0644 tools/Linux/xbmc-xsession.desktop $(prefix)/share/xsessions/XBMC.desktop
+ @install -D tools/Linux/xbmc.sh $(DESTDIR)/$(prefix)/bin/xbmc
+ @install -D tools/Linux/xbmc-standalone.sh $(DESTDIR)/$(prefix)/bin/xbmc-standalone
+ @install -D -m 0644 tools/Linux/FEH.py $(DESTDIR)/$(prefix)/share/xbmc/FEH.py
+ @install -D -m 0644 tools/Linux/xbmc-xsession.desktop $(DESTDIR)/$(prefix)/share/xsessions/XBMC.desktop
install-datas: install-scripts
@echo "Copying support and legal files..."
@for FILE in `ls README.linux LICENSE.GPL *.txt`; do \
- install -D -m 0644 "$$FILE" $(prefix)/share/xbmc/; done
+ install -D -m 0644 "$$FILE" $(DESTDIR)/$(prefix)/share/xbmc/; done
@echo "Done!"
- @echo "Copying system files to $(prefix)/share/xbmc"
+ @echo "Copying system files to $(DESTDIR)/$(prefix)/share/xbmc"
@# Arch independent files
- @find addons language media scripts sounds userdata visualisations system -regextype posix-extended -type f -not -iregex ".*svn.*|.*\.so|.*\.dll|.*\.pyd|.*python/.*\.zlib|.*\.vis" -exec install -D -m 0644 "{}" $(prefix)/share/xbmc/"{}" \; -printf " -- %-75.75f\r"
+ @find addons language media scripts sounds userdata visualisations system -regextype posix-extended -type f -not -iregex ".*svn.*|.*\.so|.*\.dll|.*\.pyd|.*python/.*\.zlib|.*\.vis" -exec install -D -m 0644 "{}" $(DESTDIR)/$(prefix)/share/xbmc/"{}" \; -printf " -- %-75.75f\r"
@# Skins
- @find skin -regextype posix-extended -type f -not -iregex '.*/\.svn/.*|^skin/[^/]*/media/.*[^x][^b][^t]' -exec install -D -m 0644 '{}' $(prefix)/share/xbmc/'{}' \; -printf " -- %-75.75f\r"
+ @find skin -regextype posix-extended -type f -not -iregex '.*/\.svn/.*|^skin/[^/]*/media/.*[^x][^b][^t]' -exec install -D -m 0644 '{}' $(DESTDIR)/$(prefix)/share/xbmc/'{}' \; -printf " -- %-75.75f\r"
@# Icons and links
- @mkdir -p $(prefix)/share/applications $(prefix)/share/pixmaps
- @cp -a tools/Linux/xbmc.png $(prefix)/share/pixmaps/
- @cp -a tools/Linux/xbmc.desktop $(prefix)/share/applications/
+ @mkdir -p $(DESTDIR)/$(prefix)/share/applications $(DESTDIR)/$(prefix)/share/pixmaps
+ @cp -a tools/Linux/xbmc.png $(DESTDIR)/$(prefix)/share/pixmaps/
+ @cp -a tools/Linux/xbmc.desktop $(DESTDIR)/$(prefix)/share/applications/
install-livedatas:
- @echo "Install Live CD datas in $(prefix) ..."
- @mkdir -p $(prefix)/bin
- @install -D tools/XBMCLive/diskmounter $(prefix)/bin
- @install -D tools/XBMCLive/installXBMC $(prefix)/bin
- @install -D tools/XBMCLive/runXBMC $(prefix)/bin
- @install -D tools/XBMCLive/setAlsaVolumes $(prefix)/bin
+ @echo "Install Live CD datas in $(DESTDIR)/$(prefix) ..."
+ @mkdir -p $(DESTDIR)/$(prefix)/bin
+ @install -D tools/XBMCLive/diskmounter $(DESTDIR)/$(prefix)/bin
+ @install -D tools/XBMCLive/installXBMC $(DESTDIR)/$(prefix)/bin
+ @install -D tools/XBMCLive/runXBMC $(DESTDIR)/$(prefix)/bin
+ @install -D tools/XBMCLive/setAlsaVolumes $(DESTDIR)/$(prefix)/bin
install-web:
- @mkdir -p $(prefix)/share/xbmc/web
- @cp -r web/poc_jsonrpc/* $(prefix)/share/xbmc/web
- @find $(prefix)/share/xbmc/web -depth -name .svn -exec rm -rf {} \;
+ @mkdir -p $(DESTDIR)/$(prefix)/share/xbmc/web
+ @cp -r web/poc_jsonrpc/* $(DESTDIR)/$(prefix)/share/xbmc/web
+ @find $(DESTDIR)/$(prefix)/share/xbmc/web -depth -name .svn -exec rm -rf {} \;
uninstall:
@echo "Removing XBMC..."
- @rm -rf $(prefix)/share/xbmc $(prefix)/bin/xbmc
- @rm -rf $(prefix)/bin/xbmc-standalone
- @rm -rf $(prefix)/share/xsessions/XBMC.desktop
+ @rm -rf $(DESTDIR)/$(prefix)/share/xbmc $(DESTDIR)/$(prefix)/bin/xbmc
+ @rm -rf $(DESTDIR)/$(prefix)/bin/xbmc-standalone
+ @rm -rf $(DESTDIR)/$(prefix)/share/xsessions/XBMC.desktop
@echo "Done!"
reallyclean:

84
packages/mediacenter/xbmc/patches/xbmc-cximage-libpng-1.4.0-0.1.diff
View File

@ -1,84 +0,0 @@
diff -Naur xbmc-27495/xbmc/lib/cximage-6.0/CxImage/ximapng.cpp xbmc-27495.patch/xbmc/lib/cximage-6.0/CxImage/ximapng.cpp
--- xbmc-27495/xbmc/lib/cximage-6.0/CxImage/ximapng.cpp 2010-02-05 23:40:42.000000000 +0100
+++ xbmc-27495.patch/xbmc/lib/cximage-6.0/CxImage/ximapng.cpp 2010-02-08 03:37:44.901982746 +0100
@@ -142,9 +142,17 @@
if (info_ptr->num_trans!=0){ //palette transparency
if (info_ptr->num_trans==1){
if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE){
+#if PNG_LIBPNG_VER > 10399
+ info.nBkgndIndex = info_ptr->trans_color.index;
+#else
info.nBkgndIndex = info_ptr->trans_values.index;
+#endif
} else{
+#if PNG_LIBPNG_VER > 10399
+ info.nBkgndIndex = info_ptr->trans_color.gray>>nshift;
+#else
info.nBkgndIndex = info_ptr->trans_values.gray>>nshift;
+#endif
}
}
if (info_ptr->num_trans>1){
@@ -152,7 +160,11 @@
if (pal){
DWORD ip;
for (ip=0;ip<min(head.biClrUsed,(unsigned long)info_ptr->num_trans);ip++)
+#if PNG_LIBPNG_VER > 10399
+ pal[ip].rgbReserved=info_ptr->trans_alpha[ip];
+#else
pal[ip].rgbReserved=info_ptr->trans[ip];
+#endif
for (ip=info_ptr->num_trans;ip<head.biClrUsed;ip++){
pal[ip].rgbReserved=255;
}
@@ -166,9 +178,15 @@
int num_trans;
png_color_16 *image_background;
if (png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, &image_background)){
+#if PNG_LIBPNG_VER > 10399
+ info.nBkgndColor.rgbRed = (BYTE)(info_ptr->trans_color.red>>nshift);
+ info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_color.green>>nshift);
+ info.nBkgndColor.rgbBlue = (BYTE)(info_ptr->trans_color.blue>>nshift);
+#else
info.nBkgndColor.rgbRed = (BYTE)(info_ptr->trans_values.red>>nshift);
info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_values.green>>nshift);
info.nBkgndColor.rgbBlue = (BYTE)(info_ptr->trans_values.blue>>nshift);
+#endif
info.nBkgndColor.rgbReserved = 0;
info.nBkgndIndex = 0;
}
@@ -417,12 +435,21 @@
if (info.nBkgndIndex >= 0){
info_ptr->num_trans = 1;
info_ptr->valid |= PNG_INFO_tRNS;
+#if PNG_LIBPNG_VER > 10399
+ info_ptr->trans_alpha = trans;
+ info_ptr->trans_color.index = (BYTE)info.nBkgndIndex;
+ info_ptr->trans_color.red = tc.rgbRed;
+ info_ptr->trans_color.green = tc.rgbGreen;
+ info_ptr->trans_color.blue = tc.rgbBlue;
+ info_ptr->trans_color.gray = info_ptr->trans_color.index;
+#else
info_ptr->trans = trans;
info_ptr->trans_values.index = (BYTE)info.nBkgndIndex;
info_ptr->trans_values.red = tc.rgbRed;
info_ptr->trans_values.green = tc.rgbGreen;
info_ptr->trans_values.blue = tc.rgbBlue;
info_ptr->trans_values.gray = info_ptr->trans_values.index;
+#endif
// the transparency indexes start from 0 for non grayscale palette
if (!bGrayScale && head.biClrUsed && info.nBkgndIndex)
@@ -443,7 +470,11 @@
trans[ip]=GetPaletteColor((BYTE)ip).rgbReserved;
info_ptr->num_trans = (WORD)nc;
info_ptr->valid |= PNG_INFO_tRNS;
+#if PNG_LIBPNG_VER > 10399
+ info_ptr->trans_alpha = trans;
+#else
info_ptr->trans = trans;
+#endif
}
// copy the palette colors
diff -Naur xbmc-27495/xbmc/lib/cximage-6.0/libpng.diff xbmc-27495.patch/xbmc/lib/cximage-6.0/libpng.diff

18
packages/mediacenter/xbmc/scripts/xbmc Executable file
View File

@ -0,0 +1,18 @@
#!/bin/sh
. /etc/sysconfig
export DISPLAY=":0.0"
/usr/share/xbmc/xbmc.bin \
--standalone \
-fs \
--lircdev $LIRC_OUTPUT \
$@
RET=$?
echo "Exited with code $RET"
[ "$RET" == 0 ] && initctl emit shutdown REBOOT=no
[ "$RET" == 64 ] && initctl emit shutdown REBOOT=no
[ "$RET" == 66 ] && initctl emit shutdown REBOOT=yes

2
packages/mediacenter/xbmc/url
View File

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