Rev bump removing automagic deps and flac 1.1.3 ready

Package-Manager: portage-2.1.2_rc2-r5

6 files changed, 296 insertions, 8 deletions

diff --git a/media-sound/rezound/ChangeLog b/media-sound/rezound/ChangeLog
index 3e4241e1ebf8..318aa505245b 100644
--- a/media-sound/rezound/ChangeLog
+++ b/media-sound/rezound/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/rezound
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rezound/ChangeLog,v 1.36 2006/11/12 14:42:21 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rezound/ChangeLog,v 1.37 2006/12/04 19:10:23 aballier Exp $
+
+*rezound-0.12.2_beta-r3 (04 Dec 2006)
+
+  04 Dec 2006; Alexis Ballier <aballier@gentoo.org>
+  +files/rezound-0.12.2_beta-automagic.patch,
+  +files/rezound-0.12.2_beta-flac-1.1.3.patch,
+  +rezound-0.12.2_beta-r3.ebuild:
+  Rev bump removing automagic deps and flac 1.1.3 ready
 
   12 Nov 2006; Alexis Ballier <aballier@gentoo.org>
   -rezound-0.12.0_beta.ebuild:
diff --git a/media-sound/rezound/Manifest b/media-sound/rezound/Manifest
index b941b35967b0..063994abf77c 100644
--- a/media-sound/rezound/Manifest
+++ b/media-sound/rezound/Manifest
@@ -1,6 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX rezound-0.12.2_beta-automagic.patch 2471 RMD160 c2c647277ccdba14b8f8b3dcf58e584446e8fe51 SHA1 164e1c2bb31a5b64f30ee9e15e4550c59a068053 SHA256 0a49f0d49ca319c66e381744f80b2666a4dd1574b451a2a7b17d8b3321409373
+MD5 913e9e9bd69b588f661ab444d784f95f files/rezound-0.12.2_beta-automagic.patch 2471
+RMD160 c2c647277ccdba14b8f8b3dcf58e584446e8fe51 files/rezound-0.12.2_beta-automagic.patch 2471
+SHA256 0a49f0d49ca319c66e381744f80b2666a4dd1574b451a2a7b17d8b3321409373 files/rezound-0.12.2_beta-automagic.patch 2471
+AUX rezound-0.12.2_beta-flac-1.1.3.patch 2635 RMD160 207d700371bc8b316bebb561f1bebd3835d48c56 SHA1 f0bfa3fb1d7b2867b6e450153aa1e201b8f25fcd SHA256 4db7fcf77bcd2b8d9508702eaf3a68760443f47d37b873cf9548d8f6349a6e2b
+MD5 1f7c812bc95902cda6f71c5fcf6528bc files/rezound-0.12.2_beta-flac-1.1.3.patch 2635
+RMD160 207d700371bc8b316bebb561f1bebd3835d48c56 files/rezound-0.12.2_beta-flac-1.1.3.patch 2635
+SHA256 4db7fcf77bcd2b8d9508702eaf3a68760443f47d37b873cf9548d8f6349a6e2b files/rezound-0.12.2_beta-flac-1.1.3.patch 2635
 AUX rezound-0.12.2_beta-foxinclude.patch 550 RMD160 28762c3a1ea58b2a8b825f53d332b06c838cecc8 SHA1 6b405f22903a30034805df498b9440af00928791 SHA256 4b81b271e092abcffbbef23d407f764b2a2bee2ee474d6e11f1b2b917398a2b6
 MD5 4b20dc8e3e91f3176df90169ebe09900 files/rezound-0.12.2_beta-foxinclude.patch 550
 RMD160 28762c3a1ea58b2a8b825f53d332b06c838cecc8 files/rezound-0.12.2_beta-foxinclude.patch 550
@@ -15,10 +23,14 @@ EBUILD rezound-0.12.2_beta-r2.ebuild 2418 RMD160 8d125b4746a1888b839597b1421751a
 MD5 6f7a0182d6895c09ef9092038179e4ad rezound-0.12.2_beta-r2.ebuild 2418
 RMD160 8d125b4746a1888b839597b1421751a82a306bb8 rezound-0.12.2_beta-r2.ebuild 2418
 SHA256 a8164576500ef74e95dbc4f88339db0d943104b483e4a53d6a2bec8d409be82f rezound-0.12.2_beta-r2.ebuild 2418
