[SCM] rtmpdump packaging branch, master, updated. debian/2.3-1-3-g057f6d1

fabian-guest at users.alioth.debian.org fabian-guest at users.alioth.debian.org
Thu Jul 8 11:08:40 UTC 2010


The following commit has been merged in the master branch:
commit 057f6d1621b16504a29eac19d81f5a99fdc2b48d
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Thu Jul 8 13:09:45 2010 +0200

    debian/patches/03-Dont-link-explicitly-against-static-library.patch: New patch from upstream SVN (slightly modified) to avoid explicit linking against the static library.

diff --git a/debian/patches/03-Dont-link-explicitly-against-static-library.patch b/debian/patches/03-Dont-link-explicitly-against-static-library.patch
new file mode 100644
index 0000000..1e34ce4
--- /dev/null
+++ b/debian/patches/03-Dont-link-explicitly-against-static-library.patch
@@ -0,0 +1,63 @@
+------------------------------------------------------------------------
+r544 | hyc | 2010-07-08 12:38:33 +0200 (Thu, 08 Jul 2010) | 2 lines
+
+Don't link explicitly against static library
+
+------------------------------------------------------------------------
+--- rtmpdump.orig/Makefile
++++ rtmpdump/Makefile
+@@ -33,7 +33,7 @@ MANDIR=$(DESTDIR)$(mandir)
+ 
+ LIBS_posix=
+ LIBS_mingw=-lws2_32 -lwinmm -lgdi32
+-LIBS=$(CRYPTO_LIB) -lz $(LIBS_$(SYS)) $(XLIBS)
++LIBS=-L librtmp -lrtmp $(CRYPTO_LIB) -lz $(LIBS_$(SYS)) $(XLIBS)
+ 
+ THREADLIB_posix=-lpthread
+ THREADLIB_mingw=
+@@ -47,11 +47,13 @@ EXT_posix=
+ EXT_mingw=.exe
+ EXT=$(EXT_$(SYS))
+ 
+-all:	$(LIBRTMP) progs
++PROGS=rtmpdump rtmpgw rtmpsrv rtmpsuck
+ 
+-progs:	rtmpdump rtmpgw rtmpsrv rtmpsuck
++all:	$(LIBRTMP) $(PROGS)
+ 
+-install:	progs
++$(PROGS): $(LIBRTMP)
++
++install:	$(PROGS)
+ 	-mkdir -p $(BINDIR) $(SBINDIR) $(MANDIR)/man1 $(MANDIR)/man8
+ 	cp rtmpdump$(EXT) $(BINDIR)
+ 	cp rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) $(SBINDIR)
+@@ -68,20 +70,17 @@ FORCE:
+ $(LIBRTMP): FORCE
+ 	@cd librtmp; $(MAKE) all
+ 
+-# note: $^ is GNU Make's equivalent to BSD $>
+-# we use both since either make will ignore the one it doesn't recognize
+-
+-rtmpdump: rtmpdump.o $(LIBRTMP)
+-	$(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(LIBS)
++rtmpdump: rtmpdump.o
++	$(CC) $(LDFLAGS) -o $@$(EXT) $@.o $(LIBS)
+ 
+-rtmpsrv: rtmpsrv.o thread.o $(LIBRTMP)
+-	$(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS)
++rtmpsrv: rtmpsrv.o thread.o
++	$(CC) $(LDFLAGS) -o $@$(EXT) $@.o thread.o $(SLIBS)
+ 
+-rtmpsuck: rtmpsuck.o thread.o $(LIBRTMP)
+-	$(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS)
++rtmpsuck: rtmpsuck.o thread.o
++	$(CC) $(LDFLAGS) -o $@$(EXT) $@.o thread.o $(SLIBS)
+ 
+-rtmpgw: rtmpgw.o thread.o $(LIBRTMP)
+-	$(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS)
++rtmpgw: rtmpgw.o thread.o
++	$(CC) $(LDFLAGS) -o $@$(EXT) $@.o thread.o $(SLIBS)
+ 
+ rtmpgw.o: rtmpgw.c $(INCRTMP) Makefile
+ rtmpdump.o: rtmpdump.c $(INCRTMP) Makefile
diff --git a/debian/patches/series b/debian/patches/series
index 984f470..2fe0d7a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_unbreak_makefile.diff
 02_strtime-visibility.patch
+03-Dont-link-explicitly-against-static-library.patch

-- 
rtmpdump packaging



More information about the pkg-multimedia-commits mailing list