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

xbmc-pvr:

Browse Source 
- install startscript for xbmc
- update to xbmc-pvr-28373
- various cleanups
This commit is contained in:
Stephan Raue 2010-03-04 21:29:38 +01:00
parent 872c5c30cf
commit 15fe3f0f43
7 changed files with 77 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/mediacenter/xbmc-pvr/install
View File

@ -65,14 +65,18 @@ $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.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/lib # mkdir -p $INSTALL/usr/lib
cp -PR $PKG_BUILD/lib/libXBMC_addon/*.so* $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_gui/*.so* $INSTALL/usr/lib
cp -PR $PKG_BUILD/lib/libXBMC_pvr/*.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 # cp -PR $PKG_BUILD/lib/libXBMC_vis/*.so* $INSTALL/usr/lib
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
@ -122,6 +126,7 @@ mkdir -p $INSTALL/usr/share/xbmc/web
mkdir -p $INSTALL/usr/share/xbmc/addons mkdir -p $INSTALL/usr/share/xbmc/addons
cp -PR $PKG_BUILD/addons/* $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

38
packages/mediacenter/xbmc-pvr/patches/010_xbmc-crosscompile_add_host_and_build_to_configures-0.2.diff → packages/mediacenter/xbmc-pvr/patches/010_xbmc-crosscompile_add_host_and_build_to_configures-0.2.1.diff
View File

@ -1,16 +1,18 @@
diff -Naur xbmc-pvr-27883/configure.in xbmc-pvr-27883.patch/configure.in diff -Naur xbmc-pvr-28368/configure.in xbmc-pvr-28368.patch/configure.in
--- xbmc-pvr-27883/configure.in 2010-02-16 14:08:12.000000000 +0100 --- xbmc-pvr-28368/configure.in 2010-03-04 14:12:37.000000000 +0100
+++ xbmc-pvr-27883.patch/configure.in 2010-02-16 14:28:40.629821216 +0100 +++ xbmc-pvr-28368.patch/configure.in 2010-03-04 14:55:05.805134767 +0100
@@ -1154,6 +1154,8 @@ @@ -1161,7 +1161,9 @@
cp pyconfig.h Include cp pyconfig.h Include
else else
./configure \ ./configure \
- --enable-ipv6 \
+ --host=$host_alias \ + --host=$host_alias \
+ --build=$build_alias \ + --build=$build_alias \
--enable-ipv6 \ + --disable-ipv6 \
--enable-unicode=ucs4 \ --enable-unicode=ucs4 \
--without-cxx \ --without-cxx \
@@ -1219,6 +1221,7 @@ --enable-shared \
@@ -1226,6 +1228,7 @@
--disable-static \ --disable-static \
--disable-ipv6 \ --disable-ipv6 \
`if test "$use_debug" = "no"; then echo --disable-debug; fi` \ `if test "$use_debug" = "no"; then echo --disable-debug; fi` \
@ -18,7 +20,7 @@ diff -Naur xbmc-pvr-27883/configure.in xbmc-pvr-27883.patch/configure.in
--disable-muxers \ --disable-muxers \
--enable-muxer=spdif \ --enable-muxer=spdif \
--enable-muxer=adts \ --enable-muxer=adts \
@@ -1235,6 +1238,7 @@ @@ -1242,6 +1245,7 @@
--enable-postproc \ --enable-postproc \
--enable-gpl \ --enable-gpl \
`if test "$use_vdpau" = "yes"; then echo --enable-vdpau; else echo --disable-vdpau; fi` \ `if test "$use_vdpau" = "yes"; then echo --enable-vdpau; else echo --disable-vdpau; fi` \
@ -26,7 +28,7 @@ diff -Naur xbmc-pvr-27883/configure.in xbmc-pvr-27883.patch/configure.in
--enable-libfaad \ --enable-libfaad \
--enable-protocol=http \ --enable-protocol=http \
--enable-pthreads \ --enable-pthreads \
@@ -1254,6 +1258,8 @@ @@ -1261,6 +1265,8 @@
--disable-win --disable-win
else else
./configure \ ./configure \
@ -35,7 +37,7 @@ diff -Naur xbmc-pvr-27883/configure.in xbmc-pvr-27883.patch/configure.in
--disable-oss \ --disable-oss \
--disable-solaris-audio \ --disable-solaris-audio \
--disable-al-audio \ --disable-al-audio \
@@ -1271,6 +1277,8 @@ @@ -1278,6 +1284,8 @@
--with-pic --with-pic
else else
./configure \ ./configure \
@ -44,7 +46,7 @@ diff -Naur xbmc-pvr-27883/configure.in xbmc-pvr-27883.patch/configure.in
--disable-doc \ --disable-doc \
--enable-static \ --enable-static \
--with-pic --with-pic
@@ -1289,6 +1297,8 @@ @@ -1296,6 +1304,8 @@
cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
else else
./configure2 \ ./configure2 \
@ -53,7 +55,7 @@ diff -Naur xbmc-pvr-27883/configure.in xbmc-pvr-27883.patch/configure.in
--extra-cflags="$CFLAGS $DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../libdvdcss/src" \ --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../libdvdcss/src" \
--prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \ --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
--enable-static \ --enable-static \
@@ -1314,6 +1324,8 @@ @@ -1321,6 +1331,8 @@
--cc="$CC" --cc="$CC"
else else
./configure2 \ ./configure2 \
@ -62,7 +64,7 @@ diff -Naur xbmc-pvr-27883/configure.in xbmc-pvr-27883.patch/configure.in
--extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../includes" \ --extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../includes" \
--extra-ldflags="-L`pwd`/../libdvdread/obj" \ --extra-ldflags="-L`pwd`/../libdvdread/obj" \
--with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \ --with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \
@@ -1346,6 +1358,8 @@ @@ -1353,6 +1365,8 @@
--disable-al-audio --disable-al-audio
else else
./configure \ ./configure \
@ -71,7 +73,7 @@ diff -Naur xbmc-pvr-27883/configure.in xbmc-pvr-27883.patch/configure.in
--with-pic \ --with-pic \
--disable-static \ --disable-static \
--enable-shared \ --enable-shared \
@@ -1381,7 +1395,9 @@ @@ -1388,7 +1402,9 @@
./configure MACOSX_DEPLOYMENT_TARGET=10.4 ./configure MACOSX_DEPLOYMENT_TARGET=10.4
else else
CFLAGS="$CFLAGS -fPIC" \ CFLAGS="$CFLAGS -fPIC" \
@ -82,7 +84,7 @@ diff -Naur xbmc-pvr-27883/configure.in xbmc-pvr-27883.patch/configure.in
fi fi
], [$USE_EXTERNAL_LIBASS]) ], [$USE_EXTERNAL_LIBASS])
@@ -1395,6 +1411,8 @@ @@ -1402,6 +1418,8 @@
--with-pic --with-pic
else else
./configure \ ./configure \
@ -91,7 +93,7 @@ diff -Naur xbmc-pvr-27883/configure.in xbmc-pvr-27883.patch/configure.in
CPPFLAGS="$CPPFLAGS" \ CPPFLAGS="$CPPFLAGS" \
CFLAGS="$CFLAGS -fPIC" \ CFLAGS="$CFLAGS -fPIC" \
CXXFLAGS="$CXXFLAGS -fPIC" \ CXXFLAGS="$CXXFLAGS -fPIC" \
@@ -1421,6 +1439,8 @@ @@ -1428,6 +1446,8 @@
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
./configure \ ./configure \
@ -100,7 +102,7 @@ diff -Naur xbmc-pvr-27883/configure.in xbmc-pvr-27883.patch/configure.in
CPPFLAGS="$CPPFLAGS" \ CPPFLAGS="$CPPFLAGS" \
CFLAGS="$CFLAGS -fPIC" \ CFLAGS="$CFLAGS -fPIC" \
CXXFLAGS="$CXXFLAGS -fPIC" \ CXXFLAGS="$CXXFLAGS -fPIC" \
@@ -1451,6 +1471,8 @@ @@ -1458,6 +1478,8 @@
--disable-skyrocket --disable-skyrocket
else else
./configure \ ./configure \
@ -109,7 +111,7 @@ diff -Naur xbmc-pvr-27883/configure.in xbmc-pvr-27883.patch/configure.in
CPPFLAGS="$CPPFLAGS" \ CPPFLAGS="$CPPFLAGS" \
CFLAGS="$CFLAGS -fPIC" \ CFLAGS="$CFLAGS -fPIC" \
CXXFLAGS="$CXXFLAGS -fPIC" \ CXXFLAGS="$CXXFLAGS -fPIC" \
@@ -1470,9 +1492,11 @@ @@ -1477,9 +1499,11 @@
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
@ -123,7 +125,7 @@ diff -Naur xbmc-pvr-27883/configure.in xbmc-pvr-27883.patch/configure.in
fi fi
], [0]) ], [0])
@@ -1481,7 +1505,9 @@ @@ -1488,7 +1512,9 @@
CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -fno-common" \ 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
else else

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

@ -1,6 +1,6 @@
diff -Naur xbmc-pvr-27686/configure.in xbmc-pvr-27686.patch/configure.in diff -Naur xbmc-pvr-28368/configure.in xbmc-pvr-28368.patch/configure.in
--- xbmc-pvr-27686/configure.in 2010-02-12 09:50:39.599142980 +0100 --- xbmc-pvr-28368/configure.in 2010-03-04 14:55:42.493261863 +0100
+++ xbmc-pvr-27686.patch/configure.in 2010-02-12 10:01:04.437016432 +0100 +++ xbmc-pvr-28368.patch/configure.in 2010-03-04 14:55:55.964134731 +0100
@@ -33,6 +33,8 @@ @@ -33,6 +33,8 @@
xrandr_disabled="== XRandR support disabled. SDL will be used for resolution support. ==" xrandr_disabled="== XRandR support disabled. SDL will be used for resolution support. =="
goom_enabled="== GOOM enabled. ==" goom_enabled="== GOOM enabled. =="
@ -10,7 +10,7 @@ diff -Naur xbmc-pvr-27686/configure.in xbmc-pvr-27686.patch/configure.in
pulse_not_found="== Could not find libpulse. PulseAudio support disabled. ==" pulse_not_found="== Could not find libpulse. PulseAudio support disabled. =="
pulse_disabled="== PulseAudio support manually disabled. ==" pulse_disabled="== PulseAudio support manually disabled. =="
faac_not_found="== Could not find libfaac. FAAC support disabled. ==" faac_not_found="== Could not find libfaac. FAAC support disabled. =="
@@ -143,6 +145,12 @@ @@ -150,6 +152,12 @@
[use_goom=$enableval], [use_goom=$enableval],
[use_goom=no]) [use_goom=no])
@ -23,7 +23,7 @@ diff -Naur xbmc-pvr-27686/configure.in xbmc-pvr-27686.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],
@@ -505,6 +513,15 @@ @@ -529,6 +537,15 @@
fi fi
fi fi
@ -39,7 +39,7 @@ diff -Naur xbmc-pvr-27686/configure.in xbmc-pvr-27686.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)
@@ -827,6 +844,12 @@ @@ -856,6 +873,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-pvr-27686/configure.in xbmc-pvr-27686.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
@@ -1057,6 +1080,7 @@ @@ -1097,6 +1120,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,7 +60,7 @@ diff -Naur xbmc-pvr-27686/configure.in xbmc-pvr-27686.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)
@@ -1399,7 +1423,7 @@ @@ -1441,7 +1465,7 @@
-DSYSCONF_INSTALL_DIR:PATH="${sysconfdir}" -DSHARE_INSTALL_PREFIX:PATH="${datadir}" . -DSYSCONF_INSTALL_DIR:PATH="${sysconfdir}" -DSHARE_INSTALL_PREFIX:PATH="${datadir}" .
set +x set +x
fi fi
@ -69,10 +69,10 @@ diff -Naur xbmc-pvr-27686/configure.in xbmc-pvr-27686.patch/configure.in
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-pvr-27686/Makefile.in xbmc-pvr-27686.patch/Makefile.in diff -Naur xbmc-pvr-28368/Makefile.in xbmc-pvr-28368.patch/Makefile.in
--- xbmc-pvr-27686/Makefile.in 2010-02-12 09:03:40.000000000 +0100 --- xbmc-pvr-28368/Makefile.in 2010-03-04 14:12:37.000000000 +0100
+++ xbmc-pvr-27686.patch/Makefile.in 2010-02-12 09:55:09.275018043 +0100 +++ xbmc-pvr-28368.patch/Makefile.in 2010-03-04 14:55:55.966137206 +0100
@@ -106,8 +106,10 @@ @@ -104,8 +104,10 @@
VIS_DIRS=\ VIS_DIRS=\
xbmc/visualizations/OpenGLSpectrum \ xbmc/visualizations/OpenGLSpectrum \
@ -85,7 +85,7 @@ diff -Naur xbmc-pvr-27686/Makefile.in xbmc-pvr-27686.patch/Makefile.in
ifneq (@BUILD_GOOM@,1) ifneq (@BUILD_GOOM@,1)
VIS_DIRS+=xbmc/visualizations/Goom VIS_DIRS+=xbmc/visualizations/Goom
endif endif
@@ -291,7 +293,9 @@ @@ -303,7 +305,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

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

@ -1,6 +1,6 @@
diff -Naur xbmc-pvr-27686/configure.in xbmc-pvr-27686.patch/configure.in diff -Naur xbmc-pvr-28368/configure.in xbmc-pvr-28368.patch/configure.in
--- xbmc-pvr-27686/configure.in 2010-02-12 10:07:39.181174683 +0100 --- xbmc-pvr-28368/configure.in 2010-03-04 14:56:29.763135238 +0100
+++ xbmc-pvr-27686.patch/configure.in 2010-02-12 10:06:08.192017722 +0100 +++ xbmc-pvr-28368.patch/configure.in 2010-03-04 14:56:42.557259507 +0100
@@ -35,6 +35,8 @@ @@ -35,6 +35,8 @@
goom_disabled="== GOOM disabled. ==" goom_disabled="== GOOM disabled. =="
xbmcprojectm_enabled="== XBMCProjectM enabled. ==" xbmcprojectm_enabled="== XBMCProjectM enabled. =="
@ -10,7 +10,7 @@ diff -Naur xbmc-pvr-27686/configure.in xbmc-pvr-27686.patch/configure.in
pulse_not_found="== Could not find libpulse. PulseAudio support disabled. ==" pulse_not_found="== Could not find libpulse. PulseAudio support disabled. =="
pulse_disabled="== PulseAudio support manually disabled. ==" pulse_disabled="== PulseAudio support manually disabled. =="
faac_not_found="== Could not find libfaac. FAAC support disabled. ==" faac_not_found="== Could not find libfaac. FAAC support disabled. =="
@@ -151,6 +153,12 @@ @@ -158,6 +160,12 @@
[use_xbmcprojectm=$enableval], [use_xbmcprojectm=$enableval],
[use_xbmcprojectm=yes]) [use_xbmcprojectm=yes])
@ -23,7 +23,7 @@ diff -Naur xbmc-pvr-27686/configure.in xbmc-pvr-27686.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],
@@ -522,6 +530,15 @@ @@ -546,6 +554,15 @@
BUILD_XBMCPROJECTM=1 BUILD_XBMCPROJECTM=1
fi fi
@ -39,7 +39,7 @@ diff -Naur xbmc-pvr-27686/configure.in xbmc-pvr-27686.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)
@@ -850,6 +867,12 @@ @@ -879,6 +896,12 @@
final_message="$final_message\n XBMCProjectM:\tNo" final_message="$final_message\n XBMCProjectM:\tNo"
fi fi
@ -52,7 +52,7 @@ diff -Naur xbmc-pvr-27686/configure.in xbmc-pvr-27686.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
@@ -1081,6 +1104,7 @@ @@ -1121,6 +1144,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-pvr-27686/configure.in xbmc-pvr-27686.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)
@@ -1477,7 +1501,7 @@ @@ -1519,7 +1543,7 @@
--disable-lattice \ --disable-lattice \
--disable-skyrocket --disable-skyrocket
fi fi
@ -69,10 +69,10 @@ diff -Naur xbmc-pvr-27686/configure.in xbmc-pvr-27686.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-pvr-27686/Makefile.in xbmc-pvr-27686.patch/Makefile.in diff -Naur xbmc-pvr-28368/Makefile.in xbmc-pvr-28368.patch/Makefile.in
--- xbmc-pvr-27686/Makefile.in 2010-02-12 10:07:39.182172289 +0100 --- xbmc-pvr-28368/Makefile.in 2010-03-04 14:56:29.764135078 +0100
+++ xbmc-pvr-27686.patch/Makefile.in 2010-02-12 10:03:25.738140979 +0100 +++ xbmc-pvr-28368.patch/Makefile.in 2010-03-04 14:57:31.037259469 +0100
@@ -101,8 +101,10 @@ @@ -99,8 +99,10 @@
lib/libmodplug \ lib/libmodplug \
lib/xbmc-dll-symbols lib/xbmc-dll-symbols
@ -85,7 +85,7 @@ diff -Naur xbmc-pvr-27686/Makefile.in xbmc-pvr-27686.patch/Makefile.in
VIS_DIRS=\ VIS_DIRS=\
xbmc/visualizations/OpenGLSpectrum \ xbmc/visualizations/OpenGLSpectrum \
@@ -305,7 +307,9 @@ @@ -317,7 +319,9 @@
$(MAKE) -C xbmc/pvrclients/vdr-streamdev $(MAKE) -C xbmc/pvrclients/vdr-streamdev
$(MAKE) -C xbmc/pvrclients/tvheadend $(MAKE) -C xbmc/pvrclients/tvheadend
screensavers: exports screensavers: exports
@ -93,5 +93,5 @@ diff -Naur xbmc-pvr-27686/Makefile.in xbmc-pvr-27686.patch/Makefile.in
$(MAKE) -C xbmc/screensavers/rsxs-0.9/xbmc $(MAKE) -C xbmc/screensavers/rsxs-0.9/xbmc
+endif +endif
libaddon: exports libaddon: exports
$(MAKE) -C xbmc/addons/lib/addonlib++ $(MAKE) -C lib/libXBMC_addon
$(MAKE) -C xbmc/addons/lib/pvrlib++ $(MAKE) -C lib/libXBMC_pvr

129
packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-add_DESTDIR_support_to_make_install-0.1.diff
View File

@ -1,129 +0,0 @@
diff -Naur xbmc-pvr-27961/Makefile.in xbmc-pvr-27961.patch/Makefile.in
--- xbmc-pvr-27961/Makefile.in 2010-02-19 08:35:07.000000000 +0100
+++ xbmc-pvr-27961.patch/Makefile.in 2010-02-19 16:03:35.500873861 +0100
@@ -496,7 +496,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
@@ -504,74 +504,74 @@
install: install-binaries install-libraries install-headers 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-libraries:
- @echo "Copying XBMC addon helper libraries to $(libdir)"
- @mkdir -p $(libdir)
- @cp -P lib/libXBMC_addon/libXBMC_addon.so* $(libdir)
- @cp -P lib/libXBMC_addon/libXBMC_addon.a $(libdir)
- @cp -P lib/libXBMC_gui/libXBMC_gui.so* $(libdir)
- @cp -P lib/libXBMC_gui/libXBMC_gui.a $(libdir)
- @cp -P lib/libXBMC_pvr/libXBMC_pvr.so* $(libdir)
- @cp -P lib/libXBMC_pvr/libXBMC_pvr.a $(libdir)
- @cp -P lib/libXBMC_vis/libXBMC_vis.so* $(libdir)
- @cp -P lib/libXBMC_vis/libXBMC_vis.a $(libdir)
+ @echo "Copying XBMC addon helper libraries to $(DESTDIR)$(libdir)"
+ @mkdir -p $(DESTDIR)$(libdir)
+ @cp -P lib/libXBMC_addon/libXBMC_addon.so* $(DESTDIR)$(libdir)
+ @cp -P lib/libXBMC_addon/libXBMC_addon.a $(DESTDIR)$(libdir)
+ @cp -P lib/libXBMC_gui/libXBMC_gui.so* $(DESTDIR)$(libdir)
+ @cp -P lib/libXBMC_gui/libXBMC_gui.a $(DESTDIR)$(libdir)
+ @cp -P lib/libXBMC_pvr/libXBMC_pvr.so* $(DESTDIR)$(libdir)
+ @cp -P lib/libXBMC_pvr/libXBMC_pvr.a $(DESTDIR)$(libdir)
+ @cp -P lib/libXBMC_vis/libXBMC_vis.so* $(DESTDIR)$(libdir)
+ @cp -P lib/libXBMC_vis/libXBMC_vis.a $(DESTDIR)$(libdir)
install-headers:
- @echo "Copying XBMC addon helper headers to $(prefix)/include/xbmc"
- @install -d $(prefix)/include/xbmc
- @install -D -m 0644 include/* $(prefix)/include/xbmc
+ @echo "Copying XBMC addon helper headers to $(DESTDIR)$(prefix)/include/xbmc"
+ @install -d $(DESTDIR)$(prefix)/include/xbmc
+ @install -D -m 0644 include/* $(DESTDIR)$(prefix)/include/xbmc
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 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"
+ @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 "{}" $(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:

18
packages/mediacenter/xbmc-pvr/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-pvr/url
View File

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