diff options
author | Alexis Ballier <aballier@gentoo.org> | 2006-11-18 11:37:15 +0000 |
---|---|---|
committer | Alexis Ballier <aballier@gentoo.org> | 2006-11-18 11:37:15 +0000 |
commit | 11f38d3b30f9227d7d89183d036a5c9a7da7fb64 (patch) | |
tree | 8e569a87dd77dea435174795c127b79a6a0e2a51 /media-sound/flac123 | |
parent | remove old (diff) | |
download | historical-11f38d3b30f9227d7d89183d036a5c9a7da7fb64.tar.gz historical-11f38d3b30f9227d7d89183d036a5c9a7da7fb64.tar.bz2 historical-11f38d3b30f9227d7d89183d036a5c9a7da7fb64.zip |
Add patch from Josh Coalson to be able to build with flac 1.1.3, and an asneeded fix
Package-Manager: portage-2.1.2_rc2
Diffstat (limited to 'media-sound/flac123')
-rw-r--r-- | media-sound/flac123/ChangeLog | 8 | ||||
-rw-r--r-- | media-sound/flac123/Manifest | 46 | ||||
-rw-r--r-- | media-sound/flac123/files/digest-flac123-0.0.7 | 2 | ||||
-rw-r--r-- | media-sound/flac123/files/digest-flac123-0.0.8 | 2 | ||||
-rw-r--r-- | media-sound/flac123/files/flac123-0.0.9+flac-1.1.3.patch | 255 | ||||
-rw-r--r-- | media-sound/flac123/files/flac123-0.0.9-asneeded.patch | 11 | ||||
-rw-r--r-- | media-sound/flac123/flac123-0.0.9.ebuild | 17 |
7 files changed, 319 insertions, 22 deletions
diff --git a/media-sound/flac123/ChangeLog b/media-sound/flac123/ChangeLog index 832db6c738e7..cccfb75cdda1 100644 --- a/media-sound/flac123/ChangeLog +++ b/media-sound/flac123/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-sound/flac123 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/flac123/ChangeLog,v 1.11 2006/10/19 20:26:28 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/flac123/ChangeLog,v 1.12 2006/11/18 11:37:15 aballier Exp $ + + 18 Nov 2006; Alexis Ballier <aballier@gentoo.org> + +files/flac123-0.0.9+flac-1.1.3.patch, + +files/flac123-0.0.9-asneeded.patch, flac123-0.0.9.ebuild: + Add patch from Josh Coalson to be able to build with flac 1.1.3, and an + asneeded fix 19 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> flac123-0.0.7.ebuild, flac123-0.0.8.ebuild, flac123-0.0.9.ebuild: diff --git a/media-sound/flac123/Manifest b/media-sound/flac123/Manifest index 24b49bc1870e..0f76d03d3c7a 100644 --- a/media-sound/flac123/Manifest +++ b/media-sound/flac123/Manifest @@ -1,8 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -DIST flac123-0.0.7.tar.gz 69852 -DIST flac123-0.0.8.tar.gz 69156 +AUX flac123-0.0.9+flac-1.1.3.patch 8333 RMD160 6f5f4a399967bdd532aa875a5bbc41ad891b2012 SHA1 42b598b2305105cb860370ecda64ab0b4ba9583b SHA256 16fd53f4234a7a6f0755c5a289c319cf6d38220e29420bf332a6d17f3c18b1c0 +MD5 86ff81e020932890e2fa92f2f679fcab files/flac123-0.0.9+flac-1.1.3.patch 8333 +RMD160 6f5f4a399967bdd532aa875a5bbc41ad891b2012 files/flac123-0.0.9+flac-1.1.3.patch 8333 +SHA256 16fd53f4234a7a6f0755c5a289c319cf6d38220e29420bf332a6d17f3c18b1c0 files/flac123-0.0.9+flac-1.1.3.patch 8333 +AUX flac123-0.0.9-asneeded.patch 334 RMD160 0d57e7e6ed583da3b1a9eabc3c4a7bb7c0ebd958 SHA1 8c26ec3b1f3626b7adf2056f992c8c70f1038add SHA256 858d81cd70d3767cd126ad41838a6c74b697c92f948d6683e6c9521586da3923 +MD5 d8b59495fec258977c30bfaf5e71f69d files/flac123-0.0.9-asneeded.patch 334 +RMD160 0d57e7e6ed583da3b1a9eabc3c4a7bb7c0ebd958 files/flac123-0.0.9-asneeded.patch 334 +SHA256 858d81cd70d3767cd126ad41838a6c74b697c92f948d6683e6c9521586da3923 files/flac123-0.0.9-asneeded.patch 334 +DIST flac123-0.0.7.tar.gz 69852 RMD160 b3847d5cdfae5f49df6058ad7a9e7400c462e1e4 SHA1 952755255326ba3e38a756c8d08f22dbdc204543 SHA256 2db5d6e2cba28bab1d9319f678368076977650fe8a7570286ae7fe038b8fe4e2 +DIST flac123-0.0.8.tar.gz 69156 RMD160 d62c99d032f097183b7077d2a83f632f39ea0fa2 SHA1 95a00b09bd901f58a3b95c6e11f2bd4374d0b171 SHA256 352f1602bfe65e73a3b9f656b8b20f6aad7decf2e115683a5fb84f915b5a192f DIST flac123-0.0.9.tar.gz 69647 RMD160 f84a0373f86322d419487492858fb0973e3accfb SHA1 54784aeda6c016759007e02e51076c0ea0b937ed SHA256 9aa3f6e9a3e809a8414158b0234e0a4a26ed39a4a8e02b790d5bf78cc9310ddf EBUILD flac123-0.0.7.ebuild 623 RMD160 542e86ea2fbc7c277218223c63823968f366c1e9 SHA1 c005f0665c77bbb872dc641a06f0a707434ffecf SHA256 1612e78147bf1ee861e20320334d8e615caf916803f9769bc1bb1ff15db70bab MD5 2fc7df6194ed3d17e8344ceb3b9081a3 flac123-0.0.7.ebuild 623 @@ -12,31 +20,31 @@ EBUILD flac123-0.0.8.ebuild 649 RMD160 5f33faf241dc07db7cd95b48d92f140d1484cddc MD5 88baef052390a1fbe9fe02c5f84ed9e2 flac123-0.0.8.ebuild 649 RMD160 5f33faf241dc07db7cd95b48d92f140d1484cddc flac123-0.0.8.ebuild 649 SHA256 6473ee6646713e3fbaf55382e72832a9fb3f083900761c27699f761d31aa1d73 flac123-0.0.8.ebuild 649 -EBUILD flac123-0.0.9.ebuild 632 RMD160 ac294ede617f1dcba917476e0c0c3a8bd528be7c SHA1 d39a820934c5e1905c615459f4c07c9eb23d30de SHA256 507551e88806540e639ea67fde05eaca23d51f3abfcc9598d1ccb15a3e239586 -MD5 af5174950e4c7102efbd9173be0a53da flac123-0.0.9.ebuild 632 -RMD160 ac294ede617f1dcba917476e0c0c3a8bd528be7c flac123-0.0.9.ebuild 632 -SHA256 507551e88806540e639ea67fde05eaca23d51f3abfcc9598d1ccb15a3e239586 flac123-0.0.9.ebuild 632 -MISC ChangeLog 1530 RMD160 0a50530fd0e62bbb60f2b56f0e6ee1cdb1a24895 SHA1 d9491cdc44dbef587304f5f4bec71197953817b5 SHA256 b033951d7d7868e03cdb3afe001503f4d10cbdecb8a349bcfccefadf75f9e45d -MD5 f974d21257a50971c7e6516ac966cb1a ChangeLog 1530 -RMD160 0a50530fd0e62bbb60f2b56f0e6ee1cdb1a24895 ChangeLog 1530 -SHA256 b033951d7d7868e03cdb3afe001503f4d10cbdecb8a349bcfccefadf75f9e45d ChangeLog 1530 +EBUILD flac123-0.0.9.ebuild 828 RMD160 56fc4ac249eacc4818a5ac986dc0bcd975787a57 SHA1 06c0bec3c0d64577e2c7e6bb60f0963a7f3d9a36 SHA256 17d59290b28a192cbc9855202c66a408d92bff53460390ee7c951cad2cb1c2b5 +MD5 03b894a8d3baf4920c904c24f5b4118e flac123-0.0.9.ebuild 828 +RMD160 56fc4ac249eacc4818a5ac986dc0bcd975787a57 flac123-0.0.9.ebuild 828 +SHA256 17d59290b28a192cbc9855202c66a408d92bff53460390ee7c951cad2cb1c2b5 flac123-0.0.9.ebuild 828 +MISC ChangeLog 1773 RMD160 1b3018653fe16cede671c1c97ff02c2a34945971 SHA1 39d984c958d8f0e2817b241c9784d85445b6688a SHA256 7dba4c1d41e03bd22de1c34a6b72aa38749cf78adab79108f4a1c793780759a5 +MD5 294dd1aeeb675692087197a55f9ae4fd ChangeLog 1773 +RMD160 1b3018653fe16cede671c1c97ff02c2a34945971 ChangeLog 1773 +SHA256 7dba4c1d41e03bd22de1c34a6b72aa38749cf78adab79108f4a1c793780759a5 ChangeLog 1773 MISC metadata.xml 257 RMD160 0a71720c5427c461b6e255cea5504d1cde852ca8 SHA1 c217bc30a376f7d42973f93aad3d3b51d778b1b2 SHA256 60bc3ecc572a56ec27a12ce5cb394f97b19bd6dbc75d429ed25983ab46799ca3 MD5 5a8290e44006ccff0dff3094555d6366 metadata.xml 257 RMD160 0a71720c5427c461b6e255cea5504d1cde852ca8 metadata.xml 257 SHA256 60bc3ecc572a56ec27a12ce5cb394f97b19bd6dbc75d429ed25983ab46799ca3 metadata.xml 257 -MD5 708afe0f2fd79d27b976776a01a1d07f files/digest-flac123-0.0.7 64 -RMD160 b26dd7a9162ebe4c0b8b9af38340123464da9f73 files/digest-flac123-0.0.7 64 -SHA256 909662574b3ff61763e2ae4a7b881072218b60771584ab486f6aaf2a9357af9c files/digest-flac123-0.0.7 64 -MD5 616f4d5d8ec1aaafd68c0fb6d90a53d1 files/digest-flac123-0.0.8 64 -RMD160 6083f4bfac3c58cf8638d2f88bccfc6571ff8488 files/digest-flac123-0.0.8 64 -SHA256 b788ead1f4c177fae4bd434fcdd2af31d22a9dd6f85a8bb1ae2e92b7ea828292 files/digest-flac123-0.0.8 64 +MD5 8088ff4604a968cc9273832228cdcd63 files/digest-flac123-0.0.7 238 +RMD160 76cf31c4590764dab888e1e8605d20a9b25994f1 files/digest-flac123-0.0.7 238 +SHA256 48291b698305f8e9d4b4c635696324011efade09d47e1339dcffa4a76242ba37 files/digest-flac123-0.0.7 238 +MD5 104bf2ecb2f8e6e2ee5f9ec880bcc9d3 files/digest-flac123-0.0.8 238 +RMD160 229123812ef123ecfe8564bc1c9bcef6ca3fa66b files/digest-flac123-0.0.8 238 +SHA256 020e25ed9a23f3d980e05f2d712f7051841e36cc698e95e279ba8f6602d4e655 files/digest-flac123-0.0.8 238 MD5 dadd20536367fd0e972d3a9f9333c776 files/digest-flac123-0.0.9 238 RMD160 8a6e77fee4e461e4d96daeaadaa61e987ed58827 files/digest-flac123-0.0.9 238 SHA256 a54b4b3844fa218fd039740bfe27a45d63e75fd15d16fe917c736703f8c13392 files/digest-flac123-0.0.9 238 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFN999AiZjviIA2XgRAnPnAJwLiibV0tkoWMktgDRY3DaTeEgxKwCeKnya -FCADc5UM9gkRtrUSd8VUfKs= -=g+I+ +iD8DBQFFXu/xvFcC4BYPU0oRAmuNAKDGS0zSU0ph4PLNCIwHwTNS/1NYwgCeLhEq +6+xD/AGgmuVIl9LvIrTpqLc= +=T09x -----END PGP SIGNATURE----- diff --git a/media-sound/flac123/files/digest-flac123-0.0.7 b/media-sound/flac123/files/digest-flac123-0.0.7 index 247373ab5414..3d5a9c473255 100644 --- a/media-sound/flac123/files/digest-flac123-0.0.7 +++ b/media-sound/flac123/files/digest-flac123-0.0.7 @@ -1 +1,3 @@ MD5 0003aefd73f2bff4824e4b76a5b5331f flac123-0.0.7.tar.gz 69852 +RMD160 b3847d5cdfae5f49df6058ad7a9e7400c462e1e4 flac123-0.0.7.tar.gz 69852 +SHA256 2db5d6e2cba28bab1d9319f678368076977650fe8a7570286ae7fe038b8fe4e2 flac123-0.0.7.tar.gz 69852 diff --git a/media-sound/flac123/files/digest-flac123-0.0.8 b/media-sound/flac123/files/digest-flac123-0.0.8 index 440931409486..6162fdcdd81c 100644 --- a/media-sound/flac123/files/digest-flac123-0.0.8 +++ b/media-sound/flac123/files/digest-flac123-0.0.8 @@ -1 +1,3 @@ MD5 ccec5b21452334778b888ae68d322ba1 flac123-0.0.8.tar.gz 69156 +RMD160 d62c99d032f097183b7077d2a83f632f39ea0fa2 flac123-0.0.8.tar.gz 69156 +SHA256 352f1602bfe65e73a3b9f656b8b20f6aad7decf2e115683a5fb84f915b5a192f flac123-0.0.8.tar.gz 69156 diff --git a/media-sound/flac123/files/flac123-0.0.9+flac-1.1.3.patch b/media-sound/flac123/files/flac123-0.0.9+flac-1.1.3.patch new file mode 100644 index 000000000000..91a22e555a88 --- /dev/null +++ b/media-sound/flac123/files/flac123-0.0.9+flac-1.1.3.patch @@ -0,0 +1,255 @@ +diff -ru flac123-0.0.9/configure.ac flac123-0.0.9-b2/configure.ac +--- flac123-0.0.9/configure.ac 2005-05-07 16:05:24.000000000 -0700 ++++ flac123-0.0.9-b2/configure.ac 2006-10-31 00:03:09.000000000 -0800 +@@ -40,9 +40,9 @@ + AC_PROG_CC + + # Checks for libraries. +-AC_CHECK_LIB(FLAC, FLAC__file_decoder_new, [haveflac=yes], [haveflac=no], -lm) ++AC_CHECK_LIB(FLAC, FLAC__stream_decoder_new, [haveflac=yes], [haveflac=no], -lm) + if test "$haveflac" = "yes"; then +- FLAC_LIBS="-lFLAC -lm" ++ FLAC_LIBS="-lFLAC -logg -lm" + AC_SUBST(FLAC_LIBS) + else + AC_MSG_ERROR(FLAC required!) +diff -ru flac123-0.0.9/flac123.c flac123-0.0.9-b2/flac123.c +--- flac123-0.0.9/flac123.c 2005-05-08 21:25:20.000000000 -0700 ++++ flac123-0.0.9-b2/flac123.c 2006-10-31 00:06:06.000000000 -0800 +@@ -49,12 +49,17 @@ + + static void play_file(const char *); + static void play_remote_file(void); +-void flac_error_hdl(const FLAC__FileDecoder *, FLAC__StreamDecoderErrorStatus, +- void *); +-void flac_metadata_hdl(const FLAC__FileDecoder *, const FLAC__StreamMetadata *, +- void *); ++#ifdef LEGACY_FLAC ++void flac_error_hdl(const FLAC__FileDecoder *, FLAC__StreamDecoderErrorStatus, void *); ++void flac_metadata_hdl(const FLAC__FileDecoder *, const FLAC__StreamMetadata *, void *); + FLAC__StreamDecoderWriteStatus flac_write_hdl(const FLAC__FileDecoder *, + const FLAC__Frame *, const FLAC__int32 * const buf[], void *); ++#else ++void flac_error_hdl(const FLAC__StreamDecoder *, FLAC__StreamDecoderErrorStatus, void *); ++void flac_metadata_hdl(const FLAC__StreamDecoder *, const FLAC__StreamMetadata *, void *); ++FLAC__StreamDecoderWriteStatus flac_write_hdl(const FLAC__StreamDecoder *, ++ const FLAC__Frame *, const FLAC__int32 * const buf[], void *); ++#endif + + static void signal_handler(int); + static int quit_now = 0; +@@ -190,6 +195,7 @@ + file_info.year[VORBIS_YEAR_LEN] = '\0'; + + /* create and initialize flac decoder object */ ++#ifdef LEGACY_FLAC + file_info.decoder = FLAC__file_decoder_new(); + FLAC__file_decoder_set_md5_checking(file_info.decoder, true); + FLAC__file_decoder_set_filename(file_info.decoder, filename); +@@ -210,13 +216,29 @@ + FLAC__file_decoder_delete(file_info.decoder); + return false; + } ++#else ++ file_info.decoder = FLAC__stream_decoder_new(); ++ FLAC__stream_decoder_set_md5_checking(file_info.decoder, true); ++ ++ /* read metadata */ ++ if ((FLAC__stream_decoder_init_file(file_info.decoder, filename, flac_write_hdl, flac_metadata_hdl, flac_error_hdl, (void *)&file_info) != FLAC__STREAM_DECODER_INIT_STATUS_OK) ++ || (!FLAC__stream_decoder_process_until_end_of_metadata(file_info.decoder))) ++ { ++ FLAC__stream_decoder_delete(file_info.decoder); ++ return false; ++ } ++#endif + + /* open libao output device */ + if (cli_args.wavfile) { + if (!(file_info.ao_dev = ao_open_file(ao_driver_id("wav"), cli_args.wavfile, /*overwrite*/ 1, &(file_info.ao_fmt), NULL))) + { + fprintf(stderr, "Error opening wav file %s\n", cli_args.wavfile); ++#ifdef LEGACY_FLAC + FLAC__file_decoder_delete(file_info.decoder); ++#else ++ FLAC__stream_decoder_delete(file_info.decoder); ++#endif + return false; + } + } +@@ -224,7 +246,11 @@ + if (!(file_info.ao_dev = ao_open_live(ao_output_id, &(file_info.ao_fmt), NULL))) + { + fprintf(stderr, "Error opening ao device %d\n", ao_output_id); ++#ifdef LEGACY_FLAC + FLAC__file_decoder_delete(file_info.decoder); ++#else ++ FLAC__stream_decoder_delete(file_info.decoder); ++#endif + return false; + } + } +@@ -237,7 +263,11 @@ + if (!(file_info.ao_dev = ao_open_live(ao_output_id, &(file_info.ao_fmt), NULL))) + { + fprintf(stderr, "Error opening ao device %d\n", ao_output_id); ++#ifdef LEGACY_FLAC + FLAC__file_decoder_delete(file_info.decoder); ++#else ++ FLAC__stream_decoder_delete(file_info.decoder); ++#endif + return false; + } + } +@@ -257,8 +287,13 @@ + + void decoder_destructor(void) + { ++#ifdef LEGACY_FLAC + FLAC__file_decoder_finish(file_info.decoder); + FLAC__file_decoder_delete(file_info.decoder); ++#else ++ FLAC__stream_decoder_finish(file_info.decoder); ++ FLAC__stream_decoder_delete(file_info.decoder); ++#endif + file_info.is_loaded = false; + file_info.is_playing = false; + file_info.filename[0] = '\0'; +@@ -272,9 +307,15 @@ + return; + } + ++#ifdef LEGACY_FLAC + while (FLAC__file_decoder_process_single(file_info.decoder) == true && + FLAC__file_decoder_get_state(file_info.decoder) == + FLAC__FILE_DECODER_OK && !interrupted) ++#else ++ while (FLAC__stream_decoder_process_single(file_info.decoder) == true && ++ FLAC__stream_decoder_get_state(file_info.decoder) < ++ FLAC__STREAM_DECODER_END_OF_STREAM && !interrupted) ++#endif + { + } + interrupted = 0; /* more accurate feedback if placed after loop */ +@@ -292,13 +333,22 @@ + { + if (file_info.is_playing == true) + { ++#ifdef LEGACY_FLAC + if (FLAC__file_decoder_get_state(file_info.decoder) == + FLAC__FILE_DECODER_END_OF_FILE) ++#else ++ if (FLAC__stream_decoder_get_state(file_info.decoder) == ++ FLAC__STREAM_DECODER_END_OF_STREAM) ++#endif + { + decoder_destructor(); + printf("@P 0\n"); + } ++#ifdef LEGACY_FLAC + else if (!FLAC__file_decoder_process_single(file_info.decoder)) ++#else ++ else if (!FLAC__stream_decoder_process_single(file_info.decoder)) ++#endif + { + fprintf(stderr, "error decoding single frame!\n"); + } +@@ -314,14 +364,24 @@ + } + } + ++#ifdef LEGACY_FLAC + void flac_error_hdl(const FLAC__FileDecoder *dec, + FLAC__StreamDecoderErrorStatus status, void *data) ++#else ++void flac_error_hdl(const FLAC__StreamDecoder *dec, ++ FLAC__StreamDecoderErrorStatus status, void *data) ++#endif + { + fprintf(stderr, "error handler called!\n"); + } + ++#ifdef LEGACY_FLAC + void flac_metadata_hdl(const FLAC__FileDecoder *dec, + const FLAC__StreamMetadata *meta, void *data) ++#else ++void flac_metadata_hdl(const FLAC__StreamDecoder *dec, ++ const FLAC__StreamMetadata *meta, void *data) ++#endif + { + file_info_struct *p = (file_info_struct *) data; + +@@ -344,10 +404,17 @@ + } + } + ++#ifdef LEGACY_FLAC + FLAC__StreamDecoderWriteStatus flac_write_hdl(const FLAC__FileDecoder *dec, + const FLAC__Frame *frame, + const FLAC__int32 * const buf[], + void *data) ++#else ++FLAC__StreamDecoderWriteStatus flac_write_hdl(const FLAC__StreamDecoder *dec, ++ const FLAC__Frame *frame, ++ const FLAC__int32 * const buf[], ++ void *data) ++#endif + { + int sample, channel, i; + uint_32 samples = frame->header.blocksize; +diff -ru flac123-0.0.9/flac123.h flac123-0.0.9-b2/flac123.h +--- flac123-0.0.9/flac123.h 2005-02-24 21:52:02.000000000 -0800 ++++ flac123-0.0.9-b2/flac123.h 2006-10-30 17:23:56.000000000 -0800 +@@ -22,13 +22,24 @@ + #include <limits.h> + #include <FLAC/all.h> + ++/* by LEGACY_FLAC we mean pre-1.1.3 before FLAC__FileDecoder was merged into FLAC__StreamDecoder */ ++#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8 ++#define LEGACY_FLAC ++#else ++#undef LEGACY_FLAC ++#endif ++ + /* string widths for printing ID3 (vorbis) data in remote mode */ + #define VORBIS_TAG_LEN 30 + #define VORBIS_YEAR_LEN 4 + + /* the main data structure of the program */ + typedef struct { ++#ifdef LEGACY_FLAC + FLAC__FileDecoder *decoder; ++#else ++ FLAC__StreamDecoder *decoder; ++#endif + + /* bits, rate, channels, byte_format */ + ao_sample_format sam_fmt; /* input sample's true format */ +diff -ru flac123-0.0.9/remote.c flac123-0.0.9-b2/remote.c +--- flac123-0.0.9/remote.c 2005-02-24 21:50:41.000000000 -0800 ++++ flac123-0.0.9-b2/remote.c 2006-10-30 17:24:28.000000000 -0800 +@@ -150,8 +150,13 @@ + file_info.current_sample += delta_frames; + } + ++#ifdef LEGACY_FLAC + FLAC__file_decoder_seek_absolute(file_info.decoder, + file_info.current_sample); ++#else ++ FLAC__stream_decoder_seek_absolute(file_info.decoder, ++ file_info.current_sample); ++#endif + } + /* absolute seek */ + else +@@ -161,7 +166,11 @@ + file_info.elapsed_time = absolute_time; + file_info.current_sample = absolute_frame; + ++#ifdef LEGACY_FLAC + FLAC__file_decoder_seek_absolute(file_info.decoder, absolute_frame); ++#else ++ FLAC__stream_decoder_seek_absolute(file_info.decoder, absolute_frame); ++#endif + } + + } diff --git a/media-sound/flac123/files/flac123-0.0.9-asneeded.patch b/media-sound/flac123/files/flac123-0.0.9-asneeded.patch new file mode 100644 index 000000000000..35936ea18b3b --- /dev/null +++ b/media-sound/flac123/files/flac123-0.0.9-asneeded.patch @@ -0,0 +1,11 @@ +--- flac123-0.0.9/Makefile.am.old 2006-11-18 12:27:32.000000000 +0100 ++++ flac123-0.0.9/Makefile.am 2006-11-18 12:27:41.000000000 +0100 +@@ -7,7 +7,7 @@ + version.h \ + vorbiscomment.c + +-flac123_LDFLAGS = @FLAC_LIBS@ @POPT_LIBS@ @AO_LIBS@ ++flac123_LDADD = @FLAC_LIBS@ @POPT_LIBS@ @AO_LIBS@ + + EXTRA_DIST = README.remote BUGS reconf + diff --git a/media-sound/flac123/flac123-0.0.9.ebuild b/media-sound/flac123/flac123-0.0.9.ebuild index 3a91717b757e..1ffb07077313 100644 --- a/media-sound/flac123/flac123-0.0.9.ebuild +++ b/media-sound/flac123/flac123-0.0.9.ebuild @@ -1,6 +1,11 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/flac123/flac123-0.0.9.ebuild,v 1.3 2006/10/19 20:26:28 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/flac123/flac123-0.0.9.ebuild,v 1.4 2006/11/18 11:37:15 aballier Exp $ + +WANT_AUTOCONF=2.5 +WANT_AUTOMAKE=1.6 + +inherit eutils autotools DESCRIPTION="console app for playing FLAC audio files" HOMEPAGE="http://flac-tools.sourceforge.net" @@ -11,9 +16,17 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" IUSE="" -DEPEND="~media-libs/flac-1.1.2 +DEPEND="media-libs/flac media-libs/libao" +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${P}+flac-1.1.3.patch" + epatch "${FILESDIR}/${P}-asneeded.patch" + eautoreconf +} + src_install() { make DESTDIR="${D}" install || die "make install failed" dodoc AUTHORS BUGS ChangeLog NEWS README* TODO |