From 1ebc0e5db84922c750fef623a519fc61b73201a9 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 7 May 2009 15:51:47 +0200 Subject: [PATCH] various fixes --- .../patches/100-fix-with-softfloat.diff | 53 ------------------- .../patches/101-add-ldl-to-mixer-simple.diff | 28 ---------- .../multimedia/elisa-plugins-bad/url.new | 1 + .../multimedia/elisa-plugins-good/url.new | 1 + .../multimedia/elisa-plugins-ugly/build | 5 +- .../multimedia/elisa-plugins-ugly/url.new | 1 + packages/python/multimedia/elisa/url.new | 1 + 7 files changed, 8 insertions(+), 82 deletions(-) delete mode 100644 packages/audio/alsa-lib/patches/100-fix-with-softfloat.diff delete mode 100644 packages/audio/alsa-lib/patches/101-add-ldl-to-mixer-simple.diff create mode 100644 packages/python/multimedia/elisa-plugins-bad/url.new create mode 100644 packages/python/multimedia/elisa-plugins-good/url.new create mode 100644 packages/python/multimedia/elisa-plugins-ugly/url.new create mode 100644 packages/python/multimedia/elisa/url.new diff --git a/packages/audio/alsa-lib/patches/100-fix-with-softfloat.diff b/packages/audio/alsa-lib/patches/100-fix-with-softfloat.diff deleted file mode 100644 index 0ef6169e9d..0000000000 --- a/packages/audio/alsa-lib/patches/100-fix-with-softfloat.diff +++ /dev/null @@ -1,53 +0,0 @@ -From: Takashi Iwai -Date: Wed, 21 Jan 2009 08:25:48 +0000 (+0100) -Subject: Fix build with softfloat option -X-Git-Url: http://git.alsa-project.org/?p=alsa-lib.git;a=commitdiff_plain;h=a789b66d00644eeeb72fd424d686c7fe8faa5daa - -Fix build with softfloat option - -Fix build of alsa-lib when --with-softfloat is used: - - disable ladspa plugin - - don't use sqrt() function - -Signed-off-by: Takashi Iwai ---- - -diff --git a/configure.in b/configure.in -index 9a71d95..ea6a8a0 100644 ---- a/configure.in -+++ b/configure.in -@@ -367,6 +367,7 @@ AC_ARG_ENABLE(seq, - AC_ARG_ENABLE(alisp, - AS_HELP_STRING([--disable-alisp], [disable the alisp component]), - [build_alisp="$enableval"], [build_alisp="yes"]) -+test "$softfloat" = "yes" && build_alisp="no" - AC_ARG_ENABLE(old-symbols, - AS_HELP_STRING([--disable-old-symbols], [disable old obsoleted symbols]), - [keep_old_symbols="$enableval"], [keep_old_symbols="yes"]) -@@ -474,6 +475,7 @@ fi - - if test "$softfloat" = "yes"; then - build_pcm_lfloat="no" -+ build_pcm_ladspa="no" - fi - - AM_CONDITIONAL(BUILD_PCM_PLUGIN, test x$build_pcm_plugin = xyes) -diff --git a/src/mixer/simple_none.c b/src/mixer/simple_none.c -index 0f4dd3a..4802200 100644 ---- a/src/mixer/simple_none.c -+++ b/src/mixer/simple_none.c -@@ -1450,7 +1450,14 @@ static int simple_add1(snd_mixer_class_t *class, const char *name, - } - if (ctype != SND_CTL_ELEM_TYPE_BOOLEAN) - return 0; -+#ifdef HAVE_SOFT_FLOAT -+ /* up to 256 channels */ -+ for (n = 1; n < 256; n++) -+ if (n * n == values) -+ break; -+#else - n = sqrt((double)values); -+#endif - if (n * n != values) - return 0; - values = n; diff --git a/packages/audio/alsa-lib/patches/101-add-ldl-to-mixer-simple.diff b/packages/audio/alsa-lib/patches/101-add-ldl-to-mixer-simple.diff deleted file mode 100644 index 2208240618..0000000000 --- a/packages/audio/alsa-lib/patches/101-add-ldl-to-mixer-simple.diff +++ /dev/null @@ -1,28 +0,0 @@ -From: Takashi Iwai -Date: Wed, 21 Jan 2009 08:29:35 +0000 (+0100) -Subject: Add missing -ldl to modules/mixer/simple/* -X-Git-Url: http://git.alsa-project.org/?p=alsa-lib.git;a=commitdiff_plain;h=3b728db20d1729f1270731006f44c20ab910bee0 - -Add missing -ldl to modules/mixer/simple/* - -Signed-off-by: Takashi Iwai ---- - -diff --git a/modules/mixer/simple/Makefile.am b/modules/mixer/simple/Makefile.am -index f73871f..bad0944 100644 ---- a/modules/mixer/simple/Makefile.am -+++ b/modules/mixer/simple/Makefile.am -@@ -21,11 +21,11 @@ smixer_sbase_la_LIBADD = ../../../src/libasound.la - - smixer_ac97_la_SOURCES = ac97.c sbasedl.c - smixer_ac97_la_LDFLAGS = -module -avoid-version $(LDFLAGS_NOUNDEFINED) --smixer_ac97_la_LIBADD = ../../../src/libasound.la -+smixer_ac97_la_LIBADD = ../../../src/libasound.la -ldl - - smixer_hda_la_SOURCES = hda.c sbasedl.c - smixer_hda_la_LDFLAGS = -module -avoid-version $(LDFLAGS_NOUNDEFINED) --smixer_hda_la_LIBADD = ../../../src/libasound.la -+smixer_hda_la_LIBADD = ../../../src/libasound.la -ldl - - if BUILD_PYTHON - smixer_python_la_SOURCES = python.c diff --git a/packages/python/multimedia/elisa-plugins-bad/url.new b/packages/python/multimedia/elisa-plugins-bad/url.new new file mode 100644 index 0000000000..84c7018022 --- /dev/null +++ b/packages/python/multimedia/elisa-plugins-bad/url.new @@ -0,0 +1 @@ +http://sources.openelec.tv/svn/elisa-plugins-bad-0.9.1.tar.gz diff --git a/packages/python/multimedia/elisa-plugins-good/url.new b/packages/python/multimedia/elisa-plugins-good/url.new new file mode 100644 index 0000000000..6637a929a9 --- /dev/null +++ b/packages/python/multimedia/elisa-plugins-good/url.new @@ -0,0 +1 @@ +http://sources.openelec.tv/svn/elisa-plugins-good-0.9.1.tar.gz diff --git a/packages/python/multimedia/elisa-plugins-ugly/build b/packages/python/multimedia/elisa-plugins-ugly/build index 66f486b2c0..769c0b71f2 100755 --- a/packages/python/multimedia/elisa-plugins-ugly/build +++ b/packages/python/multimedia/elisa-plugins-ugly/build @@ -16,4 +16,7 @@ $PYTHON setup.py install --single-version-externally-managed -O1 --root ./.insta find .install -name "*.py" -exec rm -rf "{}" ";" find .install -name "*.pyo" -exec rm -rf "{}" ";" -rm -rf .install/usr/lib/python*/site-packages/elisa/plugins/*/tests \ No newline at end of file +rm -rf .install/usr/lib/python*/site-packages/elisa/plugins/*/tests + +#rm -rf .install/usr/lib/python*/site-packages/*flickr* +#rm -rf .install/usr/lib/python*/site-packages/elisa/plugins/flickr diff --git a/packages/python/multimedia/elisa-plugins-ugly/url.new b/packages/python/multimedia/elisa-plugins-ugly/url.new new file mode 100644 index 0000000000..0a25d1bdb5 --- /dev/null +++ b/packages/python/multimedia/elisa-plugins-ugly/url.new @@ -0,0 +1 @@ +http://sources.openelec.tv/svn//elisa-plugins-ugly-0.9.1.tar.gz diff --git a/packages/python/multimedia/elisa/url.new b/packages/python/multimedia/elisa/url.new new file mode 100644 index 0000000000..4e8cf8078e --- /dev/null +++ b/packages/python/multimedia/elisa/url.new @@ -0,0 +1 @@ +http://sources.openelec.tv/svn/elisa-0.9.1.tar.gz