Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 309681 | Differences between
and this patch

Collapse All | Expand All

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

Return to bug 309681