xbmc-pvr:

- remove xbmc-pvr, will be developed in openelec-vdr branch
This commit is contained in:
Stephan Raue 2010-03-12 18:21:24 +01:00
parent b1b5d53421
commit 3e100cae51
17 changed files with 0 additions and 68584 deletions

View File

@ -1,126 +0,0 @@
#!/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 libmicrohttpd
$SCRIPTS/build dbus
$SCRIPTS/build hal
$SCRIPTS/build libXt
$SCRIPTS/build libXtst
$SCRIPTS/build libXmu
$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 libmad
$SCRIPTS/build libsamplerate
$SCRIPTS/build libogg
$SCRIPTS/build libvorbis
$SCRIPTS/build libcdio
$SCRIPTS/build libmms
$SCRIPTS/build libmodplug
$SCRIPTS/build faac
$SCRIPTS/build faad2
$SCRIPTS/build flac
$SCRIPTS/build wavpack
$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 [ "$CRYSTALHD" = yes ]; then
$SCRIPTS/build crystalhd
XBMC_CRYSTALHD="--enable-crystalhd"
else
XBMC_CRYSTALHD="--disable-crystalhd"
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 \
--disable-debug \
--enable-optimizations \
--enable-gl \
--disable-profiling \
--disable-joystick \
--enable-xrandr \
--disable-ccache \
--disable-pulse \
--enable-faac \
--disable-libdts \
--disable-liba52 \
--enable-dvdcss \
--disable-mid \
--disable-goom \
--disable-xbmcprojectm \
--disable-rsxs \
--enable-avahi \
--enable-hal \
--enable-webserver \
$XBMC_VDPAU \
$XBMC_CRYSTALHD \
$XBMC_FFMPEG \
--disable-external-liba52 \
--disable-external-libdts \
--disable-external-libass \
--enable-external-python \
make externals
make xbmc.bin
make xbmc-xrandr

View File

@ -1,29 +0,0 @@
################################################################################
# Mediacenter environment variables.
#
# This file contains non-OpenELEC evironment variables as well as OpenELEC
# evironment variables that are not user defined.
################################################################################
XBMC_CACHING="no"
#-------------------------------------------------------------------------------
# do not change anything below
#-------------------------------------------------------------------------------
XBMC_HOME="/usr/share/xbmc"
export XBMC_HOME
cache_xbmc () {
progress "caching XBMC"
mkdir -p /var/cache/bin
ionice -c 1 -n 0 cp -PR /usr/share/xbmc/xbmc.bin /var/cache/bin
touch /var/cache/xbmc.cache
}
wait_for_xbmc_cache () {
while [ ! -f /var/cache/xbmc.cache ]; do
sleep 1
done
}

View File

