Fix building with current linux-headers >=2.6.22.

Package-Manager: portage-2.1.3_rc9

5 files changed, 146 insertions, 5 deletions

diff --git a/media-sound/playmidi/ChangeLog b/media-sound/playmidi/ChangeLog
index 3d8c31eaccc8..8fda79713c83 100644
--- a/media-sound/playmidi/ChangeLog
+++ b/media-sound/playmidi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/playmidi
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/playmidi/ChangeLog,v 1.10 2007/07/22 08:32:18 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/playmidi/ChangeLog,v 1.11 2007/07/25 13:37:25 drac Exp $
+
+*playmidi-2.5-r2 (25 Jul 2007)
+
+  25 Jul 2007; Samuli Suominen <drac@gentoo.org>
+  +files/playmidi-2.5-includes.patch, +playmidi-2.5-r2.ebuild:
+  Fix building with current linux-headers >=2.6.22.
 
   22 Jul 2007; Samuli Suominen <drac@gentoo.org> playmidi-2.5-r1.ebuild:
   Remove virtual/x11 references.
diff --git a/media-sound/playmidi/Manifest b/media-sound/playmidi/Manifest
index 9f8d48d21c3d..e59f5aab9ad6 100644
--- a/media-sound/playmidi/Manifest
+++ b/media-sound/playmidi/Manifest
@@ -2,6 +2,10 @@ AUX CAN-2005-0020.patch 2512 RMD160 cc0706f71d7f8be7b939ff69bf608a8fe913dd1e SHA
 MD5 689e23daf8f2c4890c537153642c682d files/CAN-2005-0020.patch 2512
 RMD160 cc0706f71d7f8be7b939ff69bf608a8fe913dd1e files/CAN-2005-0020.patch 2512
 SHA256 35b550aac776e7476de0c4711e41be74d4afc8b061ec69307bbba8df81ddf024 files/CAN-2005-0020.patch 2512
+AUX playmidi-2.5-includes.patch 2365 RMD160 01a483bd498b6f411496f0dbdd0b26952a19baaf SHA1 6dbd186eb1df9cf34f1ac2e747d29bcded0f0b92 SHA256 9c8f01351fc221f1c5c6962fa216e23a9b2a244632bd3d43a759f82b65e84269
+MD5 4b4dcbdb86263de1029e201dc035e47a files/playmidi-2.5-includes.patch 2365
+RMD160 01a483bd498b6f411496f0dbdd0b26952a19baaf files/playmidi-2.5-includes.patch 2365
+SHA256 9c8f01351fc221f1c5c6962fa216e23a9b2a244632bd3d43a759f82b65e84269 files/playmidi-2.5-includes.patch 2365
 AUX playmidi-2.5.patch 773 RMD160 25c8bbfee154fce91f5c3b21f61f5dc60af0d089 SHA1 5937817278cde486e980bec5e4601ff10da2898d SHA256 5ccaa809ab46f64d82177ed34020028672bd67f5963802b77c10506502ea4f96
 MD5 ee0356dc56ad13119227d036ad8f409a files/playmidi-2.5.patch 773
 RMD160 25c8bbfee154fce91f5c3b21f61f5dc60af0d089 files/playmidi-2.5.patch 773
@@ -11,10 +15,14 @@ EBUILD playmidi-2.5-r1.ebuild 1599 RMD160 25d5e63cb1c1f5b1b3e2041ee0aad67fa4b96b
 MD5 be013005f3ffce3e864efe742cdb8101 playmidi-2.5-r1.ebuild 1599
 RMD160 25d5e63cb1c1f5b1b3e2041ee0aad67fa4b96b6d playmidi-2.5-r1.ebuild 1599
 SHA256 4c8f05f0ac8935ababb3224a121a8bf457c32dcac5f3b87f8e279c6d39503f59 playmidi-2.5-r1.ebuild 1599
