From a8b7d5d83016624328cd97f351225a2442aacf30 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 17 Apr 2009 11:58:46 +0000 Subject: [PATCH] Unified patches version --- live.2009.03.22-unified.patch | 107 ++++++++++++++++++++++++++++++++++ live555.spec | 22 +++---- sources | 2 - 3 files changed, 114 insertions(+), 17 deletions(-) create mode 100644 live.2009.03.22-unified.patch diff --git a/live.2009.03.22-unified.patch b/live.2009.03.22-unified.patch new file mode 100644 index 0000000..856cd28 --- /dev/null +++ b/live.2009.03.22-unified.patch @@ -0,0 +1,107 @@ +diff -uNr live/config.linux live-patches/config.linux +--- live/config.linux 2009-03-22 23:26:16.000000000 +0100 ++++ live-patches/config.linux 2009-03-24 14:10:56.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) -DBSD=1 -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 @@ + LINK = c++ -o + LINK_OPTS = -L. + CONSOLE_LINK_OPTS = $(LINK_OPTS) +-LIBRARY_LINK = ld -o +-LIBRARY_LINK_OPTS = $(LINK_OPTS) -r -Bstatic +-LIB_SUFFIX = a ++LIBRARY_LINK = $(CC) -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 -uNr live/config.linux.static live-patches/config.linux.static +--- live/config.linux.static 1970-01-01 01:00:00.000000000 +0100 ++++ live-patches/config.linux.static 2009-03-24 14:10:56.000000000 +0100 +@@ -0,0 +1,17 @@ ++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) ++CPP = cpp ++CPLUSPLUS_COMPILER = c++ ++CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall -DBSD=1 ++OBJ = o ++LINK = c++ -o ++LINK_OPTS = -L. ++CONSOLE_LINK_OPTS = $(LINK_OPTS) ++LIBRARY_LINK = ar rcvu ++LIBRARY_LINK_OPTS = ++LIB_SUFFIX = a ++LIBS_FOR_CONSOLE_APPLICATION = ++LIBS_FOR_GUI_APPLICATION = ++EXE = +diff -uNr live/Makefile.tail live-patches/Makefile.tail +--- live/Makefile.tail 2009-03-22 23:26:16.000000000 +0100 ++++ live-patches/Makefile.tail 2009-03-24 14:10:56.000000000 +0100 +@@ -15,27 +15,27 @@ + MEDIA_SERVER_DIR = mediaServer + MEDIA_SERVER_APP = $(MEDIA_SERVER_DIR)/mediaServer$(EXE) + +-ALL = $(LIVEMEDIA_LIB) \ +- $(GROUPSOCK_LIB) \ ++ALL = $(BASIC_USAGE_ENVIRONMENT_LIB) \ + $(USAGE_ENVIRONMENT_LIB) \ +- $(BASIC_USAGE_ENVIRONMENT_LIB) \ ++ $(GROUPSOCK_LIB) \ ++ $(LIVEMEDIA_LIB) \ + $(TESTPROGS_APP) \ + $(MEDIA_SERVER_APP) + all: $(ALL) + + + $(LIVEMEDIA_LIB): +- cd $(LIVEMEDIA_DIR) ; $(MAKE) ++ cd $(LIVEMEDIA_DIR) ; CFLAGS="$(CFLAGS)" $(MAKE) + $(GROUPSOCK_LIB): +- cd $(GROUPSOCK_DIR) ; $(MAKE) ++ cd $(GROUPSOCK_DIR) ; CFLAGS="$(CFLAGS)" $(MAKE) + $(USAGE_ENVIRONMENT_LIB): +- cd $(USAGE_ENVIRONMENT_DIR) ; $(MAKE) ++ cd $(USAGE_ENVIRONMENT_DIR) ; CFLAGS="$(CFLAGS)" $(MAKE) + $(BASIC_USAGE_ENVIRONMENT_LIB): +- cd $(BASIC_USAGE_ENVIRONMENT_DIR) ; $(MAKE) ++ cd $(BASIC_USAGE_ENVIRONMENT_DIR) ; CFLAGS="$(CFLAGS)" $(MAKE) + $(TESTPROGS_APP): $(LIVEMEDIA_LIB) $(GROUPSOCK_LIB) $(USAGE_ENVIRONMENT_LIB) $(BASIC_USAGE_ENVIRONMENT_LIB) +- cd $(TESTPROGS_DIR) ; $(MAKE) ++ cd $(TESTPROGS_DIR) ; CFLAGS="$(CFLAGS)" $(MAKE) + $(MEDIA_SERVER_APP): $(LIVEMEDIA_LIB) $(GROUPSOCK_LIB) $(USAGE_ENVIRONMENT_LIB) $(BASIC_USAGE_ENVIRONMENT_LIB) +- cd $(MEDIA_SERVER_DIR) ; $(MAKE) ++ cd $(MEDIA_SERVER_DIR) ; CFLAGS="$(CFLAGS)" $(MAKE) + + clean: + cd $(LIVEMEDIA_DIR) ; $(MAKE) clean +diff -uNr live/mediaServer/Makefile.tail live-patches/mediaServer/Makefile.tail +--- live/mediaServer/Makefile.tail 2009-03-22 23:26:16.000000000 +0100 ++++ live-patches/mediaServer/Makefile.tail 2009-03-24 14:10:56.000000000 +0100 +@@ -25,7 +25,7 @@ + GROUPSOCK_DIR = ../groupsock + GROUPSOCK_LIB = $(GROUPSOCK_DIR)/libgroupsock.$(LIB_SUFFIX) + LOCAL_LIBS = $(LIVEMEDIA_LIB) $(GROUPSOCK_LIB) \ +- $(USAGE_ENVIRONMENT_LIB) $(BASIC_USAGE_ENVIRONMENT_LIB) ++ $(BASIC_USAGE_ENVIRONMENT_LIB) $(USAGE_ENVIRONMENT_LIB) + LIBS = $(LOCAL_LIBS) $(LIBS_FOR_CONSOLE_APPLICATION) + + live555MediaServer$(EXE): $(MEDIA_SERVER_OBJS) $(LOCAL_LIBS) +diff -uNr live/testProgs/Makefile.tail live-patches/testProgs/Makefile.tail +--- live/testProgs/Makefile.tail 2009-03-22 23:26:16.000000000 +0100 ++++ live-patches/testProgs/Makefile.tail 2009-03-24 14:10:56.000000000 +0100 +@@ -59,7 +59,7 @@ + GROUPSOCK_DIR = ../groupsock + GROUPSOCK_LIB = $(GROUPSOCK_DIR)/libgroupsock.$(LIB_SUFFIX) + LOCAL_LIBS = $(LIVEMEDIA_LIB) $(GROUPSOCK_LIB) \ +- $(USAGE_ENVIRONMENT_LIB) $(BASIC_USAGE_ENVIRONMENT_LIB) ++ $(BASIC_USAGE_ENVIRONMENT_LIB) $(USAGE_ENVIRONMENT_LIB) + LIBS = $(LOCAL_LIBS) $(LIBS_FOR_CONSOLE_APPLICATION) + + testMP3Streamer$(EXE): $(MP3_STREAMER_OBJS) $(LOCAL_LIBS) diff --git a/live555.spec b/live555.spec index fce279c..14ee4fd 100644 --- a/live555.spec +++ b/live555.spec @@ -3,18 +3,14 @@ Name: live555 Version: 0 -Release: 0.22.%{date}%{?dist} +Release: 0.23.%{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 -# http://live555.com/liveMedia/public/changelog.txt -Source1: changelog.txt -Patch0: http://ftp.debian.org/debian/pool/main/libl/liblivemedia/liblivemedia_2008.07.25-2.diff.gz -Patch1: live.2008.02.08-shared.patch -Patch2: live.2008.04.03-reorder.patch +Patch0: live.2009.03.22-unified.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -82,14 +78,7 @@ developing applications that use %{name}. %prep %setup -q -n live -%patch0 -p1 -patch -p1 -i debian/patches/010_propagate_cflags.diff -patch -p1 -i debian/patches/010_proper_link_order.diff -patch -p1 -i debian/patches/020_invalid_casts.diff -patch -p1 -i debian/patches/021_ip_mreq_source.diff -cp -p %{SOURCE1} . -%patch1 -p1 -b .static -%patch2 -p1 -b .reorder +%patch0 -p1 -b .unified %build ./genMakefiles %{_target_os}.static @@ -191,7 +180,7 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) -%doc COPYING README changelog.txt +%doc COPYING README %{_libdir}/libBasicUsageEnvironment.so %{_libdir}/libgroupsock.so %{_libdir}/libliveMedia.so @@ -209,6 +198,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libUsageEnvironment*.a %changelog +* Fri Apr 17 2009 kwizart < kwizart at gmail.com > - 0-0.23.2009.04.07 +- Unified patches. (unrelevant fixes dropped). + * Tue Apr 07 2009 Dominik Mierzejewski - 0-0.22.2009.04.07 - 2009.04.07 - use new debian patchset diff --git a/sources b/sources index 9347428..b853c6d 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -0586323f75b5e138cf95eca43d5ea47d changelog.txt -46866494537e840f76772dedafff7ffa liblivemedia_2008.07.25-2.diff.gz 724d6779ae6363545d9e83808e5cec2e live.2009.04.07.tar.gz