[SCM] pd-readanysf/master: Fixed linking order of dependencies
zmoelnig-guest at users.alioth.debian.org
zmoelnig-guest at users.alioth.debian.org
Tue Jun 5 10:17:21 UTC 2012
The following commit has been merged in the master branch:
commit a5f327f11f1fc13d132345e7337feede6e830e80
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date: Tue Jun 5 12:17:17 2012 +0200
Fixed linking order of dependencies
so deps will be correctly resolved with modern linkers (which are used e.g. on ubuntu)
diff --git a/debian/patches/makefile-linkingorder.patch b/debian/patches/makefile-linkingorder.patch
new file mode 100644
index 0000000..13fa5f0
--- /dev/null
+++ b/debian/patches/makefile-linkingorder.patch
@@ -0,0 +1,29 @@
+Author: IOhannes m zmölnig
+Description: get linking order right (objects/libs that depends on other libs
+ should come before the dependencies)
+--- pd-readanysf.orig/Makefile
++++ pd-readanysf/Makefile
+@@ -31,7 +31,7 @@
+ #PD_CXXFLAGS += -O1 -funroll-loops -fomit-frame-pointer \
+ # -Wall -W -Wshadow \
+ # -Wno-unused -Wno-parentheses -Wno-switch
+-PD_LDFLAGS = -L/usr/local/lib -lpthread -lgavl -lgmerlin_avdec
++PD_LDFLAGS = -L/usr/lib -lgmerlin_avdec -lgavl -lpthread
+ else
+ # assume darwin here
+ STRIP=strip -x
+@@ -55,11 +55,12 @@
+ all: $(TARGET)
+
+ pd_linux: src/readanysf~.cpp objs/FifoVideoFrames.o objs/FifoAudioFrames.o objs/ReadMedia.o
+- g++ -shared -o readanysf~.pd_linux $(PD_CXXFLAGS) $(PD_LDFLAGS) \
++ g++ -shared -o readanysf~.pd_linux $(PD_CXXFLAGS) \
+ src/readanysf~.cpp \
+ objs/FifoAudioFrames.o \
+ objs/FifoVideoFrames.o \
+- objs/ReadMedia.o
++ objs/ReadMedia.o \
++ $(PD_LDFLAGS)
+ $(STRIP) readanysf~.pd_linux
+
+ pd_darwin: src/readanysf~.cpp objs/FifoVideoFrames.o objs/FifoAudioFrames.o objs/ReadMedia.o
diff --git a/debian/patches/series b/debian/patches/series
index 96de522..513d64f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ makefile-objs-dir.patch
makefile-CFLAGS.patch
makefile-fPIC.patch
makefile-defaultLinux.patch
+makefile-linkingorder.patch
--
pd-readanysf packaging
More information about the pkg-multimedia-commits
mailing list