Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/whipper/files/
Date: Mon, 23 Dec 2019 10:16:24
Message-Id: 1577096122.e46f4d6cf5996673d9cdc697e59090193601f6e8.soap@gentoo
1 commit: e46f4d6cf5996673d9cdc697e59090193601f6e8
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Mon Dec 23 06:46:38 2019 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 23 10:15:22 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e46f4d6c
7
8 media-sound/whipper: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/14099
11 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
12 Signed-off-by: David Seifert <soap <AT> gentoo.org>
13
14 ...whipper-0.7.0-src-Makefile-respect-CFLAGS.patch | 69 ----------------------
15 1 file changed, 69 deletions(-)
16
17 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
18 deleted file mode 100644
19 index 71ba1f5c785..00000000000
20 --- a/media-sound/whipper/files/whipper-0.7.0-src-Makefile-respect-CFLAGS.patch
21 +++ /dev/null
22 @@ -1,69 +0,0 @@
23 -From a3f090d8ed55e5e2c0c595b9bf0e244a81ce1464 Mon Sep 17 00:00:00 2001
24 -From: Merlijn Wajer <merlijn@××××××.org>
25 -Date: Wed, 22 Aug 2018 11:41:16 +0200
26 -Subject: [PATCH] src/Makefile: respect CFLAGS
27 -
28 ----
29 - src/Makefile | 19 +++++--------------
30 - src/config.mk | 6 +++---
31 - 2 files changed, 8 insertions(+), 17 deletions(-)
32 -
33 -diff --git a/src/Makefile b/src/Makefile
34 -index f1c6d4a..ee8845d 100644
35 ---- a/src/Makefile
36 -+++ b/src/Makefile
37 -@@ -5,25 +5,16 @@ include config.mk
38 - SRC = accuraterip-checksum.c
39 - OBJ = ${SRC:.c=.o}
40 -
41 --all: options accuraterip-checksum
42 --
43 --options:
44 -- @echo accuraterip-checksum build options:
45 -- @echo "CFLAGS = ${CFLAGS}"
46 -- @echo "LDFLAGS = ${LDFLAGS}"
47 -- @echo "CC = ${CC}"
48 -+all: accuraterip-checksum
49 -
50 - .c.o:
51 -- @echo CC $<
52 -- @${CC} -c ${CFLAGS} $<
53 -+ ${CC} -c ${OURCFLAGS} $<
54 -
55 - accuraterip-checksum: ${OBJ}
56 -- @echo CC -o $@
57 -- @${CC} -o $@ ${OBJ} ${LDFLAGS}
58 -+ ${CC} -std=c99 -lsndfile -o $@ ${OBJ} ${OURCFLAGS} ${OURLDFLAGS}
59 -
60 - clean:
61 -- @echo cleaning
62 -- @rm -f accuraterip-checksum ${OBJ} accuraterip-checksum-${VERSION}.tar.gz
63 -+ rm -f accuraterip-checksum ${OBJ} accuraterip-checksum-${VERSION}.tar.gz
64 -
65 - dist: clean
66 - @echo creating dist tarball
67 -@@ -44,4 +35,4 @@ uninstall:
68 - @echo removing executable file from ${DESTDIR}${PREFIX}/bin
69 - @rm -f ${DESTDIR}${PREFIX}/bin/accuraterip-checksum
70 -
71 --.PHONY: all options clean dist install uninstall
72 -+.PHONY: all clean dist install uninstall
73 -diff --git a/src/config.mk b/src/config.mk
74 -index 283d745..87fe219 100644
75 ---- a/src/config.mk
76 -+++ b/src/config.mk
77 -@@ -4,8 +4,8 @@ VERSION = 1.4
78 - PREFIX = /usr/local
79 -
80 - # flags
81 --CFLAGS = -std=c99
82 --LDFLAGS = -lsndfile
83 -+OURCFLAGS = ${CFLAGS} -std=c99
84 -+OURLDFLAGS = ${LDFLAGS} -lsndfile
85 -
86 - # compiler and linker
87 --CC = cc
88 -+CC ?= cc
89 ---
90 -2.16.4
91 -