[SCM] liblivemedia packaging branch, master, updated. debian/2008.07.25-2-6-g0342e6e
xtophe-guest at users.alioth.debian.org
xtophe-guest at users.alioth.debian.org
Wed Jul 22 22:53:12 UTC 2009
The following commit has been merged in the master branch:
commit f965ab026e62a409c4369b3e2751038feb5d55b0
Author: Christophe Mutricy <xtophe at videolan.org>
Date: Wed Jul 22 23:26:47 2009 +0100
Refresh patches
diff --git a/debian/patches/010_propagate_cflags.diff b/debian/patches/010_propagate_cflags.diff
index a78471f..29b0839 100644
--- a/debian/patches/010_propagate_cflags.diff
+++ b/debian/patches/010_propagate_cflags.diff
@@ -1,17 +1,17 @@
-Index: liblivemedia-2008.07.25/config.linux
+Index: liblivemedia/config.linux
===================================================================
---- liblivemedia-2008.07.25.orig/config.linux 2008-07-25 02:40:05.000000000 +0200
-+++ liblivemedia-2008.07.25/config.linux 2008-08-23 00:09:55.000000000 +0200
+--- liblivemedia.orig/config.linux 2009-07-11 23:38:24.000000000 +0100
++++ liblivemedia/config.linux 2009-07-12 00:01:12.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)
-Index: liblivemedia-2008.07.25/Makefile.tail
+Index: liblivemedia/Makefile.tail
===================================================================
---- liblivemedia-2008.07.25.orig/Makefile.tail 2008-07-25 02:40:05.000000000 +0200
-+++ liblivemedia-2008.07.25/Makefile.tail 2008-08-22 23:57:58.000000000 +0200
+--- liblivemedia.orig/Makefile.tail 2009-07-11 23:38:24.000000000 +0100
++++ liblivemedia/Makefile.tail 2009-07-12 00:00:10.000000000 +0100
@@ -25,17 +25,17 @@
diff --git a/debian/patches/010_proper_link_order.diff b/debian/patches/010_proper_link_order.diff
index 4cc934a..2e0ecea 100644
--- a/debian/patches/010_proper_link_order.diff
+++ b/debian/patches/010_proper_link_order.diff
@@ -1,7 +1,7 @@
-Index: liblivemedia-2008.07.25/mediaServer/Makefile.tail
+Index: liblivemedia/mediaServer/Makefile.tail
===================================================================
---- liblivemedia-2008.07.25.orig/mediaServer/Makefile.tail 2008-07-25 02:40:05.000000000 +0200
-+++ liblivemedia-2008.07.25/mediaServer/Makefile.tail 2008-08-22 23:57:58.000000000 +0200
+--- liblivemedia.orig/mediaServer/Makefile.tail 2009-07-11 23:38:24.000000000 +0100
++++ liblivemedia/mediaServer/Makefile.tail 2009-07-12 00:00:10.000000000 +0100
@@ -25,7 +25,7 @@
GROUPSOCK_DIR = ../groupsock
GROUPSOCK_LIB = $(GROUPSOCK_DIR)/libgroupsock.$(LIB_SUFFIX)
@@ -11,10 +11,10 @@ Index: liblivemedia-2008.07.25/mediaServer/Makefile.tail
LIBS = $(LOCAL_LIBS) $(LIBS_FOR_CONSOLE_APPLICATION)
live555MediaServer$(EXE): $(MEDIA_SERVER_OBJS) $(LOCAL_LIBS)
-Index: liblivemedia-2008.07.25/testProgs/Makefile.tail
+Index: liblivemedia/testProgs/Makefile.tail
===================================================================
---- liblivemedia-2008.07.25.orig/testProgs/Makefile.tail 2008-07-25 02:40:05.000000000 +0200
-+++ liblivemedia-2008.07.25/testProgs/Makefile.tail 2008-08-22 23:57:58.000000000 +0200
+--- liblivemedia.orig/testProgs/Makefile.tail 2009-07-11 23:38:24.000000000 +0100
++++ liblivemedia/testProgs/Makefile.tail 2009-07-12 00:00:10.000000000 +0100
@@ -59,7 +59,7 @@
GROUPSOCK_DIR = ../groupsock
GROUPSOCK_LIB = $(GROUPSOCK_DIR)/libgroupsock.$(LIB_SUFFIX)
diff --git a/debian/patches/010_static_link.diff b/debian/patches/010_static_link.diff
index 0992ee7..884dcca 100644
--- a/debian/patches/010_static_link.diff
+++ b/debian/patches/010_static_link.diff
@@ -1,7 +1,7 @@
-Index: liblivemedia-2008.07.25/config.linux
+Index: liblivemedia/config.linux
===================================================================
---- liblivemedia-2008.07.25.orig/config.linux 2008-08-22 23:57:58.000000000 +0200
-+++ liblivemedia-2008.07.25/config.linux 2008-08-22 23:57:58.000000000 +0200
+--- liblivemedia.orig/config.linux 2009-07-12 00:00:10.000000000 +0100
++++ liblivemedia/config.linux 2009-07-12 00:00:10.000000000 +0100
@@ -9,8 +9,8 @@
LINK = c++ -o
LINK_OPTS = -L.
diff --git a/debian/patches/020_invalid_casts.diff b/debian/patches/020_invalid_casts.diff
index 8c3d2c8..f5f367b 100644
--- a/debian/patches/020_invalid_casts.diff
+++ b/debian/patches/020_invalid_casts.diff
@@ -1,7 +1,7 @@
-Index: liblivemedia-2008.07.25/liveMedia/MPEG1or2Demux.cpp
+Index: liblivemedia/liveMedia/MPEG1or2Demux.cpp
===================================================================
---- liblivemedia-2008.07.25.orig/liveMedia/MPEG1or2Demux.cpp 2008-07-25 02:40:05.000000000 +0200
-+++ liblivemedia-2008.07.25/liveMedia/MPEG1or2Demux.cpp 2008-08-22 23:57:58.000000000 +0200
+--- 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
@@ -161,7 +161,7 @@
// Make sure this stream is not already being read:
if (out.isCurrentlyAwaitingData) {
@@ -10,7 +10,7 @@ Index: liblivemedia-2008.07.25/liveMedia/MPEG1or2Demux.cpp
+ << streamIdTag << " more than once!\n";
exit(1);
}
-
+
@@ -457,7 +457,7 @@
skipBytes(pack_stuffing_length);
} else { // unknown
@@ -19,11 +19,11 @@ Index: liblivemedia-2008.07.25/liveMedia/MPEG1or2Demux.cpp
+ << nextByte
<< " following pack_start_code\n";
}
-
-Index: liblivemedia-2008.07.25/liveMedia/H263plusVideoRTPSink.cpp
+
+Index: liblivemedia/liveMedia/H263plusVideoRTPSink.cpp
===================================================================
---- liblivemedia-2008.07.25.orig/liveMedia/H263plusVideoRTPSink.cpp 2008-07-25 02:40:05.000000000 +0200
-+++ liblivemedia-2008.07.25/liveMedia/H263plusVideoRTPSink.cpp 2008-08-22 23:57:58.000000000 +0200
+--- 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
@@ -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 25369e7..0bb373d 100644
--- a/debian/patches/021_ip_mreq_source.diff
+++ b/debian/patches/021_ip_mreq_source.diff
@@ -1,8 +1,8 @@
-Index: liblivemedia-2008.07.25/groupsock/GroupsockHelper.cpp
+Index: liblivemedia/groupsock/GroupsockHelper.cpp
===================================================================
---- liblivemedia-2008.07.25.orig/groupsock/GroupsockHelper.cpp 2008-07-25 02:40:05.000000000 +0200
-+++ liblivemedia-2008.07.25/groupsock/GroupsockHelper.cpp 2008-08-22 23:57:58.000000000 +0200
-@@ -474,12 +474,14 @@
+--- 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
diff --git a/debian/patches/022_safe_setlocale.diff b/debian/patches/022_safe_setlocale.diff
index 8948718..8192cc1 100644
--- a/debian/patches/022_safe_setlocale.diff
+++ b/debian/patches/022_safe_setlocale.diff
@@ -1,9 +1,9 @@
-Copyright (C) 2008 Rémi Denis-Courmont.
+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-2008.07.25/liveMedia/include/Locale.hh
+Index: liblivemedia/liveMedia/include/Locale.hh
===================================================================
---- liblivemedia-2008.07.25.orig/liveMedia/include/Locale.hh 2008-07-25 02:40:05.000000000 +0200
-+++ liblivemedia-2008.07.25/liveMedia/include/Locale.hh 2008-08-22 23:57:58.000000000 +0200
+--- 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
@@ -27,23 +27,26 @@
#ifndef LOCALE_NOT_USED
@@ -38,10 +38,10 @@ Index: liblivemedia-2008.07.25/liveMedia/include/Locale.hh
};
#endif
-Index: liblivemedia-2008.07.25/liveMedia/Locale.cpp
+Index: liblivemedia/liveMedia/Locale.cpp
===================================================================
---- liblivemedia-2008.07.25.orig/liveMedia/Locale.cpp 2008-07-25 02:40:05.000000000 +0200
-+++ liblivemedia-2008.07.25/liveMedia/Locale.cpp 2008-08-22 23:57:58.000000000 +0200
+--- 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
@@ -22,19 +22,18 @@
#include "Locale.hh"
#include <strDup.hh>
@@ -68,52 +68,52 @@ Index: liblivemedia-2008.07.25/liveMedia/Locale.cpp
}
#endif
}
-Index: liblivemedia-2008.07.25/liveMedia/RTSPClient.cpp
+Index: liblivemedia/liveMedia/RTSPClient.cpp
===================================================================
---- liblivemedia-2008.07.25.orig/liveMedia/RTSPClient.cpp 2008-07-25 02:40:05.000000000 +0200
-+++ liblivemedia-2008.07.25/liveMedia/RTSPClient.cpp 2008-08-22 23:57:58.000000000 +0200
-@@ -1017,7 +1017,7 @@
+--- 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 @@
// This is the default value; we don't need a "Scale:" header:
buf[0] = '\0';
} else {
-- Locale("C", LC_NUMERIC);
-+ Locale("C", LC_NUMERIC_MASK);
+- Locale l("C", LC_NUMERIC);
++ Locale l("C", LC_NUMERIC_MASK);
sprintf(buf, "Scale: %f\r\n", scale);
}
-@@ -1031,11 +1031,11 @@
+@@ -1033,11 +1033,11 @@
buf[0] = '\0';
} else if (end < 0) {
// There's no end time:
-- Locale("C", LC_NUMERIC);
-+ Locale("C", LC_NUMERIC_MASK);
+- 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("C", LC_NUMERIC);
-+ Locale("C", LC_NUMERIC_MASK);
+- Locale l("C", LC_NUMERIC);
++ Locale l("C", LC_NUMERIC_MASK);
sprintf(buf, "Range: npt=%.3f-%.3f\r\n", start, end);
}
-@@ -2306,7 +2306,7 @@
+@@ -2338,7 +2338,7 @@
if (_strncasecmp(line, "Scale: ", 7) != 0) return False;
line += 7;
-- Locale("C", LC_NUMERIC);
-+ Locale("C", LC_NUMERIC_MASK);
+- Locale l("C", LC_NUMERIC);
++ Locale l("C", LC_NUMERIC_MASK);
return sscanf(line, "%f", &scale) == 1;
}
-Index: liblivemedia-2008.07.25/liveMedia/RTSPCommon.cpp
+Index: liblivemedia/liveMedia/RTSPCommon.cpp
===================================================================
---- liblivemedia-2008.07.25.orig/liveMedia/RTSPCommon.cpp 2008-07-25 02:40:05.000000000 +0200
-+++ liblivemedia-2008.07.25/liveMedia/RTSPCommon.cpp 2008-08-22 23:57:58.000000000 +0200
+--- 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
@@ -146,7 +146,7 @@
char const* fields = buf + 7;
while (*fields == ' ') ++fields;
- float start, end;
-- Locale("C", LC_NUMERIC);
-+ Locale("C", LC_NUMERIC_MASK);
- if (sscanf(fields, "npt = %f - %f", &start, &end) == 2) {
+ double start, end;
+- Locale l("C", LC_NUMERIC);
++ Locale l("C", LC_NUMERIC_MASK);
+ if (sscanf(fields, "npt = %lf - %lf", &start, &end) == 2) {
rangeStart = start;
rangeEnd = end;
--
liblivemedia packaging
More information about the pkg-multimedia-commits
mailing list