diff options
| -rw-r--r-- | media-libs/mediastreamer/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/mediastreamer/Manifest | 7 | ||||
| -rw-r--r-- | media-libs/mediastreamer/files/mediastreamer-2.2.3_p1-arts.patch | 32 | ||||
| -rw-r--r-- | media-libs/mediastreamer/mediastreamer-2.2.3_p1-r1.ebuild | 12 | ||||
| -rw-r--r-- | media-libs/mediastreamer/mediastreamer-2.2.4.ebuild | 12 |
5 files changed, 15 insertions, 55 deletions
diff --git a/media-libs/mediastreamer/ChangeLog b/media-libs/mediastreamer/ChangeLog index 5a766442c596..3f7666f83863 100644 --- a/media-libs/mediastreamer/ChangeLog +++ b/media-libs/mediastreamer/ChangeLog @@ -1,6 +1,11 @@ # 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.19 2009/11/11 13:13:54 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/ChangeLog,v 1.20 2009/11/15 13:56:03 volkmar Exp $ + + 15 Nov 2009; Mounir Lamouri <volkmar@gentoo.org> + mediastreamer-2.2.3_p1-r1.ebuild, + -files/mediastreamer-2.2.3_p1-arts.patch, mediastreamer-2.2.4.ebuild: + Remove arts related patch and clean ebuilds, wrt bug 291546 11 Nov 2009; Samuli Suominen <ssuominen@gentoo.org> mediastreamer-2.2.3_p1-r1.ebuild, mediastreamer-2.2.4.ebuild: diff --git a/media-libs/mediastreamer/Manifest b/media-libs/mediastreamer/Manifest index 59d25c70b5d9..4ec30e646710 100644 --- a/media-libs/mediastreamer/Manifest +++ b/media-libs/mediastreamer/Manifest @@ -1,9 +1,8 @@ -AUX mediastreamer-2.2.3_p1-arts.patch 846 RMD160 699bf1a20a59b151afeeca6c5da60e2730a790f9 SHA1 cbafdd5671279f8439ba0446fd525a4637f08573 SHA256 5079f15b7ae71e72211c1ccf892d33e39df8b668b4e24443da355f240b480269 AUX mediastreamer-2.2.3_p1-autodeps.patch 4398 RMD160 cc3a98a9d7446e15a3fb5f851a18d6f5342e0908 SHA1 7d00b34a333b273680c612b6f0d0ffa092fb66ba SHA256 0cc00eefe8ed05ff63f3a8928c2d5a3d0fe87719c97bfd52c5057a1bba4bcb9c 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.2.4.tar.gz 595031 RMD160 b1c191c382c6d33ad8b39711b25124a94720e7dd SHA1 52887da63d794597364bcc12c63fa5851affc89d SHA256 be85e97e827efd4d7473e2310291d0aa4d46387baa749a48999b2b67f0b3bd26 -EBUILD mediastreamer-2.2.3_p1-r1.ebuild 3976 RMD160 789f29e1951632a1eb05e8f16656c8a03858901a SHA1 5fbe8b348dd778776ab12bf84aaff9d367e8e6d1 SHA256 8077fd37a9851c4783d7d6f23dfcce329d53ed0a806190ab7b043b1ecd6558cb -EBUILD mediastreamer-2.2.4.ebuild 3736 RMD160 b94942953a569c55754ea3b6f6bc39623fbc4bbd SHA1 0d516108b6e055d506da176b0152d64d010bf6db SHA256 b731e176696e5a6b012cde60939e3e773877ee243e0f4a16adc1219f39c8bc05 -MISC ChangeLog 2698 RMD160 b3a1bf37d173c5f278b6e895b345da82b9037206 SHA1 dcb58df63a3fe7d20bc7733efe22b9d0d467684a SHA256 7a598bf8e0fbfc81dc00909f13d4a24a6508af6461bb8ea4a6cf5921efa254ea +EBUILD mediastreamer-2.2.3_p1-r1.ebuild 3818 RMD160 bd2c86eb7f73d3baaadca3c308902087a3803d6b SHA1 f4f1ebc51d9c37e233b4cf4a1ab9fd85c8eee761 SHA256 53478afa2ddb03f3bf68864fc68f4b298fb3ad3425ba15f29ab9a1cae5263d38 +EBUILD mediastreamer-2.2.4.ebuild 3567 RMD160 ce83f0b19ee9fad19eb5c240e2ca5eef515b3058 SHA1 3e8e40866d6cb1a6bda7a65337e33b646814da43 SHA256 18e7024b0558ca62868b822d944675a37405738493b82d3424adc1d95186a8af +MISC ChangeLog 2918 RMD160 1e68b0d882b0717d272256da79dcef43f7e5dfbd SHA1 50276fb8063a95159a7ad485b6c1b25577c26480 SHA256 d4f5a71cb6b85b7ad8208022b8cc0e3d0556d158a7a692073bd9f8ea38cd94a7 MISC metadata.xml 380 RMD160 24797b26f9f2ef16ea5261c536ebed58e3903e97 SHA1 74bcc7d7e8bd26a92450ee714743a975ed595de0 SHA256 5cd96440722093ad63d25758891be2656d8c7f8b570eddfee1fbdce5860d237a 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 deleted file mode 100644 index 32837a0d9467..000000000000 --- a/media-libs/mediastreamer/files/mediastreamer-2.2.3_p1-arts.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- 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/mediastreamer-2.2.3_p1-r1.ebuild b/media-libs/mediastreamer/mediastreamer-2.2.3_p1-r1.ebuild index 3fed34c9208c..00dd949ed733 100644 --- a/media-libs/mediastreamer/mediastreamer-2.2.3_p1-r1.ebuild +++ b/media-libs/mediastreamer/mediastreamer-2.2.3_p1-r1.ebuild @@ -1,6 +1,6 @@ # 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.9 2009/11/11 13:13:54 ssuominen Exp $ +# $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" @@ -65,9 +65,6 @@ src_prepare() { # 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" @@ -88,10 +85,6 @@ src_prepare() { 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" @@ -101,6 +94,7 @@ 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} \ @@ -110,8 +104,8 @@ src_configure() { --disable-macaqsnd \ --enable-external-ortp \ --disable-dependency-tracking \ - $(use_enable alsa) \ --disable-artsc \ + $(use_enable alsa) \ $(use_enable debug) \ $(use_enable doc) \ $(use_enable gsm) \ diff --git a/media-libs/mediastreamer/mediastreamer-2.2.4.ebuild b/media-libs/mediastreamer/mediastreamer-2.2.4.ebuild index c95f33d8843d..9f77a0e58586 100644 --- a/media-libs/mediastreamer/mediastreamer-2.2.4.ebuild +++ b/media-libs/mediastreamer/mediastreamer-2.2.4.ebuild @@ -1,6 +1,6 @@ # 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.4.ebuild,v 1.2 2009/11/11 13:13:54 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/mediastreamer-2.2.4.ebuild,v 1.3 2009/11/15 13:56:03 volkmar Exp $ EAPI="2" @@ -53,9 +53,6 @@ pkg_setup() { } src_prepare() { - # fix arts detection for gentoo - epatch "${FILESDIR}"/${PN}-2.2.3_p1-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" @@ -76,10 +73,6 @@ src_prepare() { 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" @@ -89,6 +82,7 @@ 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} \ @@ -98,8 +92,8 @@ src_configure() { --disable-macaqsnd \ --enable-external-ortp \ --disable-dependency-tracking \ - $(use_enable alsa) \ --disable-artsc \ + $(use_enable alsa) \ $(use_enable debug) \ $(use_enable doc) \ $(use_enable gsm) \ |