[Pkg-sdl-commits] r20 - unstable/libsdl1.2/debian

[Aurelien Jarno]

Author: aurel32
Date: 2006-02-28 23:45:46 +0000 (Tue, 28 Feb 2006)
New Revision: 20

Modified:
   unstable/libsdl1.2/debian/changelog
   unstable/libsdl1.2/debian/control
   unstable/libsdl1.2/debian/rules
Log:
 * debian/control:
   + Build-depends on NASM for all i386 platforms
 * debian/rules:
   + Use NASM on all i386 platforms.
   + Build SVGA support on linux i386 only.




Modified: unstable/libsdl1.2/debian/changelog
===================================================================
--- unstable/libsdl1.2/debian/changelog	2006-02-28 21:09:47 UTC (rev 19)
+++ unstable/libsdl1.2/debian/changelog	2006-02-28 23:45:46 UTC (rev 20)
@@ -1,5 +1,6 @@
 libsdl1.2 (1.2.9-4) unstable; urgency=low
 
+  [ Sam Hocevar (Debian packages) ]
   * debian/control:
     + Build-depend on NASM.
   * debian/rules:
@@ -13,6 +14,13 @@
   * debian/patches/009_alsa_priority.diff:
     + When both are available, try the ALSA output driver before the OSS one.
 
+  [ Aurelien Jarno ]
+  * debian/control:
+    + Build-depends on NASM for all i386 platforms
+  * debian/rules:
+    + Use NASM on all i386 platforms.
+    + Build SVGA support on linux i386 only.
+
  -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Tue, 28 Feb 2006 01:48:50 +0100
 
 libsdl1.2 (1.2.9-3) unstable; urgency=low

Modified: unstable/libsdl1.2/debian/control
===================================================================
--- unstable/libsdl1.2/debian/control	2006-02-28 21:09:47 UTC (rev 19)
+++ unstable/libsdl1.2/debian/control	2006-02-28 23:45:46 UTC (rev 20)
@@ -4,7 +4,7 @@
 Maintainer: Debian SDL packages maintainers <pkg-sdl-maintainers at lists.alioth.debian.org>
 Uploaders: Matthew Danish <mrd at debian.org>, Zephaniah E. Hull <warp at debian.org>, Lawrence Williams <lawrence_cecil_williams at hotmail.com>, Sam Hocevar (Debian packages) <sam+deb at zoy.org>, Aurelien Jarno <aurel32 at debian.org>, Josselin Mouette <joss at debian.org>
 Standards-Version: 3.6.2
-Build-Depends: dpkg (>= 1.13.2), debhelper (>= 4.0), dbs, nasm [i386], libaa1-dev, libx11-dev, libxext-dev, libxt-dev, libxv-dev, x-dev, libaudiofile-dev, libesd0-dev, xlibmesa-gl-dev | libgl-dev, libsvga1-dev [i386], libarts1-dev, libartsc0-dev, libasound2-dev [linux-any], libaudio-dev, libdirectfb-dev (>= 0.9.22)
+Build-Depends: dpkg (>= 1.13.2), debhelper (>= 4.0), dbs, nasm [any-i386], libaa1-dev, libx11-dev, libxext-dev, libxt-dev, libxv-dev, x-dev, libaudiofile-dev, libesd0-dev, xlibmesa-gl-dev | libgl-dev, libsvga1-dev [i386], libarts1-dev, libartsc0-dev, libasound2-dev [linux-any], libaudio-dev, libdirectfb-dev (>= 0.9.22)
 
 Package: libsdl1.2debian
 Architecture: any

Modified: unstable/libsdl1.2/debian/rules
===================================================================
--- unstable/libsdl1.2/debian/rules	2006-02-28 21:09:47 UTC (rev 19)
+++ unstable/libsdl1.2/debian/rules	2006-02-28 23:45:46 UTC (rev 20)
@@ -39,12 +39,15 @@
   confflags += --disable-debug
 endif
 
-# Only build SVGA support and use NASM routines on linux-x86
-ifeq ($(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU),i386)
-  confflags += --enable-nasm
+# Only build SVGA support on linux-x86
+ifeq ($(shell dpkg-architecture -qDEB_BUILD_ARCH),i386)
   all_confflags += --enable-video-svga
   LIBSVGA1-DEV = libsvga1-dev
 endif
+# Only use NASM routines on x86 CPUs
+ifeq ($(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU),i386)
+  confflags += --enable-nasm
+endif
 
 # Only build ALSA support on Linux targets
 ifeq ($(DEB_BUILD_ARCH_OS),linux)