@ -1,26 +0,0 @@
# starting Mediacenter
#
# runlevels: openelec
args="--standalone -fs --lircdev $LIRC_OUTPUT"
progress "starting Mediacenter"
if test "$XBMC_CACHING" = "yes" ; then
wait_for_xbmc_cache
XBMC_BIN="/var/cache/bin/xbmc.bin"
else
XBMC_BIN="/usr/share/xbmc/xbmc.bin"
fi
while true; do
DISPLAY=:0.0 $XBMC_BIN ${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

@ -1,126 +0,0 @@
#!/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 libmicrohttpd
$SCRIPTS/install dbus
$SCRIPTS/install hal
$SCRIPTS/install DeviceKit-disks
$SCRIPTS/install ConsoleKit
$SCRIPTS/install libXt
$SCRIPTS/install libXtst
$SCRIPTS/install libXmu
$SCRIPTS/install libXrandr
$SCRIPTS/install $MESA
[ "$VDPAU" = yes ] && $SCRIPTS/install libvdpau
[ "$CRYSTALHD" = yes ] && $SCRIPTS/install crystalhd
$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 libmodplug
$SCRIPTS/install faac
$SCRIPTS/install faad2
$SCRIPTS/install flac
$SCRIPTS/install wavpack
$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
cp -PR $PKG_DIR/scripts/xbmc $INSTALL/usr/bin
mkdir -p $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
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
mkdir -p $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/
mkdir -p $INSTALL/usr/share/xbmc/skin
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
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/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
$SCRIPTS/install alsa
$SCRIPTS/install lirc
$SCRIPTS/install vdr

View File

@ -1,138 +0,0 @@
diff -Naur xbmc-pvr-28368/configure.in xbmc-pvr-28368.patch/configure.in
--- xbmc-pvr-28368/configure.in 2010-03-04 14:12:37.000000000 +0100
+++ xbmc-pvr-28368.patch/configure.in 2010-03-04 14:55:05.805134767 +0100
@@ -1161,7 +1161,9 @@
cp pyconfig.h Include
else
./configure \
- --enable-ipv6 \
+ --host=$host_alias \
+ --build=$build_alias \
+ --disable-ipv6 \
--enable-unicode=ucs4 \
--without-cxx \
--enable-shared \
@@ -1226,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 \
--enable-muxer=spdif \
--enable-muxer=adts \
@@ -1242,6 +1245,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 \
@@ -1261,6 +1265,8 @@
--disable-win
else
./configure \
+ --host=$host_alias \
+ --build=$build_alias \
--disable-oss \
--disable-solaris-audio \
--disable-al-audio \
@@ -1278,6 +1284,8 @@
--with-pic
else
./configure \
+ --host=$host_alias \
+ --build=$build_alias \
--disable-doc \
--enable-static \
--with-pic
@@ -1296,6 +1304,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 \
@@ -1321,6 +1331,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" \
@@ -1353,6 +1365,8 @@
--disable-al-audio
else
./configure \
+ --host=$host_alias \
+ --build=$build_alias \
--with-pic \
--disable-static \
--enable-shared \
@@ -1388,7 +1402,9 @@
./configure MACOSX_DEPLOYMENT_TARGET=10.4
else
CFLAGS="$CFLAGS -fPIC" \
- ./configure
+ ./configure \
+ --host=$host_alias \
+ --build=$build_alias
fi
], [$USE_EXTERNAL_LIBASS])
@@ -1402,6 +1418,8 @@
--with-pic
else
./configure \
+ --host=$host_alias \
+ --build=$build_alias \
CPPFLAGS="$CPPFLAGS" \
CFLAGS="$CFLAGS -fPIC" \
CXXFLAGS="$CXXFLAGS -fPIC" \
@@ -1428,6 +1446,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" \
@@ -1458,6 +1478,8 @@
--disable-skyrocket
else
./configure \
+ --host=$host_alias \
+ --build=$build_alias \
CPPFLAGS="$CPPFLAGS" \
CFLAGS="$CFLAGS -fPIC" \
CXXFLAGS="$CXXFLAGS -fPIC" \
@@ -1477,9 +1499,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])
@@ -1488,7 +1512,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])

View File

@ -1,97 +0,0 @@
diff -Naur xbmc-pvr-28368/configure.in xbmc-pvr-28368.patch/configure.in
--- xbmc-pvr-28368/configure.in 2010-03-04 14:55:42.493261863 +0100
+++ xbmc-pvr-28368.patch/configure.in 2010-03-04 14:55:55.964134731 +0100
@@ -33,6 +33,8 @@
xrandr_disabled="== XRandR support disabled. SDL will be used for resolution support. =="
goom_enabled="== GOOM enabled. =="
goom_disabled="== GOOM disabled. =="
+xbmcprojectm_enabled="== XBMCProjectM enabled. =="
+xbmxprojectm_disabled="== XBMCProjectM disabled. =="
pulse_not_found="== Could not find libpulse. PulseAudio support disabled. =="
pulse_disabled="== PulseAudio support manually disabled. =="
faac_not_found="== Could not find libfaac. FAAC support disabled. =="
@@ -150,6 +152,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],
@@ -529,6 +537,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
@@ -1097,6 +1120,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)
@@ -1441,7 +1465,7 @@
-DSYSCONF_INSTALL_DIR:PATH="${sysconfdir}" -DSHARE_INSTALL_PREFIX:PATH="${datadir}" .
set +x
fi
-], [0])
+], [$BUILD_XBMCPROJECTM])
XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
if test "$host_vendor" != "apple" ; then
diff -Naur xbmc-pvr-28368/Makefile.in xbmc-pvr-28368.patch/Makefile.in
--- xbmc-pvr-28368/Makefile.in 2010-03-04 14:12:37.000000000 +0100
+++ xbmc-pvr-28368.patch/Makefile.in 2010-03-04 14:55:55.966137206 +0100
@@ -104,8 +104,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
@@ -303,7 +305,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

View File

