From 4bd572f05671d08c2477889e5864892ebf0cd78c Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Wed, 31 Jan 2024 06:52:11 +0100 Subject: [PATCH 01/90] Create snapcraft.yaml --- snapcraft.yaml | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 snapcraft.yaml diff --git a/snapcraft.yaml b/snapcraft.yaml new file mode 100644 index 000000000..8dfbdaf07 --- /dev/null +++ b/snapcraft.yaml @@ -0,0 +1,74 @@ +name: desmume-emu +version: 0.9.11 +summary: DeSmuME is a Nintendo DS Emulator +description: | + An open-source Nintendo DS Emulators. + +adopt-info: desmume +grade: stable +confinement: strict +base: core22 +parts: + desmume: + source: http://fr.archive.ubuntu.com/ubuntu/pool/universe/d/desmume/desmume_0.9.11-3build2_amd64.deb + plugin: dump + source-type: deb + override-build: | + snapcraftctl build + # snapcraftctl pull + # last_commit="$(git describe | sed 's/^v//; s/-.*-/-/')" + # snapcraftctl set-version "${last_commit}" + # #sed -i.bak -e 's|Icon=desmume|Icon=/usr/share/icons/hicolor/scalable/apps/desmume.svg|g' src/wx/desmume.desktop + stage-packages: + - libasound2 + - libc6 + - libcairo2 + - libgcc-s1 + - libgcc-s1 + - libgdk-pixbuf-2.0-0 + - libgl1 + - libglade2-0 + - libglib2.0-0 + - libglu1-mesa + - libgtk2.0-0 + - libgtkglext1 + - libosmesa6 + - libpango-1.0-0 + - libsdl1.2debian + - libsoundtouch1 + - libstdc++6 + - libtinyxml2.6.2v5 + - zlib1g + build-packages: + - g++ + - gcc + - gettext + - make + - cmake + - nasm + - pkg-config + - git + - zip + - build-essential + - intltool + +apps: + desmume: + plugs: + - desktop + - desktop-legacy + - audio-playback + - opengl + - joystick + - raw-usb + - screen-inhibit-control + - home + - removable-media + - network + - wayland + - x11 + command: usr/games/desmume + desktop: usr/share/applications/desmume.desktop + extensions: [gnome] + environment: + LD_LIBRARY_PATH: $LD_LIBRARY_PATH:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/pulseaudio From ad324b1fefc4c1ba714419df7ed47d0b598995b5 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Wed, 31 Jan 2024 06:54:08 +0100 Subject: [PATCH 02/90] Update snapcraft.yaml --- snapcraft.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 8dfbdaf07..2fbbb6429 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -4,12 +4,12 @@ summary: DeSmuME is a Nintendo DS Emulator description: | An open-source Nintendo DS Emulators. -adopt-info: desmume +adopt-info: desmume-emu grade: stable confinement: strict base: core22 parts: - desmume: + desmume-emu: source: http://fr.archive.ubuntu.com/ubuntu/pool/universe/d/desmume/desmume_0.9.11-3build2_amd64.deb plugin: dump source-type: deb @@ -53,7 +53,7 @@ parts: - intltool apps: - desmume: + desmume-emu: plugs: - desktop - desktop-legacy From a06bd78aa44621a55da9285b2634bcd548dc6b35 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Wed, 31 Jan 2024 07:02:09 +0100 Subject: [PATCH 03/90] Update snapcraft.yaml --- snapcraft.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 2fbbb6429..22e8d1720 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1,15 +1,15 @@ -name: desmume-emu +name: desmume-emulator version: 0.9.11 summary: DeSmuME is a Nintendo DS Emulator description: | An open-source Nintendo DS Emulators. -adopt-info: desmume-emu +adopt-info: ddesmume-emulator grade: stable confinement: strict base: core22 parts: - desmume-emu: + desmume-emulator: source: http://fr.archive.ubuntu.com/ubuntu/pool/universe/d/desmume/desmume_0.9.11-3build2_amd64.deb plugin: dump source-type: deb @@ -53,7 +53,7 @@ parts: - intltool apps: - desmume-emu: + desmume-emulator: plugs: - desktop - desktop-legacy From 63601cc26b6d5892b72ebf365b37ab6d0af4812c Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Wed, 31 Jan 2024 07:39:43 +0100 Subject: [PATCH 04/90] Update README.md --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 4d7432715..01c8253ec 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,12 @@ # DeSmuME [![AppVeyor CI Build Status](https://ci.appveyor.com/api/projects/status/abfd7jm09wnmxyvu?svg=true)](https://ci.appveyor.com/project/zeromus/desmume) + + +[![Get it from the Snap Store](https://snapcraft.io/static/images/badges/en/snap-store-black.svg)](https://snapcraft.io/desmume-emulator) + + + DeSmuME is a Nintendo DS emulator. http://desmume.org/download From ff1354f1b3db4d047a0acf45c3628db0ab296ca2 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Wed, 31 Jan 2024 08:09:53 +0100 Subject: [PATCH 05/90] Update snapcraft.yaml --- snapcraft.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/snapcraft.yaml b/snapcraft.yaml index 22e8d1720..edb0f219f 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -4,6 +4,20 @@ summary: DeSmuME is a Nintendo DS Emulator description: | An open-source Nintendo DS Emulators. +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: snapcore/action-build@v1 + id: build + - uses: snapcore/action-publish@v1 + env: + SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.STORE_LOGIN }} + with: + snap: ${{ steps.build.outputs.snap }} + release: stable + adopt-info: ddesmume-emulator grade: stable confinement: strict From 31a103dcd7e8717eeeb78189af71f87fffeed226 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Wed, 31 Jan 2024 08:44:12 +0100 Subject: [PATCH 06/90] Update snapcraft.yaml --- snapcraft.yaml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index edb0f219f..5d2d389f9 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -3,21 +3,6 @@ version: 0.9.11 summary: DeSmuME is a Nintendo DS Emulator description: | An open-source Nintendo DS Emulators. - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: snapcore/action-build@v1 - id: build - - uses: snapcore/action-publish@v1 - env: - SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.STORE_LOGIN }} - with: - snap: ${{ steps.build.outputs.snap }} - release: stable - adopt-info: ddesmume-emulator grade: stable confinement: strict From 9e3af53ee7abce4c27ae20188386ec590840a3e4 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Wed, 31 Jan 2024 08:49:50 +0100 Subject: [PATCH 07/90] Update snapcraft.yaml --- snapcraft.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 5d2d389f9..3257ce3e0 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -3,10 +3,13 @@ version: 0.9.11 summary: DeSmuME is a Nintendo DS Emulator description: | An open-source Nintendo DS Emulators. -adopt-info: ddesmume-emulator +adopt-info: desmume-emulator grade: stable confinement: strict base: core22 +compression: lzo +architectures: + - build-on: amd64 parts: desmume-emulator: source: http://fr.archive.ubuntu.com/ubuntu/pool/universe/d/desmume/desmume_0.9.11-3build2_amd64.deb From 2cb9f631d915bda99e9b8a0b0dd35cf4783cff9f Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Wed, 31 Jan 2024 08:51:09 +0100 Subject: [PATCH 08/90] Create .stable_tag --- .stable_tag | 1 + 1 file changed, 1 insertion(+) create mode 100644 .stable_tag diff --git a/.stable_tag b/.stable_tag new file mode 100644 index 000000000..8225a4ba4 --- /dev/null +++ b/.stable_tag @@ -0,0 +1 @@ +0.9.11 From 6bbe053fd018d9f5b344082aafc9089118f500fc Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Wed, 31 Jan 2024 08:55:12 +0100 Subject: [PATCH 09/90] Update snapcraft.yaml --- snapcraft.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/snapcraft.yaml b/snapcraft.yaml index 3257ce3e0..f3aaf7ee5 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -16,6 +16,11 @@ parts: plugin: dump source-type: deb override-build: | + echo "CRAFT_PROJECT_DIR=$CRAFT_PROJECT_DIR" + STABLE_TAG_CONFIG="$CRAFT_PROJECT_DIR/.stable_tag" + TAG_REF=$(cat "${STABLE_TAG_CONFIG}") + echo "TAG_REF=$TAG_REF" + snapcraftctl set version="$TAG_REF" snapcraftctl build # snapcraftctl pull # last_commit="$(git describe | sed 's/^v//; s/-.*-/-/')" From b7a00126842a942d609e26fa1058c90fbdb3cc3b Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Wed, 31 Jan 2024 12:25:18 +0100 Subject: [PATCH 10/90] Create NEWS --- debian/NEWS | 352 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 352 insertions(+) create mode 100644 debian/NEWS diff --git a/debian/NEWS b/debian/NEWS new file mode 100644 index 000000000..bdfa54196 --- /dev/null +++ b/debian/NEWS @@ -0,0 +1,352 @@ +desmume (0.9.13-3build2) jammy; urgency=medium + + * No-change rebuild against latest gdk-pixbuf + + -- Jeremy Bicha Wed, 09 Mar 2022 18:48:49 -0500 + +desmume (0.9.11-3build1) focal; urgency=medium + + * No-change rebuild for libgcc-s1 package name change. + + -- Matthias Klose Sun, 22 Mar 2020 16:38:08 +0100 + +desmume (0.9.11-3) unstable; urgency=medium + + * Import upstream patch to fix FTBFS with GCC7 + Closes: #853372 + + -- Evgeni Golov Sun, 22 Oct 2017 11:23:03 +0200 + +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 From 699af62dfa69a11ccfc4b236cfc9586e136ac87e Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Wed, 31 Jan 2024 12:25:32 +0100 Subject: [PATCH 11/90] Create changelog --- debian/changelog | 352 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 352 insertions(+) create mode 100644 debian/changelog diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 000000000..bdfa54196 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,352 @@ +desmume (0.9.13-3build2) jammy; urgency=medium + + * No-change rebuild against latest gdk-pixbuf + + -- Jeremy Bicha Wed, 09 Mar 2022 18:48:49 -0500 + +desmume (0.9.11-3build1) focal; urgency=medium + + * No-change rebuild for libgcc-s1 package name change. + + -- Matthias Klose Sun, 22 Mar 2020 16:38:08 +0100 + +desmume (0.9.11-3) unstable; urgency=medium + + * Import upstream patch to fix FTBFS with GCC7 + Closes: #853372 + + -- Evgeni Golov Sun, 22 Oct 2017 11:23:03 +0200 + +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 From 49340248510fa6d4711180a240d369a86819c1c4 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Wed, 31 Jan 2024 12:26:37 +0100 Subject: [PATCH 12/90] Create README.Debian --- debian/README.Debian | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 debian/README.Debian diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 000000000..ce55f6f83 --- /dev/null +++ b/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 From 5942fadce84d14a423eb6f0cb3190030d594e1f5 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Wed, 31 Jan 2024 12:27:53 +0100 Subject: [PATCH 13/90] Create README.source --- debian/README.source | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 debian/README.source diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 000000000..d803172f2 --- /dev/null +++ b/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. From 1f81f80b85174e8de092fd31ba636e80a46a45a3 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Wed, 31 Jan 2024 12:29:15 +0100 Subject: [PATCH 14/90] Create build.sh --- debian/build.sh | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 debian/build.sh diff --git a/debian/build.sh b/debian/build.sh new file mode 100644 index 000000000..854878631 --- /dev/null +++ b/debian/build.sh @@ -0,0 +1,6 @@ +#!/bin/bash +source=$1 +pushd $source/desmume/src/frontend/posix +make -j12 +#meson build -C debian-linux-build -j 12 --verbose +popd From 749a94d6a3b47768f35aca808336c9f0b4940816 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Wed, 31 Jan 2024 12:49:11 +0100 Subject: [PATCH 15/90] Update build.sh --- debian/build.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/build.sh b/debian/build.sh index 854878631..e02ba1da7 100644 --- a/debian/build.sh +++ b/debian/build.sh @@ -2,5 +2,4 @@ source=$1 pushd $source/desmume/src/frontend/posix make -j12 -#meson build -C debian-linux-build -j 12 --verbose popd From f85f8b7c4c49e30e67f6b2a32e939fdbe27bf5a3 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Wed, 31 Jan 2024 12:49:56 +0100 Subject: [PATCH 16/90] Create compat --- debian/compat | 1 + 1 file changed, 1 insertion(+) create mode 100644 debian/compat diff --git a/debian/compat b/debian/compat new file mode 100644 index 000000000..ec635144f --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 From 3a32e7f5dc6b8247a2fae1c282417cc2f5eb678c Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Wed, 31 Jan 2024 12:51:01 +0100 Subject: [PATCH 17/90] Create configure.sh --- debian/configure.sh | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 debian/configure.sh diff --git a/debian/configure.sh b/debian/configure.sh new file mode 100644 index 000000000..3822a4c28 --- /dev/null +++ b/debian/configure.sh @@ -0,0 +1,19 @@ +#!/bin/bash +source=$1 +pushd $source/desmume +sed -i 's/\r//' AUTHORS +for txtfile in AUTHORS +do + iconv --from=ISO-8859-1 --to=UTF-8 $txtfile > tmp + touch -r $txtfile tmp + mv tmp $txtfile +done +find src -name *.[ch]* -exec chmod 644 {} \; +popd +pushd $source/desmume/src/frontend/posix +./autogen.sh +./configure --prefix=/usr --bindir=/usr/games --datadir=/usr/share/games \ + --enable-gdb-stub \ + --enable-osmesa \ + --enable-glade +popd From e2a862f854a348f789db2865e886d35da2d6ccce Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Wed, 31 Jan 2024 12:52:02 +0100 Subject: [PATCH 18/90] Create control --- debian/control | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 debian/control diff --git a/debian/control b/debian/control new file mode 100644 index 000000000..e3e1838cb --- /dev/null +++ b/debian/control @@ -0,0 +1,24 @@ +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, meson, libsdl2-dev, libpcap-dev, libgtk-3-dev +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 From 7c53d153a7bb34d2780295e0a3d84c0add4c2818 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Wed, 31 Jan 2024 12:53:17 +0100 Subject: [PATCH 19/90] Create copyright --- debian/copyright | 280 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 280 insertions(+) create mode 100644 debian/copyright diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 000000000..898dd74a3 --- /dev/null +++ b/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. From 2695ce4a71996c7710879d5543a35780f6072fe6 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Wed, 31 Jan 2024 12:54:31 +0100 Subject: [PATCH 20/90] Create install.sh --- debian/install.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 debian/install.sh diff --git a/debian/install.sh b/debian/install.sh new file mode 100644 index 000000000..38ff17db7 --- /dev/null +++ b/debian/install.sh @@ -0,0 +1,11 @@ +#!/bin/bash +source=$1 +pushd desmume/src/frontend/posix +DESTDIR=$source/debian/desmume make install +popd +mv $source/debian/desmume/usr/games/share/pixmaps/DeSmuME.xpm \ +$source/debian/desmume/usr/share/pixmaps/ +rm -rf $source/debian/desmume/usr/share/games/pixmaps +mv $source/debian/desmume/usr/games/share/applications/desmume*.desktop \ +$source/debian/desmume/usr/share/applications/ +rm -rf $source/debian/desmume/usr/games/share/applications From 8356908611aee7185c4c47b997fe4d2a331a1d8b Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Wed, 31 Jan 2024 12:55:13 +0100 Subject: [PATCH 21/90] Create rules --- debian/rules | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 debian/rules diff --git a/debian/rules b/debian/rules new file mode 100644 index 000000000..fc8b95655 --- /dev/null +++ b/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: + chmod +x $(CURDIR)/debian/configure.sh + $(CURDIR)/debian/configure.sh $(CURDIR) + +override_dh_auto_build: + chmod +x $(CURDIR)/debian/build.sh + $(CURDIR)/debian/build.sh $(CURDIR) + +override_dh_auto_install: + chmod +x $(CURDIR)/debian/install.sh + $(CURDIR)/debian/install.sh $(CURDIR) + +override_dh_installdocs: + echo "no doc" From 55659f48f5236e24e3c9c20b09550f12a28f2669 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Wed, 31 Jan 2024 12:56:10 +0100 Subject: [PATCH 22/90] Create format --- debian/source/format | 1 + 1 file changed, 1 insertion(+) create mode 100644 debian/source/format diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 000000000..d3827e75a --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +1.0 From 7046aeba923bddfac35d70b8de60e8a9db2baea8 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Wed, 31 Jan 2024 12:57:19 +0100 Subject: [PATCH 23/90] Create watch --- debian/watch | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 debian/watch diff --git a/debian/watch b/debian/watch new file mode 100644 index 000000000..bebd18655 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/desmume/desmume-([\d\.-]*)\.tar\.gz From 8889e61f1456db97dd6fa5057d8e384d3fc369df Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Wed, 31 Jan 2024 13:06:39 +0100 Subject: [PATCH 24/90] Update configure.sh --- debian/configure.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/configure.sh b/debian/configure.sh index 3822a4c28..6120515fa 100644 --- a/debian/configure.sh +++ b/debian/configure.sh @@ -1,5 +1,6 @@ #!/bin/bash source=$1 +prefix=$2 pushd $source/desmume sed -i 's/\r//' AUTHORS for txtfile in AUTHORS @@ -12,7 +13,7 @@ find src -name *.[ch]* -exec chmod 644 {} \; popd pushd $source/desmume/src/frontend/posix ./autogen.sh -./configure --prefix=/usr --bindir=/usr/games --datadir=/usr/share/games \ +./configure --prefix=$prefix --bindir=$prefix/games --datadir=$prefix/share/games \ --enable-gdb-stub \ --enable-osmesa \ --enable-glade From ea3108ad4f42e775de08e349523b0acc7fc710b3 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Wed, 31 Jan 2024 13:07:12 +0100 Subject: [PATCH 25/90] Update rules --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index fc8b95655..71a0a6044 100644 --- a/debian/rules +++ b/debian/rules @@ -8,7 +8,7 @@ LDFLAGS+=-Wl,-z,defs -Wl,--as-needed override_dh_auto_configure: chmod +x $(CURDIR)/debian/configure.sh - $(CURDIR)/debian/configure.sh $(CURDIR) + $(CURDIR)/debian/configure.sh $(CURDIR) /usr override_dh_auto_build: chmod +x $(CURDIR)/debian/build.sh From e78135e5155c5cba00cb686b5dcec05ce508dcd7 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Wed, 31 Jan 2024 13:12:27 +0100 Subject: [PATCH 26/90] Update rules --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 71a0a6044..7f2214738 100644 --- a/debian/rules +++ b/debian/rules @@ -16,7 +16,7 @@ override_dh_auto_build: override_dh_auto_install: chmod +x $(CURDIR)/debian/install.sh - $(CURDIR)/debian/install.sh $(CURDIR) + $(CURDIR)/debian/install.sh $(CURDIR) /usr $(CURDIR)/debian/desmume override_dh_installdocs: echo "no doc" From 3ab7355ddb03e8b595e8511091abe3cfc9897801 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Wed, 31 Jan 2024 13:14:12 +0100 Subject: [PATCH 27/90] Update install.sh --- debian/install.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/debian/install.sh b/debian/install.sh index 38ff17db7..f181470f5 100644 --- a/debian/install.sh +++ b/debian/install.sh @@ -1,11 +1,13 @@ #!/bin/bash source=$1 -pushd desmume/src/frontend/posix -DESTDIR=$source/debian/desmume make install +prefix=$2 +destdir=$3 +pushd $source/desmume/src/frontend/posix +DESTDIR=$destdir make install popd -mv $source/debian/desmume/usr/games/share/pixmaps/DeSmuME.xpm \ -$source/debian/desmume/usr/share/pixmaps/ -rm -rf $source/debian/desmume/usr/share/games/pixmaps -mv $source/debian/desmume/usr/games/share/applications/desmume*.desktop \ -$source/debian/desmume/usr/share/applications/ -rm -rf $source/debian/desmume/usr/games/share/applications +mv $destdir/$prefix/games/share/pixmaps/DeSmuME.xpm \ +$destdir/$prefix/share/pixmaps/ +rm -rf $destdir/$prefix/share/games/pixmaps +mv $destdir/$prefix/games/share/applications/desmume*.desktop \ +$destdir/$prefix/share/applications/ +rm -rf $destdir/$prefix/games/share/applications From 341f45e6915a6b947361017a7661b23daf71defb Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Wed, 31 Jan 2024 14:12:48 +0100 Subject: [PATCH 28/90] Update .stable_tag --- .stable_tag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.stable_tag b/.stable_tag index 8225a4ba4..62ea25909 100644 --- a/.stable_tag +++ b/.stable_tag @@ -1 +1 @@ -0.9.11 +0.9.13 From ac07677b0a8e73a0aa3360bf2bc3f6c35f257660 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Thu, 1 Feb 2024 09:19:15 +0100 Subject: [PATCH 29/90] Update control --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index e3e1838cb..11031407f 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,8 @@ 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, meson, libsdl2-dev, libpcap-dev, libgtk-3-dev + libsoundtouch-dev, dh-autoreconf, meson, libsdl2-dev, libpcap-dev, libgtk-3-dev, + cmake, libopenal-dev Standards-Version: 3.9.6 Homepage: http://desmume.org/ Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/desmume/ From 595aad4700718492f88091bfc08b6e1b1bac5eb3 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Thu, 1 Feb 2024 10:57:14 +0100 Subject: [PATCH 30/90] Update rules --- debian/rules | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/debian/rules b/debian/rules index 7f2214738..77deaf9b8 100644 --- a/debian/rules +++ b/debian/rules @@ -4,19 +4,4 @@ LDFLAGS+=-Wl,-z,defs -Wl,--as-needed #export LDFLAGS %: - dh $@ --with quilt,autoreconf - -override_dh_auto_configure: - chmod +x $(CURDIR)/debian/configure.sh - $(CURDIR)/debian/configure.sh $(CURDIR) /usr - -override_dh_auto_build: - chmod +x $(CURDIR)/debian/build.sh - $(CURDIR)/debian/build.sh $(CURDIR) - -override_dh_auto_install: - chmod +x $(CURDIR)/debian/install.sh - $(CURDIR)/debian/install.sh $(CURDIR) /usr $(CURDIR)/debian/desmume - -override_dh_installdocs: - echo "no doc" + dh $@ --buildsystem=meson --sourcedir=desmume/src/frontend/posix --builddir=desmume/src/frontend/posix/build From 4364595ebe086335b67611918726e9ee78570274 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Thu, 1 Feb 2024 10:57:29 +0100 Subject: [PATCH 31/90] Delete debian/build.sh --- debian/build.sh | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 debian/build.sh diff --git a/debian/build.sh b/debian/build.sh deleted file mode 100644 index e02ba1da7..000000000 --- a/debian/build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -source=$1 -pushd $source/desmume/src/frontend/posix -make -j12 -popd From 32f921f80b3b512e368148cc3e2cebd6b0764ac5 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Thu, 1 Feb 2024 10:57:39 +0100 Subject: [PATCH 32/90] Delete debian/configure.sh --- debian/configure.sh | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 debian/configure.sh diff --git a/debian/configure.sh b/debian/configure.sh deleted file mode 100644 index 6120515fa..000000000 --- a/debian/configure.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -source=$1 -prefix=$2 -pushd $source/desmume -sed -i 's/\r//' AUTHORS -for txtfile in AUTHORS -do - iconv --from=ISO-8859-1 --to=UTF-8 $txtfile > tmp - touch -r $txtfile tmp - mv tmp $txtfile -done -find src -name *.[ch]* -exec chmod 644 {} \; -popd -pushd $source/desmume/src/frontend/posix -./autogen.sh -./configure --prefix=$prefix --bindir=$prefix/games --datadir=$prefix/share/games \ - --enable-gdb-stub \ - --enable-osmesa \ - --enable-glade -popd From b9738bd476303433498743659edc96d42710fb70 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Thu, 1 Feb 2024 10:58:04 +0100 Subject: [PATCH 33/90] Delete debian/install.sh --- debian/install.sh | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 debian/install.sh diff --git a/debian/install.sh b/debian/install.sh deleted file mode 100644 index f181470f5..000000000 --- a/debian/install.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -source=$1 -prefix=$2 -destdir=$3 -pushd $source/desmume/src/frontend/posix -DESTDIR=$destdir make install -popd -mv $destdir/$prefix/games/share/pixmaps/DeSmuME.xpm \ -$destdir/$prefix/share/pixmaps/ -rm -rf $destdir/$prefix/share/games/pixmaps -mv $destdir/$prefix/games/share/applications/desmume*.desktop \ -$destdir/$prefix/share/applications/ -rm -rf $destdir/$prefix/games/share/applications From 05ed457898b5d6b86c0bd633d26ec5b4f0b21559 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Thu, 1 Feb 2024 10:59:29 +0100 Subject: [PATCH 34/90] Create 6508c2b115f954afece4243e36e9e35e1d459ea8.patch --- ...c2b115f954afece4243e36e9e35e1d459ea8.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 debian/patches/6508c2b115f954afece4243e36e9e35e1d459ea8.patch diff --git a/debian/patches/6508c2b115f954afece4243e36e9e35e1d459ea8.patch b/debian/patches/6508c2b115f954afece4243e36e9e35e1d459ea8.patch new file mode 100644 index 000000000..51d98e2b3 --- /dev/null +++ b/debian/patches/6508c2b115f954afece4243e36e9e35e1d459ea8.patch @@ -0,0 +1,31 @@ +From 6508c2b115f954afece4243e36e9e35e1d459ea8 Mon Sep 17 00:00:00 2001 +From: zeromus +Date: Thu, 1 Feb 2024 04:26:27 -0500 +Subject: [PATCH] placate -Werror=format-security (probably) (re: #768) + +--- + desmume/src/commandline.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/desmume/src/commandline.cpp b/desmume/src/commandline.cpp +index cb6c23ac4..4c7bcc4a0 100644 +--- a/desmume/src/commandline.cpp ++++ b/desmume/src/commandline.cpp +@@ -397,7 +397,7 @@ bool CommandLine::parse(int argc,char **argv) + + if(opt_help) + { +- printf(help_string); ++ printf("%s",help_string); + exit(1); + } + +@@ -571,7 +571,7 @@ bool CommandLine::validate() + + void CommandLine::errorHelp(const char* binName) + { +- printerror(help_string); ++ printerror("%s",help_string); + } + + void CommandLine::process_movieCommands() From b33d25da0669611f43e338b427ed8f558e8c0c3e Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Thu, 1 Feb 2024 11:01:31 +0100 Subject: [PATCH 35/90] Create desmume-0.9.13-aarch64.patch --- debian/patches/desmume-0.9.13-aarch64.patch | 240 ++++++++++++++++++++ 1 file changed, 240 insertions(+) create mode 100644 debian/patches/desmume-0.9.13-aarch64.patch diff --git a/debian/patches/desmume-0.9.13-aarch64.patch b/debian/patches/desmume-0.9.13-aarch64.patch new file mode 100644 index 000000000..4f736fcbe --- /dev/null +++ b/debian/patches/desmume-0.9.13-aarch64.patch @@ -0,0 +1,240 @@ +From 24eb5ed95c6cbdaba8b3c63a99e95e899e8a5061 Mon Sep 17 00:00:00 2001 +From: rogerman +Date: Sat, 18 Jun 2022 21:56:25 -0700 +Subject: [PATCH] Fix compiling on GCC for AArch64. Fixes #548. + +--- + desmume/src/render3D.cpp | 2 +- + desmume/src/texcache.cpp | 16 +++--- + .../colorspacehandler_NEON.cpp | 56 +++++++++---------- + 3 files changed, 37 insertions(+), 37 deletions(-) + +diff --git a/desmume/src/render3D.cpp b/desmume/src/render3D.cpp +index abc3b9243..26d5ca94d 100644 +--- a/desmume/src/render3D.cpp ++++ b/desmume/src/render3D.cpp +@@ -899,7 +899,7 @@ void Render3D_NEON::_ClearImageBaseLoop(const u16 *__restrict inColor16, const u + vst1q_u32_x4(outDepth24 + i, calcDepth); + + // Write the fog flags to the fog flag buffer. +- vst1q_u8( outFog + i, vuzp1q_u16(vshrq_n_u16(clearDepth.val[0], 15), vshrq_n_u16(clearDepth.val[1], 15)) ); ++ vst1q_u8( outFog + i, vreinterpretq_u8_u16( vuzp1q_u16(vshrq_n_u16(clearDepth.val[0], 15), vshrq_n_u16(clearDepth.val[1], 15)) ) ); + } + } + +diff --git a/desmume/src/texcache.cpp b/desmume/src/texcache.cpp +index 58ce81735..6d2b50757 100644 +--- a/desmume/src/texcache.cpp ++++ b/desmume/src/texcache.cpp +@@ -1429,8 +1429,8 @@ void __NDSTextureUnpackA3I5_NEON(const size_t texelCount, const u8 *__restrict s + const v128u16 palColor1 = vreinterpretq_u16_u8( vqtbl4q_u8(pal16_LUT, idx1) ); + + const v128u8 alpha = vqtbl1q_u8( alpha_LUT, vshrq_n_u8(bits, 5) ); +- const v128u16 alphaLo = vzip1q_u8(vdupq_n_u8(0), alpha); +- const v128u16 alphaHi = vzip2q_u8(vdupq_n_u8(0), alpha); ++ const v128u16 alphaLo = vreinterpretq_u16_u8( vzip1q_u8(vdupq_n_u8(0), alpha) ); ++ const v128u16 alphaHi = vreinterpretq_u16_u8( vzip2q_u8(vdupq_n_u8(0), alpha) ); + + if (TEXCACHEFORMAT == TexFormat_15bpp) + { +@@ -1658,8 +1658,8 @@ void __NDSTextureUnpackA5I3_NEON(const size_t texelCount, const u8 *__restrict s + if (TEXCACHEFORMAT == TexFormat_15bpp) + { + const v128u8 alpha = vshrq_n_u8(bits, 3); +- const v128u16 alphaLo = vzip1q_u8(vdupq_n_u8(0), alpha); +- const v128u16 alphaHi = vzip2q_u8(vdupq_n_u8(0), alpha); ++ const v128u16 alphaLo = vreinterpretq_u16_u8( vzip1q_u8(vdupq_n_u8(0), alpha) ); ++ const v128u16 alphaHi = vreinterpretq_u16_u8( vzip2q_u8(vdupq_n_u8(0), alpha) ); + + ColorspaceConvert555To6665_NEON(palColor0, alphaLo, convertedColor.val[0], convertedColor.val[1]); + ColorspaceConvert555To6665_NEON(palColor1, alphaHi, convertedColor.val[2], convertedColor.val[3]); +@@ -1667,8 +1667,8 @@ void __NDSTextureUnpackA5I3_NEON(const size_t texelCount, const u8 *__restrict s + else + { + const v128u8 alpha = vqtbl2q_u8( alpha8_LUT, vshrq_n_u8(bits, 3) ); +- const v128u16 alphaLo = vzip1q_u8(vdupq_n_u8(0), alpha); +- const v128u16 alphaHi = vzip2q_u8(vdupq_n_u8(0), alpha); ++ const v128u16 alphaLo = vreinterpretq_u16_u8( vzip1q_u8(vdupq_n_u8(0), alpha) ); ++ const v128u16 alphaHi = vreinterpretq_u16_u8( vzip2q_u8(vdupq_n_u8(0), alpha) ); + + ColorspaceConvert555To8888_NEON(palColor0, alphaLo, convertedColor.val[0], convertedColor.val[1]); + ColorspaceConvert555To8888_NEON(palColor1, alphaHi, convertedColor.val[2], convertedColor.val[3]); +@@ -1967,8 +1967,8 @@ void __NDSTextureUnpackDirect16Bit_NEON(const size_t texelCount, const u16 *__re + } + + const v128u16 alpha = vceqq_u16(vshrq_n_u16(c,15), vdupq_n_u16(1)); +- convertedColor.val[0] = vandq_u16( convertedColor.val[0], vzip1q_u16(alpha, alpha) ); +- convertedColor.val[1] = vandq_u16( convertedColor.val[1], vzip2q_u16(alpha, alpha) ); ++ convertedColor.val[0] = vandq_u32( convertedColor.val[0], vreinterpretq_u32_u16(vzip1q_u16(alpha, alpha)) ); ++ convertedColor.val[1] = vandq_u32( convertedColor.val[1], vreinterpretq_u32_u16(vzip2q_u16(alpha, alpha)) ); + + vst1q_u32_x2(dstBuffer, convertedColor); + } +diff --git a/desmume/src/utils/colorspacehandler/colorspacehandler_NEON.cpp b/desmume/src/utils/colorspacehandler/colorspacehandler_NEON.cpp +index b6b95edb4..81ad657ab 100644 +--- a/desmume/src/utils/colorspacehandler/colorspacehandler_NEON.cpp ++++ b/desmume/src/utils/colorspacehandler/colorspacehandler_NEON.cpp +@@ -25,7 +25,7 @@ + + #define COLOR16_SWAPRB_NEON(src) vorrq_u16( vshlq_n_u16(vandq_u16(src,vdupq_n_u16(0x001F)),10), vorrq_u16( vandq_u16(src,vdupq_n_u16(0x03E0)), vorrq_u16(vshrq_n_u16(vandq_u16(src,vdupq_n_u16(0x7C00)),10), vandq_u16(src,vdupq_n_u16(0x8000))) ) ) + +-#define COLOR32_SWAPRB_NEON(src) vqtbl1q_u8( (src), ((v128u8){2,1,0,3, 6,5,4,7, 10,9,8,11, 14,13,12,15}) ) ++#define COLOR32_SWAPRB_NEON(src) vreinterpretq_u32_u8( vqtbl1q_u8(vreinterpretq_u8_u32(src), ((v128u8){2,1,0,3, 6,5,4,7, 10,9,8,11, 14,13,12,15})) ) + + template + FORCEINLINE void ColorspaceConvert555To8888_NEON(const v128u16 &srcColor, const v128u16 &srcAlphaBits, v128u32 &dstLo, v128u32 &dstHi) +@@ -42,8 +42,8 @@ FORCEINLINE void ColorspaceConvert555To8888_NEON(const v128u16 &srcColor, const + ga = vorrq_u16(ga, vshrq_n_u16(ga, 5)); + ga = vorrq_u16(ga, srcAlphaBits); + +- dstLo = vzip1q_u8(rb, ga); +- dstHi = vzip2q_u8(rb, ga); ++ dstLo = vreinterpretq_u32_u8( vzip1q_u8(vreinterpretq_u8_u16(rb), vreinterpretq_u8_u16(ga)) ); ++ dstHi = vreinterpretq_u32_u8( vzip2q_u8(vreinterpretq_u8_u16(rb), vreinterpretq_u8_u16(ga)) ); + } + else + { +@@ -54,8 +54,8 @@ FORCEINLINE void ColorspaceConvert555To8888_NEON(const v128u16 &srcColor, const + ba = vorrq_u16( ba, vreinterpretq_u16_u8(vshrq_n_u8(vreinterpretq_u8_u16(ba), 5)) ); + ba = vorrq_u16( ba, srcAlphaBits ); + +- dstLo = vzip1q_u16(rg, ba); +- dstHi = vzip2q_u16(rg, ba); ++ dstLo = vreinterpretq_u32_u16( vzip1q_u16(rg, ba) ); ++ dstHi = vreinterpretq_u32_u16( vzip2q_u16(rg, ba) ); + } + } + +@@ -73,8 +73,8 @@ FORCEINLINE void ColorspaceConvert555XTo888X_NEON(const v128u16 &srcColor, v128u + v128u16 g = vandq_u16(vshrq_n_u16(srcColor, 2), vdupq_n_u16(0x00F8) ); + g = vorrq_u16(g, vshrq_n_u16(g, 5)); + +- dstLo = vzip1q_u8(rb, g); +- dstHi = vzip2q_u8(rb, g); ++ dstLo = vreinterpretq_u32_u8( vzip1q_u8(vreinterpretq_u8_u16(rb), vreinterpretq_u8_u16(g)) ); ++ dstHi = vreinterpretq_u32_u8( vzip2q_u8(vreinterpretq_u8_u16(rb), vreinterpretq_u8_u16(g)) ); + } + else + { +@@ -84,8 +84,8 @@ FORCEINLINE void ColorspaceConvert555XTo888X_NEON(const v128u16 &srcColor, v128u + rg = vorrq_u16( rg, vreinterpretq_u16_u8(vshrq_n_u8(vreinterpretq_u8_u16(rg), 5)) ); + b = vorrq_u16( b, vreinterpretq_u16_u8(vshrq_n_u8(vreinterpretq_u8_u16( b), 5)) ); + +- dstLo = vzip1q_u16(rg, b); +- dstHi = vzip2q_u16(rg, b); ++ dstLo = vreinterpretq_u32_u16( vzip1q_u16(rg, b) ); ++ dstHi = vreinterpretq_u32_u16( vzip2q_u16(rg, b) ); + } + } + +@@ -104,8 +104,8 @@ FORCEINLINE void ColorspaceConvert555To6665_NEON(const v128u16 &srcColor, const + ga = vorrq_u16(ga, vshrq_n_u16(ga, 5)); + ga = vorrq_u16(ga, srcAlphaBits); + +- dstLo = vzip1q_u8(rb, ga); +- dstHi = vzip2q_u8(rb, ga); ++ dstLo = vreinterpretq_u32_u8( vzip1q_u8(vreinterpretq_u8_u16(rb), vreinterpretq_u8_u16(ga)) ); ++ dstHi = vreinterpretq_u32_u8( vzip2q_u8(vreinterpretq_u8_u16(rb), vreinterpretq_u8_u16(ga)) ); + } + else + { +@@ -116,8 +116,8 @@ FORCEINLINE void ColorspaceConvert555To6665_NEON(const v128u16 &srcColor, const + ba = vorrq_u16( ba, vreinterpretq_u16_u8(vshrq_n_u8(vreinterpretq_u8_u16(ba), 5)) ); + ba = vorrq_u16( ba, srcAlphaBits ); + +- dstLo = vzip1q_u16(rg, ba); +- dstHi = vzip2q_u16(rg, ba); ++ dstLo = vreinterpretq_u32_u16( vzip1q_u16(rg, ba) ); ++ dstHi = vreinterpretq_u32_u16( vzip2q_u16(rg, ba) ); + } + } + +@@ -135,8 +135,8 @@ FORCEINLINE void ColorspaceConvert555XTo666X_NEON(const v128u16 &srcColor, v128u + v128u16 g = vandq_u16(vshrq_n_u16(srcColor, 4), vdupq_n_u16(0x003E) ); + g = vorrq_u16(g, vshrq_n_u16(g, 5)); + +- dstLo = vzip1q_u8(rb, g); +- dstHi = vzip2q_u8(rb, g); ++ dstLo = vreinterpretq_u32_u8( vzip1q_u8(vreinterpretq_u8_u16(rb), vreinterpretq_u8_u16(g)) ); ++ dstHi = vreinterpretq_u32_u8( vzip2q_u8(vreinterpretq_u8_u16(rb), vreinterpretq_u8_u16(g)) ); + } + else + { +@@ -146,8 +146,8 @@ FORCEINLINE void ColorspaceConvert555XTo666X_NEON(const v128u16 &srcColor, v128u + rg = vorrq_u16( rg, vreinterpretq_u16_u8(vshrq_n_u8(vreinterpretq_u8_u16(rg), 5)) ); + b = vorrq_u16( b, vreinterpretq_u16_u8(vshrq_n_u8(vreinterpretq_u8_u16( b), 5)) ); + +- dstLo = vzip1q_u16(rg, b); +- dstHi = vzip2q_u16(rg, b); ++ dstLo = vreinterpretq_u32_u16( vzip1q_u16(rg, b) ); ++ dstHi = vreinterpretq_u32_u16( vzip2q_u16(rg, b) ); + } + } + +@@ -171,14 +171,14 @@ FORCEINLINE v128u32 ColorspaceConvert8888To6665_NEON(const v128u32 &src) + // Conversion algorithm: + // RGB 8-bit to 6-bit formula: dstRGB6 = (srcRGB8 >> 2) + // Alpha 8-bit to 6-bit formula: dstA5 = (srcA8 >> 3) +- v128u8 rgba = vshlq_u8(vreinterpretq_u8_u32(src), ((v128s8){-2,-2,-2,-3, -2,-2,-2,-3, -2,-2,-2,-3, -2,-2,-2,-3})); ++ v128u32 rgba = vreinterpretq_u32_u8( vshlq_u8(vreinterpretq_u8_u32(src), ((v128s8){-2,-2,-2,-3, -2,-2,-2,-3, -2,-2,-2,-3, -2,-2,-2,-3})) ); + + if (SWAP_RB) + { +- rgba = COLOR32_SWAPRB_NEON(rgba); ++ return COLOR32_SWAPRB_NEON(rgba); + } + +- return vreinterpretq_u32_u8(rgba); ++ return rgba; + } + + template +@@ -187,14 +187,14 @@ FORCEINLINE v128u32 ColorspaceConvert6665To8888_NEON(const v128u32 &src) + // Conversion algorithm: + // RGB 6-bit to 8-bit formula: dstRGB8 = (srcRGB6 << 2) | ((srcRGB6 >> 4) & 0x03) + // Alpha 5-bit to 8-bit formula: dstA8 = (srcA5 << 3) | ((srcA5 >> 2) & 0x07) +- v128u8 rgba = vorrq_u8( vshlq_u8(vreinterpretq_u8_u32(src), ((v128s8){2,2,2,3, 2,2,2,3, 2,2,2,3, 2,2,2,3})), vshlq_u8(vreinterpretq_u8_u32(src), ((v128s8){-4,-4,-4,-2, -4,-4,-4,-2, -4,-4,-4,-2, -4,-4,-4,-2})) ); ++ v128u32 rgba = vreinterpretq_u32_u8( vorrq_u8( vshlq_u8(vreinterpretq_u8_u32(src), ((v128s8){2,2,2,3, 2,2,2,3, 2,2,2,3, 2,2,2,3})), vshlq_u8(vreinterpretq_u8_u32(src), ((v128s8){-4,-4,-4,-2, -4,-4,-4,-2, -4,-4,-4,-2, -4,-4,-4,-2})) ) ); + + if (SWAP_RB) + { +- rgba = COLOR32_SWAPRB_NEON(rgba); ++ return COLOR32_SWAPRB_NEON(rgba); + } + +- return vreinterpretq_u32_u8(rgba); ++ return rgba; + } + + template +@@ -202,7 +202,7 @@ FORCEINLINE v128u16 _ConvertColorBaseTo5551_NEON(const v128u32 &srcLo, const v12 + { + if (COLORFORMAT == NDSColorFormat_BGR555_Rev) + { +- return srcLo; ++ return vreinterpretq_u16_u32(srcLo); + } + + v128u32 rgbLo; +@@ -518,9 +518,9 @@ size_t ColorspaceConvertBuffer555XTo888_NEON(const u16 *__restrict src, u8 *__re + + dstVec.val[1] = vandq_u8( vuzp1q_u8( vreinterpretq_u8_u16(vshrq_n_u16(srcVec.val[0], 2)), vreinterpretq_u8_u16(vshrq_n_u16(srcVec.val[1], 2)) ), vdupq_n_u8(0xF8) ); + +- dstVec.val[0] = vorrq_u8(dstVec.val[0], vshrq_n_u32(dstVec.val[0], 5)); +- dstVec.val[1] = vorrq_u8(dstVec.val[1], vshrq_n_u32(dstVec.val[1], 5)); +- dstVec.val[2] = vorrq_u8(dstVec.val[2], vshrq_n_u32(dstVec.val[2], 5)); ++ dstVec.val[0] = vorrq_u8(dstVec.val[0], vshrq_n_u8(dstVec.val[0], 5)); ++ dstVec.val[1] = vorrq_u8(dstVec.val[1], vshrq_n_u8(dstVec.val[1], 5)); ++ dstVec.val[2] = vorrq_u8(dstVec.val[2], vshrq_n_u8(dstVec.val[2], 5)); + + vst3q_u8(dst+(i*3), dstVec); + } +@@ -646,7 +646,7 @@ size_t ColorspaceApplyIntensityToBuffer16_NEON(u16 *dst, size_t pixCountVec128, + g = vshlq_n_u16( vuzp2q_u16( vreinterpretq_u16_u32(vmull_u16(vget_low_u16(g), intensityVec)), vreinterpretq_u16_u32(vmull_u16(vget_high_u16(g), intensityVec)) ), 5 ); + b = vshlq_n_u16( vuzp2q_u16( vreinterpretq_u16_u32(vmull_u16(vget_low_u16(b), intensityVec)), vreinterpretq_u16_u32(vmull_u16(vget_high_u16(b), intensityVec)) ), 10 ); + +- tempDst = vorrq_u32( vorrq_u32( vorrq_u32(r, g), b), a); ++ tempDst = vorrq_u16( vorrq_u16( vorrq_u16(r, g), b), a); + + vst1q_u16(dst+i, tempDst); + } From 1f13d525fad999ce4dca029d78840fc837b7b517 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Thu, 1 Feb 2024 11:02:12 +0100 Subject: [PATCH 36/90] Create desmume-0.9.13-arm.patch --- debian/patches/desmume-0.9.13-arm.patch | 61 +++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 debian/patches/desmume-0.9.13-arm.patch diff --git a/debian/patches/desmume-0.9.13-arm.patch b/debian/patches/desmume-0.9.13-arm.patch new file mode 100644 index 000000000..5f8f5213b --- /dev/null +++ b/debian/patches/desmume-0.9.13-arm.patch @@ -0,0 +1,61 @@ +From d4afd4977ce8b7ba6293946c74914afe79536059 Mon Sep 17 00:00:00 2001 +From: rogerman +Date: Mon, 20 Jun 2022 11:22:26 -0700 +Subject: [PATCH] libretro-common: Compiling tune-up for ARM architectures. - + Fixes a mismatched register warning in arm_enable_runfast_mode() when + compiling for AArch64. - Fix compiling check_arm_cpu_feature() on non-ARM + architectures by being super explicit and pedantic about checking for + __ARM_ARCH; none of this compiler-assumes-a-macro-equals-zero-if-undefined + stuff. + +--- + desmume/src/libretro-common/features/features_cpu.c | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +diff --git a/desmume/src/libretro-common/features/features_cpu.c b/desmume/src/libretro-common/features/features_cpu.c +index 0980821f9..2c41d5732 100644 +--- a/desmume/src/libretro-common/features/features_cpu.c ++++ b/desmume/src/libretro-common/features/features_cpu.c +@@ -300,10 +300,17 @@ static void arm_enable_runfast_mode(void) + static const unsigned y = 0x03000000; + int r; + __asm__ volatile( ++#if defined(__aarch64__) || defined(_M_ARM64) ++ "fmrx %w0, fpscr \n\t" /* w0 = FPSCR */ ++ "and %w0, %w0, %w1 \n\t" /* w0 = w0 & 0x04086060 */ ++ "orr %w0, %w0, %w2 \n\t" /* w0 = w0 | 0x03000000 */ ++ "fmxr fpscr, %w0 \n\t" /* FPSCR = w0 */ ++#else + "fmrx %0, fpscr \n\t" /* r0 = FPSCR */ + "and %0, %0, %1 \n\t" /* r0 = r0 & 0x04086060 */ + "orr %0, %0, %2 \n\t" /* r0 = r0 | 0x03000000 */ + "fmxr fpscr, %0 \n\t" /* FPSCR = r0 */ ++#endif + : "=r"(r) + : "r"(x), "r"(y) + ); +@@ -311,13 +318,13 @@ static void arm_enable_runfast_mode(void) + #endif + + #if defined(__linux__) && !defined(CPU_X86) +-#if __ARM_ARCH ++#if defined(__ARM_ARCH) && (__ARM_ARCH > 0) + #include + #endif + + static unsigned char check_arm_cpu_feature(const char* feature) + { +-#if __ARM_ARCH < 8 ++#if defined(__ARM_ARCH) && (__ARM_ARCH < 8) + uint64_t hwcap = getauxval(AT_HWCAP); + if (!strcmp(feature, "neon")) + return (hwcap & HWCAP_ARM_NEON) != 0; +@@ -326,7 +333,7 @@ static unsigned char check_arm_cpu_feature(const char* feature) + if (!strcmp(feature, "vfpv4")) + return (hwcap & HWCAP_ARM_VFPv4) != 0; + return 0; +-#elif __ARM_ARCH == 8 ++#elif defined(__ARM_ARCH) && (__ARM_ARCH == 8) + uint64_t hwcap = getauxval(AT_HWCAP); + if (!strcmp(feature, "asimd")) + return (hwcap & HWCAP_ASIMD) != 0; From d187425474ee3d7a3599798e8e6419d43fce3b97 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Thu, 1 Feb 2024 11:02:43 +0100 Subject: [PATCH 37/90] Create desmume-0.9.13-formatstring.patch --- .../patches/desmume-0.9.13-formatstring.patch | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 debian/patches/desmume-0.9.13-formatstring.patch diff --git a/debian/patches/desmume-0.9.13-formatstring.patch b/debian/patches/desmume-0.9.13-formatstring.patch new file mode 100644 index 000000000..dfd49d121 --- /dev/null +++ b/debian/patches/desmume-0.9.13-formatstring.patch @@ -0,0 +1,21 @@ +diff -durN desmume-release_0_9_13.orig/desmume/src/commandline.cpp desmume-release_0_9_13/desmume/src/commandline.cpp +--- desmume-release_0_9_13.orig/desmume/src/commandline.cpp 2022-05-23 06:37:41.000000000 +0200 ++++ desmume-release_0_9_13/desmume/src/commandline.cpp 2022-06-18 18:40:49.218922840 +0200 +@@ -31,7 +31,7 @@ + #include + //#include "frontend/modules/mGetOpt.h" //to test with this, make sure global `optind` is initialized to 1 + +-#define printerror(...) fprintf(stderr, __VA_ARGS__) ++#define printerror(...) fprintf(stderr, "%s", __VA_ARGS__) + + int _scanline_filter_a = 0, _scanline_filter_b = 2, _scanline_filter_c = 2, _scanline_filter_d = 4; + int _commandline_linux_nojoy = 0; +@@ -397,7 +397,7 @@ + + if(opt_help) + { +- printf(help_string); ++ printf("%s", help_string); + exit(1); + } + From 03d132677a4f34676feeb0f386f981b28588ba5b Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Thu, 1 Feb 2024 11:05:33 +0100 Subject: [PATCH 38/90] Create desmume-0.9.13-ppc64le.patch --- debian/patches/desmume-0.9.13-ppc64le.patch | 26 +++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 debian/patches/desmume-0.9.13-ppc64le.patch diff --git a/debian/patches/desmume-0.9.13-ppc64le.patch b/debian/patches/desmume-0.9.13-ppc64le.patch new file mode 100644 index 000000000..057889515 --- /dev/null +++ b/debian/patches/desmume-0.9.13-ppc64le.patch @@ -0,0 +1,26 @@ +From a95e4c57c61b791fdcb17922735f8681af201b03 Mon Sep 17 00:00:00 2001 +From: rogerman +Date: Sun, 19 Jun 2022 20:36:50 -0700 +Subject: [PATCH] Remove AltiVec compiling for ppcle and ppc64le architectures, + since our AltiVec code only works on big-endian systems anyways. Fixes #550. + +--- + desmume/src/types.h | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/desmume/src/types.h b/desmume/src/types.h +index 0fe31b347..5d5ac50af 100644 +--- a/desmume/src/types.h ++++ b/desmume/src/types.h +@@ -53,7 +53,10 @@ + #endif + + #ifdef __GNUC__ +- #ifdef __ALTIVEC__ ++// Our AltiVec code assumes that its being run on a big-endian system. While ++// the ppcle and ppc64le architectures do exist, our AltiVec code does not ++// support little-endian right now. ++ #if defined(__ALTIVEC__) && defined(MSB_FIRST) && (MSB_FIRST > 0) + #define ENABLE_ALTIVEC + #endif + From 760286295e6edf19133e564ffe609c35b845bbd3 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Thu, 1 Feb 2024 11:06:06 +0100 Subject: [PATCH 39/90] Create desmume-0.9.13-tinyxml.patch --- debian/patches/desmume-0.9.13-tinyxml.patch | 43 +++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 debian/patches/desmume-0.9.13-tinyxml.patch diff --git a/debian/patches/desmume-0.9.13-tinyxml.patch b/debian/patches/desmume-0.9.13-tinyxml.patch new file mode 100644 index 000000000..3acf8fc7e --- /dev/null +++ b/debian/patches/desmume-0.9.13-tinyxml.patch @@ -0,0 +1,43 @@ +diff -durN desmume-release_0_9_13.orig/desmume/src/frontend/posix/meson.build desmume-release_0_9_13/desmume/src/frontend/posix/meson.build +--- desmume-release_0_9_13.orig/desmume/src/frontend/posix/meson.build 2022-05-23 06:37:41.000000000 +0200 ++++ desmume-release_0_9_13/desmume/src/frontend/posix/meson.build 2022-06-18 19:22:06.688637556 +0200 +@@ -15,6 +15,7 @@ + dep_pcap = dependency('pcap') + dep_zlib = dependency('zlib') + dep_threads = dependency('threads') ++dep_tinyxml = dependency('tinyxml') + dep_gl = dependency('gl', required: false) + dep_openal = dependency('openal', required: get_option('openal')) + dep_alsa = dependency('alsa', required: false) +@@ -28,7 +29,7 @@ + add_global_arguments('-DEXPERIMENTAL_WIFI_COMM', language: ['c', 'cpp']) + endif + +-dependencies = [dep_glib2, dep_sdl, dep_pcap, dep_zlib, dep_threads] ++dependencies = [dep_glib2, dep_sdl, dep_pcap, dep_zlib, dep_threads, dep_tinyxml] + + if target_machine.cpu() == 'x86_64' + add_global_arguments('-DHAVE_JIT', language: ['c', 'cpp']) +@@ -99,10 +100,6 @@ + '../../utils/libfat/libfat_public_api.cpp', + '../../utils/libfat/lock.cpp', + '../../utils/libfat/partition.cpp', +- '../../utils/tinyxml/tinystr.cpp', +- '../../utils/tinyxml/tinyxml.cpp', +- '../../utils/tinyxml/tinyxmlerror.cpp', +- '../../utils/tinyxml/tinyxmlparser.cpp', + '../../utils/colorspacehandler/colorspacehandler.cpp', + '../../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_rom.cpp', '../../addons/slot1comp_protocol.cpp', + '../../cheatSystem.cpp', +diff -durN desmume-release_0_9_13.orig/desmume/src/utils/advanscene.cpp desmume-release_0_9_13/desmume/src/utils/advanscene.cpp +--- desmume-release_0_9_13.orig/desmume/src/utils/advanscene.cpp 2022-05-23 06:37:41.000000000 +0200 ++++ desmume-release_0_9_13/desmume/src/utils/advanscene.cpp 2022-06-18 19:14:40.054101672 +0200 +@@ -19,7 +19,7 @@ + #include + + #define TIXML_USE_STL +-#include "tinyxml/tinyxml.h" ++#include + + #include "advanscene.h" + #include "../common.h" From 64dcb0f4ec6c18d22927ebea62a0db1e36af1be2 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Thu, 1 Feb 2024 11:06:39 +0100 Subject: [PATCH 40/90] Create series --- debian/patches/series | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 debian/patches/series diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 000000000..548cfc924 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,6 @@ +desmume-0.9.13-formatstring.patch +desmume-0.9.13-tinyxml.patch +desmume-0.9.13-aarch64.patch +desmume-0.9.13-ppc64le.patch +desmume-0.9.13-arm.patch +6508c2b115f954afece4243e36e9e35e1d459ea8.patch From 4d6e92d9dc2522b12edd869ef694063a0e86e7eb Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Thu, 1 Feb 2024 17:07:41 +0100 Subject: [PATCH 41/90] Update compat --- debian/compat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/compat b/debian/compat index ec635144f..48082f72f 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +12 From 9926814cafce85bfc28f68c4eb9495f3b25890bb Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Thu, 1 Feb 2024 21:03:40 +0100 Subject: [PATCH 42/90] Update rules --- debian/rules | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 77deaf9b8..a984bb47c 100644 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,23 @@ #!/usr/bin/make -f +LDFLAGS="" +export LDFLAGS +CFLAGS="" +export CFLAGS +FFLAGS="" +export FFLAGS +FCFLAGS="" +export FCFLAGS +DEB_CFLAGS_SET="" +export DEB_CFLAGS_SET +DEB_CXXFLAGS_SET="" +export DEB_CXXFLAGS_SET +DEB_FFLAGS_SET="" +export DEB_FFLAGS_SET +DEB_FCFLAGS_SET="" +export DEB_FCFLAGS_SET +DEB_LDFLAGS_SET="" +export DEB_LDFLAGS_SET -LDFLAGS+=-Wl,-z,defs -Wl,--as-needed -#export LDFLAGS %: dh $@ --buildsystem=meson --sourcedir=desmume/src/frontend/posix --builddir=desmume/src/frontend/posix/build From 426c742bbb8e3b3ff28272540a0ac036b0e17119 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Thu, 1 Feb 2024 21:08:06 +0100 Subject: [PATCH 43/90] Update changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index bdfa54196..d78e164b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -desmume (0.9.13-3build2) jammy; urgency=medium +desmume (0.9.13-4build2) jammy; urgency=medium * No-change rebuild against latest gdk-pixbuf From 6603196436dd94497317a0d69e5086870178842b Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 2 Feb 2024 01:39:28 +0100 Subject: [PATCH 44/90] Delete debian/changelog --- debian/changelog | 352 ----------------------------------------------- 1 file changed, 352 deletions(-) delete mode 100644 debian/changelog diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index d78e164b6..000000000 --- a/debian/changelog +++ /dev/null @@ -1,352 +0,0 @@ -desmume (0.9.13-4build2) jammy; urgency=medium - - * No-change rebuild against latest gdk-pixbuf - - -- Jeremy Bicha Wed, 09 Mar 2022 18:48:49 -0500 - -desmume (0.9.11-3build1) focal; urgency=medium - - * No-change rebuild for libgcc-s1 package name change. - - -- Matthias Klose Sun, 22 Mar 2020 16:38:08 +0100 - -desmume (0.9.11-3) unstable; urgency=medium - - * Import upstream patch to fix FTBFS with GCC7 - Closes: #853372 - - -- Evgeni Golov Sun, 22 Oct 2017 11:23:03 +0200 - -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 From 8b3e9e4459470412429dafc82ebf700d9d21cf7d Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 2 Feb 2024 01:39:51 +0100 Subject: [PATCH 45/90] Delete debian/patches/6508c2b115f954afece4243e36e9e35e1d459ea8.patch --- ...c2b115f954afece4243e36e9e35e1d459ea8.patch | 31 ------------------- 1 file changed, 31 deletions(-) delete mode 100644 debian/patches/6508c2b115f954afece4243e36e9e35e1d459ea8.patch diff --git a/debian/patches/6508c2b115f954afece4243e36e9e35e1d459ea8.patch b/debian/patches/6508c2b115f954afece4243e36e9e35e1d459ea8.patch deleted file mode 100644 index 51d98e2b3..000000000 --- a/debian/patches/6508c2b115f954afece4243e36e9e35e1d459ea8.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 6508c2b115f954afece4243e36e9e35e1d459ea8 Mon Sep 17 00:00:00 2001 -From: zeromus -Date: Thu, 1 Feb 2024 04:26:27 -0500 -Subject: [PATCH] placate -Werror=format-security (probably) (re: #768) - ---- - desmume/src/commandline.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/desmume/src/commandline.cpp b/desmume/src/commandline.cpp -index cb6c23ac4..4c7bcc4a0 100644 ---- a/desmume/src/commandline.cpp -+++ b/desmume/src/commandline.cpp -@@ -397,7 +397,7 @@ bool CommandLine::parse(int argc,char **argv) - - if(opt_help) - { -- printf(help_string); -+ printf("%s",help_string); - exit(1); - } - -@@ -571,7 +571,7 @@ bool CommandLine::validate() - - void CommandLine::errorHelp(const char* binName) - { -- printerror(help_string); -+ printerror("%s",help_string); - } - - void CommandLine::process_movieCommands() From a280093b4840a7b94b83cddf95303ccd128dbd05 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 2 Feb 2024 01:39:59 +0100 Subject: [PATCH 46/90] Delete debian/patches/desmume-0.9.13-aarch64.patch --- debian/patches/desmume-0.9.13-aarch64.patch | 240 -------------------- 1 file changed, 240 deletions(-) delete mode 100644 debian/patches/desmume-0.9.13-aarch64.patch diff --git a/debian/patches/desmume-0.9.13-aarch64.patch b/debian/patches/desmume-0.9.13-aarch64.patch deleted file mode 100644 index 4f736fcbe..000000000 --- a/debian/patches/desmume-0.9.13-aarch64.patch +++ /dev/null @@ -1,240 +0,0 @@ -From 24eb5ed95c6cbdaba8b3c63a99e95e899e8a5061 Mon Sep 17 00:00:00 2001 -From: rogerman -Date: Sat, 18 Jun 2022 21:56:25 -0700 -Subject: [PATCH] Fix compiling on GCC for AArch64. Fixes #548. - ---- - desmume/src/render3D.cpp | 2 +- - desmume/src/texcache.cpp | 16 +++--- - .../colorspacehandler_NEON.cpp | 56 +++++++++---------- - 3 files changed, 37 insertions(+), 37 deletions(-) - -diff --git a/desmume/src/render3D.cpp b/desmume/src/render3D.cpp -index abc3b9243..26d5ca94d 100644 ---- a/desmume/src/render3D.cpp -+++ b/desmume/src/render3D.cpp -@@ -899,7 +899,7 @@ void Render3D_NEON::_ClearImageBaseLoop(const u16 *__restrict inColor16, const u - vst1q_u32_x4(outDepth24 + i, calcDepth); - - // Write the fog flags to the fog flag buffer. -- vst1q_u8( outFog + i, vuzp1q_u16(vshrq_n_u16(clearDepth.val[0], 15), vshrq_n_u16(clearDepth.val[1], 15)) ); -+ vst1q_u8( outFog + i, vreinterpretq_u8_u16( vuzp1q_u16(vshrq_n_u16(clearDepth.val[0], 15), vshrq_n_u16(clearDepth.val[1], 15)) ) ); - } - } - -diff --git a/desmume/src/texcache.cpp b/desmume/src/texcache.cpp -index 58ce81735..6d2b50757 100644 ---- a/desmume/src/texcache.cpp -+++ b/desmume/src/texcache.cpp -@@ -1429,8 +1429,8 @@ void __NDSTextureUnpackA3I5_NEON(const size_t texelCount, const u8 *__restrict s - const v128u16 palColor1 = vreinterpretq_u16_u8( vqtbl4q_u8(pal16_LUT, idx1) ); - - const v128u8 alpha = vqtbl1q_u8( alpha_LUT, vshrq_n_u8(bits, 5) ); -- const v128u16 alphaLo = vzip1q_u8(vdupq_n_u8(0), alpha); -- const v128u16 alphaHi = vzip2q_u8(vdupq_n_u8(0), alpha); -+ const v128u16 alphaLo = vreinterpretq_u16_u8( vzip1q_u8(vdupq_n_u8(0), alpha) ); -+ const v128u16 alphaHi = vreinterpretq_u16_u8( vzip2q_u8(vdupq_n_u8(0), alpha) ); - - if (TEXCACHEFORMAT == TexFormat_15bpp) - { -@@ -1658,8 +1658,8 @@ void __NDSTextureUnpackA5I3_NEON(const size_t texelCount, const u8 *__restrict s - if (TEXCACHEFORMAT == TexFormat_15bpp) - { - const v128u8 alpha = vshrq_n_u8(bits, 3); -- const v128u16 alphaLo = vzip1q_u8(vdupq_n_u8(0), alpha); -- const v128u16 alphaHi = vzip2q_u8(vdupq_n_u8(0), alpha); -+ const v128u16 alphaLo = vreinterpretq_u16_u8( vzip1q_u8(vdupq_n_u8(0), alpha) ); -+ const v128u16 alphaHi = vreinterpretq_u16_u8( vzip2q_u8(vdupq_n_u8(0), alpha) ); - - ColorspaceConvert555To6665_NEON(palColor0, alphaLo, convertedColor.val[0], convertedColor.val[1]); - ColorspaceConvert555To6665_NEON(palColor1, alphaHi, convertedColor.val[2], convertedColor.val[3]); -@@ -1667,8 +1667,8 @@ void __NDSTextureUnpackA5I3_NEON(const size_t texelCount, const u8 *__restrict s - else - { - const v128u8 alpha = vqtbl2q_u8( alpha8_LUT, vshrq_n_u8(bits, 3) ); -- const v128u16 alphaLo = vzip1q_u8(vdupq_n_u8(0), alpha); -- const v128u16 alphaHi = vzip2q_u8(vdupq_n_u8(0), alpha); -+ const v128u16 alphaLo = vreinterpretq_u16_u8( vzip1q_u8(vdupq_n_u8(0), alpha) ); -+ const v128u16 alphaHi = vreinterpretq_u16_u8( vzip2q_u8(vdupq_n_u8(0), alpha) ); - - ColorspaceConvert555To8888_NEON(palColor0, alphaLo, convertedColor.val[0], convertedColor.val[1]); - ColorspaceConvert555To8888_NEON(palColor1, alphaHi, convertedColor.val[2], convertedColor.val[3]); -@@ -1967,8 +1967,8 @@ void __NDSTextureUnpackDirect16Bit_NEON(const size_t texelCount, const u16 *__re - } - - const v128u16 alpha = vceqq_u16(vshrq_n_u16(c,15), vdupq_n_u16(1)); -- convertedColor.val[0] = vandq_u16( convertedColor.val[0], vzip1q_u16(alpha, alpha) ); -- convertedColor.val[1] = vandq_u16( convertedColor.val[1], vzip2q_u16(alpha, alpha) ); -+ convertedColor.val[0] = vandq_u32( convertedColor.val[0], vreinterpretq_u32_u16(vzip1q_u16(alpha, alpha)) ); -+ convertedColor.val[1] = vandq_u32( convertedColor.val[1], vreinterpretq_u32_u16(vzip2q_u16(alpha, alpha)) ); - - vst1q_u32_x2(dstBuffer, convertedColor); - } -diff --git a/desmume/src/utils/colorspacehandler/colorspacehandler_NEON.cpp b/desmume/src/utils/colorspacehandler/colorspacehandler_NEON.cpp -index b6b95edb4..81ad657ab 100644 ---- a/desmume/src/utils/colorspacehandler/colorspacehandler_NEON.cpp -+++ b/desmume/src/utils/colorspacehandler/colorspacehandler_NEON.cpp -@@ -25,7 +25,7 @@ - - #define COLOR16_SWAPRB_NEON(src) vorrq_u16( vshlq_n_u16(vandq_u16(src,vdupq_n_u16(0x001F)),10), vorrq_u16( vandq_u16(src,vdupq_n_u16(0x03E0)), vorrq_u16(vshrq_n_u16(vandq_u16(src,vdupq_n_u16(0x7C00)),10), vandq_u16(src,vdupq_n_u16(0x8000))) ) ) - --#define COLOR32_SWAPRB_NEON(src) vqtbl1q_u8( (src), ((v128u8){2,1,0,3, 6,5,4,7, 10,9,8,11, 14,13,12,15}) ) -+#define COLOR32_SWAPRB_NEON(src) vreinterpretq_u32_u8( vqtbl1q_u8(vreinterpretq_u8_u32(src), ((v128u8){2,1,0,3, 6,5,4,7, 10,9,8,11, 14,13,12,15})) ) - - template - FORCEINLINE void ColorspaceConvert555To8888_NEON(const v128u16 &srcColor, const v128u16 &srcAlphaBits, v128u32 &dstLo, v128u32 &dstHi) -@@ -42,8 +42,8 @@ FORCEINLINE void ColorspaceConvert555To8888_NEON(const v128u16 &srcColor, const - ga = vorrq_u16(ga, vshrq_n_u16(ga, 5)); - ga = vorrq_u16(ga, srcAlphaBits); - -- dstLo = vzip1q_u8(rb, ga); -- dstHi = vzip2q_u8(rb, ga); -+ dstLo = vreinterpretq_u32_u8( vzip1q_u8(vreinterpretq_u8_u16(rb), vreinterpretq_u8_u16(ga)) ); -+ dstHi = vreinterpretq_u32_u8( vzip2q_u8(vreinterpretq_u8_u16(rb), vreinterpretq_u8_u16(ga)) ); - } - else - { -@@ -54,8 +54,8 @@ FORCEINLINE void ColorspaceConvert555To8888_NEON(const v128u16 &srcColor, const - ba = vorrq_u16( ba, vreinterpretq_u16_u8(vshrq_n_u8(vreinterpretq_u8_u16(ba), 5)) ); - ba = vorrq_u16( ba, srcAlphaBits ); - -- dstLo = vzip1q_u16(rg, ba); -- dstHi = vzip2q_u16(rg, ba); -+ dstLo = vreinterpretq_u32_u16( vzip1q_u16(rg, ba) ); -+ dstHi = vreinterpretq_u32_u16( vzip2q_u16(rg, ba) ); - } - } - -@@ -73,8 +73,8 @@ FORCEINLINE void ColorspaceConvert555XTo888X_NEON(const v128u16 &srcColor, v128u - v128u16 g = vandq_u16(vshrq_n_u16(srcColor, 2), vdupq_n_u16(0x00F8) ); - g = vorrq_u16(g, vshrq_n_u16(g, 5)); - -- dstLo = vzip1q_u8(rb, g); -- dstHi = vzip2q_u8(rb, g); -+ dstLo = vreinterpretq_u32_u8( vzip1q_u8(vreinterpretq_u8_u16(rb), vreinterpretq_u8_u16(g)) ); -+ dstHi = vreinterpretq_u32_u8( vzip2q_u8(vreinterpretq_u8_u16(rb), vreinterpretq_u8_u16(g)) ); - } - else - { -@@ -84,8 +84,8 @@ FORCEINLINE void ColorspaceConvert555XTo888X_NEON(const v128u16 &srcColor, v128u - rg = vorrq_u16( rg, vreinterpretq_u16_u8(vshrq_n_u8(vreinterpretq_u8_u16(rg), 5)) ); - b = vorrq_u16( b, vreinterpretq_u16_u8(vshrq_n_u8(vreinterpretq_u8_u16( b), 5)) ); - -- dstLo = vzip1q_u16(rg, b); -- dstHi = vzip2q_u16(rg, b); -+ dstLo = vreinterpretq_u32_u16( vzip1q_u16(rg, b) ); -+ dstHi = vreinterpretq_u32_u16( vzip2q_u16(rg, b) ); - } - } - -@@ -104,8 +104,8 @@ FORCEINLINE void ColorspaceConvert555To6665_NEON(const v128u16 &srcColor, const - ga = vorrq_u16(ga, vshrq_n_u16(ga, 5)); - ga = vorrq_u16(ga, srcAlphaBits); - -- dstLo = vzip1q_u8(rb, ga); -- dstHi = vzip2q_u8(rb, ga); -+ dstLo = vreinterpretq_u32_u8( vzip1q_u8(vreinterpretq_u8_u16(rb), vreinterpretq_u8_u16(ga)) ); -+ dstHi = vreinterpretq_u32_u8( vzip2q_u8(vreinterpretq_u8_u16(rb), vreinterpretq_u8_u16(ga)) ); - } - else - { -@@ -116,8 +116,8 @@ FORCEINLINE void ColorspaceConvert555To6665_NEON(const v128u16 &srcColor, const - ba = vorrq_u16( ba, vreinterpretq_u16_u8(vshrq_n_u8(vreinterpretq_u8_u16(ba), 5)) ); - ba = vorrq_u16( ba, srcAlphaBits ); - -- dstLo = vzip1q_u16(rg, ba); -- dstHi = vzip2q_u16(rg, ba); -+ dstLo = vreinterpretq_u32_u16( vzip1q_u16(rg, ba) ); -+ dstHi = vreinterpretq_u32_u16( vzip2q_u16(rg, ba) ); - } - } - -@@ -135,8 +135,8 @@ FORCEINLINE void ColorspaceConvert555XTo666X_NEON(const v128u16 &srcColor, v128u - v128u16 g = vandq_u16(vshrq_n_u16(srcColor, 4), vdupq_n_u16(0x003E) ); - g = vorrq_u16(g, vshrq_n_u16(g, 5)); - -- dstLo = vzip1q_u8(rb, g); -- dstHi = vzip2q_u8(rb, g); -+ dstLo = vreinterpretq_u32_u8( vzip1q_u8(vreinterpretq_u8_u16(rb), vreinterpretq_u8_u16(g)) ); -+ dstHi = vreinterpretq_u32_u8( vzip2q_u8(vreinterpretq_u8_u16(rb), vreinterpretq_u8_u16(g)) ); - } - else - { -@@ -146,8 +146,8 @@ FORCEINLINE void ColorspaceConvert555XTo666X_NEON(const v128u16 &srcColor, v128u - rg = vorrq_u16( rg, vreinterpretq_u16_u8(vshrq_n_u8(vreinterpretq_u8_u16(rg), 5)) ); - b = vorrq_u16( b, vreinterpretq_u16_u8(vshrq_n_u8(vreinterpretq_u8_u16( b), 5)) ); - -- dstLo = vzip1q_u16(rg, b); -- dstHi = vzip2q_u16(rg, b); -+ dstLo = vreinterpretq_u32_u16( vzip1q_u16(rg, b) ); -+ dstHi = vreinterpretq_u32_u16( vzip2q_u16(rg, b) ); - } - } - -@@ -171,14 +171,14 @@ FORCEINLINE v128u32 ColorspaceConvert8888To6665_NEON(const v128u32 &src) - // Conversion algorithm: - // RGB 8-bit to 6-bit formula: dstRGB6 = (srcRGB8 >> 2) - // Alpha 8-bit to 6-bit formula: dstA5 = (srcA8 >> 3) -- v128u8 rgba = vshlq_u8(vreinterpretq_u8_u32(src), ((v128s8){-2,-2,-2,-3, -2,-2,-2,-3, -2,-2,-2,-3, -2,-2,-2,-3})); -+ v128u32 rgba = vreinterpretq_u32_u8( vshlq_u8(vreinterpretq_u8_u32(src), ((v128s8){-2,-2,-2,-3, -2,-2,-2,-3, -2,-2,-2,-3, -2,-2,-2,-3})) ); - - if (SWAP_RB) - { -- rgba = COLOR32_SWAPRB_NEON(rgba); -+ return COLOR32_SWAPRB_NEON(rgba); - } - -- return vreinterpretq_u32_u8(rgba); -+ return rgba; - } - - template -@@ -187,14 +187,14 @@ FORCEINLINE v128u32 ColorspaceConvert6665To8888_NEON(const v128u32 &src) - // Conversion algorithm: - // RGB 6-bit to 8-bit formula: dstRGB8 = (srcRGB6 << 2) | ((srcRGB6 >> 4) & 0x03) - // Alpha 5-bit to 8-bit formula: dstA8 = (srcA5 << 3) | ((srcA5 >> 2) & 0x07) -- v128u8 rgba = vorrq_u8( vshlq_u8(vreinterpretq_u8_u32(src), ((v128s8){2,2,2,3, 2,2,2,3, 2,2,2,3, 2,2,2,3})), vshlq_u8(vreinterpretq_u8_u32(src), ((v128s8){-4,-4,-4,-2, -4,-4,-4,-2, -4,-4,-4,-2, -4,-4,-4,-2})) ); -+ v128u32 rgba = vreinterpretq_u32_u8( vorrq_u8( vshlq_u8(vreinterpretq_u8_u32(src), ((v128s8){2,2,2,3, 2,2,2,3, 2,2,2,3, 2,2,2,3})), vshlq_u8(vreinterpretq_u8_u32(src), ((v128s8){-4,-4,-4,-2, -4,-4,-4,-2, -4,-4,-4,-2, -4,-4,-4,-2})) ) ); - - if (SWAP_RB) - { -- rgba = COLOR32_SWAPRB_NEON(rgba); -+ return COLOR32_SWAPRB_NEON(rgba); - } - -- return vreinterpretq_u32_u8(rgba); -+ return rgba; - } - - template -@@ -202,7 +202,7 @@ FORCEINLINE v128u16 _ConvertColorBaseTo5551_NEON(const v128u32 &srcLo, const v12 - { - if (COLORFORMAT == NDSColorFormat_BGR555_Rev) - { -- return srcLo; -+ return vreinterpretq_u16_u32(srcLo); - } - - v128u32 rgbLo; -@@ -518,9 +518,9 @@ size_t ColorspaceConvertBuffer555XTo888_NEON(const u16 *__restrict src, u8 *__re - - dstVec.val[1] = vandq_u8( vuzp1q_u8( vreinterpretq_u8_u16(vshrq_n_u16(srcVec.val[0], 2)), vreinterpretq_u8_u16(vshrq_n_u16(srcVec.val[1], 2)) ), vdupq_n_u8(0xF8) ); - -- dstVec.val[0] = vorrq_u8(dstVec.val[0], vshrq_n_u32(dstVec.val[0], 5)); -- dstVec.val[1] = vorrq_u8(dstVec.val[1], vshrq_n_u32(dstVec.val[1], 5)); -- dstVec.val[2] = vorrq_u8(dstVec.val[2], vshrq_n_u32(dstVec.val[2], 5)); -+ dstVec.val[0] = vorrq_u8(dstVec.val[0], vshrq_n_u8(dstVec.val[0], 5)); -+ dstVec.val[1] = vorrq_u8(dstVec.val[1], vshrq_n_u8(dstVec.val[1], 5)); -+ dstVec.val[2] = vorrq_u8(dstVec.val[2], vshrq_n_u8(dstVec.val[2], 5)); - - vst3q_u8(dst+(i*3), dstVec); - } -@@ -646,7 +646,7 @@ size_t ColorspaceApplyIntensityToBuffer16_NEON(u16 *dst, size_t pixCountVec128, - g = vshlq_n_u16( vuzp2q_u16( vreinterpretq_u16_u32(vmull_u16(vget_low_u16(g), intensityVec)), vreinterpretq_u16_u32(vmull_u16(vget_high_u16(g), intensityVec)) ), 5 ); - b = vshlq_n_u16( vuzp2q_u16( vreinterpretq_u16_u32(vmull_u16(vget_low_u16(b), intensityVec)), vreinterpretq_u16_u32(vmull_u16(vget_high_u16(b), intensityVec)) ), 10 ); - -- tempDst = vorrq_u32( vorrq_u32( vorrq_u32(r, g), b), a); -+ tempDst = vorrq_u16( vorrq_u16( vorrq_u16(r, g), b), a); - - vst1q_u16(dst+i, tempDst); - } From 137ea7f197f20c7b8a641425f55d6f0a47f28a0d Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 2 Feb 2024 01:40:07 +0100 Subject: [PATCH 47/90] Delete debian/patches/desmume-0.9.13-arm.patch --- debian/patches/desmume-0.9.13-arm.patch | 61 ------------------------- 1 file changed, 61 deletions(-) delete mode 100644 debian/patches/desmume-0.9.13-arm.patch diff --git a/debian/patches/desmume-0.9.13-arm.patch b/debian/patches/desmume-0.9.13-arm.patch deleted file mode 100644 index 5f8f5213b..000000000 --- a/debian/patches/desmume-0.9.13-arm.patch +++ /dev/null @@ -1,61 +0,0 @@ -From d4afd4977ce8b7ba6293946c74914afe79536059 Mon Sep 17 00:00:00 2001 -From: rogerman -Date: Mon, 20 Jun 2022 11:22:26 -0700 -Subject: [PATCH] libretro-common: Compiling tune-up for ARM architectures. - - Fixes a mismatched register warning in arm_enable_runfast_mode() when - compiling for AArch64. - Fix compiling check_arm_cpu_feature() on non-ARM - architectures by being super explicit and pedantic about checking for - __ARM_ARCH; none of this compiler-assumes-a-macro-equals-zero-if-undefined - stuff. - ---- - desmume/src/libretro-common/features/features_cpu.c | 13 ++++++++++--- - 1 file changed, 10 insertions(+), 3 deletions(-) - -diff --git a/desmume/src/libretro-common/features/features_cpu.c b/desmume/src/libretro-common/features/features_cpu.c -index 0980821f9..2c41d5732 100644 ---- a/desmume/src/libretro-common/features/features_cpu.c -+++ b/desmume/src/libretro-common/features/features_cpu.c -@@ -300,10 +300,17 @@ static void arm_enable_runfast_mode(void) - static const unsigned y = 0x03000000; - int r; - __asm__ volatile( -+#if defined(__aarch64__) || defined(_M_ARM64) -+ "fmrx %w0, fpscr \n\t" /* w0 = FPSCR */ -+ "and %w0, %w0, %w1 \n\t" /* w0 = w0 & 0x04086060 */ -+ "orr %w0, %w0, %w2 \n\t" /* w0 = w0 | 0x03000000 */ -+ "fmxr fpscr, %w0 \n\t" /* FPSCR = w0 */ -+#else - "fmrx %0, fpscr \n\t" /* r0 = FPSCR */ - "and %0, %0, %1 \n\t" /* r0 = r0 & 0x04086060 */ - "orr %0, %0, %2 \n\t" /* r0 = r0 | 0x03000000 */ - "fmxr fpscr, %0 \n\t" /* FPSCR = r0 */ -+#endif - : "=r"(r) - : "r"(x), "r"(y) - ); -@@ -311,13 +318,13 @@ static void arm_enable_runfast_mode(void) - #endif - - #if defined(__linux__) && !defined(CPU_X86) --#if __ARM_ARCH -+#if defined(__ARM_ARCH) && (__ARM_ARCH > 0) - #include - #endif - - static unsigned char check_arm_cpu_feature(const char* feature) - { --#if __ARM_ARCH < 8 -+#if defined(__ARM_ARCH) && (__ARM_ARCH < 8) - uint64_t hwcap = getauxval(AT_HWCAP); - if (!strcmp(feature, "neon")) - return (hwcap & HWCAP_ARM_NEON) != 0; -@@ -326,7 +333,7 @@ static unsigned char check_arm_cpu_feature(const char* feature) - if (!strcmp(feature, "vfpv4")) - return (hwcap & HWCAP_ARM_VFPv4) != 0; - return 0; --#elif __ARM_ARCH == 8 -+#elif defined(__ARM_ARCH) && (__ARM_ARCH == 8) - uint64_t hwcap = getauxval(AT_HWCAP); - if (!strcmp(feature, "asimd")) - return (hwcap & HWCAP_ASIMD) != 0; From 7302ec3bf45e4829be123456fc379fc775369f8a Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 2 Feb 2024 01:40:15 +0100 Subject: [PATCH 48/90] Delete debian/patches/desmume-0.9.13-formatstring.patch --- .../patches/desmume-0.9.13-formatstring.patch | 21 ------------------- 1 file changed, 21 deletions(-) delete mode 100644 debian/patches/desmume-0.9.13-formatstring.patch diff --git a/debian/patches/desmume-0.9.13-formatstring.patch b/debian/patches/desmume-0.9.13-formatstring.patch deleted file mode 100644 index dfd49d121..000000000 --- a/debian/patches/desmume-0.9.13-formatstring.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -durN desmume-release_0_9_13.orig/desmume/src/commandline.cpp desmume-release_0_9_13/desmume/src/commandline.cpp ---- desmume-release_0_9_13.orig/desmume/src/commandline.cpp 2022-05-23 06:37:41.000000000 +0200 -+++ desmume-release_0_9_13/desmume/src/commandline.cpp 2022-06-18 18:40:49.218922840 +0200 -@@ -31,7 +31,7 @@ - #include - //#include "frontend/modules/mGetOpt.h" //to test with this, make sure global `optind` is initialized to 1 - --#define printerror(...) fprintf(stderr, __VA_ARGS__) -+#define printerror(...) fprintf(stderr, "%s", __VA_ARGS__) - - int _scanline_filter_a = 0, _scanline_filter_b = 2, _scanline_filter_c = 2, _scanline_filter_d = 4; - int _commandline_linux_nojoy = 0; -@@ -397,7 +397,7 @@ - - if(opt_help) - { -- printf(help_string); -+ printf("%s", help_string); - exit(1); - } - From 89ceda18ec875ef6f9374eefa369bfcc0680c846 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 2 Feb 2024 01:40:22 +0100 Subject: [PATCH 49/90] Delete debian/patches/desmume-0.9.13-ppc64le.patch --- debian/patches/desmume-0.9.13-ppc64le.patch | 26 --------------------- 1 file changed, 26 deletions(-) delete mode 100644 debian/patches/desmume-0.9.13-ppc64le.patch diff --git a/debian/patches/desmume-0.9.13-ppc64le.patch b/debian/patches/desmume-0.9.13-ppc64le.patch deleted file mode 100644 index 057889515..000000000 --- a/debian/patches/desmume-0.9.13-ppc64le.patch +++ /dev/null @@ -1,26 +0,0 @@ -From a95e4c57c61b791fdcb17922735f8681af201b03 Mon Sep 17 00:00:00 2001 -From: rogerman -Date: Sun, 19 Jun 2022 20:36:50 -0700 -Subject: [PATCH] Remove AltiVec compiling for ppcle and ppc64le architectures, - since our AltiVec code only works on big-endian systems anyways. Fixes #550. - ---- - desmume/src/types.h | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/desmume/src/types.h b/desmume/src/types.h -index 0fe31b347..5d5ac50af 100644 ---- a/desmume/src/types.h -+++ b/desmume/src/types.h -@@ -53,7 +53,10 @@ - #endif - - #ifdef __GNUC__ -- #ifdef __ALTIVEC__ -+// Our AltiVec code assumes that its being run on a big-endian system. While -+// the ppcle and ppc64le architectures do exist, our AltiVec code does not -+// support little-endian right now. -+ #if defined(__ALTIVEC__) && defined(MSB_FIRST) && (MSB_FIRST > 0) - #define ENABLE_ALTIVEC - #endif - From 4470165666de84a37a5d38a395eb553308a60b83 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 2 Feb 2024 01:40:30 +0100 Subject: [PATCH 50/90] Delete debian/patches/desmume-0.9.13-tinyxml.patch --- debian/patches/desmume-0.9.13-tinyxml.patch | 43 --------------------- 1 file changed, 43 deletions(-) delete mode 100644 debian/patches/desmume-0.9.13-tinyxml.patch diff --git a/debian/patches/desmume-0.9.13-tinyxml.patch b/debian/patches/desmume-0.9.13-tinyxml.patch deleted file mode 100644 index 3acf8fc7e..000000000 --- a/debian/patches/desmume-0.9.13-tinyxml.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -durN desmume-release_0_9_13.orig/desmume/src/frontend/posix/meson.build desmume-release_0_9_13/desmume/src/frontend/posix/meson.build ---- desmume-release_0_9_13.orig/desmume/src/frontend/posix/meson.build 2022-05-23 06:37:41.000000000 +0200 -+++ desmume-release_0_9_13/desmume/src/frontend/posix/meson.build 2022-06-18 19:22:06.688637556 +0200 -@@ -15,6 +15,7 @@ - dep_pcap = dependency('pcap') - dep_zlib = dependency('zlib') - dep_threads = dependency('threads') -+dep_tinyxml = dependency('tinyxml') - dep_gl = dependency('gl', required: false) - dep_openal = dependency('openal', required: get_option('openal')) - dep_alsa = dependency('alsa', required: false) -@@ -28,7 +29,7 @@ - add_global_arguments('-DEXPERIMENTAL_WIFI_COMM', language: ['c', 'cpp']) - endif - --dependencies = [dep_glib2, dep_sdl, dep_pcap, dep_zlib, dep_threads] -+dependencies = [dep_glib2, dep_sdl, dep_pcap, dep_zlib, dep_threads, dep_tinyxml] - - if target_machine.cpu() == 'x86_64' - add_global_arguments('-DHAVE_JIT', language: ['c', 'cpp']) -@@ -99,10 +100,6 @@ - '../../utils/libfat/libfat_public_api.cpp', - '../../utils/libfat/lock.cpp', - '../../utils/libfat/partition.cpp', -- '../../utils/tinyxml/tinystr.cpp', -- '../../utils/tinyxml/tinyxml.cpp', -- '../../utils/tinyxml/tinyxmlerror.cpp', -- '../../utils/tinyxml/tinyxmlparser.cpp', - '../../utils/colorspacehandler/colorspacehandler.cpp', - '../../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_rom.cpp', '../../addons/slot1comp_protocol.cpp', - '../../cheatSystem.cpp', -diff -durN desmume-release_0_9_13.orig/desmume/src/utils/advanscene.cpp desmume-release_0_9_13/desmume/src/utils/advanscene.cpp ---- desmume-release_0_9_13.orig/desmume/src/utils/advanscene.cpp 2022-05-23 06:37:41.000000000 +0200 -+++ desmume-release_0_9_13/desmume/src/utils/advanscene.cpp 2022-06-18 19:14:40.054101672 +0200 -@@ -19,7 +19,7 @@ - #include - - #define TIXML_USE_STL --#include "tinyxml/tinyxml.h" -+#include - - #include "advanscene.h" - #include "../common.h" From c7f7d0313c68e98e2981b43c156d2be76a9593b0 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 2 Feb 2024 01:40:37 +0100 Subject: [PATCH 51/90] Delete debian/patches/series --- debian/patches/series | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 debian/patches/series diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 548cfc924..000000000 --- a/debian/patches/series +++ /dev/null @@ -1,6 +0,0 @@ -desmume-0.9.13-formatstring.patch -desmume-0.9.13-tinyxml.patch -desmume-0.9.13-aarch64.patch -desmume-0.9.13-ppc64le.patch -desmume-0.9.13-arm.patch -6508c2b115f954afece4243e36e9e35e1d459ea8.patch From 849db6557aea435055c25565d59fe2ead7e667f0 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 2 Feb 2024 01:40:47 +0100 Subject: [PATCH 52/90] Delete debian/source/format --- debian/source/format | 1 - 1 file changed, 1 deletion(-) delete mode 100644 debian/source/format diff --git a/debian/source/format b/debian/source/format deleted file mode 100644 index d3827e75a..000000000 --- a/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -1.0 From 2d4f5b11576139cfbf1856ea056b25d0e83a0f33 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 2 Feb 2024 01:40:56 +0100 Subject: [PATCH 53/90] Delete debian/NEWS --- debian/NEWS | 352 ---------------------------------------------------- 1 file changed, 352 deletions(-) delete mode 100644 debian/NEWS diff --git a/debian/NEWS b/debian/NEWS deleted file mode 100644 index bdfa54196..000000000 --- a/debian/NEWS +++ /dev/null @@ -1,352 +0,0 @@ -desmume (0.9.13-3build2) jammy; urgency=medium - - * No-change rebuild against latest gdk-pixbuf - - -- Jeremy Bicha Wed, 09 Mar 2022 18:48:49 -0500 - -desmume (0.9.11-3build1) focal; urgency=medium - - * No-change rebuild for libgcc-s1 package name change. - - -- Matthias Klose Sun, 22 Mar 2020 16:38:08 +0100 - -desmume (0.9.11-3) unstable; urgency=medium - - * Import upstream patch to fix FTBFS with GCC7 - Closes: #853372 - - -- Evgeni Golov Sun, 22 Oct 2017 11:23:03 +0200 - -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 From fa2335533177406692c70509d79be1f7e795c228 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 2 Feb 2024 01:41:04 +0100 Subject: [PATCH 54/90] Delete debian/README.Debian --- debian/README.Debian | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 debian/README.Debian diff --git a/debian/README.Debian b/debian/README.Debian deleted file mode 100644 index ce55f6f83..000000000 --- a/debian/README.Debian +++ /dev/null @@ -1,15 +0,0 @@ -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 From 2d307de1338ee6a94db60e60dec9c519f3faee8d Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 2 Feb 2024 01:41:13 +0100 Subject: [PATCH 55/90] Delete debian/README.source --- debian/README.source | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 debian/README.source diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index d803172f2..000000000 --- a/debian/README.source +++ /dev/null @@ -1,2 +0,0 @@ -This package uses quilt for patch management, for more information see -the file /usr/share/doc/quilt/README.source in the quilt package. From 20c10babccaab88fe29cd39b803dc5036649ab6a Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 2 Feb 2024 01:41:20 +0100 Subject: [PATCH 56/90] Delete debian/compat --- debian/compat | 1 - 1 file changed, 1 deletion(-) delete mode 100644 debian/compat diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 48082f72f..000000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -12 From 5940d78c34d084176618f364bfbb28534b7635cf Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 2 Feb 2024 01:41:29 +0100 Subject: [PATCH 57/90] Delete debian/control --- debian/control | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 debian/control diff --git a/debian/control b/debian/control deleted file mode 100644 index 11031407f..000000000 --- a/debian/control +++ /dev/null @@ -1,25 +0,0 @@ -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, meson, libsdl2-dev, libpcap-dev, libgtk-3-dev, - cmake, libopenal-dev -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 From 6e484fbf224c9d1c8edfee4d0820658a784a2d53 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 2 Feb 2024 01:41:36 +0100 Subject: [PATCH 58/90] Delete debian/copyright --- debian/copyright | 280 ----------------------------------------------- 1 file changed, 280 deletions(-) delete mode 100644 debian/copyright diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index 898dd74a3..000000000 --- a/debian/copyright +++ /dev/null @@ -1,280 +0,0 @@ -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. From d6eec048018d9ab2acb1f4b83e384773770a3860 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 2 Feb 2024 01:41:45 +0100 Subject: [PATCH 59/90] Delete debian/rules --- debian/rules | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 debian/rules diff --git a/debian/rules b/debian/rules deleted file mode 100644 index a984bb47c..000000000 --- a/debian/rules +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/make -f -LDFLAGS="" -export LDFLAGS -CFLAGS="" -export CFLAGS -FFLAGS="" -export FFLAGS -FCFLAGS="" -export FCFLAGS -DEB_CFLAGS_SET="" -export DEB_CFLAGS_SET -DEB_CXXFLAGS_SET="" -export DEB_CXXFLAGS_SET -DEB_FFLAGS_SET="" -export DEB_FFLAGS_SET -DEB_FCFLAGS_SET="" -export DEB_FCFLAGS_SET -DEB_LDFLAGS_SET="" -export DEB_LDFLAGS_SET - - -%: - dh $@ --buildsystem=meson --sourcedir=desmume/src/frontend/posix --builddir=desmume/src/frontend/posix/build From 0ffcf1f7aca18256397200685b42ef34a060f749 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 2 Feb 2024 01:41:52 +0100 Subject: [PATCH 60/90] Delete debian/watch --- debian/watch | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 debian/watch diff --git a/debian/watch b/debian/watch deleted file mode 100644 index bebd18655..000000000 --- a/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://sf.net/desmume/desmume-([\d\.-]*)\.tar\.gz From 025724ab1b86346154d5f60335ae4cd2bb9860ef Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 2 Feb 2024 01:42:11 +0100 Subject: [PATCH 61/90] Update snapcraft.yaml --- snapcraft.yaml | 70 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 51 insertions(+), 19 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index f3aaf7ee5..a8b333e2c 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1,5 +1,5 @@ name: desmume-emulator -version: 0.9.11 +version: 0.9.13 summary: DeSmuME is a Nintendo DS Emulator description: | An open-source Nintendo DS Emulators. @@ -7,25 +7,16 @@ adopt-info: desmume-emulator grade: stable confinement: strict base: core22 -compression: lzo -architectures: - - build-on: amd64 +#compression: lzo parts: desmume-emulator: - source: http://fr.archive.ubuntu.com/ubuntu/pool/universe/d/desmume/desmume_0.9.11-3build2_amd64.deb - plugin: dump - source-type: deb + source: https://github.com/TASEmulators/desmume/archive/refs/tags/release_0_9_13.tar.gz + plugin: nil override-build: | - echo "CRAFT_PROJECT_DIR=$CRAFT_PROJECT_DIR" - STABLE_TAG_CONFIG="$CRAFT_PROJECT_DIR/.stable_tag" - TAG_REF=$(cat "${STABLE_TAG_CONFIG}") - echo "TAG_REF=$TAG_REF" - snapcraftctl set version="$TAG_REF" - snapcraftctl build - # snapcraftctl pull - # last_commit="$(git describe | sed 's/^v//; s/-.*-/-/')" - # snapcraftctl set-version "${last_commit}" - # #sed -i.bak -e 's|Icon=desmume|Icon=/usr/share/icons/hicolor/scalable/apps/desmume.svg|g' src/wx/desmume.desktop + LDFLAGS="" CFLAGS="" FFLAGS="" FCFLAGS="" DEB_CFLAGS_SET="" DEB_CXXFLAGS_SET="" DEB_FFLAGS_SET="" DEB_FCFLAGS_SET="" DEB_LDFLAGS_SET="" meson setup --prefix=${CRAFT_PART_INSTALL}/usr desmume/src/frontend/posix/build desmume/src/frontend/posix + LDFLAGS="" CFLAGS="" FFLAGS="" FCFLAGS="" DEB_CFLAGS_SET="" DEB_CXXFLAGS_SET="" DEB_FFLAGS_SET="" DEB_FCFLAGS_SET="" DEB_LDFLAGS_SET="" ninja -C desmume/src/frontend/posix/build + LDFLAGS="" CFLAGS="" FFLAGS="" FCFLAGS="" DEB_CFLAGS_SET="" DEB_CXXFLAGS_SET="" DEB_FFLAGS_SET="" DEB_FCFLAGS_SET="" DEB_LDFLAGS_SET="" ninja install -C desmume/src/frontend/posix/build + stage-packages: - libasound2 - libc6 @@ -46,6 +37,32 @@ parts: - libstdc++6 - libtinyxml2.6.2v5 - zlib1g + - g++ + - gcc + - gettext + - make + - cmake + - nasm + - pkg-config + - git + - zip + - build-essential + - intltool + - libglade2-dev + - libgtk2.0-dev + - libsdl1.2-dev + - libosmesa6-dev + - libagg-dev + - intltool + - quilt + - libgtkglext1-dev + - libtinyxml-dev + - libsoundtouch-dev + - dh-autoreconf + - meson + - libsdl2-dev + - libpcap-dev + - libgtk-3-dev build-packages: - g++ - gcc @@ -58,6 +75,21 @@ parts: - zip - build-essential - intltool + - libglade2-dev + - libgtk2.0-dev + - libsdl1.2-dev + - libosmesa6-dev + - libagg-dev + - intltool + - quilt + - libgtkglext1-dev + - libtinyxml-dev + - libsoundtouch-dev + - dh-autoreconf + - meson + - libsdl2-dev + - libpcap-dev + - libgtk-3-dev apps: desmume-emulator: @@ -74,8 +106,8 @@ apps: - network - wayland - x11 - command: usr/games/desmume - desktop: usr/share/applications/desmume.desktop + command: usr/bin/desmume + desktop: usr/share/applications/org.desmume.DeSmuME.desktop extensions: [gnome] environment: LD_LIBRARY_PATH: $LD_LIBRARY_PATH:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/pulseaudio From efa66c604dea0c217004365208eda359e7c5df1b Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 2 Feb 2024 01:44:27 +0100 Subject: [PATCH 62/90] Update snapcraft.yaml --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index a8b333e2c..8a55d3525 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -7,7 +7,7 @@ adopt-info: desmume-emulator grade: stable confinement: strict base: core22 -#compression: lzo +compression: lzo parts: desmume-emulator: source: https://github.com/TASEmulators/desmume/archive/refs/tags/release_0_9_13.tar.gz From d00429fac858b222313d9da9f1645adf77c105eb Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 2 Feb 2024 06:09:40 +0100 Subject: [PATCH 63/90] Rename .stable_tag to snap/.stable_tag --- .stable_tag => snap/.stable_tag | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .stable_tag => snap/.stable_tag (100%) diff --git a/.stable_tag b/snap/.stable_tag similarity index 100% rename from .stable_tag rename to snap/.stable_tag From a1d8287ed97c99c2b7577d300ddf780b2ef33cc3 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 2 Feb 2024 07:02:52 +0100 Subject: [PATCH 64/90] Create desmume-0.9.13-aarch64.patch --- snap/patches/desmume-0.9.13-aarch64.patch | 240 ++++++++++++++++++++++ 1 file changed, 240 insertions(+) create mode 100644 snap/patches/desmume-0.9.13-aarch64.patch diff --git a/snap/patches/desmume-0.9.13-aarch64.patch b/snap/patches/desmume-0.9.13-aarch64.patch new file mode 100644 index 000000000..4f736fcbe --- /dev/null +++ b/snap/patches/desmume-0.9.13-aarch64.patch @@ -0,0 +1,240 @@ +From 24eb5ed95c6cbdaba8b3c63a99e95e899e8a5061 Mon Sep 17 00:00:00 2001 +From: rogerman +Date: Sat, 18 Jun 2022 21:56:25 -0700 +Subject: [PATCH] Fix compiling on GCC for AArch64. Fixes #548. + +--- + desmume/src/render3D.cpp | 2 +- + desmume/src/texcache.cpp | 16 +++--- + .../colorspacehandler_NEON.cpp | 56 +++++++++---------- + 3 files changed, 37 insertions(+), 37 deletions(-) + +diff --git a/desmume/src/render3D.cpp b/desmume/src/render3D.cpp +index abc3b9243..26d5ca94d 100644 +--- a/desmume/src/render3D.cpp ++++ b/desmume/src/render3D.cpp +@@ -899,7 +899,7 @@ void Render3D_NEON::_ClearImageBaseLoop(const u16 *__restrict inColor16, const u + vst1q_u32_x4(outDepth24 + i, calcDepth); + + // Write the fog flags to the fog flag buffer. +- vst1q_u8( outFog + i, vuzp1q_u16(vshrq_n_u16(clearDepth.val[0], 15), vshrq_n_u16(clearDepth.val[1], 15)) ); ++ vst1q_u8( outFog + i, vreinterpretq_u8_u16( vuzp1q_u16(vshrq_n_u16(clearDepth.val[0], 15), vshrq_n_u16(clearDepth.val[1], 15)) ) ); + } + } + +diff --git a/desmume/src/texcache.cpp b/desmume/src/texcache.cpp +index 58ce81735..6d2b50757 100644 +--- a/desmume/src/texcache.cpp ++++ b/desmume/src/texcache.cpp +@@ -1429,8 +1429,8 @@ void __NDSTextureUnpackA3I5_NEON(const size_t texelCount, const u8 *__restrict s + const v128u16 palColor1 = vreinterpretq_u16_u8( vqtbl4q_u8(pal16_LUT, idx1) ); + + const v128u8 alpha = vqtbl1q_u8( alpha_LUT, vshrq_n_u8(bits, 5) ); +- const v128u16 alphaLo = vzip1q_u8(vdupq_n_u8(0), alpha); +- const v128u16 alphaHi = vzip2q_u8(vdupq_n_u8(0), alpha); ++ const v128u16 alphaLo = vreinterpretq_u16_u8( vzip1q_u8(vdupq_n_u8(0), alpha) ); ++ const v128u16 alphaHi = vreinterpretq_u16_u8( vzip2q_u8(vdupq_n_u8(0), alpha) ); + + if (TEXCACHEFORMAT == TexFormat_15bpp) + { +@@ -1658,8 +1658,8 @@ void __NDSTextureUnpackA5I3_NEON(const size_t texelCount, const u8 *__restrict s + if (TEXCACHEFORMAT == TexFormat_15bpp) + { + const v128u8 alpha = vshrq_n_u8(bits, 3); +- const v128u16 alphaLo = vzip1q_u8(vdupq_n_u8(0), alpha); +- const v128u16 alphaHi = vzip2q_u8(vdupq_n_u8(0), alpha); ++ const v128u16 alphaLo = vreinterpretq_u16_u8( vzip1q_u8(vdupq_n_u8(0), alpha) ); ++ const v128u16 alphaHi = vreinterpretq_u16_u8( vzip2q_u8(vdupq_n_u8(0), alpha) ); + + ColorspaceConvert555To6665_NEON(palColor0, alphaLo, convertedColor.val[0], convertedColor.val[1]); + ColorspaceConvert555To6665_NEON(palColor1, alphaHi, convertedColor.val[2], convertedColor.val[3]); +@@ -1667,8 +1667,8 @@ void __NDSTextureUnpackA5I3_NEON(const size_t texelCount, const u8 *__restrict s + else + { + const v128u8 alpha = vqtbl2q_u8( alpha8_LUT, vshrq_n_u8(bits, 3) ); +- const v128u16 alphaLo = vzip1q_u8(vdupq_n_u8(0), alpha); +- const v128u16 alphaHi = vzip2q_u8(vdupq_n_u8(0), alpha); ++ const v128u16 alphaLo = vreinterpretq_u16_u8( vzip1q_u8(vdupq_n_u8(0), alpha) ); ++ const v128u16 alphaHi = vreinterpretq_u16_u8( vzip2q_u8(vdupq_n_u8(0), alpha) ); + + ColorspaceConvert555To8888_NEON(palColor0, alphaLo, convertedColor.val[0], convertedColor.val[1]); + ColorspaceConvert555To8888_NEON(palColor1, alphaHi, convertedColor.val[2], convertedColor.val[3]); +@@ -1967,8 +1967,8 @@ void __NDSTextureUnpackDirect16Bit_NEON(const size_t texelCount, const u16 *__re + } + + const v128u16 alpha = vceqq_u16(vshrq_n_u16(c,15), vdupq_n_u16(1)); +- convertedColor.val[0] = vandq_u16( convertedColor.val[0], vzip1q_u16(alpha, alpha) ); +- convertedColor.val[1] = vandq_u16( convertedColor.val[1], vzip2q_u16(alpha, alpha) ); ++ convertedColor.val[0] = vandq_u32( convertedColor.val[0], vreinterpretq_u32_u16(vzip1q_u16(alpha, alpha)) ); ++ convertedColor.val[1] = vandq_u32( convertedColor.val[1], vreinterpretq_u32_u16(vzip2q_u16(alpha, alpha)) ); + + vst1q_u32_x2(dstBuffer, convertedColor); + } +diff --git a/desmume/src/utils/colorspacehandler/colorspacehandler_NEON.cpp b/desmume/src/utils/colorspacehandler/colorspacehandler_NEON.cpp +index b6b95edb4..81ad657ab 100644 +--- a/desmume/src/utils/colorspacehandler/colorspacehandler_NEON.cpp ++++ b/desmume/src/utils/colorspacehandler/colorspacehandler_NEON.cpp +@@ -25,7 +25,7 @@ + + #define COLOR16_SWAPRB_NEON(src) vorrq_u16( vshlq_n_u16(vandq_u16(src,vdupq_n_u16(0x001F)),10), vorrq_u16( vandq_u16(src,vdupq_n_u16(0x03E0)), vorrq_u16(vshrq_n_u16(vandq_u16(src,vdupq_n_u16(0x7C00)),10), vandq_u16(src,vdupq_n_u16(0x8000))) ) ) + +-#define COLOR32_SWAPRB_NEON(src) vqtbl1q_u8( (src), ((v128u8){2,1,0,3, 6,5,4,7, 10,9,8,11, 14,13,12,15}) ) ++#define COLOR32_SWAPRB_NEON(src) vreinterpretq_u32_u8( vqtbl1q_u8(vreinterpretq_u8_u32(src), ((v128u8){2,1,0,3, 6,5,4,7, 10,9,8,11, 14,13,12,15})) ) + + template + FORCEINLINE void ColorspaceConvert555To8888_NEON(const v128u16 &srcColor, const v128u16 &srcAlphaBits, v128u32 &dstLo, v128u32 &dstHi) +@@ -42,8 +42,8 @@ FORCEINLINE void ColorspaceConvert555To8888_NEON(const v128u16 &srcColor, const + ga = vorrq_u16(ga, vshrq_n_u16(ga, 5)); + ga = vorrq_u16(ga, srcAlphaBits); + +- dstLo = vzip1q_u8(rb, ga); +- dstHi = vzip2q_u8(rb, ga); ++ dstLo = vreinterpretq_u32_u8( vzip1q_u8(vreinterpretq_u8_u16(rb), vreinterpretq_u8_u16(ga)) ); ++ dstHi = vreinterpretq_u32_u8( vzip2q_u8(vreinterpretq_u8_u16(rb), vreinterpretq_u8_u16(ga)) ); + } + else + { +@@ -54,8 +54,8 @@ FORCEINLINE void ColorspaceConvert555To8888_NEON(const v128u16 &srcColor, const + ba = vorrq_u16( ba, vreinterpretq_u16_u8(vshrq_n_u8(vreinterpretq_u8_u16(ba), 5)) ); + ba = vorrq_u16( ba, srcAlphaBits ); + +- dstLo = vzip1q_u16(rg, ba); +- dstHi = vzip2q_u16(rg, ba); ++ dstLo = vreinterpretq_u32_u16( vzip1q_u16(rg, ba) ); ++ dstHi = vreinterpretq_u32_u16( vzip2q_u16(rg, ba) ); + } + } + +@@ -73,8 +73,8 @@ FORCEINLINE void ColorspaceConvert555XTo888X_NEON(const v128u16 &srcColor, v128u + v128u16 g = vandq_u16(vshrq_n_u16(srcColor, 2), vdupq_n_u16(0x00F8) ); + g = vorrq_u16(g, vshrq_n_u16(g, 5)); + +- dstLo = vzip1q_u8(rb, g); +- dstHi = vzip2q_u8(rb, g); ++ dstLo = vreinterpretq_u32_u8( vzip1q_u8(vreinterpretq_u8_u16(rb), vreinterpretq_u8_u16(g)) ); ++ dstHi = vreinterpretq_u32_u8( vzip2q_u8(vreinterpretq_u8_u16(rb), vreinterpretq_u8_u16(g)) ); + } + else + { +@@ -84,8 +84,8 @@ FORCEINLINE void ColorspaceConvert555XTo888X_NEON(const v128u16 &srcColor, v128u + rg = vorrq_u16( rg, vreinterpretq_u16_u8(vshrq_n_u8(vreinterpretq_u8_u16(rg), 5)) ); + b = vorrq_u16( b, vreinterpretq_u16_u8(vshrq_n_u8(vreinterpretq_u8_u16( b), 5)) ); + +- dstLo = vzip1q_u16(rg, b); +- dstHi = vzip2q_u16(rg, b); ++ dstLo = vreinterpretq_u32_u16( vzip1q_u16(rg, b) ); ++ dstHi = vreinterpretq_u32_u16( vzip2q_u16(rg, b) ); + } + } + +@@ -104,8 +104,8 @@ FORCEINLINE void ColorspaceConvert555To6665_NEON(const v128u16 &srcColor, const + ga = vorrq_u16(ga, vshrq_n_u16(ga, 5)); + ga = vorrq_u16(ga, srcAlphaBits); + +- dstLo = vzip1q_u8(rb, ga); +- dstHi = vzip2q_u8(rb, ga); ++ dstLo = vreinterpretq_u32_u8( vzip1q_u8(vreinterpretq_u8_u16(rb), vreinterpretq_u8_u16(ga)) ); ++ dstHi = vreinterpretq_u32_u8( vzip2q_u8(vreinterpretq_u8_u16(rb), vreinterpretq_u8_u16(ga)) ); + } + else + { +@@ -116,8 +116,8 @@ FORCEINLINE void ColorspaceConvert555To6665_NEON(const v128u16 &srcColor, const + ba = vorrq_u16( ba, vreinterpretq_u16_u8(vshrq_n_u8(vreinterpretq_u8_u16(ba), 5)) ); + ba = vorrq_u16( ba, srcAlphaBits ); + +- dstLo = vzip1q_u16(rg, ba); +- dstHi = vzip2q_u16(rg, ba); ++ dstLo = vreinterpretq_u32_u16( vzip1q_u16(rg, ba) ); ++ dstHi = vreinterpretq_u32_u16( vzip2q_u16(rg, ba) ); + } + } + +@@ -135,8 +135,8 @@ FORCEINLINE void ColorspaceConvert555XTo666X_NEON(const v128u16 &srcColor, v128u + v128u16 g = vandq_u16(vshrq_n_u16(srcColor, 4), vdupq_n_u16(0x003E) ); + g = vorrq_u16(g, vshrq_n_u16(g, 5)); + +- dstLo = vzip1q_u8(rb, g); +- dstHi = vzip2q_u8(rb, g); ++ dstLo = vreinterpretq_u32_u8( vzip1q_u8(vreinterpretq_u8_u16(rb), vreinterpretq_u8_u16(g)) ); ++ dstHi = vreinterpretq_u32_u8( vzip2q_u8(vreinterpretq_u8_u16(rb), vreinterpretq_u8_u16(g)) ); + } + else + { +@@ -146,8 +146,8 @@ FORCEINLINE void ColorspaceConvert555XTo666X_NEON(const v128u16 &srcColor, v128u + rg = vorrq_u16( rg, vreinterpretq_u16_u8(vshrq_n_u8(vreinterpretq_u8_u16(rg), 5)) ); + b = vorrq_u16( b, vreinterpretq_u16_u8(vshrq_n_u8(vreinterpretq_u8_u16( b), 5)) ); + +- dstLo = vzip1q_u16(rg, b); +- dstHi = vzip2q_u16(rg, b); ++ dstLo = vreinterpretq_u32_u16( vzip1q_u16(rg, b) ); ++ dstHi = vreinterpretq_u32_u16( vzip2q_u16(rg, b) ); + } + } + +@@ -171,14 +171,14 @@ FORCEINLINE v128u32 ColorspaceConvert8888To6665_NEON(const v128u32 &src) + // Conversion algorithm: + // RGB 8-bit to 6-bit formula: dstRGB6 = (srcRGB8 >> 2) + // Alpha 8-bit to 6-bit formula: dstA5 = (srcA8 >> 3) +- v128u8 rgba = vshlq_u8(vreinterpretq_u8_u32(src), ((v128s8){-2,-2,-2,-3, -2,-2,-2,-3, -2,-2,-2,-3, -2,-2,-2,-3})); ++ v128u32 rgba = vreinterpretq_u32_u8( vshlq_u8(vreinterpretq_u8_u32(src), ((v128s8){-2,-2,-2,-3, -2,-2,-2,-3, -2,-2,-2,-3, -2,-2,-2,-3})) ); + + if (SWAP_RB) + { +- rgba = COLOR32_SWAPRB_NEON(rgba); ++ return COLOR32_SWAPRB_NEON(rgba); + } + +- return vreinterpretq_u32_u8(rgba); ++ return rgba; + } + + template +@@ -187,14 +187,14 @@ FORCEINLINE v128u32 ColorspaceConvert6665To8888_NEON(const v128u32 &src) + // Conversion algorithm: + // RGB 6-bit to 8-bit formula: dstRGB8 = (srcRGB6 << 2) | ((srcRGB6 >> 4) & 0x03) + // Alpha 5-bit to 8-bit formula: dstA8 = (srcA5 << 3) | ((srcA5 >> 2) & 0x07) +- v128u8 rgba = vorrq_u8( vshlq_u8(vreinterpretq_u8_u32(src), ((v128s8){2,2,2,3, 2,2,2,3, 2,2,2,3, 2,2,2,3})), vshlq_u8(vreinterpretq_u8_u32(src), ((v128s8){-4,-4,-4,-2, -4,-4,-4,-2, -4,-4,-4,-2, -4,-4,-4,-2})) ); ++ v128u32 rgba = vreinterpretq_u32_u8( vorrq_u8( vshlq_u8(vreinterpretq_u8_u32(src), ((v128s8){2,2,2,3, 2,2,2,3, 2,2,2,3, 2,2,2,3})), vshlq_u8(vreinterpretq_u8_u32(src), ((v128s8){-4,-4,-4,-2, -4,-4,-4,-2, -4,-4,-4,-2, -4,-4,-4,-2})) ) ); + + if (SWAP_RB) + { +- rgba = COLOR32_SWAPRB_NEON(rgba); ++ return COLOR32_SWAPRB_NEON(rgba); + } + +- return vreinterpretq_u32_u8(rgba); ++ return rgba; + } + + template +@@ -202,7 +202,7 @@ FORCEINLINE v128u16 _ConvertColorBaseTo5551_NEON(const v128u32 &srcLo, const v12 + { + if (COLORFORMAT == NDSColorFormat_BGR555_Rev) + { +- return srcLo; ++ return vreinterpretq_u16_u32(srcLo); + } + + v128u32 rgbLo; +@@ -518,9 +518,9 @@ size_t ColorspaceConvertBuffer555XTo888_NEON(const u16 *__restrict src, u8 *__re + + dstVec.val[1] = vandq_u8( vuzp1q_u8( vreinterpretq_u8_u16(vshrq_n_u16(srcVec.val[0], 2)), vreinterpretq_u8_u16(vshrq_n_u16(srcVec.val[1], 2)) ), vdupq_n_u8(0xF8) ); + +- dstVec.val[0] = vorrq_u8(dstVec.val[0], vshrq_n_u32(dstVec.val[0], 5)); +- dstVec.val[1] = vorrq_u8(dstVec.val[1], vshrq_n_u32(dstVec.val[1], 5)); +- dstVec.val[2] = vorrq_u8(dstVec.val[2], vshrq_n_u32(dstVec.val[2], 5)); ++ dstVec.val[0] = vorrq_u8(dstVec.val[0], vshrq_n_u8(dstVec.val[0], 5)); ++ dstVec.val[1] = vorrq_u8(dstVec.val[1], vshrq_n_u8(dstVec.val[1], 5)); ++ dstVec.val[2] = vorrq_u8(dstVec.val[2], vshrq_n_u8(dstVec.val[2], 5)); + + vst3q_u8(dst+(i*3), dstVec); + } +@@ -646,7 +646,7 @@ size_t ColorspaceApplyIntensityToBuffer16_NEON(u16 *dst, size_t pixCountVec128, + g = vshlq_n_u16( vuzp2q_u16( vreinterpretq_u16_u32(vmull_u16(vget_low_u16(g), intensityVec)), vreinterpretq_u16_u32(vmull_u16(vget_high_u16(g), intensityVec)) ), 5 ); + b = vshlq_n_u16( vuzp2q_u16( vreinterpretq_u16_u32(vmull_u16(vget_low_u16(b), intensityVec)), vreinterpretq_u16_u32(vmull_u16(vget_high_u16(b), intensityVec)) ), 10 ); + +- tempDst = vorrq_u32( vorrq_u32( vorrq_u32(r, g), b), a); ++ tempDst = vorrq_u16( vorrq_u16( vorrq_u16(r, g), b), a); + + vst1q_u16(dst+i, tempDst); + } From 55f2c22d24fb7b07a4e8150e27fc6b5c0261a5d6 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 2 Feb 2024 07:03:24 +0100 Subject: [PATCH 65/90] Create desmume-0.9.13-arm.patch --- snap/patches/desmume-0.9.13-arm.patch | 61 +++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 snap/patches/desmume-0.9.13-arm.patch diff --git a/snap/patches/desmume-0.9.13-arm.patch b/snap/patches/desmume-0.9.13-arm.patch new file mode 100644 index 000000000..5f8f5213b --- /dev/null +++ b/snap/patches/desmume-0.9.13-arm.patch @@ -0,0 +1,61 @@ +From d4afd4977ce8b7ba6293946c74914afe79536059 Mon Sep 17 00:00:00 2001 +From: rogerman +Date: Mon, 20 Jun 2022 11:22:26 -0700 +Subject: [PATCH] libretro-common: Compiling tune-up for ARM architectures. - + Fixes a mismatched register warning in arm_enable_runfast_mode() when + compiling for AArch64. - Fix compiling check_arm_cpu_feature() on non-ARM + architectures by being super explicit and pedantic about checking for + __ARM_ARCH; none of this compiler-assumes-a-macro-equals-zero-if-undefined + stuff. + +--- + desmume/src/libretro-common/features/features_cpu.c | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +diff --git a/desmume/src/libretro-common/features/features_cpu.c b/desmume/src/libretro-common/features/features_cpu.c +index 0980821f9..2c41d5732 100644 +--- a/desmume/src/libretro-common/features/features_cpu.c ++++ b/desmume/src/libretro-common/features/features_cpu.c +@@ -300,10 +300,17 @@ static void arm_enable_runfast_mode(void) + static const unsigned y = 0x03000000; + int r; + __asm__ volatile( ++#if defined(__aarch64__) || defined(_M_ARM64) ++ "fmrx %w0, fpscr \n\t" /* w0 = FPSCR */ ++ "and %w0, %w0, %w1 \n\t" /* w0 = w0 & 0x04086060 */ ++ "orr %w0, %w0, %w2 \n\t" /* w0 = w0 | 0x03000000 */ ++ "fmxr fpscr, %w0 \n\t" /* FPSCR = w0 */ ++#else + "fmrx %0, fpscr \n\t" /* r0 = FPSCR */ + "and %0, %0, %1 \n\t" /* r0 = r0 & 0x04086060 */ + "orr %0, %0, %2 \n\t" /* r0 = r0 | 0x03000000 */ + "fmxr fpscr, %0 \n\t" /* FPSCR = r0 */ ++#endif + : "=r"(r) + : "r"(x), "r"(y) + ); +@@ -311,13 +318,13 @@ static void arm_enable_runfast_mode(void) + #endif + + #if defined(__linux__) && !defined(CPU_X86) +-#if __ARM_ARCH ++#if defined(__ARM_ARCH) && (__ARM_ARCH > 0) + #include + #endif + + static unsigned char check_arm_cpu_feature(const char* feature) + { +-#if __ARM_ARCH < 8 ++#if defined(__ARM_ARCH) && (__ARM_ARCH < 8) + uint64_t hwcap = getauxval(AT_HWCAP); + if (!strcmp(feature, "neon")) + return (hwcap & HWCAP_ARM_NEON) != 0; +@@ -326,7 +333,7 @@ static unsigned char check_arm_cpu_feature(const char* feature) + if (!strcmp(feature, "vfpv4")) + return (hwcap & HWCAP_ARM_VFPv4) != 0; + return 0; +-#elif __ARM_ARCH == 8 ++#elif defined(__ARM_ARCH) && (__ARM_ARCH == 8) + uint64_t hwcap = getauxval(AT_HWCAP); + if (!strcmp(feature, "asimd")) + return (hwcap & HWCAP_ASIMD) != 0; From 2f0134af3453a7d2760b6ea7d02aa02224df61d8 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 2 Feb 2024 07:10:58 +0100 Subject: [PATCH 66/90] Create desmume-0.9.13-formatstring.patch --- .../patches/desmume-0.9.13-formatstring.patch | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 snap/patches/desmume-0.9.13-formatstring.patch diff --git a/snap/patches/desmume-0.9.13-formatstring.patch b/snap/patches/desmume-0.9.13-formatstring.patch new file mode 100644 index 000000000..dfd49d121 --- /dev/null +++ b/snap/patches/desmume-0.9.13-formatstring.patch @@ -0,0 +1,21 @@ +diff -durN desmume-release_0_9_13.orig/desmume/src/commandline.cpp desmume-release_0_9_13/desmume/src/commandline.cpp +--- desmume-release_0_9_13.orig/desmume/src/commandline.cpp 2022-05-23 06:37:41.000000000 +0200 ++++ desmume-release_0_9_13/desmume/src/commandline.cpp 2022-06-18 18:40:49.218922840 +0200 +@@ -31,7 +31,7 @@ + #include + //#include "frontend/modules/mGetOpt.h" //to test with this, make sure global `optind` is initialized to 1 + +-#define printerror(...) fprintf(stderr, __VA_ARGS__) ++#define printerror(...) fprintf(stderr, "%s", __VA_ARGS__) + + int _scanline_filter_a = 0, _scanline_filter_b = 2, _scanline_filter_c = 2, _scanline_filter_d = 4; + int _commandline_linux_nojoy = 0; +@@ -397,7 +397,7 @@ + + if(opt_help) + { +- printf(help_string); ++ printf("%s", help_string); + exit(1); + } + From aca839dc8658e4879f100b6b3851f7daa3b38855 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 2 Feb 2024 07:12:21 +0100 Subject: [PATCH 67/90] Create desmume-0.9.13-ppc64le.patch --- snap/patches/desmume-0.9.13-ppc64le.patch | 26 +++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 snap/patches/desmume-0.9.13-ppc64le.patch diff --git a/snap/patches/desmume-0.9.13-ppc64le.patch b/snap/patches/desmume-0.9.13-ppc64le.patch new file mode 100644 index 000000000..057889515 --- /dev/null +++ b/snap/patches/desmume-0.9.13-ppc64le.patch @@ -0,0 +1,26 @@ +From a95e4c57c61b791fdcb17922735f8681af201b03 Mon Sep 17 00:00:00 2001 +From: rogerman +Date: Sun, 19 Jun 2022 20:36:50 -0700 +Subject: [PATCH] Remove AltiVec compiling for ppcle and ppc64le architectures, + since our AltiVec code only works on big-endian systems anyways. Fixes #550. + +--- + desmume/src/types.h | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/desmume/src/types.h b/desmume/src/types.h +index 0fe31b347..5d5ac50af 100644 +--- a/desmume/src/types.h ++++ b/desmume/src/types.h +@@ -53,7 +53,10 @@ + #endif + + #ifdef __GNUC__ +- #ifdef __ALTIVEC__ ++// Our AltiVec code assumes that its being run on a big-endian system. While ++// the ppcle and ppc64le architectures do exist, our AltiVec code does not ++// support little-endian right now. ++ #if defined(__ALTIVEC__) && defined(MSB_FIRST) && (MSB_FIRST > 0) + #define ENABLE_ALTIVEC + #endif + From 6501ca7120684b22026c7f02d189ccf90c27dfad Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 2 Feb 2024 07:13:26 +0100 Subject: [PATCH 68/90] Create desmume-0.9.13-tinyxml.patch --- snap/patches/desmume-0.9.13-tinyxml.patch | 43 +++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 snap/patches/desmume-0.9.13-tinyxml.patch diff --git a/snap/patches/desmume-0.9.13-tinyxml.patch b/snap/patches/desmume-0.9.13-tinyxml.patch new file mode 100644 index 000000000..3acf8fc7e --- /dev/null +++ b/snap/patches/desmume-0.9.13-tinyxml.patch @@ -0,0 +1,43 @@ +diff -durN desmume-release_0_9_13.orig/desmume/src/frontend/posix/meson.build desmume-release_0_9_13/desmume/src/frontend/posix/meson.build +--- desmume-release_0_9_13.orig/desmume/src/frontend/posix/meson.build 2022-05-23 06:37:41.000000000 +0200 ++++ desmume-release_0_9_13/desmume/src/frontend/posix/meson.build 2022-06-18 19:22:06.688637556 +0200 +@@ -15,6 +15,7 @@ + dep_pcap = dependency('pcap') + dep_zlib = dependency('zlib') + dep_threads = dependency('threads') ++dep_tinyxml = dependency('tinyxml') + dep_gl = dependency('gl', required: false) + dep_openal = dependency('openal', required: get_option('openal')) + dep_alsa = dependency('alsa', required: false) +@@ -28,7 +29,7 @@ + add_global_arguments('-DEXPERIMENTAL_WIFI_COMM', language: ['c', 'cpp']) + endif + +-dependencies = [dep_glib2, dep_sdl, dep_pcap, dep_zlib, dep_threads] ++dependencies = [dep_glib2, dep_sdl, dep_pcap, dep_zlib, dep_threads, dep_tinyxml] + + if target_machine.cpu() == 'x86_64' + add_global_arguments('-DHAVE_JIT', language: ['c', 'cpp']) +@@ -99,10 +100,6 @@ + '../../utils/libfat/libfat_public_api.cpp', + '../../utils/libfat/lock.cpp', + '../../utils/libfat/partition.cpp', +- '../../utils/tinyxml/tinystr.cpp', +- '../../utils/tinyxml/tinyxml.cpp', +- '../../utils/tinyxml/tinyxmlerror.cpp', +- '../../utils/tinyxml/tinyxmlparser.cpp', + '../../utils/colorspacehandler/colorspacehandler.cpp', + '../../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_rom.cpp', '../../addons/slot1comp_protocol.cpp', + '../../cheatSystem.cpp', +diff -durN desmume-release_0_9_13.orig/desmume/src/utils/advanscene.cpp desmume-release_0_9_13/desmume/src/utils/advanscene.cpp +--- desmume-release_0_9_13.orig/desmume/src/utils/advanscene.cpp 2022-05-23 06:37:41.000000000 +0200 ++++ desmume-release_0_9_13/desmume/src/utils/advanscene.cpp 2022-06-18 19:14:40.054101672 +0200 +@@ -19,7 +19,7 @@ + #include + + #define TIXML_USE_STL +-#include "tinyxml/tinyxml.h" ++#include + + #include "advanscene.h" + #include "../common.h" From 07b9fe00e25b22edb281a88883711977969e0069 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 2 Feb 2024 07:14:15 +0100 Subject: [PATCH 69/90] Update and rename snapcraft.yaml to snap/snapcraft.yaml --- snapcraft.yaml => snap/snapcraft.yaml | 67 ++++++++++----------------- 1 file changed, 25 insertions(+), 42 deletions(-) rename snapcraft.yaml => snap/snapcraft.yaml (51%) diff --git a/snapcraft.yaml b/snap/snapcraft.yaml similarity index 51% rename from snapcraft.yaml rename to snap/snapcraft.yaml index 8a55d3525..d4b741a28 100644 --- a/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -13,56 +13,42 @@ parts: source: https://github.com/TASEmulators/desmume/archive/refs/tags/release_0_9_13.tar.gz plugin: nil override-build: | - LDFLAGS="" CFLAGS="" FFLAGS="" FCFLAGS="" DEB_CFLAGS_SET="" DEB_CXXFLAGS_SET="" DEB_FFLAGS_SET="" DEB_FCFLAGS_SET="" DEB_LDFLAGS_SET="" meson setup --prefix=${CRAFT_PART_INSTALL}/usr desmume/src/frontend/posix/build desmume/src/frontend/posix - LDFLAGS="" CFLAGS="" FFLAGS="" FCFLAGS="" DEB_CFLAGS_SET="" DEB_CXXFLAGS_SET="" DEB_FFLAGS_SET="" DEB_FCFLAGS_SET="" DEB_LDFLAGS_SET="" ninja -C desmume/src/frontend/posix/build - LDFLAGS="" CFLAGS="" FFLAGS="" FCFLAGS="" DEB_CFLAGS_SET="" DEB_CXXFLAGS_SET="" DEB_FFLAGS_SET="" DEB_FCFLAGS_SET="" DEB_LDFLAGS_SET="" ninja install -C desmume/src/frontend/posix/build + sed -i 's|Icon=org.desmume.DeSmuME|Icon=/usr/share/icons/hicolor/scalable/apps/org.desmume.DeSmuME.svg|g' desmume/src/frontend/posix/gtk/org.desmume.DeSmuME.desktop + LDFLAGS="" CFLAGS="-O3" CXXFLAGS="-O3" FFLAGS="" FCFLAGS="" DEB_CFLAGS_SET="-O3" DEB_CXXFLAGS_SET="-O3" DEB_FFLAGS_SET="" DEB_FCFLAGS_SET="" DEB_LDFLAGS_SET="" meson setup --prefix=${CRAFT_PART_INSTALL}/usr desmume/src/frontend/posix/build desmume/src/frontend/posix + LDFLAGS="" CFLAGS="-O3" CXXFLAGS="-O3" FFLAGS="" FCFLAGS="" DEB_CFLAGS_SET="-O3" DEB_CXXFLAGS_SET="-O3" DEB_FFLAGS_SET="" DEB_FCFLAGS_SET="" DEB_LDFLAGS_SET="" ninja -C desmume/src/frontend/posix/build + LDFLAGS="" CFLAGS="-O3" CXXFLAGS="-O3" FFLAGS="" FCFLAGS="" DEB_CFLAGS_SET="-O3" DEB_CXXFLAGS_SET="-O3" DEB_FFLAGS_SET="" DEB_FCFLAGS_SET="" DEB_LDFLAGS_SET="" ninja install -C desmume/src/frontend/posix/build stage-packages: - - libasound2 - - libc6 - - libcairo2 + - libasound2 + - libc6 + - libcairo2 - libgcc-s1 - - libgcc-s1 - - libgdk-pixbuf-2.0-0 + - libgdk-pixbuf-2.0-0 - libgl1 - - libglade2-0 - - libglib2.0-0 + - libglib2.0-0 - libglu1-mesa - - libgtk2.0-0 - libgtkglext1 - - libosmesa6 - - libpango-1.0-0 - - libsdl1.2debian - - libsoundtouch1 - - libstdc++6 + - libosmesa6 + - libpango-1.0-0 + - libsdl2-2.0-0 + - libsoundtouch1 + - libstdc++6 - libtinyxml2.6.2v5 - zlib1g - - g++ - - gcc - gettext - - make - - cmake - - nasm - pkg-config - git - zip - - build-essential - - intltool - - libglade2-dev - - libgtk2.0-dev - - libsdl1.2-dev - - libosmesa6-dev - - libagg-dev - - intltool - - quilt - - libgtkglext1-dev - - libtinyxml-dev - - libsoundtouch-dev - - dh-autoreconf - - meson - - libsdl2-dev - - libpcap-dev - - libgtk-3-dev + - libosmesa6 + - libagg2 + - libgtkglext1 + - libsoundtouch1 + - libsdl2-2.0-0 + - libpcap0.8 + - libgtk-3-0 + - libgtk-3-0-udeb + - libgtk-3-bin + - libgtk-3-common build-packages: - g++ - gcc @@ -75,11 +61,8 @@ parts: - zip - build-essential - intltool - - libglade2-dev - - libgtk2.0-dev - - libsdl1.2-dev - libosmesa6-dev - - libagg-dev + - libagg2-dev - intltool - quilt - libgtkglext1-dev From 8f3e0d1d5db0a9756ffc1058833f2c4cf92d0162 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 2 Feb 2024 07:24:01 +0100 Subject: [PATCH 70/90] Rename snap/patches/desmume-0.9.13-aarch64.patch to patches/desmume-0.9.13-aarch64.patch --- {snap/patches => patches}/desmume-0.9.13-aarch64.patch | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {snap/patches => patches}/desmume-0.9.13-aarch64.patch (100%) diff --git a/snap/patches/desmume-0.9.13-aarch64.patch b/patches/desmume-0.9.13-aarch64.patch similarity index 100% rename from snap/patches/desmume-0.9.13-aarch64.patch rename to patches/desmume-0.9.13-aarch64.patch From 09a983cfb48fcb4aebed3a472dd97609536a38b6 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 2 Feb 2024 07:24:30 +0100 Subject: [PATCH 71/90] Rename snap/patches/desmume-0.9.13-arm.patch to patches/desmume-0.9.13-arm.patch --- {snap/patches => patches}/desmume-0.9.13-arm.patch | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {snap/patches => patches}/desmume-0.9.13-arm.patch (100%) diff --git a/snap/patches/desmume-0.9.13-arm.patch b/patches/desmume-0.9.13-arm.patch similarity index 100% rename from snap/patches/desmume-0.9.13-arm.patch rename to patches/desmume-0.9.13-arm.patch From 04af1e887814c6b74ea72f8ba0dbfd7c73c1ff50 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 2 Feb 2024 07:25:01 +0100 Subject: [PATCH 72/90] Rename snap/patches/desmume-0.9.13-formatstring.patch to patches/desmume-0.9.13-formatstring.patch --- {snap/patches => patches}/desmume-0.9.13-formatstring.patch | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {snap/patches => patches}/desmume-0.9.13-formatstring.patch (100%) diff --git a/snap/patches/desmume-0.9.13-formatstring.patch b/patches/desmume-0.9.13-formatstring.patch similarity index 100% rename from snap/patches/desmume-0.9.13-formatstring.patch rename to patches/desmume-0.9.13-formatstring.patch From 9d4b52179d1e5daaff66ec47539b3f4e25b28297 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 2 Feb 2024 07:25:27 +0100 Subject: [PATCH 73/90] Rename snap/patches/desmume-0.9.13-ppc64le.patch to patches/desmume-0.9.13-ppc64le.patch --- {snap/patches => patches}/desmume-0.9.13-ppc64le.patch | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {snap/patches => patches}/desmume-0.9.13-ppc64le.patch (100%) diff --git a/snap/patches/desmume-0.9.13-ppc64le.patch b/patches/desmume-0.9.13-ppc64le.patch similarity index 100% rename from snap/patches/desmume-0.9.13-ppc64le.patch rename to patches/desmume-0.9.13-ppc64le.patch From a67e49c8e04f1191fe49d7433969c4e1614c52ce Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 2 Feb 2024 07:26:15 +0100 Subject: [PATCH 74/90] Rename snap/patches/desmume-0.9.13-tinyxml.patch to patches/desmume-0.9.13-tinyxml.patch --- {snap/patches => patches}/desmume-0.9.13-tinyxml.patch | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {snap/patches => patches}/desmume-0.9.13-tinyxml.patch (100%) diff --git a/snap/patches/desmume-0.9.13-tinyxml.patch b/patches/desmume-0.9.13-tinyxml.patch similarity index 100% rename from snap/patches/desmume-0.9.13-tinyxml.patch rename to patches/desmume-0.9.13-tinyxml.patch From 084fe3ec36c5fa441921e880943660a8714a6e44 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 2 Feb 2024 07:26:46 +0100 Subject: [PATCH 75/90] Rename snap/.stable_tag to .stable_tag --- snap/.stable_tag => .stable_tag | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename snap/.stable_tag => .stable_tag (100%) diff --git a/snap/.stable_tag b/.stable_tag similarity index 100% rename from snap/.stable_tag rename to .stable_tag From a27df7daf93af454c9afd3dd01e6550eff9773a0 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 2 Feb 2024 07:27:01 +0100 Subject: [PATCH 76/90] Rename snap/snapcraft.yaml to snapcraft.yaml --- snap/snapcraft.yaml => snapcraft.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename snap/snapcraft.yaml => snapcraft.yaml (100%) diff --git a/snap/snapcraft.yaml b/snapcraft.yaml similarity index 100% rename from snap/snapcraft.yaml rename to snapcraft.yaml From b5844471d98c46b3123b8a1299e172c5461ec29c Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 2 Feb 2024 07:52:02 +0100 Subject: [PATCH 77/90] Update snapcraft.yaml --- snapcraft.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index d4b741a28..cab5bfa39 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -46,7 +46,6 @@ parts: - libsdl2-2.0-0 - libpcap0.8 - libgtk-3-0 - - libgtk-3-0-udeb - libgtk-3-bin - libgtk-3-common build-packages: From 68022715dbeb12aa417a96279ea866cbd6bcd003 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 2 Feb 2024 08:55:41 +0100 Subject: [PATCH 78/90] Update README.md change snap url for auto open snapd in desktop --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 01c8253ec..553151223 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ -[![Get it from the Snap Store](https://snapcraft.io/static/images/badges/en/snap-store-black.svg)](https://snapcraft.io/desmume-emulator) +[![Get it from the Snap Store](https://snapcraft.io/static/images/badges/en/snap-store-black.svg)](snap://desmume-emulator) From c74fbf3d97ec3c49b7a376f723748166ee2cabe3 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 2 Feb 2024 08:56:45 +0100 Subject: [PATCH 79/90] Update README.md link snap://desmume-emulator not work on github github change url for the image --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 553151223..01c8253ec 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ -[![Get it from the Snap Store](https://snapcraft.io/static/images/badges/en/snap-store-black.svg)](snap://desmume-emulator) +[![Get it from the Snap Store](https://snapcraft.io/static/images/badges/en/snap-store-black.svg)](https://snapcraft.io/desmume-emulator) From eeb7375eda445401d96144a13fdaf09f6e2888b7 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 2 Feb 2024 10:28:55 +0100 Subject: [PATCH 80/90] Update snapcraft.yaml --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index cab5bfa39..1957acf85 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -13,7 +13,7 @@ parts: source: https://github.com/TASEmulators/desmume/archive/refs/tags/release_0_9_13.tar.gz plugin: nil override-build: | - sed -i 's|Icon=org.desmume.DeSmuME|Icon=/usr/share/icons/hicolor/scalable/apps/org.desmume.DeSmuME.svg|g' desmume/src/frontend/posix/gtk/org.desmume.DeSmuME.desktop + sed -i 's|Icon=org.desmume.DeSmuME|Icon=${CRAFT_PART_INSTALL}/usr/share/icons/hicolor/scalable/apps/org.desmume.DeSmuME.svg|g' desmume/src/frontend/posix/gtk/org.desmume.DeSmuME.desktop LDFLAGS="" CFLAGS="-O3" CXXFLAGS="-O3" FFLAGS="" FCFLAGS="" DEB_CFLAGS_SET="-O3" DEB_CXXFLAGS_SET="-O3" DEB_FFLAGS_SET="" DEB_FCFLAGS_SET="" DEB_LDFLAGS_SET="" meson setup --prefix=${CRAFT_PART_INSTALL}/usr desmume/src/frontend/posix/build desmume/src/frontend/posix LDFLAGS="" CFLAGS="-O3" CXXFLAGS="-O3" FFLAGS="" FCFLAGS="" DEB_CFLAGS_SET="-O3" DEB_CXXFLAGS_SET="-O3" DEB_FFLAGS_SET="" DEB_FCFLAGS_SET="" DEB_LDFLAGS_SET="" ninja -C desmume/src/frontend/posix/build LDFLAGS="" CFLAGS="-O3" CXXFLAGS="-O3" FFLAGS="" FCFLAGS="" DEB_CFLAGS_SET="-O3" DEB_CXXFLAGS_SET="-O3" DEB_FFLAGS_SET="" DEB_FCFLAGS_SET="" DEB_LDFLAGS_SET="" ninja install -C desmume/src/frontend/posix/build From 6e8f1f58a4dd79c9fc534dd651318a8ed2c70f49 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 2 Feb 2024 14:45:52 +0100 Subject: [PATCH 81/90] Update snapcraft.yaml --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 1957acf85..4caf5e06f 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -13,7 +13,7 @@ parts: source: https://github.com/TASEmulators/desmume/archive/refs/tags/release_0_9_13.tar.gz plugin: nil override-build: | - sed -i 's|Icon=org.desmume.DeSmuME|Icon=${CRAFT_PART_INSTALL}/usr/share/icons/hicolor/scalable/apps/org.desmume.DeSmuME.svg|g' desmume/src/frontend/posix/gtk/org.desmume.DeSmuME.desktop + sed -i 's|Icon=org.desmume.DeSmuME|Icon=${SNAP}/usr/share/icons/hicolor/scalable/apps/org.desmume.DeSmuME.svg|g' desmume/src/frontend/posix/gtk/org.desmume.DeSmuME.desktop LDFLAGS="" CFLAGS="-O3" CXXFLAGS="-O3" FFLAGS="" FCFLAGS="" DEB_CFLAGS_SET="-O3" DEB_CXXFLAGS_SET="-O3" DEB_FFLAGS_SET="" DEB_FCFLAGS_SET="" DEB_LDFLAGS_SET="" meson setup --prefix=${CRAFT_PART_INSTALL}/usr desmume/src/frontend/posix/build desmume/src/frontend/posix LDFLAGS="" CFLAGS="-O3" CXXFLAGS="-O3" FFLAGS="" FCFLAGS="" DEB_CFLAGS_SET="-O3" DEB_CXXFLAGS_SET="-O3" DEB_FFLAGS_SET="" DEB_FCFLAGS_SET="" DEB_LDFLAGS_SET="" ninja -C desmume/src/frontend/posix/build LDFLAGS="" CFLAGS="-O3" CXXFLAGS="-O3" FFLAGS="" FCFLAGS="" DEB_CFLAGS_SET="-O3" DEB_CXXFLAGS_SET="-O3" DEB_FFLAGS_SET="" DEB_FCFLAGS_SET="" DEB_LDFLAGS_SET="" ninja install -C desmume/src/frontend/posix/build From e1212ff7616bc7e38e707f3f08600a665090c4cb Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 2 Feb 2024 15:00:14 +0100 Subject: [PATCH 82/90] Update snapcraft.yaml --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 4caf5e06f..1fd457e84 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -13,7 +13,7 @@ parts: source: https://github.com/TASEmulators/desmume/archive/refs/tags/release_0_9_13.tar.gz plugin: nil override-build: | - sed -i 's|Icon=org.desmume.DeSmuME|Icon=${SNAP}/usr/share/icons/hicolor/scalable/apps/org.desmume.DeSmuME.svg|g' desmume/src/frontend/posix/gtk/org.desmume.DeSmuME.desktop + sed -i 's|Icon=org.desmume.DeSmuME|Icon=/snap/desmume-emulator/current/usr/share/icons/hicolor/scalable/apps/org.desmume.DeSmuME.svg|g' desmume/src/frontend/posix/gtk/org.desmume.DeSmuME.desktop LDFLAGS="" CFLAGS="-O3" CXXFLAGS="-O3" FFLAGS="" FCFLAGS="" DEB_CFLAGS_SET="-O3" DEB_CXXFLAGS_SET="-O3" DEB_FFLAGS_SET="" DEB_FCFLAGS_SET="" DEB_LDFLAGS_SET="" meson setup --prefix=${CRAFT_PART_INSTALL}/usr desmume/src/frontend/posix/build desmume/src/frontend/posix LDFLAGS="" CFLAGS="-O3" CXXFLAGS="-O3" FFLAGS="" FCFLAGS="" DEB_CFLAGS_SET="-O3" DEB_CXXFLAGS_SET="-O3" DEB_FFLAGS_SET="" DEB_FCFLAGS_SET="" DEB_LDFLAGS_SET="" ninja -C desmume/src/frontend/posix/build LDFLAGS="" CFLAGS="-O3" CXXFLAGS="-O3" FFLAGS="" FCFLAGS="" DEB_CFLAGS_SET="-O3" DEB_CXXFLAGS_SET="-O3" DEB_FFLAGS_SET="" DEB_FCFLAGS_SET="" DEB_LDFLAGS_SET="" ninja install -C desmume/src/frontend/posix/build From 64ccbf1e34d62861bf2cfbc10e88aecc50245be6 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 2 Feb 2024 15:19:20 +0100 Subject: [PATCH 83/90] Update snapcraft.yaml --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 1fd457e84..cab5bfa39 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -13,7 +13,7 @@ parts: source: https://github.com/TASEmulators/desmume/archive/refs/tags/release_0_9_13.tar.gz plugin: nil override-build: | - sed -i 's|Icon=org.desmume.DeSmuME|Icon=/snap/desmume-emulator/current/usr/share/icons/hicolor/scalable/apps/org.desmume.DeSmuME.svg|g' desmume/src/frontend/posix/gtk/org.desmume.DeSmuME.desktop + sed -i 's|Icon=org.desmume.DeSmuME|Icon=/usr/share/icons/hicolor/scalable/apps/org.desmume.DeSmuME.svg|g' desmume/src/frontend/posix/gtk/org.desmume.DeSmuME.desktop LDFLAGS="" CFLAGS="-O3" CXXFLAGS="-O3" FFLAGS="" FCFLAGS="" DEB_CFLAGS_SET="-O3" DEB_CXXFLAGS_SET="-O3" DEB_FFLAGS_SET="" DEB_FCFLAGS_SET="" DEB_LDFLAGS_SET="" meson setup --prefix=${CRAFT_PART_INSTALL}/usr desmume/src/frontend/posix/build desmume/src/frontend/posix LDFLAGS="" CFLAGS="-O3" CXXFLAGS="-O3" FFLAGS="" FCFLAGS="" DEB_CFLAGS_SET="-O3" DEB_CXXFLAGS_SET="-O3" DEB_FFLAGS_SET="" DEB_FCFLAGS_SET="" DEB_LDFLAGS_SET="" ninja -C desmume/src/frontend/posix/build LDFLAGS="" CFLAGS="-O3" CXXFLAGS="-O3" FFLAGS="" FCFLAGS="" DEB_CFLAGS_SET="-O3" DEB_CXXFLAGS_SET="-O3" DEB_FFLAGS_SET="" DEB_FCFLAGS_SET="" DEB_LDFLAGS_SET="" ninja install -C desmume/src/frontend/posix/build From 5d9e6eedb99d27a4f9ba08897e4d66d90f2211e8 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 9 Feb 2024 14:07:54 +0100 Subject: [PATCH 84/90] Delete patches/desmume-0.9.13-aarch64.patch --- patches/desmume-0.9.13-aarch64.patch | 240 --------------------------- 1 file changed, 240 deletions(-) delete mode 100644 patches/desmume-0.9.13-aarch64.patch diff --git a/patches/desmume-0.9.13-aarch64.patch b/patches/desmume-0.9.13-aarch64.patch deleted file mode 100644 index 4f736fcbe..000000000 --- a/patches/desmume-0.9.13-aarch64.patch +++ /dev/null @@ -1,240 +0,0 @@ -From 24eb5ed95c6cbdaba8b3c63a99e95e899e8a5061 Mon Sep 17 00:00:00 2001 -From: rogerman -Date: Sat, 18 Jun 2022 21:56:25 -0700 -Subject: [PATCH] Fix compiling on GCC for AArch64. Fixes #548. - ---- - desmume/src/render3D.cpp | 2 +- - desmume/src/texcache.cpp | 16 +++--- - .../colorspacehandler_NEON.cpp | 56 +++++++++---------- - 3 files changed, 37 insertions(+), 37 deletions(-) - -diff --git a/desmume/src/render3D.cpp b/desmume/src/render3D.cpp -index abc3b9243..26d5ca94d 100644 ---- a/desmume/src/render3D.cpp -+++ b/desmume/src/render3D.cpp -@@ -899,7 +899,7 @@ void Render3D_NEON::_ClearImageBaseLoop(const u16 *__restrict inColor16, const u - vst1q_u32_x4(outDepth24 + i, calcDepth); - - // Write the fog flags to the fog flag buffer. -- vst1q_u8( outFog + i, vuzp1q_u16(vshrq_n_u16(clearDepth.val[0], 15), vshrq_n_u16(clearDepth.val[1], 15)) ); -+ vst1q_u8( outFog + i, vreinterpretq_u8_u16( vuzp1q_u16(vshrq_n_u16(clearDepth.val[0], 15), vshrq_n_u16(clearDepth.val[1], 15)) ) ); - } - } - -diff --git a/desmume/src/texcache.cpp b/desmume/src/texcache.cpp -index 58ce81735..6d2b50757 100644 ---- a/desmume/src/texcache.cpp -+++ b/desmume/src/texcache.cpp -@@ -1429,8 +1429,8 @@ void __NDSTextureUnpackA3I5_NEON(const size_t texelCount, const u8 *__restrict s - const v128u16 palColor1 = vreinterpretq_u16_u8( vqtbl4q_u8(pal16_LUT, idx1) ); - - const v128u8 alpha = vqtbl1q_u8( alpha_LUT, vshrq_n_u8(bits, 5) ); -- const v128u16 alphaLo = vzip1q_u8(vdupq_n_u8(0), alpha); -- const v128u16 alphaHi = vzip2q_u8(vdupq_n_u8(0), alpha); -+ const v128u16 alphaLo = vreinterpretq_u16_u8( vzip1q_u8(vdupq_n_u8(0), alpha) ); -+ const v128u16 alphaHi = vreinterpretq_u16_u8( vzip2q_u8(vdupq_n_u8(0), alpha) ); - - if (TEXCACHEFORMAT == TexFormat_15bpp) - { -@@ -1658,8 +1658,8 @@ void __NDSTextureUnpackA5I3_NEON(const size_t texelCount, const u8 *__restrict s - if (TEXCACHEFORMAT == TexFormat_15bpp) - { - const v128u8 alpha = vshrq_n_u8(bits, 3); -- const v128u16 alphaLo = vzip1q_u8(vdupq_n_u8(0), alpha); -- const v128u16 alphaHi = vzip2q_u8(vdupq_n_u8(0), alpha); -+ const v128u16 alphaLo = vreinterpretq_u16_u8( vzip1q_u8(vdupq_n_u8(0), alpha) ); -+ const v128u16 alphaHi = vreinterpretq_u16_u8( vzip2q_u8(vdupq_n_u8(0), alpha) ); - - ColorspaceConvert555To6665_NEON(palColor0, alphaLo, convertedColor.val[0], convertedColor.val[1]); - ColorspaceConvert555To6665_NEON(palColor1, alphaHi, convertedColor.val[2], convertedColor.val[3]); -@@ -1667,8 +1667,8 @@ void __NDSTextureUnpackA5I3_NEON(const size_t texelCount, const u8 *__restrict s - else - { - const v128u8 alpha = vqtbl2q_u8( alpha8_LUT, vshrq_n_u8(bits, 3) ); -- const v128u16 alphaLo = vzip1q_u8(vdupq_n_u8(0), alpha); -- const v128u16 alphaHi = vzip2q_u8(vdupq_n_u8(0), alpha); -+ const v128u16 alphaLo = vreinterpretq_u16_u8( vzip1q_u8(vdupq_n_u8(0), alpha) ); -+ const v128u16 alphaHi = vreinterpretq_u16_u8( vzip2q_u8(vdupq_n_u8(0), alpha) ); - - ColorspaceConvert555To8888_NEON(palColor0, alphaLo, convertedColor.val[0], convertedColor.val[1]); - ColorspaceConvert555To8888_NEON(palColor1, alphaHi, convertedColor.val[2], convertedColor.val[3]); -@@ -1967,8 +1967,8 @@ void __NDSTextureUnpackDirect16Bit_NEON(const size_t texelCount, const u16 *__re - } - - const v128u16 alpha = vceqq_u16(vshrq_n_u16(c,15), vdupq_n_u16(1)); -- convertedColor.val[0] = vandq_u16( convertedColor.val[0], vzip1q_u16(alpha, alpha) ); -- convertedColor.val[1] = vandq_u16( convertedColor.val[1], vzip2q_u16(alpha, alpha) ); -+ convertedColor.val[0] = vandq_u32( convertedColor.val[0], vreinterpretq_u32_u16(vzip1q_u16(alpha, alpha)) ); -+ convertedColor.val[1] = vandq_u32( convertedColor.val[1], vreinterpretq_u32_u16(vzip2q_u16(alpha, alpha)) ); - - vst1q_u32_x2(dstBuffer, convertedColor); - } -diff --git a/desmume/src/utils/colorspacehandler/colorspacehandler_NEON.cpp b/desmume/src/utils/colorspacehandler/colorspacehandler_NEON.cpp -index b6b95edb4..81ad657ab 100644 ---- a/desmume/src/utils/colorspacehandler/colorspacehandler_NEON.cpp -+++ b/desmume/src/utils/colorspacehandler/colorspacehandler_NEON.cpp -@@ -25,7 +25,7 @@ - - #define COLOR16_SWAPRB_NEON(src) vorrq_u16( vshlq_n_u16(vandq_u16(src,vdupq_n_u16(0x001F)),10), vorrq_u16( vandq_u16(src,vdupq_n_u16(0x03E0)), vorrq_u16(vshrq_n_u16(vandq_u16(src,vdupq_n_u16(0x7C00)),10), vandq_u16(src,vdupq_n_u16(0x8000))) ) ) - --#define COLOR32_SWAPRB_NEON(src) vqtbl1q_u8( (src), ((v128u8){2,1,0,3, 6,5,4,7, 10,9,8,11, 14,13,12,15}) ) -+#define COLOR32_SWAPRB_NEON(src) vreinterpretq_u32_u8( vqtbl1q_u8(vreinterpretq_u8_u32(src), ((v128u8){2,1,0,3, 6,5,4,7, 10,9,8,11, 14,13,12,15})) ) - - template - FORCEINLINE void ColorspaceConvert555To8888_NEON(const v128u16 &srcColor, const v128u16 &srcAlphaBits, v128u32 &dstLo, v128u32 &dstHi) -@@ -42,8 +42,8 @@ FORCEINLINE void ColorspaceConvert555To8888_NEON(const v128u16 &srcColor, const - ga = vorrq_u16(ga, vshrq_n_u16(ga, 5)); - ga = vorrq_u16(ga, srcAlphaBits); - -- dstLo = vzip1q_u8(rb, ga); -- dstHi = vzip2q_u8(rb, ga); -+ dstLo = vreinterpretq_u32_u8( vzip1q_u8(vreinterpretq_u8_u16(rb), vreinterpretq_u8_u16(ga)) ); -+ dstHi = vreinterpretq_u32_u8( vzip2q_u8(vreinterpretq_u8_u16(rb), vreinterpretq_u8_u16(ga)) ); - } - else - { -@@ -54,8 +54,8 @@ FORCEINLINE void ColorspaceConvert555To8888_NEON(const v128u16 &srcColor, const - ba = vorrq_u16( ba, vreinterpretq_u16_u8(vshrq_n_u8(vreinterpretq_u8_u16(ba), 5)) ); - ba = vorrq_u16( ba, srcAlphaBits ); - -- dstLo = vzip1q_u16(rg, ba); -- dstHi = vzip2q_u16(rg, ba); -+ dstLo = vreinterpretq_u32_u16( vzip1q_u16(rg, ba) ); -+ dstHi = vreinterpretq_u32_u16( vzip2q_u16(rg, ba) ); - } - } - -@@ -73,8 +73,8 @@ FORCEINLINE void ColorspaceConvert555XTo888X_NEON(const v128u16 &srcColor, v128u - v128u16 g = vandq_u16(vshrq_n_u16(srcColor, 2), vdupq_n_u16(0x00F8) ); - g = vorrq_u16(g, vshrq_n_u16(g, 5)); - -- dstLo = vzip1q_u8(rb, g); -- dstHi = vzip2q_u8(rb, g); -+ dstLo = vreinterpretq_u32_u8( vzip1q_u8(vreinterpretq_u8_u16(rb), vreinterpretq_u8_u16(g)) ); -+ dstHi = vreinterpretq_u32_u8( vzip2q_u8(vreinterpretq_u8_u16(rb), vreinterpretq_u8_u16(g)) ); - } - else - { -@@ -84,8 +84,8 @@ FORCEINLINE void ColorspaceConvert555XTo888X_NEON(const v128u16 &srcColor, v128u - rg = vorrq_u16( rg, vreinterpretq_u16_u8(vshrq_n_u8(vreinterpretq_u8_u16(rg), 5)) ); - b = vorrq_u16( b, vreinterpretq_u16_u8(vshrq_n_u8(vreinterpretq_u8_u16( b), 5)) ); - -- dstLo = vzip1q_u16(rg, b); -- dstHi = vzip2q_u16(rg, b); -+ dstLo = vreinterpretq_u32_u16( vzip1q_u16(rg, b) ); -+ dstHi = vreinterpretq_u32_u16( vzip2q_u16(rg, b) ); - } - } - -@@ -104,8 +104,8 @@ FORCEINLINE void ColorspaceConvert555To6665_NEON(const v128u16 &srcColor, const - ga = vorrq_u16(ga, vshrq_n_u16(ga, 5)); - ga = vorrq_u16(ga, srcAlphaBits); - -- dstLo = vzip1q_u8(rb, ga); -- dstHi = vzip2q_u8(rb, ga); -+ dstLo = vreinterpretq_u32_u8( vzip1q_u8(vreinterpretq_u8_u16(rb), vreinterpretq_u8_u16(ga)) ); -+ dstHi = vreinterpretq_u32_u8( vzip2q_u8(vreinterpretq_u8_u16(rb), vreinterpretq_u8_u16(ga)) ); - } - else - { -@@ -116,8 +116,8 @@ FORCEINLINE void ColorspaceConvert555To6665_NEON(const v128u16 &srcColor, const - ba = vorrq_u16( ba, vreinterpretq_u16_u8(vshrq_n_u8(vreinterpretq_u8_u16(ba), 5)) ); - ba = vorrq_u16( ba, srcAlphaBits ); - -- dstLo = vzip1q_u16(rg, ba); -- dstHi = vzip2q_u16(rg, ba); -+ dstLo = vreinterpretq_u32_u16( vzip1q_u16(rg, ba) ); -+ dstHi = vreinterpretq_u32_u16( vzip2q_u16(rg, ba) ); - } - } - -@@ -135,8 +135,8 @@ FORCEINLINE void ColorspaceConvert555XTo666X_NEON(const v128u16 &srcColor, v128u - v128u16 g = vandq_u16(vshrq_n_u16(srcColor, 4), vdupq_n_u16(0x003E) ); - g = vorrq_u16(g, vshrq_n_u16(g, 5)); - -- dstLo = vzip1q_u8(rb, g); -- dstHi = vzip2q_u8(rb, g); -+ dstLo = vreinterpretq_u32_u8( vzip1q_u8(vreinterpretq_u8_u16(rb), vreinterpretq_u8_u16(g)) ); -+ dstHi = vreinterpretq_u32_u8( vzip2q_u8(vreinterpretq_u8_u16(rb), vreinterpretq_u8_u16(g)) ); - } - else - { -@@ -146,8 +146,8 @@ FORCEINLINE void ColorspaceConvert555XTo666X_NEON(const v128u16 &srcColor, v128u - rg = vorrq_u16( rg, vreinterpretq_u16_u8(vshrq_n_u8(vreinterpretq_u8_u16(rg), 5)) ); - b = vorrq_u16( b, vreinterpretq_u16_u8(vshrq_n_u8(vreinterpretq_u8_u16( b), 5)) ); - -- dstLo = vzip1q_u16(rg, b); -- dstHi = vzip2q_u16(rg, b); -+ dstLo = vreinterpretq_u32_u16( vzip1q_u16(rg, b) ); -+ dstHi = vreinterpretq_u32_u16( vzip2q_u16(rg, b) ); - } - } - -@@ -171,14 +171,14 @@ FORCEINLINE v128u32 ColorspaceConvert8888To6665_NEON(const v128u32 &src) - // Conversion algorithm: - // RGB 8-bit to 6-bit formula: dstRGB6 = (srcRGB8 >> 2) - // Alpha 8-bit to 6-bit formula: dstA5 = (srcA8 >> 3) -- v128u8 rgba = vshlq_u8(vreinterpretq_u8_u32(src), ((v128s8){-2,-2,-2,-3, -2,-2,-2,-3, -2,-2,-2,-3, -2,-2,-2,-3})); -+ v128u32 rgba = vreinterpretq_u32_u8( vshlq_u8(vreinterpretq_u8_u32(src), ((v128s8){-2,-2,-2,-3, -2,-2,-2,-3, -2,-2,-2,-3, -2,-2,-2,-3})) ); - - if (SWAP_RB) - { -- rgba = COLOR32_SWAPRB_NEON(rgba); -+ return COLOR32_SWAPRB_NEON(rgba); - } - -- return vreinterpretq_u32_u8(rgba); -+ return rgba; - } - - template -@@ -187,14 +187,14 @@ FORCEINLINE v128u32 ColorspaceConvert6665To8888_NEON(const v128u32 &src) - // Conversion algorithm: - // RGB 6-bit to 8-bit formula: dstRGB8 = (srcRGB6 << 2) | ((srcRGB6 >> 4) & 0x03) - // Alpha 5-bit to 8-bit formula: dstA8 = (srcA5 << 3) | ((srcA5 >> 2) & 0x07) -- v128u8 rgba = vorrq_u8( vshlq_u8(vreinterpretq_u8_u32(src), ((v128s8){2,2,2,3, 2,2,2,3, 2,2,2,3, 2,2,2,3})), vshlq_u8(vreinterpretq_u8_u32(src), ((v128s8){-4,-4,-4,-2, -4,-4,-4,-2, -4,-4,-4,-2, -4,-4,-4,-2})) ); -+ v128u32 rgba = vreinterpretq_u32_u8( vorrq_u8( vshlq_u8(vreinterpretq_u8_u32(src), ((v128s8){2,2,2,3, 2,2,2,3, 2,2,2,3, 2,2,2,3})), vshlq_u8(vreinterpretq_u8_u32(src), ((v128s8){-4,-4,-4,-2, -4,-4,-4,-2, -4,-4,-4,-2, -4,-4,-4,-2})) ) ); - - if (SWAP_RB) - { -- rgba = COLOR32_SWAPRB_NEON(rgba); -+ return COLOR32_SWAPRB_NEON(rgba); - } - -- return vreinterpretq_u32_u8(rgba); -+ return rgba; - } - - template -@@ -202,7 +202,7 @@ FORCEINLINE v128u16 _ConvertColorBaseTo5551_NEON(const v128u32 &srcLo, const v12 - { - if (COLORFORMAT == NDSColorFormat_BGR555_Rev) - { -- return srcLo; -+ return vreinterpretq_u16_u32(srcLo); - } - - v128u32 rgbLo; -@@ -518,9 +518,9 @@ size_t ColorspaceConvertBuffer555XTo888_NEON(const u16 *__restrict src, u8 *__re - - dstVec.val[1] = vandq_u8( vuzp1q_u8( vreinterpretq_u8_u16(vshrq_n_u16(srcVec.val[0], 2)), vreinterpretq_u8_u16(vshrq_n_u16(srcVec.val[1], 2)) ), vdupq_n_u8(0xF8) ); - -- dstVec.val[0] = vorrq_u8(dstVec.val[0], vshrq_n_u32(dstVec.val[0], 5)); -- dstVec.val[1] = vorrq_u8(dstVec.val[1], vshrq_n_u32(dstVec.val[1], 5)); -- dstVec.val[2] = vorrq_u8(dstVec.val[2], vshrq_n_u32(dstVec.val[2], 5)); -+ dstVec.val[0] = vorrq_u8(dstVec.val[0], vshrq_n_u8(dstVec.val[0], 5)); -+ dstVec.val[1] = vorrq_u8(dstVec.val[1], vshrq_n_u8(dstVec.val[1], 5)); -+ dstVec.val[2] = vorrq_u8(dstVec.val[2], vshrq_n_u8(dstVec.val[2], 5)); - - vst3q_u8(dst+(i*3), dstVec); - } -@@ -646,7 +646,7 @@ size_t ColorspaceApplyIntensityToBuffer16_NEON(u16 *dst, size_t pixCountVec128, - g = vshlq_n_u16( vuzp2q_u16( vreinterpretq_u16_u32(vmull_u16(vget_low_u16(g), intensityVec)), vreinterpretq_u16_u32(vmull_u16(vget_high_u16(g), intensityVec)) ), 5 ); - b = vshlq_n_u16( vuzp2q_u16( vreinterpretq_u16_u32(vmull_u16(vget_low_u16(b), intensityVec)), vreinterpretq_u16_u32(vmull_u16(vget_high_u16(b), intensityVec)) ), 10 ); - -- tempDst = vorrq_u32( vorrq_u32( vorrq_u32(r, g), b), a); -+ tempDst = vorrq_u16( vorrq_u16( vorrq_u16(r, g), b), a); - - vst1q_u16(dst+i, tempDst); - } From 43e6974a7bbd523b5da97222f58ae3438a78d913 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 9 Feb 2024 14:08:07 +0100 Subject: [PATCH 85/90] Delete patches/desmume-0.9.13-arm.patch --- patches/desmume-0.9.13-arm.patch | 61 -------------------------------- 1 file changed, 61 deletions(-) delete mode 100644 patches/desmume-0.9.13-arm.patch diff --git a/patches/desmume-0.9.13-arm.patch b/patches/desmume-0.9.13-arm.patch deleted file mode 100644 index 5f8f5213b..000000000 --- a/patches/desmume-0.9.13-arm.patch +++ /dev/null @@ -1,61 +0,0 @@ -From d4afd4977ce8b7ba6293946c74914afe79536059 Mon Sep 17 00:00:00 2001 -From: rogerman -Date: Mon, 20 Jun 2022 11:22:26 -0700 -Subject: [PATCH] libretro-common: Compiling tune-up for ARM architectures. - - Fixes a mismatched register warning in arm_enable_runfast_mode() when - compiling for AArch64. - Fix compiling check_arm_cpu_feature() on non-ARM - architectures by being super explicit and pedantic about checking for - __ARM_ARCH; none of this compiler-assumes-a-macro-equals-zero-if-undefined - stuff. - ---- - desmume/src/libretro-common/features/features_cpu.c | 13 ++++++++++--- - 1 file changed, 10 insertions(+), 3 deletions(-) - -diff --git a/desmume/src/libretro-common/features/features_cpu.c b/desmume/src/libretro-common/features/features_cpu.c -index 0980821f9..2c41d5732 100644 ---- a/desmume/src/libretro-common/features/features_cpu.c -+++ b/desmume/src/libretro-common/features/features_cpu.c -@@ -300,10 +300,17 @@ static void arm_enable_runfast_mode(void) - static const unsigned y = 0x03000000; - int r; - __asm__ volatile( -+#if defined(__aarch64__) || defined(_M_ARM64) -+ "fmrx %w0, fpscr \n\t" /* w0 = FPSCR */ -+ "and %w0, %w0, %w1 \n\t" /* w0 = w0 & 0x04086060 */ -+ "orr %w0, %w0, %w2 \n\t" /* w0 = w0 | 0x03000000 */ -+ "fmxr fpscr, %w0 \n\t" /* FPSCR = w0 */ -+#else - "fmrx %0, fpscr \n\t" /* r0 = FPSCR */ - "and %0, %0, %1 \n\t" /* r0 = r0 & 0x04086060 */ - "orr %0, %0, %2 \n\t" /* r0 = r0 | 0x03000000 */ - "fmxr fpscr, %0 \n\t" /* FPSCR = r0 */ -+#endif - : "=r"(r) - : "r"(x), "r"(y) - ); -@@ -311,13 +318,13 @@ static void arm_enable_runfast_mode(void) - #endif - - #if defined(__linux__) && !defined(CPU_X86) --#if __ARM_ARCH -+#if defined(__ARM_ARCH) && (__ARM_ARCH > 0) - #include - #endif - - static unsigned char check_arm_cpu_feature(const char* feature) - { --#if __ARM_ARCH < 8 -+#if defined(__ARM_ARCH) && (__ARM_ARCH < 8) - uint64_t hwcap = getauxval(AT_HWCAP); - if (!strcmp(feature, "neon")) - return (hwcap & HWCAP_ARM_NEON) != 0; -@@ -326,7 +333,7 @@ static unsigned char check_arm_cpu_feature(const char* feature) - if (!strcmp(feature, "vfpv4")) - return (hwcap & HWCAP_ARM_VFPv4) != 0; - return 0; --#elif __ARM_ARCH == 8 -+#elif defined(__ARM_ARCH) && (__ARM_ARCH == 8) - uint64_t hwcap = getauxval(AT_HWCAP); - if (!strcmp(feature, "asimd")) - return (hwcap & HWCAP_ASIMD) != 0; From bd7387b8ca8a60da97675683dd2958cf460ae7c2 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 9 Feb 2024 14:08:21 +0100 Subject: [PATCH 86/90] Delete patches/desmume-0.9.13-formatstring.patch --- patches/desmume-0.9.13-formatstring.patch | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 patches/desmume-0.9.13-formatstring.patch diff --git a/patches/desmume-0.9.13-formatstring.patch b/patches/desmume-0.9.13-formatstring.patch deleted file mode 100644 index dfd49d121..000000000 --- a/patches/desmume-0.9.13-formatstring.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -durN desmume-release_0_9_13.orig/desmume/src/commandline.cpp desmume-release_0_9_13/desmume/src/commandline.cpp ---- desmume-release_0_9_13.orig/desmume/src/commandline.cpp 2022-05-23 06:37:41.000000000 +0200 -+++ desmume-release_0_9_13/desmume/src/commandline.cpp 2022-06-18 18:40:49.218922840 +0200 -@@ -31,7 +31,7 @@ - #include - //#include "frontend/modules/mGetOpt.h" //to test with this, make sure global `optind` is initialized to 1 - --#define printerror(...) fprintf(stderr, __VA_ARGS__) -+#define printerror(...) fprintf(stderr, "%s", __VA_ARGS__) - - int _scanline_filter_a = 0, _scanline_filter_b = 2, _scanline_filter_c = 2, _scanline_filter_d = 4; - int _commandline_linux_nojoy = 0; -@@ -397,7 +397,7 @@ - - if(opt_help) - { -- printf(help_string); -+ printf("%s", help_string); - exit(1); - } - From adbc6245bb74091e10b263002ef616b80f740353 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 9 Feb 2024 14:08:30 +0100 Subject: [PATCH 87/90] Delete patches/desmume-0.9.13-ppc64le.patch --- patches/desmume-0.9.13-ppc64le.patch | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 patches/desmume-0.9.13-ppc64le.patch diff --git a/patches/desmume-0.9.13-ppc64le.patch b/patches/desmume-0.9.13-ppc64le.patch deleted file mode 100644 index 057889515..000000000 --- a/patches/desmume-0.9.13-ppc64le.patch +++ /dev/null @@ -1,26 +0,0 @@ -From a95e4c57c61b791fdcb17922735f8681af201b03 Mon Sep 17 00:00:00 2001 -From: rogerman -Date: Sun, 19 Jun 2022 20:36:50 -0700 -Subject: [PATCH] Remove AltiVec compiling for ppcle and ppc64le architectures, - since our AltiVec code only works on big-endian systems anyways. Fixes #550. - ---- - desmume/src/types.h | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/desmume/src/types.h b/desmume/src/types.h -index 0fe31b347..5d5ac50af 100644 ---- a/desmume/src/types.h -+++ b/desmume/src/types.h -@@ -53,7 +53,10 @@ - #endif - - #ifdef __GNUC__ -- #ifdef __ALTIVEC__ -+// Our AltiVec code assumes that its being run on a big-endian system. While -+// the ppcle and ppc64le architectures do exist, our AltiVec code does not -+// support little-endian right now. -+ #if defined(__ALTIVEC__) && defined(MSB_FIRST) && (MSB_FIRST > 0) - #define ENABLE_ALTIVEC - #endif - From a42d9ee79d49e40574a82cd60aeb2e37a20150c8 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 9 Feb 2024 14:08:40 +0100 Subject: [PATCH 88/90] Delete patches/desmume-0.9.13-tinyxml.patch --- patches/desmume-0.9.13-tinyxml.patch | 43 ---------------------------- 1 file changed, 43 deletions(-) delete mode 100644 patches/desmume-0.9.13-tinyxml.patch diff --git a/patches/desmume-0.9.13-tinyxml.patch b/patches/desmume-0.9.13-tinyxml.patch deleted file mode 100644 index 3acf8fc7e..000000000 --- a/patches/desmume-0.9.13-tinyxml.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -durN desmume-release_0_9_13.orig/desmume/src/frontend/posix/meson.build desmume-release_0_9_13/desmume/src/frontend/posix/meson.build ---- desmume-release_0_9_13.orig/desmume/src/frontend/posix/meson.build 2022-05-23 06:37:41.000000000 +0200 -+++ desmume-release_0_9_13/desmume/src/frontend/posix/meson.build 2022-06-18 19:22:06.688637556 +0200 -@@ -15,6 +15,7 @@ - dep_pcap = dependency('pcap') - dep_zlib = dependency('zlib') - dep_threads = dependency('threads') -+dep_tinyxml = dependency('tinyxml') - dep_gl = dependency('gl', required: false) - dep_openal = dependency('openal', required: get_option('openal')) - dep_alsa = dependency('alsa', required: false) -@@ -28,7 +29,7 @@ - add_global_arguments('-DEXPERIMENTAL_WIFI_COMM', language: ['c', 'cpp']) - endif - --dependencies = [dep_glib2, dep_sdl, dep_pcap, dep_zlib, dep_threads] -+dependencies = [dep_glib2, dep_sdl, dep_pcap, dep_zlib, dep_threads, dep_tinyxml] - - if target_machine.cpu() == 'x86_64' - add_global_arguments('-DHAVE_JIT', language: ['c', 'cpp']) -@@ -99,10 +100,6 @@ - '../../utils/libfat/libfat_public_api.cpp', - '../../utils/libfat/lock.cpp', - '../../utils/libfat/partition.cpp', -- '../../utils/tinyxml/tinystr.cpp', -- '../../utils/tinyxml/tinyxml.cpp', -- '../../utils/tinyxml/tinyxmlerror.cpp', -- '../../utils/tinyxml/tinyxmlparser.cpp', - '../../utils/colorspacehandler/colorspacehandler.cpp', - '../../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_rom.cpp', '../../addons/slot1comp_protocol.cpp', - '../../cheatSystem.cpp', -diff -durN desmume-release_0_9_13.orig/desmume/src/utils/advanscene.cpp desmume-release_0_9_13/desmume/src/utils/advanscene.cpp ---- desmume-release_0_9_13.orig/desmume/src/utils/advanscene.cpp 2022-05-23 06:37:41.000000000 +0200 -+++ desmume-release_0_9_13/desmume/src/utils/advanscene.cpp 2022-06-18 19:14:40.054101672 +0200 -@@ -19,7 +19,7 @@ - #include - - #define TIXML_USE_STL --#include "tinyxml/tinyxml.h" -+#include - - #include "advanscene.h" - #include "../common.h" From 6cb5d40d745d8e4af8e5de2d08b23c2bf2027682 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 9 Feb 2024 14:19:54 +0100 Subject: [PATCH 89/90] Update snapcraft.yaml --- snapcraft.yaml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index cab5bfa39..459c535b0 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -13,11 +13,25 @@ parts: source: https://github.com/TASEmulators/desmume/archive/refs/tags/release_0_9_13.tar.gz plugin: nil override-build: | - sed -i 's|Icon=org.desmume.DeSmuME|Icon=/usr/share/icons/hicolor/scalable/apps/org.desmume.DeSmuME.svg|g' desmume/src/frontend/posix/gtk/org.desmume.DeSmuME.desktop + wget https://github.com/rpmfusion/desmume/raw/f39/desmume-0.9.13-aarch64.patch -O ./desmume-0.9.13-aarch64.patch + patch -p1 < ./desmume-0.9.13-aarch64.patch + rm -f ./desmume-0.9.13-aarch64.patch + wget https://github.com/rpmfusion/desmume/raw/f39/ -O ./desmume-0.9.13-arm.patch + patch -p1 < ./desmume-0.9.13-arm.patch + rm -f ./desmume-0.9.13-arm.patch + wget https://github.com/rpmfusion/desmume/raw/f39/ -O ./desmume-0.9.13-formatstring.patch + patch -p1 < ./desmume-0.9.13-formatstring.patch + rm -f ./desmume-0.9.13-formatstring.patch + wget https://github.com/rpmfusion/desmume/raw/f39/ -O ./desmume-0.9.13-ppc64le.patch + patch -p1 < ./desmume-0.9.13-ppc64le.patch + rm -f ./desmume-0.9.13-ppc64le.patch + wget https://github.com/rpmfusion/desmume/raw/f39/ -O ./desmume-0.9.13-tinyxml.patch + patch -p1 < ./desmume-0.9.13-tinyxml.patch + rm -f ./desmume-0.9.13-tinyxml.patch + sed -i 's|Icon=org.desmume.DeSmuME|Icon=${SNAP}/usr/share/icons/hicolor/scalable/apps/org.desmume.DeSmuME.svg|g' desmume/src/frontend/posix/gtk/org.desmume.DeSmuME.desktop LDFLAGS="" CFLAGS="-O3" CXXFLAGS="-O3" FFLAGS="" FCFLAGS="" DEB_CFLAGS_SET="-O3" DEB_CXXFLAGS_SET="-O3" DEB_FFLAGS_SET="" DEB_FCFLAGS_SET="" DEB_LDFLAGS_SET="" meson setup --prefix=${CRAFT_PART_INSTALL}/usr desmume/src/frontend/posix/build desmume/src/frontend/posix LDFLAGS="" CFLAGS="-O3" CXXFLAGS="-O3" FFLAGS="" FCFLAGS="" DEB_CFLAGS_SET="-O3" DEB_CXXFLAGS_SET="-O3" DEB_FFLAGS_SET="" DEB_FCFLAGS_SET="" DEB_LDFLAGS_SET="" ninja -C desmume/src/frontend/posix/build LDFLAGS="" CFLAGS="-O3" CXXFLAGS="-O3" FFLAGS="" FCFLAGS="" DEB_CFLAGS_SET="-O3" DEB_CXXFLAGS_SET="-O3" DEB_FFLAGS_SET="" DEB_FCFLAGS_SET="" DEB_LDFLAGS_SET="" ninja install -C desmume/src/frontend/posix/build - stage-packages: - libasound2 - libc6 @@ -72,6 +86,8 @@ parts: - libsdl2-dev - libpcap-dev - libgtk-3-dev + - patch + - wget apps: desmume-emulator: From a0e50b380c2224a4b95422ac86b18c43e1096f6d Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 9 Feb 2024 14:25:25 +0100 Subject: [PATCH 90/90] Update snapcraft.yaml --- snapcraft.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 459c535b0..01872b5ac 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -16,16 +16,16 @@ parts: wget https://github.com/rpmfusion/desmume/raw/f39/desmume-0.9.13-aarch64.patch -O ./desmume-0.9.13-aarch64.patch patch -p1 < ./desmume-0.9.13-aarch64.patch rm -f ./desmume-0.9.13-aarch64.patch - wget https://github.com/rpmfusion/desmume/raw/f39/ -O ./desmume-0.9.13-arm.patch + wget https://github.com/rpmfusion/desmume/raw/f39/desmume-0.9.13-arm.patch -O ./desmume-0.9.13-arm.patch patch -p1 < ./desmume-0.9.13-arm.patch rm -f ./desmume-0.9.13-arm.patch - wget https://github.com/rpmfusion/desmume/raw/f39/ -O ./desmume-0.9.13-formatstring.patch + wget https://github.com/rpmfusion/desmume/raw/f39/desmume-0.9.13-formatstring.patch -O ./desmume-0.9.13-formatstring.patch patch -p1 < ./desmume-0.9.13-formatstring.patch rm -f ./desmume-0.9.13-formatstring.patch - wget https://github.com/rpmfusion/desmume/raw/f39/ -O ./desmume-0.9.13-ppc64le.patch + wget https://github.com/rpmfusion/desmume/raw/f39/desmume-0.9.13-ppc64le.patch -O ./desmume-0.9.13-ppc64le.patch patch -p1 < ./desmume-0.9.13-ppc64le.patch rm -f ./desmume-0.9.13-ppc64le.patch - wget https://github.com/rpmfusion/desmume/raw/f39/ -O ./desmume-0.9.13-tinyxml.patch + wget https://github.com/rpmfusion/desmume/raw/f39/desmume-0.9.13-tinyxml.patch -O ./desmume-0.9.13-tinyxml.patch patch -p1 < ./desmume-0.9.13-tinyxml.patch rm -f ./desmume-0.9.13-tinyxml.patch sed -i 's|Icon=org.desmume.DeSmuME|Icon=${SNAP}/usr/share/icons/hicolor/scalable/apps/org.desmume.DeSmuME.svg|g' desmume/src/frontend/posix/gtk/org.desmume.DeSmuME.desktop