From 006e71044102ac57d03bdd142718dffc5f36228a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 15 Oct 2011 02:20:58 +0200 Subject: [PATCH 1/8] pulseaudio: move alsa plugin configurations to package 'alsa-plugins' Signed-off-by: Stephan Raue --- .../config/pcm => alsa-plugins/config}/samplerate.conf | 0 .../{pulseaudio/config/pcm => alsa-plugins/config}/speex.conf | 0 .../{pulseaudio/config/pcm => alsa-plugins/config}/upmix.conf | 0 .../config/pcm => alsa-plugins/config}/vdownmix.conf | 0 packages/audio/alsa-plugins/install | 3 +++ packages/audio/pulseaudio/install | 3 --- 6 files changed, 3 insertions(+), 3 deletions(-) rename packages/audio/{pulseaudio/config/pcm => alsa-plugins/config}/samplerate.conf (100%) rename packages/audio/{pulseaudio/config/pcm => alsa-plugins/config}/speex.conf (100%) rename packages/audio/{pulseaudio/config/pcm => alsa-plugins/config}/upmix.conf (100%) rename packages/audio/{pulseaudio/config/pcm => alsa-plugins/config}/vdownmix.conf (100%) diff --git a/packages/audio/pulseaudio/config/pcm/samplerate.conf b/packages/audio/alsa-plugins/config/samplerate.conf similarity index 100% rename from packages/audio/pulseaudio/config/pcm/samplerate.conf rename to packages/audio/alsa-plugins/config/samplerate.conf diff --git a/packages/audio/pulseaudio/config/pcm/speex.conf b/packages/audio/alsa-plugins/config/speex.conf similarity index 100% rename from packages/audio/pulseaudio/config/pcm/speex.conf rename to packages/audio/alsa-plugins/config/speex.conf diff --git a/packages/audio/pulseaudio/config/pcm/upmix.conf b/packages/audio/alsa-plugins/config/upmix.conf similarity index 100% rename from packages/audio/pulseaudio/config/pcm/upmix.conf rename to packages/audio/alsa-plugins/config/upmix.conf diff --git a/packages/audio/pulseaudio/config/pcm/vdownmix.conf b/packages/audio/alsa-plugins/config/vdownmix.conf similarity index 100% rename from packages/audio/pulseaudio/config/pcm/vdownmix.conf rename to packages/audio/alsa-plugins/config/vdownmix.conf diff --git a/packages/audio/alsa-plugins/install b/packages/audio/alsa-plugins/install index f401e3de7b..626ab795a1 100755 --- a/packages/audio/alsa-plugins/install +++ b/packages/audio/alsa-plugins/install @@ -24,3 +24,6 @@ mkdir -p $INSTALL/usr/lib/alsa cp -P $PKG_BUILD/*/.libs/*.so $INSTALL/usr/lib/alsa + +mkdir -p $INSTALL/usr/share/alsa/pcm + cp -R $PKG_DIR/config/*.conf $INSTALL/usr/share/alsa/pcm diff --git a/packages/audio/pulseaudio/install b/packages/audio/pulseaudio/install index ecd8c6e0f4..6dd8c7a1b8 100755 --- a/packages/audio/pulseaudio/install +++ b/packages/audio/pulseaudio/install @@ -16,9 +16,6 @@ mkdir -p $INSTALL/etc mkdir -p $INSTALL/etc/alsa cp $PKG_DIR/config/pulse-default.conf $INSTALL/etc/alsa -mkdir -p $INSTALL/etc/alsa/pcm - cp -R $PKG_DIR/config/pcm/*.conf $INSTALL/etc/alsa/pcm - mkdir -p $INSTALL/etc/pulse cp $PKG_BUILD/src/client.conf $INSTALL/etc/pulse cp $PKG_BUILD/src/daemon.conf $INSTALL/etc/pulse From e1f8fe927215848be6947518812ea47b47c8f2b3 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 15 Oct 2011 02:21:42 +0200 Subject: [PATCH 2/8] gcc-final: strip symbols Signed-off-by: Stephan Raue --- packages/toolchain/lang/gcc-final/build | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/toolchain/lang/gcc-final/build b/packages/toolchain/lang/gcc-final/build index 883fe3fb0f..ee262fbc0c 100755 --- a/packages/toolchain/lang/gcc-final/build +++ b/packages/toolchain/lang/gcc-final/build @@ -61,6 +61,11 @@ mkdir -p objdir-$1 && cd objdir-$1 make +if [ ! "$DEBUG" = yes ]; then + $STRIP `find . -name "*.so"` + $STRIP `find . -name "*.so.[0-9]*"` +fi + make install cp -PR $TARGET_NAME/libstdc++-v3/src/.libs/libstdc++.so* $SYSROOT_PREFIX/usr/lib From 071b9cc1bebb35b84b00c1e3d1f337bf11a62272 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 15 Oct 2011 02:22:29 +0200 Subject: [PATCH 3/8] scripts/build: fix stripping of symbols Signed-off-by: Stephan Raue --- scripts/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build b/scripts/build index 7f530963fc..a7c362740e 100755 --- a/scripts/build +++ b/scripts/build @@ -63,7 +63,7 @@ if [ ! -f $STAMP ]; then if [ -f $PKG_DIR/build ]; then $PKG_DIR/build $@ >&$VERBOSE_OUT - if [ "$DEBUG" = no ]; then + if [ ! "$DEBUG" = yes ]; then $STRIP `find $BUILD/$1* -name "*.so"` 2>/dev/null || \ echo "Information: no *.so libs found" $STRIP `find $BUILD/$1* -name "*.so.[0-9]*"` 2>/dev/null ||\ From 5e5ca45b2a3b141cbfa946b022ce13e136adbfcb Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 15 Oct 2011 02:23:05 +0200 Subject: [PATCH 4/8] wpa_supplicant: cosmetics Signed-off-by: Stephan Raue --- packages/network/wpa_supplicant/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/network/wpa_supplicant/build b/packages/network/wpa_supplicant/build index c804a252f2..cbfcf9cb08 100755 --- a/packages/network/wpa_supplicant/build +++ b/packages/network/wpa_supplicant/build @@ -28,6 +28,6 @@ cp $ROOT/$PKG_DIR/config/makefile.config .config # echo "CONFIG_TLS=gnutls" >> .config # echo "CONFIG_GNUTLS_EXTRA=y" >> .config -[ "$DEBUG" = "no" ] && echo "CONFIG_NO_STDOUT_DEBUG=y" >> .config +[ ! "$DEBUG" = "yes" ] && echo "CONFIG_NO_STDOUT_DEBUG=y" >> .config make From ffc1536dceed67523ae79ed8ae8c345a07001d92 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 15 Oct 2011 02:35:14 +0200 Subject: [PATCH 5/8] alsa: dont install alsa-plugins per default, install with pulseaudio Signed-off-by: Stephan Raue --- packages/audio/alsa/meta | 2 +- packages/audio/pulseaudio/meta | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/audio/alsa/meta b/packages/audio/alsa/meta index b77fc5208c..512a494749 100644 --- a/packages/audio/alsa/meta +++ b/packages/audio/alsa/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.alsa-project.org/" PKG_URL="" -PKG_DEPENDS="alsa-lib alsa-utils alsa-plugins" +PKG_DEPENDS="alsa-lib alsa-utils" PKG_BUILD_DEPENDS="toolchain" PKG_PRIORITY="optional" PKG_SECTION="audio" diff --git a/packages/audio/pulseaudio/meta b/packages/audio/pulseaudio/meta index 7f9c630ae8..8eb39ae298 100644 --- a/packages/audio/pulseaudio/meta +++ b/packages/audio/pulseaudio/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://pulseaudio.org/" PKG_URL="http://freedesktop.org/software/pulseaudio/releases/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="libtool json-c alsa-lib libsndfile libsamplerate speex dbus udev openssl" +PKG_DEPENDS="libtool json-c alsa-lib libsndfile libsamplerate speex dbus udev openssl alsa-plugins" PKG_BUILD_DEPENDS="toolchain libtool json-c alsa-lib libsndfile libsamplerate speex dbus udev openssl" PKG_PRIORITY="optional" PKG_SECTION="audio" From 8bcf6f996eec56d6659ba8700fd52f78bddb70e7 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 15 Oct 2011 04:42:14 +0200 Subject: [PATCH 6/8] config/options: update $OS_VERSION to 1.0 Signed-off-by: Stephan Raue --- config/options | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/options b/config/options index 18d9a875e0..0a916b75b4 100644 --- a/config/options +++ b/config/options @@ -20,7 +20,7 @@ PROJECT_DIR="$ROOT/projects" OPENELEC_VERSION=`cat VERSION` if [ "$OPENELEC_VERSION" = "devel" ]; then - OS_VERSION="0.99" + OS_VERSION="1.0" else OS_MAJOR_VERSION=`echo "$OPENELEC_VERSION" | cut -f1 -d "."` OS_MINOR_VERSION=`echo "$OPENELEC_VERSION" | cut -f2 -d "."` From 59aecb4f29c31cc21fe7f6b99023818880f7407d Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 15 Oct 2011 04:47:33 +0200 Subject: [PATCH 7/8] installer: cosmetics Signed-off-by: Stephan Raue --- packages/tools/installer/scripts/installer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tools/installer/scripts/installer b/packages/tools/installer/scripts/installer index ab76c2ac7a..9215da5b9a 100755 --- a/packages/tools/installer/scripts/installer +++ b/packages/tools/installer/scripts/installer @@ -488,7 +488,7 @@ do_poweroff() { BETA="yes" INSTALLER_VERSION="0.2.5" OS_VERSION=$(lsb_release) - BACKTITLE="OpenELEC Installer $INSTALLER_VERSION - Operating System: $OS_VERSION" + BACKTITLE="OpenELEC Installer $INSTALLER_VERSION - $OS_VERSION" TMPDIR="/tmp/installer" LOGFILE="$TMPDIR/install.log" From 0effee001c8d8feabfbc681c2aba9cd67118c8ea Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 16 Oct 2011 04:19:14 +0200 Subject: [PATCH 8/8] 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"