From 9f5341169702b7eb7745a790c34b30fdf06c3f22 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Tue, 19 May 2020 20:14:55 +0200 Subject: [PATCH] - updated to 2020.05.15 (new libliveMedia soname) - updated link patch --- live-link.patch | 14 +++++++------- live.spec | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/live-link.patch b/live-link.patch index 60a8d9c..bda8bb4 100644 --- a/live-link.patch +++ b/live-link.patch @@ -29,19 +29,19 @@ clean: -rm -rf *.$(OBJ) $(ALL) core *.core *~ include/*~ ---- live/liveMedia/Makefile.tail.orig 2011-03-15 00:40:37.000000000 +0100 -+++ live/liveMedia/Makefile.tail 2011-03-16 18:34:20.507409590 +0100 -@@ -45,10 +45,12 @@ +--- live/liveMedia/Makefile.tail.orig 2020-05-19 19:11:05.573270651 +0200 ++++ live/liveMedia/Makefile.tail 2020-05-19 19:58:52.524405711 +0200 +@@ -65,10 +65,12 @@ - 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) + LIVEMEDIA_LIB_OBJS = Media.$(OBJ) $(MISC_SOURCE_OBJS) $(MISC_SINK_OBJS) $(MISC_FILTER_OBJS) $(RTP_OBJS) $(RTCP_OBJS) $(GENERIC_MEDIA_SERVER_OBJS) $(RTSP_OBJS) $(SIP_OBJS) $(SESSION_OBJS) $(QUICKTIME_OBJS) $(AVI_OBJS) $(TRANSPORT_STREAM_TRICK_PLAY_OBJS) $(MATROSKA_OBJS) $(OGG_OBJS) $(TRANSPORT_STREAM_DEMUX_OBJS) $(HLS_OBJS) $(SECURITY_OBJS) $(MISC_OBJS) -+LIBRARY_DEPS = ../groupsock/libgroupsock.$(libgroupsock_LIB_SUFFIX) ../BasicUsageEnvironment/libBasicUsageEnvironment.$(libBasicUsageEnvironment_LIB_SUFFIX) ../UsageEnvironment/libUsageEnvironment.$(libUsageEnvironment_LIB_SUFFIX) -lssl -lcrypto ++LIBRARY_DEPS = ../groupsock/libgroupsock.$(libgroupsock_LIB_SUFFIX) ../BasicUsageEnvironment/libBasicUsageEnvironment.$(libBasicUsageEnvironment_LIB_SUFFIX) ../UsageEnvironment/libUsageEnvironment.$(libUsageEnvironment_LIB_SUFFIX) + $(LIVEMEDIA_LIB): $(LIVEMEDIA_LIB_OBJS) \ $(PLATFORM_SPECIFIC_LIB_OBJS) $(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) \ -- $(LIVEMEDIA_LIB_OBJS) -+ $(LIVEMEDIA_LIB_OBJS) $(LIBRARY_LINK_DEPS) +- $(LIVEMEDIA_LIB_OBJS) $(LIBS_FOR_LIVEMEDIA_LIB) ++ $(LIVEMEDIA_LIB_OBJS) $(LIBRARY_LINK_DEPS) $(LIBS_FOR_LIVEMEDIA_LIB) Media.$(CPP): include/Media.hh include/Media.hh: include/liveMedia_version.hh diff --git a/live.spec b/live.spec index 87fb5db..82925e9 100644 --- a/live.spec +++ b/live.spec @@ -8,15 +8,15 @@ Summary: LIVE555 streaming media server Summary(pl.UTF-8): LIVE555 - serwer strumieni multimedialnych Name: live -Version: 2020.03.06 +Version: 2020.05.15 Release: 1 Epoch: 2 License: LGPL v2.1+ Group: Applications/Multimedia Source0: http://www.live555.com/liveMedia/public/%{name}.%{version}.tar.gz -# Source0-md5: cfca528bda964d2167260b3ab6ee294e +# Source0-md5: 2daced24841d326d84da3db81243d46b Source1: http://www.live555.com/liveMedia/public/changelog.txt -# Source1-md5: 668e4613c6e2d64aa991dec5c07d7783 +# Source1-md5: 2e28b8d9b50b7ce77a2230c09a81dc55 Patch0: %{name}-link.patch # from debian Patch1: %{name}-pkgconfig.patch @@ -152,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.78 +%attr(755,root,root) %ghost %{_libdir}/libliveMedia.so.79 %files devel %defattr(644,root,root,755) -- 2.44.0