From 9607330e989ec5c5564b59ea427dd39f73788157 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 27 May 2010 18:41:23 +0200 Subject: [PATCH] xbmc: - update to xbmc-30605 - simplyfing install script (match with make install from xbmc) --- packages/mediacenter/xbmc/install | 68 ++++++------------- .../201_xbmc-let_select_XBMCProjectM-0.1.diff | 32 ++++----- .../patches/202_xbmc-let_select_RSXS-0.1.diff | 33 ++++----- ...401-xbmc-we_dont_need_libXinerama-0.1.diff | 26 +++---- .../402-xbmc-enable_yasm_in_ffmpeg-0.1.diff | 18 ++--- packages/mediacenter/xbmc/scripts/xbmc | 5 ++ packages/mediacenter/xbmc/url | 2 +- 7 files changed, 82 insertions(+), 102 deletions(-) create mode 100755 packages/mediacenter/xbmc/scripts/xbmc diff --git a/packages/mediacenter/xbmc/install b/packages/mediacenter/xbmc/install index ad4ac01714..1e68c406a4 100755 --- a/packages/mediacenter/xbmc/install +++ b/packages/mediacenter/xbmc/install @@ -38,7 +38,6 @@ $SCRIPTS/install libpng $SCRIPTS/install tiff $SCRIPTS/install freetype #libass? $SCRIPTS/install jasper -# $SCRIPTS/install libass # $SCRIPTS/install a52dec # static $SCRIPTS/install libmad @@ -68,64 +67,37 @@ PKG_DIR=`find $PACKAGES -type d -name $1` PYTHON_LIBDIR="`ls -d $INSTALL/usr/lib/python*`" mkdir -p $INSTALL/usr/bin - cp -P $PKG_BUILD/xbmc.bin $INSTALL/usr/bin/xbmc -# cp -P $PKG_DIR/scripts/xbmc-session $INSTALL/usr/bin - cp -P $PKG_BUILD/tools/EventClients/Clients/XBMC\ Send/xbmc-send.py $INSTALL/usr/bin/xbmc-send + cp $PKG_DIR/scripts/xbmc $INSTALL/usr/bin + cp $PKG_BUILD/tools/EventClients/Clients/XBMC\ Send/xbmc-send.py $INSTALL/usr/bin/xbmc-send -mkdir -p $INSTALL/usr/share/xbmc - cp -P $PKG_BUILD/xbmc-xrandr $INSTALL/usr/share/xbmc +mkdir -p $INSTALL/usr/lib/xbmc + cp $PKG_BUILD/xbmc.bin $INSTALL/usr/lib/xbmc + cp $PKG_BUILD/xbmc-xrandr $INSTALL/usr/lib/xbmc -mkdir -p $INSTALL/usr/share/xbmc/language - cp -PR $PKG_BUILD/language/* $INSTALL/usr/share/xbmc/language +cd $PKG_BUILD + find system addons \ + -regextype posix-extended -type f \ + -not -iregex ".*svn.*|.*win32(dx)?\.vis|.*osx\.vis" \ + -iregex ".*-linux.*|.*\.vis|.*\.xbs" \ + -exec install -D "{}" $ROOT/$INSTALL/usr/lib/xbmc/"{}" ";" -mkdir -p $INSTALL/usr/share/xbmc/media/Fonts - cp -P $PKG_BUILD/media/Fonts/*.ttf $INSTALL/usr/share/xbmc/media/Fonts + find addons language media scripts sounds userdata system \ + -regextype posix-extended -type f \ + -not -iregex ".*-linux.*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll|.*\.pyd|.*python/.*\.zlib" \ + -exec install -D -m 0644 "{}" $ROOT/$INSTALL/usr/share/xbmc/"{}" ";" +cd - +# overriding Splash image mkdir -p $INSTALL/usr/share/xbmc/media - cp -P $PKG_BUILD/media/weather.zip $INSTALL/usr/share/xbmc/media/ - cp -P $PKG_BUILD/media/icon.png $INSTALL/usr/share/xbmc/media/ - cp -P $PKG_DIR/splash/Splash.png $INSTALL/usr/share/xbmc/media/ - -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 -P $PKG_BUILD/system/*linux.so $INSTALL/usr/share/xbmc/system - cp -P $PKG_BUILD/system/*.xml $INSTALL/usr/share/xbmc/system - cp -P $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 -P $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 -P $PKG_BUILD/system/players/paplayer/*.so $INSTALL/usr/share/xbmc/system/players/paplayer - -mkdir -p $INSTALL/usr/share/xbmc/system/python - cp -P $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 + rm -rf $INSTALL/usr/share/xbmc/media/Splash.png + cp $PKG_DIR/splash/Splash.png $INSTALL/usr/share/xbmc/media/ mkdir -p $PYTHON_LIBDIR/site-packages - cp -PR $PKG_BUILD/tools/EventClients/lib/python/* $PYTHON_LIBDIR/site-packages - -mkdir -p $INSTALL/usr/share/xbmc/userdata - cp -PR $PKG_BUILD/userdata/* $INSTALL/usr/share/xbmc/userdata + cp -R $PKG_BUILD/tools/EventClients/lib/python/* $PYTHON_LIBDIR/site-packages 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 remote diff --git a/packages/mediacenter/xbmc/patches/201_xbmc-let_select_XBMCProjectM-0.1.diff b/packages/mediacenter/xbmc/patches/201_xbmc-let_select_XBMCProjectM-0.1.diff index 459a4eb4dd..33c0014936 100644 --- a/packages/mediacenter/xbmc/patches/201_xbmc-let_select_XBMCProjectM-0.1.diff +++ b/packages/mediacenter/xbmc/patches/201_xbmc-let_select_XBMCProjectM-0.1.diff @@ -1,6 +1,6 @@ -diff -Naur xbmc-30122/configure.in xbmc-30122.patch/configure.in ---- xbmc-30122/configure.in 2010-05-13 13:16:42.000000000 +0200 -+++ xbmc-30122.patch/configure.in 2010-05-13 13:44:00.985198286 +0200 +diff -Naur xbmc-30587/configure.in xbmc-30587.patch/configure.in +--- xbmc-30587/configure.in 2010-05-26 12:00:33.000000000 +0200 ++++ xbmc-30587.patch/configure.in 2010-05-26 12:23:05.551857623 +0200 @@ -23,6 +23,8 @@ xrandr_disabled="== XRandR support disabled. SDL will be used for resolution support. ==" goom_enabled="== GOOM enabled. ==" @@ -10,9 +10,9 @@ diff -Naur xbmc-30122/configure.in xbmc-30122.patch/configure.in 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. ==" -@@ -170,6 +172,12 @@ - [use_goom=$enableval], - [use_goom=no]) +@@ -156,6 +158,12 @@ + [use_goom=$enableval], + [use_goom=no]) +AC_ARG_ENABLE([xbmcprojectm], + [AS_HELP_STRING([--enable-xbmcprojectm], @@ -21,9 +21,9 @@ diff -Naur xbmc-30122/configure.in xbmc-30122.patch/configure.in + [use_xbmcprojectm=yes]) + AC_ARG_ENABLE([ccache], - [AS_HELP_STRING([--enable-ccache], - [enable building with ccache feature (default is auto)])], -@@ -608,6 +616,15 @@ + [AS_HELP_STRING([--enable-ccache], + [enable building with ccache feature (default is auto)])], +@@ -669,6 +677,15 @@ fi fi @@ -39,7 +39,7 @@ diff -Naur xbmc-30122/configure.in xbmc-30122.patch/configure.in ### External libraries checks # External FFmpeg if test "$use_external_ffmpeg" = "yes"; then -@@ -992,6 +1009,12 @@ +@@ -1080,6 +1097,12 @@ final_message="$final_message\n GOOM:\t\tNo" fi @@ -52,7 +52,7 @@ diff -Naur xbmc-30122/configure.in xbmc-30122.patch/configure.in if test "$use_mid" = "yes"; then final_message="$final_message\n MID Support:\tYes" SDL_DEFINES="$SDL_DEFINES -DMID" -@@ -1245,6 +1268,7 @@ +@@ -1333,6 +1356,7 @@ AC_SUBST(SDL_DEFINES) AC_SUBST(BUILD_DVDCSS) AC_SUBST(BUILD_GOOM) @@ -60,7 +60,7 @@ diff -Naur xbmc-30122/configure.in xbmc-30122.patch/configure.in AC_SUBST(USE_EXTERNAL_FFMPEG) AC_SUBST(USE_EXTERNAL_LIBA52) AC_SUBST(USE_EXTERNAL_LIBASS) -@@ -1626,7 +1650,7 @@ +@@ -1715,7 +1739,7 @@ -DSYSCONF_INSTALL_DIR:PATH="${sysconfdir}" -DSHARE_INSTALL_PREFIX:PATH="${datadir}" . set +x fi @@ -69,9 +69,9 @@ diff -Naur xbmc-30122/configure.in xbmc-30122.patch/configure.in XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[ if test "$host_vendor" != "apple" ; then -diff -Naur xbmc-30122/Makefile.in xbmc-30122.patch/Makefile.in ---- xbmc-30122/Makefile.in 2010-05-13 13:16:42.000000000 +0200 -+++ xbmc-30122.patch/Makefile.in 2010-05-13 13:41:15.585324083 +0200 +diff -Naur xbmc-30587/Makefile.in xbmc-30587.patch/Makefile.in +--- xbmc-30587/Makefile.in 2010-05-26 12:00:33.000000000 +0200 ++++ xbmc-30587.patch/Makefile.in 2010-05-26 12:23:05.553857450 +0200 @@ -106,8 +106,10 @@ VIS_DIRS=\ @@ -86,7 +86,7 @@ diff -Naur xbmc-30122/Makefile.in xbmc-30122.patch/Makefile.in VIS_DIRS+=xbmc/visualizations/iTunes endif @@ -307,7 +309,9 @@ - visualizations: exports + ifneq (arm, $(ARCH)) $(MAKE) -C xbmc/visualizations/OpenGLSpectrum $(MAKE) -C xbmc/visualizations/WaveForm +ifneq (@BUILD_XBMCPROJECTM@,1) diff --git a/packages/mediacenter/xbmc/patches/202_xbmc-let_select_RSXS-0.1.diff b/packages/mediacenter/xbmc/patches/202_xbmc-let_select_RSXS-0.1.diff index 2a11112489..aa8befb469 100644 --- a/packages/mediacenter/xbmc/patches/202_xbmc-let_select_RSXS-0.1.diff +++ b/packages/mediacenter/xbmc/patches/202_xbmc-let_select_RSXS-0.1.diff @@ -1,6 +1,6 @@ -diff -Naur xbmc-30122/configure.in xbmc-30122.patch/configure.in ---- xbmc-30122/configure.in 2010-05-13 13:44:56.876227997 +0200 -+++ xbmc-30122.patch/configure.in 2010-05-13 13:47:12.173197721 +0200 +diff -Naur xbmc-30587/configure.in xbmc-30587.patch/configure.in +--- xbmc-30587/configure.in 2010-05-26 12:59:31.798732689 +0200 ++++ xbmc-30587.patch/configure.in 2010-05-26 13:00:28.957732474 +0200 @@ -25,6 +25,8 @@ goom_disabled="== GOOM disabled. ==" xbmcprojectm_enabled="== XBMCProjectM enabled. ==" @@ -10,7 +10,7 @@ diff -Naur xbmc-30122/configure.in xbmc-30122.patch/configure.in 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. ==" -@@ -178,6 +180,12 @@ +@@ -164,6 +166,12 @@ [use_xbmcprojectm=$enableval], [use_xbmcprojectm=yes]) @@ -21,9 +21,9 @@ diff -Naur xbmc-30122/configure.in xbmc-30122.patch/configure.in + [use_rsxs=yes]) + AC_ARG_ENABLE([ccache], - [AS_HELP_STRING([--enable-ccache], - [enable building with ccache feature (default is auto)])], -@@ -625,6 +633,15 @@ + [AS_HELP_STRING([--enable-ccache], + [enable building with ccache feature (default is auto)])], +@@ -686,6 +694,15 @@ BUILD_XBMCPROJECTM=1 fi @@ -39,7 +39,7 @@ diff -Naur xbmc-30122/configure.in xbmc-30122.patch/configure.in ### External libraries checks # External FFmpeg if test "$use_external_ffmpeg" = "yes"; then -@@ -1015,6 +1032,12 @@ +@@ -1103,6 +1120,12 @@ final_message="$final_message\n XBMCProjectM:\tNo" fi @@ -52,7 +52,7 @@ diff -Naur xbmc-30122/configure.in xbmc-30122.patch/configure.in if test "$use_mid" = "yes"; then final_message="$final_message\n MID Support:\tYes" SDL_DEFINES="$SDL_DEFINES -DMID" -@@ -1269,6 +1292,7 @@ +@@ -1357,6 +1380,7 @@ AC_SUBST(BUILD_DVDCSS) AC_SUBST(BUILD_GOOM) AC_SUBST(BUILD_XBMCPROJECTM) @@ -60,18 +60,18 @@ diff -Naur xbmc-30122/configure.in xbmc-30122.patch/configure.in AC_SUBST(USE_EXTERNAL_FFMPEG) AC_SUBST(USE_EXTERNAL_LIBA52) AC_SUBST(USE_EXTERNAL_LIBASS) -@@ -1704,7 +1728,7 @@ - --disable-lattice \ +@@ -1795,7 +1819,7 @@ --disable-skyrocket fi + fi -], [0]) +], [$BUILD_RSXS]) XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [ if test "$host_vendor" = "apple" ; then -diff -Naur xbmc-30122/Makefile.in xbmc-30122.patch/Makefile.in ---- xbmc-30122/Makefile.in 2010-05-13 13:44:56.877229584 +0200 -+++ xbmc-30122.patch/Makefile.in 2010-05-13 13:45:16.444196472 +0200 +diff -Naur xbmc-30587/Makefile.in xbmc-30587.patch/Makefile.in +--- xbmc-30587/Makefile.in 2010-05-26 12:59:31.799730855 +0200 ++++ xbmc-30587.patch/Makefile.in 2010-05-26 12:59:41.162732822 +0200 @@ -101,8 +101,10 @@ lib/xbmc-dll-symbols \ lib/jsoncpp/jsoncpp/src/lib_json @@ -85,12 +85,13 @@ diff -Naur xbmc-30122/Makefile.in xbmc-30122.patch/Makefile.in VIS_DIRS=\ xbmc/visualizations/OpenGLSpectrum \ -@@ -321,7 +323,9 @@ - endif +@@ -323,8 +325,10 @@ endif screensavers: exports + ifneq (arm, $(ARCH)) +ifneq (@BUILD_RSXS@,1) $(MAKE) -C xbmc/screensavers/rsxs-0.9/xbmc + endif +endif libpython: dllloader $(MAKE) -C xbmc/lib/libPython diff --git a/packages/mediacenter/xbmc/patches/401-xbmc-we_dont_need_libXinerama-0.1.diff b/packages/mediacenter/xbmc/patches/401-xbmc-we_dont_need_libXinerama-0.1.diff index 22087fc01b..0734ba2059 100644 --- a/packages/mediacenter/xbmc/patches/401-xbmc-we_dont_need_libXinerama-0.1.diff +++ b/packages/mediacenter/xbmc/patches/401-xbmc-we_dont_need_libXinerama-0.1.diff @@ -1,13 +1,13 @@ -diff -Naur xbmc-30122/configure.in xbmc-30122.patch/configure.in ---- xbmc-30122/configure.in 2010-05-13 13:58:23.276198942 +0200 -+++ xbmc-30122.patch/configure.in 2010-05-13 13:58:49.323198531 +0200 -@@ -489,9 +489,6 @@ - PKG_CHECK_MODULES([XMU], [xmu], - [INCLUDES="$INCLUDES $XMU_CFLAGS"; LIBS="$LIBS $XMU_LIBS"], - AC_MSG_ERROR($missing_library)) -- PKG_CHECK_MODULES([XINERAMA], [xinerama], -- [INCLUDES="$INCLUDES $XINERAMA_CFLAGS"; LIBS="$LIBS $XINERAMA_LIBS"], -- AC_MSG_ERROR($missing_library)) - PKG_CHECK_MODULES([CURL], [libcurl], - [INCLUDES="$INCLUDES $CURL_CFLAGS"; LIBS="$LIBS $CURL_LIBS"], - AC_MSG_ERROR($missing_library)) +diff -Naur xbmc-30587/configure.in xbmc-30587.patch/configure.in +--- xbmc-30587/configure.in 2010-05-26 12:27:28.620730606 +0200 ++++ xbmc-30587.patch/configure.in 2010-05-26 12:29:17.460731872 +0200 +@@ -531,9 +531,6 @@ + PKG_CHECK_MODULES([XMU], [xmu], + [INCLUDES="$INCLUDES $XMU_CFLAGS"; LIBS="$LIBS $XMU_LIBS"], + AC_MSG_ERROR($missing_library)) +- PKG_CHECK_MODULES([XINERAMA],[xinerama], +- [INCLUDES="$INCLUDES $XINERAMA_CFLAGS"; LIBS="$LIBS $XINERAMA_LIBS"], +- AC_MSG_ERROR($missing_library)) + PKG_CHECK_MODULES([CURL], [libcurl], + [INCLUDES="$INCLUDES $CURL_CFLAGS"; LIBS="$LIBS $CURL_LIBS"], + AC_MSG_ERROR($missing_library)) diff --git a/packages/mediacenter/xbmc/patches/402-xbmc-enable_yasm_in_ffmpeg-0.1.diff b/packages/mediacenter/xbmc/patches/402-xbmc-enable_yasm_in_ffmpeg-0.1.diff index 184c9698b7..83c96162c2 100644 --- a/packages/mediacenter/xbmc/patches/402-xbmc-enable_yasm_in_ffmpeg-0.1.diff +++ b/packages/mediacenter/xbmc/patches/402-xbmc-enable_yasm_in_ffmpeg-0.1.diff @@ -1,7 +1,7 @@ -diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in ---- xbmc-28910/configure.in 2010-03-28 19:26:02.516628518 +0200 -+++ xbmc-28910.patch/configure.in 2010-03-28 19:26:44.961754003 +0200 -@@ -764,6 +764,7 @@ +diff -Naur xbmc-30587/configure.in xbmc-30587.patch/configure.in +--- xbmc-30587/configure.in 2010-05-26 12:30:34.583732752 +0200 ++++ xbmc-30587.patch/configure.in 2010-05-26 12:33:26.657731562 +0200 +@@ -941,6 +941,7 @@ fi fi @@ -9,11 +9,13 @@ diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in AC_CHECK_PROG(HAVE_SVNVERSION,svnversion,"yes","no",) AC_CHECK_PROG(HAVE_GIT,git,"yes","no",) -@@ -1318,6 +1319,7 @@ +@@ -1569,7 +1570,8 @@ --enable-protocol=http \ --enable-pthreads \ - `if test "$host_cpu" = "powerpc" || test "$host_cpu" = "powerpc64"; then echo --enable-pic; fi` \ -+ `if test "$HAVE_YASM" = "yes"; then echo --enable-yasm; fi` \ - --cc="$CC" + `case $host_cpu in powerpc*|arm*) echo --enable-pic ;; esac` \ +- --cc="$CC" ++ --cc="$CC" \ ++ `if test "$HAVE_YASM" = "yes"; then echo --enable-yasm; fi` fi ], [$USE_EXTERNAL_FFMPEG]) + diff --git a/packages/mediacenter/xbmc/scripts/xbmc b/packages/mediacenter/xbmc/scripts/xbmc new file mode 100755 index 0000000000..11c431210b --- /dev/null +++ b/packages/mediacenter/xbmc/scripts/xbmc @@ -0,0 +1,5 @@ +#!/bin/sh + +LIBDIR=/usr/lib + +$LIBDIR/xbmc/xbmc.bin $@ \ No newline at end of file diff --git a/packages/mediacenter/xbmc/url b/packages/mediacenter/xbmc/url index 9e21a82837..a10c42ff49 100644 --- a/packages/mediacenter/xbmc/url +++ b/packages/mediacenter/xbmc/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/xbmc-30122.tar.bz2 +http://sources.openelec.tv/svn/xbmc-30605.tar.bz2