summaryrefslogtreecommitdiffstats
path: root/redhat/tdemultimedia
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/tdemultimedia')
-rw-r--r--redhat/tdemultimedia/tdemultimedia-14.0.0-ftbfs.patch22
-rw-r--r--redhat/tdemultimedia/tdemultimedia-14.0.0.spec2
-rw-r--r--redhat/tdemultimedia/tdemultimedia-3.5.13.2-ftbfs.patch34
3 files changed, 33 insertions, 25 deletions
diff --git a/redhat/tdemultimedia/tdemultimedia-14.0.0-ftbfs.patch b/redhat/tdemultimedia/tdemultimedia-14.0.0-ftbfs.patch
deleted file mode 100644
index 3ca526523..000000000
--- a/redhat/tdemultimedia/tdemultimedia-14.0.0-ftbfs.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- trinity-tdemultimedia-14.0.0~pre177+d730f5a0/arts/modules/common/Makefile.am.ORI 2013-06-30 21:47:10.721105015 +0200
-+++ trinity-tdemultimedia-14.0.0~pre177+d730f5a0/arts/modules/common/Makefile.am 2013-06-30 21:48:05.280864583 +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_TDECORE) $(LIB_QT) $(VORBISFILE_LIBS) -lgthread-2.0
-+ -lartsflow -lartsflow_idl -lmcop $(LIB_TDECORE) $(LIB_QT) $(VORBIS_LIBS) $(VORBISFILE_LIBS) -lgthread-2.0 -lmad
-
- 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 $(VORBIS_LIBS) $(VORBISFILE_LIBS) -lmad
-
- #libartsmodulessynth_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui_idl.la $(top_builddir)/arts/midi/libartsmidi_idl.la -lartsflow -lartsflow_idl -lmcop $(LIBDL) $(LIB_TDEUI) $(LIB_TDECORE)
- libartsmodulessynth_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -lartsflow -lartsgsl -no-undefined
diff --git a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
index 0b86f89ff..d1210121a 100644
--- a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
+++ b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
@@ -41,7 +41,6 @@ Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-Patch0: tdemultimedia-14.0.0-ftbfs.patch
Obsoletes: trinity-kdemultimedia < %{version}-%{release}
Provides: trinity-kdemultimedia = %{version}-%{release}
@@ -1141,7 +1140,6 @@ noatun plugins.
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-%patch0 -p1 -b .ftbfs
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
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