| [proaudio] [933] add fix for recent flac to rezound-9999 |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 933
Author: gimpel
Date: 2007-10-29 16:33:25 +0000 (Mon, 29 Oct 2007)
Log Message:
-----------
add fix for recent flac to rezound-9999
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/rezound/Manifest
trunk/overlays/proaudio/media-sound/rezound/rezound-9999.ebuild
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/rezound/files/rezound-flac-1.2.patch
Removed Paths:
-------------
trunk/overlays/proaudio/media-sound/rezound/files/digest-rezound-0.12.2_beta-r2
trunk/overlays/proaudio/media-sound/rezound/rezound-0.12.2_beta-r2.ebuild
Modified: trunk/overlays/proaudio/media-sound/rezound/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/rezound/Manifest 2007-10-25 21:51:46 UTC (rev 932)
+++ trunk/overlays/proaudio/media-sound/rezound/Manifest 2007-10-29 16:33:25 UTC (rev 933)
@@ -10,22 +10,18 @@
MD5 693d4e7221cf243630a154ba9b76066e files/rezound-0.12.2_beta-patches.tar.bz2 7479
RMD160 c23f4208d38c271cea04ecd4f4af852cd2e4eda4 files/rezound-0.12.2_beta-patches.tar.bz2 7479
SHA256 37ab114e34144be9fa198efd6de7610720a906a0d94d77a4e912982d72263392 files/rezound-0.12.2_beta-patches.tar.bz2 7479
+AUX rezound-flac-1.2.patch 2226 RMD160 51856ac59ca3c1ce5d1550cd5312da817ba5dbf3 SHA1 760b0c03a493bb52ccfce56cbde2e9cddda3d10f SHA256 2229ad3fcc4a1bacfcaad166b0605c315d18d793ebf0fecf5bd61b24fc7e6bc1
+MD5 aaaea6b0d5bfb741bc0c885ee28e6de5 files/rezound-flac-1.2.patch 2226
+RMD160 51856ac59ca3c1ce5d1550cd5312da817ba5dbf3 files/rezound-flac-1.2.patch 2226
+SHA256 2229ad3fcc4a1bacfcaad166b0605c315d18d793ebf0fecf5bd61b24fc7e6bc1 files/rezound-flac-1.2.patch 2226
AUX undefined-functions.patch 1084 RMD160 4a2086423af2571cfb863ca95ec500a0e627527f SHA1 64a0ba99259e4d6e2b51f71c350c08055eb9ced5 SHA256 3093932261d232f81ca3bccdbccc258e932e85525f1b2d277b4a7b58c752ab27
MD5 3bc1175bcfa6d88bbe86f84556db560c files/undefined-functions.patch 1084
RMD160 4a2086423af2571cfb863ca95ec500a0e627527f files/undefined-functions.patch 1084
SHA256 3093932261d232f81ca3bccdbccc258e932e85525f1b2d277b4a7b58c752ab27 files/undefined-functions.patch 1084
-DIST rezound-0.12.2beta.tar.gz 1729771 RMD160 d5779d2dee47f504c32c87864504bdd3e8eed2c7 SHA1 4d1d40a9248d6cf525c172937e3e31d23ffa3a9d SHA256 0e170622c52866e71069372a3d94c8c6eb4e4ce5a45abc8d2458b77aa59157cc
-EBUILD rezound-0.12.2_beta-r2.ebuild 2675 RMD160 3af10aad3d35adb96d84b7913ccc52406a6245bd SHA1 23f9e8251eae9dc58c395049bf95ac669907e7dd SHA256 d1b0a53d5703f0394d1469862cbc3ede2b451cb932cd7a2500ec1086b81ced1b
-MD5 be622095a8fc825560fedc80c54d8f64 rezound-0.12.2_beta-r2.ebuild 2675
-RMD160 3af10aad3d35adb96d84b7913ccc52406a6245bd rezound-0.12.2_beta-r2.ebuild 2675
-SHA256 d1b0a53d5703f0394d1469862cbc3ede2b451cb932cd7a2500ec1086b81ced1b rezound-0.12.2_beta-r2.ebuild 2675
-EBUILD rezound-9999.ebuild 3368 RMD160 269d683877d0b8cb309b0a7b93d44c7032938601 SHA1 f4d5617054457a05e6dc14deb79be4a0f0bc6cfa SHA256 c6b76846f87455013863552a075596af837ad82fdcfd88060fdbf7dd855e5952
-MD5 04a6d6641484d8ee0a1db4a06260a255 rezound-9999.ebuild 3368
-RMD160 269d683877d0b8cb309b0a7b93d44c7032938601 rezound-9999.ebuild 3368
-SHA256 c6b76846f87455013863552a075596af837ad82fdcfd88060fdbf7dd855e5952 rezound-9999.ebuild 3368
-MD5 95825448d3e160f168334a49fbc4dd4f files/digest-rezound-0.12.2_beta-r2 259
-RMD160 1d339fa5324dfb6ad2d60d151145c7ccf60f24c6 files/digest-rezound-0.12.2_beta-r2 259
-SHA256 39f3497353bedcfddeddc2deabfe017d6b2cda9066a790712515cede48b42e62 files/digest-rezound-0.12.2_beta-r2 259
+EBUILD rezound-9999.ebuild 2960 RMD160 0daf1bb95b3033a102a16ed42ba1e75fc0ee1205 SHA1 fdc26ea9208e0db84019d0cee0cfce16f52a10d3 SHA256 613451d7b4dbafe21cd7bef3117e5acbe09d9beceb7029afd17b43c59c05dd07
+MD5 95819396655b3980f04c89b66ff52b82 rezound-9999.ebuild 2960
+RMD160 0daf1bb95b3033a102a16ed42ba1e75fc0ee1205 rezound-9999.ebuild 2960
+SHA256 613451d7b4dbafe21cd7bef3117e5acbe09d9beceb7029afd17b43c59c05dd07 rezound-9999.ebuild 2960
MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-rezound-9999 0
RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-rezound-9999 0
SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-rezound-9999 0
Deleted: trunk/overlays/proaudio/media-sound/rezound/files/digest-rezound-0.12.2_beta-r2
===================================================================
--- trunk/overlays/proaudio/media-sound/rezound/files/digest-rezound-0.12.2_beta-r2 2007-10-25 21:51:46 UTC (rev 932)
+++ trunk/overlays/proaudio/media-sound/rezound/files/digest-rezound-0.12.2_beta-r2 2007-10-29 16:33:25 UTC (rev 933)
@@ -1,3 +0,0 @@
-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
Added: trunk/overlays/proaudio/media-sound/rezound/files/rezound-flac-1.2.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/rezound/files/rezound-flac-1.2.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/rezound/files/rezound-flac-1.2.patch 2007-10-29 16:33:25 UTC (rev 933)
@@ -0,0 +1,68 @@
+--- rezound-0.12.3beta/src/backend/CFLACSoundTranslator.cpp.ark 2007-08-09 12:41:25.000000000 +0200
++++ rezound-0.12.3beta/src/backend/CFLACSoundTranslator.cpp 2007-08-09 12:56:22.000000000 +0200
+@@ -75,15 +75,13 @@
+ for(unsigned t=0;t<MAX_CHANNELS;t++)
+ accessers[t]=NULL;
+
+- set_filename(filename.c_str());
+-
+ set_metadata_ignore_all();
+ //set_metadata_respond(FLAC__METADATA_TYPE_VORBIS_COMMENT);
+ //set_metadata_respond(FLAC__METADATA_TYPE_CUESHEET);
+
+- State s=init();
+- if(s!=FLAC__FILE_DECODER_OK)
+- throw runtime_error(string(__func__)+" -- "+s.as_cstring());
++ FLAC__StreamDecoderInitStatus s=init(filename.c_str());
++ if(s!=FLAC__STREAM_DECODER_INIT_STATUS_OK)
++ throw runtime_error(string(__func__)+" -- "+FLAC__StreamDecoderInitStatusString[s]);
+ }
+
+ virtual ~MyFLACDecoderFile()
+@@ -170,7 +168,7 @@
+
+ // update status bar and detect user cancel
+ FLAC__uint64 filePosition;
+- FLAC__file_decoder_get_decode_position(decoder_, &filePosition);
++ FLAC__stream_decoder_get_decode_position(decoder_, &filePosition);
+ return statusBar.update(filePosition) ? FLAC__STREAM_DECODER_WRITE_STATUS_ABORT : FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
+ }
+
+@@ -215,7 +213,7 @@
+ bool CFLACSoundTranslator::onLoadSound(const string filename,CSound *sound) const
+ {
+ MyFLACDecoderFile f(filename,sound);
+- return f.process_until_end_of_file();
++ return f.process_until_end_of_stream();
+ }
+
+
+@@ -258,8 +256,6 @@
+
+ MyFLACEncoderFile f(saveLength);
+
+- f.set_filename(filename.c_str());
+-
+ f.set_channels(sound->getChannelCount());
+
+ /* ??? needs to be a user choice */
+@@ -274,8 +270,8 @@
+ //f.set_metadata(...) // ??? to do to set cues and user notes, etc
+
+
+- MyFLACEncoderFile::State s=f.init();
+- if(s==FLAC__STREAM_ENCODER_OK)
++ FLAC__StreamEncoderInitStatus s=f.init(filename.c_str());
++ if(s==FLAC__STREAM_ENCODER_INIT_STATUS_OK)
+ {
+ #define BUFFER_SIZE 65536
+ TAutoBuffer<FLAC__int32> buffers[MAX_CHANNELS];
+@@ -328,7 +324,7 @@
+ return true;
+ }
+ else
+- throw runtime_error(string(__func__)+" -- error creating FLAC encoder -- "+s.as_cstring());
++ throw runtime_error(string(__func__)+" -- error creating FLAC encoder -- "+FLAC__StreamEncoderInitStatusString[s]);
+
+ }
+
Deleted: trunk/overlays/proaudio/media-sound/rezound/rezound-0.12.2_beta-r2.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/rezound/rezound-0.12.2_beta-r2.ebuild 2007-10-25 21:51:46 UTC (rev 932)
+++ trunk/overlays/proaudio/media-sound/rezound/rezound-0.12.2_beta-r2.ebuild 2007-10-29 16:33:25 UTC (rev 933)
@@ -1,100 +0,0 @@
-# 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-r1.ebuild,v 1.2 2006/04/09 13:28:12 tcort Exp $
-
-WANT_AUTOMAKE=1.9
-WANT_AUTOCONF=2.5
-
-inherit eutils autotools unpacker
-
-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"
-
-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.6.14
- >=dev-util/reswrap-3.2.0
- >=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.0 )
- jack? ( media-sound/jack-audio-connection-kit )
- portaudio? ( >=media-libs/portaudio-18 )
- soundtouch? ( >=media-libs/libsoundtouch-1.3.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/autoconf
- sys-devel/automake
- sys-devel/bison
- sys-devel/flex"
-
-src_unpack() {
- unpack ${A}
- unpacker "${FILESDIR}/${P}-patches.tar.bz2"
- cd "${S}"
- EPATCH_SOURCE="${WORKDIR}" EPATCH_SUFFIX="patch"\
- EPATCH_FORCE="yes" epatch
-
- epatch "${FILESDIR}/${P}-foxinclude.patch"
- AT_M4DIR="config/m4" eautoreconf
- elibtoolize
-}
-
-src_compile() {
- # fix compilation errors on ppc, where some
- # of the required functions aren't defined
- test "${ARCH}" = ppc && epatch ${FILESDIR}/undefined-functions.patch
-
- # following features can't be disabled if already installed:
- # -> flac, oggvorbis, soundtouch <-- why not? I've added missing flags
- 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_with flac libFLAC) \
- $(use_enable soundtouch soundtouch-check) \
- $(use_with ogg ) \
- $(use_with vorbis ) \
- ${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
-}
Modified: trunk/overlays/proaudio/media-sound/rezound/rezound-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/rezound/rezound-9999.ebuild 2007-10-25 21:51:46 UTC (rev 932)
+++ trunk/overlays/proaudio/media-sound/rezound/rezound-9999.ebuild 2007-10-29 16:33:25 UTC (rev 933)
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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-r1.ebuild,v 1.2 2006/04/09 13:28:12 tcort Exp $
+# $Header: $
inherit eutils autotools cvs unpacker
@@ -52,21 +52,11 @@
EPATCH_SOURCE="${WORKDIR}" EPATCH_SUFFIX="patch"\
EPATCH_FORCE="yes" epatch
- #epatch "${FILESDIR}/rezound-0.12.2_beta-foxinclude.patch"
- #AT_M4DIR="config/m4" eautoreconf
- #elibtoolize
+ # fix for >=flac-1.2
+ has_version ">media-libs/flac-1.1.4" && epatch ${FILESDIR}/${PN}-flac-1.2.patch
+
./bootstrap
-# cd ${S}
-# epatch "${FILESDIR}"/rezound-0.12.2_beta-fox.1.6.patch
-# epatch "${FILESDIR}"/rezound-0.12.2_beta-gcc41.patch
- #epatch "${FILESDIR}"/rezound-0.12.2_beta-defaults.patch
- #eautoreconf
-# libtoolize --copy --force
-# aclocal -I config/m4
-# autoheader
-# automake -a --foreign
-# autoconf
# add missing Makefile.in.in to po/
[ ! -e po/Makefile.in.in ] && gzip -cdf "${FILESDIR}"/Makefile.in.in.gz > po/Makefile.in.in
}