r1011 - in /unstable/vlc/debian: changelog rules

[lool at users.alioth.debian.org]

Author: lool
Date: Fri Jan 11 17:04:53 2008
New Revision: 1011

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1011
Log:
--enable-svgalib on amd64

Modified:
    unstable/vlc/debian/changelog
    unstable/vlc/debian/rules

Modified: unstable/vlc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/vlc/debian/changelog?rev=1011&op=diff
==============================================================================
--- unstable/vlc/debian/changelog (original)
+++ unstable/vlc/debian/changelog Fri Jan 11 17:04:53 2008
@@ -18,7 +18,7 @@
   * Ack NMU by Nico Golde; thanks!
   * Wrap more deps.
   * Also build vlc-plugin-svgalib package on amd64 as well; build-dep on
-    libsvga1-dev on amd64 too.
+    libsvga1-dev on amd64 too; --enable-svgalib on amd64.
   * Drop debian/*.dirs.
 
  -- Loic Minier <lool at dooz.org>  Fri, 11 Jan 2008 17:32:36 +0100

Modified: unstable/vlc/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/vlc/debian/rules?rev=1011&op=diff
==============================================================================
--- unstable/vlc/debian/rules (original)
+++ unstable/vlc/debian/rules Fri Jan 11 17:04:53 2008
@@ -9,6 +9,7 @@
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_ARCH      ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_ARCH_OS    ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
@@ -84,9 +85,13 @@
 confflags += --enable-alsa --enable-dv --enable-v4l --enable-pvr
 endif
 
-# Glide and svgalib are only for x86 on Linux
-ifeq ($(shell dpkg-architecture -qDEB_BUILD_ARCH),i386)
+# Glide is only for x86 on Linux
+ifeq ($(DEB_BUILD_ARCH),i386)
 confflags += --enable-glide
+endif
+
+# svgalib is only for x86 and x86-64 on Linux
+ifneq ($(filter $(DEB_BUILD_ARCH), amd64 i386),)
 confflags += --enable-svgalib
 endif