tags 402104 + patch
block 402104 with 448537
thanks
With the attached patch, and bug #448537 fixed, zsnes builds on amd64.
- Josh Triplett
-- System Information:
Debian Release: lenny/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.22-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages zsnes depends on:
ii ia32-libs 2.2 ia32 shared libraries for use on a
ii lib32gcc1 1:4.2.2-3 GCC support library (32 bit Versio
ii lib32stdc++6 4.2.2-3 The GNU Standard C++ Library v3 (3
ii lib32z1 1:1.2.3.3.dfsg-7 compression library - 32 bit runti
ii libc6-i386 2.6.1-6 GNU C Library: 32bit shared librar
ii libsdl1.2debian 1.2.12-1 Simple DirectMedia Layer
zsnes recommends no packages.
-- no debconf information
diff -Naur zsnes-1.510.orig/debian/control zsnes-1.510/debian/control
--- zsnes-1.510.orig/debian/control 2007-11-01 23:29:13.000000000 -0700
+++ zsnes-1.510/debian/control 2007-11-01 23:51:41.000000000 -0700
@@ -2,11 +2,11 @@
Section: otherosfs
Priority: optional
Maintainer: Joshua Kwan <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4), nasm, libsdl1.2-dev (>= 1.2.2-3.1),
zlib1g-dev, sharutils, xutils, libpng12-dev | libpng-dev, xlibmesa-gl-dev,
dpatch, libao-dev
+Build-Depends: dpkg-dev (>= 1.13.2), debhelper (>= 4), gcc-multilib [!i386],
g++-multilib [!i386], ia32-libs [!i386], nasm, libsdl1.2-dev (>= 1.2.2-3.1),
zlib1g-dev [i386] | lib32z1-dev [!i386], sharutils, xutils, libpng12-dev |
libpng-dev, libgl1-mesa-dev, dpatch, libao-dev [i386]
Standards-Version: 3.7.2
Package: zsnes
-Architecture: i386
+Architecture: i386 amd64
Depends: ${shlibs:Depends}
Description: Emulator of the Super Nintendo Entertainment System (TM)
ZSNES allows you to play classic games written for the "SNES" game
diff -Naur zsnes-1.510.orig/debian/rules zsnes-1.510/debian/rules
--- zsnes-1.510.orig/debian/rules 2007-11-01 23:29:13.000000000 -0700
+++ zsnes-1.510/debian/rules 2007-11-01 23:49:54.000000000 -0700
@@ -2,6 +2,9 @@
# debian/rules for zsnes
# 2001-2005 Aaron Lehmann <[EMAIL PROTECTED]>
# 2006 Joshua Kwan <[EMAIL PROTECTED]>
+# 2007 Josh Triplett <[EMAIL PROTECTED]>
+
+DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
patch-stamp:
dpatch apply-all
@@ -11,11 +14,17 @@
dpatch deapply-all
rm -f patch-stamp
+ifeq ($(DEB_HOST_ARCH_CPU),i386)
+CONFIGURE_LIBAO := --enable-libao
+else
+CONFIGURE_LIBAO := --disable-libao
+endif
+
build: patch-stamp build-stamp
build-stamp:
dh_testdir
- cd src && ./configure --enable-opengl --disable-cpucheck
--enable-release --disable-debugger --enable-libao force_arch=i486 && $(MAKE)
+ cd src && ./configure CFLAGS=-m32 --enable-opengl --disable-cpucheck
--enable-release --disable-debugger $(CONFIGURE_LIBAO) force_arch=i486 &&
$(MAKE)
touch $@
