[SCM] liblivemedia/master: Refresh patches

Sun Sep 17 09:53:37 UTC 2017

The following commit has been merged in the master branch:
commit 21faa415603a2e1ce858e15d442c700567e298f4
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sat Sep 16 11:28:27 2017 +0200

    Refresh patches

diff --git a/debian/patches/021_ip_mreq_source.patch b/debian/patches/0001-ip_mreq_source-is-defined-in-all-glibc-not-just-on-k.patch
similarity index 55%
rename from debian/patches/021_ip_mreq_source.patch
rename to debian/patches/0001-ip_mreq_source-is-defined-in-all-glibc-not-just-on-k.patch
index 988d6e9..8910fdf 100644
--- a/debian/patches/021_ip_mreq_source.patch
+++ b/debian/patches/0001-ip_mreq_source-is-defined-in-all-glibc-not-just-on-k.patch
@@ -1,9 +1,17 @@
-Description: ip_mreq_source is defined in all glibc not just on kfreebsd.
- Fix hurd FTBFS
+From: Christophe Mutricy <xtophe at videolan.org>
+Date: Sat, 16 Sep 2017 11:22:03 +0200
+Subject: ip_mreq_source is defined in all glibc not just on kfreebsd
 
+Fix hurd FTBFS.
+---
+ groupsock/GroupsockHelper.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/groupsock/GroupsockHelper.cpp b/groupsock/GroupsockHelper.cpp
+index 9821931..2ed4ddc 100644
 --- a/groupsock/GroupsockHelper.cpp
 +++ b/groupsock/GroupsockHelper.cpp
