Update to 2012.04.27

el8
Nicolas Chauvet 13 years ago
parent 9257be29cb
commit 650d8688ee

2
.gitignore vendored

@ -1 +1 @@
live.2012.02.04.tar.gz
live.2012.04.27.tar.gz

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

@ -1,16 +1,16 @@
%global date 2012.02.04
%global date 2012.04.27
%global live_soversion 0
Name: live555
Version: 0
Release: 0.36.%{date}%{?dist}
Release: 0.37.%{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.2010.01.16-shared.patch
Patch0: live.2012.04.27-shared.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Provides: live555date%{_isa} = %{date}
@ -186,6 +186,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libUsageEnvironment*.a
%changelog
* Tue May 01 2012 Nicolas Chauvet <kwizart@gmail.com> - 0-0.37.2012.04.27
- Update to 2012.04.27
* Fri Mar 02 2012 Nicolas Chauvet <kwizart@gmail.com> - 0-0.36.2012.02.04
- Rebuilt for c++ ABI breakage

@ -1 +1 @@
5c9753e027af08c065f156e2a0bec023 live.2012.02.04.tar.gz
463acc2cab4640544d120af933fde9f1 live.2012.04.27.tar.gz

Loading…
Cancel
Save