summaryrefslogtreecommitdiffstats
path: root/redhat/tdemultimedia/tdemultimedia-3.5.13.2-ftbfs.patch
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2013-09-08 19:18:46 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2013-09-08 19:18:46 +0200
commitc56eddf6d066544f75355c5a999e1436f4aead78 (patch)
tree95f2202df7ddae113882b0cfab28701b4f15633e /redhat/tdemultimedia/tdemultimedia-3.5.13.2-ftbfs.patch
parent712bf363997de9da621b9f2b39a3775493dc0ef3 (diff)
downloadtde-packaging-c56eddf6d066544f75355c5a999e1436f4aead78.tar.gz
tde-packaging-c56eddf6d066544f75355c5a999e1436f4aead78.zip
RPM Packaging: updates for 3.5.13.2
Diffstat (limited to 'redhat/tdemultimedia/tdemultimedia-3.5.13.2-ftbfs.patch')
-rw-r--r--redhat/tdemultimedia/tdemultimedia-3.5.13.2-ftbfs.patch34
1 files changed, 33 insertions, 1 deletions
diff --git a/redhat/tdemultimedia/tdemultimedia-3.5.13.2-ftbfs.patch b/redhat/tdemultimedia/tdemultimedia-3.5.13.2-ftbfs.patch
index 08ab1c877..719313722 100644
--- a/redhat/tdemultimedia/tdemultimedia-3.5.13.2-ftbfs.patch
+++ b/redhat/tdemultimedia/tdemultimedia-3.5.13.2-ftbfs.patch
@@ -5,7 +5,39 @@
$(top_builddir)/arts/midi/libartsmidi_idl.la \
$(top_builddir)/arts/modules/synth/libartsmodulessynth.la \
- -lartsflow -lartsflow_idl -lmcop $(LIB_KDECORE) $(LIB_QT) $(VORBISFILE_LIBS) -lgthread-2.0
-+ -lartsflow -lartsflow_idl -lmcop $(LIB_KDECORE) $(LIB_QT) $(VORBIS_LIBS) $(VORBISFILE_LIBS) -lgthread-2.0 -lmad
++ -lartsflow -lartsflow_idl -lmcop $(LIB_KDECORE) $(LIB_QT) -lgthread-2.0 $(ARTS_LIBS)
libartsmodulescommon_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -no-undefined
+--- trinity-tdemultimedia-14.0.0~pre178+601a5c5f/arts/modules/synth/Makefile.am.ORI 2013-08-04 19:15:24.030530158 +0200
++++ trinity-tdemultimedia-14.0.0~pre178+601a5c5f/arts/modules/synth/Makefile.am 2013-08-04 19:15:32.878625492 +0200
+@@ -31,7 +31,7 @@
+ libartsmodulessynth_la_LIBADD = \
+ $(top_builddir)/arts/runtime/libartsbuilder.la \
+ $(top_builddir)/arts/midi/libartsmidi_idl.la \
+- -lartsflow -lartsgsl -lartsflow_idl -lmcop -lglib-2.0
++ -lartsflow -lartsgsl -lartsflow_idl -lmcop -lglib-2.0 $(ARTS_LIBS)
+
+ #libartsmodulessynth_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui_idl.la $(top_builddir)/arts/midi/libartsmidi_idl.la -lartsflow -lartsflow_idl -lmcop $(LIBDL) $(LIB_KDEUI) $(LIB_KDECORE)
+ libartsmodulessynth_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -lartsflow -lartsgsl -no-undefined
+--- trinity-tdemultimedia-14.0.0~pre183+1859432c/configure.in.in.ORI 2013-09-08 17:50:11.453897325 +0200
++++ trinity-tdemultimedia-14.0.0~pre183+1859432c/configure.in.in 2013-09-08 17:54:24.503460785 +0200
+@@ -544,15 +544,18 @@
+ LIB_ARTS="-lartskde"
+ ARTS_PREFIX=[`$ARTSCCONFIG --arts-prefix`]
+ ARTS_CFLAGS="-I$ARTS_PREFIX/include/arts"
++ ARTS_LIBS=[`$PKG_CONFIG --libs-only-l arts`]
+ AC_DEFINE(HAVE_ARTS, 1, [have arts support in juk])
+ else
+ build_arts="no"
+ LIB_ARTS=""
+ ARTS_CFLAGS=""
++ ARTS_LIBS=""
+ AC_DEFINE(HAVE_ARTS, 0, [no arts support in juk])
+ fi
+
+ AC_SUBST(LIB_ARTS)
+ AC_SUBST(ARTS_CFLAGS)
++AC_SUBST(ARTS_LIBS)
+
+ KDE_CHECK_MPEGLIB_ARTS