--- desmume-0.9.11.orig/debian/NEWS +++ desmume-0.9.11/debian/NEWS @@ -0,0 +1,14 @@ +desmume (0.9.6-1-1) unstable; urgency=low + + Users of gtk, cli and gtk-glade frontends please note that now we + have a common directory in ~/.config/desmume for config file, + saves and savestates. The old .desmume.ini will be moved + automatically with the name config but you have to move your saves + manually. + + Some save files may be invalidated due to use of broken crc logic. + Back up your DSV files before using this version of the emulator or else + the game might wipe it. + + -- Evgeni Golov Tue, 25 May 2010 15:50:49 +0200 + --- desmume-0.9.11.orig/debian/README.Debian +++ desmume-0.9.11/debian/README.Debian @@ -0,0 +1,15 @@ +DeSmuME from CVS +---------------- +If you downloaded DeSmuME from the CVS, you may build the package by: +1) Making sure you are in DeSmuME toplevel directory (the one that contains + the configure.ac files). +2) Generating the autotools files: ./autogen.sh +3) Generating the build files: ./configure +4) Building the package: debuild -B + +If you get an error about a version mismatch: +1) Find out the current version reading the first lines of configure.ac . +2) Update the first line of debian/changelog . +3) Redo the procedure above. + + -- Pascal Giard Fri, 29 Jun 2007 05:20:22 -0400 --- desmume-0.9.11.orig/debian/README.source +++ desmume-0.9.11/debian/README.source @@ -0,0 +1,2 @@ +This package uses quilt for patch management, for more information see +the file /usr/share/doc/quilt/README.source in the quilt package. --- desmume-0.9.11.orig/debian/changelog +++ desmume-0.9.11/debian/changelog @@ -0,0 +1,334 @@ +desmume (0.9.11-2) unstable; urgency=medium + + * Import upstream patch to fix FTBFS with GCC6 + Closes: #811691 + + -- Evgeni Golov Sat, 12 Nov 2016 11:22:03 +0100 + +desmume (0.9.11-1) unstable; urgency=medium + + * New upstream release. + + Does not segfault in IA__gdk_cairo_create anymore. + Closes: #801833 + * Update d/copyright. + * Standards-Version: 3.9.6 + * Use dh-autoreconf + + -- Evgeni Golov Sun, 01 Nov 2015 21:41:17 +0100 + +desmume (0.9.10-2) unstable; urgency=medium + + * Fix FTBFS on *BSD due to sysctl() not taking const parameters. + Patch from upstream SVN trunk. + + -- Evgeni Golov Sun, 23 Mar 2014 14:24:31 +0100 + +desmume (0.9.10-1) unstable; urgency=low + + * New upstream release. + * Refresh 01_use_system_tinyxml.patch against 0.9.10. + * Correct Vcs-* URLs to point to anonscm.debian.org + * Standards-Version: 3.9.5 + * add keywords to desktop files, thanks lintian + + -- Evgeni Golov Sun, 23 Mar 2014 12:49:09 +0100 + +desmume (0.9.9-1) unstable; urgency=low + + * New upstream release. + * Refresh 01_use_system_tinyxml.patch against 0.9.9. + * Add libsoundtouch-dev to Build-Depends. + * Use dh tiny rules and compat 9. + + -- Evgeni Golov Sun, 05 May 2013 21:14:45 +0200 + +desmume (0.9.8-1) unstable; urgency=low + + * New upstream release. + * Thanks Peter Green for the NMU! + * Drop patches, applied upstream: + + 01_fix_mode_t_on_kfreebsd.patch + + 02_add_gzFile_casts.patch + * Add libgtkglext1-dev to Build-Depends + * Drop README.TRANSLATION from debian/docs, it was droped upstream. + * Update debian/copyright + * Add 01_use_system_tinyxml.patch to link against the system tinyxml. + + Also add libtinyxml-dev to Build-Depends + * Update debian/copyright for latest format spec + * Standards-Version: 3.9.3 + * Add build-arch and build-indep targets. + + -- Evgeni Golov Tue, 01 May 2012 15:11:28 +0200 + +desmume (0.9.7-2.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/patches/02_add_gzFile_casts.patch: + Add some casts for compatibility with current zlib (Closes: #664914) + + -- Peter Michael Green Wed, 04 Apr 2012 22:09:07 +0000 + +desmume (0.9.7-2) unstable; urgency=low + + * Add 01_fix_mode_t_on_kfreebsd.patch to fix FTBFS on kfreebsd-*. + Closes: #618778 + + -- Evgeni Golov Thu, 24 Mar 2011 15:33:12 +0100 + +desmume (0.9.7-1) unstable; urgency=low + + * New upstream release. + Closes: #613365 + * Update debian/copyright to DEP5. + * Standards-Version: 3.9.1. + * Add BSD license to debian/copyright. + + -- Evgeni Golov Thu, 17 Mar 2011 23:48:38 +0100 + +desmume (0.9.6-1-1) unstable; urgency=low + + * New upstream release. + + Adding --gbaslot-rom= workaround for embedded file system. + LP: #575234 + * Remove 01_fix_sz_FTBFS_564788.patch, included upstream. + * Standards-Version: 3.8.4 + * Add debian/NEWS about the new config file location. + * Add debian/source/format, we're still 1.0. + + -- Evgeni Golov Tue, 25 May 2010 15:55:23 +0200 + +desmume (0.9.5-2) unstable; urgency=low + + * debian/patches: + + Add 01_fix_sz_FTBFS_564788.patch to fix FTBFS. + Closes: #564788 + + -- Evgeni Golov Tue, 19 Jan 2010 17:20:29 +0100 + +desmume (0.9.5-1) unstable; urgency=low + + * New upstream release. + * debian/copyright: + + Update my e-mail address and copyright years. + * debian/control: + + Add libagg-dev B-D. + * debian/patches: + + Drop all patches, either applied or superseded by upstream. + + -- Evgeni Golov Sun, 03 Jan 2010 20:30:35 +0100 + +desmume (0.9.4-2) unstable; urgency=low + + [ Miriam Ruiz ] + * Added patch 02_build-with-gcc-4.4.patch. Closes: #539545 + + [ Devid Antonio Filoni ] + * Add 03_build-on-hurd.patch patch, fix FTBFS on hurd-i386, patch taken from + upstream SVN revision 2754. + + [ Evgeni Golov ] + * Standards-Version: 3.8.3, no changes needed. + + -- Evgeni Golov Tue, 01 Sep 2009 17:09:34 +0200 + +desmume (0.9.4-1) unstable; urgency=low + + * New upstream release. + * debian/copyright: + + Fix typo in Guillaume's mail address. + * debian/control: + + Standards-Version: 3.8.2 + * debian/pacthes/02_manpage-fixes.patch: + + Drop the patch, was applied upstream. + + -- Evgeni Golov Wed, 15 Jul 2009 00:15:46 +0200 + +desmume (0.9.2-1-1) unstable; urgency=low + + * New upstream bugfix release. + * debian/control: + + Remove DM-Upload-Allowed: yes - I'm DD now. + + Thus also update my e-mail address. + + Add B-D on libosmesa6-dev and drop the one on libgtkglext1-dev, + upstream says this is the safer way to go. + * debian/patches/01_gfx3d.h_64bit_fix.patch: + + Drop the patch, it's included in this release. + * debian/patches/01_link-with-GL.patch: + + Add patch (ACKed by upstream) to link against libGL, so we don't + FTBFS when using --as-needed. + * debian/patches/02_manpage-fixes.patch: + + Fix hyphens in manpages, thanks lintian. + * debian/rules: + + Build with --enable-osmesa. + * debian/watch: + + Update watchfile to match a - in the version string. + + -- Evgeni Golov Sat, 02 May 2009 22:35:04 +0200 + +desmume (0.9.2-1) unstable; urgency=low + + * New upstream release. + * debian/contol: + + Bump Standards-Version to 3.8.1. + + Wrap Uploaders and Build-Depends. + + Remove Reinhard Tartler and Cyril Brulebois from Uploaders on their + requests. Thanks for your work! + + Set DM-Upload-Allowed: yes. + * debian/copyright: + + Add my copyright. + + Wrap some very long lines. + * debian/patches/01_gfx3d.h_64bit_fix.patch: + + New patch from upstream SVN, fixes function definitions in gfx3d.h + and makes desmume build again on 64bit arches. + + -- Evgeni Golov Sat, 18 Apr 2009 10:31:00 +0200 + +desmume (0.9.1-1) unstable; urgency=low + + * New upstream release. + + Doesn't try to setup a 24bit drawing area but reuse the current one. + Closes: #455749 + * debian/rules: + + Configure with --enable-gdb-stub. (Closes: #484683) + + Don't set CFLAGS, let dpkg handle them. + + Make the build-system more cross-build friendly. + + Use dh_clean instead of rm -f in the clean target. + + Don't install manpages, upstream does that now. + + Link with --as-needed to strip direct dependencies. + * debian/control: + + Add ${misc:Depends} to Depends of desmume. + + Bump Standards-Version to 3.8.0. + * debian/patches: + + Disable 01-dont_crash_on_bad_3d.patch, it was pulled from upstream + and is present in the current version. + * debian/README.source: + + Add information on quilt usage as suggested by policy. + * debian/watch: + + Update the regex to match only numerical versions (0.9, not 0.9-mac). + * debian/copyright: + + Update to machine readable format. + + Check copyright more carefully. + + -- Evgeni Golov Thu, 12 Feb 2009 02:55:17 +0100 + +desmume (0.8-2) unstable; urgency=low + + [ Ansgar Burchardt ] + * debian/control: Remove Homepage semi-field from description + + [ Cyril Brulebois ] + * Update config.{guess,sub} before running configure and remove them in + the clean target, instead of updating them in the clean target, so as + to keep the Debian diff clean, and also prevent an FTBFS with the new + “3.0 (quilt)” source package format. + * Drop debian/patches/fix-64bit-segfault.diff, since it's already + applied upstream, and would cause an FTBFS under the same conditions + as above, thanks to Raphaël Hertzog for the notice (Closes: #485033). + * Update my mail address. + + [ Evgeni Golov ] + * Add debian/patches/01-dont_crash_on_bad_3d.patch, so we don't crash + when 3D can't be enabled correctly. (Closes: #509365) + * Use $(QUILT_STAMPFN) instead of patch. + * Add myself to uploaders. + * Update the menu file for section Applications, not Apps. + + -- Evgeni Golov Wed, 24 Dec 2008 01:40:40 +0100 + +desmume (0.8-1) unstable; urgency=low + + [ Eddy Petrișor ] + * add missing Vcs-Svn headers + + [ Reinhard Tartler ] + * new upstream release. + + -- Reinhard Tartler Sat, 10 May 2008 15:34:39 +0200 + +desmume (0.7.3-3) unstable; urgency=low + + [ Pascal Giard ] + * [debian/control]: Added Build-Dep on quilt. + * [debian/rules]: Apply/unapply patches using quilt. + * [debian/patches/fix-64bit-segfault.diff]: + - Fix possible segfault on 64bit CPUs (closes: #435763). + + [ Jon Dowland ] + * add Homepage: control field to source stanza + + -- Jon Dowland Mon, 03 Dec 2007 17:41:37 +0000 + +desmume (0.7.3-2) unstable; urgency=low + + * [debian/control]: + - Added Build-Dep on intltool. + + -- Pascal Giard Tue, 04 Sep 2007 18:44:56 -0400 + +desmume (0.7.3-1) unstable; urgency=low + + * [debian/rules]: + - Removed dos2unix/unix2dos calls, no longer needed (closes: #435531). + - Specified localedir to workaround intltool Makefile.in.in weird behavior. + * [debian/control]: Removed Build-Dep on tofrodos, no longer needed. + * [debian/docs]: Added README.TRANSLATION. + * [debian/dirs]: Added localization directory. + + -- Pascal Giard Mon, 03 Sep 2007 13:35:50 -0400 + +desmume (0.7.2-3) unstable; urgency=low + + [ Cyril Brulebois ] + * [debian/control]: + - Added a B-D on tofrodos, which solves the FTBFS due to a missing + `unix2dos', thanks Kartik Mistry (Closes: #435217). + + [ Reinhard Tartler ] + - Add Cyril to uploaders + - M-x whitespace-cleanup debian/rules + - don't fail when Makefile fails in clean target. Thanks to lintian for + finding this. + + -- Reinhard Tartler Mon, 03 Sep 2007 09:47:25 +0200 + +desmume (0.7.2-2) unstable; urgency=low + + * [debian/rules]: + - Fixed gnome menu entries (upstream tarball encoding problem). + - Added debian menu entries. + * [debian/menu]: + - Added debian menu entries. + + -- Pascal Giard Sun, 29 Jul 2007 23:55:59 -0400 + +desmume (0.7.2-1) unstable; urgency=low + + [ Pascal Giard ] + * Upload to unstable (closes: #405616). + * [debian/README.Debian]: + - Procedure updated reflecting previous changes. + - Clarified CVS build instructions. + * [debian/rules]: + - Removed CFLAGS="-D_REENTRANT" as it was slowing things down considerably. + - Install glade interfaces. + - Install desktop menu files. + * [debian/docs]: + - Removed empty files. + - Added AUTHORS file. + * [debian/dirs]: Added directories for glade interfaces. + * [debian/desmume-cli.1, debian/desmume-glade.1]: + Added manpages for command-line and glade binairies. + * [debian/copyright]: + - Added LGPL license note for glade-xml.c and gtk/dev-cpp/* . + + [ Reinhard Tartler ] + * Change maintainer to 'Debian Games Team' + + -- Pascal Giard Fri, 27 Jul 2007 16:27:43 -0400 + +desmume (0.6.0-0ubuntu1) feisty; urgency=low + + * Initial release (Closes: #405616) + + -- Reinhard Tartler Sat, 10 Feb 2007 19:22:16 +0100 + --- desmume-0.9.11.orig/debian/compat +++ desmume-0.9.11/debian/compat @@ -0,0 +1 @@ +9 --- desmume-0.9.11.orig/debian/control +++ desmume-0.9.11/debian/control @@ -0,0 +1,25 @@ +Source: desmume +Section: games +Priority: extra +Maintainer: Debian Games Team +Uploaders: Pascal Giard , + Evgeni Golov +Build-Depends: debhelper (>= 9), libglade2-dev, libgtk2.0-dev, libsdl1.2-dev, + libosmesa6-dev, libagg-dev, intltool, quilt, libgtkglext1-dev, libtinyxml-dev, + libsoundtouch-dev, dh-autoreconf +Standards-Version: 3.9.6 +Homepage: http://desmume.org/ +Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/desmume/ +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/desmume/ + +Package: desmume +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Nintendo DS emulator + DeSmuME is a Nintendo DS emulator running homebrew demos and commercial games. + . + This package includes all three binaries: + * desmume: gtk user interface; + * desmume-glade: gtk-glade user interface; + * desmume-cli: command line user interface. + --- desmume-0.9.11.orig/debian/copyright +++ desmume-0.9.11/debian/copyright @@ -0,0 +1,280 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: DeSmuME +Upstream-Contact: Guillaume Duhamel +Source: http://www.desmume.org + +Files: * +Copyright: 2006-2011 Guillaume Duhamel + 2006-2011 Normmatt + 2006-2011 Bernat Muñoz (shash) + 2006-2011 thoduv + 2006-2011 Tim Seidel (Mighty Max) + 2006-2011 Pascal Giard (evilynux) + 2006-2011 Ben Jaques (masscat) + 2006-2011 Jeff Bland + 2006-2011 Andres Delikat + 2006-2011 Riccardo Magliocchetti + 2006-2011 Max Tabachenko (CrazyMax/mtabachenko) + 2006-2011 zeromus + 2006-2011 Luigi__ + 2006-2011 adelikat +License: GPL-2+ + +Files: src/common.cpp src/GPU_osd.cpp src/windows/inputdx.cpp + src/rtc.cpp src/cflash.cpp src/MMU.cpp +Copyright: 2006-2011 Guillaume Duhamel + 2006-2011 Normmatt + 2006-2011 Bernat Muñoz (shash) + 2006-2011 thoduv + 2006-2011 Tim Seidel (Mighty Max) + 2006-2011 Pascal Giard (evilynux) + 2006-2011 Ben Jaques (masscat) + 2006-2011 Jeff Bland + 2006-2011 Andres Delikat + 2006-2011 Riccardo Magliocchetti + 2006-2011 Max Tabachenko (CrazyMax/mtabachenko) + 2006-2011 zeromus + 2006-2011 Luigi__ + 2006-2011 adelikat + 2006 yopyop +License: GPL-2+ + +Files: src/SPU.cpp src/sndsdl.cpp src/windows/snddx.cpp +Copyright: 2005-2007 Theo Berkau +License: GPL-2+ + +Files: src/fs-linux.cpp src/debug.cpp src/ROMReader.cpp src/fs-windows.cpp +Copyright: 2006-2011 Guillaume Duhamel +License: GPL-2+ + +Files: src/gtk-glade/keyval_names.cpp src/gtk-glade/gdk_gl.cpp + src/gtk-glade/dTools/callbacks_2_memview.cpp + src/gtk-glade/dTools/callbacks_4_tileview.cpp + src/gtk-glade/dTools/callbacks_3_palview.cpp +Copyright: 2007 Damien Nozay (damdoum) +License: GPL-2+ + +Files: src/gtk-glade/main.cpp src/gtk-glade/callbacks.cpp + src/gtk-glade/callbacks_IO.cpp + src/gtk-glade/dTools/callbacks_1_ioregs.cpp +Copyright: 2007 Damien Nozay (damdoum) + 2007 Pascal Giard (evilynux) +License: GPL-2+ + +Files: src/bios.cpp src/thumb_instructions.cpp src/NDSSystem.cpp + src/cp15.cpp src/armcpu.cpp src/Disassembler.cpp + src/windows/palView.cpp src/windows/disView.cpp + src/windows/memView.cpp src/windows/mapView.cpp + src/windows/IORegView.cpp src/windows/oamView.cpp + src/windows/tileView.cpp src/windows/ginfo.cpp src/windows/CWindow.cpp +Copyright: 2006 yopyop +License: GPL-2+ + +Files: src/windows/FirmConfig.cpp +Copyright: 2007 Normmatt +License: GPL-2+ + +Files: src/render3D.cpp src/matrix.cpp src/windows/AboutBox.cpp +Copyright: 2006-2011 shash +License: GPL-2+ + +Files: src/ctrlssdl.cpp +Copyright: 2007 Pascal Giard +License: GPL-2+ + +Files: src/windows/throttle.cpp src/utils/xstring.cpp +Copyright: 2002 Xodnizel +License: GPL-2+ +Comment: Please note: the files do not have a license header, + but you can find them in fceux-2.0.3.src.tar.bz2 on + http://fceultra.sourceforge.net where it says it's GPL-2+. + +Files: src/gtk/gdk_3Demu.cpp src/gtk-glade/gdk_3Demu.cpp +Copyright: 2006-2007 Ben Jaques +License: GPL-2+ + +Files: src/FIFO.cpp src/arm_instructions.cpp src/OGLRender.cpp +Copyright: 2006-2007 shash + 2006 yopyop +License: GPL-2+ + +Files: src/windows/lightView.cpp src/windows/matrixView.cpp + src/windows/colorctrl.cpp +Copyright: 2007 Acid Burn +License: GPL-2+ + +Files: src/saves.cpp +Copyright: 2007 Pascal Giard + 2006 Theo Berkau + 2006 Normmatt +License: GPL-2+ + +Files: src/GPU.cpp +Copyright: 2007 shash + 2006-2007 Theo Berkau + 2006 yopyop +License: GPL-2+ + +Files: src/windows/console.cpp +Copyright: 2008 CrazyMax (mtabachenko) + 2006 yopyop +License: GPL-2+ + +Files: src/windows/main.cpp +Copyright: 2006 Theo Berkau + 2006 yopyop +License: GPL-2+ + +Files: src/gtk-glade/glade-xml.cpp +Copyright: 1998-2002 James Henstridge +License: LGPL-2+ + +Files: src/wifi.cpp +Copyright: 2007 Tim Seidel +License: GPL-2+ + +Files: src/mc.cpp +Copyright: 2006 thoduv + 2006-2007 Theo Berkau +License: GPL-2+ + +Files: src/utils/md5.cpp +Copyright: Christophe Devine +License: GPL-any + +Files: src/utils/tinyxml/* +Copyright: 2000-2007, Lee Thomason + 2002-2004, Yves Berquin +License: ZLIB + +Files: src/gdbstub/gdbstub.cpp src/gdbstub/gdbstub_internal.h +Copyright: 2006 Ben Jaques +License: MIT + +Files: src/gdbstub.h +Copyright: 2006 Ben Jaques +License: GPL-2+ + +Files: src/gtk-glade/glade-xml.cpp +Copyright: 1998-2002 James Henstridge +License: LGPL-2+ + +Files: src/utils/decrypt/header.* src/utils/decrypt/decrypt.* src/utils/decrypt/crc.* +Copyright: 2005-2006 Rafael Vuijk +License: GPL-2+ + +Files: src/windows/aviout.cpp src/windows/ogl.cpp src/utils/guid.cpp + src/movie.cpp src/readwrite.cpp +Copyright: 2006-2011 Zeromus +License: GPL-2+ + +Files: src/gtk/dToolsList.cpp +Copyright: 2006 Thoduv +License: GPL-2+ + +Files: src/softrender.cpp +Copyright: Ben Eirich +License: BSD-3-clause + +Files: src/utils/ConvertUTF.c +Copyright: 2001-2004 Unicode, Inc +License: other + This source code is provided as is by Unicode, Inc. No claims are + made as to fitness for any particular purpose. No warranties of any + kind are expressed or implied. The recipient agrees to determine + applicability of information provided. If this file has been + purchased on magnetic or optical media from Unicode, Inc., the + sole remedy for any claim will be exchange of defective media + within 90 days of receipt. + . + Limitations on Rights to Redistribute This Code + . + Unicode, Inc. hereby grants the right to freely use the information + supplied in this file in the creation of products supporting the + Unicode Standard, and to make copies of this file in any form + for internal or external distribution as long as this notice + remains attached. + +Files: debian/* +Copyright: 2007-2009 Reinhard Tartler + 2007-2009 Pascal Giard + 2008-2012 Evgeni Golov +License: GPL-2+ + +License: GPL-2+ + On Debian systems, the complete text of the GNU General Public License + version 2 can be found in the '/usr/share/common-licenses/GPL-2' file. + +License: GPL-any + On Debian systems, the complete text of the GNU General Public License + can be found in the '/usr/share/common-licenses/GPL' file. + +License: LGPL-2+ + On Debian systems, the complete text of the GNU Lesser General Public + License can be found in the '/usr/share/common-licenses/LGPL' file. + +License: BSD-3-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + +License: ZLIB + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any + damages arising from the use of this software. + . + Permission is granted to anyone to use this software for any + purpose, including commercial applications, and to alter it and + redistribute it freely, subject to the following restrictions: + . + 1. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product documentation + would be appreciated but is not required. + . + 2. Altered source versions must be plainly marked as such, and + must not be misrepresented as being the original software. + . + 3. This notice may not be removed or altered from any source + distribution. + +License: MIT + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, copy, + modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. --- desmume-0.9.11.orig/debian/dirs +++ desmume-0.9.11/debian/dirs @@ -0,0 +1,5 @@ +usr/games +usr/share/games +usr/share/locale +usr/share/pixmaps +usr/share/applications --- desmume-0.9.11.orig/debian/docs +++ desmume-0.9.11/debian/docs @@ -0,0 +1,3 @@ +README +README.LIN +AUTHORS --- desmume-0.9.11.orig/debian/menu +++ desmume-0.9.11/debian/menu @@ -0,0 +1,15 @@ +?package(desmume): \ + needs="X11" \ + section="Applications/Emulators" \ + title="DeSmuME (Gtk)" \ + icon="/usr/share/pixmaps/DeSmuME.xpm"\ + command="/usr/games/desmume" \ + longtitle="DeSmuME Gtk User Interface" + +?package(desmume): \ + needs="X11" \ + section="Applications/Emulators" \ + title="DeSmuME (Gtk-Glade)" \ + icon="/usr/share/pixmaps/DeSmuME.xpm"\ + command="/usr/games/desmume-glade" \ + longtitle="DeSmuME Gtk-Glade User Interface" --- desmume-0.9.11.orig/debian/patches/01_use_system_tinyxml.patch +++ desmume-0.9.11/debian/patches/01_use_system_tinyxml.patch @@ -0,0 +1,231 @@ +From: Evgeni Golov +Subject: use the system tinyxml instead of the embedded copy +Last-Update: 2015-08-09 + +diff --git a/src/Makefile.am b/src/Makefile.am +index 7b9e263..bc7ba8c 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -81,12 +81,6 @@ libdesmume_a_SOURCES = \ + utils/libfat/mem_allocate.h \ + utils/libfat/partition.cpp \ + utils/libfat/partition.h \ +- utils/tinyxml/tinystr.cpp \ +- utils/tinyxml/tinystr.h \ +- utils/tinyxml/tinyxml.cpp \ +- utils/tinyxml/tinyxml.h \ +- utils/tinyxml/tinyxmlerror.cpp \ +- utils/tinyxml/tinyxmlparser.cpp \ + utils/glcorearb.h \ + addons/slot2_auto.cpp addons/slot2_mpcf.cpp addons/slot2_paddle.cpp addons/slot2_gbagame.cpp addons/slot2_none.cpp addons/slot2_rumblepak.cpp addons/slot2_guitarGrip.cpp addons/slot2_expMemory.cpp addons/slot2_piano.cpp addons/slot2_passme.cpp addons/slot1_none.cpp addons/slot1_r4.cpp addons/slot1_retail_nand.cpp addons/slot1_retail_auto.cpp addons/slot1_retail_mcrom.cpp addons/slot1_retail_mcrom_debug.cpp addons/slot1comp_mc.cpp addons/slot1comp_mc.h addons/slot1comp_rom.h addons/slot1comp_rom.cpp addons/slot1comp_protocol.h addons/slot1comp_protocol.cpp \ + cheatSystem.cpp cheatSystem.h \ +@@ -204,3 +198,4 @@ if HAVE_GDB_STUB + libdesmume_a_SOURCES += gdbstub.h + endif + libdesmume_a_LIBADD = fs-$(desmume_arch).$(OBJEXT) ++LIBS += -ltinyxml +diff --git a/src/Makefile.in b/src/Makefile.in +index 9cf26a3..d9ff7b2 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -184,9 +184,6 @@ am__libdesmume_a_SOURCES_DIST = armcpu.cpp armcpu.h \ + utils/libfat/libfat_public_api.h utils/libfat/lock.cpp \ + utils/libfat/lock.h utils/libfat/mem_allocate.h \ + utils/libfat/partition.cpp utils/libfat/partition.h \ +- utils/tinyxml/tinystr.cpp utils/tinyxml/tinystr.h \ +- utils/tinyxml/tinyxml.cpp utils/tinyxml/tinyxml.h \ +- utils/tinyxml/tinyxmlerror.cpp utils/tinyxml/tinyxmlparser.cpp \ + utils/glcorearb.h addons/slot2_auto.cpp addons/slot2_mpcf.cpp \ + addons/slot2_paddle.cpp addons/slot2_gbagame.cpp \ + addons/slot2_none.cpp addons/slot2_rumblepak.cpp \ +@@ -324,10 +321,6 @@ am_libdesmume_a_OBJECTS = armcpu.$(OBJEXT) arm_instructions.$(OBJEXT) \ + utils/libfat/libfat.$(OBJEXT) \ + utils/libfat/libfat_public_api.$(OBJEXT) \ + utils/libfat/lock.$(OBJEXT) utils/libfat/partition.$(OBJEXT) \ +- utils/tinyxml/tinystr.$(OBJEXT) \ +- utils/tinyxml/tinyxml.$(OBJEXT) \ +- utils/tinyxml/tinyxmlerror.$(OBJEXT) \ +- utils/tinyxml/tinyxmlparser.$(OBJEXT) \ + addons/slot2_auto.$(OBJEXT) addons/slot2_mpcf.$(OBJEXT) \ + addons/slot2_paddle.$(OBJEXT) addons/slot2_gbagame.$(OBJEXT) \ + addons/slot2_none.$(OBJEXT) addons/slot2_rumblepak.$(OBJEXT) \ +@@ -475,7 +468,7 @@ LIBAGG_LIBS = @LIBAGG_LIBS@ + LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@ + LIBGLADE_LIBS = @LIBGLADE_LIBS@ + LIBOBJS = @LIBOBJS@ +-LIBS = @LIBS@ ++LIBS = @LIBS@ -ltinyxml + LIBSOUNDTOUCH_CFLAGS = @LIBSOUNDTOUCH_CFLAGS@ + LIBSOUNDTOUCH_LIBS = @LIBSOUNDTOUCH_LIBS@ + LTLIBOBJS = @LTLIBOBJS@ +@@ -625,9 +618,6 @@ libdesmume_a_SOURCES = armcpu.cpp armcpu.h arm_instructions.cpp \ + utils/libfat/libfat_public_api.h utils/libfat/lock.cpp \ + utils/libfat/lock.h utils/libfat/mem_allocate.h \ + utils/libfat/partition.cpp utils/libfat/partition.h \ +- utils/tinyxml/tinystr.cpp utils/tinyxml/tinystr.h \ +- utils/tinyxml/tinyxml.cpp utils/tinyxml/tinyxml.h \ +- utils/tinyxml/tinyxmlerror.cpp utils/tinyxml/tinyxmlparser.cpp \ + utils/glcorearb.h addons/slot2_auto.cpp addons/slot2_mpcf.cpp \ + addons/slot2_paddle.cpp addons/slot2_gbagame.cpp \ + addons/slot2_none.cpp addons/slot2_rumblepak.cpp \ +@@ -760,20 +750,6 @@ utils/libfat/lock.$(OBJEXT): utils/libfat/$(am__dirstamp) \ + utils/libfat/$(DEPDIR)/$(am__dirstamp) + utils/libfat/partition.$(OBJEXT): utils/libfat/$(am__dirstamp) \ + utils/libfat/$(DEPDIR)/$(am__dirstamp) +-utils/tinyxml/$(am__dirstamp): +- @$(MKDIR_P) utils/tinyxml +- @: > utils/tinyxml/$(am__dirstamp) +-utils/tinyxml/$(DEPDIR)/$(am__dirstamp): +- @$(MKDIR_P) utils/tinyxml/$(DEPDIR) +- @: > utils/tinyxml/$(DEPDIR)/$(am__dirstamp) +-utils/tinyxml/tinystr.$(OBJEXT): utils/tinyxml/$(am__dirstamp) \ +- utils/tinyxml/$(DEPDIR)/$(am__dirstamp) +-utils/tinyxml/tinyxml.$(OBJEXT): utils/tinyxml/$(am__dirstamp) \ +- utils/tinyxml/$(DEPDIR)/$(am__dirstamp) +-utils/tinyxml/tinyxmlerror.$(OBJEXT): utils/tinyxml/$(am__dirstamp) \ +- utils/tinyxml/$(DEPDIR)/$(am__dirstamp) +-utils/tinyxml/tinyxmlparser.$(OBJEXT): utils/tinyxml/$(am__dirstamp) \ +- utils/tinyxml/$(DEPDIR)/$(am__dirstamp) + addons/$(am__dirstamp): + @$(MKDIR_P) addons + @: > addons/$(am__dirstamp) +@@ -1035,10 +1011,6 @@ mostlyclean-compile: + -rm -f utils/libfat/partition.$(OBJEXT) + -rm -f utils/md5.$(OBJEXT) + -rm -f utils/task.$(OBJEXT) +- -rm -f utils/tinyxml/tinystr.$(OBJEXT) +- -rm -f utils/tinyxml/tinyxml.$(OBJEXT) +- -rm -f utils/tinyxml/tinyxmlerror.$(OBJEXT) +- -rm -f utils/tinyxml/tinyxmlparser.$(OBJEXT) + -rm -f utils/vfat.$(OBJEXT) + -rm -f utils/xstring.$(OBJEXT) + +@@ -1175,10 +1147,6 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@utils/libfat/$(DEPDIR)/libfat_public_api.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@utils/libfat/$(DEPDIR)/lock.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@utils/libfat/$(DEPDIR)/partition.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@utils/tinyxml/$(DEPDIR)/tinystr.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@utils/tinyxml/$(DEPDIR)/tinyxml.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@utils/tinyxml/$(DEPDIR)/tinyxmlerror.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@utils/tinyxml/$(DEPDIR)/tinyxmlparser.Po@am__quote@ + + .c.o: + @am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@@ -1449,8 +1417,6 @@ distclean-generic: + -rm -f utils/decrypt/$(am__dirstamp) + -rm -f utils/libfat/$(DEPDIR)/$(am__dirstamp) + -rm -f utils/libfat/$(am__dirstamp) +- -rm -f utils/tinyxml/$(DEPDIR)/$(am__dirstamp) +- -rm -f utils/tinyxml/$(am__dirstamp) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -1460,7 +1426,7 @@ clean: clean-recursive + clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am + + distclean: distclean-recursive +- -rm -rf ./$(DEPDIR) addons/$(DEPDIR) filter/$(DEPDIR) metaspu/$(DEPDIR) utils/$(DEPDIR) utils/AsmJit/core/$(DEPDIR) utils/AsmJit/x86/$(DEPDIR) utils/decrypt/$(DEPDIR) utils/libfat/$(DEPDIR) utils/tinyxml/$(DEPDIR) ++ -rm -rf ./$(DEPDIR) addons/$(DEPDIR) filter/$(DEPDIR) metaspu/$(DEPDIR) utils/$(DEPDIR) utils/AsmJit/core/$(DEPDIR) utils/AsmJit/x86/$(DEPDIR) utils/decrypt/$(DEPDIR) utils/libfat/$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags +@@ -1506,7 +1472,7 @@ install-ps-am: + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +- -rm -rf ./$(DEPDIR) addons/$(DEPDIR) filter/$(DEPDIR) metaspu/$(DEPDIR) utils/$(DEPDIR) utils/AsmJit/core/$(DEPDIR) utils/AsmJit/x86/$(DEPDIR) utils/decrypt/$(DEPDIR) utils/libfat/$(DEPDIR) utils/tinyxml/$(DEPDIR) ++ -rm -rf ./$(DEPDIR) addons/$(DEPDIR) filter/$(DEPDIR) metaspu/$(DEPDIR) utils/$(DEPDIR) utils/AsmJit/core/$(DEPDIR) utils/AsmJit/x86/$(DEPDIR) utils/decrypt/$(DEPDIR) utils/libfat/$(DEPDIR) + -rm -f Makefile + maintainer-clean-am: distclean-am maintainer-clean-generic + +diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am +index 1985209..d958323 100755 +--- a/src/cli/Makefile.am ++++ b/src/cli/Makefile.am +@@ -5,7 +5,7 @@ AM_CPPFLAGS += $(SDL_CFLAGS) $(ALSA_CFLAGS) $(LIBAGG_CFLAGS) $(GLIB_CFLAGS) $(GT + + bin_PROGRAMS = desmume-cli + desmume_cli_SOURCES = main.cpp ../sndsdl.cpp ../ctrlssdl.h ../ctrlssdl.cpp ../driver.h ../driver.cpp +-desmume_cli_LDADD = ../libdesmume.a $(SDL_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS) $(LIBSOUNDTOUCH_LIBS) ++desmume_cli_LDADD = ../libdesmume.a $(SDL_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS) $(LIBSOUNDTOUCH_LIBS) -ltinyxml + if HAVE_GDB_STUB + desmume_cli_LDADD += ../gdbstub/libgdbstub.a + endif +diff --git a/src/cli/Makefile.in b/src/cli/Makefile.in +index 14efd77..f04ab7d 100644 +--- a/src/cli/Makefile.in ++++ b/src/cli/Makefile.in +@@ -311,7 +311,7 @@ AM_LDFLAGS = + desmume_cli_SOURCES = main.cpp ../sndsdl.cpp ../ctrlssdl.h ../ctrlssdl.cpp ../driver.h ../driver.cpp + desmume_cli_LDADD = ../libdesmume.a $(SDL_LIBS) $(ALSA_LIBS) \ + $(LIBAGG_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS) \ +- $(LIBSOUNDTOUCH_LIBS) $(am__append_1) ++ $(LIBSOUNDTOUCH_LIBS) -ltinyxml $(am__append_1) + all: all-recursive + + .SUFFIXES: +diff --git a/src/gtk-glade/Makefile.am b/src/gtk-glade/Makefile.am +index b667fca..c79fdac 100755 +--- a/src/gtk-glade/Makefile.am ++++ b/src/gtk-glade/Makefile.am +@@ -33,7 +33,7 @@ desmume_glade_SOURCES = \ + desmume_glade_LDADD = ../libdesmume.a \ + $(SDL_LIBS) $(GTKGLEXT_LIBS) $(LIBGLADE_LIBS) \ + $(GTHREAD_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) \ +- $(LIBSOUNDTOUCH_LIBS) ++ $(LIBSOUNDTOUCH_LIBS) -ltinyxml + if HAVE_GDB_STUB + desmume_glade_LDADD += ../gdbstub/libgdbstub.a + endif +diff --git a/src/gtk-glade/Makefile.in b/src/gtk-glade/Makefile.in +index 5f77ec5..012aa72 100644 +--- a/src/gtk-glade/Makefile.in ++++ b/src/gtk-glade/Makefile.in +@@ -367,7 +367,7 @@ desmume_glade_SOURCES = \ + + desmume_glade_LDADD = ../libdesmume.a $(SDL_LIBS) $(GTKGLEXT_LIBS) \ + $(LIBGLADE_LIBS) $(GTHREAD_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) \ +- $(LIBSOUNDTOUCH_LIBS) $(am__append_1) ++ $(LIBSOUNDTOUCH_LIBS) -ltinyxml $(am__append_1) + all: all-recursive + + .SUFFIXES: +diff --git a/src/gtk/Makefile.am b/src/gtk/Makefile.am +index 59cb1f2..e451102 100755 +--- a/src/gtk/Makefile.am ++++ b/src/gtk/Makefile.am +@@ -32,7 +32,7 @@ desmume_SOURCES = \ + ../filter/videofilter.cpp ../filter/videofilter.h \ + main.cpp main.h + desmume_LDADD = ../libdesmume.a \ +- $(SDL_LIBS) $(GTK_LIBS) $(GTHREAD_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) $(LIBSOUNDTOUCH_LIBS) ++ $(SDL_LIBS) $(GTK_LIBS) $(GTHREAD_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) $(LIBSOUNDTOUCH_LIBS) -ltinyxml + if HAVE_GDB_STUB + desmume_LDADD += ../gdbstub/libgdbstub.a + endif +diff --git a/src/gtk/Makefile.in b/src/gtk/Makefile.in +index e1a2c37..75f392f 100644 +--- a/src/gtk/Makefile.in ++++ b/src/gtk/Makefile.in +@@ -382,7 +382,7 @@ desmume_SOURCES = \ + + desmume_LDADD = ../libdesmume.a $(SDL_LIBS) $(GTK_LIBS) \ + $(GTHREAD_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) \ +- $(LIBSOUNDTOUCH_LIBS) $(am__append_1) $(am__append_2) \ ++ $(LIBSOUNDTOUCH_LIBS) -ltinyxml $(am__append_1) $(am__append_2) \ + $(am__append_3) + UPDATE_DESKTOP = \ + appsdir=$(DESTDIR)$(datadir)/applications ; \ +diff --git a/src/utils/advanscene.cpp b/src/utils/advanscene.cpp +index 8d8f370..09c35bb 100755 +--- a/src/utils/advanscene.cpp ++++ b/src/utils/advanscene.cpp +@@ -19,7 +19,7 @@ + #include + + #define TIXML_USE_STL +-#include "tinyxml/tinyxml.h" ++#include + + #include "advanscene.h" + #include "../common.h" --- desmume-0.9.11.orig/debian/patches/add-keywords-to-desktop-files.patch +++ desmume-0.9.11/debian/patches/add-keywords-to-desktop-files.patch @@ -0,0 +1,34 @@ +From: Evgeni Golov +Date: Sun, 23 Mar 2014 12:03:04 +0100 +Subject: add keywords to desktop files + +see + http://standards.freedesktop.org/desktop-entry-spec/latest/ar01s05.html + https://wiki.gnome.org/Initiatives/GnomeGoals/DesktopFileKeywords +for details +--- + src/gtk-glade/desmume-glade.desktop | 1 + + src/gtk/desmume.desktop | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/gtk-glade/desmume-glade.desktop b/src/gtk-glade/desmume-glade.desktop +index 64a7363..3c2360b 100644 +--- a/src/gtk-glade/desmume-glade.desktop ++++ b/src/gtk-glade/desmume-glade.desktop +@@ -7,3 +7,4 @@ TryExec=desmume-glade + Exec=desmume-glade + Icon=DeSmuME + Categories=GNOME;GTK;Game;Emulator; ++Keywords=nintendo;ds;emulator +diff --git a/src/gtk/desmume.desktop b/src/gtk/desmume.desktop +index cae4c8e..788c05a 100644 +--- a/src/gtk/desmume.desktop ++++ b/src/gtk/desmume.desktop +@@ -8,3 +8,4 @@ Exec=desmume + Icon=DeSmuME + Categories=GNOME;GTK;Game;Emulator; + MimeType=application/x-nintendo-ds-rom; ++Keywords=nintendo;ds;emulator +-- +1.9.1 + --- desmume-0.9.11.orig/debian/patches/gcc6_fixes.patch +++ desmume-0.9.11/debian/patches/gcc6_fixes.patch @@ -0,0 +1,59 @@ +From: zeromus +Origin: upstream, https://sourceforge.net/p/desmume/code/5514, https://sourceforge.net/p/desmume/code/5517, https://sourceforge.net/p/desmume/code/5430 +Subject: fix GCC6 issues +Bug: https://sourceforge.net/p/desmume/bugs/1570/ +Bug-Debian: http://bugs.debian.org/811691 + +Index: desmume/src/MMU_timing.h +=================================================================== +--- desmume/src/MMU_timing.h (revision 5513) ++++ desmume/src/MMU_timing.h (revision 5517) +@@ -155,8 +155,8 @@ + enum { ASSOCIATIVITY = 1 << ASSOCIATIVESHIFT }; + enum { BLOCKSIZE = 1 << BLOCKSIZESHIFT }; + enum { TAGSHIFT = SIZESHIFT - ASSOCIATIVESHIFT }; +- enum { TAGMASK = (u32)(~0 << TAGSHIFT) }; +- enum { BLOCKMASK = ((u32)~0 >> (32 - TAGSHIFT)) & (u32)(~0 << BLOCKSIZESHIFT) }; ++ enum { TAGMASK = (u32)(~0U << TAGSHIFT) }; ++ enum { BLOCKMASK = ((u32)~0U >> (32 - TAGSHIFT)) & (u32)(~0U << BLOCKSIZESHIFT) }; + enum { WORDSIZE = sizeof(u32) }; + enum { WORDSPERBLOCK = (1 << BLOCKSIZESHIFT) / WORDSIZE }; + enum { DATAPERWORD = WORDSIZE * ASSOCIATIVITY }; +Index: desmume/src/ctrlssdl.cpp +=================================================================== +--- desmume/src/ctrlssdl.cpp (revision 5513) ++++ desmume/src/ctrlssdl.cpp (revision 5517) +@@ -200,7 +200,7 @@ + break; + case SDL_JOYAXISMOTION: + /* Dead zone of 50% */ +- if( (abs(event.jaxis.value) >> 14) != 0 ) ++ if( ((u32)abs(event.jaxis.value) >> 14) != 0 ) + { + key = ((event.jaxis.which & 15) << 12) | JOY_AXIS << 8 | ((event.jaxis.axis & 127) << 1); + if (event.jaxis.value > 0) { +@@ -370,7 +370,7 @@ + Note: button constants have a 1bit offset. */ + case SDL_JOYAXISMOTION: + key_code = ((event->jaxis.which & 15) << 12) | JOY_AXIS << 8 | ((event->jaxis.axis & 127) << 1); +- if( (abs(event->jaxis.value) >> 14) != 0 ) ++ if( ((u32)abs(event->jaxis.value) >> 14) != 0 ) + { + if (event->jaxis.value > 0) + key_code |= 1; +Index: desmume/src/wifi.cpp +=================================================================== +--- desmume/src/wifi.cpp (revision 5429) ++++ desmume/src/wifi.cpp (revision 5430) +@@ -320,9 +320,9 @@ + + #if (WIFI_LOGGING_LEVEL >= 1) + #if WIFI_LOG_USE_LOGC +- #define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) LOGC(8, "WIFI: "__VA_ARGS__); ++ #define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) LOGC(8, "WIFI: " __VA_ARGS__); + #else +- #define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) printf("WIFI: "__VA_ARGS__); ++ #define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) printf("WIFI: " __VA_ARGS__); + #endif + #else + #define WIFI_LOG(level, ...) {} --- desmume-0.9.11.orig/debian/patches/osmesa_printf.patch +++ desmume-0.9.11/debian/patches/osmesa_printf.patch @@ -0,0 +1,12 @@ +diff --git a/src/gtk/osmesa_3Demu.cpp b/src/gtk/osmesa_3Demu.cpp +index 4e20fd4..51d9182 100755 +--- a/src/gtk/osmesa_3Demu.cpp ++++ b/src/gtk/osmesa_3Demu.cpp +@@ -20,6 +20,7 @@ + + #ifdef HAVE_LIBOSMESA + #include ++#include + #include + #include "../OGLRender.h" + #include "osmesa_3Demu.h" --- desmume-0.9.11.orig/debian/patches/series +++ desmume-0.9.11/debian/patches/series @@ -0,0 +1,4 @@ +01_use_system_tinyxml.patch +add-keywords-to-desktop-files.patch +osmesa_printf.patch +gcc6_fixes.patch --- desmume-0.9.11.orig/debian/rules +++ desmume-0.9.11/debian/rules @@ -0,0 +1,22 @@ +#!/usr/bin/make -f + +LDFLAGS+=-Wl,-z,defs -Wl,--as-needed +#export LDFLAGS + +%: + dh $@ --with quilt,autoreconf + +override_dh_auto_configure: + dh_auto_configure -- --bindir=/usr/games --datadir=/usr/share/games \ + --enable-gdb-stub \ + --enable-osmesa \ + --enable-glade + +override_dh_auto_install: + dh_auto_install + mv debian/desmume/usr/share/games/pixmaps/DeSmuME.xpm \ + debian/desmume/usr/share/pixmaps/ + rm -rf debian/desmume/usr/share/games/pixmaps + mv debian/desmume/usr/share/games/applications/desmume*.desktop \ + debian/desmume/usr/share/applications/ + rm -rf debian/desmume/usr/share/games/applications --- desmume-0.9.11.orig/debian/source/format +++ desmume-0.9.11/debian/source/format @@ -0,0 +1 @@ +1.0 --- desmume-0.9.11.orig/debian/watch +++ desmume-0.9.11/debian/watch @@ -0,0 +1,3 @@ +version=3 +http://sf.net/desmume/desmume-([\d\.-]*)\.tar\.gz +