blob: 719313722ff93da78815aa7daced5bf502e17b0f (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
--- trinity-tdemultimedia-3.5.13.2~pre17+a4c1404c/arts/modules/common/Makefile.am.ORI 2013-05-09 10:51:39.994294437 +0200
+++ trinity-tdemultimedia-3.5.13.2~pre17+a4c1404c/arts/modules/common/Makefile.am 2013-05-09 10:52:23.837409361 +0200
@@ -25,7 +25,7 @@
$(top_builddir)/arts/gui/common/libartsgui_idl.la \
$(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) -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
|
