new package:

- add xbmc-pvr (PVR branch of xbmc for testing)
This commit is contained in:
Stephan Raue 2010-01-11 05:07:49 +01:00
parent 3a75102f2f
commit c6b5287a13
25 changed files with 68594 additions and 0 deletions

View File

@ -0,0 +1,130 @@
#!/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 SDL #?
$SCRIPTS/build SDL_mixer #?
$SCRIPTS/build SDL_image #?
$SCRIPTS/build avahi
$SCRIPTS/build sqlite
$SCRIPTS/build mysql #lib #?
$SCRIPTS/build samba #lib
if [ "$VDPAU" = yes ]; then
$SCRIPTS/build libvdpau
XBMC_VDPAU="--enable-vdpau"
else
XBMC_VDPAU="--disable-vdpau"
fi
if [ "$FFMPEG" = external ]; then
$SCRIPTS/build ffmpeg
XBMC_FFMPEG="--enable-external-ffmpeg"
else
XBMC_FFMPEG="--disable-external-ffmpeg"
fi
LDFLAGS="$LDFLAGS -lpython2.6"
cd $PKG_BUILD
cd xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss
./bootstrap
cd -
./bootstrap
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr \
--exec-prefix=/usr \
--sysconfdir=/etc \
--datadir=/usr/share \
--enable-debug \
--enable-optimizations \
--enable-gl \
$XBMC_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 \
--enable-hal \
$XBMC_FFMPEG \
--disable-external-liba52 \
--disable-external-libdts \
--disable-external-libmpeg2 \
--disable-external-libass \
--enable-external-libogg \
--enable-external-python \
make externals
make xbmc.bin
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

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,22 @@
# configure X.Org video settings
#
# runlevels: openelec
wait_for_xorg
# export XBMC_HOME="/usr/share/xbmc"
args="--standalone -fs --lircdev $LIRC_OUTPUT"
while true; do
progress "starting Mediacenter"
DISPLAY=:0.0 /usr/bin/xbmc ${args} > /dev/null 2>&1
RET=$?
echo "Exited with code $RET"
[ "$RET" == 0 ] && break
[ "$RET" == 64 ] && sync && poweroff
[ "$RET" == 66 ] && sync && reboot
done

View File

