[patch] low-quality hackery

live-libtool-qa-ld-fixes.fatpatch (text/plain), 26.49 KB, created by Nathan Phillip Brink (binki) (RETIRED) on 2010-03-16 01:38:22 UTC

diff -r 4706d9c49caf -r f40ae7352506 media-plugins/live/files/config.gentoo
--- a/media-plugins/live/files/config.gentoo	Sun Mar 14 22:03:45 2010 -0400
+++ b/media-plugins/live/files/config.gentoo	Mon Mar 15 21:37:16 2010 -0400
@@ -1,17 +1,25 @@
+LIBTOOL_WRAPPER =	libtool --tag=CXX
 COMPILE_OPTS =		$(INCLUDES) -I. -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
 C =			c
-C_COMPILER =		$(CC)
+C_COMPILER =		$(LIBTOOL_WRAPPER) --mode=compile $(CC)
 C_FLAGS =		$(COMPILE_OPTS) $(CFLAGS)
 CPP =			cpp
-CPLUSPLUS_COMPILER =	$(CXX)
+CPLUSPLUS_COMPILER =	$(LIBTOOL_WRAPPER) --mode=compile $(CXX)
 CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) $(CXXFLAGS)
-OBJ =			o
-LINK =			$(CXX) -o
-LINK_OPTS =		-L.
+OBJ =			lo
+LINK =			$(LIBTOOL_WRAPPER) --mode=link $(CXX) -o 
+LINK_OPTS =		$(CXXFLAGS) $(LDFLAGS)
 CONSOLE_LINK_OPTS =	$(LINK_OPTS)
-LIBRARY_LINK =		$(LD) -o
-LIBRARY_LINK_OPTS =	$(LINK_OPTS) -r -Bstatic
-LIB_SUFFIX =			a
+LIBRARY_LINK =		$(LIBTOOL_WRAPPER) --mode=link $(CXX) -version-info $(LIVE_ABI_VERSION) -rpath $(LIBDIR) -o 
+LIBRARY_LINK_OPTS =	$(LINK_OPTS)
+LIB_SUFFIX =		la
 LIBS_FOR_CONSOLE_APPLICATION =
 LIBS_FOR_GUI_APPLICATION =
 EXE =