-MISC ChangeLog 6246 RMD160 c3ee607a433390139b7d778a32e29be4a73ca579 SHA1 19f5e289d5999ecf2fe492d0898bf8f74d6c79bc SHA256 9416ec2dd5d8b601544905a62ad6cd80a78ba2f1767db4421e1923d93712ed09
-MD5 c455312f1beb7c8a9af6e325e7c3bbee ChangeLog 6246
-RMD160 c3ee607a433390139b7d778a32e29be4a73ca579 ChangeLog 6246
-SHA256 9416ec2dd5d8b601544905a62ad6cd80a78ba2f1767db4421e1923d93712ed09 ChangeLog 6246
+EBUILD rezound-0.12.2_beta-r3.ebuild 2588 RMD160 91ee67afbc236f82522061aaa630e1b8d3159e1a SHA1 21f856b46a065b0f825c74551ba6b1cbfd28ef81 SHA256 6ea6d6f67d25b18e09c999d21c08f14d148809d4ef2b17d430c9657480ab6e62
+MD5 44d4424dca18ec7c1a10b41d9204e430 rezound-0.12.2_beta-r3.ebuild 2588
+RMD160 91ee67afbc236f82522061aaa630e1b8d3159e1a rezound-0.12.2_beta-r3.ebuild 2588
+SHA256 6ea6d6f67d25b18e09c999d21c08f14d148809d4ef2b17d430c9657480ab6e62 rezound-0.12.2_beta-r3.ebuild 2588
+MISC ChangeLog 6521 RMD160 c002202b2bf7b3a92682be680f73d171a233f307 SHA1 19c1eb2beb3df90ac7de104653510906e1e84939 SHA256 aad6ccba7c5a3173986a786fae4be0394917423ae54165d2a94affd91b6b6279
+MD5 847a356ff5bdf237ce96552d675a5d2a ChangeLog 6521
+RMD160 c002202b2bf7b3a92682be680f73d171a233f307 ChangeLog 6521
+SHA256 aad6ccba7c5a3173986a786fae4be0394917423ae54165d2a94affd91b6b6279 ChangeLog 6521
 MISC metadata.xml 221 RMD160 600a2278f8a89283311c5bb10b02d54cebef8ca3 SHA1 aff61004cffd7341912643e1ab44a8df84e14c23 SHA256 3341e7789c5ba08aade2440d5ce6d2937e8432775731033190f11df5f64d085e
 MD5 d0d7ea03e238a808414b4426394c100f metadata.xml 221
 RMD160 600a2278f8a89283311c5bb10b02d54cebef8ca3 metadata.xml 221
@@ -26,10 +38,13 @@ SHA256 3341e7789c5ba08aade2440d5ce6d2937e8432775731033190f11df5f64d085e metadata
 MD5 ef2620a843937ab508b716186bed86bd files/digest-rezound-0.12.2_beta-r2 539
 RMD160 8d477a20d613175ac948844bae2e29637f539492 files/digest-rezound-0.12.2_beta-r2 539
 SHA256 b84b06424b364a21d257b77d3c8bc0f1cd782167556486334b1a9cc283bbefb3 files/digest-rezound-0.12.2_beta-r2 539
+MD5 ef2620a843937ab508b716186bed86bd files/digest-rezound-0.12.2_beta-r3 539
+RMD160 8d477a20d613175ac948844bae2e29637f539492 files/digest-rezound-0.12.2_beta-r3 539
+SHA256 b84b06424b364a21d257b77d3c8bc0f1cd782167556486334b1a9cc283bbefb3 files/digest-rezound-0.12.2_beta-r3 539
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFVzLGvFcC4BYPU0oRAn2uAKCesliJ+gLTYTHrxgMtk/sIoifWkACgtFOv
-AVY5XWeaA1IOCVlMAmxuF7E=
-=Dmne
+iD8DBQFFdHKEvFcC4BYPU0oRAkN4AJ9voR35NhmTsZJG79rj0S0QhOVUxwCfTH1b
+UQ84VShJlO1HPScRzOM8cus=
+=NhRb
 -----END PGP SIGNATURE-----
