Version bump, now build both static and shared libraries, and install in proper place...

Package-Manager: portage-2.1.2_rc4-r2

diff --git a/media-plugins/live/ChangeLog b/media-plugins/live/ChangeLog
index 84bc27fdf5cfddd9328f3071c026018c79426fd2..1a4a04b3195e98b569a02f0b3b1e0313badf7edd 100644 (file)
--- a/media-plugins/live/ChangeLog
+++ b/media-plugins/live/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-plugins/live
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/live/ChangeLog,v 1.66 2006/12/30 15:20:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/live/ChangeLog,v 1.67 2006/12/30 20:17:33 flameeyes Exp $
+
+*live-2006.12.08 (30 Dec 2006)
+
+  30 Dec 2006; Diego Pettenò <flameeyes@gentoo.org> +files/config.gentoo,
+  +files/config.gentoo-so, +live-2006.12.08.ebuild:
+  Version bump, now build both static and shared libraries, and install in
+  proper places, rather than mimic the structure of the buildtree. MPlayer and
+  mimd needs to be fixed to build with this version.
 
   30 Dec 2006; Diego Pettenò <flameeyes@gentoo.org> -files/gcc-3.3.patch,
   -live-2004.03.27.ebuild, -live-2004.07.20.ebuild, -live-2004.09.30.ebuild,

diff --git a/media-plugins/live/Manifest b/media-plugins/live/Manifest
index a696352411f8011a5619bfc3a20435570f1a2281..cf9ebb561ef4b55b3d4384595ad0cf03f8800c11 100644 (file)
--- a/media-plugins/live/Manifest
+++ b/media-plugins/live/Manifest
@@ -1,19 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX config.gentoo 457 RMD160 02c09c562e54602733ad4ac09d263e5be55a27f0 SHA1 27aed0b3a1240b91cb2bf5d7919e9091d9558ce6 SHA256 999143f7cc162d757eb08350d7327ead27083cbc7aa6bb3f9b89bc2174048edc
+MD5 d0c2d7e2b89570d08bda7753948076ad files/config.gentoo 457
+RMD160 02c09c562e54602733ad4ac09d263e5be55a27f0 files/config.gentoo 457
+SHA256 999143f7cc162d757eb08350d7327ead27083cbc7aa6bb3f9b89bc2174048edc files/config.gentoo 457
+AUX config.gentoo-so 481 RMD160 75fe3f56e6bdd95a6e6e226353f059f145466964 SHA1 13d3e4f838f9e216e3e4ea8b607b30d1249465b3 SHA256 59ed4c3334aebb7fba88390a7abaea298e26fa8611ea81ef2a2d9dc7be9e603e
+MD5 5dcef175aef5f50178919ae5c21dc17e files/config.gentoo-so 481
+RMD160 75fe3f56e6bdd95a6e6e226353f059f145466964 files/config.gentoo-so 481
+SHA256 59ed4c3334aebb7fba88390a7abaea298e26fa8611ea81ef2a2d9dc7be9e603e files/config.gentoo-so 481
 AUX live-gcc41.patch 881 RMD160 b57c631f3d0128529bbf64749ada681434a71e0f SHA1 6d490db06405b495c5f42df8726f17d0d38f192f SHA256 79b588693dcd1a42d3e1bae4473c5e922402158d1e5adb593c55fbcdf5c3516e
 MD5 9d2b18645c4c808930c5f6d1f44b835e files/live-gcc41.patch 881
 RMD160 b57c631f3d0128529bbf64749ada681434a71e0f files/live-gcc41.patch 881
 SHA256 79b588693dcd1a42d3e1bae4473c5e922402158d1e5adb593c55fbcdf5c3516e files/live-gcc41.patch 881
 DIST live.2005.11.11.tar.gz 414485 RMD160 287277496f550d025e0263f44c2233dd3bc0b565 SHA1 907d24302d96bdc1c0e9914be179f96450497158 SHA256 48e900b8cbbd5b648464e15f2ad1612802967e1ad33b4b981533a34040b322e3
