Fix building with current linux-headers >=2.6.22.

(Portage version: 2.1.3_rc9)

4 files changed, 131 insertions, 1 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/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/*
+}