Version bump. Fixed libxml/libxml2 detection. Fixed alsa detection

9 files changed, 176 insertions, 11 deletions

diff --git a/media-sound/glame/ChangeLog b/media-sound/glame/ChangeLog
index 06bb98bd1825..c855d19aa5ec 100644
--- a/media-sound/glame/ChangeLog
+++ b/media-sound/glame/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/glame
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/glame/ChangeLog,v 1.12 2003/11/12 22:08:42 todd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/glame/ChangeLog,v 1.13 2004/01/21 18:42:53 raker Exp $
+
+*glame-1.0.2 (21 Jan 2004)
+
+  21 Jan 2004; Nick Hadaway <raker@gentoo.org> glame-1.0.2.ebuild,
+  gentoo.patch:
+  Version bump.  Fixed libxml/libxml2 detection.  Fixed alsa detection
+  and added the alsa USE variable.  Added support for fftw and ladspa.
+  Please comment and reopen bug #35948 if you find any problems.
 
   12 Nov 2003; Todd Sunderlin <todd@gentoo.org> glame-1.0.1.ebuild:
   added ~sparc keyword
diff --git a/media-sound/glame/Manifest b/media-sound/glame/Manifest
index a2b2a8a38cde..86750d81db9c 100644
--- a/media-sound/glame/Manifest
+++ b/media-sound/glame/Manifest
@@ -1,7 +1,11 @@
-MD5 9b0a6cd3eb817a43dc30ca2aa664d469 glame-1.0.1.ebuild 1855
+MD5 eec3e0345028601333f772b8e28fbbb3 glame-1.0.1.ebuild 1856
+MD5 5c7e99710f689a30094aba00b076f382 glame-0.6.4.ebuild 1790
+MD5 b5ab121aaf1b94bba0c4c650bfa53507 glame-0.6.3.ebuild 1714
+MD5 473ec836410811a4da9160a0f389b47e glame-1.0.2.ebuild 2228
+MD5 99f616cc7781616e77972ecf245b5430 ChangeLog 2258
+MD5 552d4fdf9e391a7631494186974bdb80 metadata.xml 266
+MD5 1414bd1790705dfed4d11d93033cbda8 files/gentoo.patch 1532
 MD5 0f9e060b52d269fd1c243646143605e1 files/digest-glame-0.6.3 64
 MD5 fcefae48a292c979f6c45a0bccafe745 files/digest-glame-0.6.4 64
 MD5 6d37da48379bb5a16ffc8f3e9ca2febd files/digest-glame-1.0.1 64
