Files
@ f40ae7352506
Branch filter:
Location: ohnobinki_overlay/media-plugins/live/files/live-2009.06.02-libdeps.patch - annotation
f40ae7352506
2.7 KiB
text/x-diff
Fix up ebuilds to build libraries using libtool, use EAPI="2", and fix QA issues. Bug 309681, bug 308373, and for portage-multilib.
(Portage version: 2.2_rc67-r2/hg/Linux x86_64)
(Signed Manifest commit)
(Portage version: 2.2_rc67-r2/hg/Linux x86_64)
(Signed Manifest commit)
f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 f40ae7352506 | Author: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
Purpose: To help get libtool working with live.
diff -r a467df21e246 -r d1fda89b91cd BasicUsageEnvironment/Makefile.tail
--- a/BasicUsageEnvironment/Makefile.tail Fri Mar 12 11:30:13 2010 -0500
+++ b/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/groupsock/Makefile.tail Fri Mar 12 11:30:13 2010 -0500
+++ b/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/liveMedia/Makefile.tail Fri Mar 12 11:30:13 2010 -0500
+++ b/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) $(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
|