[SCM] pd-readanysf/master: Removed patches included upstream.
zmoelnig-guest at users.alioth.debian.org
zmoelnig-guest at users.alioth.debian.org
Thu Jun 27 16:47:02 UTC 2013
The following commit has been merged in the master branch:
commit 4d3c4536f9132f357db884c2f5e251c09a4409b2
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date: Thu Jun 27 18:22:11 2013 +0200
Removed patches included upstream.
diff --git a/debian/patches/makefile-CFLAGS.patch b/debian/patches/makefile-CFLAGS.patch
deleted file mode 100644
index bdd94c0..0000000
--- a/debian/patches/makefile-CFLAGS.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-Author: IOhannes m zmölnig
-Description: build-system might set the CFLAGS/LDFLAGS variables from
-outside, which will make make ignore the flags set inside the makefile
-(and thus fail); this patch renames CFLAGS to PD_CXXFLAGS (it's c++ after
-all), likewise LDFLAGS
-
---- pd-readanysf.orig/Makefile
-+++ pd-readanysf/Makefile
-@@ -20,42 +20,44 @@
- ##############################################
- LBITS := $(shell getconf LONG_BIT)
- ifeq ($(LBITS),64)
-- # do 64 bit stuff here, like set some CFLAGS
--CFLAGS = -fPIC -I./ -I$(GAVLPATH) -I$(GAVLPATH)/gavl -I$(GAVLPATH)/gmerlin -I$(PDPATH) -Wall
-+ # do 64 bit stuff here, like set some PD_CXXFLAGS
-+PD_CXXFLAGS = -fPIC -I./ -I$(GAVLPATH) -I$(GAVLPATH)/gavl -I$(GAVLPATH)/gmerlin -I$(PDPATH) -Wall
- else
- # do 32 bit stuff here
--CFLAGS = -I./ -I$(GAVLPATH) -I$(GAVLPATH)/gavl -I$(GAVLPATH)/gmerlin -I$(PDPATH) -Wall
-+PD_CXXFLAGS = -I./ -I$(GAVLPATH) -I$(GAVLPATH)/gavl -I$(GAVLPATH)/gmerlin -I$(PDPATH) -Wall
- endif
-
-
- ifeq ($(UNAME), Linux)
- STRIP=strip --strip-unneeded
- # optimizations?
--#CFLAGS += -O1 -funroll-loops -fomit-frame-pointer \
-+#PD_CXXFLAGS += -O1 -funroll-loops -fomit-frame-pointer \
- # -Wall -W -Wshadow \
- # -Wno-unused -Wno-parentheses -Wno-switch
--LDFLAGS = -L/usr/local/lib -lpthread -lgavl -lgmerlin_avdec
-+PD_LDFLAGS = -L/usr/local/lib -lpthread -lgavl -lgmerlin_avdec
- else
- # assume darwin here
- STRIP=strip -x
--CFLAGS += -I/sw/include -fast -fPIC
--LDFLAGS = -bundle -undefined dynamic_lookup -L/sw/lib -lgavl -lgmerlin_avdec
--#LDFLAGS += -bundle -bundle_loader $(pd_src)/bin/pd -undefined dynamic_lookup \
-+PD_CXXFLAGS += -I/sw/include -fast -fPIC
-+PD_LDFLAGS = -bundle -undefined dynamic_lookup -L/sw/lib -lgavl -lgmerlin_avdec
-+#PD_LDFLAGS += -bundle -bundle_loader $(pd_src)/bin/pd -undefined dynamic_lookup \
- # -L/sw/lib -weak_framework Carbon -lc -L/sw/lib -lgavl -lgmerlin_avdec
- # os 10.4
--#CFLAGS += -mmacosx-version-min=10.4 -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk
--#LDFLAGS = -L/sw/lib -lgavl -lgmerlin_avdec \
-+#PD_CXXFLAGS += -mmacosx-version-min=10.4 -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk
-+#PD_LDFLAGS = -L/sw/lib -lgavl -lgmerlin_avdec \
- # -dynamiclib -undefined dynamic_lookup -lsupc++ -mmacosx-version-min=10.4 \
- # -lSystem.B -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk
- endif
-
-
-+PD_CXXFLAGS += $(CXXFLAGS)
-+PD_LDFLAGS += $(LDFLAGS)
-
-
- all: $(TARGET)
-
- pd_linux: src/readanysf~.cpp objs/FifoVideoFrames.o objs/FifoAudioFrames.o objs/ReadMedia.o
-- g++ -shared -o readanysf~.pd_linux $(CFLAGS) $(LDFLAGS) \
-+ g++ -shared -o readanysf~.pd_linux $(PD_CXXFLAGS) $(PD_LDFLAGS) \
- src/readanysf~.cpp \
- objs/FifoAudioFrames.o \
- objs/FifoVideoFrames.o \
-@@ -63,7 +65,7 @@
- $(STRIP) readanysf~.pd_linux
-
- pd_darwin: src/readanysf~.cpp objs/FifoVideoFrames.o objs/FifoAudioFrames.o objs/ReadMedia.o
-- g++ $(LDFLAGS) -o readanysf~.pd_darwin $(CFLAGS) \
-+ g++ $(PD_LDFLAGS) -o readanysf~.pd_darwin $(PD_CXXFLAGS) \
- src/readanysf~.cpp \
- objs/FifoAudioFrames.o \
- objs/FifoVideoFrames.o \
-@@ -79,13 +81,13 @@
- gzip readanysf~$(VERSION)_MacOSX-Intel.tar
-
- objs/ReadMedia.o: src/ReadMedia.cpp src/ReadMedia.h objs/FifoAudioFrames.o objs/FifoVideoFrames.o objs/
-- g++ -c -o objs/ReadMedia.o src/ReadMedia.cpp $(CFLAGS)
-+ g++ -c -o objs/ReadMedia.o src/ReadMedia.cpp $(PD_CXXFLAGS)
-
- objs/FifoAudioFrames.o: src/FifoAudioFrames.cpp src/FifoAudioFrames.h objs/
-- g++ -c -o objs/FifoAudioFrames.o src/FifoAudioFrames.cpp $(CFLAGS)
-+ g++ -c -o objs/FifoAudioFrames.o src/FifoAudioFrames.cpp $(PD_CXXFLAGS)
-
- objs/FifoVideoFrames.o: src/FifoVideoFrames.cpp src/FifoVideoFrames.h objs/
-- g++ -c -o objs/FifoVideoFrames.o src/FifoVideoFrames.cpp $(CFLAGS)
-+ g++ -c -o objs/FifoVideoFrames.o src/FifoVideoFrames.cpp $(PD_CXXFLAGS)
-
- clean:
- if [ -d readanysf~$(VERSION)_MacOSX-Intel ]; then rm -rf readanysf~$(VERSION)_MacOSX-Intel; fi;
diff --git a/debian/patches/makefile-defaultLinux.patch b/debian/patches/makefile-defaultLinux.patch
deleted file mode 100644
index a847e5b..0000000
--- a/debian/patches/makefile-defaultLinux.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Author: IOhannes m zmölnig
-Description: default to (so-called) "Linux
-upstream's OS-detection assumed that everything is Darwin that is not Linux
-on Debian (which is very linux-like) UNAME could as well be "kFreeBSD" or
-"Hurd", so i thought it safer to assume that everything is "Linux"(like) that is
-not Darwin.
-
---- pd-readanysf.orig/Makefile
-+++ pd-readanysf/Makefile
-@@ -8,6 +8,13 @@
- VERSION=0.42
- UNAME := $(shell uname)
-
-+ifneq ($(UNAME), Darwin)
-+# simplistic approach to OS-detection
-+ UNAME=Linux
-+endif
-+
-+
-+
- ifeq ($(UNAME), Linux)
- TARGET=pd_linux
- else
diff --git a/debian/patches/makefile-fPIC.patch b/debian/patches/makefile-fPIC.patch
deleted file mode 100644
index bdb3c65..0000000
--- a/debian/patches/makefile-fPIC.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Author: IOhannes m zmölnig
-Description: unconditionally use "-fPIC"
-upstream only uses "-fPIC" on 64bit architectures
---- pd-readanysf.orig/Makefile
-+++ pd-readanysf/Makefile
-@@ -18,16 +18,6 @@
- endif
-
- ##############################################
--LBITS := $(shell getconf LONG_BIT)
--ifeq ($(LBITS),64)
-- # do 64 bit stuff here, like set some PD_CXXFLAGS
--PD_CXXFLAGS = -fPIC -I./ -I$(GAVLPATH) -I$(GAVLPATH)/gavl -I$(GAVLPATH)/gmerlin -I$(PDPATH) -Wall
--else
-- # do 32 bit stuff here
--PD_CXXFLAGS = -I./ -I$(GAVLPATH) -I$(GAVLPATH)/gavl -I$(GAVLPATH)/gmerlin -I$(PDPATH) -Wall
--endif
--
--
- ifeq ($(UNAME), Linux)
- STRIP=strip --strip-unneeded
- # optimizations?
-@@ -49,6 +39,7 @@
- # -lSystem.B -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk
- endif
-
-+PD_CXXFLAGS += -fPIC
-
- PD_CXXFLAGS += $(CXXFLAGS)
- PD_LDFLAGS += $(LDFLAGS)
diff --git a/debian/patches/makefile-linkingorder.patch b/debian/patches/makefile-linkingorder.patch
deleted file mode 100644
index 13fa5f0..0000000
--- a/debian/patches/makefile-linkingorder.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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/makefile-objs-dir.patch b/debian/patches/makefile-objs-dir.patch
deleted file mode 100644
index a234f6b..0000000
--- a/debian/patches/makefile-objs-dir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Author: IOhannes m zmölnig
-Description: make builds into nonexistant objs directory and fails to clean up;
-this patch will create the directory and delete it on clean.
-
---- pd-readanysf.orig/Makefile
-+++ pd-readanysf/Makefile
-@@ -78,16 +78,20 @@
- tar -cvf readanysf~$(VERSION)_MacOSX-Intel.tar readanysf~$(VERSION)_MacOSX-Intel/
- gzip readanysf~$(VERSION)_MacOSX-Intel.tar
-
--objs/ReadMedia.o: src/ReadMedia.cpp src/ReadMedia.h objs/FifoAudioFrames.o objs/FifoVideoFrames.o
-+objs/ReadMedia.o: src/ReadMedia.cpp src/ReadMedia.h objs/FifoAudioFrames.o objs/FifoVideoFrames.o objs/
- g++ -c -o objs/ReadMedia.o src/ReadMedia.cpp $(CFLAGS)
-
--objs/FifoAudioFrames.o: src/FifoAudioFrames.cpp src/FifoAudioFrames.h
-+objs/FifoAudioFrames.o: src/FifoAudioFrames.cpp src/FifoAudioFrames.h objs/
- g++ -c -o objs/FifoAudioFrames.o src/FifoAudioFrames.cpp $(CFLAGS)
-
--objs/FifoVideoFrames.o: src/FifoVideoFrames.cpp src/FifoVideoFrames.h
-+objs/FifoVideoFrames.o: src/FifoVideoFrames.cpp src/FifoVideoFrames.h objs/
- g++ -c -o objs/FifoVideoFrames.o src/FifoVideoFrames.cpp $(CFLAGS)
-
- clean:
- if [ -d readanysf~$(VERSION)_MacOSX-Intel ]; then rm -rf readanysf~$(VERSION)_MacOSX-Intel; fi;
- if [ -f readanysf~$(VERSION)_MacOSX-Intel.tar.gz ]; then rm -rf readanysf~$(VERSION)_MacOSX-Intel.tar.gz; fi;
- rm -f objs/*.o readanysf~.pd_*
-+ rm -rf objs/
-+
-+objs/:
-+ mkdir objs
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 513d64f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,5 +0,0 @@
-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