commit: ea9f1eb279c5bdb7625d90fa9fa5f6d2da74c808 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sun Mar 20 18:49:01 2022 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun Mar 20 18:49:01 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea9f1eb2
media-sound/dagrab: update EAPI 6 -> 8 Closes: https://bugs.gentoo.org/644160 Closes: https://bugs.gentoo.org/715754 Signed-off-by: David Seifert <soap <AT> gentoo.org> ...grab-0.513-r1.ebuild => dagrab-0.513-r2.ebuild} | 23 +++++++++-------- .../dagrab/files/dagrab-0.513-C99-inline.patch | 30 ++++++++++++++++++++++ media-sound/dagrab/files/dagrab-0.513-build.patch | 30 +++++++++++++--------- media-sound/dagrab/files/dagrab-0.513-fd_set.patch | 10 ++++++++ 4 files changed, 70 insertions(+), 23 deletions(-) diff --git a/media-sound/dagrab/dagrab-0.513-r1.ebuild b/media-sound/dagrab/dagrab-0.513-r2.ebuild similarity index 60% rename from media-sound/dagrab/dagrab-0.513-r1.ebuild rename to 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>
