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

[Aurelien Jarno]

Author: aurel32
Date: 2006-06-03 14:04:26 +0000 (Sat, 03 Jun 2006)
New Revision: 77

Modified:
   unstable/libsdl1.2/debian/changelog
   unstable/libsdl1.2/debian/control
   unstable/libsdl1.2/debian/rules
Log:
  * debian/rules, debian/control:
    - Enable libsvga1 support on amd64.
    - Explicitely disable libsvga support on other architectures to make 
      sure that the resulting library will not be linked with libsvga1 if
      libsvga1-dev is installed on the system.



Modified: unstable/libsdl1.2/debian/changelog
===================================================================
--- unstable/libsdl1.2/debian/changelog	2006-06-02 18:46:19 UTC (rev 76)
+++ unstable/libsdl1.2/debian/changelog	2006-06-03 14:04:26 UTC (rev 77)
@@ -1,3 +1,13 @@
+libsdl1.2 (1.2.10-3) unstable; urgency=low
+
+  * debian/rules, debian/control:
+    - Enable libsvga1 support on amd64.
+    - Explicitely disable libsvga support on other architectures to make 
+      sure that the resulting library will not be linked with libsvga1 if
+      libsvga1-dev is installed on the system.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Sat,  3 Jun 2006 15:57:40 +0200
+
 libsdl1.2 (1.2.10-2) unstable; urgency=low
 
   * Reduce the shlibs dependency from (>> 1.2.10-1) to (>= 1.2.10-1)

Modified: unstable/libsdl1.2/debian/control
===================================================================
--- unstable/libsdl1.2/debian/control	2006-06-02 18:46:19 UTC (rev 76)
+++ unstable/libsdl1.2/debian/control	2006-06-03 14:04:26 UTC (rev 77)
@@ -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.7.2
-Build-Depends: dpkg (>= 1.13.2), debhelper (>= 4.0), quilt, nasm [i386 kfreebsd-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 [i386 ia64 alpha amd64 armeb arm hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], libaudio-dev, libdirectfb-dev (>= 0.9.22), libusbhid-dev [kfreebsd-i386 kfreebsd-amd64]
+Build-Depends: dpkg (>= 1.13.2), debhelper (>= 4.0), quilt, nasm [i386 kfreebsd-i386], libaa1-dev, libx11-dev, libxext-dev, libxt-dev, libxv-dev, x-dev, libaudiofile-dev, libesd0-dev, xlibmesa-gl-dev | libgl-dev, libsvga1-dev [amd64 i386], libarts1-dev, libartsc0-dev, libasound2-dev [i386 ia64 alpha amd64 armeb arm hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], libaudio-dev, libdirectfb-dev (>= 0.9.22), libusbhid-dev [kfreebsd-i386 kfreebsd-amd64]
 
 Package: libsdl1.2debian
 Architecture: any

Modified: unstable/libsdl1.2/debian/rules
===================================================================
--- unstable/libsdl1.2/debian/rules	2006-06-02 18:46:19 UTC (rev 76)
+++ unstable/libsdl1.2/debian/rules	2006-06-03 14:04:26 UTC (rev 77)
@@ -9,7 +9,9 @@
 
 DEB_HOST_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_ARCH		?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 DEB_BUILD_ARCH_OS	?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
+DEB_BUILD_ARCH_CPU	?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
 
 export DEB_HOST_GNU_TYPE
 export DEB_BUILD_GNU_TYPE
@@ -45,17 +47,19 @@
   confflags += --disable-debug
 endif
 
-# Only build SVGA support on linux-x86
-ifeq ($(shell dpkg-architecture -qDEB_BUILD_ARCH),i386)
+# Only build SVGA support on linux-x86 and linux-amd64
+ifneq (,$(findstring $(DEB_BUILD_ARCH),amd64 i386)
   all_confflags += --enable-video-svga
   LIBSVGA1-DEV = libsvga1-dev
+else
+  all_confflags += --disable-video-svga
 endif
 # Only depends on libusbhid-dev on GNU/kFreeBSd
 ifeq ($(DEB_BUILD_ARCH_OS),kfreebsd)
   LIBUSBHID-DEV = libusbhid-dev
 endif
 # Only use NASM routines on x86 CPUs
-ifeq ($(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU),i386)
+ifeq ($(DEB_BUILD_ARCH_CPU),i386)
   confflags += --enable-nasm
 endif