Make raw file writer plug-in optional as requested wrt #266885.

(Portage version: 2.2_rc63/cvs/Linux x86_64)

4 files changed, 85 insertions, 2 deletions

diff --git a/media-libs/libmikmod/ChangeLog b/media-libs/libmikmod/ChangeLog
index b0cd9f9d3fb0..0c0d59787a5c 100644
--- a/media-libs/libmikmod/ChangeLog
+++ b/media-libs/libmikmod/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libmikmod
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/ChangeLog,v 1.70 2010/01/31 00:19:20 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/ChangeLog,v 1.71 2010/03/01 22:44:52 ssuominen Exp $
+
+*libmikmod-3.2.0_beta2-r2 (01 Mar 2010)
+
+  01 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +libmikmod-3.2.0_beta2-r2.ebuild,
+  +files/libmikmod-3.2.0_beta2-no-drv_raw.patch, metadata.xml:
+  Make raw file writer plug-in optional as requested wrt #266885.
 
   31 Jan 2010; Markus Meier <maekke@gentoo.org>
   libmikmod-3.2.0_beta2-r1.ebuild:
diff --git a/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-no-drv_raw.patch b/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-no-drv_raw.patch
new file mode 100644
index 000000000000..3bbd2294f475
--- /dev/null
+++ b/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-no-drv_raw.patch
@@ -0,0 +1,24 @@
+http://bugs.gentoo.org/266885
+
+--- drivers/drv_raw.c
++++ drivers/drv_raw.c
+@@ -44,6 +44,8 @@
+ 
+ #include "mikmod_internals.h"
+ 
++#ifdef DRV_RAW
++
+ #define BUFFERSIZE 32768
+ #define FILENAME "music.raw"
+ 
+@@ -171,4 +173,10 @@
+ 	VC_VoiceRealVolume
+ };
+ 
++#else
++
++MISSING(drv_raw);
++
++#endif
++
+ /* ex:set ts=4: */
diff --git a/media-libs/libmikmod/libmikmod-3.2.0_beta2-r2.ebuild b/media-libs/libmikmod/libmikmod-3.2.0_beta2-r2.ebuild
new file mode 100644
index 000000000000..3eff8e30649a
--- /dev/null
+++ b/media-libs/libmikmod/libmikmod-3.2.0_beta2-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.2.0_beta2-r2.ebuild,v 1.1 2010/03/01 22:44:52 ssuominen Exp $
+
+EAPI=2
+MY_P=${P/_/-}
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="A library to play a wide range of module formats"
+HOMEPAGE="http://mikmod.raphnet.net/"
+SRC_URI="http://mikmod.raphnet.net/files/${MY_P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 LGPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+# Enable OSS by default since ALSA support isn't available, look below
+IUSE="+oss raw"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-64bit.patch \
+		"${FILESDIR}"/${P}-autotools.patch \
+		"${FILESDIR}"/${P}-info.patch \
+		"${FILESDIR}"/${P}-doubleRegister.patch \
+		"${FILESDIR}"/${PN}-CVE-2007-6720.patch \
+		"${FILESDIR}"/${PN}-CVE-2009-0179.patch \
+		"${FILESDIR}"/${P}-no-drv_raw.patch
+
+	AT_M4DIR=${S} eautoreconf
+}
+
+src_configure() {
+	use raw && append-flags -DDRV_RAW
+
+	# * af is something called AF/AFlib.h and -lAF, not audiofile in tree
+	# * alsa support is for deprecated API and doesn't work
+	econf \
+		--disable-af \
+		--disable-alsa \
+		--disable-esd \
+		$(use_enable oss)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS NEWS README TODO
+	dohtml docs/*.html
+}
diff --git a/media-libs/libmikmod/metadata.xml b/media-libs/libmikmod/metadata.xml
index e1774e3d9ad7..331b754ad12a 100644
--- a/media-libs/libmikmod/metadata.xml
+++ b/media-libs/libmikmod/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+  <herd>sound</herd>
+  <use>
+    <flag name="raw">Enable raw file writer plug-in</flag>
+  </use>
 </pkgmetadata>