commit fa75e60388e21e4f36bc265399e8bd4a5733720c
Author: Jakub Bogusz <[email protected]>
Date: Wed Mar 18 17:20:47 2020 +0100
- updated to 2020.03.06 (note: new libliveMedia soname; introduces HLSProxy
and openssl support)
- updated link patch
live-link.patch | 8 ++++----
live.spec | 10 ++++++----
2 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/live.spec b/live.spec
index a5cd825..87fb5db 100644
--- a/live.spec
+++ b/live.spec
@@ -8,20 +8,21 @@
Summary: LIVE555 streaming media server
Summary(pl.UTF-8): LIVE555 - serwer strumieni multimedialnych
Name: live
-Version: 2019.11.05
+Version: 2020.03.06
Release: 1
Epoch: 2
License: LGPL v2.1+
Group: Applications/Multimedia
Source0:
http://www.live555.com/liveMedia/public/%{name}.%{version}.tar.gz
-# Source0-md5: 130f62ce9de7316cb60092d079989103
+# Source0-md5: cfca528bda964d2167260b3ab6ee294e
Source1: http://www.live555.com/liveMedia/public/changelog.txt
-# Source1-md5: d4e99b1676759f9620cc32776e8fa9d0
+# Source1-md5: 668e4613c6e2d64aa991dec5c07d7783
Patch0: %{name}-link.patch
# from debian
Patch1: %{name}-pkgconfig.patch
URL: http://www.live555.com/liveMedia/
BuildRequires: libstdc++-devel
+BuildRequires: openssl-devel
BuildRequires: sed >= 4.0
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -138,6 +139,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/live555HLSProxy
%attr(755,root,root) %{_bindir}/live555MediaServer
%attr(755,root,root) %{_bindir}/live555ProxyServer
@@ -150,7 +152,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libgroupsock.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libgroupsock.so.8
%attr(755,root,root) %{_libdir}/libliveMedia.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libliveMedia.so.73
+%attr(755,root,root) %ghost %{_libdir}/libliveMedia.so.78
%files devel
%defattr(644,root,root,755)
diff --git a/live-link.patch b/live-link.patch
index 36d6612..60a8d9c 100644
--- a/live-link.patch
+++ b/live-link.patch
@@ -35,7 +35,7 @@
LIVEMEDIA_LIB_OBJS = Media.$(OBJ) $(MISC_SOURCE_OBJS) $(MISC_SINK_OBJS)
$(MISC_FILTER_OBJS) $(RTP_OBJS) $(RTCP_OBJS) $(RTSP_OBJS) $(SIP_OBJS)
$(SESSION_OBJS) $(QUICKTIME_OBJS) $(AVI_OBJS)
$(TRANSPORT_STREAM_TRICK_PLAY_OBJS) $(MISC_OBJS)
-+LIBRARY_DEPS = ../groupsock/libgroupsock.$(libgroupsock_LIB_SUFFIX)
../BasicUsageEnvironment/libBasicUsageEnvironment.$(libBasicUsageEnvironment_LIB_SUFFIX)
../UsageEnvironment/libUsageEnvironment.$(libUsageEnvironment_LIB_SUFFIX)
++LIBRARY_DEPS = ../groupsock/libgroupsock.$(libgroupsock_LIB_SUFFIX)
../BasicUsageEnvironment/libBasicUsageEnvironment.$(libBasicUsageEnvironment_LIB_SUFFIX)
../UsageEnvironment/libUsageEnvironment.$(libUsageEnvironment_LIB_SUFFIX)
-lssl -lcrypto
+
$(LIVEMEDIA_LIB): $(LIVEMEDIA_LIB_OBJS) \
$(PLATFORM_SPECIFIC_LIB_OBJS)
@@ -60,13 +60,13 @@
cd $(TESTPROGS_DIR) ; $(MAKE)
cd $(MEDIA_SERVER_DIR) ; $(MAKE)
---- live/config.linux-with-shared-libraries.orig 2017-04-26
09:37:47.000000000 +0200
-+++ live/config.linux-with-shared-libraries 2017-05-16 16:00:01.649253530
+0200
+--- live/config.linux-with-shared-libraries.orig 2020-03-17
21:29:48.897335650 +0100
++++ live/config.linux-with-shared-libraries 2020-03-17 21:35:13.995574442
+0100
@@ -39,6 +39,7 @@
SHORT_LIB_SUFFIX = so.$(shell expr $($(NAME)_VERSION_CURRENT) -
$($(NAME)_VERSION_AGE))
LIB_SUFFIX =
$(SHORT_LIB_SUFFIX).$($(NAME)_VERSION_AGE).$($(NAME)_VERSION_REVISION)
LIBRARY_LINK_OPTS = -shared -Wl,-soname,$(NAME).$(SHORT_LIB_SUFFIX)
$(LDFLAGS)
+LIBRARY_LINK_DEPS = $(LIBRARY_DEPS)
- LIBS_FOR_CONSOLE_APPLICATION =
+ LIBS_FOR_CONSOLE_APPLICATION = -lssl -lcrypto
LIBS_FOR_GUI_APPLICATION =
EXE =
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/live.git/commitdiff/fa75e60388e21e4f36bc265399e8bd4a5733720c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