@ -1,97 +0,0 @@
diff -Naur xbmc-pvr-28368/configure.in xbmc-pvr-28368.patch/configure.in
--- xbmc-pvr-28368/configure.in 2010-03-04 14:56:29.763135238 +0100
+++ xbmc-pvr-28368.patch/configure.in 2010-03-04 14:56:42.557259507 +0100
@@ -35,6 +35,8 @@
goom_disabled="== GOOM disabled. =="
xbmcprojectm_enabled="== XBMCProjectM enabled. =="
xbmxprojectm_disabled="== XBMCProjectM disabled. =="
+rsxs_enabled="== RSXS enabled. =="
+rsxs_disabled="== RSXS disabled. =="
pulse_not_found="== Could not find libpulse. PulseAudio support disabled. =="
pulse_disabled="== PulseAudio support manually disabled. =="
faac_not_found="== Could not find libfaac. FAAC support disabled. =="
@@ -158,6 +160,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],
@@ -546,6 +554,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
@@ -1121,6 +1144,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)
@@ -1519,7 +1543,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-28368/Makefile.in xbmc-pvr-28368.patch/Makefile.in
--- xbmc-pvr-28368/Makefile.in 2010-03-04 14:56:29.764135078 +0100
+++ xbmc-pvr-28368.patch/Makefile.in 2010-03-04 14:57:31.037259469 +0100
@@ -99,8 +99,10 @@
lib/libmodplug \
lib/xbmc-dll-symbols
-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 \
@@ -317,7 +319,9 @@
$(MAKE) -C xbmc/pvrclients/vdr-streamdev
$(MAKE) -C xbmc/pvrclients/tvheadend
screensavers: exports
+ifneq (@BUILD_RSXS@,1)
$(MAKE) -C xbmc/screensavers/rsxs-0.9/xbmc
+endif
libaddon: exports
$(MAKE) -C lib/libXBMC_addon
$(MAKE) -C lib/libXBMC_pvr

View File

@ -1,29 +0,0 @@
diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
--- xbmc-27135/configure.in 2010-01-24 13:07:18.024733190 +0100
+++ xbmc-27135.patch/configure.in 2010-01-24 13:07:39.324609701 +0100
@@ -894,12 +894,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-27135/configure.in.orig xbmc-27135.patch/configure.in.orig
diff -Naur xbmc-27135/tools/TexturePacker/XBMCTex.cpp xbmc-27135.patch/tools/TexturePacker/XBMCTex.cpp
--- xbmc-27135/tools/TexturePacker/XBMCTex.cpp 2010-01-24 11:48:16.696641003 +0100
+++ xbmc-27135.patch/tools/TexturePacker/XBMCTex.cpp 2010-01-24 13:07:39.325705415 +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

@ -1,29 +0,0 @@
diff -Naur xbmc-27135/guilib/Makefile.in xbmc-27135.patch/guilib/Makefile.in
--- xbmc-27135/guilib/Makefile.in 2010-01-24 11:46:42.066643776 +0100
+++ xbmc-27135.patch/guilib/Makefile.in 2010-01-24 13:14:01.800579073 +0100
@@ -1,4 +1,4 @@
-INCLUDES=-I. -I../ -Icommon -I../xbmc -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/linux -I../xbmc/utils -I../xbmc/lib/libsquish
ifneq (@USE_EXTERNAL_FFMPEG@,1)
INCLUDES+=-I../xbmc/cores/dvdplayer/Codecs/ffmpeg
endif
diff -Naur xbmc-27135/xbmc/FileSystem/Makefile.in xbmc-27135.patch/xbmc/FileSystem/Makefile.in
--- xbmc-27135/xbmc/FileSystem/Makefile.in 2010-01-24 11:47:36.842631867 +0100
+++ xbmc-27135.patch/xbmc/FileSystem/Makefile.in 2010-01-24 13:14:59.573578187 +0100
@@ -1,6 +1,6 @@
ARCH=@ARCH@
-INCLUDES=-I. -I../ -I../cores -I../linux -I../../guilib -I../lib/UnrarXLib -I../utils -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I../lib
+INCLUDES=-I. -I../ -I../cores -I../linux -I../../guilib -I../lib/UnrarXLib -I../utils -I../lib
INCLUDES+=-I../lib/libcdio/libcdio/include
ifeq ($(findstring osx,$(ARCH)), osx)
INCLUDES+=-I../../lib/libcurl-OSX/include
diff -Naur xbmc-27135/xbmc/Makefile.in xbmc-27135.patch/xbmc/Makefile.in
--- xbmc-27135/xbmc/Makefile.in 2010-01-24 11:47:03.973632064 +0100
+++ xbmc-27135.patch/xbmc/Makefile.in 2010-01-24 13:14:32.079579280 +0100
@@ -1,4 +1,4 @@
-INCLUDES+=-I../ -I. -Ilinux -Icores -I../guilib -Iutils -IFileSystem -I/usr/include/freetype2 -Icores/dvdplayer
+INCLUDES+=-I../ -I. -Ilinux -Icores -I../guilib -Iutils -IFileSystem -Icores/dvdplayer
ifneq (@USE_EXTERNAL_FFMPEG@,1)
INCLUDES+=-Icores/dvdplayer/Codecs/ffmpeg

View File

