- updated to 2020.05.15 (new libliveMedia soname)

[packages/live.git] / live-link.patch

diff --git a/live-link.patch b/live-link.patch
index 5ba5ed97b14e2795c42a6a7f39b54d57d8d05ec1..bda8bb46e05efdbbdadaf46abaffa77aa22382cc 100644 (file)
--- a/live-link.patch
+++ b/live-link.patch
@@ -4,7 +4,7 @@
        BasicTaskScheduler0.$(OBJ) BasicTaskScheduler.$(OBJ) \
        DelayQueue.$(OBJ) BasicHashTable.$(OBJ)
  
-+LIBRARY_DEPS = ../UsageEnvironment/libUsageEnvironment.$(LIB_SUFFIX)
++LIBRARY_DEPS = ../UsageEnvironment/libUsageEnvironment.$(libUsageEnvironment_LIB_SUFFIX)
 +
  libBasicUsageEnvironment.$(LIB_SUFFIX): $(OBJS)
        $(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) \
@@ -19,7 +19,7 @@
  NetAddress.$(CPP):    include/NetAddress.hh include/GroupsockHelper.hh
  IOHandlers.$(CPP):    include/IOHandlers.hh include/TunnelEncaps.hh
  
-+LIBRARY_DEPS = ../BasicUsageEnvironment/libBasicUsageEnvironment.$(LIB_SUFFIX) ../UsageEnvironment/libUsageEnvironment.$(LIB_SUFFIX)
++LIBRARY_DEPS = ../BasicUsageEnvironment/libBasicUsageEnvironment.$(libBasicUsageEnvironment_LIB_SUFFIX) ../UsageEnvironment/libUsageEnvironment.$(libUsageEnvironment_LIB_SUFFIX)
 +
  libgroupsock.$(LIB_SUFFIX): $(GROUPSOCK_LIB_OBJS) \
      $(PLATFORM_SPECIFIC_LIB_OBJS)
@@ -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.$(LIB_SUFFIX) ../BasicUsageEnvironment/libBasicUsageEnvironment.$(LIB_SUFFIX) ../UsageEnvironment/libUsageEnvironment.$(LIB_SUFFIX)
++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
@@ -60,3 +60,13 @@
        cd $(TESTPROGS_DIR) ; $(MAKE)
        cd $(MEDIA_SERVER_DIR) ; $(MAKE)
  
+--- 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 = -lssl -lcrypto
+ LIBS_FOR_GUI_APPLICATION =
+ EXE =