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

--- live/BasicUsageEnvironment/Makefile.tail.orig	2011-03-15 00:40:37.000000000 +0100
+++ live/BasicUsageEnvironment/Makefile.tail	2011-03-16 18:09:05.547417970 +0100
@@ -8,9 +8,11 @@
 	BasicTaskScheduler0.$(OBJ) BasicTaskScheduler.$(OBJ) \
 	DelayQueue.$(OBJ) BasicHashTable.$(OBJ)
 
+LIBRARY_DEPS = ../UsageEnvironment/libUsageEnvironment.$(libUsageEnvironment_LIB_SUFFIX)
+
 libBasicUsageEnvironment.$(LIB_SUFFIX): $(OBJS)
 	$(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) \
-		$(OBJS)
+		$(OBJS) $(LIBRARY_LINK_DEPS)
 
 .$(C).$(OBJ):
 	$(C_COMPILER) -c $(C_FLAGS) $<       
--- live/groupsock/Makefile.tail.orig	2011-03-15 00:40:37.000000000 +0100
+++ live/groupsock/Makefile.tail	2011-03-16 18:11:05.827411266 +0100
@@ -25,10 +25,12 @@
 NetAddress.$(CPP):	include/NetAddress.hh include/GroupsockHelper.hh
 IOHandlers.$(CPP):	include/IOHandlers.hh include/TunnelEncaps.hh
 
+LIBRARY_DEPS = ../BasicUsageEnvironment/libBasicUsageEnvironment.$(libBasicUsageEnvironment_LIB_SUFFIX) ../UsageEnvironment/libUsageEnvironment.$(libUsageEnvironment_LIB_SUFFIX)
+
 libgroupsock.$(LIB_SUFFIX): $(GROUPSOCK_LIB_OBJS) \
     $(PLATFORM_SPECIFIC_LIB_OBJS)
 	$(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) \
