Author: kwizart Update of /cvs/free/rpms/live555/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv18662 Modified Files: live555.spec .cvsignore sources Added Files: live.2010.01.16-shared.patch Removed Files: live.2009.03.22-unified.patch Log Message: - Update to 2010.01.16 - Update patch for shared library live.2010.01.16-shared.patch: Makefile.tail | 12 ++++++------ config.linux | 8 ++++---- config.linux.static | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) --- NEW FILE live.2010.01.16-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 2010-01-16 04:04:54.000000000 +0100 +++ live/Makefile.tail 2010-01-16 17:16:37.479611105 +0100 @@ -10,12 +10,12 @@ TESTPROGS_DIR = testProgs MEDIA_SERVER_DIR = mediaServer 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 $(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) clean: cd $(LIVEMEDIA_DIR) ; $(MAKE) clean Index: live555.spec =================================================================== RCS file: /cvs/free/rpms/live555/devel/live555.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- live555.spec 17 Aug 2009 17:14:31 -0000 1.6 +++ live555.spec 16 Jan 2010 16:22:01 -0000 1.7 @@ -1,16 +1,16 @@ -%define date 2009.07.28 -%define live_soversion 0 +%global date 2010.01.16 +%global live_soversion 0 Name: live555 Version: 0 -Release: 0.24.%{date}%{?dist} +Release: 0.25.%{date}%{?dist} Summary: Live555.com streaming libraries Group: System Environment/Libraries License: LGPLv2+ URL: http://live555.com/liveMedia/ Source0: http://live555.com/liveMedia/public/live.%{date}.tar.gz -Patch0: live.2009.03.22-unified.patch +Patch0: live.2010.01.16-shared.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -78,7 +78,9 @@ %prep %setup -q -n live -%patch0 -p1 -b .unified +install -pm 0644 config.linux config.linux.static +%patch0 -p1 -b .shared + %build ./genMakefiles %{_target_os}.static @@ -169,6 +171,10 @@ %{_libdir}/libUsageEnvironment*.a %changelog +* Sat Jan 16 2010 Nicolas Chauvet <kwizart(a)fedoraprojec.org&gt; - 0-0.25.2010.01.16 +- Update to 2010.01.16 +- Update patch for shared library + * Mon Aug 17 2009 kwizart < kwizart at gmail.com > - 0-0.24.2009.07.28 - 2009.07.28 - Revert circle dependency (prefer undefined non_weak_symbol) Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/live555/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 17 Aug 2009 17:14:31 -0000 1.5 +++ .cvsignore 16 Jan 2010 16:22:01 -0000 1.6 @@ -1 +1 @@ -live.2009.07.28.tar.gz +live.2010.01.16.tar.gz Index: sources =================================================================== RCS file: /cvs/free/rpms/live555/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 17 Aug 2009 17:14:31 -0000 1.6 +++ sources 16 Jan 2010 16:22:01 -0000 1.7 @@ -1 +1 @@ -f2a9c1067e97076492b324c185bda108 live.2009.07.28.tar.gz +21f6952776d13e0c80aed3fefa7de72e live.2010.01.16.tar.gz --- live.2009.03.22-unified.patch DELETED ---