Revision bump, with patch to fix running on systems with recent gcc/glibc. Closes bug #142663.

(Portage version: 2.1.1)

5 files changed, 104 insertions, 1 deletions

diff --git a/x11-plugins/wmmixer/ChangeLog b/x11-plugins/wmmixer/ChangeLog
index 6c5b38284524..017f5a725abb 100644
--- a/x11-plugins/wmmixer/ChangeLog
+++ b/x11-plugins/wmmixer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/wmmixer
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmixer/ChangeLog,v 1.8 2006/01/31 19:56:31 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmixer/ChangeLog,v 1.9 2006/09/12 12:48:10 s4t4n Exp $
+
+*wmmixer-2.0_beta4 (12 Sep 2006)
+
+  12 Sep 2006; Michele Noberasco <s4t4n@gentoo.org> wmmixer-2.0_beta4-r1.ebuild:
+  Revision bump, with patch to fix running issues on systems with newer gcc/glibc.
+  Fixes bug #142663.
 
   31 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org>
   wmmixer-2.0_beta4.ebuild:
diff --git a/x11-plugins/wmmixer/files/digest-wmmixer-2.0_beta4 b/x11-plugins/wmmixer/files/digest-wmmixer-2.0_beta4
index e6b627bd3667..e984a77c2c36 100644
--- a/x11-plugins/wmmixer/files/digest-wmmixer-2.0_beta4
+++ b/x11-plugins/wmmixer/files/digest-wmmixer-2.0_beta4
@@ -1 +1,3 @@
 MD5 8ac38fbbdc3064e902c87df0b3ef3b64 wmmixer-2.0b4.tar.gz 105985
+RMD160 cc9c5c9d1c9c1d4153a6cf390b9079db0938e809 wmmixer-2.0b4.tar.gz 105985
+SHA256 0bb350bb6fc0da5cade3426df7ff821b5ec40b0d3aba67ddfcb981c1141c6ecc wmmixer-2.0b4.tar.gz 105985
diff --git a/x11-plugins/wmmixer/files/digest-wmmixer-2.0_beta4-r1 b/x11-plugins/wmmixer/files/digest-wmmixer-2.0_beta4-r1
new file mode 100644
index 000000000000..e984a77c2c36
--- /dev/null
+++ b/x11-plugins/wmmixer/files/digest-wmmixer-2.0_beta4-r1
@@ -0,0 +1,3 @@
+MD5 8ac38fbbdc3064e902c87df0b3ef3b64 wmmixer-2.0b4.tar.gz 105985
+RMD160 cc9c5c9d1c9c1d4153a6cf390b9079db0938e809 wmmixer-2.0b4.tar.gz 105985
+SHA256 0bb350bb6fc0da5cade3426df7ff821b5ec40b0d3aba67ddfcb981c1141c6ecc wmmixer-2.0b4.tar.gz 105985
diff --git a/x11-plugins/wmmixer/files/wmmixer-2.0_beta4.gcc.patch b/x11-plugins/wmmixer/files/wmmixer-2.0_beta4.gcc.patch
new file mode 100644
index 000000000000..590c2d1698e2
--- /dev/null
+++ b/x11-plugins/wmmixer/files/wmmixer-2.0_beta4.gcc.patch
@@ -0,0 +1,24 @@
+diff -Naur wmmixer-2.0b4/src/dockapp.cc wmmixer-2.0b4.new/src/dockapp.cc
+--- wmmixer-2.0b4/src/dockapp.cc	2003-03-12 21:54:16.000000000 +0100
++++ wmmixer-2.0b4.new/src/dockapp.cc	2006-09-12 14:36:27.000000000 +0200
+@@ -24,7 +24,7 @@
+   {
+     theme_ = new Theme(theme_file);
+     theme_->initImages(getXHandler());
+-    icons_ = new unsigned[theme_->icon_num_];
++    icons_ = new unsigned[mixer->getNumChannels()];
+   }
+   catch(InvalidThemeException& e)
+   {
+diff -Naur wmmixer-2.0b4/src/theme.cc wmmixer-2.0b4.new/src/theme.cc
+--- wmmixer-2.0b4/src/theme.cc	2003-03-12 21:48:20.000000000 +0100
++++ wmmixer-2.0b4.new/src/theme.cc	2006-09-12 14:33:35.000000000 +0200
+@@ -33,8 +33,6 @@
+   }
+ 
+ 
+-  delete config;
+-  config = NULL;
+ 
+ }
+ 
diff --git a/x11-plugins/wmmixer/wmmixer-2.0_beta4-r1.ebuild b/x11-plugins/wmmixer/wmmixer-2.0_beta4-r1.ebuild
new file mode 100644
index 000000000000..94c918d0263a
--- /dev/null
+++ b/x11-plugins/wmmixer/wmmixer-2.0_beta4-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmixer/wmmixer-2.0_beta4-r1.ebuild,v 1.1 2006/09/12 12:48:10 s4t4n Exp $
+
+inherit eutils
+
+IUSE="alsa oss"
+
+DESCRIPTION="The next generation of WMMixer with native ALSA and OSS support."
+SRC_URI="http://freakzone.net/gordon/src/${PN}-2.0b4.tar.gz"
+HOMEPAGE="http://freakzone.net/gordon/#wmmixer"
+
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-proto/xproto
+		x11-proto/xextproto )
+	virtual/x11 )
+	alsa? ( media-libs/alsa-lib )
+	>=sys-apps/sed-4"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~mips"
+
+S="${WORKDIR}/${PN}-2.0b4"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	sed -i 's#/usr/local/share#/usr/share#g' src/wmmixer.h example/*
+
+	# Allow use of Gentoo CXXFLAGS
+	epatch ${FILESDIR}/${PN}-cflags.patch
+
+	# Fix compilation issues with recent gcc versions
+	epatch ${FILESDIR}/${P}.gcc.patch
+}
+
+src_compile() {
+
+	local myconf=""
+
+	if use alsa ; then
+		myconf="${myconf} --enable-alsa"
+	elif use oss ; then
+		myconf="${myconf} --disable-alsatest --enable-oss"
+	fi
+
+	econf "${myconf}" || die
+	emake || die
+}
+
+src_install() {
+
+	einstall || die
+	dodoc README AUTHORS example/home.wmmixerrc example/home.wmmixer
+
+	einfo
+	einfo "Two sample configuration files have been installed in /usr/share/doc/${PF}/."
+	einfo "You can copy one of them to ~/.wmmixerrc and adjust any settings you may need."
+	einfo
+}