diff options
author | Quentin Retornaz <gentoo@retornaz.com> | 2018-08-10 13:38:33 +0200 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2018-08-23 10:06:23 +0200 |
commit | 8c290a104b56f379afa2b0b2ccd526eb5427af2f (patch) | |
tree | 05f6b1b26064bb6cf85247e83650e55f350e7ce5 /media-sound/whipper/files | |
parent | app-crypt/gnupg: fix bug #649598, USE=usb on prefix (diff) | |
download | gentoo-8c290a104b56f379afa2b0b2ccd526eb5427af2f.tar.gz gentoo-8c290a104b56f379afa2b0b2ccd526eb5427af2f.tar.bz2 gentoo-8c290a104b56f379afa2b0b2ccd526eb5427af2f.zip |
media-sound/whipper: New package
Closes: https://github.com/gentoo/gentoo/pull/9525
Diffstat (limited to 'media-sound/whipper/files')
-rw-r--r-- | media-sound/whipper/files/whipper-0.7.0-cdparanoia-name-fix.patch | 51 | ||||
-rw-r--r-- | media-sound/whipper/files/whipper-0.7.0-src-Makefile-respect-CFLAGS.patch | 69 |
2 files changed, 120 insertions, 0 deletions
diff --git a/media-sound/whipper/files/whipper-0.7.0-cdparanoia-name-fix.patch b/media-sound/whipper/files/whipper-0.7.0-cdparanoia-name-fix.patch new file mode 100644 index 000000000000..fdd7b9eed463 --- /dev/null +++ b/media-sound/whipper/files/whipper-0.7.0-cdparanoia-name-fix.patch @@ -0,0 +1,51 @@ +diff -ur a/whipper/program/cdparanoia.py b/whipper/program/cdparanoia.py +--- a/whipper/program/cdparanoia.py 2018-04-09 10:05:00.000000000 +0200 ++++ b/whipper/program/cdparanoia.py 2018-08-03 11:59:22.582106444 +0200 +@@ -280,10 +280,10 @@ + + bufsize = 1024 + if self._overread: +- argv = ["cd-paranoia", "--stderr-progress", ++ argv = ["libcdio-paranoia", "--stderr-progress", + "--sample-offset=%d" % self._offset, "--force-overread", ] + else: +- argv = ["cd-paranoia", "--stderr-progress", ++ argv = ["libcdio-paranoia", "--stderr-progress", + "--sample-offset=%d" % self._offset, ] + if self._device: + argv.extend(["--force-cdrom-device", self._device, ]) +@@ -302,7 +302,7 @@ + except OSError, e: + import errno + if e.errno == errno.ENOENT: +- raise common.MissingDependencyException('cd-paranoia') ++ raise common.MissingDependencyException('libcdio-paranoia') + + raise + +@@ -559,8 +559,8 @@ + + + def getCdParanoiaVersion(): +- getter = common.VersionGetter('cd-paranoia', +- ["cd-paranoia", "-V"], ++ getter = common.VersionGetter('libcdio-paranoia', ++ ["libcdio-paranoia", "-V"], + _VERSION_RE, + "%(version)s %(release)s") + +@@ -585,12 +585,12 @@ + def __init__(self, device=None): + # cdparanoia -A *always* writes cdparanoia.log + self.cwd = tempfile.mkdtemp(suffix='.whipper.cache') +- self.command = ['cd-paranoia', '-A'] ++ self.command = ['libcdio-paranoia', '-A'] + if device: + self.command += ['-d', device] + + def commandMissing(self): +- raise common.MissingDependencyException('cd-paranoia') ++ raise common.MissingDependencyException('libcdio-paranoia') + + def readbyteserr(self, bytes): + self._output.append(bytes) diff --git a/media-sound/whipper/files/whipper-0.7.0-src-Makefile-respect-CFLAGS.patch b/media-sound/whipper/files/whipper-0.7.0-src-Makefile-respect-CFLAGS.patch new file mode 100644 index 000000000000..71ba1f5c7857 --- /dev/null +++ b/media-sound/whipper/files/whipper-0.7.0-src-Makefile-respect-CFLAGS.patch @@ -0,0 +1,69 @@ +From a3f090d8ed55e5e2c0c595b9bf0e244a81ce1464 Mon Sep 17 00:00:00 2001 +From: Merlijn Wajer <merlijn@wizzup.org> +Date: Wed, 22 Aug 2018 11:41:16 +0200 +Subject: [PATCH] src/Makefile: respect CFLAGS + +--- + src/Makefile | 19 +++++-------------- + src/config.mk | 6 +++--- + 2 files changed, 8 insertions(+), 17 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index f1c6d4a..ee8845d 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -5,25 +5,16 @@ include config.mk + SRC = accuraterip-checksum.c + OBJ = ${SRC:.c=.o} + +-all: options accuraterip-checksum +- +-options: +- @echo accuraterip-checksum build options: +- @echo "CFLAGS = ${CFLAGS}" +- @echo "LDFLAGS = ${LDFLAGS}" +- @echo "CC = ${CC}" ++all: accuraterip-checksum + + .c.o: +- @echo CC $< +- @${CC} -c ${CFLAGS} $< ++ ${CC} -c ${OURCFLAGS} $< + + accuraterip-checksum: ${OBJ} +- @echo CC -o $@ +- @${CC} -o $@ ${OBJ} ${LDFLAGS} ++ ${CC} -std=c99 -lsndfile -o $@ ${OBJ} ${OURCFLAGS} ${OURLDFLAGS} + + clean: +- @echo cleaning +- @rm -f accuraterip-checksum ${OBJ} accuraterip-checksum-${VERSION}.tar.gz ++ rm -f accuraterip-checksum ${OBJ} accuraterip-checksum-${VERSION}.tar.gz + + dist: clean + @echo creating dist tarball +@@ -44,4 +35,4 @@ uninstall: + @echo removing executable file from ${DESTDIR}${PREFIX}/bin + @rm -f ${DESTDIR}${PREFIX}/bin/accuraterip-checksum + +-.PHONY: all options clean dist install uninstall ++.PHONY: all clean dist install uninstall +diff --git a/src/config.mk b/src/config.mk +index 283d745..87fe219 100644 +--- a/src/config.mk ++++ b/src/config.mk +@@ -4,8 +4,8 @@ VERSION = 1.4 + PREFIX = /usr/local + + # flags +-CFLAGS = -std=c99 +-LDFLAGS = -lsndfile ++OURCFLAGS = ${CFLAGS} -std=c99 ++OURLDFLAGS = ${LDFLAGS} -lsndfile + + # compiler and linker +-CC = cc ++CC ?= cc +-- +2.16.4 + |