+INSTALL =		install -c 
+
+# rules for libtool's lo files
+%.$(OBJ) : %.$(C)
+	 $(C_COMPILER) -c $(C_FLAGS) $<
+%.$(OBJ) : %.$(CPP)
+	 $(CPLUSPLUS_COMPILER) -c $(CPLUSPLUS_FLAGS) $<
diff -r 4706d9c49caf -r f40ae7352506 media-plugins/live/files/config.gentoo-so
--- a/media-plugins/live/files/config.gentoo-so	Sun Mar 14 22:03:45 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-COMPILE_OPTS =		$(INCLUDES) -I. -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
-C =			c
-C_COMPILER =		$(CC)
-C_FLAGS =		$(COMPILE_OPTS) -fPIC $(CFLAGS)
-CPP =			cpp
-CPLUSPLUS_COMPILER =	$(CXX)
-CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) -fPIC $(CXXFLAGS)
-OBJ =			o
-LINK =			$(CXX) -o
-LINK_OPTS =		-L.
-CONSOLE_LINK_OPTS =	$(LINK_OPTS)
-LIBRARY_LINK =		$(CC) -o
-LIBRARY_LINK_OPTS =	$(LINK_OPTS) -shared -Wl,-soname,$@
-LIB_SUFFIX =			so
-LIBS_FOR_CONSOLE_APPLICATION =
-LIBS_FOR_GUI_APPLICATION =
-EXE =
diff -r 4706d9c49caf -r f40ae7352506 media-plugins/live/files/config.gentoo-so-r1
--- a/media-plugins/live/files/config.gentoo-so-r1	Sun Mar 14 22:03:45 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-COMPILE_OPTS =		$(INCLUDES) -I. -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
-C =			c
-C_COMPILER =		$(CC)
-C_FLAGS =		$(COMPILE_OPTS) -fPIC $(CFLAGS)
-CPP =			cpp
-CPLUSPLUS_COMPILER =	$(CXX)
-CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) -fPIC $(CXXFLAGS)
-OBJ =			o
-LINK =			$(CXX) -o
-LINK_OPTS =		-L.
-CONSOLE_LINK_OPTS =	$(LINK_OPTS)
-LIBRARY_LINK =		$(CXX) -o
-LIBRARY_LINK_OPTS =	$(LINK_OPTS) -shared -Wl,-soname,$@
-LIB_SUFFIX =			so
-LIBS_FOR_CONSOLE_APPLICATION =
-LIBS_FOR_GUI_APPLICATION =
-EXE =
diff -r 4706d9c49caf -r f40ae7352506 media-plugins/live/files/live-2009.06.02-as-needed.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/media-plugins/live/files/live-2009.06.02-as-needed.patch	Mon Mar 15 21:37:16 2010 -0400
@@ -0,0 +1,42 @@
+Author: Nathan Phillip Brink <[e-mail]>
+Purpose: To fix compilation error when using LDFLAGS=-Wl,--as-needed
+Uselessness: Not needed as of live-2009.09.28.
+
+--- a/testProgs/Makefile.tail	2010-03-08 20:37:16.000000000 -0500
++++ b/testProgs/Makefile.tail	2010-03-08 20:37:27.000000000 -0500
+@@ -59,7 +59,7 @@
+ GROUPSOCK_DIR = ../groupsock
+ GROUPSOCK_LIB = $(GROUPSOCK_DIR)/libgroupsock.$(LIB_SUFFIX)
+ LOCAL_LIBS =	$(LIVEMEDIA_LIB) $(GROUPSOCK_LIB) \
+-		$(USAGE_ENVIRONMENT_LIB) $(BASIC_USAGE_ENVIRONMENT_LIB)
++		$(BASIC_USAGE_ENVIRONMENT_LIB) $(USAGE_ENVIRONMENT_LIB)
+ LIBS =			$(LOCAL_LIBS) $(LIBS_FOR_CONSOLE_APPLICATION)
+ 
+ testMP3Streamer$(EXE):	$(MP3_STREAMER_OBJS) $(LOCAL_LIBS)
+
+Diff finished.  Mon Mar  8 20:37:27 2010
+--- a/mediaServer/Makefile.tail	2009-06-02 05:03:18.000000000 -0400
++++ b/mediaServer/Makefile.tail	2010-03-08 20:45:35.000000000 -0500
+@@ -25,7 +25,7 @@
+ GROUPSOCK_DIR = ../groupsock
+ GROUPSOCK_LIB = $(GROUPSOCK_DIR)/libgroupsock.$(LIB_SUFFIX)
+ LOCAL_LIBS =	$(LIVEMEDIA_LIB) $(GROUPSOCK_LIB) \
+-		$(USAGE_ENVIRONMENT_LIB) $(BASIC_USAGE_ENVIRONMENT_LIB)
++		$(BASIC_USAGE_ENVIRONMENT_LIB) $(USAGE_ENVIRONMENT_LIB)
+ LIBS =			$(LOCAL_LIBS) $(LIBS_FOR_CONSOLE_APPLICATION)
+ 
+ live555MediaServer$(EXE):	$(MEDIA_SERVER_OBJS) $(LOCAL_LIBS)
+--- a/Makefile.tail	2009-06-02 05:03:18.000000000 -0400
++++ b/Makefile.tail	2010-03-08 20:48:23.000000000 -0500
+@@ -32,9 +32,9 @@
+ 	cd $(USAGE_ENVIRONMENT_DIR) ; $(MAKE)
+ $(BASIC_USAGE_ENVIRONMENT_LIB):
+ 	cd $(BASIC_USAGE_ENVIRONMENT_DIR) ; $(MAKE)
+-$(TESTPROGS_APP): $(LIVEMEDIA_LIB) $(GROUPSOCK_LIB) $(USAGE_ENVIRONMENT_LIB) $(BASIC_USAGE_ENVIRONMENT_LIB)
++$(TESTPROGS_APP): $(LIVEMEDIA_LIB) $(GROUPSOCK_LIB) $(BASIC_USAGE_ENVIRONMENT_LIB) $(USAGE_ENVIRONMENT_LIB)
+ 	cd $(TESTPROGS_DIR) ; $(MAKE)
+-$(MEDIA_SERVER_APP): $(LIVEMEDIA_LIB) $(GROUPSOCK_LIB) $(USAGE_ENVIRONMENT_LIB) $(BASIC_USAGE_ENVIRONMENT_LIB)
++$(MEDIA_SERVER_APP): $(LIVEMEDIA_LIB) $(GROUPSOCK_LIB) $(BASIC_USAGE_ENVIRONMENT_LIB) $(USAGE_ENVIRONMENT_LIB)
+ 	cd $(MEDIA_SERVER_DIR) ; $(MAKE)
+ 
+ clean:
diff -r 4706d9c49caf -r f40ae7352506 media-plugins/live/files/live-2009.06.02-buildorder.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/media-plugins/live/files/live-2009.06.02-buildorder.patch	Mon Mar 15 21:37:16 2010 -0400
@@ -0,0 +1,24 @@
+Author: Nathan Phillip Brink <[e-mail]>
+Purpose: To help get libtool working with live.
+
+diff -r a467df21e246 -r d1fda89b91cd Makefile.tail
+--- a/Makefile.tail	Fri Mar 12 11:30:13 2010 -0500
++++ b/Makefile.tail	Fri Mar 12 12:19:11 2010 -0500
+@@ -24,13 +24,13 @@
+ all:	$(ALL)
+ 
+ 
+-$(LIVEMEDIA_LIB):
++$(LIVEMEDIA_LIB): $(GROUPSOCK_LIB) $(BASIC_USAGE_ENVIRONMENT_LIB)
+ 	cd $(LIVEMEDIA_DIR) ; $(MAKE)
+-$(GROUPSOCK_LIB):
++$(GROUPSOCK_LIB): $(BASIC_USAGE_ENVIRONMENT_LIB)
+ 	cd $(GROUPSOCK_DIR) ; $(MAKE)
+ $(USAGE_ENVIRONMENT_LIB):
+ 	cd $(USAGE_ENVIRONMENT_DIR) ; $(MAKE)
+-$(BASIC_USAGE_ENVIRONMENT_LIB):
++$(BASIC_USAGE_ENVIRONMENT_LIB): $(USAGE_ENVIRONMENT_LIB)
+ 	cd $(BASIC_USAGE_ENVIRONMENT_DIR) ; $(MAKE)
+ $(TESTPROGS_APP): $(LIVEMEDIA_LIB) $(GROUPSOCK_LIB) $(BASIC_USAGE_ENVIRONMENT_LIB) $(USAGE_ENVIRONMENT_LIB)
+ 	cd $(TESTPROGS_DIR) ; $(MAKE)
+diff -r a467df21e246 -r d1fda89b91cd groupsock/Makefile.tail
diff -r 4706d9c49caf -r f40ae7352506 media-plugins/live/files/live-2009.06.02-libdeps.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/media-plugins/live/files/live-2009.06.02-libdeps.patch	Mon Mar 15 21:37:16 2010 -0400
@@ -0,0 +1,60 @@
+Author: Nathan Phillip Brink <[e-mail]>
+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
diff -r 4706d9c49caf -r f40ae7352506 media-plugins/live/files/live-2009.09.28-buildorder.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/media-plugins/live/files/live-2009.09.28-buildorder.patch	Mon Mar 15 21:37:16 2010 -0400
@@ -0,0 +1,27 @@
+Author: Nathan Phillip Brink <[e-mail]>
+Purpose: to help facilitate building liveMedia with libtool by making sure that the libtool archive files different targets need already exist before telling libtool to link against then. (i.e., to fix the build order).
+
+diff -r 7f99bfe34df0 Makefile.tail
+--- a/Makefile.tail	Sat Mar 13 02:18:02 2010 -0500
++++ b/Makefile.tail	Sat Mar 13 02:19:05 2010 -0500
+@@ -10,17 +10,17 @@
+ 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)
+ 
+ clean:
+-	cd $(LIVEMEDIA_DIR) ; $(MAKE) clean
+ 	cd $(GROUPSOCK_DIR) ; $(MAKE) clean
+ 	cd $(USAGE_ENVIRONMENT_DIR) ; $(MAKE) clean
+ 	cd $(BASIC_USAGE_ENVIRONMENT_DIR) ; $(MAKE) clean
++	cd $(LIVEMEDIA_DIR) ; $(MAKE) clean
+ 	cd $(TESTPROGS_DIR) ; $(MAKE) clean
+ 	cd $(MEDIA_SERVER_DIR) ; $(MAKE) clean
diff -r 4706d9c49caf -r f40ae7352506 media-plugins/live/files/live-recursive.patch
--- a/media-plugins/live/files/live-recursive.patch	Sun Mar 14 22:03:45 2010 -0400
+++ b/media-plugins/live/files/live-recursive.patch	Mon Mar 15 21:37:16 2010 -0400
@@ -2,10 +2,11 @@
 ===================================================================
 --- live.orig/Makefile.tail
 +++ live/Makefile.tail
