Gentoo Archives: gentoo-commits

From: "Alexis Ballier (aballier)" <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-plugins/swh-plugins/files: swh-plugins-0.4.15-system_gsm.patch
Date: Tue, 13 Jan 2009 07:38:40
Message-Id: E1LMdrB-000152-4K@stork.gentoo.org
1 aballier 09/01/13 07:38:37
2
3 Added: swh-plugins-0.4.15-system_gsm.patch
4 Log:
5 Use system libgsm, bug #252890
6 (Portage version: 2.2_rc21/cvs/Linux 2.6.28 x86_64)
7
8 Revision Changes Path
9 1.1 media-plugins/swh-plugins/files/swh-plugins-0.4.15-system_gsm.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/swh-plugins/files/swh-plugins-0.4.15-system_gsm.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/swh-plugins/files/swh-plugins-0.4.15-system_gsm.patch?rev=1.1&content-type=text/plain
13
14 Index: swh-plugins-0.4.15-system_gsm.patch
15 ===================================================================
16 Index: swh-plugins-0.4.15/Makefile.am
17 ===================================================================
18 --- swh-plugins-0.4.15.orig/Makefile.am
19 +++ swh-plugins-0.4.15/Makefile.am
20 @@ -33,7 +33,7 @@ plugin_LTLIBRARIES = \
21 latency_1914.la xfade_1915.la sc4m_1916.la \
22 mbeq_1197.la pitch_scale_1193.la pitch_scale_1194.la imp_1199.la
23
24 -SUBDIRS = m4 po util gsm gverb metadata
25 +SUBDIRS = m4 po util gverb metadata
26
27 # Wacky stuff to stop automake getting confused
28 EXTRA_DIST = @top_srcdir@/*.xml @top_srcdir@/*.c @top_srcdir@/*.h \
29 @@ -72,7 +72,7 @@ sc3_1427_la_LIBADD = util/libdb.la util/
30 sc4_1882_la_LIBADD = util/libdb.la util/librms.la
31 sc4m_1916_la_LIBADD = util/libdb.la util/librms.la
32 se4_1883_la_LIBADD = util/libdb.la util/librms.la
33 -gsm_1215_la_LIBADD = gsm/libgsm.la
34 +gsm_1215_la_LIBADD = @GSM_LIBS@
35 gverb_1216_la_LIBADD = gverb/libgverb.la
36 lcr_delay_1436_la_DEPENDENCIES = util/biquad.h
37
38 Index: swh-plugins-0.4.15/configure.in
39 ===================================================================
40 --- swh-plugins-0.4.15.orig/configure.in
41 +++ swh-plugins-0.4.15/configure.in
42 @@ -136,17 +136,19 @@ else
43 AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}")
44 fi
45
46 -subdirs="util gsm gverb metadata"
47 +GSM_LIBS=-lgsm
48 +
49 +subdirs="util gverb metadata"
50
51 AC_SUBST(subdirs)
52 AC_SUBST(FFTW_LIBS)
53 AC_SUBST(STATIC_FFTW_LIBS)
54 AC_SUBST(FFTW_CFLAGS)
55 +AC_SUBST(GSM_LIBS)
56 AC_SUBST(LIBTOOL)
57 AC_OUTPUT([ m4/Makefile
58 Makefile
59 util/Makefile
60 -gsm/Makefile
61 gverb/Makefile
62 metadata/Makefile
63 po/Makefile.in