From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- media-sound/cdstatus/Manifest | 4 +- media-sound/cdstatus/cdstatus-0.97.03.ebuild | 8 ++- .../files/cdstatus-0.97.03-fno-common.patch | 73 ++++++++++++++++++++++ .../cdstatus-0.97.03-respect-user-CFLAGS.patch | 11 ++++ 4 files changed, 93 insertions(+), 3 deletions(-) create mode 100644 media-sound/cdstatus/files/cdstatus-0.97.03-fno-common.patch create mode 100644 media-sound/cdstatus/files/cdstatus-0.97.03-respect-user-CFLAGS.patch (limited to 'media-sound/cdstatus') diff --git a/media-sound/cdstatus/Manifest b/media-sound/cdstatus/Manifest index a98dbe1acab9..451d5d472651 100644 --- a/media-sound/cdstatus/Manifest +++ b/media-sound/cdstatus/Manifest @@ -1,3 +1,5 @@ +AUX cdstatus-0.97.03-fno-common.patch 1943 BLAKE2B 21e563a4c1e3b7ba2a9af165879b4ba388f4de77423dc9c0921ce8fd6f00af5eb82b3a08846acca1620f842d4af50508ac9b0f12f798db23440de1bdd51b64d2 SHA512 475d2c1be54bdc78ee08c228313be4af4636d867ac56b533bf62b59a6a7193f3556962dd77e60d36ee2fa5aae6d85351dc5b17be291bd0ebfd4323ba6e61fb71 +AUX cdstatus-0.97.03-respect-user-CFLAGS.patch 276 BLAKE2B 8fdbaaf08ae8559c4a77bfe183a483c11e38f3f45c5ac7eec81981fe5de01a2539aa7926833b5ce5a9d4307668d8eba3c52ef21edc3017e19c2b89f24448a061 SHA512 03a43a04eb7a88e8ff5d386f3a65ea2a70df8bc46cbd84d57eb3df532ded8687c100d529315e895022a8021cff8bc9a47bf24a67bee5372369adc1ae0c71284a DIST cdstatus-0.97.03.tar.gz 115982 BLAKE2B 85c8f7383ec985896704b1fb4d77f6c7c2c1f8b84ae8914f675980f11cc558ed63b592d974387c5bc579ea2a0a6481e0a8b01ae46aac9a96ed3558e9f26a225a SHA512 d9819bfd40360b8796810d38b2c9f75c87a1256adc289d261e0cf56557170492eabc7fb0c4f7ee91c6303f24867ff4540962556edfdd8cf46b02df0236037177 -EBUILD cdstatus-0.97.03.ebuild 483 BLAKE2B ea1395e7d68a30ebfa5a85f52611dbb40a7f2693c55bf8ed2c4744881d6765d3a1b9df46a0dbb84c45985a98d5cbeb5d1dd92aec53b759c3f5cc448c77dd4c1e SHA512 5de9368aedb85cafbafefa1261b4e6cab8b604f486557fc7f60fca30d74769db3eff2ad2e69a8e28e2d91a4e42bab48d438e10b7b7bba1566616dd5d67b23617 +EBUILD cdstatus-0.97.03.ebuild 589 BLAKE2B bf31b41be734cc9a48d70df6c22fbdda225f9693877053abb1dcd6050e796ec53d40f9662b0b4e72c419132b98b9f762065b991cbfdad8448b8ed9758f549670 SHA512 e1ef7ccc12bb23d43a38c688f23a9ba8ed6bea16069fd72b63ae9845951413de660a4e700663780efab79a802356996e2b65247f556af60e3d4d018901cac745 MISC metadata.xml 331 BLAKE2B 5dcc2ceb66c009d882b35cca299c673cf3c74bc04bc2f1c8154fbc471324625436cc36a92703da315811b8082b4fb7e0c6f90a623845df2d42b2bb0394be23c7 SHA512 9f671ef16e9fc4800e4f4d1c003679332b467654a860ce36558c671208077e325116b8f9355c6888c38cedfc95a7ee226b720c8bf4ef9a8287facb21ab6ac5aa diff --git a/media-sound/cdstatus/cdstatus-0.97.03.ebuild b/media-sound/cdstatus/cdstatus-0.97.03.ebuild index e4ae820f71f7..5d7d361d54a8 100644 --- a/media-sound/cdstatus/cdstatus-0.97.03.ebuild +++ b/media-sound/cdstatus/cdstatus-0.97.03.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,11 @@ SRC_URI="mirror://sourceforge/cdstatus/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ppc64 x86" -IUSE="" + +PATCHES=( + "${FILESDIR}"/${PN}-0.97.03-respect-user-CFLAGS.patch + "${FILESDIR}"/${PN}-0.97.03-fno-common.patch +) pkg_postinst() { elog "Copy cdstatus.cfg from /usr/share/cdstatus.cfg" 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 \ -- cgit v1.2.3