+DIST live.2006.12.08.tar.gz 424941 RMD160 be9a248f5ef0bff33f8c41af1e0f09ef5a2dcff2 SHA1 c25d34fa389654d2559bf4d43c9f2addf5e2dc82 SHA256 62f2f852d3459353bef27d8c35f929d105673917df685366495bf77125ab1eda
 EBUILD live-2005.11.11.ebuild 2001 RMD160 74464a9c2edc768d4a65068ea8dd3cc9c860035e SHA1 f786d2e7035f686b57e41a905500e8a8bcdf4814 SHA256 e499689c82bf304e7ca2aabf1b55fb2c715e45ebabc7bb4b29b38a0f2afb17f4
 MD5 d4057428f8e56c643f02912e79835600 live-2005.11.11.ebuild 2001
 RMD160 74464a9c2edc768d4a65068ea8dd3cc9c860035e live-2005.11.11.ebuild 2001
 SHA256 e499689c82bf304e7ca2aabf1b55fb2c715e45ebabc7bb4b29b38a0f2afb17f4 live-2005.11.11.ebuild 2001
-MISC ChangeLog 7937 RMD160 86b49c86f0787a4dc4779dd9fccbf4058d645f49 SHA1 7c6bba99b891704ef7ec5543f00ba9d5860970a7 SHA256 9e1b891ce868417ac4d1bfe362813ec274e80175cbf47fb49dd039a167fbdddd
-MD5 f4b7e5c0fdb09155785de748decda4dd ChangeLog 7937
-RMD160 86b49c86f0787a4dc4779dd9fccbf4058d645f49 ChangeLog 7937
-SHA256 9e1b891ce868417ac4d1bfe362813ec274e80175cbf47fb49dd039a167fbdddd ChangeLog 7937
+EBUILD live-2006.12.08.ebuild 1538 RMD160 104aafe1366621f19ab777b7b101698e8a22cd3d SHA1 b03bb040e84ef4ea8bb5bca39c8aad0a00af480f SHA256 d913ac8a2d62d82e1cf19b81df8555e06600a677c44cfbf864accef7d66a42d5
+MD5 cf1a215fc2dc682320a2bd255f99e774 live-2006.12.08.ebuild 1538
+RMD160 104aafe1366621f19ab777b7b101698e8a22cd3d live-2006.12.08.ebuild 1538
+SHA256 d913ac8a2d62d82e1cf19b81df8555e06600a677c44cfbf864accef7d66a42d5 live-2006.12.08.ebuild 1538
+MISC ChangeLog 8304 RMD160 0392a358e748de87479632cf30b03b5b92cef095 SHA1 07580aefbd6bf1d82b304e16bcb00dde3304b903 SHA256 f444e6a8b86f9734b96ca4b8d0672d4464ce5efd3b44ff43a16058438d78c74d
+MD5 97e5d0727b0c5822de637b9d571e218a ChangeLog 8304
+RMD160 0392a358e748de87479632cf30b03b5b92cef095 ChangeLog 8304
+SHA256 f444e6a8b86f9734b96ca4b8d0672d4464ce5efd3b44ff43a16058438d78c74d ChangeLog 8304
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d metadata.xml 225
@@ -21,10 +34,13 @@ SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 metadata
 MD5 9f4a58a61b3b66b77d5409d9a250bc6f files/digest-live-2005.11.11 247
 RMD160 cb237c31a78e377deb279d1995e28aaf88acda8c files/digest-live-2005.11.11 247
 SHA256 ad2d80ea4b8edca8af6694f34b777afe3d7d3670d4951af28da85153a2abb029 files/digest-live-2005.11.11 247
