dosbox-staging: update to 0.77.0

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: dosbox-staging: update to 0.77.0
From: Yorick Hardy <yorickhardy%gmail.com@localhost>
Date: Sun, 11 Jul 2021 10:54:56 +0000
Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Sun Jul 11 12:54:56 2021 +0200
Changeset:	beb2c10807274e6a463dfeb85da27a1a2e759403

Modified Files:
	dosbox-staging/Makefile
	dosbox-staging/PLIST
	dosbox-staging/distinfo
Added Files:
	dosbox-staging/patches/patch-contrib_linux_dosbox-staging.desktop
	dosbox-staging/patches/patch-meson.build
Removed Files:
	dosbox-staging/patches/patch-docs_Makefile.am
	dosbox-staging/patches/patch-src_Makefile.am

Log Message:
dosbox-staging: update to 0.77.0

Announcement:

1. Table of Contents

  * 1. Table of Contents
  * 2. Significant Changes
  * 3. Bugfixes
  * 4. Contributions

2. Significant Changes

  * Migrated Staging from autotools to the Meson build system.
      - Those building from source, please see BUILD.md in the repository.
  * Added write-xor-execute page support to comply with the latest macOS
    and SELinux security policies.
      - Thanks to jmarsh and Jonathan Campbell for discussions on vogons.
  * Added variable expansion to the interactive DOS shell.
  * Finished FluidSynth integration, which is now included in all release
    binaries.
      - See the wiki notes for how to use it.
      - Run mixer /listmidi in the DOS shell to see your available soundfonts.
      - Thanks to Christian Lestrade for authoring this support in 2005,
        and all subsequent maintainers.
      - Thanks to Meson for adding FluidSynth to the WrapDB.
  * Finished MT-32 integration, which is now included in all release binaries.
      - See the wiki notes for how to use it.
      - Run mixer /listmidi in the DOS shell to see the available MT-32 models
        and versions.
      - See the list of unmissable MT-32 experiences, courtesy vogons.org
        forum user Shreddoc and contributors.
      - Thanks to Canadacow for authoring MT-32 emulation in 2003,
        KingGuppy and Mok for the follow-on work, and SergM who continues to
        maintain and improve the Munt project today.
      - Thanks to Meson for adding libmt32emu to the WrapDB.
      - Thanks to Microsoft for adding libmt32emu to Vcpkg.
  * Added IBM PS/1 Audio device support.
      - See the wiki notes for how to use it.
      - Thanks to JMK for authoring PS/1 Audio emulation in 2008.
  * Added Innovation SSI-2001 audio device support.
      - See the wiki notes for how to use it.
      - Thanks to Vasyl for authoring SSI-2001 emulation in 2006.
      - Thanks to Dag Lem for authoring, and Antti Lankila and Leandro Nini for
        improving the SID chip emulator.
  * Replaced the default Ctrl+F<keys> hotkeys on macOS with Cmd+F<keys> to
    reduce conflicts with the OS.
      - Thanks to Antti Peltola, Burrito78, and Kirk Klobe for guidance and
        testing.
  * Added or Improved translations for French, Italian, Polish, Russian, and
    Spanish.
      - Thanks to Draky50110 (fr), Kappa971 (it), dreamer (po), IlyaIndigo
        (ru), and Peluchito (es).
  * Added splash_only to the startup_verbosity settings. This shows the splash
    but skips the help banner.
  * Three relative window sizes: small, medium, or large are now understood by
    the windowresolution conf setting. These T-shirt sizes correspond to a
    window that's 25%, 50%, or 80% of your desktop's area, regardless of DPI or
    type of monitor (be it 720p, 1080p, or 4K).
  * Window resizeable using corner-drag is now auto-enabled on all platforms
    when conditions permit.

3. Bugfixes