@ -1,78 +0,0 @@
diff -Naur xbmc-27135/configure.in xbmc-27135.patch/configure.in
--- xbmc-27135/configure.in 2010-01-24 13:08:23.126603769 +0100
+++ xbmc-27135.patch/configure.in 2010-01-24 13:16:12.459703838 +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. =="
@@ -191,6 +193,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)])],
@@ -437,15 +444,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
@@ -474,6 +475,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-27135/configure.in.orig xbmc-27135.patch/configure.in.orig
diff -Naur xbmc-27135/guilib/system.h xbmc-27135.patch/guilib/system.h
--- xbmc-27135/guilib/system.h 2010-01-24 11:46:42.047669779 +0100
+++ xbmc-27135.patch/guilib/system.h 2010-01-24 13:16:12.460703245 +0100
@@ -117,7 +117,6 @@
#define HAS_AVAHI
#endif
#define HAS_LCD
-#define HAS_HAL
#define HAS_DBUS
#define HAS_DBUS_SERVER
#define HAS_GL
diff -Naur xbmc-27135/guilib/system.h.orig xbmc-27135.patch/guilib/system.h.orig

View File

@ -1,16 +0,0 @@
diff -Naur xbmc-24572/xbmc/utils/Splash.cpp xbmc-24572.patch/xbmc/utils/Splash.cpp
--- xbmc-24572/xbmc/utils/Splash.cpp 2009-11-13 18:19:48.374746147 +0100
+++ xbmc-24572.patch/xbmc/utils/Splash.cpp 2009-11-14 16:58:52.677231191 +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

@ -1,19 +0,0 @@
diff -Naur xbmc-23998/configure.in xbmc-23998.patch/configure.in
--- xbmc-23998/configure.in 2009-10-25 13:30:40.869660379 +0100
+++ xbmc-23998.patch/configure.in 2009-10-25 13:33:30.376657368 +0100
@@ -692,6 +692,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",)
@@ -1177,6 +1178,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 \

View File

@ -1,13 +0,0 @@
diff -Naur xbmc-pvr-28391/configure.in xbmc-pvr-28391.patch/configure.in
--- xbmc-pvr-28391/configure.in 2010-03-06 13:44:06.000000000 +0100
+++ xbmc-pvr-28391.patch/configure.in 2010-03-07 23:26:55.998017036 +0100
@@ -438,9 +438,6 @@
PKG_CHECK_MODULES([XMU], [xmu],
[INCLUDES+=" $XMU_CFLAGS"; LIBS+=" $XMU_LIBS"],
AC_MSG_ERROR($missing_library))
- PKG_CHECK_MODULES([XINERAMA], [xinerama],
- [INCLUDES+=" $XINERAMA_CFLAGS"; LIBS+=" $XINERAMA_LIBS"],
- AC_MSG_ERROR($missing_library))
PKG_CHECK_MODULES([CURL], [libcurl],
[INCLUDES+=" $CURL_CFLAGS"; LIBS+=" $CURL_LIBS"],
AC_MSG_ERROR($missing_library))

View File

@ -1,99 +0,0 @@
diff -Naur xbmc-pvr-28373/Makefile.in xbmc-pvr-28373.patch/Makefile.in
--- xbmc-pvr-28373/Makefile.in 2010-03-04 18:42:13.000000000 +0100
+++ xbmc-pvr-28373.patch/Makefile.in 2010-03-05 14:38:39.934492375 +0100
@@ -492,7 +492,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
@@ -500,57 +500,57 @@
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 addons -regextype posix-extended -type f -not -iregex ".*svn.*|.*win32(dx)?\.vis|.*osx\.vis" -iregex ".*$(ARCH).*|.*\.pvr|.*\.vis|.*\.xbs" -exec install -D "{}" $(prefix)/share/xbmc/"{}" \; -printf " -- %-75.75f\r"
+ @find system addons -regextype posix-extended -type f -not -iregex ".*svn.*|.*win32(dx)?\.vis|.*osx\.vis" -iregex ".*$(ARCH).*|.*\.pvr|.*\.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 system -regextype posix-extended -type f -not -iregex ".*svn.*|.*\.so|.*\.dll|.*\.pyd|.*\.pvr|.*python/.*\.zlib|.*\.vis" -exec install -D -m 0644 "{}" $(prefix)/share/xbmc/"{}" \; -printf " -- %-75.75f\r"
+ @find addons language media scripts sounds userdata system -regextype posix-extended -type f -not -iregex ".*svn.*|.*\.so|.*\.dll|.*\.pyd|.*\.pvr|.*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 $(libdir)/libXBMC_*
- @rm -rf $(prefix)/include/xbmc
+ @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
+ @rm -rf $(DESTDIR)/$(libdir)/libXBMC_*
+ @rm -rf $(DESTDIR)/$(prefix)/include/xbmc
@echo "Done!"
reallyclean:

View File

@ -1,18 +0,0 @@
#!/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

View File

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