summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2013-07-16 10:48:58 +0000
committerLars Wendler <polynomial-c@gentoo.org>2013-07-16 10:48:58 +0000
commit65d5331e6f390c85183b996a1741666b43fc6321 (patch)
tree997f031a96ac71b0d61b85bbbbe05864ab024761
parentVersion bump (diff)
downloadgentoo-2-65d5331e6f390c85183b996a1741666b43fc6321.tar.gz
gentoo-2-65d5331e6f390c85183b996a1741666b43fc6321.tar.bz2
gentoo-2-65d5331e6f390c85183b996a1741666b43fc6321.zip
Version bump (bug #476926). Fixes automagic dependency on pulseaudio (bug #460072) and compilation failure with gcc-4.7 (bug #428596)
(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
-rw-r--r--media-sound/darkice/ChangeLog13
-rw-r--r--media-sound/darkice/darkice-1.2.ebuild (renamed from media-sound/darkice/darkice-1.0.ebuild)31
-rw-r--r--media-sound/darkice/files/darkice-1.0-gcc44.patch14
-rw-r--r--media-sound/darkice/files/darkice-1.2-gcc47.patch11
-rw-r--r--media-sound/darkice/metadata.xml1
5 files changed, 37 insertions, 33 deletions
diff --git a/media-sound/darkice/ChangeLog b/media-sound/darkice/ChangeLog
index 3c15bd0003bf..c9661cd467b7 100644
--- a/media-sound/darkice/ChangeLog
+++ b/media-sound/darkice/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for media-sound/darkice
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/darkice/ChangeLog,v 1.58 2012/09/07 22:13:07 radhermit Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/darkice/ChangeLog,v 1.59 2013/07/16 10:48:58 polynomial-c Exp $
+
+*darkice-1.2 (16 Jul 2013)
+
+ 16 Jul 2013; Lars Wendler <polynomial-c@gentoo.org> -darkice-1.0.ebuild,
+ +darkice-1.2.ebuild, -files/darkice-1.0-gcc44.patch,
+ +files/darkice-1.2-gcc47.patch, metadata.xml:
+ Non-maintainer commit: Version bump (bug #476926). Fixes automagic dependency
+ on pulseaudio (bug #460072) and compilation failure with gcc-4.7 (bug
+ #428596). Removed old.
07 Sep 2012; Tim Harder <radhermit@gentoo.org> metadata.xml:
Remove redundant maintainer from metadata.
diff --git a/media-sound/darkice/darkice-1.0.ebuild b/media-sound/darkice/darkice-1.2.ebuild
index 522888c9aa51..05c12d2bea98 100644
--- a/media-sound/darkice/darkice-1.0.ebuild
+++ b/media-sound/darkice/darkice-1.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/darkice/darkice-1.0.ebuild,v 1.1 2010/07/29 23:37:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/darkice/darkice-1.2.ebuild,v 1.1 2013/07/16 10:48:58 polynomial-c Exp $
-EAPI=2
+EAPI=5
inherit eutils
DESCRIPTION="A live audio streamer"
@@ -12,43 +12,40 @@ SRC_URI="http://darkice.googlecode.com/files/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="aac alsa jack libsamplerate mp3 twolame vorbis"
+IUSE="aac alsa jack libsamplerate mp3 opus pulseaudio twolame vorbis"
RDEPEND="aac? ( media-libs/faac )
alsa? ( media-libs/alsa-lib )
jack? ( media-sound/jack-audio-connection-kit )
mp3? ( media-sound/lame )
+ opus? ( media-libs/opus )
+ pulseaudio? ( media-sound/pulseaudio )
twolame? ( media-sound/twolame )
vorbis? ( media-libs/libvorbis )
- libsamplerate? ( media-libs/libsamplerate )
- !mp3? ( !vorbis? ( !aac? ( !twolame? ( media-sound/lame ) ) ) )"
+ libsamplerate? ( media-libs/libsamplerate )"
DEPEND="${RDEPEND}"
+REQUIRED_USE="|| ( aac mp3 opus twolame vorbis )
+ || ( alsa jack pulseaudio )"
+
src_prepare() {
- epatch "${FILESDIR}"/${P}-gcc44.patch
+ epatch "${FILESDIR}"/${P}-gcc47.patch
}
src_configure() {
- local myconf
-
- if ! use mp3 && ! use vorbis && ! use aac && ! use twolame; then
- myconf="--with-lame"
- fi
-
econf \
- --disable-dependency-tracking \
$(use_with mp3 lame) \
$(use_with vorbis) \
$(use_with aac faac) \
--without-aacplus \
$(use_with twolame) \
+ $(use_with opus) \
$(use_with alsa) \
$(use_with jack) \
- $(use_with libsamplerate samplerate) \
- ${myconf}
+ $(use_with libsamplerate samplerate)
}
src_install() {
- emake DESTDIR="${D}" install || die
+ emake DESTDIR="${D}" install
dodoc AUTHORS ChangeLog FAQ NEWS README TODO
}
diff --git a/media-sound/darkice/files/darkice-1.0-gcc44.patch b/media-sound/darkice/files/darkice-1.0-gcc44.patch
deleted file mode 100644
index f531258add8d..000000000000
--- a/media-sound/darkice/files/darkice-1.0-gcc44.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://code.google.com/p/darkice/issues/detail?id=29
-SerialUlaw.cpp:296:26: error: ‘perror’ was not declared in this scope
-
---- src/SerialUlaw.cpp
-+++ src/SerialUlaw.cpp
-@@ -40,6 +40,8 @@
- #include "config.h"
- #endif
-
-+#include <stdio.h>
-+
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #else
diff --git a/media-sound/darkice/files/darkice-1.2-gcc47.patch b/media-sound/darkice/files/darkice-1.2-gcc47.patch
new file mode 100644
index 000000000000..e10439f27e45
--- /dev/null
+++ b/media-sound/darkice/files/darkice-1.2-gcc47.patch
@@ -0,0 +1,11 @@
+--- darkice-1.2/src/PulseAudioDspSource.cpp
++++ darkice-1.2/src/PulseAudioDspSource.cpp
+@@ -43,6 +43,8 @@
+ #include "config.h"
+ #endif
+
++#include <stdio.h>
++
+ #include "Util.h"
+ #include "Exception.h"
+ #include "PulseAudioDspSource.h"
diff --git a/media-sound/darkice/metadata.xml b/media-sound/darkice/metadata.xml
index 6848826abbd5..4197bc9059f4 100644
--- a/media-sound/darkice/metadata.xml
+++ b/media-sound/darkice/metadata.xml
@@ -3,6 +3,7 @@
<pkgmetadata>
<herd>sound</herd>
<use>
+ <flag name="opus">Enable Opus audio codec support</flag>
<flag name="twolame">Build with twolame support</flag>
</use>
<upstream>