-MD5 1c4ef87d8b8bef5258dd697a6c0094e1 glame-0.6.4.ebuild 1793
-MD5 19d6f4fd88c4f18f45a26b913abd8a0a glame-0.6.3.ebuild 1717
-MD5 7d93b525ebcae5bd0cf78422a3e48bcc ChangeLog 1938
+MD5 f96064bc6c40df179eea7502e0999af8 files/digest-glame-1.0.2 64
diff --git a/media-sound/glame/files/digest-glame-1.0.2 b/media-sound/glame/files/digest-glame-1.0.2
new file mode 100644
index 000000000000..e2ec202d8d91
--- /dev/null
+++ b/media-sound/glame/files/digest-glame-1.0.2
@@ -0,0 +1 @@
+MD5 6d4c76891257dab0d9cee18d21a5db9a glame-1.0.2.tar.gz 1587125
diff --git a/media-sound/glame/files/gentoo.patch b/media-sound/glame/files/gentoo.patch
new file mode 100644
index 000000000000..75a0424a26de
--- /dev/null
+++ b/media-sound/glame/files/gentoo.patch
@@ -0,0 +1,52 @@
+diff -urN glame-1.0.2/configure glame-1.0.2-new/configure
+--- glame-1.0.2/configure	2004-01-13 13:56:21.000000000 -0600
++++ glame-1.0.2-new/configure	2004-01-21 12:29:41.576998136 -0600
+@@ -28042,7 +28042,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+-#include <xmlversion.h>
++#include <libxml/xmlversion.h>
+ 
+ int
+ main()
+@@ -30609,15 +30609,16 @@
+ main ()
+ {
+ 
+-#if SND_LIB_MAJOR != $alsa_min_major_version
+-#error wrong major version
+-#endif
+-#if SND_LIB_MINOR < $alsa_min_minor_version
+-#error wrong minor version
+-#endif
+-#if (SND_LIB_MINOR == $alsa_min_minor_version) && (SND_LIB_SUBMINOR < $alsa_min_subminor_version)
+-#error wrong subminor version
+-#endif
++/* #if SND_LIB_MAJOR != $alsa_min_major_version */
++/* #error wrong major version */
++/* #endif */
++/* #if SND_LIB_MINOR < $alsa_min_minor_version */
++/* #error wrong minor version */
++/* #endif */
++/* #if (SND_LIB_MINOR == $alsa_min_minor_version) && (SND_LIB_SUBMINOR < */
++/* $alsa_min_subminor_version) */
++/* #error wrong subminor version */
++/* #endif */
+ 
+   ;
+   return 0;
+diff -urN glame-1.0.2/src/glmid/gpsm.c glame-1.0.2-new/src/glmid/gpsm.c
+--- glame-1.0.2/src/glmid/gpsm.c	2004-01-10 18:17:16.000000000 -0600
++++ glame-1.0.2-new/src/glmid/gpsm.c	2004-01-21 12:32:35.530553176 -0600
+@@ -26,8 +26,8 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <string.h>
+-#include <xmlmemory.h>
+-#include <parser.h>
++#include <libxml/xmlmemory.h>
++#include <libxml/parser.h>
+ #include "glame_types.h"
+ #include "swapfile.h"
+ #include "gpsm.h"
diff --git a/media-sound/glame/glame-0.6.3.ebuild b/media-sound/glame/glame-0.6.3.ebuild
index 512e500dad81..ce21cbcee384 100644
--- a/media-sound/glame/glame-0.6.3.ebuild
+++ b/media-sound/glame/glame-0.6.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/glame/glame-0.6.3.ebuild,v 1.6 2003/09/07 00:06:05 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/glame/glame-0.6.3.ebuild,v 1.7 2004/01/21 18:42:53 raker Exp $
 
 IUSE="nls gnome"
 
diff --git a/media-sound/glame/glame-0.6.4.ebuild b/media-sound/glame/glame-0.6.4.ebuild
index f0f421807c73..438c57e913da 100644
--- a/media-sound/glame/glame-0.6.4.ebuild
+++ b/media-sound/glame/glame-0.6.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/glame/glame-0.6.4.ebuild,v 1.4 2003/09/07 00:06:05 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/glame/glame-0.6.4.ebuild,v 1.5 2004/01/21 18:42:53 raker Exp $
 
 IUSE="nls gnome"
 
diff --git a/media-sound/glame/glame-1.0.1.ebuild b/media-sound/glame/glame-1.0.1.ebuild
index d76e75924e0a..f39fef3e4c2b 100644
--- a/media-sound/glame/glame-1.0.1.ebuild
+++ b/media-sound/glame/glame-1.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/glame/glame-1.0.1.ebuild,v 1.3 2003/11/12 22:08:42 todd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/glame/glame-1.0.1.ebuild,v 1.4 2004/01/21 18:42:53 raker Exp $
 
 IUSE="nls gnome"
 
diff --git a/media-sound/glame/glame-1.0.2.ebuild b/media-sound/glame/glame-1.0.2.ebuild
new file mode 100644
index 000000000000..8d960409df0e
--- /dev/null
+++ b/media-sound/glame/glame-1.0.2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/glame/glame-1.0.2.ebuild,v 1.1 2004/01/21 18:42:53 raker Exp $
+
+IUSE="nls gnome oggvorbis debug alsa"
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Glame is an audio file editing utility"
+SRC_URI="mirror://sourceforge/glame/${P}.tar.gz"
+HOMEPAGE="http://glame.sourceforge.net/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc"
+
+DEPEND=">=dev-util/guile-1.4-r3
+	>=dev-libs/libxml-1.8.0
+	>=dev-libs/libxml2-2.0.0
+	>=media-sound/esound-0.2
+	>=media-libs/audiofile-0.2.2
+	=dev-libs/fftw-2*
+	media-sound/mad
+	media-libs/ladspa-sdk
+	oggvorbis? ( >=media-libs/libvorbis-1.0 )
+	gnome? ( <gnome-base/libglade-2 gnome-base/gnome-libs )
+	alsa? ( media-libs/alsa-lib )"
+
+RDEPEND="nls? ( >=sys-devel/gettext-0.11.3 )"
+
+src_unpack() {
+	unpack ${A}
+
+	# fix NLS problem (bug #7587)
+	if [ ! "`use nls`" ]
+	then
+		cd ${S}/src/gui
+		mv swapfilegui.c swapfilegui.c.bad
+		sed -e "s:#include <libintl.h>::" swapfilegui.c.bad > swapfilegui.c
+	fi
+
+	# fix makefile problem
+	export WANT_AUTOCONF_2_5=1
+	cd ${S}/libltdl
+	autoconf -f
+
+	cd ${S}
+	epatch ${FILESDIR}/gentoo.patch
+}
+
+src_compile() {
+	local myconf="--enable-ladspa"
+
+	if [ "`use gnome`" ]
+	then
+		# Use a valid icon for the GNOME menu entry
+		cp src/gui/glame.desktop src/gui/glame.desktop.old
+		sed -e 's:glame.png:glame-logo.jpg:' \
+			src/gui/glame.desktop.old > src/gui/glame.desktop
+		rm src/gui/glame.desktop.old
+	fi
+
+	use nls	&& myconf="--enable-nls" \
+		|| myconf="--disable-nls"
+
+	use gnome && myconf="${myconf} --enable-gui" \
+		|| myconf="${myconf} --disable-gui"
+
+	use debug && myconf="${myconf} --enable-swapfiledebug --enable-debug" \
+		|| myconf="${myconf} --disable-swapfiledebug --disable-debug"
+
+	use alsa || myconf="${myconf} --disable-alsatest"
+
+	econf ${myconf} || die "Configuration failed"
+
+	emake || die "Compilation failed"
+}
+
+src_install () {
+	einstall || die "Installation failed"
+
+	if [ "`use gnome`" ]
+	then
+		dodir /usr/share/pixmaps
+		dosym ../glame/pixmaps/glame-logo.jpg \
+		      /usr/share/pixmaps/glame-logo.jpg
+	fi
+
+	dodoc ABOUT-NLS AUTHORS BUGS COPYING CREDITS ChangeLog MAINTAINERS \
+		NEWS README TODO
+}
+
diff --git a/media-sound/glame/metadata.xml b/media-sound/glame/metadata.xml
new file mode 100644
index 000000000000..4c7ac1abe68a
--- /dev/null
+++ b/media-sound/glame/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+  <maintainer>
+    <email>sound@gentoo.org</email>
+    <name>The Gentoo Sound Herd</name>
+  </maintainer>
+</pkgmetadata>