ohnobinki_overlay Changeset - 5aec9d013452

Changeset - 5aec9d013452

Parent rev.

Child rev.

[Not reviewed]

default

1 4 1

Nathan Brink (binki) - 14 years ago 2011-03-24 19:22:57
ohnobinki@ohnopublishing.net

media-plugins/live: Match live ebuild up more closely with the gentoo-x86-cvs version. Drop live-2009.06.02. Fix building live without live being previously installed (was trying to link against previously-installed live libraries).

(Portage version: 2.2.0_alpha27-r1/hg/Linux x86_64, signed Manifest commit with key 6BA81050)

6 files changed with 85 insertions and 154 deletions:

media-plugins/live/ChangeLog

media-plugins/live/Manifest

media-plugins/live/files/config.gentoo

media-plugins/live/files/config.gentoo-so-r1

media-plugins/live/live-2009.06.02.ebuild

media-plugins/live/live-2011.01.24.ebuild

0 comments (0 inline, 0 general)

media-plugins/live/ChangeLog

➞

Show inline comments

@@ @@ -2,6 +2,13 @@ @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/media-plugins/live/ChangeLog,v 1.126 2010/01/06 16:55:17 ranger Exp $
 Mar 2011; Nathan Phillip Brink (binki) <ohnobinki@ohnopublishing.net>
   -live-2009.06.02.ebuild, live-2011.01.24.ebuild, files/config.gentoo,
   +files/config.gentoo-so-r1:
   Match live ebuild up more closely with the gentoo-x86-cvs version. Drop
   live-2009.06.02. Fix building live without live being previously installed
   (was trying to link against previously-installed live libraries).
 Feb 2011; Nathan Phillip Brink (binki) <ohnobinki@ohnopublishing.net>
   live-2009.06.02.ebuild, live-2011.01.24.ebuild:
   Fix missing dependencies on sys-devel/libtool which caused novae a

media-plugins/live/Manifest

➞

