[SCM] liblivemedia/master: Drop pass-variables.patch (accepted upstream).
bdrung at users.alioth.debian.org
bdrung at users.alioth.debian.org
Fri Dec 21 12:39:04 UTC 2012
The following commit has been merged in the master branch:
commit 87bfba73a245d8f93a533aada8cae9ff92ccade5
Author: Benjamin Drung <bdrung at debian.org>
Date: Fri Dec 21 13:38:16 2012 +0100
Drop pass-variables.patch (accepted upstream).
diff --git a/debian/patches/pass-variables.patch b/debian/patches/pass-variables.patch
deleted file mode 100644
index 0285ee0..0000000
--- a/debian/patches/pass-variables.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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 3f7335c..34bc587 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
020_invalid_casts.diff
021_ip_mreq_source.diff
022_synchronous_rtspclient.patch
-pass-variables.patch
install-target.patch
--
liblivemedia packaging
More information about the pkg-multimedia-commits
mailing list