-MISC ChangeLog 1405 RMD160 82595391a95ad71a86162c8c7aaba0028fc9670b SHA1 ad783dc5ab2f2256528f00849f9b911f8a2bb1ca SHA256 9ea18689ef08d8886d7e4e383a4596442b9d4966a1831f86194bee5e8b700530
-MD5 22100c3fd96cb28c464eed8bd4eb03a0 ChangeLog 1405
-RMD160 82595391a95ad71a86162c8c7aaba0028fc9670b ChangeLog 1405
-SHA256 9ea18689ef08d8886d7e4e383a4596442b9d4966a1831f86194bee5e8b700530 ChangeLog 1405
+EBUILD playmidi-2.5-r2.ebuild 1364 RMD160 1abf631d52d821919bdea77b61f25f889921e067 SHA1 5e0752f1dad5c63850195bb0450af6a253544e8d SHA256 c8ac74f4d8aaa13bd61469ca7361e6b248152671e2bae1eb5b394936bb1be1d1
+MD5 4f2b490dbd0b20047ab2b4cea0967934 playmidi-2.5-r2.ebuild 1364
+RMD160 1abf631d52d821919bdea77b61f25f889921e067 playmidi-2.5-r2.ebuild 1364
+SHA256 c8ac74f4d8aaa13bd61469ca7361e6b248152671e2bae1eb5b394936bb1be1d1 playmidi-2.5-r2.ebuild 1364
+MISC ChangeLog 1602 RMD160 f9c57b7470e47081de945cb648816f9525044d1d SHA1 d40379e422a0dd9b2425a4a90e02817d3789d990 SHA256 f381a209bbc5fdb293b83fb906a924f2dd81fa65d44e5e520cde3401bab1b7d2
+MD5 ea12e1d1ba99c40a6a0f1319d5c6e599 ChangeLog 1602
+RMD160 f9c57b7470e47081de945cb648816f9525044d1d ChangeLog 1602
+SHA256 f381a209bbc5fdb293b83fb906a924f2dd81fa65d44e5e520cde3401bab1b7d2 ChangeLog 1602
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -22,3 +30,6 @@ SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata
 MD5 7a1883337e06df7d5cd451e6061ea00e files/digest-playmidi-2.5-r1 238
 RMD160 fc16e73bb1ca6825d7f658665456d94e4742e42e files/digest-playmidi-2.5-r1 238
 SHA256 dd0dbee926ef956042aa92816705962af29951f328f65e9bdb39ac8fae1c5a74 files/digest-playmidi-2.5-r1 238