-@@ -14,8 +14,6 @@ all:
- 	cd $(GROUPSOCK_DIR) ; $(MAKE)
+@@ -14,9 +14,7 @@ all:
  	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)
  
diff -r 4706d9c49caf -r f40ae7352506 media-plugins/live/live-2008.09.02.ebuild
--- a/media-plugins/live/live-2008.09.02.ebuild	Sun Mar 14 22:03:45 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/live/live-2008.09.02.ebuild,v 1.7 2008/10/18 14:45:49 armin76 Exp $
-
-inherit flag-o-matic eutils toolchain-funcs multilib
-
-DESCRIPTION="Source-code libraries for standards-based RTP/RTCP/RTSP multimedia streaming, suitable for embedded and/or low-cost streaming applications"
-HOMEPAGE="http://www.live555.com/"
-SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-S="${WORKDIR}"
-
-# Alexis Ballier <[e-mail]>
-# Be careful, bump this everytime you bump the package and the ABI has changed.
-# If you don't know, ask someone.
-LIVE_ABI_VERSION=1
-
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}"
-
-	cp -pPR live live-shared
-	mv live live-static
-
-	cp "${FILESDIR}/config.gentoo" live-static
-	cp "${FILESDIR}/config.gentoo-so" live-shared
-}
-
-src_compile() {
-	tc-export CC CXX LD
-
-	cd "${WORKDIR}/live-static"
-
-	einfo "Beginning static library build"
-	./genMakefiles gentoo
-	emake -j1 LINK_OPTS="-L. $(raw-ldflags)" TESTPROGS_APP="" MEDIA_SERVER_APP="" || die "failed to build static libraries"
-
-	einfo "Beginning programs build"
-	cd "${WORKDIR}/live-static/testProgs"
-	emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build test programs"
-	cd "${WORKDIR}/live-static/mediaServer"
-	emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build the mediaserver"
-
-	cd "${WORKDIR}/live-shared"
-	einfo "Beginning shared library build"
-	./genMakefiles gentoo-so
-	emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="so.${LIVE_ABI_VERSION}" TESTPROGS_APP="" MEDIA_SERVER_APP="" || die "failed to build shared libraries"
-}
-
-src_install() {
-	for library in UsageEnvironment liveMedia BasicUsageEnvironment groupsock; do
-		dolib.a live-static/${library}/lib${library}.a
-		dolib.so live-shared/${library}/lib${library}.so.${LIVE_ABI_VERSION}
-		dosym lib${library}.so.${LIVE_ABI_VERSION} /usr/$(get_libdir)/lib${library}.so
-
-		insinto /usr/include/${library}
-		doins live-shared/${library}/include/*h
-	done
-
-	# Should we really install these?
-	find live-static/testProgs -type f -perm +111 -print0 | \
-		xargs -0 dobin
-
-	#install included live555MediaServer aplication
-	dobin live-static/mediaServer/live555MediaServer
-
-	# install docs
-	dodoc live-static/README
-}
-
-pkg_postinst() {
-	ewarn "If you are upgrading from a version prior to live-2008.02.08"
-	ewarn "Please make sure to rebuild applications built against ${PN}"
-	ewarn "like vlc or mplayer. ${PN} may have had ABI changes and ${PN}"
-	ewarn "support might be broken."
-}
diff -r 4706d9c49caf -r f40ae7352506 media-plugins/live/live-2009.06.02.ebuild
--- a/media-plugins/live/live-2009.06.02.ebuild	Sun Mar 14 22:03:45 2010 -0400
+++ b/media-plugins/live/live-2009.06.02.ebuild	Mon Mar 15 21:37:16 2010 -0400
@@ -2,75 +2,80 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-plugins/live/live-2009.06.02.ebuild,v 1.8 2010/01/06 16:55:17 ranger Exp $
 
-inherit flag-o-matic eutils toolchain-funcs multilib
+EAPI="2"
 
-DESCRIPTION="Source-code libraries for standards-based RTP/RTCP/RTSP multimedia streaming, suitable for embedded and/or low-cost streaming applications"
+inherit eutils flag-o-matic toolchain-funcs multilib
+
+DESCRIPTION="Standards-based RTP/RTCP/RTSP multimedia streaming for embedded streaming applications"
 HOMEPAGE="http://www.live555.com/"
 SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
+IUSE="static-libs"
 
-S="${WORKDIR}"
+DEPEND="sys-devel/libtool"
+RDEPEND=""
+
+S=${WORKDIR}/${PN}
 
 # Alexis Ballier <[e-mail]>
 # Be careful, bump this everytime you bump the package and the ABI has changed.
 # If you don't know, ask someone.
 LIVE_ABI_VERSION=3
 
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}"
+src_prepare() {
+	cp "${FILESDIR}"/config.gentoo ./ || die
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+	epatch "${FILESDIR}"/${P}-buildorder.patch
+	epatch "${FILESDIR}"/${P}-libdeps.patch
+}
 
-	cp -pPR live live-shared
-	mv live live-static
+src_configure() {
+	tc-export CC CXX
+	export LIVE_ABI_VERSION LIBDIR=/usr/$(get_libdir)
 
-	cp "${FILESDIR}/config.gentoo" live-static
-	cp "${FILESDIR}/config.gentoo-so" live-shared
+	if ! use static-libs; then
+		append-flags -shared
+		append-ldflags -shared
+	fi
+
+	./genMakefiles gentoo
 }
 
 src_compile() {
-	tc-export CC CXX LD
-
-	cd "${WORKDIR}/live-static"
-
-	einfo "Beginning static library build"
-	./genMakefiles gentoo
-	emake -j1 LINK_OPTS="-L. $(raw-ldflags)" TESTPROGS_APP="" MEDIA_SERVER_APP="" || die "failed to build static libraries"
+	einfo "Beginning library build"
+	emake -j1 TESTPROGS_APP="" MEDIA_SERVER_APP="" || die "failed to build libraries"
 
 	einfo "Beginning programs build"
-	cd "${WORKDIR}/live-static/testProgs"
-	emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build test programs"
-	cd "${WORKDIR}/live-static/mediaServer"
-	emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build the mediaserver"
-
-	cd "${WORKDIR}/live-shared"
-	einfo "Beginning shared library build"
-	./genMakefiles gentoo-so
-	emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="so.${LIVE_ABI_VERSION}" TESTPROGS_APP="" MEDIA_SERVER_APP="" || die "failed to build shared libraries"
+	emake -C testProgs || die "failed to build test programs"
+	emake -C mediaServer || die "failed to build the mediaserver"
 }
 
 src_install() {
+	dodir /usr/{$(get_libdir),bin} || die
 	for library in UsageEnvironment liveMedia BasicUsageEnvironment groupsock; do
-		dolib.a live-static/${library}/lib${library}.a
-		dolib.so live-shared/${library}/lib${library}.so.${LIVE_ABI_VERSION}
-		dosym lib${library}.so.${LIVE_ABI_VERSION} /usr/$(get_libdir)/lib${library}.so
+		libtool --mode=install install -c ${library}/lib${library}.la "${D}"/usr/$(get_libdir)/ || die
+
+		if ! use static-libs; then
+			# make tommy happy --ohnobinki
+			rm -v "${D}"/usr/$(get_libdir)/lib${library}.la || die
+		fi
 
 		insinto /usr/include/${library}
-		doins live-shared/${library}/include/*h
+		doins ${library}/include/*h || die
 	done
 
 	# Should we really install these?
-	find live-static/testProgs -type f -perm +111 -print0 | \
-		xargs -0 dobin
+	find testProgs -type f -perm +111 \
+		-exec libtool --mode=install install -c '{}' "${D}"/usr/bin/ \; || die
 
-	#install included live555MediaServer aplication
-	dobin live-static/mediaServer/live555MediaServer
+	#install included live555MediaServer application
+	libtool --mode=install install -c mediaServer/live555MediaServer "${D}"/usr/bin/ || die
 
 	# install docs
-	dodoc live-static/README
+	dodoc README || die
 }
 
 pkg_postinst() {
diff -r 4706d9c49caf -r f40ae7352506 media-plugins/live/live-2009.09.28.ebuild
--- a/media-plugins/live/live-2009.09.28.ebuild	Sun Mar 14 22:03:45 2010 -0400
+++ b/media-plugins/live/live-2009.09.28.ebuild	Mon Mar 15 21:37:16 2010 -0400
@@ -1,77 +1,81 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-plugins/live/live-2009.09.28.ebuild,v 1.1 2009/09/29 07:03:26 aballier Exp $
 
-inherit flag-o-matic eutils toolchain-funcs multilib
+EAPI="2"
 
-DESCRIPTION="Source-code libraries for standards-based RTP/RTCP/RTSP multimedia streaming, suitable for embedded and/or low-cost streaming applications"
+inherit eutils flag-o-matic toolchain-funcs multilib
+
+DESCRIPTION="Standards-based RTP/RTCP/RTSP multimedia streaming for embedded streaming applications"
 HOMEPAGE="http://www.live555.com/"
 SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
+IUSE="static-libs"
 
-S="${WORKDIR}"
+DEPEND="sys-devel/libtool"
+RDEPEND=""
+
+S=${WORKDIR}/${PN}
 
 # Alexis Ballier <[e-mail]>
 # Be careful, bump this everytime you bump the package and the ABI has changed.
 # If you don't know, ask someone.
 LIVE_ABI_VERSION=3
 
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}/${PN}-recursive.patch"
+src_prepare() {
+	cp "${FILESDIR}"/config.gentoo ./ || die
+	epatch "${FILESDIR}"/${P}-buildorder.patch
+	epatch "${FILESDIR}"/${PN}-2009.06.02-libdeps.patch
+	epatch "${FILESDIR}"/${PN}-recursive.patch
+}
 
-	cp -pPR live live-shared
-	mv live live-static
+src_configure() {
+	tc-export CC CXX
+	export LIVE_ABI_VERSION LIBDIR=/usr/$(get_libdir)
 
-	cp "${FILESDIR}/config.gentoo" live-static
-	cp "${FILESDIR}/config.gentoo-so-r1" live-shared
+	if ! use static-libs; then
+		append-flags -shared
+		append-ldflags -shared
+	fi
+
+	./genMakefiles gentoo
 }
 
 src_compile() {
-	tc-export CC CXX LD
-
-	cd "${WORKDIR}/live-static"
-
-	einfo "Beginning static library build"
-	./genMakefiles gentoo
-	emake -j1 LINK_OPTS="-L. $(raw-ldflags)" || die "failed to build static libraries"
+	einfo "Beginning library build"
+	emake -j1 || die "failed to build libraries"
 
 	einfo "Beginning programs build"
-	cd "${WORKDIR}/live-static/testProgs"
-	emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build test programs"
-	cd "${WORKDIR}/live-static/mediaServer"
-	emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build the mediaserver"
-
-	cd "${WORKDIR}/live-shared"
-	einfo "Beginning shared library build"
-	./genMakefiles gentoo-so-r1
-	emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="so.${LIVE_ABI_VERSION}" || die "failed to build shared libraries"
+	emake -C testProgs || die "failed to build test programs"
+	emake -C mediaServer || die "failed to build the mediaserver"
 }
 
 src_install() {
+	dodir /usr/{$(get_libdir),bin} || die
 	for library in UsageEnvironment liveMedia BasicUsageEnvironment groupsock; do
-		dolib.a live-static/${library}/lib${library}.a
-		dolib.so live-shared/${library}/lib${library}.so.${LIVE_ABI_VERSION}
-		dosym lib${library}.so.${LIVE_ABI_VERSION} /usr/$(get_libdir)/lib${library}.so
+		libtool --mode=install install -c ${library}/lib${library}.la "${D}"/usr/$(get_libdir)/ || die
+
+		if ! use static-libs; then
+			# make tommy happy --ohnobinki
+			rm -v "${D}"/usr/$(get_libdir)/lib${library}.la || die
+		fi
 
 		insinto /usr/include/${library}
-		doins live-shared/${library}/include/*h
+		doins ${library}/include/*h || die
 	done
 
 	# Should we really install these?
-	find live-static/testProgs -type f -perm +111 -print0 | \
-		xargs -0 dobin
+	find testProgs -type f -perm +111 \
+		-exec libtool --mode=install install -c '{}' "${D}"/usr/bin/ \; || die
 
-	#install included live555MediaServer aplication
-	dobin live-static/mediaServer/live555MediaServer
+	#install included live555MediaServer application
+	libtool --mode=install install -c mediaServer/live555MediaServer "${D}"/usr/bin/ || die
 
 	# install docs
-	dodoc live-static/README
+	dodoc README || die
 }
 
 pkg_postinst() {
diff -r 4706d9c49caf -r f40ae7352506 media-plugins/live/live-2009.11.12.ebuild
--- a/media-plugins/live/live-2009.11.12.ebuild	Sun Mar 14 22:03:45 2010 -0400
+++ b/media-plugins/live/live-2009.11.12.ebuild	Mon Mar 15 21:37:16 2010 -0400
@@ -1,77 +1,78 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-plugins/live/live-2009.11.12.ebuild,v 1.1 2009/11/21 12:23:51 aballier Exp $
 
-inherit flag-o-matic eutils toolchain-funcs multilib
+EAPI="2"
 
-DESCRIPTION="Source-code libraries for standards-based RTP/RTCP/RTSP multimedia streaming, suitable for embedded and/or low-cost streaming applications"
+inherit eutils flag-o-matic eutils toolchain-funcs multilib
+
+DESCRIPTION="Standards-based RTP/RTCP/RTSP multimedia streaming for embedded streaming applications"
 HOMEPAGE="http://www.live555.com/"
 SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
+IUSE="static-libs"
 
-S="${WORKDIR}"
+S=${WORKDIR}/${PN}
 
 # Alexis Ballier <[e-mail]>
 # Be careful, bump this everytime you bump the package and the ABI has changed.
 # If you don't know, ask someone.
 LIVE_ABI_VERSION=3
 
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}/${PN}-recursive.patch"
+src_prepare() {
+	cp "${FILESDIR}"/config.gentoo ./ || die
+	epatch "${FILESDIR}"/${PN}-2009.09.28-buildorder.patch
+	epatch "${FILESDIR}"/${PN}-2009.06.02-libdeps.patch
+	epatch "${FILESDIR}"/${PN}-recursive.patch
+}
 
-	cp -pPR live live-shared
-	mv live live-static
+src_configure() {
+	tc-export CC CXX
+	export LIVE_ABI_VERSION LIBDIR=/usr/$(get_libdir)
 
-	cp "${FILESDIR}/config.gentoo" live-static
-	cp "${FILESDIR}/config.gentoo-so-r1" live-shared
+	if ! use static-libs; then
+		append-flags -shared
+		append-ldflags -shared
+	fi
+
+	./genMakefiles gentoo
 }
 
 src_compile() {
-	tc-export CC CXX LD
-
-	cd "${WORKDIR}/live-static"
-
-	einfo "Beginning static library build"
-	./genMakefiles gentoo
-	emake -j1 LINK_OPTS="-L. $(raw-ldflags)" || die "failed to build static libraries"
+	einfo "Beginning library build"
+	emake -j1 || die "failed to build libraries"
 
 	einfo "Beginning programs build"
-	cd "${WORKDIR}/live-static/testProgs"
-	emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build test programs"
-	cd "${WORKDIR}/live-static/mediaServer"
-	emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build the mediaserver"
-
-	cd "${WORKDIR}/live-shared"
-	einfo "Beginning shared library build"
-	./genMakefiles gentoo-so-r1
-	emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="so.${LIVE_ABI_VERSION}" || die "failed to build shared libraries"
+	emake -C testProgs || die "failed to build test programs"
+	emake -C mediaServer || die "failed to build the mediaserver"
 }
 
 src_install() {
+	dodir /usr/{$(get_libdir),bin} || die
 	for library in UsageEnvironment liveMedia BasicUsageEnvironment groupsock; do
-		dolib.a live-static/${library}/lib${library}.a
-		dolib.so live-shared/${library}/lib${library}.so.${LIVE_ABI_VERSION}
-		dosym lib${library}.so.${LIVE_ABI_VERSION} /usr/$(get_libdir)/lib${library}.so
+		libtool --mode=install install -c ${library}/lib${library}.la "${D}"/usr/$(get_libdir)/ || die
+
+		if ! use static-libs; then
+			# make tommy happy --ohnobinki
+			rm -v "${D}"/usr/$(get_libdir)/lib${library}.la || die
+		fi
 
 		insinto /usr/include/${library}
-		doins live-shared/${library}/include/*h
+		doins ${library}/include/*h || die
 	done
 
 	# Should we really install these?
-	find live-static/testProgs -type f -perm +111 -print0 | \
-		xargs -0 dobin
+	find testProgs -type f -perm +111 \
+		-exec libtool --mode=install install -c '{}' "${D}"/usr/bin/ \; || die
 
 	#install included live555MediaServer aplication
-	dobin live-static/mediaServer/live555MediaServer
+	libtool --mode=install install -c mediaServer/live555MediaServer "${D}"/usr/bin/ || die
 
 	# install docs
-	dodoc live-static/README
+	dodoc README || die
 }
 
 pkg_postinst() {