Show inline comments

 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 AUX config.gentoo 883 RMD160 7e6abf65cc60bbd409d4b10004eeb66dc91fa019 SHA1 0c1c2394d75f2a6beb3c7c540df96d4720232510 SHA256 6d5b8f14b5ede4e04835730fe9ffc6246774c7cb10891cbb6337f567eff4f079
 AUX config.gentoo 547 RMD160 db872641e2a0f3352554c15a7f561894fdb2aa37 SHA1 add31e3f3888906ad6ce8178735cad0d08a0e510 SHA256 51b798a297e16fe7cc281471671c64e123a1588108fbbf87a974b73b0b50c0dd
 AUX config.gentoo-so-r1 601 RMD160 3ee8f50dd9466449057df6022994bff76b6a99db SHA1 b9e045681ffad767c2483d5ede7dd7109b54b231 SHA256 eb33f62e18b8e847d5730bd31f2b22e99339d46cfa32750233df959743aec313
 AUX live-2009.06.02-as-needed.patch 2046 RMD160 0b3d76de9a4e3204270f9a6d302f30dfaa35e231 SHA1 c123bf94e44e1956586038e98b54b66fad42e129 SHA256 91a6686066fb66d191ae715b30e21b1df26546cd07aa3a4ce3280521a90739da
 AUX live-2009.06.02-buildorder.patch 924 RMD160 a9a6a7a364b21b43859e35e6e023715bb0fad7dd SHA1 f86fa92a48572bb89b4a6a38c6aed4edd4d098de SHA256 59a91ecbbcdda7f62f7150962490333bbb67e2ee838ff9c6e334dd5d0ab20813
 AUX live-2009.06.02-libdeps.patch 2803 RMD160 37d3e1479e742e73d9694678f0c2628ece430725 SHA1 1c8f0ae1092bf57d322361c168e70d60bafd0442 SHA256 ba29f92495d18c0620fbda9d3797cf5871fb22443a242f982a854b892a309903
 AUX live-2009.09.28-buildorder.patch 1060 RMD160 cd6a6c2e699eaae0c5b5a40959c988ed3e74745a SHA1 5fdeea464948f31dcb4a6948394f74b67e502428 SHA256 f280a8cade00530cdd009cf1f999df6ff0d5f6c53cae78e12e84a8dc6461b2aa
 AUX live-recursive.patch 433 RMD160 f70734114f7423f48693f71c5b0f0ae85c337090 SHA1 87526904f6e69696f6fbf41a2313f1a43c51871a SHA256 6347a54046cf02671666bf74a3dbb54ebb898adafe9670abecebe86e6d870288
 DIST live.2009.06.02.tar.gz 469471 RMD160 ddbe057ac4f47d66ee7c99ec3c4886fe97f06565 SHA1 a03ac47dc1b2a5e4745e30fc304af61675036782 SHA256 66c54241bfcc7ea42fe40e1c93739be79a3c065390c4163c0f2647ac45c24758
 DIST live.2011.01.24.tar.gz 480478 RMD160 2c029b276fc382f0e483fe769a021b2b280e8ed6 SHA1 94545798f1b700d6e30c4b132d7bcff4d5d14db8 SHA256 7c98cf1db4ba1015645f6e4f5f51442b0d54eb76a8f477737aded58a5dc2bd42
 EBUILD live-2009.06.02.ebuild 2549 RMD160 76d8f7c15a7a30d461d4454aaaaadc8dae45c348 SHA1 45399140d16fe98f857081b8842872165b793571 SHA256 4112e1f6bac3f02b62007fb5ff501bd1d0d3b1c337c8051a0b55fb714927309c
 EBUILD live-2011.01.24.ebuild 3736 RMD160 da17394e4e51a041e5bfe28e7e1e20e196b1470e SHA1 3bc0856690a88e508218514f2f5a18615211df73 SHA256 ef52b717ee4bf9ba8140998aedf9d658fa07811a14a2f8b62924a0aaffae25ea
 MISC ChangeLog 17436 RMD160 14afadd38cc08d83c36d4608f92836c59d36301d SHA1 25533fe308c0b627eaf424d22a08ea2ab07ea91f SHA256 d9f979c9ea3d0f0a4271610c10e91c86f9642119fc7b0ce9c1dcfb424140cd8c
 EBUILD live-2011.01.24.ebuild 3738 RMD160 778f8a2465714ec12d1e9380cf5565dd4a07bf67 SHA1 42f0e81ae7ec996af36ca6f67538333dee3ec5b6 SHA256 dce3783ecdb2c97880925322226ccf14105bd21556d3832303fa7df0f704bf8c
 MISC ChangeLog 17833 RMD160 6130c7b98444e909810e886c15c05bf7683b6459 SHA1 312aa1aeeb27aefcb7109bea9c35f0371a24d684 SHA256 3e54ea63d2ea9571e36f92b634f0e899bd284e0ce1f75f8fd9e910cbae86342e
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 iQIcBAEBCAAGBQJNZIUyAAoJEHQ6UuhrqBBQGdUQAKmG5gJZbSUR6af43ZIIkkhv
 ziA4BRh7vNgD7usVndyGXBXvW/1R2wB0RsaXV4+tUt12vLCrWXjK1Qhkz8myozaM
 F+IaagAdTnrPvB4ic4UnoYJzycPZZlaNsFolwsGylwCYg+LK7simNbeEvmHRWmB
 luK+jZfzTCG3F+d8fDHv/IsxtAmeLTfTnhDOOaOBTka64uCYBk/Stm4tyuOkeqT
 Xcy9Yw3+4vUwzfgBMoBvruiKmdw4O5lxtPzDTtQHzusX3k7yjvNDpO9RB2qBSpC2
 +QCW329tBsvRREuynk/t6BYlrKfHC5gOmLuRfjOkygzAXaz0CSdpQIbnMx+QImlS
 M13vU3M5aueSyYAhIYc/hvH/BI1NjJPecuqoPRbNNssOa4Zsnoluz6zImoBoP6om
 gsbBF9TAvc+T6lpbK9A62bCRwgs3aGHGWU5DayfMg9CYaGIaTdV5y2T7yvb4KBK/
 rcRPmxdAjNJEWds6y3TYgaEJpK6MVlUsu/6Wrt4MwkoX/AkCt41BEwGFChej4fds
 QOVhsTJ5LLB0s5IGvnEEDXPLc3/D5O5fgtyi2chKteNPqTZcguRQcfm3mS2+iIV4
 bjeQPxT+sQE1lc5TTGVrA8bETDG076lIgY1OQg5fpHdgiP4cjz9pa+ONk5mAhb3P
 /H5QdDrA9P8GdAJZh5tW
 =vs8T
 iQIcBAEBCAAGBQJNi9JQAAoJEHQ6UuhrqBBQ8tAP/RlwFaRFILJVXtFhPymvNx7I
 ZYky7uE9UZ96Isrfc0YqJhGFgoD7Y9FhYKyuxrJUEXIVKT3L/5ngo8Dd6V7x1kAc
 v8fE8XpHOHLZMK4vvSmfbxGK2c4yTu0Run2cKOFMo7+FBJgYRPq/AeBJA1GCiHTl
 DkQJButKFl/bX9GHtYarkFGN1+6VcYadaPg9gx1j4xv9uDg/HzX/c3WdRbkBA2/X
 RW0J6oAh/VIOu6wdHxWRWCxnoy2SndSazjZfd3RIUcUrGJO0mx2wMn443vucAx2V
 YTb8OOYdKiws0y9vyP4VwIu/etPmmabbuCOKEDd8Drdn7GJoBoRkJ2EeOJTyUF8
 yTFkTyEo1yP+pmaxcNGri/DIpIF5zH3q0tjyltX67bWeMu9vNEFmNv4uT9OGnI6x
 XBJV/7P0CvXKM4vvVv+zjnr2Hn7TOeatSw0sGGmqVOTZicCUV9cmKbmmQBVoQqpy
 zU+qidK+32VPqMFucGdkSghWUKQhgWtA4t7jAZxErjLoH/gcuwkYchBiaYIHrlix
 JlB/tQBVcKGwzPZYDwpBIIeoQLJYv4L/Opdxlo/xq6guRlS+PMYFZ35gZVw/opyi
 gtipRhtxSfy3ereb5sT5mWNI/8W+eBkBf1zIceUJELmp4memh4jVt39XuaZpUdZq
 eUa1eH/PwZbpsJhrJx8q
 =erDx
 -----END PGP SIGNATURE-----

