Package: release.debian.org Severity: normal User: [email protected] Usertags: freeze-exception
Please unblock package zsnes This upload fixes RC bugs #679526 (Multi-arch support) and #679826 (segfault of zsnes:i386 on amd64 machines). There are a few other changes, namely : - use of dpkg-buildflags to enable hardening features - update .desktop file - install hi-resolution icons Here the diff between the version in testing and the one that was recently uploaded to unstable. unblock zsnes/1.510+bz2-4 Thanks ! -- System Information: Debian Release: wheezy/sid APT prefers testing APT policy: (900, 'testing') Architecture: i386 (i686) Kernel: Linux 3.2.0-2-686-pae (SMP w/2 CPU cores) Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash -- Etienne Millon
diff -Nru zsnes-1.510+bz2/debian/changelog zsnes-1.510+bz2/debian/changelog --- zsnes-1.510+bz2/debian/changelog 2012-05-08 16:13:54.000000000 +0200 +++ zsnes-1.510+bz2/debian/changelog 2012-07-06 08:27:13.000000000 +0200 @@ -1,3 +1,27 @@ +zsnes (1.510+bz2-4) unstable; urgency=low + + [ Etienne Millon ] + * Disable build on amd64 (Closes: #679526) + - Add Multi-Arch: Foreign + * debian/compat : use level 9 compatibility level + * debian/rules : + - use find -delete instead of command expansion + - use dpkg-buildflags + - add -Wl,--as-needed to LDFLAGS (Closes: #607311) + + [ Eshat Cakar ] + * Improve zsnes.desktop file, thanks to Fabian Greffrath (Closes: #680054) + + [ Fabian Greffrath ] + * Add myself to Uploaders. + * 0001-gcc-fno-rtti.patch: Patch src/configure.in instead of the + auto-generated src/configure. + * Add patch to initialize the ao_sample_format structure + (thanks also to Goswin von Brederlow - Closes: #679826) + * Install high-res PNG icons provided with the sources (Closes: #680078) + + -- Etienne Millon <[email protected]> Fri, 06 Jul 2012 08:27:08 +0200 + zsnes (1.510+bz2-3) unstable; urgency=low * New patches : diff -Nru zsnes-1.510+bz2/debian/compat zsnes-1.510+bz2/debian/compat --- zsnes-1.510+bz2/debian/compat 2010-12-08 18:07:02.000000000 +0100 +++ zsnes-1.510+bz2/debian/compat 2012-06-29 17:53:34.000000000 +0200 @@ -1 +1 @@ -8 +9 diff -Nru zsnes-1.510+bz2/debian/control zsnes-1.510+bz2/debian/control --- zsnes-1.510+bz2/debian/control 2012-05-08 15:18:13.000000000 +0200 +++ zsnes-1.510+bz2/debian/control 2012-07-05 16:24:33.000000000 +0200 @@ -4,28 +4,26 @@ Homepage: http://www.zsnes.com Maintainer: Debian Games Team <[email protected]> Uploaders: Etienne Millon <[email protected]>, - Eshat Cakar <[email protected]> -Build-Depends: debhelper (>= 8), + Eshat Cakar <[email protected]>, + Fabian Greffrath <[email protected]> +Build-Depends: debhelper (>= 9), dh-autoreconf, dpkg-dev (>= 1.13.2), - g++-multilib [amd64], - gcc-multilib [amd64], - ia32-libs-dev [amd64], - lib32ncurses5-dev [amd64], - libao-dev [i386], + libao-dev, libgl1-mesa-dev | libgl-dev, libncurses5-dev | libncurses-dev, libpng-dev, libsdl1.2-dev (>= 1.2.2-3.1), nasm, sharutils, - zlib1g-dev [i386] | lib32z1-dev [amd64] + zlib1g-dev Standards-Version: 3.9.3 Vcs-Git: git://git.debian.org/pkg-games/zsnes.git Vcs-Browser: http://git.debian.org/?p=pkg-games/zsnes.git Package: zsnes -Architecture: amd64 i386 +Architecture: i386 +Multi-Arch: foreign Depends: ${misc:Depends}, ${shlibs:Depends} Description: Emulator of the Super Nintendo Entertainment System ZSNES allows you to play classic games written for the Super Nintendo (SNES) diff -Nru zsnes-1.510+bz2/debian/patches/0001-gcc-fno-rtti.patch zsnes-1.510+bz2/debian/patches/0001-gcc-fno-rtti.patch --- zsnes-1.510+bz2/debian/patches/0001-gcc-fno-rtti.patch 2012-05-01 23:47:43.000000000 +0200 +++ zsnes-1.510+bz2/debian/patches/0001-gcc-fno-rtti.patch 2012-07-05 16:24:33.000000000 +0200 @@ -7,11 +7,9 @@ src/configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/configure b/src/configure -index 0dbbb43..09c6f12 100755 ---- a/src/configure -+++ b/src/configure -@@ -5237,7 +5237,7 @@ echo "$as_me: WARNING: If you intend to distribute this binary, make sure you us +--- a/src/configure.in ++++ b/src/configure.in +@@ -299,7 +299,7 @@ else NFLAGS="$NFLAGS -O1" fi fi diff -Nru zsnes-1.510+bz2/debian/patches/0014-Initialize-driver_format.matrix-with-NULL.patch zsnes-1.510+bz2/debian/patches/0014-Initialize-driver_format.matrix-with-NULL.patch --- zsnes-1.510+bz2/debian/patches/0014-Initialize-driver_format.matrix-with-NULL.patch 1970-01-01 01:00:00.000000000 +0100 +++ zsnes-1.510+bz2/debian/patches/0014-Initialize-driver_format.matrix-with-NULL.patch 2012-07-02 21:08:13.000000000 +0200 @@ -0,0 +1,26 @@ +From: Fabian Greffrath <[email protected]> +Date: Mon, 2 Jul 2012 11:15:52 +0200 +Subject: Initialize driver_format.matrix with NULL; + +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=679826 +--- + src/linux/audio.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/linux/audio.c b/src/linux/audio.c +index 985855c..06ea851 100644 +--- a/src/linux/audio.c ++++ b/src/linux/audio.c +@@ -166,10 +166,12 @@ static int SoundInit_ao() + if (driver_id < 0) { driver_id = ao_default_driver_id(); } + + ao_sample_format driver_format; ++ memset(&driver_format, 0, sizeof(driver_format)); + driver_format.bits = 16; + driver_format.channels = StereoSound+1; + driver_format.rate = freqtab[SoundQuality = ((SoundQuality > 6) ? 1 : SoundQuality)]; + driver_format.byte_format = AO_FMT_LITTLE; ++ driver_format.matrix = NULL; + + if (audio_device) + { diff -Nru zsnes-1.510+bz2/debian/patches/series zsnes-1.510+bz2/debian/patches/series --- zsnes-1.510+bz2/debian/patches/series 2012-05-01 23:47:43.000000000 +0200 +++ zsnes-1.510+bz2/debian/patches/series 2012-07-02 21:38:50.000000000 +0200 @@ -11,3 +11,4 @@ 0011-Don-t-strip-binaries-upstream.patch 0012-Fix-build-with-gcc-4.7.patch 0013-Fix-sound-with-libao.patch +0014-Initialize-driver_format.matrix-with-NULL.patch diff -Nru zsnes-1.510+bz2/debian/rules zsnes-1.510+bz2/debian/rules --- zsnes-1.510+bz2/debian/rules 2011-08-07 13:01:19.000000000 +0200 +++ zsnes-1.510+bz2/debian/rules 2012-07-03 19:58:05.000000000 +0200 @@ -10,28 +10,30 @@ #export DH_VERBOSE=1 #export DH_OPTIONS=-v -DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -lpthread %: dh $@ --sourcedirectory=src --with autoreconf -ifeq ($(DEB_HOST_ARCH_CPU),i386) -CONFIGURE_LIBAO := --enable-libao -else -CONFIGURE_LIBAO := --disable-libao -LIBS := -L/usr/lib32 -endif - override_dh_auto_configure: dh_auto_configure --sourcedirectory=src -- \ - LIBS="$(LIBS)" CFLAGS=-m32 LDFLAGS=-lpthread --enable-opengl \ + --enable-opengl \ --disable-cpucheck --enable-release \ - $(CONFIGURE_LIBAO) force_arch=i486 + --enable-libao force_arch=i486 override_dh_clean: - rm -f $$(find src/ -type f -name *.o) src/Makefile src/cfg.h src/config.h src/config.log src/config.status src/input.h src/makefile.dep src/md.h src/parsegen src/tools/depbuild src/zsnes + rm -f src/Makefile src/cfg.h src/config.h src/config.log src/config.status src/input.h src/makefile.dep src/md.h src/parsegen src/tools/depbuild src/zsnes + find src/ -type f -name '*.o' -delete dh_clean +override_dh_install: + dh_install + for res in 16 32 48 64; do \ + mkdir -p debian/zsnes/usr/share/icons/hicolor/$${res}x$${res}/apps; \ + cp -f src/icons/$${res}x$${res}x32.png \ + debian/zsnes/usr/share/icons/hicolor/$${res}x$${res}/apps/zsnes.png; \ + done + override_dh_installchangelogs: dh_installchangelogs docs/readme.txt/history.txt diff -Nru zsnes-1.510+bz2/debian/zsnes.desktop zsnes-1.510+bz2/debian/zsnes.desktop --- zsnes-1.510+bz2/debian/zsnes.desktop 2010-12-08 18:07:02.000000000 +0100 +++ zsnes-1.510+bz2/debian/zsnes.desktop 2012-07-03 13:17:00.000000000 +0200 @@ -1,8 +1,9 @@ [Desktop Entry] -Name=zsnes -Comment=A Super Nintendo Entertainment System (TM) emulator -Exec=zsnes -Icon=zsnes.xpm +Name=ZSNES +Comment=Super Nintendo Entertainment System (TM) emulator +Exec=zsnes %f +Icon=zsnes Terminal=false Type=Application -Categories=Application;Game;2DGraphics;Emulator +Categories=Game;Emulator; +MimeType=application/x-snes-rom;