+MD5 7a1883337e06df7d5cd451e6061ea00e files/digest-playmidi-2.5-r2 238
+RMD160 fc16e73bb1ca6825d7f658665456d94e4742e42e files/digest-playmidi-2.5-r2 238
+SHA256 dd0dbee926ef956042aa92816705962af29951f328f65e9bdb39ac8fae1c5a74 files/digest-playmidi-2.5-r2 238
diff --git a/media-sound/playmidi/files/digest-playmidi-2.5-r2 b/media-sound/playmidi/files/digest-playmidi-2.5-r2
new file mode 100644
index 000000000000..b76c824341aa
--- /dev/null
+++ b/media-sound/playmidi/files/digest-playmidi-2.5-r2
@@ -0,0 +1,3 @@
+MD5 ce27bfbc4e122f103bf3d2fe8d253011 playmidi-2.5.tar.gz 147687
+RMD160 60dc546465e14f2dbdd384717aab1bc6ad2ef9a5 playmidi-2.5.tar.gz 147687
+SHA256 a7ce37c2a2234fc875290e6ecc897ea2d405c63e95eda5244487c6a7053bfbdd playmidi-2.5.tar.gz 147687
diff --git a/media-sound/playmidi/files/playmidi-2.5-includes.patch b/media-sound/playmidi/files/playmidi-2.5-includes.patch
new file mode 100644
index 000000000000..0a93c5930892
--- /dev/null
+++ b/media-sound/playmidi/files/playmidi-2.5-includes.patch
@@ -0,0 +1,66 @@
+diff -ur playmidi-2.4.orig/Makefile playmidi-2.4/Makefile
+--- playmidi-2.4.orig/Makefile	1998-10-01 05:39:18.000000000 +0300
++++ playmidi-2.4/Makefile	2007-07-25 16:22:23.000000000 +0300
+@@ -12,38 +12,38 @@
+ 
+ # ncurses usually /usr/lib, -L/usr/local/lib doesn't hurt
+ # unless there's more than one ncurses floating around on your system
+-LIBNC	= -L/usr/local/lib -lncurses
++LIBNC	= -L/usr/lib -lncurses
+ 
+ ######### NOTE:  X11R6 or newer REQUIRED
+-LIBX11	= -L/usr/X11R6/lib -lXaw -lXmu -lXt -lX11 -lXext -lSM -lICE
+-LIBGTK	= -L/usr/X11R6/lib -lgtk-1.1 -lgdk-1.1 -lglib-1.1 -lX11 -lXext -lm
+-LIBVGA	= -L/usr/local/lib -lvgagl -lvga
++LIBX11	= -L/usr/lib -lXaw -lXmu -lXt -lX11 -lXext -lSM -lICE
++LIBGTK	= -L/usr/lib -lgtk-1.1 -lgdk-1.1 -lglib-1.1 -lX11 -lXext -lm
++LIBVGA	= -L/usr/lib -lvgagl -lvga
+ 
+ # ncurses is usually in /usr/include/ncurses, but you may need
+ # to use /usr/local/include/ncurses depending on your setup.
+ INCNC	= -I/usr/include/ncurses
+ 
+ # just in case you keep your X includes in an odd location.
+-INCX11	= -I/usr/X11R6/include -DNARROWPROTO
++INCX11	= -I/usr/include -DNARROWPROTO
+ 
+ # stuff for sound blaster awe32
+ INCAWE  = -DVOXWARE_CONTROLLER_7_WORKING
+ # awe_voice.h path
+-INCAWE  += -I/usr/lib/oss/include/sys
++INCAWE  += -I.
+ 
+ # usually in /usr/include, but -I/usr/local/include doesn't hurt
+ # unless there's more than one svgalib floating around your system.
+-INCVGA	= -I/usr/local/include
++INCVGA	= -I/usr/include
+ 
+ # Directory where application defaults files are stored for X11 version
+-XAPPDEFAULTS = /usr/X11R6/lib/X11/app-defaults
++XAPPDEFAULTS = /usr/share/X11/app-defaults
+ 
+ INCLUDES= $(INCNC) $(INCX11) $(INCVGA) $(INCAWE)
+ INSTALLDIR = /usr/bin
+ INSTALL = install -s
+ 
+ # if you are using the GUS Ultra driver module, add -DULTRA_DRIVER
+-CFLAGS	= -Wall -pipe -fomit-frame-pointer -O2 -m486 $(INCAWE)
++CFLAGS	= -Wall $(INCAWE)
+ LDFLAGS =
+ 
+ OBJECTS = playmidi.o readmidi.o playevents.o \
+diff -ur playmidi-2.4.orig/playmidi.h-dist playmidi-2.4/playmidi.h-dist
+--- playmidi-2.4.orig/playmidi.h-dist	1997-05-12 00:26:36.000000000 +0300
++++ playmidi-2.4/playmidi.h-dist	2007-07-25 16:22:44.000000000 +0300
+@@ -52,11 +52,7 @@
+ #include <stdlib.h>
+ #include <sys/soundcard.h>
+ #include <sys/ioctl.h>
+-#ifdef linux
+-#include <linux/awe_voice.h>
+-#else
+ #include <awe_voice.h>
+-#endif
+ 
+ struct chanstate {
+     int program;
diff --git a/media-sound/playmidi/playmidi-2.5-r2.ebuild b/media-sound/playmidi/playmidi-2.5-r2.ebuild
new file mode 100644
index 000000000000..5071f80b2e50
--- /dev/null
+++ b/media-sound/playmidi/playmidi-2.5-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/playmidi/playmidi-2.5-r2.ebuild,v 1.1 2007/07/25 13:37:25 drac Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Command Line and GUI based MIDI Player"
+HOMEPAGE="http://sourceforge.net/projects/playmidi/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="svga X"
+
+RDEPEND="sys-libs/ncurses
+	svga? ( media-libs/svgalib )
+	X? ( x11-libs/libX11
+		x11-libs/libSM
+		x11-libs/libXaw )"
+DEPEND="${RDEPEND}
+	X? ( x11-proto/xextproto )"
+
+S="${WORKDIR}/${P/2.5/2.4}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}.patch
+	epatch "${FILESDIR}"/CAN-2005-0020.patch
+	epatch "${FILESDIR}"/${P}-includes.patch
+}
+
+src_compile() {
+	local targets="playmidi"
+
+	use svga && targets="$targets splaymidi"
+	use X && targets="$targets xplaymidi"
+
+	echo "5" | ./Configure
+
+	emake -j1 CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+		depend clean || die "emake failed."
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -I." LDFLAGS="${LDFLAGS}" ${targets} \
+		|| die "emake failed."
+}
+
+src_install() {
+	dobin playmidi
+	use svga && dobin splaymidi
+	use X && dobin xplaymidi
+	dodoc BUGS QuickStart README.1ST
+	docinto techref
+	dodoc techref/*
+}