xbmc-pvr:

- update to xbmc-pvr-27902
This commit is contained in:
Stephan Raue 2010-02-17 09:54:56 +01:00
parent 63b25f47a2
commit 89a5cff003
5 changed files with 56 additions and 45 deletions

View File

@ -13,6 +13,7 @@ $SCRIPTS/build pcre
$SCRIPTS/build alsa-lib
$SCRIPTS/build enca
$SCRIPTS/build curl
$SCRIPTS/build libmicrohttpd
$SCRIPTS/build dbus
$SCRIPTS/build hal
@ -41,6 +42,7 @@ $SCRIPTS/build libogg
$SCRIPTS/build libvorbis
$SCRIPTS/build libcdio
$SCRIPTS/build libmms
$SCRIPTS/build libmodplug
$SCRIPTS/build faac
$SCRIPTS/build faad2
$SCRIPTS/build flac
@ -96,8 +98,6 @@ cd -
--disable-debug \
--enable-optimizations \
--enable-gl \
$XBMC_VDPAU \
$XBMC_CRYSTALHD \
--disable-profiling \
--disable-joystick \
--disable-xrandr \
@ -113,6 +113,9 @@ cd -
--disable-rsxs \
--enable-avahi \
--enable-hal \
--enable-webserver \
$XBMC_VDPAU \
$XBMC_CRYSTALHD \
$XBMC_FFMPEG \
--disable-external-liba52 \
--disable-external-libdts \

View File

