Make raw file writer plug-in optional as requested wrt #266885.
authorSamuli Suominen <ssuominen@gentoo.org>
Mon, 1 Mar 2010 22:44:52 +0000 (22:44 +0000)
committerSamuli Suominen <ssuominen@gentoo.org>
Mon, 1 Mar 2010 22:44:52 +0000 (22:44 +0000)
Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

media-libs/libmikmod/ChangeLog
media-libs/libmikmod/Manifest
media-libs/libmikmod/files/libmikmod-3.2.0_beta2-no-drv_raw.patch [new file with mode: 0644]
media-libs/libmikmod/libmikmod-3.2.0_beta2-r2.ebuild [new file with mode: 0644]
media-libs/libmikmod/metadata.xml

index b0cd9f9d3fb03b88b373e9174784ef011ec44025..0c0d59787a5c5e3c0f0c8de16e092ec945f79515 100644 (file)
@@ -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:
index b9a17c1be820416dfed722ed279e19ef68c8eb9e..d4198e56837954ab6934fc22e1632fef2bffa2e4 100644 (file)
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX libmikmod-3.1.11-alsa.patch 816 RMD160 829c9a979849e1f770166f06674015a79be6d4bf SHA1 c6104ca5bfd56ef49565cf718f92db32ca7fd001 SHA256 4b6fa98756681b6a26d9207ed065a6b3f4d821df288c694b43f91e2d9c83930a
 AUX libmikmod-3.1.11-amd64-archdef.patch 490 RMD160 eeba4322c3cc54391acc35c6cfb9e544d32b5daa SHA1 c14d486348347e6608580dd94a94a7f3a75b33a3 SHA256 59101a6b5c25a4a8af7a18a7d9b206e3183380c80f490c251f9bb4140bcd7b6d
 AUX libmikmod-3.1.11-amd64-ppc64-archdef.patch 516 RMD160 3d5a063b7327c17b87790dae2b6399811403a602 SHA1 0773ab390f4ef2a30d921031b782b5ec3fb57f9e SHA256 206fe12a3d4460d6cf3e10b6c6476e3a569078e7b0bc101017ac6348d8a3b567
@@ -11,6 +8,7 @@ AUX libmikmod-3.2.0_beta2-64bit.patch 1044 RMD160 5d16f56caae168d875a5bb607f0981
 AUX libmikmod-3.2.0_beta2-autotools.patch 10264 RMD160 ea1718aaf0e75464522ba25b6aa8fd609a783667 SHA1 bb9ffc1164e01cb9ddb171573888501d647e3747 SHA256 fa0b1b75420efb86ad7ac627d1ac9b82ba233f594672879fcaa65778b7dc7513
 AUX libmikmod-3.2.0_beta2-doubleRegister.patch 722 RMD160 9b40114b4a966747af2905aaa38f3b1ee7e1d263 SHA1 f57811b14706dc31ece6206bc472a3ed7288f422 SHA256 f658d3459ef5bebf8daea407961cfa5f5059035a5fbbb56f81b26807fbe907f2
 AUX libmikmod-3.2.0_beta2-info.patch 1405 RMD160 7ce4c47e7ec34c5d2f33bd538d59a7f991563b0b SHA1 675cff9d348a3c03b5c2672a863688a6ad986301 SHA256 d116a38ad10292c5ee0c37a04e1ed3cd9436e432d5d6b4128721d168199b4be1
+AUX libmikmod-3.2.0_beta2-no-drv_raw.patch 312 RMD160 a3be6c7f01ebe90a14f016a0fa23de33578fc445 SHA1 a72b8ff78940218e589a4566c9349ad951b33f1a SHA256 6201e46dba0a7e3c5ab793b85e9db8469c467b44df0aa04201029939dee63947
 AUX libmikmod-CVE-2007-6720.patch 3178 RMD160 8c9e8493f609e79dc6981b6182c17a645220a5fe SHA1 311cbe9412eeeb576afed3425e28d6aae3abd822 SHA256 580ca0d63d94a7bd009346da49cf731e8d837a723af30f530be57c0084e2b8ab
 AUX libmikmod-CVE-2009-0179.patch 1401 RMD160 0c4967c39d5c67b6d677b05d7f223785b7d53c6a SHA1 fbfa3648f9368a2ad010a504f2650792797ea8a7 SHA256 386b8430c38c21e8c558db88fa1e1844459df1381e610843a39e6763cd6329fd
 DIST libmikmod-3.1.11-esdm4.patch.bz2 2944 RMD160 8abf8e31a5e3cb9ebee45a04b52ef04024894e25 SHA1 63e03cb0f34d3ece66af2403d9c2d5c463affe7b SHA256 3dc3d413a9c617b919523866768559bee487a240670040f987825305609987da
