port from using esd to canberra - patch submitted by David Leverton via bug #357675

Package-Manager: portage-2.1.9.25/cvs/Linux i686

4 files changed, 205 insertions, 3 deletions

diff --git a/games-puzzle/gtetrinet/ChangeLog b/games-puzzle/gtetrinet/ChangeLog
index 928e2c838c60..a3ace024938d 100644
--- a/games-puzzle/gtetrinet/ChangeLog
+++ b/games-puzzle/gtetrinet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-puzzle/gtetrinet
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gtetrinet/ChangeLog,v 1.17 2009/01/29 02:36:31 mr_bones_ Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gtetrinet/ChangeLog,v 1.18 2011/03/08 01:10:38 mr_bones_ Exp $
+
+*gtetrinet-0.7.11-r1 (08 Mar 2011)
+
+  08 Mar 2011; Michael Sterrett <mr_bones_@gentoo.org>
+  +gtetrinet-0.7.11-r1.ebuild, +files/gtetrinet-0.7.11-noesd.patch:
+  port from using esd to canberra - patch submitted by David Leverton via
+  bug #357675
 
   29 Jan 2009; Michael Sterrett <mr_bones_@gentoo.org>
   gtetrinet-0.7.11.ebuild:
diff --git a/games-puzzle/gtetrinet/Manifest b/games-puzzle/gtetrinet/Manifest
index 43f07cbb0461..9c0dd95e19e8 100644
--- a/games-puzzle/gtetrinet/Manifest
+++ b/games-puzzle/gtetrinet/Manifest
@@ -1,5 +1,7 @@
+AUX gtetrinet-0.7.11-noesd.patch 4007 RMD160 0cf307911072eb84d0eaf3615cde760e9a32b293 SHA1 e70ec4b57f2bf89866a2ab4b2b9ae076974dc7e2 SHA256 ee0b877775bbf10463cd31c39e1f18fac5600a4a595d5e93b7bf6b269d1a744e
 DIST gtetrinet-0.7.11.tar.bz2 416744 RMD160 fbc3a17a49afcce3f66a16b736af9c3102090b04 SHA1 e39f5b072d290f48f6460451d114db9ab18f7f6a SHA256 cea27a5f65cc4384e9130cf345421ef677418be4ebdab14d82b9049dd162ddc0
 DIST gtetrinet-gentoo-theme-0.1.tbz2 88240 RMD160 58452bb836c9422563202cee01bba8da6be5a193 SHA1 60de7973422c9287cbb4b54f582cf310eb946145 SHA256 33037370a0cab1ac395716f8b33ead7f2360cac0bd25b869cff3ab5d28b6a323
+EBUILD gtetrinet-0.7.11-r1.ebuild 1453 RMD160 a9e206872e8f4f0d5fd617ba902aefd2f0714f4d SHA1 5a287f24a389b7f05cc10a9b427dba9b8257df82 SHA256 006590ff249cdc9ea182eba42bc5d5e72362ea0241170f9cd02c313f3bcd67d6
 EBUILD gtetrinet-0.7.11.ebuild 1453 RMD160 f3f9f0d3e8f1b2a91d61307d486883a3aeb00f78 SHA1 bc5522e329098ca004f59b4eb13fe95a698ff975 SHA256 8483f36ef9dd119867b018ceb74d2e2f799f394580511d7b1bc85e078197675d
-MISC ChangeLog 4672 RMD160 b31f4fd61a199fd4476db96a13ba233b5e5776aa SHA1 8aa9a34ac89a39c1a753fca4a8d6289de1188fe5 SHA256 a5238cf5d816787f5c0037a3e5dc6a4b6dcae5e7898b613d0212b7d49e54ff94
+MISC ChangeLog 4920 RMD160 f83236dc2c4fa2fc9badf3b012c8a23c3110ce6d SHA1 540f37810b12e55d2817de4b8c65112ea3fe0aaa SHA256 9936edea7fdf7a7013de465c853678bc4cd7f2bbc895a7ef6fa3cfaae27bf456
 MISC metadata.xml 652 RMD160 9e16ca70ddebd3d8ee8ecbf2dfa441f1a7e39bed SHA1 74c69b369104a3e3aff08f828050fcf9e0da78db SHA256 02143afc3f481a6995a9b1edb08ac275303f93a9aa15824977b5552632b5fa58
