tags 402104 + patch
block 402104 with 583518
thanks
With 583518 fixed, and the attached patch (based on the above patch from
Josh Triplett), zsnes builds on amd64.
diff -u zsnes-1.510.orig/debian/control zsnes-1.510/debian/control
--- zsnes-1.510.orig/debian/control 2010-05-27 21:38:26.000000000 -0400
+++ zsnes-1.510/debian/control 2010-05-27 21:03:51.000000000 -0400
@@ -2,11 +2,11 @@
Section: otherosfs
Priority: optional
Maintainer: Joshua Kwan <jo...@triplehelix.org>
-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.3
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
Common subdirectories: zsnes-1.510.orig/debian/examples and zsnes-1.510/debian/examples
Only in zsnes-1.510/debian: files
Only in zsnes-1.510/debian: patched
Common subdirectories: zsnes-1.510.orig/debian/patches and zsnes-1.510/debian/patches
diff -u zsnes-1.510.orig/debian/rules zsnes-1.510/debian/rules
--- zsnes-1.510.orig/debian/rules 2010-05-27 21:38:26.000000000 -0400
+++ zsnes-1.510/debian/rules 2010-05-27 21:41:46.000000000 -0400
@@ -2,6 +2,10 @@
# debian/rules for zsnes
# 2001-2005 Aaron Lehmann <aar...@vitelus.com>
# 2006 Joshua Kwan <jo...@triplehelix.org>
+# 2007 Josh Triplett <j...@freedesktop.org>
+# 2010 Michael Leuchtenburg <mich...@slashhome.org>
+
+DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
patch-stamp:
dpatch apply-all
@@ -11,11 +15,18 @@
dpatch deapply-all
rm -f patch-stamp
+ifeq ($(DEB_HOST_ARCH_CPU),i386)
+CONFIGURE_LIBAO := --enable-libao
+else
+CONFIGURE_LIBAO := --disable-libao
+LIBS := -L/usr/lib32
+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 LIBS="$(LIBS)" CFLAGS=-m32 --enable-opengl --disable-cpucheck --enable-release --disable-debugger $(CONFIGURE_LIBAO) force_arch=i486 && $(MAKE)
touch $@
Only in zsnes-1.510/debian: zsnes
Only in zsnes-1.510/debian: zsnes.debhelper.log
Only in zsnes-1.510/debian: zsnes.postinst.debhelper
Only in zsnes-1.510/debian: zsnes.postrm.debhelper
Only in zsnes-1.510/debian: zsnes.substvars
