[SCM] liblivemedia/master: Refresh patches and drop patches that are applied upstream in a similar way.
bdrung at users.alioth.debian.org
bdrung at users.alioth.debian.org
Fri Dec 30 13:18:09 UTC 2011
The following commit has been merged in the master branch:
commit dd7e8d489582eea7684d8646db9836423764763a
Author: Benjamin Drung <bdrung at debian.org>
Date: Fri Dec 30 14:01:39 2011 +0100
Refresh patches and drop patches that are applied upstream in a similar way.
diff --git a/debian/patches/010_propagate_cflags.diff b/debian/patches/010_propagate_cflags.diff
index 19baff1..042f16a 100644
--- a/debian/patches/010_propagate_cflags.diff
+++ b/debian/patches/010_propagate_cflags.diff
@@ -1,17 +1,13 @@
-Index: liblivemedia/config.linux
-===================================================================
---- liblivemedia.orig/config.linux 2010-04-20 23:23:06.000000000 +0100
-+++ liblivemedia/config.linux 2010-04-20 23:23:22.000000000 +0100
+--- a/config.linux
++++ b/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)
-Index: liblivemedia/Makefile.tail
-===================================================================
---- liblivemedia.orig/Makefile.tail 2010-04-20 23:23:06.000000000 +0100
-+++ liblivemedia/Makefile.tail 2010-04-20 23:23:22.000000000 +0100
+--- a/Makefile.tail
++++ b/Makefile.tail
@@ -10,12 +10,12 @@
MEDIA_SERVER_DIR = mediaServer
diff --git a/debian/patches/020_invalid_casts.diff b/debian/patches/020_invalid_casts.diff
index f16eec7..167eba3 100644
--- a/debian/patches/020_invalid_casts.diff
+++ b/debian/patches/020_invalid_casts.diff
@@ -3,9 +3,9 @@
liveMedia/MPEG1or2Demux.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
---- liblivemedia.orig/liveMedia/MPEG1or2Demux.cpp
-+++ liblivemedia/liveMedia/MPEG1or2Demux.cpp
-@@ -161,7 +161,7 @@ void MPEG1or2Demux::registerReadInterest
+--- a/liveMedia/MPEG1or2Demux.cpp
++++ b/liveMedia/MPEG1or2Demux.cpp
+@@ -161,7 +161,7 @@
// Make sure this stream is not already being read:
if (out.isCurrentlyAwaitingData) {
envir() << "MPEG1or2Demux::registerReadInterest(): attempt to read stream id "
@@ -14,7 +14,7 @@
envir().internalError();
}
-@@ -457,7 +457,7 @@ void MPEGProgramStreamParser::parsePackH
+@@ -460,7 +460,7 @@
skipBytes(pack_stuffing_length);
} else { // unknown
fUsingDemux->envir() << "StreamParser::parsePack() saw strange byte "
@@ -23,9 +23,9 @@
<< " following pack_start_code\n";
}
---- liblivemedia.orig/liveMedia/H263plusVideoRTPSink.cpp
-+++ liblivemedia/liveMedia/H263plusVideoRTPSink.cpp
-@@ -64,7 +64,7 @@ void H263plusVideoRTPSink
+--- a/liveMedia/H263plusVideoRTPSink.cpp
++++ b/liveMedia/H263plusVideoRTPSink.cpp
+@@ -64,7 +64,7 @@
}
if (frameStart[0] != 0 || frameStart[1] != 0) {
envir() << "H263plusVideoRTPSink::doSpecialFrameHandling(): unexpected non-zero first two bytes: "
diff --git a/debian/patches/021_ip_mreq_source.diff b/debian/patches/021_ip_mreq_source.diff
index 5519509..2498831 100644
--- a/debian/patches/021_ip_mreq_source.diff
+++ b/debian/patches/021_ip_mreq_source.diff
@@ -1,6 +1,6 @@
--- a/groupsock/GroupsockHelper.cpp
+++ b/groupsock/GroupsockHelper.cpp
-@@ -399,12 +399,14 @@
+@@ -441,12 +441,14 @@
// 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/022_safe_setlocale.diff b/debian/patches/022_safe_setlocale.diff
deleted file mode 100644
index 37c8215..0000000
--- a/debian/patches/022_safe_setlocale.diff
+++ /dev/null
@@ -1,118 +0,0 @@
-Copyright (C) 2008 Rémi Denis-Courmont, adaptation by Felix Kühne (C) 2009.
-Licensed under GNU General Public License version 2 or higher.
----
- liveMedia/Locale.cpp | 13 ++++++-------
- liveMedia/RTSPClient.cpp | 8 ++++----
- liveMedia/RTSPCommon.cpp | 2 +-
- liveMedia/include/Locale.hh | 17 ++++++++++-------
- 4 files changed, 21 insertions(+), 19 deletions(-)
-
---- liblivemedia.orig/liveMedia/include/Locale.hh
-+++ liblivemedia/liveMedia/include/Locale.hh
-@@ -27,23 +27,26 @@ along with this library; if not, write t
-
- #ifndef LOCALE_NOT_USED
- #include <locale.h>
-+#ifdef __APPLE__
-+#include <xlocale.h>
-+#endif
- #else
--#ifndef LC_ALL
--#define LC_ALL 0
-+#ifndef LC_ALL_MASK
-+#define LC_ALL_MASK 0
- #endif
--#ifndef LC_NUMERIC
--#define LC_NUMERIC 4
-+#ifndef LC_NUMERIC_MASK
-+#define LC_NUMERIC_MASK 0
- #endif
-+typedef int locale_t;
- #endif
-
- class Locale {
- public:
-- Locale(char const* newLocale, int category = LC_ALL);
-+ Locale(char const* newLocale, int category = LC_ALL_MASK);
- virtual ~Locale();
-
- private:
-- int fCategory;
-- char* fPrevLocale;
-+ locale_t fLocale, fPrevLocale;
- };
-
- #endif
---- liblivemedia.orig/liveMedia/Locale.cpp
-+++ liblivemedia/liveMedia/Locale.cpp
-@@ -22,19 +22,18 @@ along with this library; if not, write t
- #include "Locale.hh"
- #include <strDup.hh>
-
--Locale::Locale(char const* newLocale, int category)
-- : fCategory(category) {
-+Locale::Locale(char const* newLocale, int category) {
- #ifndef LOCALE_NOT_USED
-- fPrevLocale = strDup(setlocale(category, NULL));
-- setlocale(category, newLocale);
-+ fLocale = newlocale(category, newLocale, NULL);
-+ fPrevLocale = uselocale(fLocale);
- #endif
- }
-
- Locale::~Locale() {
- #ifndef LOCALE_NOT_USED
-- if (fPrevLocale != NULL) {
-- setlocale(fCategory, fPrevLocale);
-- delete[] fPrevLocale;
-+ if (fLocale != (locale_t)0) {
-+ uselocale(fPrevLocale);
-+ freelocale(fLocale);
- }
- #endif
- }
---- liblivemedia.orig/liveMedia/RTSPClient.cpp
-+++ liblivemedia/liveMedia/RTSPClient.cpp
-@@ -469,7 +469,7 @@ static char* createScaleString(float sca
- // This is the default value; we don't need a "Scale:" header:
- buf[0] = '\0';
- } else {
-- Locale l("C", LC_NUMERIC);
-+ Locale l("C", LC_NUMERIC_MASK);
- sprintf(buf, "Scale: %f\r\n", scale);
- }
-
-@@ -483,11 +483,11 @@ static char* createRangeString(double st
- buf[0] = '\0';
- } else if (end < 0) {
- // There's no end time:
-- Locale l("C", LC_NUMERIC);
-+ Locale l("C", LC_NUMERIC_MASK);
- sprintf(buf, "Range: npt=%.3f-\r\n", start);
- } else {
- // There's both a start and an end time; include them both in the "Range:" hdr
-- Locale l("C", LC_NUMERIC);
-+ Locale l("C", LC_NUMERIC_MASK);
- sprintf(buf, "Range: npt=%.3f-%.3f\r\n", start, end);
- }
-
-@@ -921,7 +921,7 @@ Boolean RTSPClient::parseTransportParams
- }
-
- Boolean RTSPClient::parseScaleParam(char const* paramStr, float& scale) {
-- Locale l("C", LC_NUMERIC);
-+ Locale l("C", LC_NUMERIC_MASK);
- return sscanf(paramStr, "%f", &scale) == 1;
- }
-
---- liblivemedia.orig/liveMedia/RTSPCommon.cpp
-+++ liblivemedia/liveMedia/RTSPCommon.cpp
-@@ -150,7 +150,7 @@ Boolean parseRTSPRequestString(char cons
- Boolean parseRangeParam(char const* paramStr, double& rangeStart, double& rangeEnd) {
- double start, end;
- int numCharsMatched = 0;
-- Locale l("C", LC_NUMERIC);
-+ Locale l("C", LC_NUMERIC_MASK);
- if (sscanf(paramStr, "npt = %lf - %lf", &start, &end) == 2) {
- rangeStart = start;
- rangeEnd = end;
diff --git a/debian/patches/030_sockets_close_on_exec.diff b/debian/patches/030_sockets_close_on_exec.diff
deleted file mode 100644
index eb6fb05..0000000
--- a/debian/patches/030_sockets_close_on_exec.diff
+++ /dev/null
@@ -1,53 +0,0 @@
-Description: Force close-on-exec flag on live555 sockets.
-Author: Rémi Denis-Courmont <remi at remlab.net>
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=639007
-Forwarded: no
----
- groupsock/GroupsockHelper.cpp | 23 +++++++++++++++++++++--
- 1 file changed, 21 insertions(+), 2 deletions(-)
-
---- liblivemedia.orig/groupsock/GroupsockHelper.cpp
-+++ liblivemedia/groupsock/GroupsockHelper.cpp
-@@ -49,13 +49,32 @@ NoReuse::~NoReuse() {
- reuseFlag = 1;
- }
-
-+static int makeSocket(int type)
-+{
-+ int fd;
-+
-+#ifdef SOCK_CLOEXEC
-+ fd = socket(AF_INET, type|SOCK_CLOEXEC, 0);
-+ if (fd != -1 || errno != EINVAL)
-+ return fd;
-+#endif
-+
-+ fd = socket(AF_INET, type, 0);
-+ if (fd == -1)
-+ return -1;
-+#ifdef FD_CLOEXEC
-+ fcntl(fd, F_SETFD, FD_CLOEXEC);
-+#endif
-+ return fd;
-+}
-+
- int setupDatagramSocket(UsageEnvironment& env, Port port) {
- if (!initializeWinsockIfNecessary()) {
- socketErr(env, "Failed to initialize 'winsock': ");
- return -1;
- }
-
-- int newSocket = socket(AF_INET, SOCK_DGRAM, 0);
-+ int newSocket = makeSocket(SOCK_DGRAM);
- if (newSocket < 0) {
- socketErr(env, "unable to create datagram socket: ");
- return newSocket;
-@@ -161,7 +180,7 @@ int setupStreamSocket(UsageEnvironment&
- return -1;
- }
-
-- int newSocket = socket(AF_INET, SOCK_STREAM, 0);
-+ int newSocket = makeSocket(SOCK_STREAM);
- if (newSocket < 0) {
- socketErr(env, "unable to create stream socket: ");
- return newSocket;
diff --git a/debian/patches/series b/debian/patches/series
index abae02d..f3f2439 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-010_propagate_cflags.diff
-020_invalid_casts.diff
+010_propagate_cflags.diff
+020_invalid_casts.diff
021_ip_mreq_source.diff
-022_safe_setlocale.diff
-030_sockets_close_on_exec.diff
--
liblivemedia packaging
More information about the pkg-multimedia-commits
mailing list