media-plugins/live/files/config.gentoo

➞

Show inline comments

 LIBTOOL_WRAPPER =	libtool --tag=CXX
 COMPILE_OPTS =		$(INCLUDES) -I. -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
 COMPILE_OPTS =		$(INCLUDES) -I. -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 $(CPPFLAGS)
 C =			c
-C_COMPILER =		$(LIBTOOL_WRAPPER) --mode=compile $(CC)
 C_COMPILER =		$(CC)
 C_FLAGS =		$(COMPILE_OPTS) $(CFLAGS)
 CPP =			cpp
-CPLUSPLUS_COMPILER =	$(LIBTOOL_WRAPPER) --mode=compile $(CXX)
 CPLUSPLUS_COMPILER =	$(CXX)
 CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) $(CXXFLAGS)
 OBJ =			lo
 LINK =			$(LIBTOOL_WRAPPER) --mode=link $(CXX) -o
 LINK_OPTS =		$(CXXFLAGS) $(LDFLAGS)
 OBJ =			o
 LINK =			$(CXX) -o
 LINK_OPTS =		$(CXXFLAGS) $(LDFLAGS) -L.
 CONSOLE_LINK_OPTS =	$(LINK_OPTS)
 LIBRARY_LINK =		$(LIBTOOL_WRAPPER) --mode=link $(CXX) -version-info $(LIVE_ABI_VERSION) -rpath $(LIBDIR) -o
 LIBRARY_LINK_OPTS =	$(LINK_OPTS)
 LIB_SUFFIX =		la
 LIBRARY_LINK =		$(CXX) -o
 LIBRARY_LINK_OPTS =	$(LINK_OPTS) -r -static -nostdlib
 LIB_SUFFIX =		a
 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) $<

media-plugins/live/files/config.gentoo-so-r1

➞

Show inline comments

@@ new file 100644 @@
 COMPILE_OPTS =		$(INCLUDES) -I. -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 $(CPPFLAGS)
 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 =		$(CXXFLAGS) $(LDFLAGS) -L.
 CONSOLE_LINK_OPTS =	$(LINK_OPTS)
 LIBRARY_LINK =		$(CXX) -o
 LIBRARY_LINK_OPTS =	$(LINK_OPTS) -shared -Wl,-soname=$@.$(LIVE_ABI_VERSION),-rpath,'$(LIBDIR)'
 LIB_SUFFIX =		so
 LIBS_FOR_CONSOLE_APPLICATION =
 LIBS_FOR_GUI_APPLICATION =
 EXE =
 INSTALL =		install -c

media-plugins/live/live-2009.06.02.ebuild

➞

Show inline comments

deleted file

media-plugins/live/live-2011.01.24.ebuild

➞

Show inline comments

@@ @@ -4,7 +4,7 @@ @@
 EAPI="3"
-inherit eutils flag-o-matic eutils toolchain-funcs multilib
 inherit eutils eutils toolchain-funcs multilib
 DESCRIPTION="Standards-based RTP/RTCP/RTSP multimedia streaming for embedded streaming applications"
 HOMEPAGE="http://www.live555.com/"
@@ @@ -13,12 +13,9 @@ SRC_URI="http://www.live555.com/liveMedi @@
 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="static-libs"
 IUSE=""
 DEPEND="sys-devel/libtool:2"
 RDEPEND=""
 S=${WORKDIR}/${PN}
 S=${WORKDIR}
 # Alexis Ballier <aballier@gentoo.org>
 # Be careful, bump this everytime you bump the package and the ABI has changed.
