patched version of mediastreamer-2.2.3 with diff from bundled on in linphone-3.1.1

(Portage version: 2.1.6.7/cvs/Linux ppc)

4 files changed, 346 insertions, 1 deletions

diff --git a/media-libs/mediastreamer/ChangeLog b/media-libs/mediastreamer/ChangeLog
index 1fe5575f8849..21e878ea29d0 100644
--- a/media-libs/mediastreamer/ChangeLog
+++ b/media-libs/mediastreamer/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/mediastreamer
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/ChangeLog,v 1.6 2009/04/25 00:29:08 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/ChangeLog,v 1.7 2009/04/27 17:45:01 volkmar Exp $
+
+*mediastreamer-2.2.3_p1 (27 Apr 2009)
+
+  27 Apr 2009; Mounir Lamouri <volkmar@gentoo.org>
+  +files/mediastreamer-2.2.3_p1-arts.patch,
+  +files/mediastreamer-2.2.3_p1-autodeps.patch,
+  +mediastreamer-2.2.3_p1.ebuild:
+  Add mediastreamer-2.2.3 with diff from bundled on in linphone-3.1.1 to make it
+  working with it.
 
 *mediastreamer-2.2.3 (25 Apr 2009)
 
diff --git a/media-libs/mediastreamer/files/mediastreamer-2.2.3_p1-arts.patch b/media-libs/mediastreamer/files/mediastreamer-2.2.3_p1-arts.patch
new file mode 100644
index 000000000000..32837a0d9467
--- /dev/null
+++ b/media-libs/mediastreamer/files/mediastreamer-2.2.3_p1-arts.patch
@@ -0,0 +1,32 @@
+--- configure.ac.old	2009-04-26 11:59:41.000000000 -0400
++++ configure.ac	2009-04-26 12:00:24.000000000 -0400
+@@ -216,15 +216,11 @@
+ 	],[
+ 		dnl Old detection
+ 		if test x$artsc = xtrue ; then
+-			AC_CHECK_HEADERS(kde/artsc/artsc.h,
+-				[ AC_CHECK_LIB(artsc,arts_init, 
+-					[ ARTS_LIBS="-lartsc"
+-					arts_enabled=true
+-					])
+-				]
+-			)
++			 MS_CHECK_DEP([ARTS],[ARTS],[/usr/kde/3.5/include],[/usr/kde/3.5/lib],[artsc/artsc.h],[artsc],[arts_init])
++			 if test "$ARTS_found" = "yes"; then
++				 arts_enabled=true
++			 fi
+ 		fi
+-		AC_SUBST(ARTS_LIBS)
+ 	])
+ fi
+ 
+--- src/Makefile.am.old	2009-04-26 12:00:39.000000000 -0400
++++ src/Makefile.am	2009-04-26 12:01:03.000000000 -0400
+@@ -127,6 +127,7 @@
+                 $(ORTP_CFLAGS)   \
+ 		$(SPEEX_CFLAGS)  \
+ 		$(GSM_CFLAGS)    \
++		$(ARTS_CFLAGS)   \
+ 		$(STRICT_OPTIONS)
+ 
+ if BUILD_VIDEO
diff --git a/media-libs/mediastreamer/files/mediastreamer-2.2.3_p1-autodeps.patch b/media-libs/mediastreamer/files/mediastreamer-2.2.3_p1-autodeps.patch
new file mode 100644
index 000000000000..db6220b082db
--- /dev/null
+++ b/media-libs/mediastreamer/files/mediastreamer-2.2.3_p1-autodeps.patch
@@ -0,0 +1,168 @@
+--- configure.ac.old	2009-04-26 11:08:53.000000000 -0400
++++ configure.ac	2009-04-26 11:49:27.000000000 -0400
+@@ -49,8 +49,8 @@
+ 		wall_werror=yes
+ 	else
+ 		wall_werror=no
+-	fi
+-]
++	fi  
++]    
+ )
+ 
+ CFLAGS="-DORTP_INET6 $CFLAGS "
+@@ -152,6 +152,15 @@
+ 
+ found_sound=no
+ 
++AC_ARG_ENABLE(oss,
++      [  --enable-oss    Disable oss support],
++      [case "${enableval}" in
++        yes) oss=true ;;
++        no)  oss=false ;;
++        *) AC_MSG_ERROR(bad value ${enableval} for --disable-oss) ;;
++      esac],[oss=true])
++
++if "$oss" = "true"; then
+ AC_CHECK_HEADERS(soundcard.h sys/soundcard.h machine/soundcard.h sys/audio.h)
+ if test "${ac_cv_header_sys_soundcard_h}" = "yes" || \
+ 	test "${ac_cv_header_soundcard_h}" = "yes" || \
+@@ -159,6 +168,7 @@
+ 	test "${ac_cv_header_machine_soundcard_h}" = "yes"; then
+ 	found_sound=yes
+ fi
++fi
+ 
+ AM_CONDITIONAL(BUILD_OSS, test x$found_sound = xyes)
+ 
+@@ -280,6 +290,16 @@
+ 
+ AM_CONDITIONAL(BUILD_MACAQSND, test x$macaqsnd_enabled = xtrue)
+ 
++AC_ARG_ENABLE(jack,
++      [  --disable-jack    Disable jack support],
++      [case "${enableval}" in
++        yes) jack=true ;;
++        no)  jack=false ;;
++        *) AC_MSG_ERROR(bad value ${enableval} for --disable-jack) ;;
++      esac],[jack=true])
++
++if test x$jack = xtrue; then
++
+ dnl Check for samplerate libraries
+ dnl Check for jack libraries (sound output plugin)
+ PKG_CHECK_MODULES(JACK,jack >= 0.15.0, 
+@@ -306,6 +326,8 @@
+ AC_SUBST(JACK_CFLAGS)
+ AC_SUBST(JACK_LIBS) 
+ 
++fi
++
+ if test "$found_sound" = "no"; then
+ 	AC_MSG_ERROR([Could not find a support sound driver API])
+ fi
+@@ -315,6 +337,16 @@
+ dnl	check for various codecs libraries
+ dnl	*************************************
+ 
++AC_ARG_ENABLE(speex,
++      [  --disable-speex    Disable speex support],
++      [case "${enableval}" in
++        yes) speex=true ;;
++        no)  speex=false ;;
++        *) AC_MSG_ERROR(bad value ${enableval} for --disable-speex) ;;
++      esac],[speex=true])
++
++if test x$speex = xtrue; then
++
+ dnl check for installed version of speex
+ PKG_CHECK_MODULES(SPEEX, speex >= 1.2beta3,
+ 	[ AC_DEFINE(HAVE_SPEEX_NOISE,1,[tells whether the noise arg of speex_echo_cancel can be used]) ],
+@@ -329,11 +361,26 @@
+     [AC_MSG_NOTICE([No speexdsp library found.])
+ ]
+ )
++else
++SPEEX_CFLAGS="-DDISABLE_SPEEX"
++fi
++
+ AC_SUBST(SPEEX_CFLAGS)
+ AC_SUBST(SPEEX_LIBS)
++
+ AM_CONDITIONAL(BUILD_SPEEX, test x$build_speex = xyes )
+ AM_CONDITIONAL(BUILD_RESAMPLE, test x$build_resample = xyes )
+ 
++AC_ARG_ENABLE(gsm,
++      [  --disable-gsm    Disable gsm support],
++      [case "${enableval}" in
++        yes) gsm=true ;;
++        no)  gsm=false ;;
++        *) AC_MSG_ERROR(bad value ${enableval} for --disable-gsm) ;;
++      esac],[gsm=true])
++
++if test x$gsm = xtrue; then
++
+ dnl check for gsm
+ build_gsm=no
+ AC_ARG_WITH( gsm,
+@@ -350,6 +397,9 @@
+ else
+ 	build_gsm=no
+ fi
++
++fi
++
+ AM_CONDITIONAL(BUILD_GSM, test x$build_gsm = xyes )
+ 
+ MS_CHECK_VIDEO
+@@ -415,7 +465,17 @@
+ dnl # Check for doxygen
+ dnl ##################################################
+ 
++AC_ARG_ENABLE(doc,
++			[  --disable-doc    Disable documentation build/install],
++      [case "${enableval}" in
++			  yes) enable_doc=true ;;
++        no)  enable_doc=false ;;
++				*) AC_MSG_ERROR(bad value ${enableval} for --disable-doc) ;;
++      esac],[enable_doc=true])
++
++if test "$enable_doc" = "true"; then
+ AC_PATH_PROG(DOXYGEN,doxygen,false)
++fi
+ AM_CONDITIONAL(HAVE_DOXYGEN, test $DOXYGEN != false)
+ 
+ 
+--- acinclude.m4.old	2009-04-26 11:28:59.000000000 -0400
++++ acinclude.m4	2009-04-26 11:13:06.000000000 -0400
+@@ -108,9 +108,30 @@
+ 			fi
+ 		fi
+ 
++		AC_ARG_ENABLE(theora,
++		  [  --disable-theora    Disable theora support],
++		  [case "${enableval}" in
++			yes) theora=true ;;
++			no)  theora=false ;;
++			*) AC_MSG_ERROR(bad value ${enableval} for --disable-theora) ;;
++		  esac],[theora=true])
++
++		if test x$theora = xtrue; then
+ 		PKG_CHECK_MODULES(THEORA, [theora >= 1.0alpha7 ], [have_theora=yes],
+ 					[have_theora=no])
++		fi
++
++		AC_ARG_ENABLE(x11,
++		  [  --disable-x11    Disable X11 support],
++		  [case "${enableval}" in
++			yes) enable_x11=true ;;
++			no)  enable_x11=false ;;
++			*) AC_MSG_ERROR(bad value ${enableval} for --disable-x11) ;;
++		  esac],[enable_x11=true])
++
++		if test "$enable_x11" = "true"; then
+ 		AC_CHECK_HEADERS(X11/Xlib.h)
++		fi
+ 		
+ 		VIDEO_CFLAGS=" $FFMPEG_CFLAGS -DVIDEO_ENABLED"
+ 		VIDEO_LIBS=" $FFMPEG_LIBS $SWSCALE_LIBS"
diff --git a/media-libs/mediastreamer/mediastreamer-2.2.3_p1.ebuild b/media-libs/mediastreamer/mediastreamer-2.2.3_p1.ebuild
new file mode 100644
index 000000000000..f7b24d312762
--- /dev/null
+++ b/media-libs/mediastreamer/mediastreamer-2.2.3_p1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/mediastreamer-2.2.3_p1.ebuild,v 1.1 2009/04/27 17:45:01 volkmar Exp $
+
+EAPI="2"
+
+inherit eutils autotools multilib
+
+MY_P=${P/_p1/}
+
+DESCRIPTION="Mediastreaming library for telephony application"
+HOMEPAGE="http://www.linphone.org/index.php/eng/code_review/mediastreamer2"
+SRC_URI="http://download.savannah.nongnu.org/releases/linphone/${PN}/${MY_P}.tar.gz
+	mirror://gentoo/${P}-linphone-3.1.1.patch.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc"
+IUSE="alsa arts debug doc examples gsm ipv6 jack oss portaudio speex theora
+video X"
+
+RDEPEND=">=net-libs/ortp-0.15.0_p1
+	alsa? ( media-libs/alsa-lib )
+	arts? ( kde-base/arts )
+	gsm? ( media-sound/gsm )
+	jack? ( media-libs/libsamplerate
+		media-sound/jack-audio-connection-kit )
+	portaudio? ( media-libs/portaudio )
+	speex? ( >=media-libs/speex-1.2_beta3 )
+	video? ( media-libs/libsdl[video,X]
+		media-video/ffmpeg
+		theora? ( media-libs/libtheora )
+		X? ( x11-libs/libX11 ) )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+S=${WORKDIR}/${MY_P}
+
+# TODO:
+# run-time test for arts support
+# run-time test for ipv6 : does it need ortp[ipv6] ?
+
+# NOTES:
+# in some way, v4l support is auto-magic but keeping it like that atm
+
+pkg_setup() {
+	if ! use oss && ! use alsa && ! use arts && ! use jack && ! use portaudio;
+	then
+		eerror "You must enable at least oss, alsa, arts, jack or portaudio"
+		eerror "Please, re-emerge ${PN} with one of this USE flag enabled"
+		die
+	fi
+
+	if ! use video && ( use theora || use X ); then
+		ewarn "X and theora support are enabled if video USE flag is enabled"
+		ewarn "If you want X or theora support, consider re-emerge with USE=\"video\""
+	fi
+}
+
+src_prepare() {
+	epatch "${WORKDIR}"/${P}-linphone-3.1.1.patch
+
+	# fixing doc, oss, jack, gsm, speex, theora and X auto-magic deps
+	epatch "${FILESDIR}"/${P}-autodeps.patch
+
+	# fix arts detection for gentoo
+	epatch "${FILESDIR}"/${P}-arts.patch
+
+	# too hard to have a flexible lib dir in a clean way
+	sed -i -e "s:\(/usr/kde/3.5/\)lib:\1$(get_libdir):" configure.ac \
+		|| die "patching configure.ac failed"
+
+	# respect user's CFLAGS
+	sed -i -e "s:-O2::" 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"
+
+	# 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"
+
+	eautoreconf
+
+	# fix arts include
+	sed -i -e "s:kde/\(artsc/artsc.h\):\1:" src/arts.c \
+		|| die "patching src/arts.c failed"
+
+	# don't build examples in tests/
+	sed -i -e "s:\(SUBDIRS = .*\) tests \(.*\):\1 \2:" Makefile.in \
+		|| die "patching Makefile.in failed"
+}
+
+src_configure() {
+	# strict: don't want -Werror
+	# macsnd and macaqsnd: macosx related
+	# external-ortp: don't use bundled libs
+	econf \
+		--htmldir=/usr/share/doc/${PF}/html \
+		--datadir=/usr/share/${PN} \
+		--libdir=/usr/$(get_libdir) \
+		--disable-strict \
+		--disable-macsnd \
+		--disable-macaqsnd \
+		--enable-external-ortp \
+		--disable-dependency-tracking \
+		$(use_enable alsa) \
+		$(use_enable arts artsc) \
+		$(use_enable debug) \
+		$(use_enable doc) \
+		$(use_enable gsm) \
+		$(use_enable ipv6) \
+		$(use_enable jack) \
+		$(use_enable oss) \
+		$(use_enable portaudio) \
+		$(use_enable speex) \
+		$(use_enable theora) \
+		$(use_enable video) \
+		$(use_enable X x11)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins tests/*.c || die "doins failed"
+	fi
+}