@@ -18,13 +16,7 @@ DIST libmikmod-3.1.11.tar.gz 611590 RMD160 79b144cce51340b4c9abe09d1110dba2333d7
 DIST libmikmod-3.2.0-beta2.tar.gz 760967 RMD160 db2cb3510874f50663528507a2d7598b6137bc3c SHA1 86ba141daf37ce059f83483aabaecddc0d504c73 SHA256 857b66ef04d695f70414188b985e08b04f1f62cc250d72a43d0e0609dfbdba03
 EBUILD libmikmod-3.1.11-r5.ebuild 1354 RMD160 3b8411c1c78ad2a184017b4e730f7dcd44527d63 SHA1 5a3e6f5748c1ec443f0a200a3003700eb3ad3a72 SHA256 0310aff7ed7c929906130c6093178288fe2b3a57fb6786fe46e378518efc507d
 EBUILD libmikmod-3.2.0_beta2-r1.ebuild 1353 RMD160 79898fecb97e16d8e4d98f43155e887fbb588f03 SHA1 390a4470e0291845e5330da9bc6279a4c01264de SHA256 03a03186e4851b8b7092de26116888b677d6f011af960dcd1a3202656ba29b79
+EBUILD libmikmod-3.2.0_beta2-r2.ebuild 1460 RMD160 c7081b619a3560f9e4911ec74790ff4eadfe8884 SHA1 bcd5e1dbf9f28e625c8b406fda01a3963fd2bac7 SHA256 7757d1e9b0491693edf384e39e345c0d79de562aa1156c925e4bb03c853d4ce2
 EBUILD libmikmod-3.2.0_beta2.ebuild 1131 RMD160 c143a18c0138e05a6155dca92a128b673704e6df SHA1 bd007be121927d1c60390c92b56a5182a04498de SHA256 2441a964126c194e0833bc93910ec3e50136c98263c0a60dd5bcfd0217fdfbf1
-MISC ChangeLog 9716 RMD160 517264aa6f17bfa5263715ba9edc2be714306982 SHA1 e6388660a23db034f7c03e62773501f3ac0a3c88 SHA256 eea0ce0588488c45a3ce767bd5f1757ab17cb0a8d7ea7fe92680fa739c820536
-MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAktkzF4ACgkQkKaRLQcq0GK9PQCgjZ+Z6IccS5w8xxoIGD5/F81z
-D8EAoJFgU8XwiF2x9IC9DN8ugCztGhQO
-=ZKvY
------END PGP SIGNATURE-----
+MISC ChangeLog 9980 RMD160 1b88e693db1a5ae817ab27a055fbcb27d7d6ea9d SHA1 74dc5336320d9c22e694de0d7b7a791877e9ee2f SHA256 9b2040af8326b47d1f1b8948a72c47f6138b234d62f4af2e9c7db50cb1629ca2
+MISC metadata.xml 236 RMD160 3969babbfba2230d4e8beec6e5a070dcad100a50 SHA1 57c9f2d501b5459469f2b43c6696e96275887507 SHA256 51c287082d15bcb9fa6e0464614f5bb1490dc3a3c533468de8a6523e46c85d0b
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 (file)
index 0000000..3bbd229
--- /dev/null
@@ -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 (file)
index 0000000..3eff8e3
--- /dev/null
@@ -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
+}
index e1774e3d9ad71fcd59b25ed8c584d61740a2d118..331b754ad12a7033dc31aaea3816721e96a2a8cc 100644 (file)
@@ -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>