rpms
/
live555
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Update to 2010.01.16

Browse Source 
- Update patch for shared library
el8
Nicolas Chauvet 15 years ago
parent cc2742c465
commit 748534d883
5 changed files with 66 additions and 114 deletions
Show Stats Download Patch File Download Diff File

2
.gitignore vendored
Unescape View File

@ -1 +1 @@
live.2009.07.28.tar.gz
live.2010.01.16.tar.gz

107
live.2009.03.22-unified.patch
Unescape View File

@ -1,107 +0,0 @@
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) -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 = 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 -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
+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)

53
live.2010.01.16-shared.patch
Unescape View File

@ -0,0 +1,53 @@
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

16
live555.spec
Unescape View File

@ -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 @@ developing applications that use %{name}.
%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 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libUsageEnvironment*.a
%changelog
* Sat Jan 16 2010 Nicolas Chauvet <kwizart@fedoraprojec.org> - 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)

2
sources
Unescape View File

@ -1 +1 @@
f2a9c1067e97076492b324c185bda108 live.2009.07.28.tar.gz
21f6952776d13e0c80aed3fefa7de72e live.2010.01.16.tar.gz

Write Preview
Loading…
Cancel
Save