diff -Nru liblivemedia-2018.01.29/BasicUsageEnvironment/include/BasicUsageEnvironment_version.hh liblivemedia-2018.02.18/BasicUsageEnvironment/include/BasicUsageEnvironment_version.hh --- liblivemedia-2018.01.29/BasicUsageEnvironment/include/BasicUsageEnvironment_version.hh 2018-01-29 10:11:03.000000000 +0000 +++ liblivemedia-2018.02.18/BasicUsageEnvironment/include/BasicUsageEnvironment_version.hh 2018-02-18 08:53:11.000000000 +0000 @@ -4,7 +4,7 @@ #ifndef _BASICUSAGEENVIRONMENT_VERSION_HH #define _BASICUSAGEENVIRONMENT_VERSION_HH -#define BASICUSAGEENVIRONMENT_LIBRARY_VERSION_STRING "2018.01.29" -#define BASICUSAGEENVIRONMENT_LIBRARY_VERSION_INT 1517184000 +#define BASICUSAGEENVIRONMENT_LIBRARY_VERSION_STRING "2018.02.18" +#define BASICUSAGEENVIRONMENT_LIBRARY_VERSION_INT 1518912000 #endif diff -Nru liblivemedia-2018.01.29/config.cygwin liblivemedia-2018.02.18/config.cygwin --- liblivemedia-2018.01.29/config.cygwin 2018-01-29 10:14:07.000000000 +0000 +++ liblivemedia-2018.02.18/config.cygwin 2018-02-18 08:54:22.000000000 +0000 @@ -1,4 +1,4 @@ -COMPILE_OPTS = $(INCLUDES) -I. -O -DSOCKLEN_T=socklen_t -DXLOCALE_NOT_USED=1 +COMPILE_OPTS = $(INCLUDES) -I. -O -DSOCKLEN_T=socklen_t -DNEWLOCALE_NOT_USED=1 C = c C_COMPILER = gcc C_FLAGS = $(COMPILE_OPTS) -DUSE_OUR_BZERO=1 -D__CYGWIN__ diff -Nru liblivemedia-2018.01.29/config.cygwin-for-vlc liblivemedia-2018.02.18/config.cygwin-for-vlc --- liblivemedia-2018.01.29/config.cygwin-for-vlc 2018-01-29 10:14:07.000000000 +0000 +++ liblivemedia-2018.02.18/config.cygwin-for-vlc 2018-02-18 08:54:22.000000000 +0000 @@ -1,4 +1,4 @@ -COMPILE_OPTS = $(INCLUDES) -I. -O -DSOCKLEN_T=socklen_t -DXLOCALE_NOT_USED=1 +COMPILE_OPTS = $(INCLUDES) -I. -O -DSOCKLEN_T=socklen_t -DNEWLOCALE_NOT_USED=1 C = c C_COMPILER = gcc C_FLAGS = $(COMPILE_OPTS) -DUSE_OUR_BZERO=1 -D_WIN32 -mno-cygwin diff -Nru liblivemedia-2018.01.29/config.freebsd liblivemedia-2018.02.18/config.freebsd --- liblivemedia-2018.01.29/config.freebsd 2018-01-29 10:14:07.000000000 +0000 +++ liblivemedia-2018.02.18/config.freebsd 2018-02-18 08:54:22.000000000 +0000 @@ -1,4 +1,4 @@ -COMPILE_OPTS = $(INCLUDES) -I. -O -DBSD=1 -DXLOCALE_NOT_USED=1 -DSOCKLEN_T=socklen_t -DHAVE_SOCKADDR_LEN=1 +COMPILE_OPTS = $(INCLUDES) -I. -O -DBSD=1 -DNEWLOCALE_NOT_USED=1 -DSOCKLEN_T=socklen_t -DHAVE_SOCKADDR_LEN=1 C = c C_COMPILER = cc C_FLAGS = $(COMPILE_OPTS) diff -Nru liblivemedia-2018.01.29/config.linux-with-shared-libraries liblivemedia-2018.02.18/config.linux-with-shared-libraries --- liblivemedia-2018.01.29/config.linux-with-shared-libraries 2018-01-29 10:14:07.000000000 +0000 +++ liblivemedia-2018.02.18/config.linux-with-shared-libraries 2018-02-18 08:54:22.000000000 +0000 @@ -4,7 +4,7 @@ # One or more interfaces were added, but no existing interfaces were changed or removed => CURRENT += 1; REVISION = 0; AGE += 1 libliveMedia_VERSION_CURRENT=62 -libliveMedia_VERSION_REVISION=1 +libliveMedia_VERSION_REVISION=2 libliveMedia_VERSION_AGE=0 libliveMedia_LIB_SUFFIX=so.$(shell expr $(libliveMedia_VERSION_CURRENT) - $(libliveMedia_VERSION_AGE)).$(libliveMedia_VERSION_AGE).$(libliveMedia_VERSION_REVISION) diff -Nru liblivemedia-2018.01.29/#config.macosx# liblivemedia-2018.02.18/#config.macosx# --- liblivemedia-2018.01.29/#config.macosx# 1970-01-01 00:00:00.000000000 +0000 +++ liblivemedia-2018.02.18/#config.macosx# 2018-02-18 08:54:22.000000000 +0000 @@ -0,0 +1,17 @@ +COMPILE_OPTS = $(INCLUDES) -I. $(EXTRA_LDFLAGS) -DBSD=1 -O -DSOCKLEN_T=socklen_t -DHAVE_SOCKADDR_LEN=1 -DTIME_BASE=in +C = c +C_COMPILER = cc +C_FLAGS = $(COMPILE_OPTS) +CPP = cpp +CPLUSPLUS_COMPILER = c++ +CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall +OBJ = o +LINK = c++ -o +LINK_OPTS = -L. +CONSOLE_LINK_OPTS = $(LINK_OPTS) +LIBRARY_LINK = libtool -s -o +LIBRARY_LINK_OPTS = +LIB_SUFFIX = a +LIBS_FOR_CONSOLE_APPLICATION = +LIBS_FOR_GUI_APPLICATION = +EXE = diff -Nru liblivemedia-2018.01.29/config.macosx liblivemedia-2018.02.18/config.macosx --- liblivemedia-2018.01.29/config.macosx 2018-01-29 10:14:07.000000000 +0000 +++ liblivemedia-2018.02.18/config.macosx 2018-02-18 08:54:22.000000000 +0000 @@ -1,4 +1,4 @@ -COMPILE_OPTS = $(INCLUDES) -I. $(EXTRA_LDFLAGS) -DBSD=1 -O -DSOCKLEN_T=socklen_t -DHAVE_SOCKADDR_LEN=1 -DTIME_BASE=int +COMPILE_OPTS = $(INCLUDES) -I. $(EXTRA_LDFLAGS) -DBSD=1 -O -DSOCKLEN_T=socklen_t -DHAVE_SOCKADDR_LEN=1 -DTIME_BASE=int -DNEED_XLOCALE_H=1 C = c C_COMPILER = cc C_FLAGS = $(COMPILE_OPTS) diff -Nru liblivemedia-2018.01.29/config.solaris-32bit liblivemedia-2018.02.18/config.solaris-32bit --- liblivemedia-2018.01.29/config.solaris-32bit 2018-01-29 10:14:07.000000000 +0000 +++ liblivemedia-2018.02.18/config.solaris-32bit 2018-02-18 08:54:22.000000000 +0000 @@ -1,4 +1,4 @@ -COMPILE_OPTS = $(INCLUDES) -I. -O -DSOLARIS -DXLOCALE_NOT_USED -DSOCKLEN_T=socklen_t +COMPILE_OPTS = $(INCLUDES) -I. -O -DSOLARIS -DNEWLOCALE_NOT_USED -DSOCKLEN_T=socklen_t C = c C_COMPILER = cc C_FLAGS = $(COMPILE_OPTS) diff -Nru liblivemedia-2018.01.29/config.solaris-64bit liblivemedia-2018.02.18/config.solaris-64bit --- liblivemedia-2018.01.29/config.solaris-64bit 2018-01-29 10:14:07.000000000 +0000 +++ liblivemedia-2018.02.18/config.solaris-64bit 2018-02-18 08:54:22.000000000 +0000 @@ -1,4 +1,4 @@ -COMPILE_OPTS = $(INCLUDES) -m64 -I. -O -DSOLARIS -DXLOCALE_NOT_USED -DSOCKLEN_T=socklen_t +COMPILE_OPTS = $(INCLUDES) -m64 -I. -O -DSOLARIS -DNEWLOCALE_NOT_USED -DSOCKLEN_T=socklen_t C = c C_COMPILER = cc C_FLAGS = $(COMPILE_OPTS) diff -Nru liblivemedia-2018.01.29/debian/changelog liblivemedia-2018.02.18/debian/changelog --- liblivemedia-2018.01.29/debian/changelog 2018-02-01 17:31:09.000000000 +0000 +++ liblivemedia-2018.02.18/debian/changelog 2018-02-19 19:09:37.000000000 +0000 @@ -1,3 +1,11 @@ +liblivemedia (2018.02.18-1) unstable; urgency=medium + + * New upstream release. + * debian/patches: Remove patch for glibc 2.26 compatibility - fixed + upstream. + + -- Sebastian Ramacher Mon, 19 Feb 2018 20:09:37 +0100 + liblivemedia (2018.01.29-1) unstable; urgency=medium * New upstream release. diff -Nru liblivemedia-2018.01.29/debian/patches/0001-ip_mreq_source-is-defined-in-all-glibc-not-just-on-k.patch liblivemedia-2018.02.18/debian/patches/0001-ip_mreq_source-is-defined-in-all-glibc-not-just-on-k.patch --- liblivemedia-2018.01.29/debian/patches/0001-ip_mreq_source-is-defined-in-all-glibc-not-just-on-k.patch 2017-11-17 18:34:46.000000000 +0000 +++ liblivemedia-2018.02.18/debian/patches/0001-ip_mreq_source-is-defined-in-all-glibc-not-just-on-k.patch 2018-02-19 19:06:51.000000000 +0000 @@ -8,7 +8,7 @@ 1 file changed, 2 insertions(+) diff --git a/groupsock/GroupsockHelper.cpp b/groupsock/GroupsockHelper.cpp -index 9821931..2ed4ddc 100644 +index 4cf045e..24777ff 100644 --- a/groupsock/GroupsockHelper.cpp +++ b/groupsock/GroupsockHelper.cpp @@ -495,12 +495,14 @@ Boolean socketLeaveGroup(UsageEnvironment&, int socket, diff -Nru liblivemedia-2018.01.29/debian/patches/0003-Link-shared-libraries-with-g-instead-of-gcc-to-fix-b.patch liblivemedia-2018.02.18/debian/patches/0003-Link-shared-libraries-with-g-instead-of-gcc-to-fix-b.patch --- liblivemedia-2018.01.29/debian/patches/0003-Link-shared-libraries-with-g-instead-of-gcc-to-fix-b.patch 2017-11-17 18:34:46.000000000 +0000 +++ liblivemedia-2018.02.18/debian/patches/0003-Link-shared-libraries-with-g-instead-of-gcc-to-fix-b.patch 2018-02-19 19:06:51.000000000 +0000 @@ -28,7 +28,7 @@ CONSOLE_LINK_OPTS = $(LINK_OPTS) LIBRARY_LINK = ar cr diff --git a/config.linux-with-shared-libraries b/config.linux-with-shared-libraries -index 6cc6888..bc1d2fb 100644 +index b8fa41e..5c648a5 100644 --- a/config.linux-with-shared-libraries +++ b/config.linux-with-shared-libraries @@ -33,12 +33,12 @@ CPLUSPLUS_COMPILER = $(CXX) diff -Nru liblivemedia-2018.01.29/debian/patches/0005-Don-t-include-xlocale.h.patch liblivemedia-2018.02.18/debian/patches/0005-Don-t-include-xlocale.h.patch --- liblivemedia-2018.01.29/debian/patches/0005-Don-t-include-xlocale.h.patch 2017-11-17 18:34:46.000000000 +0000 +++ liblivemedia-2018.02.18/debian/patches/0005-Don-t-include-xlocale.h.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -From: Matthias Klose -Date: Fri, 17 Nov 2017 19:34:38 +0100 -Subject: Don't include xlocale.h - ---- - liveMedia/include/Locale.hh | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/liveMedia/include/Locale.hh b/liveMedia/include/Locale.hh -index c6cd745..e7b22ce 100644 ---- a/liveMedia/include/Locale.hh -+++ b/liveMedia/include/Locale.hh -@@ -43,9 +43,6 @@ along with this library; if not, write to the Free Software Foundation, Inc., - - #ifndef LOCALE_NOT_USED - #include --#ifndef XLOCALE_NOT_USED --#include // because, on some systems, doesn't include ; this makes sure that we get both --#endif - #endif - - diff -Nru liblivemedia-2018.01.29/debian/patches/series liblivemedia-2018.02.18/debian/patches/series --- liblivemedia-2018.01.29/debian/patches/series 2017-11-17 18:34:46.000000000 +0000 +++ liblivemedia-2018.02.18/debian/patches/series 2018-02-19 19:06:51.000000000 +0000 @@ -2,4 +2,3 @@ 0002-Add-a-pkg-config-file-for-the-shared-libraries.patch 0003-Link-shared-libraries-with-g-instead-of-gcc-to-fix-b.patch 0004-Reduce-number-of-unresolved-symbols-by-linking-libra.patch -0005-Don-t-include-xlocale.h.patch diff -Nru liblivemedia-2018.01.29/groupsock/include/groupsock_version.hh liblivemedia-2018.02.18/groupsock/include/groupsock_version.hh --- liblivemedia-2018.01.29/groupsock/include/groupsock_version.hh 2018-01-29 10:11:03.000000000 +0000 +++ liblivemedia-2018.02.18/groupsock/include/groupsock_version.hh 2018-02-18 08:53:11.000000000 +0000 @@ -4,7 +4,7 @@ #ifndef _GROUPSOCK_VERSION_HH #define _GROUPSOCK_VERSION_HH -#define GROUPSOCK_LIBRARY_VERSION_STRING "2018.01.29" -#define GROUPSOCK_LIBRARY_VERSION_INT 1517184000 +#define GROUPSOCK_LIBRARY_VERSION_STRING "2018.02.18" +#define GROUPSOCK_LIBRARY_VERSION_INT 1518912000 #endif diff -Nru liblivemedia-2018.01.29/liveMedia/ByteStreamMultiFileSource.cpp liblivemedia-2018.02.18/liveMedia/ByteStreamMultiFileSource.cpp --- liblivemedia-2018.01.29/liveMedia/ByteStreamMultiFileSource.cpp 2018-01-29 10:11:02.000000000 +0000 +++ liblivemedia-2018.02.18/liveMedia/ByteStreamMultiFileSource.cpp 2018-02-18 08:53:10.000000000 +0000 @@ -15,7 +15,8 @@ **********/ // "liveMedia" // Copyright (c) 1996-2018 Live Networks, Inc. All rights reserved. -// A source that consists of multiple byte-stream files, read sequentially +// A source that consists of multiple byte-stream files, read sequentially. +// (The input is an array of file names, with a terminating 'file name' of NULL.) // Implementation #include "ByteStreamMultiFileSource.hh" @@ -26,7 +27,7 @@ : FramedSource(env), fPreferredFrameSize(preferredFrameSize), fPlayTimePerFrame(playTimePerFrame), fCurrentlyReadSourceNumber(0), fHaveStartedNewFile(False) { - // Begin by counting the number of sources: + // Begin by counting the number of sources (by looking for a terminating 'file name' of NULL): for (fNumSources = 0; ; ++fNumSources) { if (fileNameArray[fNumSources] == NULL) break; } diff -Nru liblivemedia-2018.01.29/liveMedia/include/ByteStreamMultiFileSource.hh liblivemedia-2018.02.18/liveMedia/include/ByteStreamMultiFileSource.hh --- liblivemedia-2018.01.29/liveMedia/include/ByteStreamMultiFileSource.hh 2018-01-29 10:11:02.000000000 +0000 +++ liblivemedia-2018.02.18/liveMedia/include/ByteStreamMultiFileSource.hh 2018-02-18 08:53:10.000000000 +0000 @@ -15,7 +15,8 @@ **********/ // "liveMedia" // Copyright (c) 1996-2018 Live Networks, Inc. All rights reserved. -// A source that consists of multiple byte-stream files, read sequentially +// A source that consists of multiple byte-stream files, read sequentially. +// (The input is an array of file names, with a terminating 'file name' of NULL.) // C++ header #ifndef _BYTE_STREAM_MULTI_FILE_SOURCE_HH @@ -30,7 +31,8 @@ static ByteStreamMultiFileSource* createNew(UsageEnvironment& env, char const** fileNameArray, unsigned preferredFrameSize = 0, unsigned playTimePerFrame = 0); - // A 'filename' of NULL indicates the end of the array + // "fileNameArray" is a pointer to an array of (char const*) file names, with + // A 'file name' of NULL indicating the end of the array Boolean haveStartedNewFile() const { return fHaveStartedNewFile; } // True iff the most recently delivered frame was the first from a newly-opened file diff -Nru liblivemedia-2018.01.29/liveMedia/include/liveMedia_version.hh liblivemedia-2018.02.18/liveMedia/include/liveMedia_version.hh --- liblivemedia-2018.01.29/liveMedia/include/liveMedia_version.hh 2018-01-29 10:11:02.000000000 +0000 +++ liblivemedia-2018.02.18/liveMedia/include/liveMedia_version.hh 2018-02-18 08:53:10.000000000 +0000 @@ -4,7 +4,7 @@ #ifndef _LIVEMEDIA_VERSION_HH #define _LIVEMEDIA_VERSION_HH -#define LIVEMEDIA_LIBRARY_VERSION_STRING "2018.01.29" -#define LIVEMEDIA_LIBRARY_VERSION_INT 1517184000 +#define LIVEMEDIA_LIBRARY_VERSION_STRING "2018.02.18" +#define LIVEMEDIA_LIBRARY_VERSION_INT 1518912000 #endif diff -Nru liblivemedia-2018.01.29/liveMedia/include/Locale.hh liblivemedia-2018.02.18/liveMedia/include/Locale.hh --- liblivemedia-2018.01.29/liveMedia/include/Locale.hh 2018-01-29 10:11:02.000000000 +0000 +++ liblivemedia-2018.02.18/liveMedia/include/Locale.hh 2018-02-18 08:53:10.000000000 +0000 @@ -26,25 +26,30 @@ // add "-DLOCALE_NOT_USED" to your "config.*" file. // If you're on a system that (for whatever reason) has "setlocale()" but not "newlocale()", then -// add "-DXLOCALE_NOT_USED" to your "config.*" file. -// (Note that -DLOCALE_NOT_USED implies -DXLOCALE_NOT_USED; you do not need both.) -// Also, for Windows systems, we define "XLOCALE_NOT_USED" by default, because at least some Windows systems +// add "-DNEWLOCALE_NOT_USED" to your "config.*" file. +// (Note that -DLOCALE_NOT_USED implies -DNEWLOCALE_NOT_USED; you do not need both.) +// Also, for Windows systems, we define "NEWLOCALE_NOT_USED" by default, because at least some Windows systems // (or their development environments) don't have "newlocale()". If, however, your Windows system *does* have "newlocale()", -// then you can override this by defining "XLOCALE_USED" before #including this file. +// then you can override this by defining "NEWLOCALE_USED" before #including this file. -#ifdef XLOCALE_USED +// Finally, some old development environments need a header file "xlocale.h" to use "newlocale()". +// Should you need this header file, add "-DNEED_XLOCALE_H" to your "config.*" file. + +#ifdef NEWLOCALE_USED #undef LOCALE_NOT_USED -#undef XLOCALE_NOT_USED +#undef NEWLOCALE_NOT_USED #else #if defined(__WIN32__) || defined(_WIN32) -#define XLOCALE_NOT_USED 1 +#define NEWLOCALE_NOT_USED 1 #endif #endif #ifndef LOCALE_NOT_USED #include -#ifndef XLOCALE_NOT_USED -#include // because, on some systems, doesn't include ; this makes sure that we get both +#ifndef NEWLOCALE_NOT_USED +#ifdef NEED_XLOCALE_H +#include +#endif #endif #endif @@ -58,7 +63,7 @@ private: #ifndef LOCALE_NOT_USED -#ifndef XLOCALE_NOT_USED +#ifndef NEWLOCALE_NOT_USED locale_t fLocale, fPrevLocale; #else int fCategoryNum; diff -Nru liblivemedia-2018.01.29/liveMedia/Locale.cpp liblivemedia-2018.02.18/liveMedia/Locale.cpp --- liblivemedia-2018.01.29/liveMedia/Locale.cpp 2018-01-29 10:11:02.000000000 +0000 +++ liblivemedia-2018.02.18/liveMedia/Locale.cpp 2018-02-18 08:53:10.000000000 +0000 @@ -24,7 +24,7 @@ Locale::Locale(char const* newLocale, LocaleCategory category) { #ifndef LOCALE_NOT_USED -#ifndef XLOCALE_NOT_USED +#ifndef NEWLOCALE_NOT_USED int categoryMask; switch (category) { case All: { categoryMask = LC_ALL_MASK; break; } @@ -45,7 +45,7 @@ Locale::~Locale() { #ifndef LOCALE_NOT_USED -#ifndef XLOCALE_NOT_USED +#ifndef NEWLOCALE_NOT_USED if (fLocale != (locale_t)0) { uselocale(fPrevLocale); freelocale(fLocale); diff -Nru liblivemedia-2018.01.29/UsageEnvironment/include/UsageEnvironment_version.hh liblivemedia-2018.02.18/UsageEnvironment/include/UsageEnvironment_version.hh --- liblivemedia-2018.01.29/UsageEnvironment/include/UsageEnvironment_version.hh 2018-01-29 10:11:03.000000000 +0000 +++ liblivemedia-2018.02.18/UsageEnvironment/include/UsageEnvironment_version.hh 2018-02-18 08:53:11.000000000 +0000 @@ -4,7 +4,7 @@ #ifndef _USAGEENVIRONMENT_VERSION_HH #define _USAGEENVIRONMENT_VERSION_HH -#define USAGEENVIRONMENT_LIBRARY_VERSION_STRING "2018.01.29" -#define USAGEENVIRONMENT_LIBRARY_VERSION_INT 1517184000 +#define USAGEENVIRONMENT_LIBRARY_VERSION_STRING "2018.02.18" +#define USAGEENVIRONMENT_LIBRARY_VERSION_INT 1518912000 #endif