diff --git a/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-noesd.patch b/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-noesd.patch
new file mode 100644
index 000000000000..b49758401298
--- /dev/null
+++ b/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-noesd.patch
@@ -0,0 +1,130 @@
+--- gtetrinet-0.7.11/configure.in~	2006-11-15 17:02:36.000000000 +0000
++++ gtetrinet-0.7.11/configure.in	2011-03-06 15:39:10.000000000 +0000
+@@ -30,7 +30,6 @@
+ LIBGTK_REQUIRED=2.6.0
+ LIBGNOME_REQUIRED=2.0.0
+ LIBGNOMEUI_REQUIRED=2.0.0
+-LIBESD_REQUIRED=0.2.36
+ 
+ dnl *****************************************
+ dnl libgnome, libgnomeui needed for all utils
+@@ -40,21 +39,21 @@
+ AC_SUBST(GTET_CFLAGS)
+ AC_SUBST(GTET_LIBS)
+ 
+-dnl Check for libesd
+-if pkg-config --exists esound ; then
+-	have_esound=yes
++dnl Check for libcanberra
++if pkg-config --exists libcanberra ; then
++	have_libcanberra=yes
+ else 
+-	have_esound=no
++	have_libcanberra=no
+ fi
+ 
+-if test "x$have_esound" = "xyes"; then
+-AC_DEFINE(HAVE_ESD, 1, [Define this to enable EsounD support.])
+-PKG_CHECK_MODULES(ESOUND, esound >= $LIBESD_REQUIRED)
+-AC_SUBST(ESOUND_CFLAGS)
+-AC_SUBST(ESOUND_LIBS)
++if test "x$have_libcanberra" = "xyes"; then
++AC_DEFINE(HAVE_LIBCANBERRA, 1, [Define this to enable libcanberra support.])
++PKG_CHECK_MODULES(LIBCANBERRA, libcanberra)
++AC_SUBST(LIBCANBERRA_CFLAGS)
++AC_SUBST(LIBCANBERRA_LIBS)
+ fi
+ 
+-AM_CONDITIONAL(HAVE_ESOUND, test "x$have_esound" = "xyes")
++AM_CONDITIONAL(HAVE_LIBCANBERRA, test "x$have_libcanberra" = "xyes")
+ 
+ AC_HEADER_STDC
+ AC_HEADER_SYS_WAIT
+--- gtetrinet-0.7.11/config.h.in~	2006-11-15 17:03:53.000000000 +0000
++++ gtetrinet-0.7.11/config.h.in	2011-03-06 15:39:31.000000000 +0000
+@@ -15,8 +15,8 @@
+ /* Define to 1 if you have the `dcgettext' function. */
+ #undef HAVE_DCGETTEXT
+ 
+-/* Define this to enable EsounD support. */
+-#undef HAVE_ESD
++/* Define this to enable libcanberra support. */
++#undef HAVE_LIBCANBERRA
+ 
+ /* Define if the GNU gettext() function is already present or preinstalled. */
+ #undef HAVE_GETTEXT
+--- gtetrinet-0.7.11/src/dialogs.c~	2006-11-03 12:49:49.000000000 +0000
++++ gtetrinet-0.7.11/src/dialogs.c	2011-03-06 15:40:45.000000000 +0000
+@@ -1054,7 +1054,7 @@
+     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(soundcheck), soundenable);
+     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(midicheck), midienable);
+ 
+-#ifdef HAVE_ESD
++#ifdef HAVE_LIBCANBERRA
+     if (midienable) prefdialog_midion ();
+     else prefdialog_midioff ();
+     if (soundenable) prefdialog_soundon ();
+--- gtetrinet-0.7.11/src/sound.c~	2005-03-18 21:19:18.000000000 +0000
++++ gtetrinet-0.7.11/src/sound.c	2011-03-06 15:47:24.000000000 +0000
+@@ -36,33 +36,36 @@
+ char midifile[1024];
+ char midicmd[1024];
+ 
+-#ifdef HAVE_ESD
++#ifdef HAVE_LIBCANBERRA
+ 
+-#include <esd.h>
+-#include <libgnome/gnome-sound.h>
++#include <canberra.h>
+ 
+-static int soundsamples[S_NUM];
+ static int midipid = 0;
++static ca_context *ctx = 0;
+ 
+ void sound_cache (void)
+ {
+     int i;
+     if (!soundenable) return;
++    if (!ctx)
++        ca_context_create(&ctx);
++    if (ctx) {
+     for (i = 0; i < S_NUM; i ++) {
+-        if (soundsamples[i])
+-            esd_sample_free (gnome_sound_connection_get (), soundsamples[i]);
+         if (soundfiles[i][0])
+-            soundsamples[i] = gnome_sound_sample_load (soundfiles[i], soundfiles[i]);
+-        else
+-            soundsamples[i] = 0;
++                ca_context_cache(ctx,
++                    CA_PROP_MEDIA_FILENAME, soundfiles[i],
++                    NULL);
++        }
+     }
+ }
+ 
+ void sound_playsound (int id)
+ {
+-    if (!soundenable) return;
+-    if (soundsamples[id] > 0)
+-      esd_sample_play (gnome_sound_connection_get (), soundsamples[id]);
++    if (!soundenable || !ctx) return;
++    if (soundfiles[id][0])
++        ca_context_play(ctx, 0,
++            CA_PROP_MEDIA_FILENAME, soundfiles[id],
++            NULL);
+ }
+ 
+ void sound_playmidi (char *file)
+--- gtetrinet-0.7.11/src/Makefile.am~	2006-11-03 16:20:08.000000000 +0000
++++ gtetrinet-0.7.11/src/Makefile.am	2011-03-06 15:57:32.000000000 +0000
+@@ -7,8 +7,8 @@
+ 	   -DGTETPIXMAPSDIR=\""$(datadir)/pixmaps/gtetrinet"\" \
+ 	   $(GTET_CFLAGS)
+ 
+-if HAVE_ESOUND
+-LDADD = $(GTET_LIBS) $(ESOUND_LIBS)
++if HAVE_LIBCANBERRA
++LDADD = $(GTET_LIBS) $(LIBCANBERRA_LIBS)
+ else
+ LDADD = $(GTET_LIBS)
+ endif
diff --git a/games-puzzle/gtetrinet/gtetrinet-0.7.11-r1.ebuild b/games-puzzle/gtetrinet/gtetrinet-0.7.11-r1.ebuild
new file mode 100644
index 000000000000..9b3f9e88db0a
--- /dev/null
+++ b/games-puzzle/gtetrinet/gtetrinet-0.7.11-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gtetrinet/gtetrinet-0.7.11-r1.ebuild,v 1.1 2011/03/08 01:10:38 mr_bones_ Exp $
+
+EAPI=2
+# games after gnome2 so games' functions will override gnome2's
+inherit autotools gnome2 games
+
+DESCRIPTION="Tetrinet Clone for GNOME 2"
+HOMEPAGE="http://gtetrinet.sourceforge.net/"
+SRC_URI="${SRC_URI}
+	mirror://gentoo/gtetrinet-gentoo-theme-0.1.tbz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="nls ipv6"
+
+RDEPEND="dev-libs/libxml2
+	media-libs/libcanberra
+	>=gnome-base/gconf-2
+	>=gnome-base/libgnome-2
+	>=gnome-base/libgnomeui-2
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-noesd.patch
+	sed -i \
+		-e "/^pkgdatadir =/s:=.*:= ${GAMES_DATADIR}/${PN}:" \
+		src/Makefile.in themes/*/Makefile.in || die
+	sed -i \
+		-e '/^gamesdir/s:=.*:=@bindir@:' \
+		src/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable ipv6) \
+		--bindir="${GAMES_BINDIR}" \
+		|| die
+}
+
+src_install() {
+	USE_DESTDIR=1 gnome2_src_install
+	dodoc AUTHORS ChangeLog NEWS README TODO
+	mv "${WORKDIR}"/gentoo "${D}/${GAMES_DATADIR}"/${PN}/themes/
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+	games_pkg_preinst
+}
+
+pkg_postinst() {
+	SCROLLKEEPER_UPDATE=0
+	gnome2_pkg_postinst
+	games_pkg_postinst
+}