diff --git a/media-sound/rezound/files/digest-rezound-0.12.2_beta-r3 b/media-sound/rezound/files/digest-rezound-0.12.2_beta-r3
new file mode 100644
index 000000000000..3b6d5f63b0f5
--- /dev/null
+++ b/media-sound/rezound/files/digest-rezound-0.12.2_beta-r3
@@ -0,0 +1,6 @@
+MD5 693d4e7221cf243630a154ba9b76066e rezound-0.12.2_beta-patches.tar.bz2 7479
+RMD160 c23f4208d38c271cea04ecd4f4af852cd2e4eda4 rezound-0.12.2_beta-patches.tar.bz2 7479
+SHA256 37ab114e34144be9fa198efd6de7610720a906a0d94d77a4e912982d72263392 rezound-0.12.2_beta-patches.tar.bz2 7479
+MD5 acbe0d885643081db1c6b6e93d89f4b2 rezound-0.12.2beta.tar.gz 1729771
+RMD160 d5779d2dee47f504c32c87864504bdd3e8eed2c7 rezound-0.12.2beta.tar.gz 1729771
+SHA256 0e170622c52866e71069372a3d94c8c6eb4e4ce5a45abc8d2458b77aa59157cc rezound-0.12.2beta.tar.gz 1729771
diff --git a/media-sound/rezound/files/rezound-0.12.2_beta-automagic.patch b/media-sound/rezound/files/rezound-0.12.2_beta-automagic.patch
new file mode 100644
index 000000000000..3def7a9702df
--- /dev/null
+++ b/media-sound/rezound/files/rezound-0.12.2_beta-automagic.patch
@@ -0,0 +1,61 @@
+--- rezound-0.12.2beta/configure.ac.old	2006-12-04 18:20:25.000000000 +0100
++++ rezound-0.12.2beta/configure.ac	2006-12-04 18:25:53.000000000 +0100
+@@ -505,12 +505,20 @@
+ AC_LANG_PUSH(C) # xiph needs to include vorbisenc.h as well if C++ is going to compile the code
+ 
+ AH_TEMPLATE(HAVE_LIBOGG)
++
++AC_ARG_ENABLE(vorbis, AC_HELP_STRING([--disable-vorbis], [disable support for vorbis (default=autodetect)]), [ enable_vorbis=$enableval ], [ enable_vorbis=yes ])
++
++
+ # this macro detects libogg and does an AC_SUBST on OGG_CFLAGS and OGG_LIBS, so I put these variables in src/backend/Makefile.am for substitution
++if test "x$enable_vorbis" = "xyes"; then
+ XIPH_PATH_OGG(AC_DEFINE(HAVE_LIBOGG),AC_MSG_NOTICE([Ogg Vorbis website: http://www.xiph.org]))
++fi
+ 
+ AH_TEMPLATE(HAVE_LIBVORBIS)
+ # this macro detects libvorbis and does an AC_SUBST on VORBIS_CFLAGS, VORBIS_LIBS, VORBISFILE_LIBS and VORBISENC_LIBS, so I put these variables in src/backend/Makefile.am for substitution
++if test "x$enable_vorbis" = "xyes"; then
+ XIPH_PATH_VORBIS(AC_DEFINE(HAVE_LIBVORBIS),AC_MSG_NOTICE([Ogg Vorbis website: http://www.xiph.org]))
++fi
+ 
+ AC_LANG_POP(C)
+ 
+@@ -524,7 +532,12 @@
+ AH_TEMPLATE(HAVE_LIBFLACPP)
+ AH_TEMPLATE(HAVE_LIBFLAC)
+ 
++AC_ARG_ENABLE(flac, AC_HELP_STRING([--disable-flac], [disable support for flac (default=autodetect)]), [ enable_flac=$enableval ], [ enable_flac=yes ])
++
++
++
+ # look for libFLAC and if it's found then look for libFLAC++
++if test "x$enable_flac" = "xyes"; then
+ AM_PATH_LIBFLAC(
+ 	[
+ 		AC_DEFINE(HAVE_LIBFLAC)
+@@ -532,8 +545,7 @@
+ 	],
+ 	AC_MSG_NOTICE([FLAC website: http://flac.sourceforge.net])
+ )
+-
+-
++fi
+ 
+ 
+ 
+@@ -603,9 +615,13 @@
+ dnl ############################################################################
+ dnl # Handle the flags for a library to to tempo/pitch changing independantly  *
+ dnl ############################################################################
+-AM_PATH_SOUNDTOUCH([],[],AC_MSG_WARN([***** libSoundTouch not found -- tempo and pitch changing will be disabled (http://www.iki.fi/oparviai/soundtouch) *****]))
++AC_ARG_ENABLE(soundtouch, AC_HELP_STRING([--disable-soundtouch], [disable support for soundtouch (default=autodetect)]), [ enable_soundtouch=$enableval ], [ enable_soundtouch=yes ])
+ 
+ 
++if test "x$enable_soundtouch" = "xyes"; then
++AM_PATH_SOUNDTOUCH([],[],AC_MSG_WARN([***** libSoundTouch not found -- tempo and pitch changing will be disabled (http://www.iki.fi/oparviai/soundtouch) *****]))
++fi
++
+ 
+ 
+ 
diff --git a/media-sound/rezound/files/rezound-0.12.2_beta-flac-1.1.3.patch b/media-sound/rezound/files/rezound-0.12.2_beta-flac-1.1.3.patch
new file mode 100644
index 000000000000..6dbb69db1992
--- /dev/null
+++ b/media-sound/rezound/files/rezound-0.12.2_beta-flac-1.1.3.patch
@@ -0,0 +1,99 @@
+--- rezound-0.12.2beta/src/backend/CFLACSoundTranslator.cpp.old	2006-12-04 19:08:26.000000000 +0100
++++ rezound-0.12.2beta/src/backend/CFLACSoundTranslator.cpp	2006-12-04 19:33:45.000000000 +0100
+@@ -42,6 +42,12 @@
+ #include "CSound.h"
+ #include "AStatusComm.h"
+ 
++#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
++#define LEGACY_FLAC
++#else
++#undef LEGACY_FLAC
++#endif
++
+ CFLACSoundTranslator::CFLACSoundTranslator()
+ {
+ }
+@@ -75,15 +81,23 @@
+ 		for(unsigned t=0;t<MAX_CHANNELS;t++)
+ 			accessers[t]=NULL;
+ 
++#ifdef LEGACY_FLAC
+ 		set_filename(filename.c_str());
++#endif
+ 
+ 		set_metadata_ignore_all();
+ 		//set_metadata_respond(FLAC__METADATA_TYPE_VORBIS_COMMENT);
+ 		//set_metadata_respond(FLAC__METADATA_TYPE_CUESHEET);
+ 
++#ifdef LEGACY_FLAC
+ 		State s=init();
+ 		if(s!=FLAC__FILE_DECODER_OK)
+ 			throw runtime_error(string(__func__)+" -- "+s.as_cstring());
++#else
++		FLAC__StreamDecoderInitStatus s=init(filename.c_str());
++		if(s!=FLAC__STREAM_DECODER_INIT_STATUS_OK)
++			throw runtime_error(string(__func__)+" -- FLAC__STREAM_DECODER_INIT_STATUS not OK");
++#endif
+ 	}
+ 
+ 	virtual ~MyFLACDecoderFile()
+@@ -170,7 +184,11 @@
+ 
+ 		// update status bar and detect user cancel
+ 		FLAC__uint64 filePosition;
++#ifdef LEGACY_FLAC
+ 		FLAC__file_decoder_get_decode_position(decoder_, &filePosition);
++#else
++		FLAC__stream_decoder_get_decode_position(decoder_, &filePosition);
++#endif
+ 		return statusBar.update(filePosition) ? FLAC__STREAM_DECODER_WRITE_STATUS_ABORT : FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
+ 	}
+ 
+@@ -215,7 +233,11 @@
+ bool CFLACSoundTranslator::onLoadSound(const string filename,CSound *sound) const
+ {
+ 	MyFLACDecoderFile f(filename,sound);
++#ifdef LEGACY_FLAC
+ 	return f.process_until_end_of_file();
++#else
++	return f.process_until_end_of_stream();
++#endif	
+ }
+ 
+ 
+@@ -258,7 +280,9 @@
+ 
+ 	MyFLACEncoderFile f(saveLength);
+ 
++#ifdef LEGACY_FLAC
+ 	f.set_filename(filename.c_str());
++#endif
+ 
+ 	f.set_channels(sound->getChannelCount());
+ 
+@@ -274,8 +298,13 @@
+ 	//f.set_metadata(...) // ??? to do to set cues and user notes, etc
+ 
+ 
++#ifdef LEGACY_FLAC
+ 	MyFLACEncoderFile::State s=f.init();
+ 	if(s==FLAC__STREAM_ENCODER_OK)
++#else
++	FLAC__StreamEncoderInitStatus s=f.init(filename.c_str());
++	if(s==FLAC__STREAM_ENCODER_INIT_STATUS_OK)
++#endif
+ 	{
+ 		#define BUFFER_SIZE 65536
+ 		TAutoBuffer<FLAC__int32> buffers[MAX_CHANNELS];
+@@ -328,7 +357,11 @@
+ 		return true;
+ 	}
+ 	else
++#ifdef LEGACY_FLAC
+ 		throw runtime_error(string(__func__)+" -- error creating FLAC encoder -- "+s.as_cstring());
++#else
++		throw runtime_error(string(__func__)+" -- error creating FLAC encoder -- ");
++#endif
+ 
+ }
+ 
diff --git a/media-sound/rezound/rezound-0.12.2_beta-r3.ebuild b/media-sound/rezound/rezound-0.12.2_beta-r3.ebuild
new file mode 100644
index 000000000000..80ac112a72cc
--- /dev/null
+++ b/media-sound/rezound/rezound-0.12.2_beta-r3.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rezound/rezound-0.12.2_beta-r3.ebuild,v 1.1 2006/12/04 19:10:23 aballier Exp $
+
+WANT_AUTOMAKE=1.9
+WANT_AUTOCONF=2.5
+
+inherit eutils autotools
+
+MY_P="${P/_/}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Sound editor and recorder"
+HOMEPAGE="http://rezound.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
+	mirror://gentoo/${P}-patches.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="16bittmp alsa flac jack nls oss portaudio soundtouch vorbis"
+
+RDEPEND="=sci-libs/fftw-2*
+	>=x11-libs/fox-1.2.4
+	>=media-libs/audiofile-0.2.3
+	>=media-libs/ladspa-sdk-1.12
+	>=media-libs/ladspa-cmt-1.15
+	alsa? ( >=media-libs/alsa-lib-1.0 )
+	flac? ( >=media-libs/flac-1.1.2 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	portaudio? ( >=media-libs/portaudio-18 )
+	soundtouch? ( >=media-libs/libsoundtouch-1.2.1 )
+	vorbis? ( media-libs/libvorbis media-libs/libogg )"
+
+# optional packages (don't need to be installed during emerge):
+#
+# >=media-sound/lame-3.92
+# app-cdr/cdrdao
+
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	EPATCH_SOURCE="${WORKDIR}" EPATCH_SUFFIX="patch"\
+	EPATCH_FORCE="yes" epatch
+
+	epatch "${FILESDIR}/${P}-foxinclude.patch"
+	epatch "${FILESDIR}/${P}-automagic.patch"
+	epatch "${FILESDIR}/${P}-flac-1.1.3.patch"
+	AT_M4DIR="config/m4" eautoreconf
+	elibtoolize
+}
+
+src_compile() {
+	# fix compilation errors on ppc, where some
+	# of the required functions aren't defined
+	use ppc && epatch ${FILESDIR}/undefined-functions.patch
+
+	# following features can't be disabled if already installed:
+	# -> flac, oggvorbis, soundtouch
+	local sampletype="--enable-internal-sample-type=float"
+	use 16bittmp && sampletype="--enable-internal-sample-type=int16"
+
+	econf \
+		$(use_enable alsa) \
+		$(use_enable jack) \
+		$(use_enable nls) \
+		$(use_enable oss) \
+		$(use_enable portaudio) \
+		$(use_enable flac) \
+		$(use_enable vorbis) \
+		$(use_enable soundtouch) \
+		${sampletype} \
+		--enable-ladspa \
+		--enable-largefile \
+		|| die "configure failed"
+
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	# remove wrong doc directory
+	rm -rf "${D}/usr/doc"
+
+	dodoc docs/{AUTHORS,NEWS,README*}
+	dodoc docs/{TODO_FOR_USERS_TO_READ,*.txt}
+	newdoc README README.rezound
+
+	docinto code
+	dodoc docs/code/*
+	newicon src/images/icon_logo_32.gif rezound.gif
+	make_desktop_entry rezound Rezound rezound.gif AudioVideo
+}