git: c662ce116641 - main - emulators/dosbox-staging: Update to 0.77.0
Max Brazhnikov
makc at FreeBSD.org
Sat Jul 17 12:16:53 UTC 2021
The branch main has been updated by makc:
URL: https://cgit.FreeBSD.org/ports/commit/?id=c662ce116641ab7ef0faa0ca058c0dcfe8c7d0d0
commit c662ce116641ab7ef0faa0ca058c0dcfe8c7d0d0
Author: Max Brazhnikov <makc at FreeBSD.org>
AuthorDate: 2021-07-17 11:53:09 +0000
Commit: Max Brazhnikov <makc at FreeBSD.org>
CommitDate: 2021-07-17 12:14:51 +0000
emulators/dosbox-staging: Update to 0.77.0
Upstream switched from autotools to meson. Ajust port accordingly
and drop custom install target.
Release notes: https://dosbox-staging.github.io/v0-77-0/
---
emulators/dosbox-staging/Makefile | 28 ++++++------------------
emulators/dosbox-staging/distinfo | 6 ++---
emulators/dosbox-staging/files/patch-Makefile.am | 9 --------
emulators/dosbox-staging/files/patch-meson.build | 20 +++++++++++++++++
emulators/dosbox-staging/pkg-plist | 10 ++++++++-
5 files changed, 39 insertions(+), 34 deletions(-)
diff --git a/emulators/dosbox-staging/Makefile b/emulators/dosbox-staging/Makefile
index 2ea691175cb6..10d4edcd8920 100644
--- a/emulators/dosbox-staging/Makefile
+++ b/emulators/dosbox-staging/Makefile
@@ -1,7 +1,6 @@
PORTNAME= dosbox-staging
DISTVERSIONPREFIX= v
-DISTVERSION= 0.76.0
-PORTREVISION= 1
+DISTVERSION= 0.77.0
CATEGORIES= emulators
MAINTAINER= makc at FreeBSD.org
@@ -12,13 +11,13 @@ LICENSE= GPLv2
LIB_DEPENDS= libopusfile.so:audio/opusfile \
libpng.so:graphics/png
-USES= autoreconf compiler:c++14-lang gl pkgconfig sdl
+USES= compiler:c++14-lang gl meson pkgconfig sdl
USE_GL= gl
USE_SDL= sdl2 net2
USE_GITHUB= yes
-GNU_CONFIGURE= yes
+MESON_ARGS= -Duse_mt32emu=false
LDFLAGS+= -pthread
OPTIONS_DEFINE= ALSA DOCS FLUIDSYNTH
@@ -26,29 +25,16 @@ OPTIONS_DEFAULT= FLUIDSYNTH
ALSA_DESC= ALSA midi support
ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
-ALSA_CONFIGURE_ENABLE= alsa-midi
+ALSA_MESON_TRUE= use_alsa
-FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth
-FLUIDSYNTH_CONFIGURE_ENABLE= fluidsynth
-
-PORTDOCS= NEWS README README.md
+FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth
+FLUIDSYNTH_MESON_TRUE= use_fluidsynth
post-patch:
@${REINPLACE_CMD} 's,/usr/share/doc/dosbox-staging,${DOCSDIR},' \
${WRKSRC}/docs/dosbox.1
+ ${MV} ${WRKSRC}/docs/dosbox.1 ${WRKSRC}/docs/dosbox-staging.1
@${REINPLACE_CMD} '/^Exec/s,dosbox,dosbox-staging,' \
${WRKSRC}/contrib/linux/dosbox-staging.desktop
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/src/dosbox ${STAGEDIR}${PREFIX}/bin/dosbox-staging
- ${INSTALL_MAN} ${WRKSRC}/docs/dosbox.1 ${STAGEDIR}${PREFIX}/share/man/man1/dosbox-staging.1
- @${MKDIR} ${STAGEDIR}${DESKTOPDIR}
- ${INSTALL_DATA} ${WRKSRC}/contrib/linux/dosbox-staging.desktop ${STAGEDIR}${DESKTOPDIR}
- @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
- ${INSTALL_DATA} ${WRKSRC}/contrib/icons/dosbox-staging.svg ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
-
-do-install-DOCS-on:
- @${MKDIR} ${STAGEDIR}${DOCSDIR}
- ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
-
.include <bsd.port.mk>
diff --git a/emulators/dosbox-staging/distinfo b/emulators/dosbox-staging/distinfo
index a2c5494e7584..815046dcbb93 100644
--- a/emulators/dosbox-staging/distinfo
+++ b/emulators/dosbox-staging/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1611347947
-SHA256 (dosbox-staging-dosbox-staging-v0.76.0_GH0.tar.gz) = 7df53c22f7ce78c70afb60b26b06742b90193b56c510219979bf12e0bb2dc6c7
-SIZE (dosbox-staging-dosbox-staging-v0.76.0_GH0.tar.gz) = 1908605
+TIMESTAMP = 1626517418
+SHA256 (dosbox-staging-dosbox-staging-v0.77.0_GH0.tar.gz) = 85e1739f5dfd7d96b752b2b0e12aad6f95c7770b47fcdaf978d4128d7890d986
+SIZE (dosbox-staging-dosbox-staging-v0.77.0_GH0.tar.gz) = 2579927
diff --git a/emulators/dosbox-staging/files/patch-Makefile.am b/emulators/dosbox-staging/files/patch-Makefile.am
deleted file mode 100644
index 14def1d9eda0..000000000000
--- a/emulators/dosbox-staging/files/patch-Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
---- Makefile.am.orig 2021-01-22 20:52:17 UTC
-+++ Makefile.am
-@@ -1,6 +1,5 @@
- # Main Makefile for DOSBox
-
--AM_MAKEFLAGS ?= --no-print-directory
-
- EXTRA_DIST = autogen.sh contrib
-
diff --git a/emulators/dosbox-staging/files/patch-meson.build b/emulators/dosbox-staging/files/patch-meson.build
new file mode 100644
index 000000000000..c2e0b4118a0a
--- /dev/null
+++ b/emulators/dosbox-staging/files/patch-meson.build
@@ -0,0 +1,20 @@
+--- meson.build.orig 2021-07-17 10:53:48 UTC
++++ 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/emulators/dosbox-staging/pkg-plist b/emulators/dosbox-staging/pkg-plist
index 58a019512912..e25cd69875b9 100644
--- a/emulators/dosbox-staging/pkg-plist
+++ b/emulators/dosbox-staging/pkg-plist
@@ -1,4 +1,12 @@
bin/dosbox-staging
+man/man1/dosbox-staging.1.gz
share/applications/dosbox-staging.desktop
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/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/man/man1/dosbox-staging.1.gz
+share/metainfo/dosbox-staging.metainfo.xml
More information about the dev-commits-ports-all
mailing list