From 9804dab4c24e69cf96bb9b26b7b81dfb6ca36113 Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Sun, 23 Oct 2011 11:43:51 +0000 Subject: [PATCH] Punt static libraries and libtool archives, remove overshadowed versions. Package-Manager: portage-2.2.0_alpha70/cvs/Linux x86_64 --- media-libs/mediastreamer/ChangeLog | 8 +- media-libs/mediastreamer/Manifest | 32 ++-- .../mediastreamer-2.2.3_p1-autodeps.patch | 168 ------------------ .../mediastreamer-2.2.3_p1-r1.ebuild | 131 -------------- .../mediastreamer/mediastreamer-2.5.0.ebuild | 131 -------------- .../mediastreamer/mediastreamer-2.6.0.ebuild | 129 -------------- .../mediastreamer-2.7.3-r3.ebuild | 12 +- 7 files changed, 31 insertions(+), 580 deletions(-) delete mode 100644 media-libs/mediastreamer/files/mediastreamer-2.2.3_p1-autodeps.patch delete mode 100644 media-libs/mediastreamer/mediastreamer-2.2.3_p1-r1.ebuild delete mode 100644 media-libs/mediastreamer/mediastreamer-2.5.0.ebuild delete mode 100644 media-libs/mediastreamer/mediastreamer-2.6.0.ebuild diff --git a/media-libs/mediastreamer/ChangeLog b/media-libs/mediastreamer/ChangeLog index f157b7ad43a2..2c1708642f09 100644 --- a/media-libs/mediastreamer/ChangeLog +++ b/media-libs/mediastreamer/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-libs/mediastreamer # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/ChangeLog,v 1.48 2011/10/14 07:22:44 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/ChangeLog,v 1.49 2011/10/23 11:43:51 scarabeus Exp $ + + 23 Oct 2011; Tomáš Chvátal + -mediastreamer-2.2.3_p1-r1.ebuild, + -files/mediastreamer-2.2.3_p1-autodeps.patch, -mediastreamer-2.5.0.ebuild, + -mediastreamer-2.6.0.ebuild, mediastreamer-2.7.3-r3.ebuild: + Punt static libraries and libtool archives, remove overshadowed versions. 14 Oct 2011; Peter Volkov mediastreamer-2.7.3-r3.ebuild: Allow building with pulseaudio only, bug #384961 wrt niks1024 AT gmail.com diff --git a/media-libs/mediastreamer/Manifest b/media-libs/mediastreamer/Manifest index 8f3c93d9294c..87e1472c0cb2 100644 --- a/media-libs/mediastreamer/Manifest +++ b/media-libs/mediastreamer/Manifest @@ -1,26 +1,28 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 -AUX mediastreamer-2.2.3_p1-autodeps.patch 4398 RMD160 cc3a98a9d7446e15a3fb5f851a18d6f5342e0908 SHA1 7d00b34a333b273680c612b6f0d0ffa092fb66ba SHA256 0cc00eefe8ed05ff63f3a8928c2d5a3d0fe87719c97bfd52c5057a1bba4bcb9c AUX mediastreamer-2.7.3-sdl-build.patch 8006 RMD160 30b4398a6b6488466ce47c27acf4d04028676b5f SHA1 cb620aab50915a20d012a4eaa4db71568364e186 SHA256 f143cf44b767e07ba7bff5572fe5f11950142ff0a36025a64db585aa048ab263 AUX mediastreamer-2.7.3-v4l-automagic.patch 1083 RMD160 7525df8acec6073afc9d249e124a5a0abca38fa0 SHA1 96b8169fde8375b05aaa7d275089a99117398317 SHA256 697cc9697504e57bb5810b7844eac34bfbae9c909f299ca5bb056b352c26bcfe -DIST mediastreamer-2.2.3.tar.gz 581001 RMD160 ca84cf2f415099ad2fb9219aadfebc1aa2cb3381 SHA1 e3a6d4e5314043ad690da6c1ed55a81e70282941 SHA256 203ab2508efa37831cf2bef76ef222c01e51bf250fd14db1ae85e442ed87cd48 -DIST mediastreamer-2.2.3_p1-linphone-3.1.1.patch.tgz 67833 RMD160 4b6096a989eeea869f10376fd6632b1ffb655054 SHA1 ce4141723c40d36f856723e3073d110577fcbb68 SHA256 1aef7c853e6e76f9137dbaf6c575995a2c9816ae464770e819eadacb81778f67 DIST mediastreamer-2.3.0.tar.gz 669093 RMD160 8d656df1008025b91c3905ef69eb88c35c8741ab SHA1 eae7032fbbf5d31b3c47a54566d34a8b97e38405 SHA256 67b87a094da0b17be43919e67dffe7b5347bc4299f4d87165a8f27282ea7afbd -DIST mediastreamer-2.5.0.tar.gz 722241 RMD160 80843719b6329dfb2dea9acb9f9b2717f79e5c6b SHA1 38200d3dd730376a1ed9ecb71c8d3cb2b73b9361 SHA256 aef06bd61491909e852080bec4c40ff5330f9c74ffafe64805d6ad3121539468 -DIST mediastreamer-2.6.0.tar.gz 728710 RMD160 a3936ad2b6a6a4f1798729a1c1362c5bf90fae2d SHA1 fc4ea1c4c0d453c6e2e60ae71c53930715bd2f5b SHA256 2817ddc7a48e5b7a0deb96df4daea7e62227ab08a37acb6a9e8db587721f3351 DIST mediastreamer-2.7.3.tar.gz 758146 RMD160 ce37caec4b80012b3231929a9e337147ee730d1f SHA1 5d3c94b74131d2d333212de7315c39d230b91539 SHA256 c3cbea285f1e85259b2ac06d3f1730b4258e280011598b91f5b90b8432bf1dc0 -EBUILD mediastreamer-2.2.3_p1-r1.ebuild 3818 RMD160 bd2c86eb7f73d3baaadca3c308902087a3803d6b SHA1 f4f1ebc51d9c37e233b4cf4a1ab9fd85c8eee761 SHA256 53478afa2ddb03f3bf68864fc68f4b298fb3ad3425ba15f29ab9a1cae5263d38 EBUILD mediastreamer-2.3.0-r1.ebuild 3847 RMD160 6476120db21958071d930f1dbc43bc1db3b1ea2d SHA1 084a373e4139c782c5c784625b6cd1b7bb082f6c SHA256 33c8f48eba5ee865de37eab53cf185d3e8f0587ea666e21c33c20a95a72559d6 -EBUILD mediastreamer-2.5.0.ebuild 4166 RMD160 1be347cc0366f575ee77befb44a3995dad7642cb SHA1 486f1b49dfbc65cb719b364373e9491d669308b4 SHA256 fe26d84b36f3eaf1bc17949e376ac9d9228e811df295ba62106fbbd1966c15bb -EBUILD mediastreamer-2.6.0.ebuild 4095 RMD160 e9c25b2c8a6b561a57cd02749d6d36a9469c1db1 SHA1 2d984bda4aff26e62a11ee2e2ec64a798876858e SHA256 dfb22069c4e698d7c609756babc8a4b76c5607f9a967b23ec9dfdbb31c02f467 -EBUILD mediastreamer-2.7.3-r3.ebuild 3873 RMD160 f403ce09a875f054a5c0c2b1898be2cf206254d7 SHA1 eb06a2f39beb332826a8ae2e0294b231825f151b SHA256 1fb081bcade4c63667a86849d6864404b7b039de7223303e05bc058efcee55e4 -MISC ChangeLog 7376 RMD160 4cc49702f9b35fc0b084089b7e0a029aafb97151 SHA1 193e801e803198dc0661c0d8bbc1e0413009de11 SHA256 efba76f80535d58f52f4408bcde7d47ad8246ec57d6d84da677dc8378f729154 +EBUILD mediastreamer-2.7.3-r3.ebuild 3954 RMD160 6a83641ea0c9a789ad57dc1b71e611b982e1fd1a SHA1 e868087cbd336ee8eee16ae4abad42c7f037ba2f SHA256 687a506576370d7bc2b5cb8dc7a89378f10b9e0468d99dc4d336c03c82f9d3e6 +MISC ChangeLog 7690 RMD160 3240cc892d8ae07a120882736e7f588b20a899bd SHA1 9d0e3a1ffecfc081f9153c077b09f18d77692fd1 SHA256 692d634489e42478fdd38b569c26097efc8d19613821930b0b96bedba4cc5e0c MISC metadata.xml 531 RMD160 8c69e8bafc5b2b770b20d3f30352fc81e842e14c SHA1 369aa519353274364586f218538191596828a6f2 SHA256 25bc15caead165fa7563daefe69bfe714efb8e4970f9043751f7f78ea3669dcc -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk6X4tkACgkQGrk+8vGYmwdp5AD/XrBZIdUJWsqsSGYaZwwfAyZ9 -q2dM1jnMKMUhxBrvURsA/2vdZo1yFWCvl+IZEITjzauk7JDN4EytuSRH33kyG7wa -=v2/1 +iQIcBAEBAgAGBQJOo/2oAAoJEOSiRoyO7jvoOD4QAIeUf3DQwaxjQ3QEC600pxDQ +rjIa8UmmFttv0PeQuCZ7KjG7p56mHS4zzVFwTSMMcKyre34e8RMC1nK+QmWHsAGx +b9qK7h29LKcjymGwR8CWiAw3YoL8Q3yXLY6y871SgiQvBZ4bOi9FLu51jgh8zrJm +RC+CaHq1URLD+ROuc0U8Fka2Sx9JIHQDfHalaUNa/oCD7RjBZ+GGWVW/7EI5FUXr +vJ01HlI+owCCyhYVNKb7Ug8j0a5LuL7pBFl9x7+Dz0ZdTmMESU0HuXyhKVsXtHqR +Gcjx8+aos/2MVXx9ejMS6tyy6fjBXN2tIFeoI88r7EL0+/9q0wGs4Yh5G9TMyLyt +5EQjdljDhBo1xZJvnqL9BfiC2LIrLKyfGsy3B4t2chNYOR/Xnb0SOUOOjCljWjRQ +9aNmgduyiTe4y1itaEPNse4sfyxzVUbCcIWATmtKNNkdQV/1P7OR+Ix7agpQVZuy +IlTJtNwC52aHx1N9gZdWCBVRfwj3RVKho6hc6ngFT+F3XrFVVjclMLYw+bwIMn7G +hUelK4Zn+pggu+xLE71vOs5eQxkxAzCM8J6vBhP/ZNxfszNePkMum0STbKEFpA5R +THTOy3YxVlf2FxikDTS9kMP+Lm3NKz1YdYCULp3nJrNWSd4K9lwKBco3YGhKwLM0 +T6SPJx5duf9mKzpEm3vs +=hPQV -----END PGP SIGNATURE----- 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 deleted file mode 100644 index db6220b082db..000000000000 --- a/media-libs/mediastreamer/files/mediastreamer-2.2.3_p1-autodeps.patch +++ /dev/null @@ -1,168 +0,0 @@ ---- 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-r1.ebuild b/media-libs/mediastreamer/mediastreamer-2.2.3_p1-r1.ebuild deleted file mode 100644 index 00dd949ed733..000000000000 --- a/media-libs/mediastreamer/mediastreamer-2.2.3_p1-r1.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# 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-r1.ebuild,v 1.10 2009/11/15 13:56:03 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="amd64 ppc x86" -IUSE="+alsa debug doc examples gsm ilbc ipv6 jack oss portaudio +speex -theora video x264 X" - -RDEPEND=">=net-libs/ortp-0.15.0_p1 - alsa? ( media-libs/alsa-lib ) - 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 )" - -PDEPEND="ilbc? ( media-plugins/mediastreamer-ilbc ) - video? ( x264? ( media-plugins/mediastreamer-x264 ) )" - -S=${WORKDIR}/${MY_P} - -# TODO: -# 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 jack && ! use portaudio; - then - eerror "You must enable at least oss, alsa, 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 - - # 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 - - # 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 - # arts: arts is deprecated - 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 \ - --disable-artsc \ - $(use_enable alsa) \ - $(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 -} diff --git a/media-libs/mediastreamer/mediastreamer-2.5.0.ebuild b/media-libs/mediastreamer/mediastreamer-2.5.0.ebuild deleted file mode 100644 index 752531032958..000000000000 --- a/media-libs/mediastreamer/mediastreamer-2.5.0.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/mediastreamer-2.5.0.ebuild,v 1.1 2010/06/07 14:44:54 pva Exp $ - -EAPI="3" - -inherit eutils autotools multilib - -DESCRIPTION="Mediastreaming library for telephony application" -HOMEPAGE="http://www.linphone.org/index.php/eng/code_review/mediastreamer2" -SRC_URI="mirror://nongnu/linphone/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x86-macos" -IUSE="+alsa coreaudio debug examples gsm ilbc ipv6 jack oss portaudio +speex theora video v4l2 x264 X" - -RDEPEND=">=net-libs/ortp-0.16.2 - alsa? ( media-libs/alsa-lib ) - gsm? ( media-sound/gsm ) - jack? ( >=media-libs/libsamplerate-0.0.13 - 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 ) - v4l2? ( media-libs/libv4l - sys-kernel/linux-headers ) - X? ( x11-libs/libX11 ) )" -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -PDEPEND="ilbc? ( media-plugins/mediastreamer-ilbc ) - video? ( x264? ( media-plugins/mediastreamer-x264 ) )" - -# TODO: -# 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 jack && ! use portaudio && ! use coreaudio; - then - eerror "You must enable at least oss, alsa, jack, portaudio or coreaudio" - eerror "Please, re-emerge ${PN} with one of this USE flag enabled" - die - fi - - if ! use video && ( use theora || use X || use v4l2 ); then - ewarn "X, theora and v4l2 support are enabled if video USE flag is enabled" - ewarn "If you want X, theora or v4l support, consider re-emerge with USE=\"video\"" - fi - - if use video && ! use v4l2; then - ewarn "Many cameras will not work or will crash your application if ${PN} is" - ewarn "not built with v4l2 support. Please, enable USE='v4l2'." - fi -} - -src_prepare() { - # 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::;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" - - # 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 - - # don't build examples in tests/ - sed -i -e "s:\(SUBDIRS = .*\) tests \(.*\):\1 \2:" Makefile.in \ - || die "patching Makefile.in failed" -} - -src_configure() { - local macaqsnd="--disable-macaqsnd" - # Mac OS X Audio Queue is an audio recording facility, available on - # 10.5 (Leopard, Darwin9) and onward - if use coreaudio && [[ ${CHOST} == *-darwin* && ${CHOST##*-darwin} -ge 9 ]]; - then - macaqsnd="--enable-macaqsnd" - fi - # strict: don't want -Werror - # external-ortp: don't use bundled libs - # arts: arts is deprecated - econf \ - --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - --datadir="${EPREFIX}"/usr/share/${PN} \ - --libdir="${EPREFIX}"/usr/$(get_libdir) \ - --disable-strict \ - --enable-external-ortp \ - --disable-dependency-tracking \ - --disable-artsc \ - $(use_enable alsa) \ - $(use_enable coreaudio macsnd) ${macaqsnd} \ - $(use_enable debug) \ - $(use_enable gsm) \ - $(use_enable ipv6) \ - $(use_enable jack) \ - $(use_enable oss) \ - $(use_enable portaudio) \ - $(use_enable speex) \ - $(use_enable theora) \ - $(use video && use_enable v4l2 libv4l || echo --disable-libv4l) \ - $(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 -} diff --git a/media-libs/mediastreamer/mediastreamer-2.6.0.ebuild b/media-libs/mediastreamer/mediastreamer-2.6.0.ebuild deleted file mode 100644 index 1ae6bcdfb2a0..000000000000 --- a/media-libs/mediastreamer/mediastreamer-2.6.0.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/mediastreamer-2.6.0.ebuild,v 1.4 2011/01/01 20:36:35 hwoarang Exp $ - -EAPI="3" - -inherit eutils autotools multilib - -DESCRIPTION="Mediastreaming library for telephony application" -HOMEPAGE="http://www.linphone.org/index.php/eng/code_review/mediastreamer2" -SRC_URI="mirror://nongnu/linphone/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 x86 ~ppc-macos ~x86-macos" -IUSE="+alsa coreaudio debug examples gsm ilbc ipv6 jack oss portaudio pulseaudio +speex theora video v4l2 x264 X" - -RDEPEND=">=net-libs/ortp-0.16.2 - alsa? ( media-libs/alsa-lib ) - gsm? ( media-sound/gsm ) - jack? ( >=media-libs/libsamplerate-0.0.13 - media-sound/jack-audio-connection-kit ) - portaudio? ( media-libs/portaudio ) - pulseaudio? ( >=media-sound/pulseaudio-0.9.21 ) - speex? ( >=media-libs/speex-1.2_beta3 ) - video? ( media-libs/libsdl[video,X] - media-video/ffmpeg - theora? ( media-libs/libtheora ) - v4l2? ( media-libs/libv4l - sys-kernel/linux-headers ) - X? ( x11-libs/libX11 ) )" -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -PDEPEND="ilbc? ( media-plugins/mediastreamer-ilbc ) - video? ( x264? ( media-plugins/mediastreamer-x264 ) )" - -# TODO: -# 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 jack && ! use portaudio && ! use coreaudio; - then - eerror "You must enable at least oss, alsa, jack, portaudio or coreaudio" - eerror "Please, re-emerge ${PN} with one of this USE flag enabled" - die - fi - - if ! use video && ( use theora || use X || use v4l2 ); then - ewarn "X, theora and v4l2 support are enabled if video USE flag is enabled" - ewarn "If you want X, theora or v4l support, consider re-emerge with USE=\"video\"" - fi - - if use video && ! use v4l2; then - ewarn "Many cameras will not work or will crash your application if ${PN} is" - ewarn "not built with v4l2 support. Please, enable USE='v4l2'." - fi -} - -src_prepare() { - # respect user's CFLAGS - 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" - - # 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 - - # don't build examples in tests/ - sed -i -e "s:\(SUBDIRS = .*\) tests \(.*\):\1 \2:" Makefile.in \ - || die "patching Makefile.in failed" -} - -src_configure() { - local macaqsnd="--disable-macaqsnd" - # Mac OS X Audio Queue is an audio recording facility, available on - # 10.5 (Leopard, Darwin9) and onward - if use coreaudio && [[ ${CHOST} == *-darwin* && ${CHOST##*-darwin} -ge 9 ]]; - then - macaqsnd="--enable-macaqsnd" - fi - # strict: don't want -Werror - # external-ortp: don't use bundled libs - # arts: arts is deprecated - econf \ - --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - --datadir="${EPREFIX}"/usr/share/${PN} \ - --libdir="${EPREFIX}"/usr/$(get_libdir) \ - --disable-strict \ - --enable-external-ortp \ - --disable-dependency-tracking \ - --disable-artsc \ - $(use_enable alsa) \ - $(use_enable pulseaudio) \ - $(use_enable coreaudio macsnd) ${macaqsnd} \ - $(use_enable debug) \ - $(use_enable gsm) \ - $(use_enable ipv6) \ - $(use_enable jack) \ - $(use_enable oss) \ - $(use_enable portaudio) \ - $(use_enable speex) \ - $(use_enable theora) \ - $(use video && use_enable v4l2 libv4l || echo --disable-libv4l) \ - $(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 -} diff --git a/media-libs/mediastreamer/mediastreamer-2.7.3-r3.ebuild b/media-libs/mediastreamer/mediastreamer-2.7.3-r3.ebuild index ca50c71bfd6d..87dd56894759 100644 --- a/media-libs/mediastreamer/mediastreamer-2.7.3-r3.ebuild +++ b/media-libs/mediastreamer/mediastreamer-2.7.3-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/mediastreamer-2.7.3-r3.ebuild,v 1.9 2011/10/14 07:22:44 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/mediastreamer-2.7.3-r3.ebuild,v 1.10 2011/10/23 11:43:51 scarabeus Exp $ EAPI="4" @@ -17,7 +17,7 @@ KEYWORDS="amd64 ~ppc ~ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos" # 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 examples gsm ilbc ipv6 jack oss portaudio -pulseaudio sdl +speex theora v4l video x264 X" +pulseaudio sdl +speex static-libs theora v4l video x264 X" REQUIRED_USE="|| ( oss alsa jack portaudio coreaudio pulseaudio ) video? ( || ( sdl X ) ) theora? ( video ) @@ -48,6 +48,8 @@ PDEPEND="amr? ( !bindist? ( media-plugins/mediastreamer-amr ) ) ilbc? ( media-plugins/mediastreamer-ilbc ) video? ( x264? ( media-plugins/mediastreamer-x264 ) )" +DOCS=( AUTHORS ChangeLog NEWS README ) + src_prepare() { # respect user's CFLAGS sed -i -e "s:-O2::;s: -g::" configure.ac || die "patching configure.ac failed" @@ -105,6 +107,7 @@ src_configure() { $(use_enable oss) \ $(use_enable portaudio) \ $(use_enable speex) \ + $(use_enable static-libs static) \ $(use_enable theora) \ $(use_enable video) \ $(use_enable v4l) \ @@ -115,9 +118,8 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install - - dodoc AUTHORS ChangeLog NEWS README + default + find "${ED}" -name '*.la' -exec rm -f {} + if use examples; then insinto /usr/share/doc/${PF}/examples -- 2.26.2