[SCM] liblivemedia/master: Replace 010_propagate_cflags.diff and 301_hardening.patch by pass-variables.patch.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d9a5d7e82fe19ba942a0647380a8349581d65f24
Author: Benjamin Drung <bdrung at debian.org>
Date:   Tue Dec 18 11:09:40 2012 +0100

    Replace 010_propagate_cflags.diff and 301_hardening.patch by pass-variables.patch.

diff --git a/debian/patches/010_propagate_cflags.diff b/debian/patches/010_propagate_cflags.diff
deleted file mode 100644
index bcd9c90..0000000
--- a/debian/patches/010_propagate_cflags.diff
+++ /dev/null
@@ -1,36 +0,0 @@
----
- Makefile.tail |   14 +++++++-------
- config.linux  |    2 +-
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
---- liblivemedia.orig/config.linux
-+++ liblivemedia/config.linux
-@@ -1,4 +1,4 @@
--COMPILE_OPTS =		$(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
-+COMPILE_OPTS =		$(INCLUDES) -I. $(CFLAGS) -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
- C =			c
- C_COMPILER =		cc
- C_FLAGS =		$(COMPILE_OPTS)
---- liblivemedia.orig/Makefile.tail
-+++ liblivemedia/Makefile.tail
-@@ -12,13 +12,13 @@ MEDIA_SERVER_DIR = mediaServer
- PROXY_SERVER_DIR = proxyServer
- 
- all:
--	cd $(LIVEMEDIA_DIR) ; $(MAKE)
--	cd $(GROUPSOCK_DIR) ; $(MAKE)
--	cd $(USAGE_ENVIRONMENT_DIR) ; $(MAKE)
--	cd $(BASIC_USAGE_ENVIRONMENT_DIR) ; $(MAKE)
--	cd $(TESTPROGS_DIR) ; $(MAKE)
--	cd $(MEDIA_SERVER_DIR) ; $(MAKE)
--	cd $(PROXY_SERVER_DIR) ; $(MAKE)
-+	cd $(LIVEMEDIA_DIR) ; CFLAGS="$(CFLAGS)" $(MAKE)
-+	cd $(GROUPSOCK_DIR) ; CFLAGS="$(CFLAGS)" $(MAKE)
-+	cd $(USAGE_ENVIRONMENT_DIR) ; CFLAGS="$(CFLAGS)" $(MAKE)
-+	cd $(BASIC_USAGE_ENVIRONMENT_DIR) ; CFLAGS="$(CFLAGS)" $(MAKE)
-+	cd $(TESTPROGS_DIR) ; CFLAGS="$(CFLAGS)" $(MAKE)
-+	cd $(MEDIA_SERVER_DIR) ; CFLAGS="$(CFLAGS)" $(MAKE)
-+	cd $(PROXY_SERVER_DIR) ; CFLAGS="$(CFLAGS)" $(MAKE)
- 
- clean:
- 	cd $(LIVEMEDIA_DIR) ; $(MAKE) clean
diff --git a/debian/patches/301_hardening.patch b/debian/patches/301_hardening.patch
deleted file mode 100644
index 8ce2ec3..0000000
--- a/debian/patches/301_hardening.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Prevent build failure when compiled with
- -Wformat -Werror=format-security.
- Pass LDFLAGS to the linker.
-Author: Alessio Treglia <alessio at debian.org>
-Forwarded: live-devel at lists.live555.com
----
- config.linux |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- liblivemedia.orig/config.linux
-+++ liblivemedia/config.linux
-@@ -8,7 +8,7 @@ CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) -Wall
- OBJ =			o
- LINK =			c++ -o
- LINK_OPTS =		-L.
--CONSOLE_LINK_OPTS =	$(LINK_OPTS)
-+CONSOLE_LINK_OPTS =	$(LDFLAGS) $(LINK_OPTS)
- LIBRARY_LINK =		ar cr 
- LIBRARY_LINK_OPTS =	
- LIB_SUFFIX =			a
diff --git a/debian/patches/pass-variables.patch b/debian/patches/pass-variables.patch
new file mode 100644
index 0000000..0285ee0
--- /dev/null
+++ b/debian/patches/pass-variables.patch
@@ -0,0 +1,41 @@
+Description: Add support for CPPFLAGS, CFLAGS, CXXFLAGS, LDFLAGS
+Author: Benjamin Drung <bdrung at debian.org>
+
+--- a/config.linux
++++ b/config.linux
+@@ -1,13 +1,13 @@
+ COMPILE_OPTS =		$(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
+ C =			c
+ C_COMPILER =		cc
+-C_FLAGS =		$(COMPILE_OPTS)
++C_FLAGS =		$(COMPILE_OPTS) $(CPPFLAGS) $(CFLAGS)
+ CPP =			cpp
+ CPLUSPLUS_COMPILER =	c++
+-CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) -Wall -DBSD=1
++CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) -Wall -DBSD=1 $(CPPFLAGS) $(CXXFLAGS)
+ OBJ =			o
+ LINK =			c++ -o
+-LINK_OPTS =		-L.
++LINK_OPTS =		-L. $(LDFLAGS)
+ CONSOLE_LINK_OPTS =	$(LINK_OPTS)
+ LIBRARY_LINK =		ar cr 
+ LIBRARY_LINK_OPTS =	
+--- a/config.linux-with-shared-libraries
++++ b/config.linux-with-shared-libraries
+@@ -21,13 +21,13 @@
+ COMPILE_OPTS =		$(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -fPIC
+ C =			c
+ C_COMPILER =		cc
+-C_FLAGS =		$(COMPILE_OPTS)
++C_FLAGS =		$(COMPILE_OPTS) $(CPPFLAGS) $(CFLAGS)
+ CPP =			cpp
+ CPLUSPLUS_COMPILER =	c++
+-CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) -Wall -DBSD=1
++CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) -Wall -DBSD=1 $(CPPFLAGS) $(CXXFLAGS)
+ OBJ =			o
+ LINK =			c++ -o
+-LINK_OPTS =		-L.
++LINK_OPTS =		-L. $(LDFLAGS)
+ CONSOLE_LINK_OPTS =	$(LINK_OPTS)
+ LIBRARY_LINK =		gcc -o 
+ LIBRARY_LINK_OPTS =	-shared -Wl,-soname,$(NAME).so.$(shell expr $($(NAME)_VERSION_CURRENT) - $($(NAME)_VERSION_AGE))
diff --git a/debian/patches/series b/debian/patches/series
index 6b9c576..3f7335c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
-010_propagate_cflags.diff
 020_invalid_casts.diff
 021_ip_mreq_source.diff
 022_synchronous_rtspclient.patch
-301_hardening.patch
+pass-variables.patch
 install-target.patch

-- 
liblivemedia packaging