@ -11,11 +11,12 @@ $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 DeviceKit-disks
$SCRIPTS/install ConsoleKit
$SCRIPTS/install libXt
$SCRIPTS/install libXtst
@ -44,6 +45,7 @@ $SCRIPTS/install libogg
$SCRIPTS/install libvorbis
$SCRIPTS/install libcdio
$SCRIPTS/install libmms
$SCRIPTS/install libmodplug
$SCRIPTS/install faac
$SCRIPTS/install faad2
$SCRIPTS/install flac
@ -66,6 +68,12 @@ PKG_DIR=`find $PACKAGES -type d -name $1`
mkdir -p $INSTALL/usr/share/xbmc
cp -PR $PKG_BUILD/xbmc.bin $INSTALL/usr/share/xbmc
mkdir -p $INSTALL/usr/lib
cp -PR $PKG_BUILD/lib/libXBMC_addon/*.so* $INSTALL/usr/lib
cp -PR $PKG_BUILD/lib/libXBMC_gui/*.so* $INSTALL/usr/lib
cp -PR $PKG_BUILD/lib/libXBMC_pvr/*.so* $INSTALL/usr/lib
cp -PR $PKG_BUILD/lib/libXBMC_vis/*.so* $INSTALL/usr/lib
mkdir -p $INSTALL/usr/share/xbmc/language
cp -PR $PKG_BUILD/language/* $INSTALL/usr/share/xbmc/language
@ -77,9 +85,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/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/sounds
@ -102,7 +107,6 @@ mkdir -p $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
@ -113,14 +117,8 @@ mkdir -p $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
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

View File

@ -1,7 +1,7 @@
diff -Naur xbmc-pvr-27686/configure.in xbmc-pvr-27686.patch/configure.in
--- xbmc-pvr-27686/configure.in 2010-02-12 09:03:40.000000000 +0100
+++ xbmc-pvr-27686.patch/configure.in 2010-02-12 09:30:08.351016359 +0100
@@ -1121,6 +1121,8 @@
diff -Naur xbmc-pvr-27883/configure.in xbmc-pvr-27883.patch/configure.in
--- xbmc-pvr-27883/configure.in 2010-02-16 14:08:12.000000000 +0100
+++ xbmc-pvr-27883.patch/configure.in 2010-02-16 14:28:40.629821216 +0100
@@ -1154,6 +1154,8 @@
cp pyconfig.h Include
else
./configure \
@ -10,15 +10,15 @@ diff -Naur xbmc-pvr-27686/configure.in xbmc-pvr-27686.patch/configure.in
--enable-ipv6 \
--enable-unicode=ucs4 \
--without-cxx \
@@ -1185,6 +1187,7 @@
@@ -1219,6 +1221,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 \
--disable-encoders \
@@ -1200,6 +1203,7 @@
--enable-muxer=adts \
@@ -1235,6 +1238,7 @@
--enable-postproc \
--enable-gpl \
`if test "$use_vdpau" = "yes"; then echo --enable-vdpau; else echo --disable-vdpau; fi` \
@ -26,7 +26,7 @@ diff -Naur xbmc-pvr-27686/configure.in xbmc-pvr-27686.patch/configure.in
--enable-libfaad \
--enable-protocol=http \
--enable-pthreads \
@@ -1219,6 +1223,8 @@
@@ -1254,6 +1258,8 @@
--disable-win
else
./configure \
@ -35,7 +35,7 @@ diff -Naur xbmc-pvr-27686/configure.in xbmc-pvr-27686.patch/configure.in
--disable-oss \
--disable-solaris-audio \
--disable-al-audio \
@@ -1236,6 +1242,8 @@
@@ -1271,6 +1277,8 @@
--with-pic
else
./configure \
@ -44,7 +44,7 @@ diff -Naur xbmc-pvr-27686/configure.in xbmc-pvr-27686.patch/configure.in
--disable-doc \
--enable-static \
--with-pic
@@ -1254,6 +1262,8 @@
@@ -1289,6 +1297,8 @@
cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
else
./configure2 \
@ -53,7 +53,7 @@ diff -Naur xbmc-pvr-27686/configure.in xbmc-pvr-27686.patch/configure.in
--extra-cflags="$CFLAGS $DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../libdvdcss/src" \
--prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
--enable-static \
@@ -1279,6 +1289,8 @@
@@ -1314,6 +1324,8 @@
--cc="$CC"
else
./configure2 \
@ -62,7 +62,7 @@ diff -Naur xbmc-pvr-27686/configure.in xbmc-pvr-27686.patch/configure.in
--extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../includes" \
--extra-ldflags="-L`pwd`/../libdvdread/obj" \
--with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \
@@ -1311,6 +1323,8 @@
@@ -1346,6 +1358,8 @@
--disable-al-audio
else
./configure \
@ -71,7 +71,7 @@ diff -Naur xbmc-pvr-27686/configure.in xbmc-pvr-27686.patch/configure.in
--with-pic \
--disable-static \
--enable-shared \
@@ -1346,7 +1360,9 @@
@@ -1381,7 +1395,9 @@
./configure MACOSX_DEPLOYMENT_TARGET=10.4
else
CFLAGS="$CFLAGS -fPIC" \
@ -82,7 +82,7 @@ diff -Naur xbmc-pvr-27686/configure.in xbmc-pvr-27686.patch/configure.in
fi
], [$USE_EXTERNAL_LIBASS])
@@ -1360,6 +1376,8 @@
@@ -1395,6 +1411,8 @@
--with-pic
else
./configure \
@ -91,7 +91,7 @@ diff -Naur xbmc-pvr-27686/configure.in xbmc-pvr-27686.patch/configure.in
CPPFLAGS="$CPPFLAGS" \
CFLAGS="$CFLAGS -fPIC" \
CXXFLAGS="$CXXFLAGS -fPIC" \
@@ -1386,6 +1404,8 @@
@@ -1421,6 +1439,8 @@
XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
if test "$host_vendor" != "apple" ; then
./configure \
@ -100,7 +100,7 @@ diff -Naur xbmc-pvr-27686/configure.in xbmc-pvr-27686.patch/configure.in
CPPFLAGS="$CPPFLAGS" \
CFLAGS="$CFLAGS -fPIC" \
CXXFLAGS="$CXXFLAGS -fPIC" \
@@ -1416,6 +1436,8 @@
@@ -1451,6 +1471,8 @@
--disable-skyrocket
else
./configure \
@ -109,7 +109,7 @@ diff -Naur xbmc-pvr-27686/configure.in xbmc-pvr-27686.patch/configure.in
CPPFLAGS="$CPPFLAGS" \
CFLAGS="$CFLAGS -fPIC" \
CXXFLAGS="$CXXFLAGS -fPIC" \
@@ -1435,9 +1457,11 @@
@@ -1470,9 +1492,11 @@
XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [
if test "$host_vendor" = "apple" ; then
@ -123,7 +123,7 @@ diff -Naur xbmc-pvr-27686/configure.in xbmc-pvr-27686.patch/configure.in
fi
], [0])
@@ -1446,7 +1470,9 @@
@@ -1481,7 +1505,9 @@
CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -fno-common" \
./configure MACOSX_DEPLOYMENT_TARGET=10.4 --disable-shared
else
@ -134,14 +134,3 @@ diff -Naur xbmc-pvr-27686/configure.in xbmc-pvr-27686.patch/configure.in
fi
], [0])
@@ -1456,7 +1482,9 @@
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 --with-pic --enable-static \
+ --host=$host_alias \
+ --build=$build_alias
fi
], [0])

View File

@ -0,0 +1,21 @@
diff -Naur xbmc-pvr-27902/Makefile.in xbmc-pvr-27902.patch/Makefile.in
--- xbmc-pvr-27902/Makefile.in 2010-02-17 06:15:09.000000000 +0100
+++ xbmc-pvr-27902.patch/Makefile.in 2010-02-17 08:16:28.151814467 +0100
@@ -521,7 +521,7 @@
install-arch:
@# Arch dependent files
- @find system addons -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 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"
install-scripts:
@install -D tools/Linux/xbmc.sh $(prefix)/bin/xbmc
@@ -536,7 +536,7 @@
@echo "Done!"
@echo "Copying system files to $(prefix)/share/xbmc"
@# Arch independent files
- @find language media scripts sounds userdata addons 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 language media scripts sounds userdata addons 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"
@# 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"
@# Icons and links

View File

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