rpms/dssi/devel dssi-linking.patch,NONE,1.1 dssi.spec,1.13,1.14
Orcan Ogetbil
oget at fedoraproject.org
Wed Feb 10 08:04:41 UTC 2010
Author: oget
Update of /cvs/pkgs/rpms/dssi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31892
Modified Files:
dssi.spec
Added Files:
dssi-linking.patch
Log Message:
* Wed Feb 10 2010 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.0.0-4
- Fix DSO-linking failure
dssi-linking.patch:
examples/Makefile.am | 4 ++--
examples/Makefile.in | 4 ++--
jack-dssi-host/Makefile.am | 2 +-
jack-dssi-host/Makefile.in | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
--- NEW FILE dssi-linking.patch ---
diff -rupN dssi-1.0.0.old/examples/Makefile.am dssi-1.0.0/examples/Makefile.am
--- dssi-1.0.0.old/examples/Makefile.am 2008-12-13 03:29:39.000000000 -0500
+++ dssi-1.0.0/examples/Makefile.am 2010-02-10 02:56:56.000000000 -0500
@@ -85,7 +85,7 @@ LTS_qt_SOURCES = \
nodist_LTS_qt_SOURCES = $(LTS_MOC)
LTS_qt_CXXFLAGS = $(AM_CXXFLAGS) $(QT_CXXFLAGS) $(LIBLO_CFLAGS)
-LTS_qt_LDADD = $(AM_LDFLAGS) $(QT_LIBS) $(LIBLO_LIBS)
+LTS_qt_LDADD = $(AM_LDFLAGS) $(QT_LIBS) $(LIBLO_LIBS) -lX11
trivial_sampler_uidir = $(libdir)/dssi/trivial_sampler
@@ -99,7 +99,7 @@ trivial_sampler_qt_SOURCES = \
nodist_trivial_sampler_qt_SOURCES = $(trivial_sampler_MOC)
trivial_sampler_qt_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir)/dssi $(ALSA_CFLAGS) $(QT_CXXFLAGS) $(LIBLO_CFLAGS) $(SNDFILE_CFLAGS)
-trivial_sampler_qt_LDADD = $(AM_LDFLAGS) $(QT_LIBS) $(LIBLO_LIBS) $(SNDFILE_LIBS)
+trivial_sampler_qt_LDADD = $(AM_LDFLAGS) $(QT_LIBS) $(LIBLO_LIBS) $(SNDFILE_LIBS) -lX11
%.moc.cpp: %.h
$(QT_MOC) -o $@ $<
diff -rupN dssi-1.0.0.old/examples/Makefile.in dssi-1.0.0/examples/Makefile.in
--- dssi-1.0.0.old/examples/Makefile.in 2009-01-09 17:15:49.000000000 -0500
+++ dssi-1.0.0/examples/Makefile.in 2010-02-10 02:57:15.000000000 -0500
@@ -342,7 +342,7 @@ LTS_qt_SOURCES = \
nodist_LTS_qt_SOURCES = $(LTS_MOC)
LTS_qt_CXXFLAGS = $(AM_CXXFLAGS) $(QT_CXXFLAGS) $(LIBLO_CFLAGS)
-LTS_qt_LDADD = $(AM_LDFLAGS) $(QT_LIBS) $(LIBLO_LIBS)
+LTS_qt_LDADD = $(AM_LDFLAGS) $(QT_LIBS) $(LIBLO_LIBS) -lX11
trivial_sampler_uidir = $(libdir)/dssi/trivial_sampler
trivial_sampler_MOC = trivial_sampler_qt_gui.moc.cpp
trivial_sampler_qt_SOURCES = \
@@ -352,7 +352,7 @@ trivial_sampler_qt_SOURCES = \
nodist_trivial_sampler_qt_SOURCES = $(trivial_sampler_MOC)
trivial_sampler_qt_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir)/dssi $(ALSA_CFLAGS) $(QT_CXXFLAGS) $(LIBLO_CFLAGS) $(SNDFILE_CFLAGS)
-trivial_sampler_qt_LDADD = $(AM_LDFLAGS) $(QT_LIBS) $(LIBLO_LIBS) $(SNDFILE_LIBS)
+trivial_sampler_qt_LDADD = $(AM_LDFLAGS) $(QT_LIBS) $(LIBLO_LIBS) $(SNDFILE_LIBS) -lX11
@HAVE_QT_FALSE at BUILT_SOURCES =
@HAVE_QT_TRUE at BUILT_SOURCES = $(LTS_MOC) $(trivial_sampler_MOC)
CLEANFILES = $(BUILT_SOURCES)
diff -rupN dssi-1.0.0.old/jack-dssi-host/Makefile.am dssi-1.0.0/jack-dssi-host/Makefile.am
--- dssi-1.0.0.old/jack-dssi-host/Makefile.am 2005-05-25 11:58:06.000000000 -0400
+++ dssi-1.0.0/jack-dssi-host/Makefile.am 2010-02-10 02:40:12.000000000 -0500
@@ -22,6 +22,6 @@ jack_dssi_host_CFLAGS = -I$(top_srcdir)/
if DARWIN
jack_dssi_host_LDADD = $(AM_LDFLAGS) -lmx $(ALSA_LIBS) $(LIBLO_LIBS) $(JACK_LIBS)
else
-jack_dssi_host_LDADD = $(AM_LDFLAGS) $(ALSA_LIBS) $(LIBLO_LIBS) $(JACK_LIBS)
+jack_dssi_host_LDADD = $(AM_LDFLAGS) $(ALSA_LIBS) $(LIBLO_LIBS) $(JACK_LIBS) -lm -ldl
endif
diff -rupN dssi-1.0.0.old/jack-dssi-host/Makefile.in dssi-1.0.0/jack-dssi-host/Makefile.in
--- dssi-1.0.0.old/jack-dssi-host/Makefile.in 2009-01-09 17:15:50.000000000 -0500
+++ dssi-1.0.0/jack-dssi-host/Makefile.in 2010-02-10 02:40:12.000000000 -0500
@@ -211,7 +211,7 @@ jack_dssi_host_SOURCES = \
../message_buffer/message_buffer.h
jack_dssi_host_CFLAGS = -I$(top_srcdir)/dssi $(AM_CFLAGS) $(ALSA_CFLAGS) $(LIBLO_CFLAGS) $(JACK_CFLAGS)
- at DARWIN_FALSE@jack_dssi_host_LDADD = $(AM_LDFLAGS) $(ALSA_LIBS) $(LIBLO_LIBS) $(JACK_LIBS)
+ at DARWIN_FALSE@jack_dssi_host_LDADD = $(AM_LDFLAGS) $(ALSA_LIBS) $(LIBLO_LIBS) $(JACK_LIBS) -lm -ldl
@DARWIN_TRUE at jack_dssi_host_LDADD = $(AM_LDFLAGS) -lmx $(ALSA_LIBS) $(LIBLO_LIBS) $(JACK_LIBS)
all: all-am
Index: dssi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dssi/devel/dssi.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- dssi.spec 24 Jul 2009 20:35:43 -0000 1.13
+++ dssi.spec 10 Feb 2010 08:04:41 -0000 1.14
@@ -1,12 +1,17 @@
Summary: Disposable Soft Synth Interface
Name: dssi
Version: 1.0.0
-Release: 3%{?dist}
+Release: 4%{?dist}
License: MIT
Group: Applications/Multimedia
URL: http://dssi.sourceforge.net/
Source0: http://download.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+# Fix 64bit plugin path
+# http://sourceforge.net/tracker/?func=detail&aid=2798711&group_id=104230&atid=637350
Patch1: dssi-lib64.patch
+# Fix DSO-linking failure
+# http://sourceforge.net/tracker/?func=detail&aid=2948913&group_id=104230&atid=637350
+Patch2: dssi-linking.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel
@@ -48,6 +53,7 @@ Libraries, include files, etc you can us
%prep
%setup -q
%patch1 -p1
+%patch2 -p1 -b .linking
%build
%configure
@@ -95,6 +101,9 @@ tests/controller
%{_libdir}/pkgconfig/dssi.pc
%changelog
+* Wed Feb 10 2010 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.0.0-4
+- Fix DSO-linking failure
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
More information about the scm-commits
mailing list