From: Alexis Ballier Date: Sun, 10 Dec 2006 15:58:24 +0000 (+0000) Subject: Patch from Josh Coalson to be compatible with flac 1.1.3 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6999a2878952b38ee3fcfec18c5e9c79d78c5e31;p=gentoo.git Patch from Josh Coalson to be compatible with flac 1.1.3 Package-Manager: portage-2.1.2_rc3-r1 --- diff --git a/media-sound/qmbtagger/ChangeLog b/media-sound/qmbtagger/ChangeLog index 3ba939235cfd..ec572b5456c8 100644 --- a/media-sound/qmbtagger/ChangeLog +++ b/media-sound/qmbtagger/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/qmbtagger # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/qmbtagger/ChangeLog,v 1.17 2006/10/28 00:57:36 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/qmbtagger/ChangeLog,v 1.18 2006/12/10 15:58:24 aballier Exp $ + + 10 Dec 2006; Alexis Ballier + +files/qmbtagger-0.07+flac-1.1.3.patch, qmbtagger-0.07.ebuild: + Patch from Josh Coalson to be compatible with flac 1.1.3 28 Oct 2006; Diego Pettenò qmbtagger-0.07.ebuild: Update admindir with a 3.5.5 version to fix autotools dependencies. Thanks diff --git a/media-sound/qmbtagger/Manifest b/media-sound/qmbtagger/Manifest index 2b371c22d1b1..57ecd845d81f 100644 --- a/media-sound/qmbtagger/Manifest +++ b/media-sound/qmbtagger/Manifest @@ -1,20 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX qmbtagger-0.07+flac-1.1.3.patch 3453 RMD160 59bcd16dddfd0644ad8709bf7da91271567790ce SHA1 7fd6b5025a83d0bde360a455d290a1b596b2a9da SHA256 d81871d5eed471e76678c389a006c1ab3f11ac130a31cc50a657deb79e930711 +MD5 62c06e1d0552aae26ebab727a9ab5cfd files/qmbtagger-0.07+flac-1.1.3.patch 3453 +RMD160 59bcd16dddfd0644ad8709bf7da91271567790ce files/qmbtagger-0.07+flac-1.1.3.patch 3453 +SHA256 d81871d5eed471e76678c389a006c1ab3f11ac130a31cc50a657deb79e930711 files/qmbtagger-0.07+flac-1.1.3.patch 3453 AUX qmbtagger-0.07-errno.patch 841 RMD160 6ff9f0c65bd499ccc724d47e8930e9bef402292d SHA1 56805bf2313374cd6a27c16d6bced80b2ff7d115 SHA256 03c4d062f7a9fd4a4bfe720966ec0546890323e795f1cfbdcb3f80537db8cf28 MD5 8201bc5ae9dc0b533146e1669029612b files/qmbtagger-0.07-errno.patch 841 RMD160 6ff9f0c65bd499ccc724d47e8930e9bef402292d files/qmbtagger-0.07-errno.patch 841 SHA256 03c4d062f7a9fd4a4bfe720966ec0546890323e795f1cfbdcb3f80537db8cf28 files/qmbtagger-0.07-errno.patch 841 DIST kde-admindir-3.5.5.tar.bz2 187274 RMD160 24528f3bf94e7d1a1036b6e5af180719785839ed SHA1 b640d2606305201b0ec030555c324d326440efff SHA256 1aa56856e432839ec74a67ab33fc21b56ed4f1b4b5c60bfd5b953cb2d3423153 DIST qmbtagger-0.07.tar.bz2 432072 RMD160 0daf2e4cd83db7009c98b7430fa28970ac98fc0d SHA1 2aa36db0d93be96df2ae839ff586c60c43422901 SHA256 cdaeb4799fc18b7b7d824f887545a3fff29d68ecb2fc983e0699d72eca633f60 -EBUILD qmbtagger-0.07.ebuild 1208 RMD160 9c4b07fa62d87d722c81c4ebdb40069431a9abb1 SHA1 d2ef4b78a034a038b2a337b8beee60e90aa68621 SHA256 78f498763a003df8501b4eab2acd8c7a8455a07d7497c32ca22dcdfdaeadd96b -MD5 b9f643d8b40782536390d87a98ad70cf qmbtagger-0.07.ebuild 1208 -RMD160 9c4b07fa62d87d722c81c4ebdb40069431a9abb1 qmbtagger-0.07.ebuild 1208 -SHA256 78f498763a003df8501b4eab2acd8c7a8455a07d7497c32ca22dcdfdaeadd96b qmbtagger-0.07.ebuild 1208 -MISC ChangeLog 2534 RMD160 db3c4716214c10967e322483aa09eec8a2807e37 SHA1 ddacc9847625ee8bd20b04b2ee5143bef9db77aa SHA256 a4f2915b71140bab21d0ee6fca21e86b0cb6da24119c0d28d1a6a21081e81b29 -MD5 17f6de5b85c067bc8322bd4e5e319515 ChangeLog 2534 -RMD160 db3c4716214c10967e322483aa09eec8a2807e37 ChangeLog 2534 -SHA256 a4f2915b71140bab21d0ee6fca21e86b0cb6da24119c0d28d1a6a21081e81b29 ChangeLog 2534 +EBUILD qmbtagger-0.07.ebuild 1244 RMD160 7880fbf332e7141dc22ecfb764ddf81f4b6f8607 SHA1 581876a8deeb1c0512423734f55826cb48d6bf1b SHA256 71e4843aae7a65aa95c8d9acda12caa04685fbb59b04d82ce40fec06eb3036a1 +MD5 0fbf110f5b545f650a178dd01f81e361 qmbtagger-0.07.ebuild 1244 +RMD160 7880fbf332e7141dc22ecfb764ddf81f4b6f8607 qmbtagger-0.07.ebuild 1244 +SHA256 71e4843aae7a65aa95c8d9acda12caa04685fbb59b04d82ce40fec06eb3036a1 qmbtagger-0.07.ebuild 1244 +MISC ChangeLog 2710 RMD160 5aacdce331f9c42c228b885f51b95ebdd4160ac7 SHA1 9a94c0ae8825289e2bb982aeed1331da17fba71a SHA256 f54d87dd735b0f4ec9f2ed70452fd2e1a78c9ac25a677bf9bb37bc3fb3ad27c9 +MD5 84b5ca1a85d469da6546073e5de0504d ChangeLog 2710 +RMD160 5aacdce331f9c42c228b885f51b95ebdd4160ac7 ChangeLog 2710 +SHA256 f54d87dd735b0f4ec9f2ed70452fd2e1a78c9ac25a677bf9bb37bc3fb3ad27c9 ChangeLog 2710 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158 @@ -23,9 +27,9 @@ MD5 f7f7fa4095954ddfba486db3f6ae9e45 files/digest-qmbtagger-0.07 506 RMD160 8ffd18bda249620ec25c32604972f2666bf750bc files/digest-qmbtagger-0.07 506 SHA256 2e332a0fe5350f01107435610144c52647c3c32fd73b263cad7bbdcc866057bb files/digest-qmbtagger-0.07 506 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) +Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFFQqsHAiZjviIA2XgRAh6YAJ94c7Tf97Wk5hDtR1tbDoC4g+WdnQCfZSQ6 -3gNzy1JJGXIWojRd9AOQB4g= -=dEOc +iD8DBQFFfC6hvFcC4BYPU0oRArxiAJ9QZXJh3z/w3af/9Ne4W5kkMIvIogCfbFll +8+bkkJW7Th4Km89PvhuI7Ik= +=l/zo -----END PGP SIGNATURE----- diff --git a/media-sound/qmbtagger/files/qmbtagger-0.07+flac-1.1.3.patch b/media-sound/qmbtagger/files/qmbtagger-0.07+flac-1.1.3.patch new file mode 100644 index 000000000000..da92864f8cb9 --- /dev/null +++ b/media-sound/qmbtagger/files/qmbtagger-0.07+flac-1.1.3.patch @@ -0,0 +1,98 @@ +diff -ru qmbtagger-0.07/configure.in qmbtagger-0.07-b2/configure.in +--- qmbtagger-0.07/configure.in 2004-06-15 16:50:14.000000000 -0700 ++++ qmbtagger-0.07-b2/configure.in 2004-06-15 16:50:14.000000000 -0700 +@@ -140,7 +140,7 @@ + AC_MSG_RESULT($have_lib) + if test $have_lib = yes; then + AC_DEFINE(USE_FLAC, 1, [FLAC support on]) +- BLIBS="$BLIBS -lFLAC++ -lFLAC" ++ BLIBS="$BLIBS -lFLAC++ -lFLAC -logg" + use_FLAC=1 + fi + ]) +diff -ru qmbtagger-0.07/configure.in.in qmbtagger-0.07-b2/configure.in.in +--- qmbtagger-0.07/configure.in.in 2004-06-15 16:50:14.000000000 -0700 ++++ qmbtagger-0.07-b2/configure.in.in 2004-06-15 16:50:14.000000000 -0700 +@@ -136,7 +136,7 @@ + AC_MSG_RESULT($have_lib) + if test $have_lib = yes; then + AC_DEFINE(USE_FLAC, 1, [FLAC support on]) +- BLIBS="$BLIBS -lFLAC++ -lFLAC" ++ BLIBS="$BLIBS -lFLAC++ -lFLAC -logg" + use_FLAC=1 + fi + ]) +diff -ru qmbtagger-0.07/src/qmbflacfile.cpp qmbtagger-0.07-b2/src/qmbflacfile.cpp +--- qmbtagger-0.07/src/qmbflacfile.cpp 2004-05-01 13:18:00.000000000 -0700 ++++ qmbtagger-0.07-b2/src/qmbflacfile.cpp 2006-10-31 23:12:28.000000000 -0800 +@@ -23,6 +23,7 @@ + + #include "qmbflacfile.h" + #include "qmbfile.h" ++#include + #include + #include + #include +@@ -30,6 +31,13 @@ + #include + #include + ++/* by LEGACY_FLAC we mean before FLAC 1.1.3 when the APIs were simplified. */ ++#if !defined(FLACPP_API_VERSION_CURRENT) || FLACPP_API_VERSION_CURRENT < 6 ++#define LEGACY_FLAC ++#else ++#undef LEGACY_FLAC ++#endif ++ + QMBFLACFile::QMBFLACFile() + : QMBFile(), FLAC::Decoder::File(), offset(0), decode_error(false) + { +@@ -66,13 +74,16 @@ + int lastslash = filename.findRev('/'); + metadata.SetFileName(filename.right(filename.length() - lastslash - 1)); + ++#ifdef LEGACY_FLAC + //set the filename with the FLAC::Decoder::File class + set_filename(fullfilename.latin1()); ++#endif + + //tell the decoder to call the metadata callback on vorbis comments so we can get the metadata already stored in the file + set_metadata_respond(FLAC__METADATA_TYPE_VORBIS_COMMENT); + + //Start reading the FLAC file ++#ifdef LEGACY_FLAC + FLAC__FileDecoderState state = init(); + + if (state != FLAC__FILE_DECODER_OK) { +@@ -80,11 +91,19 @@ + finish(); + return -1; + } ++#else ++ FLAC__StreamDecoderInitStatus status = init(fullfilename.latin1()); ++ ++ if (status != FLAC__STREAM_DECODER_INIT_STATUS_OK) { ++ qWarning("QMBFLACFile::Extract(): error opening file: %i (%s).", status, FLAC__StreamDecoderInitStatusString[status]); ++ finish(); ++ return -1; ++ } ++#endif + + //read through all the metadata so our callback can catch it all + if(!process_until_end_of_metadata ()) { +- state = get_state(); +- qWarning("QMBFLACFile::Extract(): error getting metadata: %i (%s).", state, FLAC__FileDecoderStateString[state]); ++ qWarning("QMBFLACFile::Extract(): error getting metadata: (%s).", get_state().as_cstring()); + decode_error = true; + finish(); + return -2; +@@ -116,8 +135,7 @@ + //now lets get the data from the FLAC file + while (!decode_error && offset < (unsigned long) bufferlen) { + if (!process_single()) { +- state = get_state(); +- qWarning("QMBFLACFile::Extract(): error getting raw data: %i (%s).", state, FLAC__FileDecoderStateString[state]); ++ qWarning("QMBFLACFile::Extract(): error getting raw data: (%s).", get_state().as_cstring()); + decode_error = true; + finish(); + return -2; diff --git a/media-sound/qmbtagger/qmbtagger-0.07.ebuild b/media-sound/qmbtagger/qmbtagger-0.07.ebuild index ecec249d8b93..ada22bff3513 100644 --- a/media-sound/qmbtagger/qmbtagger-0.07.ebuild +++ b/media-sound/qmbtagger/qmbtagger-0.07.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/qmbtagger/qmbtagger-0.07.ebuild,v 1.10 2006/10/28 00:57:35 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/qmbtagger/qmbtagger-0.07.ebuild,v 1.11 2006/12/10 15:58:24 aballier Exp $ inherit eutils kde-functions @@ -15,7 +15,7 @@ KEYWORDS="amd64 ~ppc x86" IUSE="ogg debug" RDEPEND="=x11-libs/qt-3* - ~media-libs/flac-1.1.2 + media-libs/flac media-libs/id3lib media-libs/musicbrainz media-libs/libmad @@ -29,6 +29,7 @@ src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}/${P}-errno.patch" + epatch "${FILESDIR}/${P}+flac-1.1.3.patch" rm -rf "${S}/admin" ln -s "${WORKDIR}/admin" "${S}/admin"