+MD5 6ed681ff436043bec1757bee88b71932 files/digest-live-2006.12.08 247
+RMD160 b2bff5759d235f9af320dad2469e749338ea0938 files/digest-live-2006.12.08 247
+SHA256 5051b7f3ff2cc50df754535ef8ba49d13adaae97a68001d8a2bd6361571c6b4f files/digest-live-2006.12.08 247
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFloPjAiZjviIA2XgRArR4AKCS+OxlD/v2gzc1yYXvx/kkq2U0TgCfZ8pM
-n5zQi7QiR6oJZQ9TJPbfUVo=
-=7djJ
+iD8DBQFFlslkAiZjviIA2XgRAgC5AJ47zeyLCSYFM0PaxOgOSrZ0DGjLZwCfVFp1
+CQwwfr5ON11N9BR2gwoW4aY=
+=Kc/I
 -----END PGP SIGNATURE-----

diff --git a/media-plugins/live/files/config.gentoo b/media-plugins/live/files/config.gentoo
new file mode 100644 (file)
index 0000000..09d8427
--- /dev/null
+++ b/media-plugins/live/files/config.gentoo
@@ -0,0 +1,17 @@
+COMPILE_OPTS =         $(INCLUDES) -I. -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1
+C =                    c
+C_COMPILER =           $(CC)
+C_FLAGS =              $(COMPILE_OPTS) $(CFLAGS)
+CPP =                  cpp
+CPLUSPLUS_COMPILER =   $(CXX)
+CPLUSPLUS_FLAGS =      $(COMPILE_OPTS) $(CXXFLAGS)
+OBJ =                  o
+LINK =                 $(CXX) -o
+LINK_OPTS =            -L.
+CONSOLE_LINK_OPTS =    $(LINK_OPTS)
+LIBRARY_LINK =         $(LD) -o
+LIBRARY_LINK_OPTS =    $(LINK_OPTS) -r -Bstatic
+LIB_SUFFIX =                   a
+LIBS_FOR_CONSOLE_APPLICATION =
+LIBS_FOR_GUI_APPLICATION =
+EXE =

diff --git a/media-plugins/live/files/config.gentoo-so b/media-plugins/live/files/config.gentoo-so
new file mode 100644 (file)
index 0000000..df73c71
--- /dev/null
+++ b/media-plugins/live/files/config.gentoo-so
@@ -0,0 +1,17 @@
+COMPILE_OPTS =         $(INCLUDES) -I. -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1
+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 --git a/media-plugins/live/files/digest-live-2006.12.08 b/media-plugins/live/files/digest-live-2006.12.08
new file mode 100644 (file)
index 0000000..344d756
--- /dev/null
+++ b/media-plugins/live/files/digest-live-2006.12.08
@@ -0,0 +1,3 @@
+MD5 966bf45cbe43fae5df633296bf051cbd live.2006.12.08.tar.gz 424941
+RMD160 be9a248f5ef0bff33f8c41af1e0f09ef5a2dcff2 live.2006.12.08.tar.gz 424941
+SHA256 62f2f852d3459353bef27d8c35f929d105673917df685366495bf77125ab1eda live.2006.12.08.tar.gz 424941

diff --git a/media-plugins/live/live-2006.12.08.ebuild b/media-plugins/live/live-2006.12.08.ebuild
new file mode 100644 (file)
index 0000000..940dd5a
--- /dev/null
+++ b/media-plugins/live/live-2006.12.08.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/live/live-2006.12.08.ebuild,v 1.1 2006/12/30 20:17:33 flameeyes 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"
+IUSE=""
+
+S="${WORKDIR}"
+
+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 || die
+
+       cd "${WORKDIR}/live-shared"
+       einfo "Beginning shared library build"
+       ./genMakefiles gentoo-so
+       emake -j1 || die
+}
+
+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
+
+               insinto /usr/include/${library}
+               doins live-shared/${library}/include/*h
+       done
+
+       # Should we really install these?
+       find live-shared/testProgs -type f -perm +111 -print0 | \
+               xargs -0 dobin
+
+       # install docs
+       dodoc README
+}