[patch] mediastreamer-2.9.0.ebuild.diff

mediastreamer-2.9.0.ebuild.diff (text/plain), 4.40 KB, created by Julian Ospald on 2013-10-09 17:07:03 UTC

--- media-libs/mediastreamer/mediastreamer-2.8.2.ebuild
+++ media-libs/mediastreamer/mediastreamer-2.9.0.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/mediastreamer-2.8.2.ebuild,v 1.10 2013/06/29 19:23:31 ago Exp $
 
-EAPI="4"
+EAPI=5
 
-inherit autotools eutils multilib
+inherit autotools eutils
 
 DESCRIPTION="Mediastreaming library for telephony application"
 HOMEPAGE="http://www.linphone.org/"
@@ -12,13 +12,13 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 # Many cameras will not work or will crash an application if mediastreamer2 is
 # not built with v4l2 support (taken from configure.ac)
 # TODO: run-time test for ipv6: does it really need ortp[ipv6] ?
-IUSE="+alsa amr bindist coreaudio debug doc examples g726 g729 gsm ilbc
-	ipv6 oss portaudio pulseaudio sdl silk +speex static-libs theora v4l
-	video x264 X"
+IUSE="+alsa amr bindist coreaudio debug doc examples +filters g726 g729 gsm ilbc
+	ipv6 ntp-timestamp opus +ortp oss pcap portaudio pulseaudio sdl silk +speex
+	static-libs theora upnp v4l video x264 X"
 
 REQUIRED_USE="|| ( oss alsa portaudio coreaudio pulseaudio )
 	video? ( || ( sdl X ) )
@@ -26,13 +26,16 @@
 	X? ( video )
 	v4l? ( video )"
 
-RDEPEND=">=net-libs/ortp-0.17[ipv6?]
-	alsa? ( media-libs/alsa-lib )
+RDEPEND="alsa? ( media-libs/alsa-lib )
 	g726? ( >=media-libs/spandsp-0.0.6_pre1 )
 	gsm? ( media-sound/gsm )
+	opus? ( media-libs/opus )
+	ortp? ( >=net-libs/ortp-0.17[ipv6?] )
+	pcap? ( sys-libs/libcap )
 	portaudio? ( media-libs/portaudio )
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.21 )
 	speex? ( >=media-libs/speex-1.2_beta3 )
+	upnp? ( net-libs/libupnp )
 	video? (
 		virtual/ffmpeg
 		v4l? ( media-libs/libv4l
@@ -44,8 +47,8 @@
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig
-	x11-proto/videoproto
-	doc? ( app-doc/doxygen )"
+	doc? ( app-doc/doxygen )
+	X? ( x11-proto/videoproto )"
 
 PDEPEND="amr? ( !bindist? ( media-plugins/mediastreamer-amr ) )
 	g729? ( !bindist? ( media-plugins/mediastreamer-bcg729 ) )
@@ -54,30 +57,40 @@
 	silk? ( !bindist? ( media-plugins/mediastreamer-silk ) )"
 
 src_prepare() {
+	# variable causes "command not found" warning and is not
+	# needed anyway
+	sed -i \
+		-e 's/$(ACLOCAL_MACOS_FLAGS)//' \
+		Makefile.am || die
+
 	# respect user's CFLAGS
-	sed -i -e "s:-O2::;s: -g::" configure.ac || die "patching configure.ac failed"
+	sed -i \
+		-e "s:-O2::;s: -g::" \
+		configure.ac || die "patching configure.ac failed"
 
 	# change default paths
-	sed -i -e "s:\(\${prefix}/\)lib:\1$(get_libdir):" \
-		-e "s:\(prefix/share\):\1/${PN}:" configure.ac \
-		|| die "patching configure.ac failed"
+	sed -i \
+		-e "s:\(prefix/share\):\1/${PN}:" \
+		configure.ac || die "patching configure.ac failed"
 
-	# fix html doc installation dir
-	sed -i -e "s:\$(pkgdocdir):\$(docdir):" help/Makefile.am \
-		|| die "patching help/Makefile.am failed"
-	sed -i -e "s:\(doc_htmldir=\).*:\1\$(htmldir):" help/Makefile.am \
-		|| die "patching help/Makefile.am failed"
+	# fix doc installation dir
+	sed -i \
+		-e "s:\$(pkgdocdir):\$(docdir):" \
+		help/Makefile.am || die "patching help/Makefile.am failed"
+
+	# fix html installation dir
+	sed -i \
+		-e "s:\(doc_htmldir=\).*:\1\$(htmldir):" \
+		help/Makefile.am || die "patching help/Makefile.am failed"
+
+	# linux/videodev.h dropped in 2.6.38
+	sed -i \
+		-e 's:linux/videodev.h ::' \
+		configure.ac || die
 
 	epatch "${FILESDIR}/${P}-v4l-automagic.patch" \
-		"${FILESDIR}/${P}-autopoint.patch" \
-		"${FILESDIR}/${P}-ffmpeg-1.0.patch" \
-		"${FILESDIR}/${P}-libav9.patch"
-
-	# linux/videodev.h dropped in 2.6.38
-	sed -i -e 's:linux/videodev.h ::' configure.ac || die
-
-	# don't build examples in tests/
-	sed -i -e "/SUBDIRS/s/ tests//" Makefile.in || die
+		"${FILESDIR}/${P}-libav9.patch" \
+		"${FILESDIR}/${P}-underlinking.patch"
 
 	eautoreconf
 }
@@ -97,14 +110,20 @@
 		$(use_enable pulseaudio)
 		$(use_enable coreaudio macsnd)
 		$(use_enable debug)
+		$(use_enable filters)
 		$(use_enable g726 spandsp )
 		$(use_enable gsm)
 		$(use_enable ipv6)
+		$(use_enable ntp-timestamp)
+		$(use_enable opus)
+		$(use_enable ortp)
 		$(use_enable oss)
+		$(use_enable pcap)
 		$(use_enable portaudio)
 		$(use_enable speex)
 		$(use_enable static-libs static)
 		$(use_enable theora)
+		$(use_enable upnp)
 		$(use_enable video)
 		$(use_enable v4l)
 		$(use_enable v4l libv4l2)