@ -0,0 +1,135 @@
#!/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 DeviceKit-disks
#$SCRIPTS/install ConsoleKit
$SCRIPTS/install libXt
$SCRIPTS/install libXtst
$SCRIPTS/install libXmu
$SCRIPTS/install libXinerama
$SCRIPTS/install libXrandr
$SCRIPTS/install $MESA
[ "$VDPAU" = yes ] && $SCRIPTS/install libvdpau
$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
[ "$FFMPEG" = external ] && $SCRIPTS/install ffmpeg
$SCRIPTS/install SDL
$SCRIPTS/install SDL_mixer
$SCRIPTS/install SDL_image
$SCRIPTS/install avahi
$SCRIPTS/install sqlite
$SCRIPTS/install mysql
$SCRIPTS/install samba
PKG_DIR=`find $PACKAGES -type d -name $1`
mkdir -p $INSTALL/usr/bin
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
mkdir -p $INSTALL/usr/share/xbmc/language
cp -PR $PKG_BUILD/language/* $INSTALL/usr/share/xbmc/language
mkdir -p $INSTALL/usr/share/xbmc/media/Fonts
cp -PR $PKG_BUILD/media/Fonts/*.ttf $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/icon.png $INSTALL/usr/share/xbmc/media/
cp -PR $PKG_DIR/splash/Splash.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
# cp -PR $PKG_BUILD/skin/* $INSTALL/usr/share/xbmc/skin
# find $INSTALL/usr/share/xbmc/skin -name *.bat -exec rm -rf {} ";"
# find $INSTALL/usr/share/xbmc/skin -name Makefile -exec rm -rf {} ";"
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
mkdir -p $INSTALL/usr/share/xbmc/system/keymaps
cp -PR $PKG_BUILD/system/keymaps/* $INSTALL/usr/share/xbmc/system/keymaps
mkdir -p $INSTALL/usr/share/xbmc/system/players/dvdplayer
cp -PR $PKG_BUILD/system/players/dvdplayer/*.so $INSTALL/usr/share/xbmc/system/players/dvdplayer
cp -PR $PKG_BUILD/system/players/dvdplayer/etc $INSTALL/usr/share/xbmc/system/players/dvdplayer
mkdir -p $INSTALL/usr/share/xbmc/system/players/paplayer
cp -PR $PKG_BUILD/system/players/paplayer/*.so $INSTALL/usr/share/xbmc/system/players/paplayer
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/spyce $INSTALL/usr/share/xbmc/system/python
mkdir -p $INSTALL/usr/share/xbmc/system/scrapers
cp -PR $PKG_BUILD/system/scrapers/* $INSTALL/usr/share/xbmc/system/scrapers
mkdir -p $INSTALL/usr/share/xbmc/system/shaders
cp -PR $PKG_BUILD/system/shaders/* $INSTALL/usr/share/xbmc/system/shaders
mkdir -p $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
cp -R $PKG_BUILD/web/Project_Mayhem_III/* $INSTALL/usr/share/xbmc/web
# other programs needed to run
$SCRIPTS/install alsa
$SCRIPTS/install lirc
$SCRIPTS/install vdr

View File

@ -0,0 +1,281 @@
diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in
--- xbmc-pvr-26651/configure.in 2010-01-11 03:33:19.645347327 +0100
+++ xbmc-pvr-26651.patch/configure.in 2010-01-11 04:20:15.677347493 +0100
@@ -1116,6 +1116,8 @@
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 \
@@ -1138,6 +1140,8 @@
cp pyconfig.h Include
else
./configure \
+ --host=$host_alias \
+ --build=$build_alias \
--enable-ipv6 \
--enable-unicode=ucs4 \
--without-cxx \
@@ -1155,6 +1159,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 \
@@ -1169,7 +1175,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
@@ -1178,7 +1186,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
@@ -1191,6 +1201,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 \
@@ -1217,6 +1228,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 \
@@ -1229,6 +1241,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 \
@@ -1242,12 +1255,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 \
@@ -1260,11 +1277,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
@@ -1275,6 +1296,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" &&
@@ -1284,6 +1307,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" &&
@@ -1299,6 +1324,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 \
@@ -1307,6 +1334,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 \
@@ -1328,6 +1357,10 @@
if test "$host_vendor" = "apple" ; then
CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
./configure MACOSX_DEPLOYMENT_TARGET=10.4 \
+ --host=$host_alias \
+ --build=$build_alias \
+ --host=$host_alias \
+ --build=$build_alias \
--with-pic \
--disable-static \
--enable-shared \
@@ -1337,6 +1370,8 @@
--disable-al-audio
else
./configure \
+ --host=$host_alias \
+ --build=$build_alias \
--with-pic \
--disable-static \
--enable-shared \
@@ -1352,6 +1387,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 \
@@ -1360,6 +1397,8 @@
--without-x
else
./configure \
+ --host=$host_alias \
+ --build=$build_alias \
--with-pic \
--disable-static \
--enable-shared \
@@ -1373,6 +1412,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
@@ -1383,17 +1424,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])
@@ -1402,12 +1449,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
@@ -1425,6 +1476,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
@@ -1439,6 +1492,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 \
@@ -1454,6 +1509,8 @@
./configure \
CFLAGS="-fPIC" \
CXXFLAGS="-fPIC" \
+ --host=$host_alias \
+ --build=$build_alias \
--without-xscreensaver \
--disable-sound \
--disable-cyclone \
@@ -1469,9 +1526,13 @@
XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [
if test "$host_vendor" = "apple" ; then
- ./configure --with-ssl-dir=/opt/local/include
- else
- ./configure
+ ./configure --with-ssl-dir=/opt/local/include \
+ --host=$host_alias \
+ --build=$build_alias
+ else
+ ./configure \
+ --host=$host_alias \
+ --build=$build_alias
fi
], [0])
diff -Naur xbmc-pvr-26651/configure.in.orig xbmc-pvr-26651.patch/configure.in.orig

View File

@ -0,0 +1,99 @@
diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in
--- xbmc-pvr-26651/configure.in 2010-01-11 04:27:41.051347205 +0100
+++ xbmc-pvr-26651.patch/configure.in 2010-01-11 04:28:14.760345801 +0100
@@ -45,6 +45,8 @@
vdpau_disabled="== VDPAU support manually disabled. =="
crystalhd_not_found="== Could not find libldil. CrystalHD support disabled. =="
crystalhd_disabled="== CrystalHD 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. =="
@@ -149,6 +151,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],
@@ -512,6 +520,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)
@@ -856,6 +873,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"
else
@@ -1072,6 +1095,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)
@@ -1471,7 +1495,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-pvr-26651/configure.in.orig xbmc-pvr-26651.patch/configure.in.orig
diff -Naur xbmc-pvr-26651/Makefile.in xbmc-pvr-26651.patch/Makefile.in
--- xbmc-pvr-26651/Makefile.in 2010-01-11 03:33:19.643343732 +0100
+++ xbmc-pvr-26651.patch/Makefile.in 2010-01-11 04:28:14.771345022 +0100
@@ -105,8 +105,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
@@ -279,7 +281,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
diff -Naur xbmc-pvr-26651/Makefile.in.orig xbmc-pvr-26651.patch/Makefile.in.orig

View File

@ -0,0 +1,98 @@
diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in
--- xbmc-pvr-26651/configure.in 2010-01-11 04:32:20.242370124 +0100
+++ xbmc-pvr-26651.patch/configure.in 2010-01-11 04:32:45.253470764 +0100
@@ -47,6 +47,8 @@
crystalhd_disabled="== CrystalHD 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. =="
@@ -157,6 +159,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],
@@ -529,6 +537,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)
@@ -879,6 +896,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"
else
@@ -1096,6 +1119,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)
@@ -1546,7 +1570,7 @@
--disable-lattice \
--disable-skyrocket
fi
-], [0])
+], [$BUILD_RSXS])
XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [
if test "$host_vendor" = "apple" ; then
diff -Naur xbmc-pvr-26651/configure.in.orig xbmc-pvr-26651.patch/configure.in.orig
diff -Naur xbmc-pvr-26651/Makefile.in xbmc-pvr-26651.patch/Makefile.in
--- xbmc-pvr-26651/Makefile.in 2010-01-11 04:32:20.302471949 +0100
+++ xbmc-pvr-26651.patch/Makefile.in 2010-01-11 04:34:20.323471765 +0100
@@ -100,8 +100,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 \
@@ -292,7 +294,9 @@
pvrclients: exports
$(MAKE) -C xbmc/pvrclients/vdr
screensavers: exports
+ifneq (@BUILD_RSXS@,1)
$(MAKE) -C xbmc/screensavers/rsxs-0.9/xbmc
+endif
libaddon: exports
$(MAKE) -C xbmc/addons/lib/addonlib++
$(MAKE) -C xbmc/addons/lib/pvrlib++

View File

@ -0,0 +1,29 @@
diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in
--- xbmc-pvr-26651/configure.in 2010-01-11 04:36:31.629347857 +0100
+++ xbmc-pvr-26651.patch/configure.in 2010-01-11 04:36:52.004347732 +0100
@@ -915,12 +915,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-pvr-26651/configure.in.orig xbmc-pvr-26651.patch/configure.in.orig
diff -Naur xbmc-pvr-26651/tools/TexturePacker/XBMCTex.cpp xbmc-pvr-26651.patch/tools/TexturePacker/XBMCTex.cpp
--- xbmc-pvr-26651/tools/TexturePacker/XBMCTex.cpp 2010-01-11 03:50:23.030349137 +0100
+++ xbmc-pvr-26651.patch/tools/TexturePacker/XBMCTex.cpp 2010-01-11 04:36:52.005347847 +0100
@@ -37,7 +37,7 @@
#endif
#ifdef _LINUX
-#include <lzo1x.h>
+#include <lzo/lzo1x.h>
#else
#include "../../xbmc/lib/liblzo/LZO1X.H"
#endif

View File

@ -0,0 +1,27 @@
diff -Naur xbmc-pvr-26651/guilib/Makefile xbmc-pvr-26651.patch/guilib/Makefile
--- xbmc-pvr-26651/guilib/Makefile 2010-01-11 03:33:19.802350966 +0100
+++ xbmc-pvr-26651.patch/guilib/Makefile 2010-01-11 04:38:11.069345520 +0100
@@ -1,4 +1,4 @@
-INCLUDES=-I. -I../ -Icommon -I../xbmc -I../xbmc/cores/dvdplayer/Codecs/ffmpeg -I../xbmc/linux -I../xbmc/utils -I/usr/include/freetype2 -I/usr/include/SDL -I../xbmc/lib/libsquish
+INCLUDES=-I. -I../ -Icommon -I../xbmc -I../xbmc/cores/dvdplayer/Codecs/ffmpeg -I../xbmc/linux -I../xbmc/utils -I../xbmc/lib/libsquish
SRCS=AnimatedGif.cpp \
AudioContext.cpp \
diff -Naur xbmc-pvr-26651/xbmc/FileSystem/Makefile xbmc-pvr-26651.patch/xbmc/FileSystem/Makefile
--- xbmc-pvr-26651/xbmc/FileSystem/Makefile 2010-01-11 03:41:38.093347308 +0100
+++ xbmc-pvr-26651.patch/xbmc/FileSystem/Makefile 2010-01-11 04:38:11.069345520 +0100
@@ -1,4 +1,4 @@
-INCLUDES=-I. -I../ -I../cores -I../linux -I../../guilib -I../lib/UnrarXLib -I../utils -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I../lib
+INCLUDES=-I. -I../ -I../cores -I../linux -I../../guilib -I../lib/UnrarXLib -I../utils -I../lib
INCLUDES+=-I../lib/libcdio/libcdio/include
CXXFLAGS+=-D__STDC_FORMAT_MACROS \
diff -Naur xbmc-pvr-26651/xbmc/Makefile xbmc-pvr-26651.patch/xbmc/Makefile
--- xbmc-pvr-26651/xbmc/Makefile 2010-01-11 03:34:23.448346973 +0100
+++ xbmc-pvr-26651.patch/xbmc/Makefile 2010-01-11 04:38:11.076345842 +0100
@@ -1,4 +1,4 @@
-INCLUDES+=-I../ -I. -Ilinux -Icores -I../guilib -Iutils -IFileSystem -I/usr/include/freetype2 -Icores/dvdplayer -Icores/dvdplayer/Codecs/ffmpeg
+INCLUDES+=-I../ -I. -Ilinux -Icores -I../guilib -Iutils -IFileSystem -Icores/dvdplayer -Icores/dvdplayer/Codecs/ffmpeg
INCLUDES+=-Ilib/libUPnP/Platinum/Source/Core \
-Ilib/libUPnP/Platinum/Source/Platinum \

View File

@ -0,0 +1,12 @@
diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in
--- xbmc-pvr-26651/configure.in 2010-01-11 04:37:50.978472580 +0100
+++ xbmc-pvr-26651.patch/configure.in 2010-01-11 04:38:58.055345557 +0100
@@ -1573,6 +1573,7 @@
--build=$build_alias
else
./configure \
+ `if test "$cross_compiling" = "yes"; then echo ac_cv_openssl_linker_option=no; fi` \
--host=$host_alias \
--build=$build_alias
fi
diff -Naur xbmc-pvr-26651/configure.in.orig xbmc-pvr-26651.patch/configure.in.orig

View File

@ -0,0 +1,78 @@
diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in
--- xbmc-pvr-26651/configure.in 2010-01-11 04:39:36.433347449 +0100
+++ xbmc-pvr-26651.patch/configure.in 2010-01-11 04:39:55.195347999 +0100
@@ -39,6 +39,8 @@
faac_disabled="== FAAC support manually disabled. =="
dvdcss_enabled="== DVDCSS support enabled. =="
dvdcss_disabled="== DVDCSS support disabled. =="
+hal_not_found="== Could not find hal and hal-storage. HAL support disabled. =="
+hal_disabled="== HAL support disabled. =="
avahi_not_found="== Could not find libavahi-common or libavahi-client. Avahi support disabled. =="
avahi_disabled="== Avahi support disabled. =="
vdpau_not_found="== Could not find libvdpau. VDPAU support disabled. =="
@@ -195,6 +197,11 @@
[enable MID support (default is no)])],
[use_mid=$enableval],
[use_mid=no])
+AC_ARG_ENABLE([hal],
+ [AS_HELP_STRING([--disable-hal],
+ [disable HAL support (default is enabled if hal and hal-storage is found)])],
+ [use_hal=$enableval],
+ [use_hal=yes])
AC_ARG_ENABLE([avahi],
[AS_HELP_STRING([--disable-avahi],
[disable Avahi support (default is enabled if libavahi-common and libavahi-client is found)])],
@@ -446,15 +453,9 @@
PKG_CHECK_MODULES([DBUS], [dbus-1],
[INCLUDES+=" $DBUS_CFLAGS"; LIBS+=" $DBUS_LIBS"],
AC_MSG_ERROR($missing_library))
- PKG_CHECK_MODULES([HAL_STORAGE], [hal-storage],
- [INCLUDES+=" $HAL_STORAGE_CFLAGS"; LIBS+=" $HAL_STORAGE_LIBS"],
- AC_MSG_ERROR($missing_library))
PKG_CHECK_MODULES([SDL], [sdl],
[INCLUDES+=" $SDL_CFLAGS"; LIBS+=" $SDL_LIBS"],
AC_MSG_ERROR($missing_library))
- PKG_CHECK_MODULES([HAL], [hal],
- [INCLUDES+=" $HAL_CFLAGS"; LIBS+=" $HAL_LIBS"],
- AC_MSG_ERROR($missing_library))
fi
# PulseAudio
@@ -483,6 +484,24 @@
fi
fi
+# HAL
+if test "$host_vendor" = "apple" ; then
+ use_hal="no"
+ AC_MSG_RESULT($hal_disabled)
+else
+ if test "$use_hal" = "yes"; then
+ PKG_CHECK_MODULES([HAL], [hal],
+ [INCLUDES+=" $HAL_CFLAGS"; LIBS+=" $HAL_LIBS"],
+ use_hal=no;AC_MSG_ERROR($missing_library))
+ PKG_CHECK_MODULES([HAL_STORAGE], [hal-storage],
+ [INCLUDES+=" $HAL_STORAGE_CFLAGS"; LIBS+=" $HAL_STORAGE_LIBS"],
+ use_hal=no;AC_MSG_ERROR($missing_library))
+ AC_DEFINE([HAS_HAL], [1], [Define to 1 if you have HAL installed])
+ else
+AC_MSG_RESULT($hal_disabled)
+ fi
+fi
+
# avahi
if test "$host_vendor" = "apple" ; then
use_avahi="no"
diff -Naur xbmc-pvr-26651/configure.in.orig xbmc-pvr-26651.patch/configure.in.orig
diff -Naur xbmc-pvr-26651/guilib/system.h xbmc-pvr-26651.patch/guilib/system.h
--- xbmc-pvr-26651/guilib/system.h 2010-01-11 03:33:19.672356894 +0100
+++ xbmc-pvr-26651.patch/guilib/system.h 2010-01-11 04:39:55.196347910 +0100
@@ -116,7 +116,6 @@
#define HAS_AVAHI
#endif
#define HAS_LCD
-#define HAS_HAL
#define HAS_DBUS
#define HAS_DBUS_SERVER
#define HAS_GL
diff -Naur xbmc-pvr-26651/guilib/system.h.orig xbmc-pvr-26651.patch/guilib/system.h.orig

View File

@ -0,0 +1,18 @@
diff -Naur xbmc-pvr-26651/configure.in.orig xbmc-pvr-26651.patch/configure.in.orig
diff -Naur xbmc-pvr-26651/guilib/system.h.orig xbmc-pvr-26651.patch/guilib/system.h.orig
diff -Naur xbmc-pvr-26651/xbmc/utils/Splash.cpp xbmc-pvr-26651.patch/xbmc/utils/Splash.cpp
--- xbmc-pvr-26651/xbmc/utils/Splash.cpp 2010-01-11 03:41:56.067346735 +0100
+++ xbmc-pvr-26651.patch/xbmc/utils/Splash.cpp 2010-01-11 04:40:54.868347693 +0100
@@ -53,9 +53,9 @@
g_graphicsContext.Clear();
g_graphicsContext.SetCameraPosition(CPoint(0, 0));
- float w = g_graphicsContext.GetWidth() * 0.5f;
- float h = g_graphicsContext.GetHeight() * 0.5f;
- CGUIImage* image = new CGUIImage(0, 0, w*0.5f, h*0.5f, w, h, m_ImageName);
+ float w = g_graphicsContext.GetWidth();
+ float h = g_graphicsContext.GetHeight();
+ CGUIImage* image = new CGUIImage(0, 0, 0, 0, w, h, m_ImageName);
image->SetAspectRatio(CAspectRatio::AR_KEEP);
image->AllocResources();

View File

@ -0,0 +1,21 @@
diff -Naur xbmc-pvr-26651/configure.in xbmc-pvr-26651.patch/configure.in
--- xbmc-pvr-26651/configure.in 2010-01-11 04:40:33.487469992 +0100
+++ xbmc-pvr-26651.patch/configure.in 2010-01-11 04:42:38.159472611 +0100
@@ -770,6 +770,7 @@
fi
fi
+AC_CHECK_PROG(HAVE_YASM,yasm,"yes","no",)
AC_CHECK_PROG(HAVE_SVNVERSION,svnversion,"yes","no",)
AC_CHECK_PROG(HAVE_GIT,git,"yes","no",)
@@ -1290,6 +1291,7 @@
--disable-ipv6 \
`if test "$use_debug" = "no"; then echo --disable-debug; fi` \
`if test "$cross_compiling" = "yes"; then echo --enable-cross-compile; fi` \
+ `if test "$HAVE_YASM" = "yes"; then echo --enable-yasm; fi` \
--disable-muxers \
--disable-encoders \
--disable-decoder=mpeg_xvmc \
diff -Naur xbmc-pvr-26651/configure.in.orig xbmc-pvr-26651.patch/configure.in.orig
diff -Naur xbmc-pvr-26651/guilib/system.h.orig xbmc-pvr-26651.patch/guilib/system.h.orig

File diff suppressed because it is too large Load Diff

Binary file not shown.

After

Width:  |  Height:  |  Size: 292 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 57 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 205 KiB

View File

@ -0,0 +1 @@
http://sources.openelec.tv/svn/xbmc-pvr-26651.tar.bz2