diff options
| author | Krzysztof Krakowiak | 2010-12-15 08:44:32 (GMT) |
|---|---|---|
| committer | cvs2git | 2012-06-24 12:13:13 (GMT) |
| commit | 96ece3e1ac231b21a7c8443bf870f7bb44681279 (patch) | |
| tree | de6d5fedb2e2b1a44c77c0d3734b2d8e387b8076 | |
| parent | 30ab2630b0b173b98829545dfee15e9c4e5d9dc9 (diff) | |
| download | playmidi-master.zip playmidi-master.tar.gz | |
- added playmidi-awe_voice.patch and reverted in-spec change removing that header, because its no longer in-kernelHEADmaster
Changed files:
playmidi-awe_voice.patch -> 1.1
playmidi.spec -> 1.41
| -rw-r--r-- | playmidi-awe_voice.patch | 15 | ||||
| -rw-r--r-- | playmidi.spec | 11 |
2 files changed, 21 insertions, 5 deletions
diff --git a/playmidi-awe_voice.patch b/playmidi-awe_voice.patch new file mode 100644 index 0000000..a351bd3 --- /dev/null +++ b/playmidi-awe_voice.patch @@ -0,0 +1,15 @@ +--- playmidi-2.4/playmidi.h-dist.orig 2010-12-15 08:39:42.880937000 +0100 ++++ playmidi-2.4/playmidi.h-dist 2010-12-15 08:40:01.850937000 +0100 +@@ -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 ++#include "awe_voice.h" + + struct chanstate { + int program; diff --git a/playmidi.spec b/playmidi.spec index ce77928..a881503 100644 --- a/playmidi.spec +++ b/playmidi.spec @@ -12,7 +12,7 @@ Summary(pl.UTF-8): Odtwarzacz plików MIDI Summary(tr.UTF-8): FM, GUS ve MIDI aygıtları üzerindeki midi dosyalarını çalar Name: playmidi Version: 2.5 -Release: 1 +Release: 2 License: GPL Group: Applications/Sound Source0: http://dl.sourceforge.net/playmidi/%{name}-%{version}.tar.gz @@ -20,6 +20,7 @@ Source0: http://dl.sourceforge.net/playmidi/%{name}-%{version}.tar.gz Patch0: %{name}-hertz.patch Patch1: %{name}-make.patch Patch2: %{name}-midimap.patch +Patch3: %{name}-awe_voice.patch URL: http://sourceforge.net/projects/playmidi/ BuildRequires: glib-devel >= 1.2 %{?with_gtk:BuildRequires: gtk+-devel >= 1.2} @@ -28,7 +29,7 @@ BuildRequires: ncurses-devel >= 5.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _sysconfdir /etc/midi -%define _appdefsdir /usr/X11R6/lib/X11/app-defaults +%define _appdefsdir /usr/share/X11/app-defaults %description Playmidi plays MIDI (Musicial Instrument Digital Interface) sound @@ -131,16 +132,16 @@ odtwarzanie plików MIDI poprzez kartę dźwiękową. %prep %setup -q -n %{name}-2.4 -# awe_voice.h is now part of the kernel source. -rm -f awe_voice.h %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %{__make} playmidi xplaymidi %{?with_gtk:gtkplaymidi} %{?with_svga:splaymidi} \ CC="%{__cc}" \ -LIBX11="-L%{_prefix}/X11R6/%{_lib} -lXaw -lXmu -lXt -lX11 -lXext -lSM -lICE" \ + -I"$RPM_BUILD_ROOT" \ +LIBX11="-L%{_prefix}/%{_lib} -lXaw -lXmu -lXt -lX11 -lXext -lSM -lICE" \ %{?with_gtk:LIBGTK="`gtk-config --libs`"} \ OPT_FLAGS="%{rpmcflags} %{?with_gtk:`gtk-config --cflags`}" \ <<EOF |