The following user-visible bugs were fixed:

  * Will no longer lose focus on Raspberry Pi when launched fullscreen in an
    Xorg session [PR#995].
  * Release builds now use dosbox-staging.conf as the primary conf file instead
    of dosbox-staging-git.conf [PR#932].
  * Windows release builds once again mount Opus CD-DA tracks, which was a
    regression in 0.76 [PR#885].
  * AUTOTYPE now works with all games. Until now, a subset of games didn't
    respond to its keystrokes [PR#942].
  * Shoulder triggers on some six-axis controllers, such as the PS4 and
    Logitech's F310 and F710 controllers, can now be mapped [PR#944].
  * When toggling out of fullscreen mode, in some corner cases this resulted in
    a blank window. This is now fixed [PR#1096].

4. Contributions

The 0.77 release includes 920 commits plus 35 commits originating from the
DOSBox project.

DOSBox Staging Members

The following members actively supported the project during the 0.77 timeframe:

  * Antti Peltola (macOS testing and feedback)
  * Brandon Munger (collaborator)
  * Burrito78 (macOS testing and feedback)
  * GranMinigun (testing and triage)
  * kcgen (maintainer)
  * Kirk Klobe (maintainer)
  * Dennis Lühring (collaborator)
  * nemo93 (Wiki maintainer)
  * Patryk Obara (maintainer)
  * Ruben Genoese (testing and triage)
  * Wengier (collaborator)

Direct Contributors

The following authors, co-authors, wiki editors, translators, testers, and bug
reporters directly contributed to the 0.77 release:

  * Allofich
  * Antti Peltola
  * Brandon Munger
  * Burrito78
  * Dennis Lühring
  * Didu
  * Draky50110
  * Dugan Chen
  * eli-schwart
  * Emmanuel Gil Peyrot
  * Feignint
  * Gilles
  * GranMinigun
  * hail-to-the-ryzen
  * IlyaIndigo
  * IPeluchito
  * jmarsh
  * Joshua Krämer
  * Kappa971
  * kcgen
  * Ken Händel
  * Kirk Klobe
  * mdmallard
  * nemo93
  * Otto Urpelainen
  * Patryk Obara
  * Peluchito
  * Ruben Genoese
  * rhys073
  * Sarah Whitman
  * Toby Jennings
  * warpdesign
  * Wengier

DOSBox Contributors

The following DOSBox authors' SVN commits (r4393 through r4459) were merged
during the 0.77 timeframe:

  * jmarsh
  * Peter Veenstra
  * ripsaw8080
  * Sjoerd van der Berg

Indirect Contributors

The following patch or external project authors' sources were merged during the
0.77 timeframe:

  * Antti S. Lankila (reSIDfp maintainer)
  * Dag Lem (Original reSID author)
  * David Reid (dr_libs audio codecs author)
  * Dean Beeler (Original MT-32 patch author)
  * Jason Kim (PS/1 patch author)
  * Jonathan Campbell (DOSBox-X maintainer)
  * nukeykt (Nuked OPL emulator author)
  * sergm (Munt and MT-32 patch maintainer)
  * Vasyl Tsvirkunov (SS1-2001 patch author)
  * Wengier (DOSBox-X maintainer)
  * ykhwong (DOSBox Daum maintainer)

Thank You

We are extremely grateful for all contributions, including the invaluable
improvements merged in from the DOSBox project.

The project maintains original authorship on all commits (including those from
upstream, patches, and external projects) to ensure correct attribution is
recorded in the version control system.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=beb2c10807274e6a463dfeb85da27a1a2e759403

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 dosbox-staging/Makefile                            | 22 ++++++++++++------
 dosbox-staging/PLIST                               | 11 +++++++++
 dosbox-staging/distinfo                            | 12 +++++-----
 .../patch-contrib_linux_dosbox-staging.desktop     | 15 +++++++++++++
 dosbox-staging/patches/patch-docs_Makefile.am      | 14 ------------
 dosbox-staging/patches/patch-meson.build           | 24 ++++++++++++++++++++
 dosbox-staging/patches/patch-src_Makefile.am       | 26 ----------------------
 7 files changed, 71 insertions(+), 53 deletions(-)

diffs:
diff --git a/dosbox-staging/Makefile b/dosbox-staging/Makefile
index cfb18905bc..a3085a6837 100644
--- a/dosbox-staging/Makefile
+++ b/dosbox-staging/Makefile
@@ -1,8 +1,8 @@
 # $NetBSD$
 
 GITHUB_PROJECT=	dosbox-staging
-GITHUB_TAG=	v0.76.0
-DISTNAME=	v0.76.0
+GITHUB_TAG=	v0.77.0
+DISTNAME=	v0.77.0
 PKGNAME=	${GITHUB_PROJECT}-${DISTNAME:S,^v,,}
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=dosbox-staging/}
@@ -13,21 +13,29 @@ HOMEPAGE=	https://dosbox-staging.github.io/
 COMMENT=	DOS/x86 emulator focusing on ease of use
 LICENSE=	gnu-gpl-v2
 
-WRKSRC=		${WRKDIR}/dosbox-staging-0.76.0
-GNU_CONFIGURE=	yes
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_LANGUAGES=	c c++
-USE_TOOLS=	aclocal automake autoconf gmake pkg-config
+USE_TOOLS=	pkg-config
 
 NOT_PAX_MPROTECT_SAFE=	bin/dosbox-staging
 
 pre-configure:
 	${MV} ${WRKSRC}/docs/dosbox.1 ${WRKSRC}/docs/dosbox-staging.1
-	set -e; cd ${WRKSRC}; \
-	aclocal; autoheader; automake -a --foreign -i; autoconf
+
+# devel/googletest
+MESON_ARGS+=	-Dunit_tests=disabled
+MESON_ARGS+=	-Duse_fluidsynth=true
+MESON_ARGS+=	-Duse_mt32emu=false
+MESON_ARGS+=	-Duse_png=true
+MESON_ARGS+=	-Duse_sdl2_net=true
+
+.include "../../devel/meson/build.mk"
 
 .include "../../audio/fluidsynth/buildlink3.mk"
 .include "../../audio/opusfile/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
+.include "../../devel/libatomic/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
 .include "../../net/SDL2_net/buildlink3.mk"
diff --git a/dosbox-staging/PLIST b/dosbox-staging/PLIST
index c3fbb8e60c..7afa251399 100644
--- a/dosbox-staging/PLIST
+++ b/dosbox-staging/PLIST
@@ -1,3 +1,14 @@
 @comment $NetBSD$
 bin/dosbox-staging
 man/man1/dosbox-staging.1
+share/applications/dosbox-staging.desktop
+share/doc/dosbox-staging/AUTHORS
+share/doc/dosbox-staging/README
+share/doc/dosbox-staging/THANKS
+share/icons/hicolor/16x16/apps/dosbox-staging.png
+share/icons/hicolor/22x22/apps/dosbox-staging.png
+share/icons/hicolor/24x24/apps/dosbox-staging.png
+share/icons/hicolor/32x32/apps/dosbox-staging.png
+share/icons/hicolor/scalable/apps/dosbox-staging.svg
+share/licenses/dosbox-staging/COPYING
+share/metainfo/dosbox-staging.metainfo.xml
diff --git a/dosbox-staging/distinfo b/dosbox-staging/distinfo
index fe63d40f4c..380d35ea9b 100644
--- a/dosbox-staging/distinfo
+++ b/dosbox-staging/distinfo
@@ -1,8 +1,8 @@
 $NetBSD$
 
-SHA1 (dosbox-staging/v0.76.0.tar.gz) = ca64bc6285a7f5d7c88fb23671e3639c23f3ed30
-RMD160 (dosbox-staging/v0.76.0.tar.gz) = 3cc9aa389bc8a906cbf5a899992e9b9364884775
-SHA512 (dosbox-staging/v0.76.0.tar.gz) = 8c0357bcec08cac2cd2b306edd8b51ad05e16a3c3efb1f4c77e1d942f285493cae8aab45f1633e9c168c0b4b45aa289cf3ffc72685dc004d83127cdb6c76ae9d
-Size (dosbox-staging/v0.76.0.tar.gz) = 1908605 bytes
-SHA1 (patch-docs_Makefile.am) = 89ea60bae98438fb6d86d28ff0ce02949588bae4
-SHA1 (patch-src_Makefile.am) = 369abff7137bb602478c62babca980dac54af876
+SHA1 (dosbox-staging/v0.77.0.tar.gz) = 2c6817f0b2f9d19dcce53ef429363ad81f6dbe72
+RMD160 (dosbox-staging/v0.77.0.tar.gz) = 38d55a92073ee69b09a500443426795f34861605
+SHA512 (dosbox-staging/v0.77.0.tar.gz) = 37259fecc091f1e318c2385d6e6fdc3b4ad0905ce63a7db1fc812c924bf8c01640692aca4f08b87d06e6001e50f3f2f4bb63c3715aa9cdfeebd205ed345558a0
+Size (dosbox-staging/v0.77.0.tar.gz) = 2579927 bytes
+SHA1 (patch-contrib_linux_dosbox-staging.desktop) = 896b0b24f0a0cbb1de9c66e2a58c2303677b7dea
+SHA1 (patch-meson.build) = 19f54936ad9de1d956ca8377b4491ffa5ed89d60
diff --git a/dosbox-staging/patches/patch-contrib_linux_dosbox-staging.desktop b/dosbox-staging/patches/patch-contrib_linux_dosbox-staging.desktop
new file mode 100644
index 0000000000..a12bbff978
--- /dev/null
+++ b/dosbox-staging/patches/patch-contrib_linux_dosbox-staging.desktop
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Install as "dosbox-staging" to avoid a conflict with emulators/dosbox.
+
+--- contrib/linux/dosbox-staging.desktop.orig	2021-07-02 15:47:39.000000000 +0000
++++ contrib/linux/dosbox-staging.desktop
+@@ -55,7 +55,7 @@ GenericName[wa]=Èn emulateu DOS
+ GenericName[zh_CN]=DOS 模拟器
+ GenericName[zh_TW]=DOS 模擬器
+ Comment=DOS/x86 emulator focusing on ease of use
+-Exec=dosbox
++Exec=dosbox-staging
+ Icon=dosbox-staging
+ Type=Application
+ Terminal=false
diff --git a/dosbox-staging/patches/patch-docs_Makefile.am b/dosbox-staging/patches/patch-docs_Makefile.am
deleted file mode 100644
index aa3db6d85a..0000000000
--- a/dosbox-staging/patches/patch-docs_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-Install as "dosbox-staging" to avoid a conflict with emulators/dosbox.
-
---- docs/Makefile.am.orig	2020-12-03 18:36:19.000000000 +0000
-+++ docs/Makefile.am
-@@ -1,6 +1,6 @@
- # Main Makefile for DOSBox
- 
--man_MANS = dosbox.1 
-+man_MANS = dosbox-staging.1 
- EXTRA_DIST = $(man_MANS) README.video PORTING
- 
- 
diff --git a/dosbox-staging/patches/patch-meson.build b/dosbox-staging/patches/patch-meson.build
new file mode 100644
index 0000000000..a720dd0d41
--- /dev/null
+++ b/dosbox-staging/patches/patch-meson.build
@@ -0,0 +1,24 @@
+$NetBSD$
+
+Install as "dosbox-staging" to avoid a conflict with emulators/dosbox.
+
+--- meson.build.orig	2021-07-02 15:47:39.000000000 +0000
++++ meson.build
+@@ -340,7 +340,7 @@ subdir('tests')
+ # dosbox executable
+ #
+ version_file = vcs_tag(input : 'src/version.cpp.in', output : 'version.cpp')
+-executable('dosbox', ['src/main.cpp', 'src/dosbox.cpp', version_file],
++executable('dosbox-staging', ['src/main.cpp', 'src/dosbox.cpp', version_file],
+            dependencies : [atomic_dep, threads_dep, sdl2_dep] + internal_deps,
+            include_directories : incdir,
+            install : true)
+@@ -352,7 +352,7 @@ data_dir     = get_option('datadir')
+ licenses_dir = data_dir / 'licenses' / 'dosbox-staging'
+ doc_dir      = data_dir / 'doc' / 'dosbox-staging'
+ 
+-install_man('docs/dosbox.1')
++install_man('docs/dosbox-staging.1')
+ install_data('COPYING', install_dir : licenses_dir)
+ install_data('AUTHORS', 'README', 'THANKS', install_dir : doc_dir)
+ 
diff --git a/dosbox-staging/patches/patch-src_Makefile.am b/dosbox-staging/patches/patch-src_Makefile.am
deleted file mode 100644
index 60318cda54..0000000000
--- a/dosbox-staging/patches/patch-src_Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-Install as "dosbox-staging" to avoid a conflict with emulators/dosbox.
-
---- src/Makefile.am.orig	2020-12-03 18:36:19.000000000 +0000
-+++ src/Makefile.am
-@@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
- 
- SUBDIRS = cpu debug dos fpu gui hardware libs ints midi misc shell platform
- 
--bin_PROGRAMS = dosbox
-+bin_PROGRAMS = dosbox-staging
- 
- if HAVE_WINDRES
- ico_stuff = winres.rc
-@@ -11,8 +11,8 @@ endif
- .rc.o:
- 	$(WINDRES) -o $@ $<
- 
--dosbox_SOURCES = dosbox.cpp $(ico_stuff)
--dosbox_LDADD = cpu/libcpu.a \
-+dosbox_staging_SOURCES = dosbox.cpp $(ico_stuff)
-+dosbox_staging_LDADD = cpu/libcpu.a \
-                debug/libdebug.a \
-                dos/libdos.a \
-                fpu/libfpu.a \
Prev by Date: reone: import reone-0.19.0 as wip/reone
Next by Date: auto-admin: Update to 0.7.5.6
Previous by Thread: reone: import reone-0.19.0 as wip/reone
Next by Thread: auto-admin: Update to 0.7.5.6
Indexes:
Home | Main Index | Thread Index | Old Index