summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2017-12-09 23:38:19 +0100
committerMichał Górny <mgorny@gentoo.org>2017-12-09 23:40:26 +0100
commitb1fc2c2e7917b871c014c9b7c952f7075a767f73 (patch)
tree63b4ef9ec9e2a8022eeaea1163958c6ed49433fd
parentdev-texlive/texlive-xetex: Update Manifest hashes (diff)
downloadgentoo-b1fc2c2e7917b871c014c9b7c952f7075a767f73.tar.gz
gentoo-b1fc2c2e7917b871c014c9b7c952f7075a767f73.tar.bz2
gentoo-b1fc2c2e7917b871c014c9b7c952f7075a767f73.zip
media-plugins/swh-plugins: [QA] Move patches to a distfile
Closes: https://bugs.gentoo.org/620590
-rw-r--r--media-plugins/swh-plugins/Manifest3
-rw-r--r--media-plugins/swh-plugins/files/swh-plugins-0.4.15-gettext.patch12
-rw-r--r--media-plugins/swh-plugins/files/swh-plugins-0.4.15-glibc-2.10.patch1045
-rw-r--r--media-plugins/swh-plugins/files/swh-plugins-0.4.15-pic.patch135
-rw-r--r--media-plugins/swh-plugins/files/swh-plugins-0.4.15-plugindir.patch13
-rw-r--r--media-plugins/swh-plugins/files/swh-plugins-0.4.15-riceitdown.patch23
-rw-r--r--media-plugins/swh-plugins/files/swh-plugins-0.4.15-system_gsm.patch48
-rw-r--r--media-plugins/swh-plugins/files/swh-plugins-0.4.15-x86-asm-optional.patch16
-rw-r--r--media-plugins/swh-plugins/swh-plugins-0.4.15-r3.ebuild19
9 files changed, 12 insertions, 1302 deletions
diff --git a/media-plugins/swh-plugins/Manifest b/media-plugins/swh-plugins/Manifest
index c0f234b38c7..5b1dd4b8a78 100644
--- a/media-plugins/swh-plugins/Manifest
+++ b/media-plugins/swh-plugins/Manifest
@@ -1 +1,2 @@
-DIST swh-plugins-0.4.15.tar.gz 1051623 SHA256 d05ee8a4f4d92e828412bce3449a034f6ef16bb630eaf60f8fe4e15a89168640 SHA512 b26d11f3887d03d39187b86f8e4061e3808ac03fa49caf24256ae457a0156be5982fe687ed50fa4240ccbb3e6250ed920d1da8c95d57cf4313e127559491eb03 WHIRLPOOL 853af1d3c7f0593be223e722641b797e39c5e55dd09928652834cc5d48f3d1985da645f2e2ae121d9c6669ca709c363936128b5fe062889febf72ee0ed50e4a6
+DIST swh-plugins-0.4.15-patchset.tar.bz2 5208 BLAKE2B 5ed8f49ddec0a8ed34fab05defc9489c6ae563f824f1514845719ee3716847cbeb023152d3ac1522e28712845ecd14ab62b4e4c466e9385a3df6fa3dc9a970ab SHA512 b2d016c52fa3cb90e255f26f1e9f7410b7a44b50e0ede0acc5a3092abbb65fbb455c3c3eb0059083f40556e00f95262a885c8970a8b25c310f73af6913973fc5
+DIST swh-plugins-0.4.15.tar.gz 1051623 BLAKE2B 8b18cd558160b58ad09662b3aea69ce928daa812bb5aa8089423a504a103fa6e29b4663b9bd827230742b1d7c6570c9b671b4a25cdc54e794b465edb36743a07 SHA512 b26d11f3887d03d39187b86f8e4061e3808ac03fa49caf24256ae457a0156be5982fe687ed50fa4240ccbb3e6250ed920d1da8c95d57cf4313e127559491eb03
diff --git a/media-plugins/swh-plugins/files/swh-plugins-0.4.15-gettext.patch b/media-plugins/swh-plugins/files/swh-plugins-0.4.15-gettext.patch
deleted file mode 100644
index 917898356e1..00000000000
--- a/media-plugins/swh-plugins/files/swh-plugins-0.4.15-gettext.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: swh-plugins-0.4.15/configure.in
-===================================================================
---- swh-plugins-0.4.15.orig/configure.in
-+++ swh-plugins-0.4.15/configure.in
-@@ -52,6 +52,7 @@ AC_PROG_CC
- AC_REQUIRE_CPP
- ALL_LINGUAS="en_GB"
- AM_GNU_GETTEXT([external])
-+AM_GNU_GETTEXT_VERSION([0.13])
- AC_C_BIGENDIAN
-
- LIBS="$LIBS -lm"
diff --git a/media-plugins/swh-plugins/files/swh-plugins-0.4.15-glibc-2.10.patch b/media-plugins/swh-plugins/files/swh-plugins-0.4.15-glibc-2.10.patch
deleted file mode 100644
index f2c07a2b146..00000000000
--- a/media-plugins/swh-plugins/files/swh-plugins-0.4.15-glibc-2.10.patch
+++ /dev/null
@@ -1,1045 +0,0 @@
-diff -ur a/alias_1407.c b/alias_1407.c
---- a/alias_1407.c 2004-10-26 17:35:36.000000000 +0400
-+++ b/alias_1407.c 2009-06-13 14:35:24.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/allpass_1895.c b/allpass_1895.c
---- a/allpass_1895.c 2004-10-26 17:35:42.000000000 +0400
-+++ b/allpass_1895.c 2009-06-13 14:38:16.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/am_pitchshift_1433.c b/am_pitchshift_1433.c
---- a/am_pitchshift_1433.c 2004-10-26 17:35:40.000000000 +0400
-+++ b/am_pitchshift_1433.c 2009-06-13 14:38:25.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/amp_1181.c b/amp_1181.c
---- a/amp_1181.c 2004-10-26 17:35:32.000000000 +0400
-+++ b/amp_1181.c 2009-06-12 17:13:46.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/analogue_osc_1416.c b/analogue_osc_1416.c
---- a/analogue_osc_1416.c 2004-10-26 17:35:38.000000000 +0400
-+++ b/analogue_osc_1416.c 2009-06-13 14:38:36.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/bandpass_a_iir_1893.c b/bandpass_a_iir_1893.c
---- a/bandpass_a_iir_1893.c 2004-10-26 17:35:41.000000000 +0400
-+++ b/bandpass_a_iir_1893.c 2009-06-13 14:38:42.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/bandpass_iir_1892.c b/bandpass_iir_1892.c
---- a/bandpass_iir_1892.c 2004-10-26 17:35:41.000000000 +0400
-+++ b/bandpass_iir_1892.c 2009-06-13 14:38:48.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/bode_shifter_1431.c b/bode_shifter_1431.c
---- a/bode_shifter_1431.c 2004-10-26 17:35:40.000000000 +0400
-+++ b/bode_shifter_1431.c 2009-06-13 14:38:54.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/bode_shifter_cv_1432.c b/bode_shifter_cv_1432.c
---- a/bode_shifter_cv_1432.c 2004-10-26 17:35:40.000000000 +0400
-+++ b/bode_shifter_cv_1432.c 2009-06-13 14:39:00.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/butterworth_1902.c b/butterworth_1902.c
---- a/butterworth_1902.c 2004-10-26 17:35:42.000000000 +0400
-+++ b/butterworth_1902.c 2009-06-13 14:39:07.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/chebstortion_1430.c b/chebstortion_1430.c
---- a/chebstortion_1430.c 2004-10-26 17:35:40.000000000 +0400
-+++ b/chebstortion_1430.c 2009-06-13 14:39:13.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/comb_1190.c b/comb_1190.c
---- a/comb_1190.c 2004-10-26 17:35:32.000000000 +0400
-+++ b/comb_1190.c 2009-06-12 17:26:17.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/comb_1887.c b/comb_1887.c
---- a/comb_1887.c 2004-10-26 17:35:42.000000000 +0400
-+++ b/comb_1887.c 2009-06-13 14:45:46.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/comb_splitter_1411.c b/comb_splitter_1411.c
---- a/comb_splitter_1411.c 2004-10-26 17:35:37.000000000 +0400
-+++ b/comb_splitter_1411.c 2009-06-13 14:36:12.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/const_1909.c b/const_1909.c
---- a/const_1909.c 2004-10-26 17:35:43.000000000 +0400
-+++ b/const_1909.c 2009-06-13 14:49:01.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/crossover_dist_1404.c b/crossover_dist_1404.c
---- a/crossover_dist_1404.c 2005-07-20 15:36:59.000000000 +0400
-+++ b/crossover_dist_1404.c 2009-06-13 14:31:57.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/dc_remove_1207.c b/dc_remove_1207.c
---- a/dc_remove_1207.c 2004-10-26 17:35:34.000000000 +0400
-+++ b/dc_remove_1207.c 2009-06-12 17:31:35.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/decay_1886.c b/decay_1886.c
---- a/decay_1886.c 2004-10-26 17:35:43.000000000 +0400
-+++ b/decay_1886.c 2009-06-13 14:46:06.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/decimator_1202.c b/decimator_1202.c
---- a/decimator_1202.c 2004-10-26 17:35:33.000000000 +0400
-+++ b/decimator_1202.c 2009-06-12 17:29:58.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/declip_1195.c b/declip_1195.c
---- a/declip_1195.c 2004-10-26 17:35:32.000000000 +0400
-+++ b/declip_1195.c 2009-06-12 17:27:08.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/delay_1898.c b/delay_1898.c
---- a/delay_1898.c 2004-10-26 17:35:43.000000000 +0400
-+++ b/delay_1898.c 2009-06-13 14:46:20.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/delayorama_1402.c b/delayorama_1402.c
---- a/delayorama_1402.c 2004-10-26 17:35:36.000000000 +0400
-+++ b/delayorama_1402.c 2009-06-13 14:31:08.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/diode_1185.c b/diode_1185.c
---- a/diode_1185.c 2004-10-26 17:35:32.000000000 +0400
-+++ b/diode_1185.c 2009-06-12 17:16:36.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/divider_1186.c b/divider_1186.c
---- a/divider_1186.c 2004-10-26 17:35:32.000000000 +0400
-+++ b/divider_1186.c 2009-06-12 17:19:08.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/dj_eq_1901.c b/dj_eq_1901.c
---- a/dj_eq_1901.c 2004-10-26 17:35:42.000000000 +0400
-+++ b/dj_eq_1901.c 2009-06-13 14:44:52.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/dj_flanger_1438.c b/dj_flanger_1438.c
---- a/dj_flanger_1438.c 2004-10-26 17:35:40.000000000 +0400
-+++ b/dj_flanger_1438.c 2009-06-13 14:44:55.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/dyson_compress_1403.c b/dyson_compress_1403.c
---- a/dyson_compress_1403.c 2004-10-26 17:35:36.000000000 +0400
-+++ b/dyson_compress_1403.c 2009-06-13 14:31:22.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/fad_delay_1192.c b/fad_delay_1192.c
---- a/fad_delay_1192.c 2005-07-20 15:36:51.000000000 +0400
-+++ b/fad_delay_1192.c 2009-06-12 17:31:17.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/fast_lookahead_limiter_1913.c b/fast_lookahead_limiter_1913.c
---- a/fast_lookahead_limiter_1913.c 2006-08-08 19:49:13.000000000 +0400
-+++ b/fast_lookahead_limiter_1913.c 2009-06-13 14:46:45.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/flanger_1191.c b/flanger_1191.c
---- a/flanger_1191.c 2004-10-26 17:35:33.000000000 +0400
-+++ b/flanger_1191.c 2009-06-12 17:29:41.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/fm_osc_1415.c b/fm_osc_1415.c
---- a/fm_osc_1415.c 2004-10-26 17:35:38.000000000 +0400
-+++ b/fm_osc_1415.c 2009-06-13 14:41:09.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/foldover_1213.c b/foldover_1213.c
---- a/foldover_1213.c 2004-10-26 17:35:35.000000000 +0400
-+++ b/foldover_1213.c 2009-06-13 14:20:25.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/foverdrive_1196.c b/foverdrive_1196.c
---- a/foverdrive_1196.c 2004-10-26 17:35:33.000000000 +0400
-+++ b/foverdrive_1196.c 2009-06-12 17:28:24.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/freq_tracker_1418.c b/freq_tracker_1418.c
---- a/freq_tracker_1418.c 2004-10-26 17:35:38.000000000 +0400
-+++ b/freq_tracker_1418.c 2009-06-13 14:42:12.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/gate_1410.c b/gate_1410.c
---- a/gate_1410.c 2004-10-26 17:35:37.000000000 +0400
-+++ b/gate_1410.c 2009-06-13 14:35:59.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/giant_flange_1437.c b/giant_flange_1437.c
---- a/giant_flange_1437.c 2004-10-26 17:35:41.000000000 +0400
-+++ b/giant_flange_1437.c 2009-06-13 14:41:24.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/gong_1424.c b/gong_1424.c
---- a/gong_1424.c 2004-10-26 17:35:39.000000000 +0400
-+++ b/gong_1424.c 2009-06-13 14:41:17.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/gong_beater_1439.c b/gong_beater_1439.c
---- a/gong_beater_1439.c 2004-10-26 17:35:41.000000000 +0400
-+++ b/gong_beater_1439.c 2009-06-13 14:45:27.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/gsm_1215.c b/gsm_1215.c
---- a/gsm_1215.c 2004-10-26 17:35:35.000000000 +0400
-+++ b/gsm_1215.c 2009-06-13 14:28:45.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/gverb_1216.c b/gverb_1216.c
---- a/gverb_1216.c 2004-10-26 17:35:35.000000000 +0400
-+++ b/gverb_1216.c 2009-06-13 14:29:13.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/hard_limiter_1413.c b/hard_limiter_1413.c
---- a/hard_limiter_1413.c 2004-10-26 17:35:37.000000000 +0400
-+++ b/hard_limiter_1413.c 2009-06-13 14:30:04.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/harmonic_gen_1220.c b/harmonic_gen_1220.c
---- a/harmonic_gen_1220.c 2004-10-26 17:35:36.000000000 +0400
-+++ b/harmonic_gen_1220.c 2009-06-13 14:30:44.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/hermes_filter_1200.c b/hermes_filter_1200.c
---- a/hermes_filter_1200.c 2004-10-26 17:35:33.000000000 +0400
-+++ b/hermes_filter_1200.c 2009-06-12 17:29:01.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/highpass_iir_1890.c b/highpass_iir_1890.c
---- a/highpass_iir_1890.c 2004-10-26 17:35:41.000000000 +0400
-+++ b/highpass_iir_1890.c 2009-06-13 14:43:51.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/hilbert_1440.c b/hilbert_1440.c
---- a/hilbert_1440.c 2004-10-26 17:35:41.000000000 +0400
-+++ b/hilbert_1440.c 2009-06-13 14:43:48.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/imp_1199.c b/imp_1199.c
---- a/imp_1199.c 2006-08-08 19:49:15.000000000 +0400
-+++ b/imp_1199.c 2009-06-13 14:43:43.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/impulse_1885.c b/impulse_1885.c
---- a/impulse_1885.c 2004-10-26 17:35:43.000000000 +0400
-+++ b/impulse_1885.c 2009-06-13 14:43:40.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/inv_1429.c b/inv_1429.c
---- a/inv_1429.c 2004-10-26 17:35:40.000000000 +0400
-+++ b/inv_1429.c 2009-06-13 14:43:34.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/karaoke_1409.c b/karaoke_1409.c
---- a/karaoke_1409.c 2004-10-26 17:35:37.000000000 +0400
-+++ b/karaoke_1409.c 2009-06-13 14:35:45.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/latency_1914.c b/latency_1914.c
---- a/latency_1914.c 2004-10-26 17:35:44.000000000 +0400
-+++ b/latency_1914.c 2009-06-13 14:46:57.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/lcr_delay_1436.c b/lcr_delay_1436.c
---- a/lcr_delay_1436.c 2004-10-26 17:35:40.000000000 +0400
-+++ b/lcr_delay_1436.c 2009-06-13 14:44:08.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/lowpass_iir_1891.c b/lowpass_iir_1891.c
---- a/lowpass_iir_1891.c 2004-10-26 17:35:42.000000000 +0400
-+++ b/lowpass_iir_1891.c 2009-06-13 14:44:23.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/ls_filter_1908.c b/ls_filter_1908.c
---- a/ls_filter_1908.c 2004-10-26 17:35:43.000000000 +0400
-+++ b/ls_filter_1908.c 2009-06-13 14:44:27.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/matrix_ms_st_1421.c b/matrix_ms_st_1421.c
---- a/matrix_ms_st_1421.c 2004-10-26 17:35:38.000000000 +0400
-+++ b/matrix_ms_st_1421.c 2009-06-13 14:42:39.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/matrix_spatialiser_1422.c b/matrix_spatialiser_1422.c
---- a/matrix_spatialiser_1422.c 2004-10-26 17:35:38.000000000 +0400
-+++ b/matrix_spatialiser_1422.c 2009-06-13 14:42:44.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/matrix_st_ms_1420.c b/matrix_st_ms_1420.c
---- a/matrix_st_ms_1420.c 2004-10-26 17:35:38.000000000 +0400
-+++ b/matrix_st_ms_1420.c 2009-06-13 14:42:48.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/mbeq_1197.c b/mbeq_1197.c
---- a/mbeq_1197.c 2006-08-08 19:49:15.000000000 +0400
-+++ b/mbeq_1197.c 2009-06-13 14:42:52.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/mod_delay_1419.c b/mod_delay_1419.c
---- a/mod_delay_1419.c 2004-10-26 17:35:38.000000000 +0400
-+++ b/mod_delay_1419.c 2009-06-13 14:42:21.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/multivoice_chorus_1201.c b/multivoice_chorus_1201.c
---- a/multivoice_chorus_1201.c 2004-10-26 17:35:33.000000000 +0400
-+++ b/multivoice_chorus_1201.c 2009-06-12 17:29:23.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/notch_iir_1894.c b/notch_iir_1894.c
---- a/notch_iir_1894.c 2004-10-26 17:35:42.000000000 +0400
-+++ b/notch_iir_1894.c 2009-06-13 14:42:30.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/phasers_1217.c b/phasers_1217.c
---- a/phasers_1217.c 2004-10-26 17:35:35.000000000 +0400
-+++ b/phasers_1217.c 2009-06-13 14:30:24.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/pitch_scale_1193.c b/pitch_scale_1193.c
---- a/pitch_scale_1193.c 2004-10-26 17:35:44.000000000 +0400
-+++ b/pitch_scale_1193.c 2009-06-13 14:42:03.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/pitch_scale_1194.c b/pitch_scale_1194.c
---- a/pitch_scale_1194.c 2004-10-26 17:35:44.000000000 +0400
-+++ b/pitch_scale_1194.c 2009-06-13 14:41:59.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/plate_1423.c b/plate_1423.c
---- a/plate_1423.c 2004-10-26 17:35:39.000000000 +0400
-+++ b/plate_1423.c 2009-06-13 14:41:55.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/pointer_cast_1910.c b/pointer_cast_1910.c
---- a/pointer_cast_1910.c 2004-10-26 17:35:43.000000000 +0400
-+++ b/pointer_cast_1910.c 2009-06-13 14:41:50.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/rate_shifter_1417.c b/rate_shifter_1417.c
---- a/rate_shifter_1417.c 2004-10-26 17:35:38.000000000 +0400
-+++ b/rate_shifter_1417.c 2009-06-13 14:41:44.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/retro_flange_1208.c b/retro_flange_1208.c
---- a/retro_flange_1208.c 2004-10-26 17:35:34.000000000 +0400
-+++ b/retro_flange_1208.c 2009-06-12 17:42:45.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/revdelay_1605.c b/revdelay_1605.c
---- a/revdelay_1605.c 2004-10-26 17:35:43.000000000 +0400
-+++ b/revdelay_1605.c 2009-06-13 14:46:32.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/ringmod_1188.c b/ringmod_1188.c
---- a/ringmod_1188.c 2004-10-26 17:35:32.000000000 +0400
-+++ b/ringmod_1188.c 2009-06-12 17:24:55.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/satan_maximiser_1408.c b/satan_maximiser_1408.c
---- a/satan_maximiser_1408.c 2004-10-26 17:35:37.000000000 +0400
-+++ b/satan_maximiser_1408.c 2009-06-13 14:35:36.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/sc1_1425.c b/sc1_1425.c
---- a/sc1_1425.c 2004-10-26 17:35:39.000000000 +0400
-+++ b/sc1_1425.c 2009-06-13 14:43:09.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/sc2_1426.c b/sc2_1426.c
---- a/sc2_1426.c 2004-10-26 17:35:39.000000000 +0400
-+++ b/sc2_1426.c 2009-06-13 14:37:55.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/sc3_1427.c b/sc3_1427.c
---- a/sc3_1427.c 2004-10-26 17:35:39.000000000 +0400
-+++ b/sc3_1427.c 2009-06-13 14:37:48.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/sc4_1882.c b/sc4_1882.c
---- a/sc4_1882.c 2005-07-20 15:37:15.000000000 +0400
-+++ b/sc4_1882.c 2009-06-13 14:37:41.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/sc4m_1916.c b/sc4m_1916.c
---- a/sc4m_1916.c 2006-08-08 19:49:14.000000000 +0400
-+++ b/sc4m_1916.c 2009-06-13 14:37:27.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/se4_1883.c b/se4_1883.c
---- a/se4_1883.c 2004-10-26 17:35:41.000000000 +0400
-+++ b/se4_1883.c 2009-06-13 14:37:22.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/shaper_1187.c b/shaper_1187.c
---- a/shaper_1187.c 2004-10-26 17:35:32.000000000 +0400
-+++ b/shaper_1187.c 2009-06-12 17:20:04.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/sifter_1210.c b/sifter_1210.c
---- a/sifter_1210.c 2004-10-26 17:35:34.000000000 +0400
-+++ b/sifter_1210.c 2009-06-12 17:43:33.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/sin_cos_1881.c b/sin_cos_1881.c
---- a/sin_cos_1881.c 2004-10-26 17:35:41.000000000 +0400
-+++ b/sin_cos_1881.c 2009-06-13 14:40:51.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/single_para_1203.c b/single_para_1203.c
---- a/single_para_1203.c 2004-10-26 17:35:34.000000000 +0400
-+++ b/single_para_1203.c 2009-06-12 17:30:27.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/sinus_wavewrapper_1198.c b/sinus_wavewrapper_1198.c
---- a/sinus_wavewrapper_1198.c 2004-10-26 17:35:33.000000000 +0400
-+++ b/sinus_wavewrapper_1198.c 2009-06-12 17:28:42.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/smooth_decimate_1414.c b/smooth_decimate_1414.c
---- a/smooth_decimate_1414.c 2004-10-26 17:35:38.000000000 +0400
-+++ b/smooth_decimate_1414.c 2009-06-13 14:40:12.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/split_1406.c b/split_1406.c
---- a/split_1406.c 2004-10-26 17:35:37.000000000 +0400
-+++ b/split_1406.c 2009-06-13 14:35:10.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/step_muxer_1212.c b/step_muxer_1212.c
---- a/step_muxer_1212.c 2004-10-26 17:35:35.000000000 +0400
-+++ b/step_muxer_1212.c 2009-06-13 14:19:49.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/surround_encoder_1401.c b/surround_encoder_1401.c
---- a/surround_encoder_1401.c 2004-10-26 17:35:36.000000000 +0400
-+++ b/surround_encoder_1401.c 2009-06-13 14:30:56.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/svf_1214.c b/svf_1214.c
---- a/svf_1214.c 2006-08-08 19:48:36.000000000 +0400
-+++ b/svf_1214.c 2009-06-13 14:21:03.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/tape_delay_1211.c b/tape_delay_1211.c
---- a/tape_delay_1211.c 2005-07-20 15:36:53.000000000 +0400
-+++ b/tape_delay_1211.c 2009-06-12 17:43:51.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/transient_1206.c b/transient_1206.c
---- a/transient_1206.c 2004-10-26 17:35:34.000000000 +0400
-+++ b/transient_1206.c 2009-06-12 17:31:00.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/triple_para_1204.c b/triple_para_1204.c
---- a/triple_para_1204.c 2004-10-26 17:35:34.000000000 +0400
-+++ b/triple_para_1204.c 2009-06-12 17:30:40.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/valve_1209.c b/valve_1209.c
---- a/valve_1209.c 2006-08-08 19:48:34.000000000 +0400
-+++ b/valve_1209.c 2009-06-12 17:43:08.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/valve_rect_1405.c b/valve_rect_1405.c
---- a/valve_rect_1405.c 2004-10-26 17:35:36.000000000 +0400
-+++ b/valve_rect_1405.c 2009-06-13 14:32:11.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/vynil_1905.c b/vynil_1905.c
---- a/vynil_1905.c 2004-10-26 17:35:43.000000000 +0400
-+++ b/vynil_1905.c 2009-06-13 14:37:13.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/wave_terrain_1412.c b/wave_terrain_1412.c
---- a/wave_terrain_1412.c 2004-10-26 17:35:37.000000000 +0400
-+++ b/wave_terrain_1412.c 2009-06-13 14:36:28.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/xfade_1915.c b/xfade_1915.c
---- a/xfade_1915.c 2005-07-20 15:37:32.000000000 +0400
-+++ b/xfade_1915.c 2009-06-13 14:40:40.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
-diff -ur a/zm1_1428.c b/zm1_1428.c
---- a/zm1_1428.c 2004-10-26 17:35:39.000000000 +0400
-+++ b/zm1_1428.c 2009-06-13 14:40:45.000000000 +0400
-@@ -6,6 +6,7 @@
-
- #ifdef ENABLE_NLS
- #include <libintl.h>
-+#include <locale.h>
- #endif
-
- #define _ISOC9X_SOURCE 1
diff --git a/media-plugins/swh-plugins/files/swh-plugins-0.4.15-pic.patch b/media-plugins/swh-plugins/files/swh-plugins-0.4.15-pic.patch
deleted file mode 100644
index 58fcd64bce8..00000000000
--- a/media-plugins/swh-plugins/files/swh-plugins-0.4.15-pic.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-Index: swh-plugins-0.4.15/gsm/Makefile.am
-===================================================================
---- swh-plugins-0.4.15.orig/gsm/Makefile.am
-+++ swh-plugins-0.4.15/gsm/Makefile.am
-@@ -2,12 +2,12 @@ LIBTOOL=libtool
- RANLIB=ranlib
-
- noinst_HEADERS = gsm.h config.h private.h proto.h unproto.h
--noinst_LIBRARIES = libgsm.a
-+noinst_LTLIBRARIES = libgsm.la
-
- CFILES = add.c decode.c gsm_decode.c gsm_encode.c long_term.c preprocess.c \
- short_term.c code.c gsm_create.c gsm_destroy.c gsm_option.c lpc.c rpe.c table.c
-
--libgsm_a_SOURCES = $(CFILES) $(noinst_HEADERS)
-+libgsm_la_SOURCES = $(CFILES) $(noinst_HEADERS)
-
- # Disable autoheader.
- AUTOHEADER=echo
-Index: swh-plugins-0.4.15/Makefile.am
-===================================================================
---- swh-plugins-0.4.15.orig/Makefile.am
-+++ swh-plugins-0.4.15/Makefile.am
-@@ -48,10 +48,10 @@ DESTDIR = $(INSTALL_ROOT)
- DISTFN = $(distdir)
-
- # Files needed for FFT based plugins
--pitch_scale_1193_la_LIBADD = util/libpitchscale.a $(FFTW_LIBS)
-+pitch_scale_1193_la_LIBADD = util/libpitchscale.la $(FFTW_LIBS)
- pitch_scale_1193_la_CFLAGS = $(FFTW_CFLAGS)
- pitch_scale_1193_la_SOURCES = pitch_scale_1193.c
--pitch_scale_1194_la_LIBADD = util/libpitchscale.a $(FFTW_LIBS)
-+pitch_scale_1194_la_LIBADD = util/libpitchscale.la $(FFTW_LIBS)
- pitch_scale_1194_la_CFLAGS = $(FFTW_CFLAGS)
- pitch_scale_1194_la_SOURCES = pitch_scale_1194.c
- mbeq_1197_la_LIBADD = $(FFTW_LIBS)
-@@ -60,33 +60,33 @@ mbeq_1197_la_SOURCES = mbeq_1197.c
- imp_1199_la_LIBADD = $(FFTW_LIBS)
- imp_1199_la_CFLAGS = $(FFTW_CFLAGS)
- imp_1199_la_DEPENDENCIES = @top_srcdir@/impulses/*
--hermes_filter_1200_la_DEPENDENCIES = util/libblo.a
--hermes_filter_1200_la_LIBADD = util/libblo.a
--fm_osc_1415_la_DEPENDENCIES = util/libblo.a
--fm_osc_1415_la_LIBADD = util/libblo.a
--analogue_osc_1416_la_DEPENDENCIES = util/libblo.a
--analogue_osc_1416_la_LIBADD = util/libblo.a
--sc1_1425_la_LIBADD = util/libdb.a util/librms.a
--sc2_1426_la_LIBADD = util/libdb.a util/librms.a
--sc3_1427_la_LIBADD = util/libdb.a util/librms.a
--sc4_1882_la_LIBADD = util/libdb.a util/librms.a
--sc4m_1916_la_LIBADD = util/libdb.a util/librms.a
--se4_1883_la_LIBADD = util/libdb.a util/librms.a
--gsm_1215_la_LIBADD = gsm/libgsm.a
--gverb_1216_la_LIBADD = gverb/libgverb.a
-+hermes_filter_1200_la_DEPENDENCIES = util/libblo.la
-+hermes_filter_1200_la_LIBADD = util/libblo.la
-+fm_osc_1415_la_DEPENDENCIES = util/libblo.la
-+fm_osc_1415_la_LIBADD = util/libblo.la
-+analogue_osc_1416_la_DEPENDENCIES = util/libblo.la
-+analogue_osc_1416_la_LIBADD = util/libblo.la
-+sc1_1425_la_LIBADD = util/libdb.la util/librms.la
-+sc2_1426_la_LIBADD = util/libdb.la util/librms.la
-+sc3_1427_la_LIBADD = util/libdb.la util/librms.la
-+sc4_1882_la_LIBADD = util/libdb.la util/librms.la
-+sc4m_1916_la_LIBADD = util/libdb.la util/librms.la
-+se4_1883_la_LIBADD = util/libdb.la util/librms.la
-+gsm_1215_la_LIBADD = gsm/libgsm.la
-+gverb_1216_la_LIBADD = gverb/libgverb.la
- lcr_delay_1436_la_DEPENDENCIES = util/biquad.h
-
--highpass_iir_1890_la_LIBADD = util/libiir.a
-+highpass_iir_1890_la_LIBADD = util/libiir.la
- highpass_iir_1890_la_SOURCES = highpass_iir_1890.c
--lowpass_iir_1891_la_LIBADD = util/libiir.a
-+lowpass_iir_1891_la_LIBADD = util/libiir.la
- lowpass_iir_1891_la_SOURCES = lowpass_iir_1891.c
--bandpass_iir_1892_la_LIBADD = util/libiir.a
-+bandpass_iir_1892_la_LIBADD = util/libiir.la
- bandpass_iir_1892_la_SOURCES = bandpass_iir_1892.c
--bandpass_a_iir_1893_la_LIBADD = util/libiir.a
-+bandpass_a_iir_1893_la_LIBADD = util/libiir.la
- bandpass_a_iir_1893_la_SOURCES = bandpass_a_iir_1893.c
--notch_iir_1894_la_LIBADD = util/libiir.a
-+notch_iir_1894_la_LIBADD = util/libiir.la
- notch_iir_1894_la_SOURCES = notch_iir_1894.c
--butterworth_1902_la_LIBADD = util/libiir.a
-+butterworth_1902_la_LIBADD = util/libiir.la
- butterworth_1902_la_SOURCES = butterworth_1902.c
-
- # Rule to build .c files from XML source
-Index: swh-plugins-0.4.15/util/Makefile.am
-===================================================================
---- swh-plugins-0.4.15.orig/util/Makefile.am
-+++ swh-plugins-0.4.15/util/Makefile.am
-@@ -3,16 +3,16 @@ RANLIB=ranlib
-
- noinst_HEADERS = rms.h db.h blo.h pitchscale.h waveguide_nl.h biquad.h iir.h buffer.h ls_filter.h
-
--noinst_LIBRARIES = librms.a libdb.a libblo.a libpitchscale.a libiir.a
-+noinst_LTLIBRARIES = librms.la libdb.la libblo.la libpitchscale.la libiir.la
-
--librms_a_SOURCES = rms.c
--libdb_a_SOURCES = db.c
--libblo_a_SOURCES = blo.c
--libblo_a_CFLAGS = -I@top_srcdir@
--libpitchscale_a_SOURCES = pitchscale.c
--libpitchscale_a_CFLAGS = $(FFTW_CFLAGS)
-+librms_la_SOURCES = rms.c
-+libdb_la_SOURCES = db.c
-+libblo_la_SOURCES = blo.c
-+libblo_la_CFLAGS = -I@top_srcdir@
-+libpitchscale_la_SOURCES = pitchscale.c
-+libpitchscale_la_CFLAGS = $(FFTW_CFLAGS)
- #libpitchscale_a_LIBS = $(FFTW_LIBS)
--libiir_a_SOURCES = iir.c
-+libiir_la_SOURCES = iir.c
- #libbuffer_a_SOURCES = buffer.c
- # Disable autoheader.
- AUTOHEADER=echo
-Index: swh-plugins-0.4.15/gverb/Makefile.am
-===================================================================
---- swh-plugins-0.4.15.orig/gverb/Makefile.am
-+++ swh-plugins-0.4.15/gverb/Makefile.am
-@@ -3,9 +3,9 @@ RANLIB=ranlib
-
- noinst_HEADERS = gverb.h gverbdsp.h
-
--noinst_LIBRARIES = libgverb.a
-+noinst_LTLIBRARIES = libgverb.la
-
--libgverb_a_SOURCES = gverb.c gverbdsp.c
-+libgverb_la_SOURCES = gverb.c gverbdsp.c
-
- # Disable autoheader.
- AUTOHEADER=echo
diff --git a/media-plugins/swh-plugins/files/swh-plugins-0.4.15-plugindir.patch b/media-plugins/swh-plugins/files/swh-plugins-0.4.15-plugindir.patch
deleted file mode 100644
index 011ea988209..00000000000
--- a/media-plugins/swh-plugins/files/swh-plugins-0.4.15-plugindir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: swh-plugins-0.4.15/Makefile.am
-===================================================================
---- swh-plugins-0.4.15.orig/Makefile.am
-+++ swh-plugins-0.4.15/Makefile.am
-@@ -39,7 +39,7 @@ SUBDIRS = m4 po util gsm gverb metadata
- EXTRA_DIST = @top_srcdir@/*.xml @top_srcdir@/*.c @top_srcdir@/*.h \
- @top_srcdir@/*.dtd @top_srcdir@/*.pl @top_srcdir@/*.css \
- @top_srcdir@/impulses/*.h autogen.sh bozosoity-checker.pl
--plugindir = @prefix@/lib/ladspa
-+plugindir = $(libdir)/ladspa
-
- # Uncomment below for Darwin support. Or add a conditional for this.
- #AM_CFLAGS = -fno-common -flat_namespace -bundle -undefined suppress -lbundle1.o
diff --git a/media-plugins/swh-plugins/files/swh-plugins-0.4.15-riceitdown.patch b/media-plugins/swh-plugins/files/swh-plugins-0.4.15-riceitdown.patch
deleted file mode 100644
index f514425e2a9..00000000000
--- a/media-plugins/swh-plugins/files/swh-plugins-0.4.15-riceitdown.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: swh-plugins-0.4.15/configure.in
-===================================================================
---- swh-plugins-0.4.15.orig/configure.in
-+++ swh-plugins-0.4.15/configure.in
-@@ -99,12 +99,12 @@ else
- AC_MSG_WARN([Can't find architecture specifaction in CFLAGS, picking one from build host CPU type])
- AC_MSG_WARN([May result in non-portable code])
- dnl For gcc use:
-- MACHINE="-march=${build_cpu}"
-- if test ${build_cpu} = "powerpc"; then MACHINE=""; fi
-- if test ${build_cpu} = "powerpc64"; then MACHINE=""; fi
-- if test ${build_cpu} = "x86_64"; then MACHINE=""; fi
--
-- CFLAGS="$CFLAGS -Wall -O3 -fomit-frame-pointer -fstrength-reduce -funroll-loops -ffast-math -fPIC -DPIC ${MACHINE} ${USE_SSE} ${DARWIN_CFLAGS}"
-+ # MACHINE="-march=${build_cpu}"
-+ # if test ${build_cpu} = "powerpc"; then MACHINE=""; fi
-+ # if test ${build_cpu} = "powerpc64"; then MACHINE=""; fi
-+ # if test ${build_cpu} = "x86_64"; then MACHINE=""; fi
-+ #
-+ # CFLAGS="$CFLAGS -Wall -O3 -fomit-frame-pointer -fstrength-reduce -funroll-loops -ffast-math -fPIC -DPIC ${MACHINE} ${USE_SSE} ${DARWIN_CFLAGS}"
-
- dnl For Intel's C compiler use:
- dnl CC="icc"
diff --git a/media-plugins/swh-plugins/files/swh-plugins-0.4.15-system_gsm.patch b/media-plugins/swh-plugins/files/swh-plugins-0.4.15-system_gsm.patch
deleted file mode 100644
index cc80af1f58c..00000000000
--- a/media-plugins/swh-plugins/files/swh-plugins-0.4.15-system_gsm.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: swh-plugins-0.4.15/Makefile.am
-===================================================================
---- swh-plugins-0.4.15.orig/Makefile.am
-+++ swh-plugins-0.4.15/Makefile.am
-@@ -33,7 +33,7 @@ plugin_LTLIBRARIES = \
- latency_1914.la xfade_1915.la sc4m_1916.la \
- mbeq_1197.la pitch_scale_1193.la pitch_scale_1194.la imp_1199.la
-
--SUBDIRS = m4 po util gsm gverb metadata
-+SUBDIRS = m4 po util gverb metadata
-
- # Wacky stuff to stop automake getting confused
- EXTRA_DIST = @top_srcdir@/*.xml @top_srcdir@/*.c @top_srcdir@/*.h \
-@@ -72,7 +72,7 @@ sc3_1427_la_LIBADD = util/libdb.la util/
- sc4_1882_la_LIBADD = util/libdb.la util/librms.la
- sc4m_1916_la_LIBADD = util/libdb.la util/librms.la
- se4_1883_la_LIBADD = util/libdb.la util/librms.la
--gsm_1215_la_LIBADD = gsm/libgsm.la
-+gsm_1215_la_LIBADD = @GSM_LIBS@
- gverb_1216_la_LIBADD = gverb/libgverb.la
- lcr_delay_1436_la_DEPENDENCIES = util/biquad.h
-
-Index: swh-plugins-0.4.15/configure.in
-===================================================================
---- swh-plugins-0.4.15.orig/configure.in
-+++ swh-plugins-0.4.15/configure.in
-@@ -136,17 +136,19 @@ else
- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}")
- fi
-
--subdirs="util gsm gverb metadata"
-+GSM_LIBS=-lgsm
-+
-+subdirs="util gverb metadata"
-
- AC_SUBST(subdirs)
- AC_SUBST(FFTW_LIBS)
- AC_SUBST(STATIC_FFTW_LIBS)
- AC_SUBST(FFTW_CFLAGS)
-+AC_SUBST(GSM_LIBS)
- AC_SUBST(LIBTOOL)
- AC_OUTPUT([ m4/Makefile
- Makefile
- util/Makefile
--gsm/Makefile
- gverb/Makefile
- metadata/Makefile
- po/Makefile.in
diff --git a/media-plugins/swh-plugins/files/swh-plugins-0.4.15-x86-asm-optional.patch b/media-plugins/swh-plugins/files/swh-plugins-0.4.15-x86-asm-optional.patch
deleted file mode 100644
index b18ff39948e..00000000000
--- a/media-plugins/swh-plugins/files/swh-plugins-0.4.15-x86-asm-optional.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur swh-plugins-0.4.15/configure.in swh-plugins-0.4.15-teknohog/configure.in
---- swh-plugins-0.4.15/configure.in 2006-08-08 18:47:16.000000000 +0300
-+++ swh-plugins-0.4.15-teknohog/configure.in 2012-07-04 16:20:19.000000000 +0300
-@@ -87,9 +87,9 @@
- AC_CHECK_FUNC(shm_open,,[AC_CHECK_LIB(rt,shm_open)])
- AC_C99_FUNC_LRINTF()
-
--AC_ARG_ENABLE(3dnow, [ --enable-3dnow Enables 3DNow! acceleration], AC_DEFINE_UNQUOTED(ACCEL_3DNOW, ""))
--AC_ARG_ENABLE(sse, [ --enable-sse Uses SSE instructions where possible, requires gcc3 and a processor with SSE support], USE_SSE="-msse -mfpmath=sse -malign-double")
--AC_ARG_ENABLE(darwin, [ --enable-darwin Builds plugins that will be shared object in the Darwin OS], DARWIN_CFLAGS="-fno-common -flat_namespace -bundle -undefined suppress -lbundle1.o")
-+AC_ARG_ENABLE(3dnow, [ --enable-3dnow Enables 3DNow! acceleration], AS_IF([test "x$enableval" = "xyes"], [AC_DEFINE_UNQUOTED(ACCEL_3DNOW, "")]))
-+AC_ARG_ENABLE(sse, [ --enable-sse Uses SSE instructions where possible, requires gcc3 and a processor with SSE support], AS_IF([test "x$enableval" = "xyes"], [USE_SSE="-msse -mfpmath=sse -malign-double"]))
-+AC_ARG_ENABLE(darwin, [ --enable-darwin Builds plugins that will be shared object in the Darwin OS], AS_IF([test "x$enableval" = "xyes"], [DARWIN_CFLAGS="-fno-common -flat_namespace -bundle -undefined suppress -lbundle1.o"]))
-
- CFLAGS=$lrintf_save_CFLAGS -I@top_srcdir@/intl -I@top_srcdir@
-
diff --git a/media-plugins/swh-plugins/swh-plugins-0.4.15-r3.ebuild b/media-plugins/swh-plugins/swh-plugins-0.4.15-r3.ebuild
index f77be26ee57..3959e3ddf9c 100644
--- a/media-plugins/swh-plugins/swh-plugins-0.4.15-r3.ebuild
+++ b/media-plugins/swh-plugins/swh-plugins-0.4.15-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -7,7 +7,8 @@ inherit eutils autotools multilib-minimal
DESCRIPTION="Large collection of LADSPA audio plugins/effects"
HOMEPAGE="http://plugin.org.uk"
-SRC_URI="http://plugin.org.uk/releases/${PV}/${P}.tar.gz"
+SRC_URI="http://plugin.org.uk/releases/${PV}/${P}.tar.gz
+ https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
SLOT="0"
LICENSE="GPL-2"
@@ -27,16 +28,16 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS ChangeLog README TODO )
src_prepare() {
- epatch "${FILESDIR}/${P}-pic.patch"
- epatch "${FILESDIR}/${P}-plugindir.patch"
- epatch "${FILESDIR}/${P}-riceitdown.patch"
- epatch "${FILESDIR}/${P}-gettext.patch"
- epatch "${FILESDIR}/${P}-x86-asm-optional.patch"
- epatch "${FILESDIR}/${P}-glibc-2.10.patch"
+ epatch "${WORKDIR}/${P}-patchset/${P}-pic.patch"
+ epatch "${WORKDIR}/${P}-patchset/${P}-plugindir.patch"
+ epatch "${WORKDIR}/${P}-patchset/${P}-riceitdown.patch"
+ epatch "${WORKDIR}/${P}-patchset/${P}-gettext.patch"
+ epatch "${WORKDIR}/${P}-patchset/${P}-x86-asm-optional.patch"
+ epatch "${WORKDIR}/${P}-patchset/${P}-glibc-2.10.patch"
# Use system libgsm, bug #252890
rm -rf gsm
- epatch "${FILESDIR}/${P}-system_gsm.patch"
+ epatch "${WORKDIR}/${P}-patchset/${P}-system_gsm.patch"
# This is to update gettext macros, otherwise they are incompatible with
# recent libtools, bug #231767