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-libs/schroedinger/files/
Date: Wed, 04 Jan 2017 10:15:19
Message-Id: 1483524819.ee3e73a6060eed4ed6ef18f38313fba1d13d3fcf.soap@gentoo
1 commit: ee3e73a6060eed4ed6ef18f38313fba1d13d3fcf
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Fri Dec 30 14:23:16 2016 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 4 10:13:39 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee3e73a6
7
8 media-libs/schroedinger: remove unused patches
9
10 Closes: https://github.com/gentoo/gentoo/pull/3286
11
12 .../files/schroedinger-1.0.10-orc-symbols.patch | 43 ----------------------
13 .../files/schroedinger-1.0.9-asneeded.patch | 11 ------
14 2 files changed, 54 deletions(-)
15
16 diff --git a/media-libs/schroedinger/files/schroedinger-1.0.10-orc-symbols.patch b/media-libs/schroedinger/files/schroedinger-1.0.10-orc-symbols.patch
17 deleted file mode 100644
18 index 6e236ab..00000000
19 --- a/media-libs/schroedinger/files/schroedinger-1.0.10-orc-symbols.patch
20 +++ /dev/null
21 @@ -1,43 +0,0 @@
22 -From: David Schleef <ds@×××××××.org>
23 -Date: Fri, 8 Oct 2010 20:32:11 +0000 (-0700)
24 -Subject: Don't export orc_ symbols and fix related bugs
25 -X-Git-Url: http://diracvideo.schleef.org/git?p=schroedinger.git;a=commitdiff_plain;h=9c4e8a89af9f8ce408e50a0ffab79348e9703df2
26 -
27 -Don't export orc_ symbols and fix related bugs
28 ----
29 -
30 -diff --git a/schroedinger/Makefile.am b/schroedinger/Makefile.am
31 -index b9b10c6..aa5e41c 100644
32 ---- a/schroedinger/Makefile.am
33 -+++ b/schroedinger/Makefile.am
34 -@@ -157,7 +157,7 @@ libschroedinger_@SCHRO_MAJORMINOR@_la_LIBADD = \
35 - libschroedinger_@SCHRO_MAJORMINOR@_la_LDFLAGS = \
36 - -no-undefined \
37 - -version-info $(SCHRO_LIBVERSION) \
38 -- -export-symbols-regex '^(schro|orc)_'
39 -+ -export-symbols-regex '^schro_'
40 -
41 - %.c.gcov: .libs/libschroedinger_@SCHRO_MAJORMINOR@_la-%.gcda %.c
42 - $(GCOV) -b -f -o $^ > $@.out
43 -diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
44 -index fac2e21..92d74fd 100644
45 ---- a/testsuite/Makefile.am
46 -+++ b/testsuite/Makefile.am
47 -@@ -95,7 +95,7 @@ wavelet_gain_curve_SOURCES = wavelet_gain_curve.c
48 -
49 - #wavelet_2d_CFLAGS = $(SCHRO_CFLAGS)
50 - #wavelet_2d_LDADD = $(SCHRO_LIBS)
51 --wavelet_2d_SOURCES = wavelet_2d.c
52 -+wavelet_2d_SOURCES = wavelet_2d.c $(top_srcdir)/schroedinger/tmp-orc.c
53 -
54 - wavelet_noise_2d_SOURCES = wavelet_noise_2d.c
55 -
56 -@@ -113,7 +113,7 @@ motion2_SOURCES = motion2.c
57 -
58 - #quant_CFLAGS =
59 - #quant_LDADD = -lm
60 --quant_SOURCES = quant.c
61 -+quant_SOURCES = quant.c $(top_srcdir)/schroedinger/tmp-orc.c
62 -
63 - #sort_CFLAGS = $(SCHRO_CFLAGS)
64 - #sort_LDADD = $(SCHRO_LIBS)
65
66 diff --git a/media-libs/schroedinger/files/schroedinger-1.0.9-asneeded.patch b/media-libs/schroedinger/files/schroedinger-1.0.9-asneeded.patch
67 deleted file mode 100644
68 index dd67a50..00000000
69 --- a/media-libs/schroedinger/files/schroedinger-1.0.9-asneeded.patch
70 +++ /dev/null
71 @@ -1,11 +0,0 @@
72 ---- testsuite/Makefile.am
73 -+++ testsuite/Makefile.am
74 -@@ -34,7 +34,7 @@
75 -
76 - AM_CFLAGS = $(SCHRO_CFLAGS) $(ERROR_CFLAGS) $(ORC_CFLAGS) \
77 - -DSCHRO_ENABLE_UNSTABLE_API
78 --LDADD = $(LIBM) libschrotest.la $(SCHRO_LIBS)
79 -+LDADD = $(LIBM) libschrotest.la $(SCHRO_LIBS) -lorc-test-0.4
80 -
81 - libschrotest_la_SOURCES = common.c
82 - libschrotest_la_LIBADD = $(SCHRO_LIBS) $(ORC_LIBS) -lorc-test-0.4 $(LIBM)