diff options
Diffstat (limited to 'media-sound/dagrab')
-rw-r--r-- | media-sound/dagrab/Manifest | 6 | ||||
-rw-r--r-- | media-sound/dagrab/dagrab-0.513-r2.ebuild (renamed from media-sound/dagrab/dagrab-0.513-r1.ebuild) | 23 | ||||
-rw-r--r-- | media-sound/dagrab/files/dagrab-0.513-C99-inline.patch | 30 | ||||
-rw-r--r-- | media-sound/dagrab/files/dagrab-0.513-build.patch | 30 | ||||
-rw-r--r-- | media-sound/dagrab/files/dagrab-0.513-fd_set.patch | 10 |
5 files changed, 74 insertions, 25 deletions
diff --git a/media-sound/dagrab/Manifest b/media-sound/dagrab/Manifest index 432d56e8f229..d3aa809ae624 100644 --- a/media-sound/dagrab/Manifest +++ b/media-sound/dagrab/Manifest @@ -1,5 +1,7 @@ -AUX dagrab-0.513-build.patch 1207 BLAKE2B 737937b71be7eca2cabd90e6e77595032389e4580e8258f247ca561cc7964bc462f6415a8b766121d275df90d2bad5e1aca5f6f96d35457c9fea1917136c4d24 SHA512 f86f59d3877551162505ea0d15e5f90248aee45f6217771143b2809a650d720a203a147f7d8ebbad52902b61054b6786f51b85c98dd4c5d8e2df812e7011e537 +AUX dagrab-0.513-C99-inline.patch 599 BLAKE2B dd593062ab831130ff0942e6a53fd460a3d433be57b7b32cd4cc5962cb885ccf99238a5148b6220d662b4aa73e1f51e21b1383ea964a142698996f5929403365 SHA512 d2c6747e64c13c718e9d457bf2e25ca1447e8875a40f0713734cad74a4159fcbeace250e8beb71625c76c505363f6853e2ba8420c0f54860b1644c458ba7fc7b +AUX dagrab-0.513-build.patch 1381 BLAKE2B 936da275c3593ac6337b95f6736807cd65200f3fbaff3cc0172dbf551e7efb0c5fd145a322e25d5c05bc819e5c2372a84670007b90cbf2d6f333787619f38cb6 SHA512 dd8071c6135f703908fa2fe67c4a4519dc65452faa61bccb4e7082d60863d9ab483cc5a5e159d1b965afbe275eac60a8667715168e42dfa3e3be430593b6d8f9 +AUX dagrab-0.513-fd_set.patch 180 BLAKE2B 75eaea68b558444dbfad0e230f11b0b54f59f927c810f1e036e10a35131c205536cfe758a00765dde40fc904e5fca6a2b01b806a53cdc605c4a3121a53296e81 SHA512 731d950af742bab0bf3f244419f17bacccef65f641a1383b94b25f69071c0eaa02ffc59cfa03f839c90b78dc9a8dc59508a86545419690661131c98ad090cf2f AUX dagrab-0.513-freedb.patch 716 BLAKE2B 72965ea27ba42422d207f8949d2730a47732a4882193c5eec7a9b6f9a567151961c33556dde82a15b1786a9fdb6fd19c060b950899f57ede191a20ee62d65e83 SHA512 5516bb2db854fef1c371f8f96213055ec24086ec773e2b8e1f12c8ca9ce87d2b43b3575112763e7bcf401e029dee47386c244f61bbc675ec3ad64c5f7788a0fe DIST dagrab-S0.513.tgz 38747 BLAKE2B 42019cf9ba49fa6bf94f143f7ffd2e3d67f105b9ec53a7eb77edb6e69fc323d1a02aa1a713d349ad47bce62985c06231eda0b272ac01ea87532355f5e5f1518e SHA512 196a9b0282715bc28dc68b56cf04370369a6403c8178fd943dd3e029c91c6ecc67f7500a4be2b3277e10e9af06a39cb701bbe76cc57e4f97732e0d53d7c9efa7 -EBUILD dagrab-0.513-r1.ebuild 652 BLAKE2B ff0cdc006e1bedb5c547dd0981cbddbc7972cc9ceb0f2012efa900f90a194750ae26a2ca0922e98970e50ba94ba0e984d550aaf18cae15abc3dfdf85909cae07 SHA512 429163b9a053b684e36da274b6566c5d1e96a524467ed810a3b7cb130a649b6208cf3188412f57e2963d7abcc8a2421b514386a1e61de34fc16b39598dbcfb26 +EBUILD dagrab-0.513-r2.ebuild 652 BLAKE2B 87c44ead11469f1e983cc82494c0c8b2cef29f0edab84442e94a1bbdee6f29be110c2797faddbf77eca705007b55bb46ea62d01e70cf951a4a6c4932231821d2 SHA512 31b8071596a405e22ad1658e0856e28c68210d2db9dcebcb518b650b8b37fe2fe60881867cfc0c03be52cbfb32c5421f7d81ae05ccefb7b88a590955ab515016 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8 diff --git a/media-sound/dagrab/dagrab-0.513-r1.ebuild b/media-sound/dagrab/dagrab-0.513-r2.ebuild index e288a0d2df40..3ffa49eab889 100644 --- a/media-sound/dagrab/dagrab-0.513-r1.ebuild +++ b/media-sound/dagrab/dagrab-0.513-r2.ebuild @@ -1,34 +1,35 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit flag-o-matic +inherit toolchain-funcs MY_P="${PN}-S${PV}" + DESCRIPTION="fixed point cd ripper" HOMEPAGE="http://vertigo.fme.vutbr.cz/~stibor/dagrab.html" SRC_URI="http://ashtray.jz.gts.cz/~smsti/archiv/${MY_P}.tgz" +S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" -S=${WORKDIR}/${MY_P} PATCHES=( - "${FILESDIR}/${P}-build.patch" - "${FILESDIR}/${P}-freedb.patch" + "${FILESDIR}"/${P}-build.patch + "${FILESDIR}"/${P}-freedb.patch + "${FILESDIR}"/${P}-C99-inline.patch + "${FILESDIR}"/${P}-fd_set.patch ) -src_prepare() { - # fix #570732 by restoring pre-GCC5 inline semantics - append-cflags -std=gnu89 - - default +src_configure() { + tc-export CC } src_install() { dobin dagrab + dodoc BUGS CHANGES FAQ grab TODO doman dagrab.1 } diff --git a/media-sound/dagrab/files/dagrab-0.513-C99-inline.patch b/media-sound/dagrab/files/dagrab-0.513-C99-inline.patch new file mode 100644 index 000000000000..fa5e0793e4d9 --- /dev/null +++ b/media-sound/dagrab/files/dagrab-0.513-C99-inline.patch @@ -0,0 +1,30 @@ +--- a/dagrab.c ++++ b/dagrab.c +@@ -416,7 +416,7 @@ + return 0; + } + +-inline void cd_track_name(char *name, cd_trk_list * tl, int tn, ++void cd_track_name(char *name, cd_trk_list * tl, int tn, + char *trackname) + { + if (opt_cddb) +--- a/err.c ++++ b/err.c +@@ -35,7 +35,7 @@ + "\n%s: error writing wave file %s\n" /* ERR_WRITING */ + }; + +-inline void die(int n, char *p) ++void die(int n, char *p) + { + fprintf(stderr, errs[n], PROGNAME, p); + exit(1); +--- a/err.h ++++ b/err.h +@@ -6,4 +6,4 @@ + #define ERR_CHMOD 5 + #define ERR_WRITING 6 + +-inline void die(int n, char *p); ++void die(int n, char *p); diff --git a/media-sound/dagrab/files/dagrab-0.513-build.patch b/media-sound/dagrab/files/dagrab-0.513-build.patch index 43408d56b374..1c85aecd0986 100644 --- a/media-sound/dagrab/files/dagrab-0.513-build.patch +++ b/media-sound/dagrab/files/dagrab-0.513-build.patch @@ -1,5 +1,5 @@ ---- dagrab-S0.513/dagrab.c -+++ dagrab-S0.513/dagrab.c +--- a/dagrab.c ++++ b/dagrab.c @@ -776,6 +776,7 @@ thread_save(NULL); #endif @@ -8,8 +8,8 @@ } /**************************************************************** * Close output file * ---- dagrab-S0.513/jit_in.c -+++ dagrab-S0.513/jit_in.c +--- a/jit_in.c ++++ b/jit_in.c @@ -74,5 +74,6 @@ *p = (*(p + SSIZE) + *(p - SSIZE)) / 2; view_status(ID_JITTER, NULL); @@ -17,9 +17,9 @@ + ; } } ---- dagrab-S0.513/Makefile -+++ dagrab-S0.513/Makefile -@@ -3,14 +3,12 @@ +--- a/Makefile ++++ b/Makefile +@@ -3,23 +3,15 @@ # Note: PTHREAD support is optional, you can comment it out ################################################################################ @@ -31,20 +31,26 @@ -ifneq ($(wildcard /usr/include/linux/ucdrom.h),) - CFLAGS +=-DUSE_UCDROM -endif -+CC ?= gcc -+CFLAGS ?= -O +CFLAGS += -W -Wall -DPTHREAD -+LDFLAGS ?= -O +LIBS = -lpthread all: dagrab -@@ -28,7 +26,7 @@ + SOURCES=cddb.c dagrab.c jitter.c jit_in.c print.c err.c + OBJ= $(SOURCES:.c=.o) + +-%.o: %.c +- $(CC) $(CFLAGS) -c $< -o $@ +- + cddb.o: main.h const.h version.h dagrab.h + dagrab.o: main.h const.h jit_in.h jitter.h cddb.h print.h err.c Makefile + jitter.o: main.h dagrab.h print.h const.h +@@ -28,7 +20,7 @@ err.o: dagrab.h main.h dagrab: $(OBJ) Makefile - $(CC) $(LDFLAGS) $(OBJ) $(LIBS) -o dagrab -+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJ) $(LIBS) -o dagrab ++ $(CC) $(CFLAGS) $(LDFLAGS) -o dagrab $(OBJ) $(LIBS) clean: rm -f dagrab *.o *.wav *.mp[23] *.ogg .*swp *~ gmon.out tags diff --git a/media-sound/dagrab/files/dagrab-0.513-fd_set.patch b/media-sound/dagrab/files/dagrab-0.513-fd_set.patch new file mode 100644 index 000000000000..2b039f5c6b31 --- /dev/null +++ b/media-sound/dagrab/files/dagrab-0.513-fd_set.patch @@ -0,0 +1,10 @@ +--- a/cddb.c ++++ b/cddb.c +@@ -29,6 +29,7 @@ + + #include <netdb.h> + #include <netinet/in.h> ++#include <sys/select.h> + #include <sys/socket.h> + #include <pwd.h> + #include <dirent.h> |