[SCM] liblivemedia packaging branch, master, updated. debian/2010.02.10-1-8-gd744cce
xtophe-guest at users.alioth.debian.org
xtophe-guest at users.alioth.debian.org
Tue Apr 20 23:24:22 UTC 2010
The following commit has been merged in the master branch:
commit a859ee3be16675e53a7a9caeee04079f8cfa6306
Author: Christophe Mutricy <xtophe at videolan.org>
Date: Tue Apr 20 23:26:27 2010 +0100
Refresh patches
diff --git a/debian/patches/010_propagate_cflags.diff b/debian/patches/010_propagate_cflags.diff
index 5575287..19baff1 100644
--- a/debian/patches/010_propagate_cflags.diff
+++ b/debian/patches/010_propagate_cflags.diff
@@ -1,18 +1,18 @@
Index: liblivemedia/config.linux
===================================================================
---- liblivemedia.orig/config.linux 2009-07-11 23:38:24.000000000 +0100
-+++ liblivemedia/config.linux 2009-07-12 00:01:12.000000000 +0100
+--- liblivemedia.orig/config.linux 2010-04-20 23:23:06.000000000 +0100
++++ liblivemedia/config.linux 2010-04-20 23:23:22.000000000 +0100
@@ -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)
-diff --git a/Makefile.tail b/Makefile.tail
-index 6838011..52fa704 100644
---- a/Makefile.tail
-+++ b/Makefile.tail
-@@ -10,12 +10,12 @@ TESTPROGS_DIR = testProgs
+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
+@@ -10,12 +10,12 @@
MEDIA_SERVER_DIR = mediaServer
all:
diff --git a/debian/patches/020_invalid_casts.diff b/debian/patches/020_invalid_casts.diff
index 3303396..500026b 100644
--- a/debian/patches/020_invalid_casts.diff
+++ b/debian/patches/020_invalid_casts.diff
@@ -1,7 +1,7 @@
Index: liblivemedia/liveMedia/MPEG1or2Demux.cpp
===================================================================
---- liblivemedia.orig/liveMedia/MPEG1or2Demux.cpp 2009-07-11 23:38:24.000000000 +0100
-+++ liblivemedia/liveMedia/MPEG1or2Demux.cpp 2009-07-12 00:00:10.000000000 +0100
+--- liblivemedia.orig/liveMedia/MPEG1or2Demux.cpp 2010-04-20 23:23:06.000000000 +0100
++++ liblivemedia/liveMedia/MPEG1or2Demux.cpp 2010-04-20 23:23:35.000000000 +0100
@@ -161,7 +161,7 @@
// Make sure this stream is not already being read:
if (out.isCurrentlyAwaitingData) {
@@ -22,8 +22,8 @@ Index: liblivemedia/liveMedia/MPEG1or2Demux.cpp
Index: liblivemedia/liveMedia/H263plusVideoRTPSink.cpp
===================================================================
---- liblivemedia.orig/liveMedia/H263plusVideoRTPSink.cpp 2009-07-11 23:38:24.000000000 +0100
-+++ liblivemedia/liveMedia/H263plusVideoRTPSink.cpp 2009-07-12 00:00:10.000000000 +0100
+--- liblivemedia.orig/liveMedia/H263plusVideoRTPSink.cpp 2010-04-20 23:23:06.000000000 +0100
++++ liblivemedia/liveMedia/H263plusVideoRTPSink.cpp 2010-04-20 23:23:35.000000000 +0100
@@ -64,7 +64,7 @@
}
if (frameStart[0] != 0 || frameStart[1] != 0) {
diff --git a/debian/patches/021_ip_mreq_source.diff b/debian/patches/021_ip_mreq_source.diff
index b79e1d2..fe9f260 100644
--- a/debian/patches/021_ip_mreq_source.diff
+++ b/debian/patches/021_ip_mreq_source.diff
@@ -1,11 +1,11 @@
Index: liblivemedia/groupsock/GroupsockHelper.cpp
===================================================================
---- liblivemedia.orig/groupsock/GroupsockHelper.cpp 2009-07-11 23:38:24.000000000 +0100
-+++ liblivemedia/groupsock/GroupsockHelper.cpp 2009-07-12 00:00:10.000000000 +0100
-@@ -472,12 +472,14 @@
- // let us know, by sending email to the "live-devel" mailing list.
- // (See <http://lists.live555.com/mailman/listinfo/live-devel/> to subscribe to that mailing list.)
- // END NOTE TO CYGWIN DEVELOPERS
+--- liblivemedia.orig/groupsock/GroupsockHelper.cpp 2010-04-20 23:23:06.000000000 +0100
++++ liblivemedia/groupsock/GroupsockHelper.cpp 2010-04-20 23:23:40.000000000 +0100
+@@ -470,12 +470,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)
+#ifndef __GLIBC__
struct ip_mreq_source {
struct in_addr imr_multiaddr; /* IP multicast address of group */
diff --git a/debian/patches/022_safe_setlocale.diff b/debian/patches/022_safe_setlocale.diff
index 8192cc1..2b9e74c 100644
--- a/debian/patches/022_safe_setlocale.diff
+++ b/debian/patches/022_safe_setlocale.diff
@@ -2,8 +2,8 @@ Copyright (C) 2008 Rémi Denis-Courmont, adaptation by Felix Kühne (C) 2009.
Licensed under GNU General Public License version 2 or higher.
Index: liblivemedia/liveMedia/include/Locale.hh
===================================================================
---- liblivemedia.orig/liveMedia/include/Locale.hh 2009-07-11 23:29:07.000000000 +0100
-+++ liblivemedia/liveMedia/include/Locale.hh 2009-07-12 00:19:34.000000000 +0100
+--- liblivemedia.orig/liveMedia/include/Locale.hh 2010-04-20 23:23:59.000000000 +0100
++++ liblivemedia/liveMedia/include/Locale.hh 2010-04-20 23:24:30.000000000 +0100
@@ -27,23 +27,26 @@
#ifndef LOCALE_NOT_USED
@@ -40,8 +40,8 @@ Index: liblivemedia/liveMedia/include/Locale.hh
#endif
Index: liblivemedia/liveMedia/Locale.cpp
===================================================================
---- liblivemedia.orig/liveMedia/Locale.cpp 2009-07-11 23:29:07.000000000 +0100
-+++ liblivemedia/liveMedia/Locale.cpp 2009-07-12 00:19:34.000000000 +0100
+--- liblivemedia.orig/liveMedia/Locale.cpp 2010-04-20 23:23:59.000000000 +0100
++++ liblivemedia/liveMedia/Locale.cpp 2010-04-20 23:24:30.000000000 +0100
@@ -22,19 +22,18 @@
#include "Locale.hh"
#include <strDup.hh>
@@ -70,9 +70,9 @@ Index: liblivemedia/liveMedia/Locale.cpp
}
Index: liblivemedia/liveMedia/RTSPClient.cpp
===================================================================
---- liblivemedia.orig/liveMedia/RTSPClient.cpp 2009-07-11 23:29:07.000000000 +0100
-+++ liblivemedia/liveMedia/RTSPClient.cpp 2009-07-12 00:19:34.000000000 +0100
-@@ -1019,7 +1019,7 @@
+--- liblivemedia.orig/liveMedia/RTSPClient.cpp 2010-04-20 23:23:59.000000000 +0100
++++ liblivemedia/liveMedia/RTSPClient.cpp 2010-04-20 23:24:30.000000000 +0100
+@@ -924,7 +924,7 @@
// This is the default value; we don't need a "Scale:" header:
buf[0] = '\0';
} else {
@@ -81,7 +81,7 @@ Index: liblivemedia/liveMedia/RTSPClient.cpp
sprintf(buf, "Scale: %f\r\n", scale);
}
-@@ -1033,11 +1033,11 @@
+@@ -938,11 +938,11 @@
buf[0] = '\0';
} else if (end < 0) {
// There's no end time:
@@ -95,7 +95,7 @@ Index: liblivemedia/liveMedia/RTSPClient.cpp
sprintf(buf, "Range: npt=%.3f-%.3f\r\n", start, end);
}
-@@ -2338,7 +2338,7 @@
+@@ -2225,7 +2225,7 @@
if (_strncasecmp(line, "Scale: ", 7) != 0) return False;
line += 7;
@@ -106,8 +106,8 @@ Index: liblivemedia/liveMedia/RTSPClient.cpp
Index: liblivemedia/liveMedia/RTSPCommon.cpp
===================================================================
---- liblivemedia.orig/liveMedia/RTSPCommon.cpp 2009-07-11 23:29:07.000000000 +0100
-+++ liblivemedia/liveMedia/RTSPCommon.cpp 2009-07-12 00:19:34.000000000 +0100
+--- liblivemedia.orig/liveMedia/RTSPCommon.cpp 2010-04-20 23:23:59.000000000 +0100
++++ liblivemedia/liveMedia/RTSPCommon.cpp 2010-04-20 23:24:30.000000000 +0100
@@ -146,7 +146,7 @@
char const* fields = buf + 7;
while (*fields == ' ') ++fields;
--
liblivemedia packaging
More information about the pkg-multimedia-commits
mailing list