From 59b3b08e0d7c8fb30554632ceeb46324fae41888 Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Thu, 28 Aug 2003 22:12:18 +0000
Subject: [PATCH] - updated alsa9 patch (builds, !tested), made it default

Changed files:
    allegro-alsa9.patch -> 1.4
    allegro.spec -> 1.38
---
 allegro-alsa9.patch | 37 +++++++++++++------------------------
 allegro.spec        | 16 ++++++++--------
 2 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/allegro-alsa9.patch b/allegro-alsa9.patch
index 8b338e5..2402b99 100644
--- a/allegro-alsa9.patch
+++ b/allegro-alsa9.patch
@@ -38,22 +38,6 @@
  
  
  /************************************/
-diff -uNr allegro-4.1.6.old/acconfig.h allegro-4.1.6/acconfig.h
---- allegro-4.1.6.old/acconfig.h	Sat Nov 30 12:13:21 2002
-+++ allegro-4.1.6/acconfig.h	Fri Dec  6 17:40:10 2002
-@@ -79,6 +79,12 @@
- /* Define if ALSA MIDI driver is supported.  */
- #undef ALLEGRO_WITH_ALSAMIDI
- 
-+/* Define if ALSA9 DIGI driver is supported.  */
-+#undef ALLEGRO_WITH_ALSA9DIGI
-+
-+/* Define if ALSA9 MIDI driver is supported.  */
-+#undef ALLEGRO_WITH_ALSA9MIDI
-+
- /* Define if ESD DIGI driver is supported.  */
- #undef ALLEGRO_WITH_ESDDIGI
- 
 diff -uNr allegro-4.1.6.old/aclocal.m4 allegro-4.1.6/aclocal.m4
 --- allegro-4.1.6.old/aclocal.m4	Sat Nov 30 12:13:21 2002
 +++ allegro-4.1.6/aclocal.m4	Fri Dec  6 17:40:10 2002
@@ -130,28 +114,33 @@ diff -uNr allegro-4.1.6.old/allegro.mft allegro-4.1.6/allegro.mft
  allegro/src/unix/arts.c
  allegro/src/unix/sgial.c
  allegro/src/unix/udjgpp.c
-diff -uNr allegro-4.1.6.old/configure.in allegro-4.1.6/configure.in
---- allegro-4.1.6.old/configure.in	Sat Nov 30 12:13:21 2002
-+++ allegro-4.1.6/configure.in	Fri Dec  6 17:40:10 2002
-@@ -304,6 +304,17 @@
-   AC_DEFINE(ALLEGRO_WITH_ALSAMIDI)
+--- allegro-4.1.11/configure.in.orig	2003-06-30 01:27:00.000000000 +0200
++++ allegro-4.1.11/configure.in	2003-08-28 22:06:21.582127920 +0200
+@@ -313,6 +313,23 @@
+   _disabled_modules="alsamidi $_disabled_modules"
  fi
  
 +dnl Test for ALSA9 drivers.
 +ALLEGRO_ACTEST_ALSA9DIGI
 +if test "$allegro_cv_support_alsa9digi" = yes; then
-+  AC_DEFINE(ALLEGRO_WITH_ALSA9DIGI)
++  AC_DEFINE(ALLEGRO_WITH_ALSA9DIGI,1,[Define if ALSA9 DIGI driver is supported.])
++  _enabled_modules="alsa9digi $_enabled_modules"
++else
++  _disabled_modules="alsa9digi $_disabled_modules"
 +fi
 +
 +ALLEGRO_ACTEST_ALSA9MIDI
 +if test "$allegro_cv_support_alsa9midi" = yes; then
-+  AC_DEFINE(ALLEGRO_WITH_ALSA9MIDI)
++  AC_DEFINE(ALLEGRO_WITH_ALSA9MIDI,1,[Define if ALSA9 MIDI driver is supported.])
++  _enabled_modules="alsa9midi $_enabled_modules"
++else
++  _disabled_modules="alsa9midi $_disabled_modules"
 +fi
 +
  dnl Test for ESD drivers.
  ALLEGRO_ACTEST_ESDDIGI
  if test -n "$allegro_support_esddigi"; then
-@@ -478,6 +489,16 @@
+@@ -558,6 +575,16 @@
      ALLEGRO_MODULE_TARGETS="$ALLEGRO_MODULE_TARGETS lib/unix/alleg-alsamidi.so"
    fi
  
diff --git a/allegro.spec b/allegro.spec
index 7754826..dfc8935 100644
--- a/allegro.spec
+++ b/allegro.spec
@@ -5,16 +5,14 @@
 # _without_dbglib	- don't build debug versions of library
 # _without_proflib	- don't debug profiling versions of library
 # _without_svgalib      - without svgalib module
-# _with_alsa9	- use alsa 0.9 not 0.5
+# _with_alsa5		- use alsa 0.5 not 0.9
 #
-
-%define	_without_alsa	1
 %define	_without_arts	1
 
 %ifarch sparc sparc64
 %define	_without_alsa	1
 %endif
-%{!?_without_alsa:%{!?_with_alsa9:%define _with_alsa5 1}}
+%{!?_without_alsa:%{!?_with_alsa5:%define _with_alsa9 1}}
 Summary:	A game programming library
 Summary(de):	Eine Bibliothek zur Programmierung von Spielen
 Summary(es):	Una libreria de programacion de juegos
@@ -395,17 +393,18 @@ Group:		Development/Libraries
 Requires:	%{name} = %{version}
 
 %description examples
-This package contains example programs which are showing
-allegro features.
+This package contains example programs which demonstrate allegro
+features.
 
 %description examples -l pl
-Pakiet zawiera programy przyk³adowe demonstruj±ce mo?liwo¶ci biblioteki allegro.
+Pakiet zawiera programy przyk³adowe demonstruj±ce mo¿liwo¶ci
+biblioteki allegro.
 
 %prep
 %setup  -q
 %patch0 -p1
 %patch1 -p1
-#%patch2 -p1	# you want it, you do it
+%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 
@@ -580,6 +579,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/exblend
 %attr(755,root,root) %{_bindir}/excamera
 %attr(755,root,root) %{_bindir}/excolmap
+%attr(755,root,root) %{_bindir}/exconfig
 %attr(755,root,root) %{_bindir}/excustom
 %attr(755,root,root) %{_bindir}/exdata
 %attr(755,root,root) %{_bindir}/exdbuf
-- 
2.44.0