From 0effee001c8d8feabfbc681c2aba9cd67118c8ea Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 16 Oct 2011 04:19:14 +0200 Subject: [PATCH] xbmc: add option to build with RSXS screensaver support, remove unneeded and disabled screensaver and visualzation addons Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc/build | 8 +++++++- packages/mediacenter/xbmc/install | 12 ++++++++++++ .../xbmc-10.1-Dharma-311-fix_rsxs_build-0.1.patch | 12 ++++++++++++ projects/ATV/options | 3 +++ projects/Fusion/options | 3 +++ projects/Generic/options | 3 +++ projects/Generic_OSS/options | 3 +++ projects/ION/options | 3 +++ projects/Intel/options | 3 +++ projects/Ultra/options | 3 +++ 10 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-311-fix_rsxs_build-0.1.patch diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build index ddb1bf326a..5b15ec7136 100755 --- a/packages/mediacenter/xbmc/build +++ b/packages/mediacenter/xbmc/build @@ -22,6 +22,12 @@ . config/options $1 +if [ "$XBMC_SCR_RSXS" = yes ]; then + XBMC_RSXS="--enable-rsxs" +else + XBMC_RSXS="--disable-rsxs" +fi + if [ "$XBMC_VIS_PROJECTM" = yes ]; then XBMC_PROJECTM="--enable-xbmcprojectm" else @@ -144,7 +150,7 @@ do_autoreconf xbmc/lib/libid3tag/libid3tag --enable-xrandr \ --disable-goom \ $XBMC_PROJECTM \ - --disable-rsxs \ + $XBMC_RSXS \ --disable-ccache \ $XBMC_PULSEAUDIO \ --enable-ffmpeg-libvorbis \ diff --git a/packages/mediacenter/xbmc/install b/packages/mediacenter/xbmc/install index fcfb59bd33..f9e89ec58f 100755 --- a/packages/mediacenter/xbmc/install +++ b/packages/mediacenter/xbmc/install @@ -46,6 +46,18 @@ cd $PKG_BUILD -exec install -D -m 0644 "{}" $ROOT/$INSTALL/usr/share/xbmc/"{}" ";" cd - +if [ ! "$XBMC_SCR_RSXS" = yes ]; then + rm -rf $ROOT/$INSTALL/usr/share/xbmc/addons/screensaver.rsxs.* +fi + +if [ ! "$XBMC_VIS_PROJECTM" = yes ]; then + rm -rf $ROOT/$INSTALL/usr/share/xbmc/addons/visualization.projectm +fi + +rm -rf $ROOT/$INSTALL/usr/share/xbmc/addons/visualization.dxspectrum +rm -rf $ROOT/$INSTALL/usr/share/xbmc/addons/visualization.itunes +rm -rf $ROOT/$INSTALL/usr/share/xbmc/addons/visualization.milkdrop + # overriding Splash image mkdir -p $INSTALL/usr/share/xbmc/media rm -rf $INSTALL/usr/share/xbmc/media/Splash.png diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-311-fix_rsxs_build-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-311-fix_rsxs_build-0.1.patch new file mode 100644 index 0000000000..fe0ee49cab --- /dev/null +++ b/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-311-fix_rsxs_build-0.1.patch @@ -0,0 +1,12 @@ +diff -Naur xbmc-dab646e/xbmc/screensavers/rsxs-0.9/lib/argp-namefrob.h xbmc-dab646e.patch/xbmc/screensavers/rsxs-0.9/lib/argp-namefrob.h +--- xbmc-dab646e/xbmc/screensavers/rsxs-0.9/lib/argp-namefrob.h 2011-09-27 15:56:19.000000000 +0200 ++++ xbmc-dab646e.patch/xbmc/screensavers/rsxs-0.9/lib/argp-namefrob.h 2011-10-16 02:13:13.805433847 +0200 +@@ -17,7 +17,7 @@ + with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +-#if !_LIBC ++#if 0 + /* This code is written for inclusion in gnu-libc, and uses names in the + namespace reserved for libc. If we're not compiling in libc, define those + names to be the normal ones instead. */ diff --git a/projects/ATV/options b/projects/ATV/options index 1581304405..48a08000d1 100644 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -120,6 +120,9 @@ # e.g. XBMC_PLUGINS="SABnzbd" XBMC_PLUGINS="" +# build and install 'RSXS' Screensaver (yes / no) + XBMC_SCR_RSXS="no" + # build and install 'ProjectM' Visualization (yes / no) XBMC_VIS_PROJECTM="yes" diff --git a/projects/Fusion/options b/projects/Fusion/options index 1d658390f2..15d9eac67a 100644 --- a/projects/Fusion/options +++ b/projects/Fusion/options @@ -120,6 +120,9 @@ # e.g. XBMC_PLUGINS="SABnzbd" XBMC_PLUGINS="" +# build and install 'RSXS' Screensaver (yes / no) + XBMC_SCR_RSXS="no" + # build and install 'ProjectM' Visualization (yes / no) XBMC_VIS_PROJECTM="yes" diff --git a/projects/Generic/options b/projects/Generic/options index ff1405b176..3edb183a37 100644 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -120,6 +120,9 @@ # e.g. XBMC_PLUGINS="SABnzbd" XBMC_PLUGINS="" +# build and install 'RSXS' Screensaver (yes / no) + XBMC_SCR_RSXS="no" + # build and install 'ProjectM' Visualization (yes / no) XBMC_VIS_PROJECTM="yes" diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options index 2a791110dd..5696b17aa2 100644 --- a/projects/Generic_OSS/options +++ b/projects/Generic_OSS/options @@ -120,6 +120,9 @@ # e.g. XBMC_PLUGINS="SABnzbd" XBMC_PLUGINS="" +# build and install 'RSXS' Screensaver (yes / no) + XBMC_SCR_RSXS="no" + # build and install 'ProjectM' Visualization (yes / no) XBMC_VIS_PROJECTM="yes" diff --git a/projects/ION/options b/projects/ION/options index 2c4269e4f2..eb1b9fda13 100644 --- a/projects/ION/options +++ b/projects/ION/options @@ -120,6 +120,9 @@ # e.g. XBMC_PLUGINS="SABnzbd" XBMC_PLUGINS="" +# build and install 'RSXS' Screensaver (yes / no) + XBMC_SCR_RSXS="no" + # build and install 'ProjectM' Visualization (yes / no) XBMC_VIS_PROJECTM="yes" diff --git a/projects/Intel/options b/projects/Intel/options index 8e6aedc619..2756534ec7 100644 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -120,6 +120,9 @@ # e.g. XBMC_PLUGINS="SABnzbd" XBMC_PLUGINS="" +# build and install 'RSXS' Screensaver (yes / no) + XBMC_SCR_RSXS="no" + # build and install 'ProjectM' Visualization (yes / no) XBMC_VIS_PROJECTM="yes" diff --git a/projects/Ultra/options b/projects/Ultra/options index 6484625081..ce14da3c00 100644 --- a/projects/Ultra/options +++ b/projects/Ultra/options @@ -120,6 +120,9 @@ # e.g. XBMC_PLUGINS="SABnzbd" XBMC_PLUGINS="" +# build and install 'RSXS' Screensaver (yes / no) + XBMC_SCR_RSXS="no" + # build and install 'ProjectM' Visualization (yes / no) XBMC_VIS_PROJECTM="yes"