version bump. Add static-libs support and examples useflag to install test programs. Link programs dynamically instead of statically.

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

4 files changed, 154 insertions, 5 deletions

diff --git a/media-plugins/live/ChangeLog b/media-plugins/live/ChangeLog
index 647d6dbd7a42..f7d502f09648 100644
--- a/media-plugins/live/ChangeLog
+++ b/media-plugins/live/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/live
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/live/ChangeLog,v 1.153 2012/04/05 12:32:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/live/ChangeLog,v 1.154 2012/04/24 13:01:39 aballier Exp $
+
+*live-2012.04.21 (24 Apr 2012)
+
+  24 Apr 2012; Alexis Ballier <aballier@gentoo.org>
+  +files/live-recursive2.patch, +live-2012.04.21.ebuild:
+  version bump. Add static-libs support and examples useflag to install test
+  programs. Link programs dynamically instead of statically.
 
 *live-2012.04.04 (05 Apr 2012)
 
diff --git a/media-plugins/live/Manifest b/media-plugins/live/Manifest
index c2ec620e23cc..59c7efedfb66 100644
--- a/media-plugins/live/Manifest
+++ b/media-plugins/live/Manifest
@@ -4,16 +4,19 @@ Hash: SHA1
 AUX config.gentoo 480 RMD160 7fe83cf6a587076b282c66f4e4d730e41b55fc27 SHA1 c26ee14495ac18d25aff20290b55181fa9245082 SHA256 f8dfcb44221ab3e1fbea958b0be5d817aaebe971129def44a96fe1cb0a7d4a00
 AUX config.gentoo-so-r1 505 RMD160 6bd37a2fa790eb116c477a6c77f61e88a3535348 SHA1 99961d3665c05375750c076e5f6bffc4044fdc42 SHA256 be1d556e414d128ee3998b4ad640dcd2fb829430c134997134e7054edac55eaf
 AUX live-recursive.patch 401 RMD160 512ee0cf4ca9139af5451be8bf7aa4321997cb03 SHA1 df84e25e5f879d93be4a71ec57c090f0d2c80f4f SHA256 353e9d709ae60a216069d39880ae1781e2037692c77ea5aca60dfb0ca1b2ae88
+AUX live-recursive2.patch 436 RMD160 2abedfd7596c67d23834f886d2f50f73ae2f6f22 SHA1 8b87a8bf96168f86a9b4530cd9c4f2fbb746d00a SHA256 7276c4465574d0862c280fe44955621b0aba02e21a2dd97ec352ccf24aaac06e
 DIST live.2012.01.07.tar.gz 534076 RMD160 1bfbbbe4b0ee7f627aa2551657bf9f0937603147 SHA1 a89bc86d179d17c57ed98c0bb8fdaf5f101fdb70 SHA256 8f3d167959b355c571caab2ee12cf70c89f09e93484f150080a59367b35c8131
 DIST live.2012.04.04.tar.gz 541301 RMD160 d37ff787c0c08566851959feb82bdc6e4e278345 SHA1 e240a90f4ed5766136bcc2efa44338f0c453362c SHA256 673ec5b14157a4ba4fed2dd49b2c3c0a63378439df1b9cc392eaf2bdad892412
+DIST live.2012.04.21.tar.gz 548778 RMD160 21dab0813d56fbb02f0eaefd566b2f0557a7c136 SHA1 1028f51d6139bad5c3dc5479c229c246541661a0 SHA256 b5073bdfe615d6bf9f6fff48e9cabeb835a6286dfc0d8679853e516ed64aea81
 EBUILD live-2012.01.07.ebuild 3706 RMD160 79e216bb7dfe0f538f230a36a81995817a0128fd SHA1 795c69a8726b42b7d968c22e7743325353bde5c1 SHA256 6a939b524fcf3c10dcd285445b661911e1c8f0c222c893049cf743c1fe51af33
 EBUILD live-2012.04.04.ebuild 3873 RMD160 5ac82e7843863780a8f3ccdfb3970b299e607a2d SHA1 975c898965caf9392c849b4ff1d5798b4170e47d SHA256 a4744169bad50a70319e62aca1f3ac22f8872b0d431dd77f05c0cea304966232
