summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-cdr/cuecue/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'app-cdr/cuecue/files')
-rw-r--r--app-cdr/cuecue/files/cuecue-0.2.2-flac113.diff130
1 files changed, 130 insertions, 0 deletions
diff --git a/app-cdr/cuecue/files/cuecue-0.2.2-flac113.diff b/app-cdr/cuecue/files/cuecue-0.2.2-flac113.diff
new file mode 100644
index 00000000000..8a0252180d2
--- /dev/null
+++ b/app-cdr/cuecue/files/cuecue-0.2.2-flac113.diff
@@ -0,0 +1,130 @@
+diff -Naur src.orig/libcuecue/flac.c src/libcuecue/flac.c
+--- src.orig/libcuecue/flac.c 2004-09-22 04:28:21.000000000 +0200
++++ src/libcuecue/flac.c 2007-02-27 23:25:36.000000000 +0100
+@@ -27,6 +27,12 @@
+ #include "cuecue.h"
+ #include "cuecue_internal.h"
+
++#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT <= 7
++#define LEGACY_FLAC
++#else
++#undef LEGACY_FLAC
++#endif
++
+ typedef struct Internal
+ {
+ FILE *dst;
+@@ -38,7 +44,11 @@
+ } Internal;
+
+
++#ifdef LEGACY_FLAC
+ void error(const FLAC__FileDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
++#else
++void error(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
++#endif
+ {
+ Internal *internal = client_data;
+ switch (status) {
+@@ -52,11 +62,21 @@
+ strcpy(cuecue_error,"CRC Mismatch: FLAC file corrupted");
+ internal->error=1;
+ break;
++#ifndef LEGACY_FLAC
++ case FLAC__STREAM_DECODER_ERROR_STATUS_UNPARSEABLE_STREAM:
++ strcpy(cuecue_error,"Unparseable stream");
++ internal->error=1;
++ break;
++#endif
+ }
+ }
+
+
++#ifdef LEGACY_FLAC
+ void metadata(const FLAC__FileDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
++#else
++void metadata(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
++#endif
+ {
+ if(metadata->type == FLAC__METADATA_TYPE_STREAMINFO) {
+ /* get size of the file, for progress callback */
+@@ -66,7 +86,11 @@
+ }
+
+
++#ifdef LEGACY_FLAC
+ FLAC__StreamDecoderWriteStatus write(const FLAC__FileDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
++#else
++FLAC__StreamDecoderWriteStatus write(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
++#endif
+ {
+ Internal *internal = client_data;
+ unsigned int samples = frame->header.blocksize;
+@@ -126,7 +150,11 @@
+ {
+ FILE *dst;
+ Internal internal;
++#ifdef LEGACY_FLAC
+ FLAC__FileDecoder *decoder;
++#else
++ FLAC__StreamDecoder *decoder;
++#endif
+
+ dst = fopen(file_destination, "wb");
+
+@@ -141,7 +169,11 @@
+ internal.error=0;
+ internal.dst=dst;
+
++#ifdef LEGACY_FLAC
+ decoder = FLAC__file_decoder_new();
++#else
++ decoder = FLAC__stream_decoder_new();
++#endif
+
+ if (decoder==NULL) {
+ snprintf(cuecue_error,CUECUE_ERROR_LENGTH,"Cannot create FLAC decoder! memory error ?");
+@@ -150,6 +182,7 @@
+
+ internal.buffer = malloc(BUFFER_SIZE);
+
++#ifdef LEGACY_FLAC
+ FLAC__file_decoder_set_md5_checking(decoder, true);
+ FLAC__file_decoder_set_filename(decoder, file_source);
+
+@@ -162,8 +195,20 @@
+ snprintf(cuecue_error,1024,"Cannot open '%s'",file_source);
+ internal.error=1;
+ }
++#else
++ FLAC__stream_decoder_set_md5_checking(decoder, true);
++ if(FLAC__stream_decoder_init_file(decoder, file_source, write, metadata, error, &internal) != FLAC__STREAM_DECODER_INIT_STATUS_OK) {
++ snprintf(cuecue_error,1024,"Cannot open '%s'",file_source);
++ internal.error=1;
++ }
++#endif
+
+- if(!FLAC__file_decoder_process_until_end_of_file(decoder)) {
++#ifdef LEGACY_FLAC
++ if(!FLAC__file_decoder_process_until_end_of_file(decoder))
++#else
++ if(!FLAC__stream_decoder_process_until_end_of_stream(decoder))
++#endif
++ {
+ if (!internal.error) {
+ /* early error, not even the time to decode metadata :) */
+ snprintf(cuecue_error,CUECUE_ERROR_LENGTH,"Cannot open '%s'",file_source);
+@@ -171,8 +216,13 @@
+ internal.error=1;
+ }
+
++#ifdef LEGACY_FLAC
+ FLAC__file_decoder_finish(decoder);
+ FLAC__file_decoder_delete(decoder);
++#else
++ FLAC__stream_decoder_finish(decoder);
++ FLAC__stream_decoder_delete(decoder);
++#endif
+
+ fclose(dst);
+ free(internal.buffer);