diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /media-sound/cdstatus/files | |
parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) |
gentoo resync : 25.08.2020
Diffstat (limited to 'media-sound/cdstatus/files')
-rw-r--r-- | media-sound/cdstatus/files/cdstatus-0.97.03-fno-common.patch | 73 | ||||
-rw-r--r-- | media-sound/cdstatus/files/cdstatus-0.97.03-respect-user-CFLAGS.patch | 11 |
2 files changed, 84 insertions, 0 deletions
diff --git a/media-sound/cdstatus/files/cdstatus-0.97.03-fno-common.patch b/media-sound/cdstatus/files/cdstatus-0.97.03-fno-common.patch new file mode 100644 index 000000000000..588a0e333848 --- /dev/null +++ b/media-sound/cdstatus/files/cdstatus-0.97.03-fno-common.patch @@ -0,0 +1,73 @@ +--- a/src/cdstatus_cddb.c ++++ b/src/cdstatus_cddb.c +@@ -31,6 +31,12 @@ + #define DIE_CLEAN if(buffer) { free(buffer); } if(scratchbuffer) { free(scratchbuffer); } exit(EXIT_FAILURE); + #endif + ++char album_name[256]; ++int album_year; ++char artist_name[256]; ++char album_genre[128]; ++track_listing trackinfo[100]; ++unsigned int cddb_tracks; + + /** The system-provided error return code for system calls */ + extern int errno; +--- a/src/cdstatus_cddb.h ++++ b/src/cdstatus_cddb.h +@@ -24,21 +24,21 @@ + + /* Exported Globals (I hate globals, need to find another way to do this... */ + /** Holds album name for cd */ +-char album_name[256]; ++extern char album_name[256]; + + /** Holds album year for cd */ +-int album_year; ++extern int album_year; + + /** Holds artist name for cd */ +-char artist_name[256]; ++extern char artist_name[256]; + + /** Holds album genre for cd */ +-char album_genre[128]; ++extern char album_genre[128]; + + /** Holds cddb info for each track */ +-track_listing trackinfo[100]; ++extern track_listing trackinfo[100]; + + /** Number of tracks for which we have info */ +-unsigned int cddb_tracks; ++extern unsigned int cddb_tracks; + + #endif +--- a/src/cdstatus_output.c ++++ b/src/cdstatus_output.c +@@ -4,6 +4,10 @@ + + #include "cdstatus_output.h" + ++enum OUTPUT_PRIORITY current_priority; ++ ++char output_buffer[OUTPUT_BUFFSIZE]; ++ + void conditional_puts(enum OUTPUT_PRIORITY pri, const char * message) + { + if(pri >= current_priority) +--- a/src/cdstatus_output.h ++++ b/src/cdstatus_output.h +@@ -3,10 +3,10 @@ + #define CDSTATUS_OUTPUT_H + + enum OUTPUT_PRIORITY { VERBOSE_DEBUG, DEBUG, NORMAL, WARNING, CRITICAL }; +-enum OUTPUT_PRIORITY current_priority; ++extern enum OUTPUT_PRIORITY current_priority; + + #define OUTPUT_BUFFSIZE 512 +-char output_buffer[OUTPUT_BUFFSIZE]; ++extern char output_buffer[OUTPUT_BUFFSIZE]; + + void conditional_puts(enum OUTPUT_PRIORITY, const char *); + void conditional_perror(enum OUTPUT_PRIORITY, const char *); diff --git a/media-sound/cdstatus/files/cdstatus-0.97.03-respect-user-CFLAGS.patch b/media-sound/cdstatus/files/cdstatus-0.97.03-respect-user-CFLAGS.patch new file mode 100644 index 000000000000..d8fdb62d479f --- /dev/null +++ b/media-sound/cdstatus/files/cdstatus-0.97.03-respect-user-CFLAGS.patch @@ -0,0 +1,11 @@ +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -154,7 +154,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-AM_CFLAGS = -O2 -funroll-loops -finline-functions ++AM_CFLAGS = + cdstatus_SOURCES = \ + args.h \ + basic_info.c \ |