-MISC ChangeLog 19341 RMD160 5d0316355ff7718ef6e2389d7c07bfa696027512 SHA1 12c34fd964f78ff29d4c5aa7746fa2c44653eb19 SHA256 bb1ed3a5598096858eb7b2841c0f68c6c08d0426af3711fa53e41f891131e35f
+EBUILD live-2012.04.21.ebuild 4129 RMD160 bafc5852e9aec0e1dfd2ddecb1972bdebaafbdfd SHA1 51ee98d0452b75fde1dc957dddab576da0fd9c08 SHA256 bd31207f162848090f5c76164154e6a7b8b207a2508ba23b55e7d6160b48fccc
+MISC ChangeLog 19621 RMD160 d98674b1e3cd19d2eee042b322e8dd02eb0f5c32 SHA1 1674297b0273e5ba339bd425840c9ba91ddd90e3 SHA256 c4e5235de41f5fc4d0fb28de36886b8428965e76a08d002c940ab445b178a004
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk99kPIACgkQvFcC4BYPU0qg3QCfcwxvVa3xjfhZCZ5dQEqTVpXW
-9qoAn3Cqke3UNm8Te3trhtJpQZdIwNlr
-=hIJz
+iEYEARECAAYFAk+WpDsACgkQvFcC4BYPU0pcHQCgppd/aOPD3ULeKipH+NSnOLXQ
+KKUAoJuNC+ZKMDXoF9M240wEYr+KxzbB
+=xqK0
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/live/files/live-recursive2.patch b/media-plugins/live/files/live-recursive2.patch
new file mode 100644
index 000000000000..107e53c6e137
--- /dev/null
+++ b/media-plugins/live/files/live-recursive2.patch
@@ -0,0 +1,14 @@
+Index: live/Makefile.tail
+===================================================================
+--- live.orig/Makefile.tail
++++ live/Makefile.tail
+@@ -16,9 +16,6 @@ all:
+ 	cd $(GROUPSOCK_DIR) ; $(MAKE)
+ 	cd $(USAGE_ENVIRONMENT_DIR) ; $(MAKE)
+ 	cd $(BASIC_USAGE_ENVIRONMENT_DIR) ; $(MAKE)
+-	cd $(TESTPROGS_DIR) ; $(MAKE)
+-	cd $(MEDIA_SERVER_DIR) ; $(MAKE)
+-	cd $(PROXY_SERVER_DIR) ; $(MAKE)
+ 
+ clean:
+ 	cd $(LIVEMEDIA_DIR) ; $(MAKE) clean
diff --git a/media-plugins/live/live-2012.04.21.ebuild b/media-plugins/live/live-2012.04.21.ebuild
new file mode 100644
index 000000000000..4b5628000153
--- /dev/null
+++ b/media-plugins/live/live-2012.04.21.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/live/live-2012.04.21.ebuild,v 1.1 2012/04/24 13:01:41 aballier Exp $
+
+EAPI=3
+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 ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="examples static-libs"
+
+S="${WORKDIR}"
+
+# Alexis Ballier <aballier@gentoo.org>
+# Be careful, bump this everytime you bump the package and the ABI has changed.
+# If you don't know, ask someone.
+LIVE_ABI_VERSION=6
+
+src_prepare() {
+	cd "${WORKDIR}"
+	epatch "${FILESDIR}/${PN}-recursive2.patch"
+
+	if use static-libs ; then
+		cp -pPR live live-shared
+		mv live live-static
+	else
+		mv live live-shared
+	fi
+
+	use static-libs && cp "${FILESDIR}/config.gentoo" live-static
+	cp "${FILESDIR}/config.gentoo-so-r1" live-shared
+
+	case ${CHOST} in
+		*-solaris*)
+			use static-libs && { sed -i \
+				-e '/^COMPILE_OPTS /s/$/ -DSOLARIS/' \
+				-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
+				live-static/config.gentoo \
+				|| die ; }
+			sed -i \
+				-e '/^COMPILE_OPTS /s/$/ -DSOLARIS/' \
+				-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
+				live-shared/config.gentoo-so-r1 \
+				|| die
+		;;
+		*-darwin*)
+			use static-libs && { sed -i \
+				-e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
+				-e '/^LINK /s/$/ /' \
+				-e '/^LIBRARY_LINK /s/$/ /' \
+				-e '/^LIBRARY_LINK_OPTS /s/-Bstatic//' \
+				live-static/config.gentoo \
+				|| die static ; }
+			sed -i \
+				-e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
+				-e '/^LINK /s/$/ /' \
+				-e '/^LIBRARY_LINK /s/=.*$/= $(CXX) -o /' \
+				-e '/^LIBRARY_LINK_OPTS /s:-shared.*$:-undefined suppress -flat_namespace -dynamiclib -install_name '"${EPREFIX}/usr/$(get_libdir)/"'$@:' \
+				live-shared/config.gentoo-so-r1 \
+				|| die shared
+		;;
+	esac
+}
+
+src_configure() { :; }
+
+src_compile() {
+	tc-export CC CXX LD
+
+	# Still build the old synchronous interface as mplayer still needs it.
+	# Please drop me at some point!
+	append-flags '-DRTSPCLIENT_SYNCHRONOUS_INTERFACE'
+
+	if use static-libs ; then
+		cd "${WORKDIR}/live-static"
+
+		einfo "Beginning static library build"
+		./genMakefiles gentoo
+		emake -j1 LINK_OPTS="-L. $(raw-ldflags)" || die "failed to build static libraries"
+	fi
+
+	cd "${WORKDIR}/live-shared"
+	einfo "Beginning shared library build"
+	./genMakefiles gentoo-so-r1
+	local suffix=$(get_libname ${LIVE_ABI_VERSION})
+	emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="${suffix#.}" || die "failed to build shared libraries"
+
+	for i in liveMedia groupsock UsageEnvironment BasicUsageEnvironment ; do
+		pushd "${WORKDIR}/live-shared/${i}" > /dev/null
+		ln -s lib${i}.${suffix#.} lib${i}$(get_libname) || die
+		popd > /dev/null
+	done
+
+	einfo "Beginning programs build"
+	for i in $(use examples && echo "testProgs") proxyServer mediaServer ; do
+		cd "${WORKDIR}/live-shared/${i}"
+		emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build test programs"
+	done
+}
+
+src_install() {
+	for library in UsageEnvironment liveMedia BasicUsageEnvironment groupsock; do
+		use static-libs && dolib.a live-static/${library}/lib${library}.a
+		dolib.so live-shared/${library}/lib${library}$(get_libname ${LIVE_ABI_VERSION})
+		dosym lib${library}$(get_libname ${LIVE_ABI_VERSION}) /usr/$(get_libdir)/lib${library}$(get_libname)
+
+		insinto /usr/include/${library}
+		doins live-shared/${library}/include/*h
+	done
+
+	# Should we really install these?
+	use examples && find live-shared/testProgs -type f -perm +111 -print0 | \
+		xargs -0 dobin
+
+	dobin live-shared/mediaServer/live555MediaServer
+	dobin live-shared/proxyServer/live555ProxyServer
+
+	# install docs
+	dodoc live-shared/README
+}