diff options
| author |   Nathan Phillip Brink <binki@gentoo.org> | 2011-12-25 04:46:34 +0000 |
|---|---|---|
| committer | Nathan Phillip Brink <binki@gentoo.org> | 2011-12-25 04:46:34 +0000 |
| commit | 35b712e47fa2656874df90503401883af49826b1 (patch) | |
| tree | 3cda8c553b3c6cce197e3033be388b0199ef22a2 /media-plugins/live/files/live-2011.12.20-libdeps.patch | |
| parent | Sync portage (diff) | |
| download | multilib-portage-35b712e47fa2656874df90503401883af49826b1.tar.gz multilib-portage-35b712e47fa2656874df90503401883af49826b1.tar.bz2 multilib-portage-35b712e47fa2656874df90503401883af49826b1.zip | |
media-plugins/live: Import a fork of media-plugins/live with patches from bug 309681 fixing multilib support.
(Portage version: 2.2.0_alpha78-r1/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 6BA81050)
Diffstat (limited to 'media-plugins/live/files/live-2011.12.20-libdeps.patch')
| -rw-r--r-- | media-plugins/live/files/live-2011.12.20-libdeps.patch | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/media-plugins/live/files/live-2011.12.20-libdeps.patch b/media-plugins/live/files/live-2011.12.20-libdeps.patch new file mode 100644 index 000000000..5a78998a9 --- /dev/null +++ b/media-plugins/live/files/live-2011.12.20-libdeps.patch @@ -0,0 +1,60 @@ +Author: Nathan Phillip Brink <ohnobinki@ohnopublishing.net> +Purpose: To help get libtool working with live. + +diff -r a467df21e246 -r d1fda89b91cd BasicUsageEnvironment/Makefile.tail +--- a/live/BasicUsageEnvironment/Makefile.tail Fri Mar 12 11:30:13 2010 -0500 ++++ b/live/BasicUsageEnvironment/Makefile.tail Fri Mar 12 12:19:11 2010 -0500 +@@ -7,10 +7,11 @@ + OBJS = BasicUsageEnvironment0.$(OBJ) BasicUsageEnvironment.$(OBJ) \ + BasicTaskScheduler0.$(OBJ) BasicTaskScheduler.$(OBJ) \ + DelayQueue.$(OBJ) BasicHashTable.$(OBJ) ++LIBS = ../UsageEnvironment/libUsageEnvironment.$(LIB_SUFFIX) + + libBasicUsageEnvironment.$(LIB_SUFFIX): $(OBJS) + $(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) \ +- $(OBJS) ++ $(OBJS) $(LIBS) + + .$(C).$(OBJ): + $(C_COMPILER) -c $(C_FLAGS) $< +diff -r a467df21e246 -r d1fda89b91cd groupsock/Makefile.tail +--- a/live/groupsock/Makefile.tail Fri Mar 12 11:30:13 2010 -0500 ++++ b/live/groupsock/Makefile.tail Fri Mar 12 12:19:11 2010 -0500 +@@ -10,6 +10,7 @@ + $(CPLUSPLUS_COMPILER) -c $(CPLUSPLUS_FLAGS) $< + + GROUPSOCK_LIB_OBJS = GroupsockHelper.$(OBJ) GroupEId.$(OBJ) inet.$(OBJ) Groupsock.$(OBJ) NetInterface.$(OBJ) NetAddress.$(OBJ) IOHandlers.$(OBJ) ++GROUPSOCK_LIBS = ../BasicUsageEnvironment/libBasicUsageEnvironment.$(LIB_SUFFIX) + + GroupsockHelper.$(CPP): include/GroupsockHelper.hh + include/GroupsockHelper.hh: include/NetAddress.hh +@@ -26,9 +27,9 @@ + IOHandlers.$(CPP): include/IOHandlers.hh include/TunnelEncaps.hh + + libgroupsock.$(LIB_SUFFIX): $(GROUPSOCK_LIB_OBJS) \ +- $(PLATFORM_SPECIFIC_LIB_OBJS) ++ $(PLATFORM_SPECIFIC_LIB_OBJS) $(GROUPSOCK_LIBS) + $(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) \ +- $(GROUPSOCK_LIB_OBJS) ++ $(GROUPSOCK_LIB_OBJS) $(GROUPSOCK_LIBS) + + clean: + -rm -rf *.$(OBJ) $(ALL) core *.core *~ include/*~ +diff -r a467df21e246 -r d1fda89b91cd liveMedia/Makefile.tail +--- a/live/liveMedia/Makefile.tail Fri Mar 12 11:30:13 2010 -0500 ++++ b/live/liveMedia/Makefile.tail Fri Mar 12 12:19:11 2010 -0500 +@@ -42,11 +42,12 @@ + MISC_OBJS = DarwinInjector.$(OBJ) BitVector.$(OBJ) StreamParser.$(OBJ) DigestAuthentication.$(OBJ) our_md5.$(OBJ) our_md5hl.$(OBJ) Base64.$(OBJ) Locale.$(OBJ) + + 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) $(MATROSKA_OBJS) $(MISC_OBJS) ++LIVEMEDIA_LIBS = ../groupsock/libgroupsock.$(LIB_SUFFIX) ../BasicUsageEnvironment/libBasicUsageEnvironment.$(LIB_SUFFIX) + +-$(LIVEMEDIA_LIB): $(LIVEMEDIA_LIB_OBJS) \ ++$(LIVEMEDIA_LIB): $(LIVEMEDIA_LIB_OBJS) $(LIVEMEDIA_LIBS) \ + $(PLATFORM_SPECIFIC_LIB_OBJS) + $(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) \ +- $(LIVEMEDIA_LIB_OBJS) ++ $(LIVEMEDIA_LIB_OBJS) $(LIVEMEDIA_LIBS) + + Media.$(CPP): include/Media.hh + include/Media.hh: include/liveMedia_version.hh |