@@ @@ -26,14 +23,18 @@ S=${WORKDIR}/${PN} @@
 LIVE_ABI_VERSION=3
 src_prepare() {
 	cp "${FILESDIR}"/config.gentoo ./ || die
 	cp -pPR live live-shared || die
 	mv live live-static || die
 	cp "${FILESDIR}"/config.gentoo live-static/ || die
 	cp "${FILESDIR}"/config.gentoo-so-r1 live-shared/ || die
 	cd "${WORKDIR}"/${PN}-shared || die
 	epatch "${FILESDIR}"/${PN}-2009.09.28-buildorder.patch
 	epatch "${FILESDIR}"/${PN}-2009.06.02-libdeps.patch
 	epatch "${FILESDIR}"/${PN}-recursive.patch
 	cd "${WORKDIR}" || die
 	# copied from portage's live-2009-11.*.ebuild ->
 	# live-2010.04.09.ebuild diff, not gauranteed to work. Please file
 	# bugs at http://ohnopub.net/bugzilla against ohnobinki_overlay.
 	case ${CHOST} in
 		*-solaris*)
 			sed -i \
@@ @@ -41,7 +42,7 @@ src_prepare() { @@
 				-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
 				live-static/config.gentoo \
 				live-shared/config.gentoo-so-r1 \
-				|| die "Please file bug at http://ohnopub.net/bugzilla"
 				|| die
 		;;
 		*-darwin*)
 			sed -i \
@@ @@ -50,63 +51,62 @@ src_prepare() { @@
 				-e '/^LIBRARY_LINK /s/$/ /' \
 				-e '/^LIBRARY_LINK_OPTS /s/-Bstatic//' \
 				live-static/config.gentoo \
-				|| die "static Please file bug at http://ohnopub.net/bugzilla"
 				|| 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 Please file bug at http://ohnopub.net/bugzilla"
 				|| die shared
 		;;
 	esac
+}
 src_configure() {
 	tc-export CC CXX
 	export LIVE_ABI_VERSION LIBDIR=/usr/$(get_libdir)
+	export LIVE_ABI_VERSION LIBDIR=/usr/"$(get_libdir)"
 	if ! use static-libs; then
 		append-flags -shared
 		append-ldflags -shared
 	fi
 	cd "${WORKDIR}"/${PN}-static || die
 	./genMakefiles gentoo
 	./genMakefiles gentoo
 	cd "${WORKDIR}"/${PN}-shared || die
 	./genMakefiles gentoo-so-r1
+}
 src_compile() {
 	einfo "Beginning library build"
 	emake -j1 || die "failed to build libraries"
 	einfo "Beginning static library build"
 	emake -C ${PN}-static -j1 || die "failed to build static libraries"
 	einfo "Beginning shared library build"
 	emake -C ${PN}-shared -j1 || die "failed to build shared libraries"
 	einfo "Beginning programs build"
 	emake -C testProgs || die "failed to build test programs"
 	emake -C mediaServer || die "failed to build the mediaserver"
 	emake -C ${PN}-shared/testProgs || die "failed to build test programs"
 	emake -C ${PN}-shared/mediaServer || die "failed to build the mediaserver"
+}
 src_install() {
 	dodir /usr/{$(get_libdir),bin} || die
 	for library in UsageEnvironment liveMedia BasicUsageEnvironment groupsock; do
-		libtool --mode=install install -c ${library}/lib${library}.la "${ED}"/usr/$(get_libdir)/ || die
+		dolib.a ${PN}-static/${library}/lib${library}.a || die
 		if ! use static-libs; then
 			# make tommy happy --ohnobinki
 			rm -v "${ED}"/usr/$(get_libdir)/lib${library}.la || die
 		fi
 		mv ${PN}-shared/${library}/lib${library}.so{,.${LIVE_ABI_VERSION}} || die
 		dolib.so ${PN}-shared/${library}/lib${library}.so.${LIVE_ABI_VERSION} || die
 		dosym lib${library}.so.${LIVE_ABI_VERSION} /usr/$(get_libdir)/lib${library}.so || die
 		insinto /usr/include/${library}
 		doins ${library}/include/*h || die
+		doins ${PN}-shared/${library}/include/*h || die
 	done
 	# Should we really install these?
 	find testProgs -type f -perm +111 \
 		-exec libtool --mode=install install -c '{}' "${ED}"/usr/bin/ \; || die
 	dobin $(find ${PN}-shared/testProgs -type f -perm +111) || die
 	#install included live555MediaServer aplication
-	libtool --mode=install install -c mediaServer/live555MediaServer "${ED}"/usr/bin/ || die
+	dobin ${PN}-shared/mediaServer/live555MediaServer || die
 	# install docs
 	dodoc README || die
+	dodoc ${PN}-shared/README || die
+}
 pkg_postinst() {

0 comments (0 inline, 0 general)