Fix enabling/disabling asm code, bug #391675 by cJ and Risto A. Paju.

(Portage version: 2.2.0_alpha174/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

3 files changed, 97 insertions, 1 deletions

diff --git a/media-plugins/swh-plugins/ChangeLog b/media-plugins/swh-plugins/ChangeLog
index 96a6753d2244..d08121720fa5 100644
--- a/media-plugins/swh-plugins/ChangeLog
+++ b/media-plugins/swh-plugins/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/swh-plugins
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/swh-plugins/ChangeLog,v 1.44 2013/05/08 12:06:39 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/swh-plugins/ChangeLog,v 1.45 2013/05/08 12:19:02 aballier Exp $
+
+*swh-plugins-0.4.15-r2 (08 May 2013)
+
+  08 May 2013; Alexis Ballier <aballier@gentoo.org>
+  +swh-plugins-0.4.15-r2.ebuild,
+  +files/swh-plugins-0.4.15-x86-asm-optional.patch:
+  Fix enabling/disabling asm code, bug #391675 by cJ and Risto A. Paju.
 
   08 May 2013; Alexis Ballier <aballier@gentoo.org>
   swh-plugins-0.4.15-r1.ebuild:
diff --git a/media-plugins/swh-plugins/files/swh-plugins-0.4.15-x86-asm-optional.patch b/media-plugins/swh-plugins/files/swh-plugins-0.4.15-x86-asm-optional.patch
new file mode 100644
index 000000000000..b18ff39948e6
--- /dev/null
+++ b/media-plugins/swh-plugins/files/swh-plugins-0.4.15-x86-asm-optional.patch
@@ -0,0 +1,16 @@
+diff -ur swh-plugins-0.4.15/configure.in swh-plugins-0.4.15-teknohog/configure.in
+--- swh-plugins-0.4.15/configure.in	2006-08-08 18:47:16.000000000 +0300
++++ swh-plugins-0.4.15-teknohog/configure.in	2012-07-04 16:20:19.000000000 +0300
+@@ -87,9 +87,9 @@
+ AC_CHECK_FUNC(shm_open,,[AC_CHECK_LIB(rt,shm_open)])
+ AC_C99_FUNC_LRINTF()
+ 
+-AC_ARG_ENABLE(3dnow, [  --enable-3dnow Enables 3DNow! acceleration], AC_DEFINE_UNQUOTED(ACCEL_3DNOW, ""))
+-AC_ARG_ENABLE(sse, [  --enable-sse Uses SSE instructions where possible, requires gcc3 and a processor with SSE support], USE_SSE="-msse -mfpmath=sse -malign-double")
+-AC_ARG_ENABLE(darwin, [  --enable-darwin Builds plugins that will be shared object in the Darwin OS], DARWIN_CFLAGS="-fno-common -flat_namespace -bundle -undefined suppress -lbundle1.o")
++AC_ARG_ENABLE(3dnow, [  --enable-3dnow Enables 3DNow! acceleration], AS_IF([test "x$enableval" = "xyes"], [AC_DEFINE_UNQUOTED(ACCEL_3DNOW, "")]))
++AC_ARG_ENABLE(sse, [  --enable-sse Uses SSE instructions where possible, requires gcc3 and a processor with SSE support], AS_IF([test "x$enableval" = "xyes"], [USE_SSE="-msse -mfpmath=sse -malign-double"]))
++AC_ARG_ENABLE(darwin, [  --enable-darwin Builds plugins that will be shared object in the Darwin OS], AS_IF([test "x$enableval" = "xyes"], [DARWIN_CFLAGS="-fno-common -flat_namespace -bundle -undefined suppress -lbundle1.o"]))
+ 
+ CFLAGS=$lrintf_save_CFLAGS -I@top_srcdir@/intl -I@top_srcdir@
+ 
diff --git a/media-plugins/swh-plugins/swh-plugins-0.4.15-r2.ebuild b/media-plugins/swh-plugins/swh-plugins-0.4.15-r2.ebuild
new file mode 100644
index 000000000000..0463924e525c
--- /dev/null
+++ b/media-plugins/swh-plugins/swh-plugins-0.4.15-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/swh-plugins/swh-plugins-0.4.15-r2.ebuild,v 1.1 2013/05/08 12:19:02 aballier Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="Large collection of LADSPA audio plugins/effects"
+HOMEPAGE="http://plugin.org.uk"
+SRC_URI="http://plugin.org.uk/releases/${PV}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="3dnow nls sse"
+
+RDEPEND="media-libs/ladspa-sdk
+	media-sound/gsm
+	>=sci-libs/fftw-3"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-pic.patch"
+	epatch "${FILESDIR}/${P}-plugindir.patch"
+	epatch "${FILESDIR}/${P}-riceitdown.patch"
+	epatch "${FILESDIR}/${P}-gettext.patch"
+	epatch "${FILESDIR}/${P}-x86-asm-optional.patch"
+
+	# Use system libgsm, bug #252890
+	rm -rf gsm
+	epatch "${FILESDIR}/${P}-system_gsm.patch"
+
+	# This is to update gettext macros, otherwise they are incompatible with
+	# recent libtools, bug #231767
+	autopoint -f || die
+
+	# it doesn't get updated otherwise
+	rm -f missing
+
+	# Fix build with automake 1.13
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die
+
+	eautoreconf
+	elibtoolize
+}
+
+src_compile() {
+	econf ${myconf} \
+		$(use_enable sse) \
+		$(use_enable 3dnow) \
+		$(use_enable nls) \
+		$(use_enable userland_Darwin darwin) \
+		--enable-fast-install \
+		--disable-dependency-tracking || die "econf failed"
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog README TODO
+}
+
+pkg_postinst() {
+	ewarn "WARNING: You have to be careful when using the"
+	ewarn "swh plugins. Be sure to lower your sound volume"
+	ewarn "and then play around a bit with the plugins so"
+	ewarn "you get a feeling for it. Otherwise your speakers"
+	ewarn "won't like that."
+}