r4806 - in packages/branches/openal/unstable/debian: . patches

[Emmet Hikory]

Author: persia-guest
Date: 2007-11-30 19:21:37 +0000 (Fri, 30 Nov 2007)
New Revision: 4806

Added:
   packages/branches/openal/unstable/debian/patches/x64_64-disable-MMX.diff
Modified:
   packages/branches/openal/unstable/debian/changelog
   packages/branches/openal/unstable/debian/control
   packages/branches/openal/unstable/debian/patches/series
Log:
Add changes for 1:0.0.8-7, including:
    Myself as uploading
    x86_64-disable-MMX.patch to get it working again for AMD64 SMP



Modified: packages/branches/openal/unstable/debian/changelog
===================================================================
--- packages/branches/openal/unstable/debian/changelog	2007-11-30 19:15:11 UTC (rev 4805)
+++ packages/branches/openal/unstable/debian/changelog	2007-11-30 19:21:37 UTC (rev 4806)
@@ -1,3 +1,13 @@
+openal (1:0.0.8-7) unstable; urgency=low
+
+  [ Emmet Hikory ]
+  * Add x64_64-disable-MMX.diff to restore AMD64 SMP support (Closes: #428375)
+
+  [ Reinhard Tartler ]
+  * Add Emmet to uploaders.
+
+ -- Reinhard Tartler <siretart at tauware.de>  Fri, 30 Nov 2007 17:33:59 +0100
+
 openal (1:0.0.8-6) unstable; urgency=low
 
   * Continue the switch to quilt by moving all source modifications from the

Modified: packages/branches/openal/unstable/debian/control
===================================================================
--- packages/branches/openal/unstable/debian/control	2007-11-30 19:15:11 UTC (rev 4805)
+++ packages/branches/openal/unstable/debian/control	2007-11-30 19:21:37 UTC (rev 4806)
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Reinhard Tartler <siretart at tauware.de>, Thierry Reding <thierry at doppeltgemoppelt.de>, Eddy Petrişor <eddy.petrisor at gmail.com>, Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>, Gonéri Le Bouder <goneri at rulezlan.org>
+Uploaders: Reinhard Tartler <siretart at tauware.de>, Thierry Reding <thierry at doppeltgemoppelt.de>, Eddy Petrişor <eddy.petrisor at gmail.com>, Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>, Gonéri Le Bouder <goneri at rulezlan.org>, Emmet Hikory <emmet.hikory at gmail.com>
 Build-Depends: debhelper (>= 5.0.0), texinfo, libsdl1.2-dev (>= 1.2.7), libesd0-dev, libsmpeg-dev, libvorbis-dev (>= 1.0.1), libasound2-dev (>= 1.0.5) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libarts1-dev (>= 1.3.0), quilt
 Standards-Version: 3.7.2
 

Modified: packages/branches/openal/unstable/debian/patches/series
===================================================================
--- packages/branches/openal/unstable/debian/patches/series	2007-11-30 19:15:11 UTC (rev 4805)
+++ packages/branches/openal/unstable/debian/patches/series	2007-11-30 19:21:37 UTC (rev 4806)
@@ -2,3 +2,4 @@
 kfreebsd_linking.diff
 pkg-config_drop_requirements.diff
 undocumented_alext_header.diff
+x64_64-disable-MMX.diff -p0

Added: packages/branches/openal/unstable/debian/patches/x64_64-disable-MMX.diff
===================================================================
--- packages/branches/openal/unstable/debian/patches/x64_64-disable-MMX.diff	                        (rev 0)
+++ packages/branches/openal/unstable/debian/patches/x64_64-disable-MMX.diff	2007-11-30 19:21:37 UTC (rev 4806)
@@ -0,0 +1,64 @@
+Index: configure
+===================================================================
+--- configure.orig
++++ configure
+@@ -22428,7 +22428,7 @@
+ esac
+ 
+ case "$target" in
+-    *i386* | *i486* | *i586* | *i686* | *x86_64*)
++    *i386* | *i486* | *i586* | *i686*)
+     openal_x86_support_yn=yes
+ 
+     echo "$as_me:$LINENO: checking for MMX support" >&5
+Index: configure.ac
+===================================================================
+--- configure.ac.orig
++++ configure.ac
+@@ -365,7 +365,7 @@
+ 
+ dnl Special objs for architectures
+ case "$target" in
+-    *i386* | *i486* | *i586* | *i686* | *x86_64*)
++    *i386* | *i486* | *i586* | *i686*)
+     openal_x86_support_yn=yes
+ 
+     AC_MSG_CHECKING([for MMX support])
+Index: src/al_mixfunc.c
+===================================================================
+--- src/al_mixfunc.c.orig
++++ src/al_mixfunc.c
+@@ -38,7 +38,7 @@
+ 		return AL_FALSE;
+ 	}
+ 
+-#ifdef __MMX__
++#ifdef USE_LIGHT_GEN_MIXING
+ 	if (_alHaveMMX()) {
+ 		/* FIXME: we really ignore size. */
+ 		mf->max      = MMXMIXSOURCES;
+@@ -83,7 +83,7 @@
+ 	
+ 		return AL_TRUE;
+ 	}
+-#endif /* __MMX__ */
++#endif /* USE_LIGHT_GEN_MIXING */
+ 
+ 	/* FIXME: we really ignore size. */
+ 	mf->max      = GENMIXSOURCES;
+Index: src/mixaudio16.h
+===================================================================
+--- src/mixaudio16.h.orig
++++ src/mixaudio16.h
+@@ -12,9 +12,9 @@
+ #include "al_types.h"
+ #include "al_siteconfig.h"
+ 
+-#ifdef __MMX__
++#ifdef USE_LIGHT_GEN_MIXING
+ #include "mixaudio16_mmx_prk.h"
+-#endif /* __MMX__ */
++#endif /* USE_LIGHT_GEN_MIXING */
+ 
+ /*
+  * max_audioval is the maximum value of a signed short.