Author: kwizart Update of /cvs/free/rpms/live555/EL-6 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19755/EL-6 Modified Files: .cvsignore live555.spec sources Added Files: live.2012.04.27-shared.patch Removed Files: live-cloexec.patch live-getaddrinfo.patch live-inet_ntop.patch live-intptr.patch live-uselocale.patch live.2010.01.16-shared.patch Log Message: Back to LGPL license, Update to vlc supported version live.2012.04.27-shared.patch: Makefile.tail | 14 +++++++------- config.linux | 8 ++++---- config.linux.static | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) --- NEW FILE live.2012.04.27-shared.patch --- diff -up live/config.linux.shared live/config.linux --- live/config.linux.shared 2010-01-16 04:04:54.000000000 +0100 +++ live/config.linux 2010-01-16 17:16:37.479611105 +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) @@ -9,9 +9,9 @@ OBJ = o LINK = c++ -o LINK_OPTS = -L. CONSOLE_LINK_OPTS = $(LINK_OPTS) -LIBRARY_LINK = ar cr -LIBRARY_LINK_OPTS = -LIB_SUFFIX = a +LIBRARY_LINK = c++ -o +LIBRARY_LINK_OPTS = $(LINK_OPTS) -shared -Wl,-soname,$@.$(SO_VERSION) $(LIBADDS) +LIB_SUFFIX = so LIBS_FOR_CONSOLE_APPLICATION = LIBS_FOR_GUI_APPLICATION = EXE = diff -up live/config.linux.static.shared live/config.linux.static --- live/config.linux.static.shared 2010-01-16 17:16:50.562862926 +0100 +++ live/config.linux.static 2010-01-16 17:16:57.271866612 +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 -up live/Makefile.tail.shared live/Makefile.tail --- live/Makefile.tail.shared 2012-04-27 21:53:46.000000000 +0200 +++ live/Makefile.tail 2012-05-01 15:55:42.856780542 +0200 @@ -12,13 +12,13 @@ PROXY_SERVER_DIR = proxyServer all: - cd $(LIVEMEDIA_DIR) ; $(MAKE) - cd $(GROUPSOCK_DIR) ; $(MAKE) - cd $(USAGE_ENVIRONMENT_DIR) ; $(MAKE) - cd $(BASIC_USAGE_ENVIRONMENT_DIR) ; $(MAKE) - cd $(TESTPROGS_DIR) ; $(MAKE) - cd $(MEDIA_SERVER_DIR) ; $(MAKE) - cd $(PROXY_SERVER_DIR) ; $(MAKE) + cd $(LIVEMEDIA_DIR) ; C_FLAGS="$(C_FLAGS)" $(MAKE) + cd $(GROUPSOCK_DIR) ; C_FLAGS="$(C_FLAGS)" $(MAKE) + cd $(USAGE_ENVIRONMENT_DIR) ; C_FLAGS="$(C_FLAGS)" $(MAKE) + cd $(BASIC_USAGE_ENVIRONMENT_DIR) ; C_FLAGS="$(C_FLAGS)" $(MAKE) + cd $(TESTPROGS_DIR) ; C_FLAGS="$(C_FLAGS)" $(MAKE) + cd $(MEDIA_SERVER_DIR) ; C_FLAGS="$(C_FLAGS)" $(MAKE) + cd $(PROXY_SERVER_DIR) ; C_FLAGS="$(C_FLAGS)" $(MAKE) clean: cd $(LIVEMEDIA_DIR) ; $(MAKE) clean Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/live555/EL-6/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 4 Jan 2012 21:48:35 -0000 1.10 +++ .cvsignore 29 Jun 2012 13:56:15 -0000 1.11 @@ -1 +1 @@ -live.2011.11.20.tar.gz +live.2012.04.27.tar.gz Index: live555.spec =================================================================== RCS file: /cvs/free/rpms/live555/EL-6/live555.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- live555.spec 4 Jan 2012 21:48:36 -0000 1.14 +++ live555.spec 29 Jun 2012 13:56:15 -0000 1.15 @@ -1,22 +1,16 @@ -%global date 2011.11.20 +%global date 2012.04.27 %global live_soversion 0 Name: live555 Version: 0 -Release: 0.33.%{date}%{?dist} +Release: 0.37.%{date}%{?dist} Summary: Live555.com streaming libraries Group: System Environment/Libraries -License: LGPLv2+ and GPLv2+ +License: LGPLv2+ URL: http://live555.com/liveMedia/ Source0: http://live555.com/liveMedia/public/live.%{date}.tar.gz -Patch0: live.2010.01.16-shared.patch -#Thoses patches are Copyright Rémi Denis-Courmont - provided as GPLv2+ -Patch1: live-uselocale.patch -Patch2: live-inet_ntop.patch -Patch3: live-intptr.patch -Patch4: live-getaddrinfo.patch -Patch5: live-cloexec.patch +Patch0: live.2012.04.27-shared.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Provides: live555date%{_isa} = %{date} @@ -91,11 +85,6 @@ %setup -q -n live install -pm 0644 config.linux config.linux.static %patch0 -p1 -b .shared -%patch1 -p1 -b .vlc1 -%patch2 -p1 -b .vlc2 -%patch3 -p1 -b .vlc3 -%patch4 -p1 -b .vlc4 -%patch5 -p1 -b .vlc5 %build @@ -197,6 +186,20 @@ %{_libdir}/libUsageEnvironment*.a %changelog +* Tue May 01 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0-0.37.2012.04.27 +- Update to 2012.04.27 + +* Fri Mar 02 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0-0.36.2012.02.04 +- Rebuilt for c++ ABI breakage + +* Sun Feb 19 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0-0.35.2012.02.04 +- Update to 2012.02.04 + +* Wed Jan 25 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0-0.34.2012.01.25 +- Update to 2012.01.25 +- Drop merged patch +- Back to LGPLv+2 license + * Mon Sep 19 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0-0.32.2011.09.02 - Update to 2011.09.02 - Reorder patches Index: sources =================================================================== RCS file: /cvs/free/rpms/live555/EL-6/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 4 Jan 2012 21:48:36 -0000 1.11 +++ sources 29 Jun 2012 13:56:15 -0000 1.12 @@ -1 +1 @@ -8e5ebefdf7d12ca9cfd7175ff3d7eef2 live.2011.11.20.tar.gz +463acc2cab4640544d120af933fde9f1 live.2012.04.27.tar.gz --- live-cloexec.patch DELETED --- --- live-getaddrinfo.patch DELETED --- --- live-inet_ntop.patch DELETED --- --- live-intptr.patch DELETED --- --- live-uselocale.patch DELETED --- --- live.2010.01.16-shared.patch DELETED ---