-		$(GROUPSOCK_LIB_OBJS)
+		$(GROUPSOCK_LIB_OBJS) $(LIBRARY_LINK_DEPS)
 
 clean:
 	-rm -rf *.$(OBJ) $(ALL) core *.core *~ include/*~
--- 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) $(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)
+
 $(LIVEMEDIA_LIB): $(LIVEMEDIA_LIB_OBJS) \
     $(PLATFORM_SPECIFIC_LIB_OBJS)
 	$(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) \
-		$(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
--- live/Makefile.tail.orig	2011-03-16 19:18:57.767415456 +0100
+++ live/Makefile.tail	2011-03-16 19:30:31.367419646 +0100
@@ -10,10 +10,10 @@
 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 $(GROUPSOCK_DIR) ; $(MAKE)
+	cd $(LIVEMEDIA_DIR) ; $(MAKE)
 	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 =
Commit	Line	Data
fe23064d JB	1	--- live/BasicUsageEnvironment/Makefile.tail.orig 2011-03-15 00:40:37.000000000 +0100
	2	+++ live/BasicUsageEnvironment/Makefile.tail 2011-03-16 18:09:05.547417970 +0100
	3	@@ -8,9 +8,11 @@
	4	BasicTaskScheduler0.$(OBJ) BasicTaskScheduler.$(OBJ) \
	5	DelayQueue.$(OBJ) BasicHashTable.$(OBJ)
	6
32fd5524	7	+LIBRARY_DEPS = ../UsageEnvironment/libUsageEnvironment.$(libUsageEnvironment_LIB_SUFFIX)
fe23064d JB	8	+
	9	libBasicUsageEnvironment.$(LIB_SUFFIX): $(OBJS)
	10	$(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) \
	11	- $(OBJS)
	12	+ $(OBJS) $(LIBRARY_LINK_DEPS)
	13
	14	.$(C).$(OBJ):
	15	$(C_COMPILER) -c $(C_FLAGS) $<
	16	--- live/groupsock/Makefile.tail.orig 2011-03-15 00:40:37.000000000 +0100
	17	+++ live/groupsock/Makefile.tail 2011-03-16 18:11:05.827411266 +0100
	18	@@ -25,10 +25,12 @@
	19	NetAddress.$(CPP): include/NetAddress.hh include/GroupsockHelper.hh
	20	IOHandlers.$(CPP): include/IOHandlers.hh include/TunnelEncaps.hh
	21
32fd5524	22	+LIBRARY_DEPS = ../BasicUsageEnvironment/libBasicUsageEnvironment.$(libBasicUsageEnvironment_LIB_SUFFIX) ../UsageEnvironment/libUsageEnvironment.$(libUsageEnvironment_LIB_SUFFIX)
fe23064d JB	23	+
	24	libgroupsock.$(LIB_SUFFIX): $(GROUPSOCK_LIB_OBJS) \
	25	$(PLATFORM_SPECIFIC_LIB_OBJS)
	26	$(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) \
	27	- $(GROUPSOCK_LIB_OBJS)
	28	+ $(GROUPSOCK_LIB_OBJS) $(LIBRARY_LINK_DEPS)
	29
	30	clean:
	31	-rm -rf .$(OBJ) $(ALL) core .core ~ include/~
9f534116 JB	32	--- live/liveMedia/Makefile.tail.orig 2020-05-19 19:11:05.573270651 +0200
	33	+++ live/liveMedia/Makefile.tail 2020-05-19 19:58:52.524405711 +0200
	34	@@ -65,10 +65,12 @@
fe23064d	35
9f534116	36	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)
fe23064d	37
9f534116	38	+LIBRARY_DEPS = ../groupsock/libgroupsock.$(libgroupsock_LIB_SUFFIX) ../BasicUsageEnvironment/libBasicUsageEnvironment.$(libBasicUsageEnvironment_LIB_SUFFIX) ../UsageEnvironment/libUsageEnvironment.$(libUsageEnvironment_LIB_SUFFIX)
fe23064d JB	39	+
	40	$(LIVEMEDIA_LIB): $(LIVEMEDIA_LIB_OBJS) \
	41	$(PLATFORM_SPECIFIC_LIB_OBJS)
	42	$(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) \
9f534116 JB	43	- $(LIVEMEDIA_LIB_OBJS) $(LIBS_FOR_LIVEMEDIA_LIB)
9f534116 JB	44	+ $(LIVEMEDIA_LIB_OBJS) $(LIBRARY_LINK_DEPS) $(LIBS_FOR_LIVEMEDIA_LIB)
fe23064d JB	45
	46	Media.$(CPP): include/Media.hh
	47	include/Media.hh: include/liveMedia_version.hh
	48	--- live/Makefile.tail.orig 2011-03-16 19:18:57.767415456 +0100
	49	+++ live/Makefile.tail 2011-03-16 19:30:31.367419646 +0100
	50	@@ -10,10 +10,10 @@
	51	MEDIA_SERVER_DIR = mediaServer
	52
	53	all:
	54	- cd $(LIVEMEDIA_DIR) ; $(MAKE)
	55	- cd $(GROUPSOCK_DIR) ; $(MAKE)
	56	cd $(USAGE_ENVIRONMENT_DIR) ; $(MAKE)
	57	cd $(BASIC_USAGE_ENVIRONMENT_DIR) ; $(MAKE)
	58	+ cd $(GROUPSOCK_DIR) ; $(MAKE)
	59	+ cd $(LIVEMEDIA_DIR) ; $(MAKE)
	60	cd $(TESTPROGS_DIR) ; $(MAKE)
	61	cd $(MEDIA_SERVER_DIR) ; $(MAKE)
	62
fa75e603 JB	63	--- live/config.linux-with-shared-libraries.orig 2020-03-17 21:29:48.897335650 +0100
fa75e603 JB	64	+++ live/config.linux-with-shared-libraries 2020-03-17 21:35:13.995574442 +0100
32fd5524 JB	65	@@ -39,6 +39,7 @@
	66	SHORT_LIB_SUFFIX = so.$(shell expr $($(NAME)_VERSION_CURRENT) - $($(NAME)_VERSION_AGE))
	67	LIB_SUFFIX = $(SHORT_LIB_SUFFIX).$($(NAME)_VERSION_AGE).$($(NAME)_VERSION_REVISION)
	68	LIBRARY_LINK_OPTS = -shared -Wl,-soname,$(NAME).$(SHORT_LIB_SUFFIX) $(LDFLAGS)
	69	+LIBRARY_LINK_DEPS = $(LIBRARY_DEPS)
fa75e603	70	LIBS_FOR_CONSOLE_APPLICATION = -lssl -lcrypto
32fd5524 JB	71	LIBS_FOR_GUI_APPLICATION =
32fd5524 JB	72	EXE =