1 |
commit: 7b7cc4b7e5d62c1490b4d25d14dc70927114f5a6 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Oct 4 13:42:27 2020 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 4 13:42:27 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b7cc4b7 |
7 |
|
8 |
media-libs/libsndfile: Use fixed upstream tarball |
9 |
|
10 |
Package-Manager: Portage-3.0.8, Repoman-3.0.1 |
11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
12 |
|
13 |
media-libs/libsndfile/Manifest | 2 +- |
14 |
.../files/libsndfile-1.0.30-fix-nl.patch | 121 --------------------- |
15 |
media-libs/libsndfile/libsndfile-1.0.30.ebuild | 4 - |
16 |
3 files changed, 1 insertion(+), 126 deletions(-) |
17 |
|
18 |
diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest |
19 |
index c3b5434221e..75717570710 100644 |
20 |
--- a/media-libs/libsndfile/Manifest |
21 |
+++ b/media-libs/libsndfile/Manifest |
22 |
@@ -1,4 +1,4 @@ |
23 |
DIST libsndfile-1.0.28.tar.gz 1202833 BLAKE2B 102735766e2c22b5278fde43feaaa664598c08fadb5264d5130e4bf1e354bd4202948db38e2912d7487bd7f8c0b9faf1616c0873eed886a56b1d7f49452bf488 SHA512 890731a6b8173f714155ce05eaf6d991b31632c8ab207fbae860968861a107552df26fcf85602df2e7f65502c7256c1b41735e1122485a3a07ddb580aa83b57f |
24 |
DIST libsndfile-1.0.29.tar.bz2 831090 BLAKE2B 0bdf20a0abe22f628434e80c61c6b7d31e62c40dd881f462d8e12eb4488f0bcb1c0c7712fbff4902bbbea86e08763a01f7d85b875166c5c9214ab9d8aa10a1c1 SHA512 72cf038b26c66e6e085d97ef1954bd3aa76315527f632649707c76128953bfbb2c9b52527d309720ca1107a9e04e033722995911dad43b4adda46bf4a05354d7 |
25 |
DIST libsndfile-1.0.29_pre2_p20191024.tar.gz 720981 BLAKE2B 9f1dcf3d3669b66d8582d50b62ff863facd7125432a84a3e1e3fb0f817554f260f42948b4479371fb0967dcc75bedc6c49afffc6bee3f973a875d72d2e508210 SHA512 e37b385b90cadc97348db03b6c5ae7a8fcee17ded60f54d1508adddb8e2dc604ea44b60a0fe08627e81c0faa83997cdafb0b0ecf8574f901bf5e8a1819a63998 |
26 |
-DIST libsndfile-1.0.30.tar.bz2 849559 BLAKE2B 28a0191b0882a0e6546c496c8670ee44c9f34befeeb876d2156ffcb8772a2c419672329f25e532dc611ebeb3197ad3a2f70fe2c1e287d94e3d5b512c9f1d4052 SHA512 ff1e533e0480ae9d0ba08f68eb82fdbad186c65f93c74f956f2fc5a7264cd31f2610c3f8b72a93e24704cac2b05e7a00e6a43dba70391dcbd1d1c9344bd88df0 |
27 |
+DIST libsndfile-1.0.30.tar.bz2 852320 BLAKE2B 00bd558a3d8645f4ad03fba38c31fcea25d30bea4b6f1a785b4b31b0da61bfa6a6f7df1bd7907c95c543cce8ee6766032d2e614eb285f2fc529146cb1d319517 SHA512 c4be4bc57df880da81570889a80256ba4567f2c7d6bdfb38f3803c55f616278160e962544bfac32e53b613b8fdf2a2644d8da9ee778747c32cb681a0fd5aab00 |
28 |
|
29 |
diff --git a/media-libs/libsndfile/files/libsndfile-1.0.30-fix-nl.patch b/media-libs/libsndfile/files/libsndfile-1.0.30-fix-nl.patch |
30 |
deleted file mode 100644 |
31 |
index 7fa3c47d938..00000000000 |
32 |
--- a/media-libs/libsndfile/files/libsndfile-1.0.30-fix-nl.patch |
33 |
+++ /dev/null |
34 |
@@ -1,121 +0,0 @@ |
35 |
-diff --git a/tests/pedantic-header-test.sh.in b/tests/pedantic-header-test.sh.in |
36 |
-index 5ba9b4c..283af64 100755 |
37 |
---- a/tests/pedantic-header-test.sh.in |
38 |
-+++ b/tests/pedantic-header-test.sh.in |
39 |
-@@ -1,58 +1,58 @@ |
40 |
--#!/bin/bash |
41 |
-- |
42 |
--# Copyright (C) 2010-2017 Erik de Castro Lopo <erikd@×××××××××.com> |
43 |
--# |
44 |
--# All rights reserved. |
45 |
--# |
46 |
--# Redistribution and use in source and binary forms, with or without |
47 |
--# modification, are permitted provided that the following conditions are |
48 |
--# met: |
49 |
--# |
50 |
--# * Redistributions of source code must retain the above copyright |
51 |
--# notice, this list of conditions and the following disclaimer. |
52 |
--# * Redistributions in binary form must reproduce the above copyright |
53 |
--# notice, this list of conditions and the following disclaimer in |
54 |
--# the documentation and/or other materials provided with the |
55 |
--# distribution. |
56 |
--# * Neither the author nor the names of any contributors may be used |
57 |
--# to endorse or promote products derived from this software without |
58 |
--# specific prior written permission. |
59 |
--# |
60 |
--# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
61 |
--# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED |
62 |
--# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
63 |
--# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR |
64 |
--# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
65 |
--# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
66 |
--# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; |
67 |
--# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, |
68 |
--# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR |
69 |
--# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
70 |
--# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
71 |
-- |
72 |
-- |
73 |
--if test ! -f @top_srcdir@/tests/sfversion.c ; then |
74 |
-- exit 0 |
75 |
-- fi |
76 |
-- |
77 |
--echo -n " Pedantic header test : " |
78 |
-- |
79 |
--# Only do this if the compiler is GCC. |
80 |
--if test -n "@GCC_MAJOR_VERSION@" ; then |
81 |
-- |
82 |
-- CC=`echo "@CC@" | sed "s/.*shave cc //"` |
83 |
-- # Compile with -Werror and -pedantic. |
84 |
-- $CC -std=c99 -Werror -pedantic -I@top_srcdir@/src -I@abs_top_builddir@/src -I@abs_top_builddir@/include -c @top_srcdir@/tests/sfversion.c -o /dev/null |
85 |
-- |
86 |
-- # Check compiler return status. |
87 |
-- if test $? -ne 0 ; then |
88 |
-- echo |
89 |
-- exit 1 |
90 |
-- fi |
91 |
-- |
92 |
-- echo "ok" |
93 |
--else |
94 |
-- echo "n/a" |
95 |
-- fi |
96 |
-- |
97 |
--exit 0 |
98 |
-+#!/bin/bash |
99 |
-+ |
100 |
-+# Copyright (C) 2010-2017 Erik de Castro Lopo <erikd@×××××××××.com> |
101 |
-+# |
102 |
-+# All rights reserved. |
103 |
-+# |
104 |
-+# Redistribution and use in source and binary forms, with or without |
105 |
-+# modification, are permitted provided that the following conditions are |
106 |
-+# met: |
107 |
-+# |
108 |
-+# * Redistributions of source code must retain the above copyright |
109 |
-+# notice, this list of conditions and the following disclaimer. |
110 |
-+# * Redistributions in binary form must reproduce the above copyright |
111 |
-+# notice, this list of conditions and the following disclaimer in |
112 |
-+# the documentation and/or other materials provided with the |
113 |
-+# distribution. |
114 |
-+# * Neither the author nor the names of any contributors may be used |
115 |
-+# to endorse or promote products derived from this software without |
116 |
-+# specific prior written permission. |
117 |
-+# |
118 |
-+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
119 |
-+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED |
120 |
-+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
121 |
-+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR |
122 |
-+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
123 |
-+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
124 |
-+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; |
125 |
-+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, |
126 |
-+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR |
127 |
-+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
128 |
-+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
129 |
-+ |
130 |
-+ |
131 |
-+if test ! -f @top_srcdir@/tests/sfversion.c ; then |
132 |
-+ exit 0 |
133 |
-+ fi |
134 |
-+ |
135 |
-+echo -n " Pedantic header test : " |
136 |
-+ |
137 |
-+# Only do this if the compiler is GCC. |
138 |
-+if test -n "@GCC_MAJOR_VERSION@" ; then |
139 |
-+ |
140 |
-+ CC=`echo "@CC@" | sed "s/.*shave cc //"` |
141 |
-+ # Compile with -Werror and -pedantic. |
142 |
-+ $CC -std=c99 -Werror -pedantic -I@top_srcdir@/src -I@abs_top_builddir@/src -I@abs_top_builddir@/include -c @top_srcdir@/tests/sfversion.c -o /dev/null |
143 |
-+ |
144 |
-+ # Check compiler return status. |
145 |
-+ if test $? -ne 0 ; then |
146 |
-+ echo |
147 |
-+ exit 1 |
148 |
-+ fi |
149 |
-+ |
150 |
-+ echo "ok" |
151 |
-+else |
152 |
-+ echo "n/a" |
153 |
-+ fi |
154 |
-+ |
155 |
-+exit 0 |
156 |
|
157 |
diff --git a/media-libs/libsndfile/libsndfile-1.0.30.ebuild b/media-libs/libsndfile/libsndfile-1.0.30.ebuild |
158 |
index 1888607bd26..4c56a90eda7 100644 |
159 |
--- a/media-libs/libsndfile/libsndfile-1.0.30.ebuild |
160 |
+++ b/media-libs/libsndfile/libsndfile-1.0.30.ebuild |
161 |
@@ -42,10 +42,6 @@ if [[ ${PV} == *9999 ]]; then |
162 |
" |
163 |
fi |
164 |
|
165 |
-PATCHES=( |
166 |
- "${FILESDIR}/${PN}-1.0.30-fix-nl.patch" |
167 |
-) |
168 |
- |
169 |
pkg_setup() { |
170 |
if use test || [[ ${PV} == *9999 ]]; then |
171 |
python-any-r1_pkg_setup |