-@@ -489,12 +489,14 @@
+@@ -495,12 +495,14 @@ Boolean socketLeaveGroup(UsageEnvironment&, int socket,
  // commands, and a special structure (ip_mreq_source).  If the include files
  // didn't define these, we do so here:
  #if !defined(IP_ADD_SOURCE_MEMBERSHIP)
diff --git a/debian/patches/add-pkgconfig-file.patch b/debian/patches/0002-Add-a-pkg-config-file-for-the-shared-libraries.patch
similarity index 70%
rename from debian/patches/add-pkgconfig-file.patch
rename to debian/patches/0002-Add-a-pkg-config-file-for-the-shared-libraries.patch
index de155af..d6d1eaf 100644
--- a/debian/patches/add-pkgconfig-file.patch
+++ b/debian/patches/0002-Add-a-pkg-config-file-for-the-shared-libraries.patch
@@ -1,6 +1,16 @@
-Description: Add a pkg-config file for the shared libraries.
-Author: Benjamin Drung <bdrung at debian.org>
+From: Benjamin Drung <bdrung at debian.org>
+Date: Sat, 16 Sep 2017 11:22:03 +0200
+Subject: Add a pkg-config file for the shared libraries
 
+---
+ Makefile.head | 3 +++
+ Makefile.tail | 7 ++++++-
+ live555.pc.in | 9 +++++++++
+ 3 files changed, 18 insertions(+), 1 deletion(-)
+ create mode 100644 live555.pc.in
+
+diff --git a/Makefile.head b/Makefile.head
+index 458c54c..1571037 100644
 --- a/Makefile.head
 +++ b/Makefile.head
 @@ -1 +1,4 @@
@@ -8,21 +18,11 @@ Author: Benjamin Drung <bdrung at debian.org>
 +LIBDIR = /usr/local/lib
 +VERSION = $(shell grep LIVEMEDIA_LIBRARY_VERSION_STRING liveMedia/include/liveMedia_version.hh | sed 's/.*"\([^"]*\)".*/\1/')
  ##### Change the following for your environment:
---- /dev/null
-+++ b/live555.pc.in
-@@ -0,0 +1,9 @@
-+prefix=@PREFIX@
-+libdir=@LIBDIR@
-+includedir=${prefix}/include
-+
-+Name: live555
-+Description: multimedia RTSP streaming library
-+Version: @VERSION@
-+Cflags: -I${includedir}/liveMedia -I${includedir}/groupsock -I${includedir}/BasicUsageEnvironment -I${includedir}/UsageEnvironment
-+Libs: -L${libdir} -lliveMedia -lgroupsock -lBasicUsageEnvironment -lUsageEnvironment
+diff --git a/Makefile.tail b/Makefile.tail
+index fc594ea..a20a527 100644
 --- a/Makefile.tail
 +++ b/Makefile.tail
-@@ -22,7 +22,12 @@
+@@ -22,7 +22,12 @@ all:
  	@echo
  	@echo "For more information about this source code (including your obligations under the LGPL), please see our FAQ at http://live555.com/liveMedia/faq.html"
  
@@ -36,3 +36,18 @@ Author: Benjamin Drung <bdrung at debian.org>
  	cd $(LIVEMEDIA_DIR) ; $(MAKE) install
  	cd $(GROUPSOCK_DIR) ; $(MAKE) install
  	cd $(USAGE_ENVIRONMENT_DIR) ; $(MAKE) install
+diff --git a/live555.pc.in b/live555.pc.in
+new file mode 100644
+index 0000000..3736944
+--- /dev/null
++++ b/live555.pc.in
+@@ -0,0 +1,9 @@
++prefix=@PREFIX@
++libdir=@LIBDIR@
++includedir=${prefix}/include
++
++Name: live555
++Description: multimedia RTSP streaming library
++Version: @VERSION@
++Cflags: -I${includedir}/liveMedia -I${includedir}/groupsock -I${includedir}/BasicUsageEnvironment -I${includedir}/UsageEnvironment
++Libs: -L${libdir} -lliveMedia -lgroupsock -lBasicUsageEnvironment -lUsageEnvironment
diff --git a/debian/patches/link-library-with-g++.patch b/debian/patches/0003-Link-shared-libraries-with-g-instead-of-gcc-to-fix-b.patch
similarity index 66%
rename from debian/patches/link-library-with-g++.patch
rename to debian/patches/0003-Link-shared-libraries-with-g-instead-of-gcc-to-fix-b.patch
index 06bb3f1..788e76e 100644
--- a/debian/patches/link-library-with-g++.patch
+++ b/debian/patches/0003-Link-shared-libraries-with-g-instead-of-gcc-to-fix-b.patch
@@ -1,6 +1,14 @@
-Description: Link shared libraries with g++ instead of gcc to fix build failure.
-Author: Benjamin Drung <bdrung at debian.org>
+From: Benjamin Drung <bdrung at debian.org>
+Date: Sat, 16 Sep 2017 11:22:04 +0200
+Subject: Link shared libraries with g++ instead of gcc to fix build failure
 
+---
+ config.linux                       | 6 +++---
+ config.linux-with-shared-libraries | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/config.linux b/config.linux
+index d0ec446..87cd0e6 100644
 --- a/config.linux
 +++ b/config.linux
 @@ -1,12 +1,12 @@
@@ -19,9 +27,11 @@ Author: Benjamin Drung <bdrung at debian.org>
  LINK_OPTS =		-L. $(LDFLAGS)
  CONSOLE_LINK_OPTS =	$(LINK_OPTS)
  LIBRARY_LINK =		ar cr 
+diff --git a/config.linux-with-shared-libraries b/config.linux-with-shared-libraries
+index df8a8e0..d428192 100644
 --- a/config.linux-with-shared-libraries
 +++ b/config.linux-with-shared-libraries
-@@ -35,7 +35,7 @@
+@@ -35,7 +35,7 @@ OBJ =			o
  LINK =			$(CXX) -o
  LINK_OPTS =		-L. $(LDFLAGS)
  CONSOLE_LINK_OPTS =	$(LINK_OPTS)
diff --git a/debian/patches/series b/debian/patches/series
index 55b166d..e5ea6cf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-021_ip_mreq_source.patch
-add-pkgconfig-file.patch
-link-library-with-g++.patch
+0001-ip_mreq_source-is-defined-in-all-glibc-not-just-on-k.patch
+0002-Add-a-pkg-config-file-for-the-shared-libraries.patch
+0003-Link-shared-libraries-with-g-instead-of-gcc-to-fix-b.patch

-- 
liblivemedia packaging

