1 |
commit: b7c408a069acdb656b371db30a0fa537b3af5d18 |
2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
3 |
AuthorDate: Thu Apr 22 18:14:47 2021 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Apr 23 05:03:51 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7c408a0 |
7 |
|
8 |
media-libs/libsamplerate: remove unused patch(es) |
9 |
|
10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
11 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/20506 |
13 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
14 |
|
15 |
...samplerate-0.1.3-dontbuild-tests-examples.patch | 32 ------------- |
16 |
.../files/libsamplerate-0.1.8-lm.patch | 8 ---- |
17 |
.../files/libsamplerate-0.1.9-htmldocdir.patch | 53 ---------------------- |
18 |
.../libsamplerate-0.1.9-no-sndfile-resample.patch | 34 -------------- |
19 |
4 files changed, 127 deletions(-) |
20 |
|
21 |
diff --git a/media-libs/libsamplerate/files/libsamplerate-0.1.3-dontbuild-tests-examples.patch b/media-libs/libsamplerate/files/libsamplerate-0.1.3-dontbuild-tests-examples.patch |
22 |
deleted file mode 100644 |
23 |
index 23cf5897a59..00000000000 |
24 |
--- a/media-libs/libsamplerate/files/libsamplerate-0.1.3-dontbuild-tests-examples.patch |
25 |
+++ /dev/null |
26 |
@@ -1,32 +0,0 @@ |
27 |
-Index: libsamplerate-0.1.3/examples/Makefile.am |
28 |
-=================================================================== |
29 |
---- libsamplerate-0.1.3.orig/examples/Makefile.am |
30 |
-+++ libsamplerate-0.1.3/examples/Makefile.am |
31 |
-@@ -3,7 +3,7 @@ |
32 |
- |
33 |
- bin_PROGRAMS = sndfile-resample |
34 |
- |
35 |
--noinst_PROGRAMS = varispeed-play timewarp-file |
36 |
-+EXTRA_PROGRAMS = varispeed-play timewarp-file |
37 |
- |
38 |
- SAMPLERATEDIR =../src |
39 |
- INCLUDES = -I$(srcdir)/$(SAMPLERATEDIR) @OS_SPECIFIC_INCLUDES@ |
40 |
-Index: libsamplerate-0.1.3/tests/Makefile.am |
41 |
-=================================================================== |
42 |
---- libsamplerate-0.1.3.orig/tests/Makefile.am |
43 |
-+++ libsamplerate-0.1.3/tests/Makefile.am |
44 |
-@@ -1,4 +1,4 @@ |
45 |
--noinst_PROGRAMS = misc_test termination_test simple_test callback_test \ |
46 |
-+EXTRA_PROGRAMS = misc_test termination_test simple_test callback_test \ |
47 |
- reset_test multi_channel_test snr_bw_test \ |
48 |
- float_short_test varispeed_test callback_hang_test \ |
49 |
- src-evaluate throughput_test |
50 |
-@@ -55,7 +55,7 @@ throughput_test_LDADD = $(SAMPLRATEDIR) |
51 |
- |
52 |
- #=============================================================================== |
53 |
- |
54 |
--check: $(noinst_PROGRAMS) |
55 |
-+check: $(EXTRA_PROGRAMS) |
56 |
- date |
57 |
- uname -a |
58 |
- ./misc_test |
59 |
|
60 |
diff --git a/media-libs/libsamplerate/files/libsamplerate-0.1.8-lm.patch b/media-libs/libsamplerate/files/libsamplerate-0.1.8-lm.patch |
61 |
deleted file mode 100644 |
62 |
index bfaa87bf976..00000000000 |
63 |
--- a/media-libs/libsamplerate/files/libsamplerate-0.1.8-lm.patch |
64 |
+++ /dev/null |
65 |
@@ -1,8 +0,0 @@ |
66 |
---- libsamplerate-0.1.8/samplerate.pc.in.orig |
67 |
-+++ libsamplerate-0.1.8/samplerate.pc.in |
68 |
-@@ -8,4 +8,5 @@ |
69 |
- Requires: |
70 |
- Version: @VERSION@ |
71 |
- Libs: -L${libdir} -lsamplerate |
72 |
-+Libs.private: @LIBS@ |
73 |
- Cflags: -I${includedir} |
74 |
|
75 |
diff --git a/media-libs/libsamplerate/files/libsamplerate-0.1.9-htmldocdir.patch b/media-libs/libsamplerate/files/libsamplerate-0.1.9-htmldocdir.patch |
76 |
deleted file mode 100644 |
77 |
index cedcd312433..00000000000 |
78 |
--- a/media-libs/libsamplerate/files/libsamplerate-0.1.9-htmldocdir.patch |
79 |
+++ /dev/null |
80 |
@@ -1,53 +0,0 @@ |
81 |
-From 06fea5c39b186955194e85ada50724465c39033d Mon Sep 17 00:00:00 2001 |
82 |
-From: David Seifert <soap@g.o> |
83 |
-Date: Sat, 10 Jun 2017 15:48:00 +0200 |
84 |
-Subject: [PATCH] Remove htmldocdir variable |
85 |
- |
86 |
-* Autoconf and Automake provide a variable (htmldir) |
87 |
- for this already. |
88 |
- |
89 |
-* asturm 2020-09-04: Rebased onto 0.1.9 |
90 |
---- |
91 |
- configure.ac | 10 ---------- |
92 |
- doc/Makefile.am | 6 +----- |
93 |
- 2 files changed, 1 insertion(+), 15 deletions(-) |
94 |
- |
95 |
-diff --git a/configure.ac b/configure.ac |
96 |
-index 0ce20e9..6d5e692 100644 |
97 |
---- a/configure.ac |
98 |
-+++ b/configure.ac |
99 |
-@@ -264,21 +264,11 @@ AS_CASE([$target_os], |
100 |
- ;; |
101 |
- esac |
102 |
- |
103 |
--htmldocdir=$prefix/share/doc/libsamplerate0-dev/html |
104 |
-- |
105 |
--if test $prefix = "NONE" ; then |
106 |
-- htmldocdir=/usr/local/share/doc/libsamplerate0-dev/html |
107 |
--else |
108 |
-- htmldocdir=$prefix/share/doc/libsamplerate0-dev/html |
109 |
-- fi |
110 |
-- |
111 |
- #==================================================================================== |
112 |
- # Now use the information from the checking stage. |
113 |
- |
114 |
- AC_DEFINE_UNQUOTED(OS_IS_WIN32, ${os_is_win32}, [Set to 1 if compiling for Win32]) |
115 |
- |
116 |
--AC_SUBST(htmldocdir) |
117 |
-- |
118 |
- AC_SUBST(SHLIB_VERSION_ARG) |
119 |
- AC_SUBST(SHARED_VERSION_INFO) |
120 |
- AC_SUBST(OS_SPECIFIC_INCLUDES) |
121 |
-diff --git a/doc/Makefile.am b/doc/Makefile.am |
122 |
-index be86d64..cbc9963 100644 |
123 |
---- a/doc/Makefile.am |
124 |
-+++ b/doc/Makefile.am |
125 |
-@@ -1,7 +1,3 @@ |
126 |
--htmldir = $(htmldocdir) |
127 |
--html_DATA = SRC.png SRC.css index.html license.html history.html download.html \ |
128 |
-+dist_html_DATA = SRC.png SRC.css index.html license.html history.html download.html \ |
129 |
- lists.html quality.html win32.html faq.html api.html \ |
130 |
- api_simple.html api_callback.html api_full.html api_misc.html |
131 |
-- |
132 |
--EXTRA_DIST = $(html_DATA) |
133 |
-- |
134 |
|
135 |
diff --git a/media-libs/libsamplerate/files/libsamplerate-0.1.9-no-sndfile-resample.patch b/media-libs/libsamplerate/files/libsamplerate-0.1.9-no-sndfile-resample.patch |
136 |
deleted file mode 100644 |
137 |
index ae515602d81..00000000000 |
138 |
--- a/media-libs/libsamplerate/files/libsamplerate-0.1.9-no-sndfile-resample.patch |
139 |
+++ /dev/null |
140 |
@@ -1,34 +0,0 @@ |
141 |
-From bf39835df4eba7b2ec2d5c5e7d1d40397942c3b0 Mon Sep 17 00:00:00 2001 |
142 |
-From: David Seifert <soap@g.o> |
143 |
-Date: Sat, 27 Jan 2018 14:12:35 +0100 |
144 |
-Subject: [PATCH] Move `sndfile-resample` to sndfile-tools package |
145 |
- |
146 |
-* Fixes https://bugs.gentoo.org/645258 |
147 |
- |
148 |
-* asturm 2020-09-04: Rebased onto 0.1.9 |
149 |
- |
150 |
---- |
151 |
- Makefile.am | 7 - |
152 |
- 1 file changed, 7 deletions(-) |
153 |
- |
154 |
---- a/examples/Makefile.am 2014-11-30 11:44:50.000000000 +0100 |
155 |
-+++ b/examples/Makefile.am 2020-09-04 17:30:07.824611967 +0200 |
156 |
-@@ -1,8 +1,6 @@ |
157 |
- # This file was automatically generated |
158 |
- # DO NOT EDIT! |
159 |
- |
160 |
--bin_PROGRAMS = sndfile-resample |
161 |
-- |
162 |
- EXTRA_PROGRAMS = varispeed-play timewarp-file |
163 |
- |
164 |
- SAMPLERATEDIR =../src |
165 |
-@@ -15,9 +13,6 @@ |
166 |
- |
167 |
- #=============================================================================== |
168 |
- |
169 |
--sndfile_resample_SOURCES = sndfile-resample.c |
170 |
--sndfile_resample_LDADD = $(SAMPLERATEDIR)/libsamplerate.la $(SNDFILE_LIBS) |
171 |
-- |
172 |
- varispeed_play_SOURCES = varispeed-play.c audio_out.c audio_out.h |
173 |
- varispeed_play_LDADD = $(SAMPLERATEDIR)/libsamplerate.la $(SNDFILE_LIBS) $(OS_SPECIFIC_LINKS) |
174 |
- |