From nobody Thu Feb 15 20:50:16 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TbRyx27J1z5BBMC; Thu, 15 Feb 2024 20:50:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TbRyx1ZXdz4Kt0; Thu, 15 Feb 2024 20:50:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708030217; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OqVHNoJw7oI9cYpmX4sGhNZQCAl/7AyU7BnIuiEniME=; b=GBDfBcsJ+sLM5JFY7Qm9sErPQ6AxIPvy5eS8A6B8qkJPD8okEcOJKerHTkDWtlyGhTVP+Y 72cJzcYWTQmsQ5agdZ9snRJsxEBJzyhTJ2hSL1vxv6AzFS+l/2I7hVGvXebM4j2MH8xoto YshrUela/33eSnEWPVmla/vupI44r0t43Et6k/f3yaB6L2mlTlgrzpAtB022Gp2asN5XUj JAegH9nc289EDIuzAhqJUab4zKe9Vu/XUzElV6iuzTSb2yFxTu5/0CEmx9uvoVaVS81LVx rJSRHMx803GRtuRLaZseBJE0yF0giri5mDrUD2lPkI/eoXdTRPczYibSZmuITg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708030217; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OqVHNoJw7oI9cYpmX4sGhNZQCAl/7AyU7BnIuiEniME=; b=lALKGHlpzpAqKs8ij+djNPjGupdE5gugH0/x0b5Rf/dLPCcugIqzzWvlhMIGfEzK+Uln8m Feeg+YdbhqbjCcxnh+FzhgBnc3suphVWEtSgheIWZET9VrcGF8eOouzJyoy03mlw6yTzyc RCmprSvSNyaxfV34KQXUoakwJgD55A/w2ZJKMdLVOGo8hLJnGPE2PR6nzS6lkE0gie/gEP u8Q0H3JyMRPCiQTgIWuvQ+qN3WCuK88mTnABQy9Qz/+i6om8iZpqHr5rssdtQr5Oywe5Aj VdTPEnlkCYRVMm//iQiIBkR1/tytVggkNkJsn/WsH1YPQ2yCfCz542up+5keZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708030217; a=rsa-sha256; cv=none; b=NQJr+LaFqBh5OdUFOw2CXft4r1dTLiyLLz9dn4aP7/meciRB7JaDnpjhNo3UT2llFTPBSe ID9FjFGNnZMqoYpZ1mhL1KKFuM7Eak1XaRaY4/hm0iWSoK7HCTcSdLWmNe9iI92xOGGRXt VYfmRneqY3a09AgD3iN4DbSd6hSrmq7/XNkkFlXjhC7Bl4y9OXeghLDnOEVLSYTrELVqjt CBo3oa47yuVDd33sZ95557IMDK1EGcuqtzID51OVKS9rmOsIzWC9YXi/vGhgHC1qvIL4+g UV1zJmXAngkYp6cJzriwOiHwhAHSZcE7tmCib709c/ZoDNx6Du+f3TdVXc0MXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbRyx0fK8zwsG; Thu, 15 Feb 2024 20:50:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41FKoGrP095024; Thu, 15 Feb 2024 20:50:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41FKoG8s095019; Thu, 15 Feb 2024 20:50:16 GMT (envelope-from git) Date: Thu, 15 Feb 2024 20:50:16 GMT Message-Id: <202402152050.41FKoG8s095019@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 04d41f9a48a5 - main - emulators/dosbox-staging: update to 0.81.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 04d41f9a48a528a334544f53bf3a9e84c17f9943 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=04d41f9a48a528a334544f53bf3a9e84c17f9943 commit 04d41f9a48a528a334544f53bf3a9e84c17f9943 Author: Vladimir Druzenko AuthorDate: 2024-02-15 20:41:47 +0000 Commit: Vladimir Druzenko CommitDate: 2024-02-15 20:49:33 +0000 emulators/dosbox-staging: update to 0.81.0 Release notes: https://dosbox-staging.github.io/releases/release-notes/0.81.0/ Approved by: makc (maintainer), arrowd (mentor) Differential Revision: https://reviews.freebsd.org/D43924 --- emulators/dosbox-staging/Makefile | 12 ++-- emulators/dosbox-staging/distinfo | 6 +- emulators/dosbox-staging/files/patch-meson.build | 12 ++-- emulators/dosbox-staging/pkg-plist | 83 ++++++++++++++++++------ 4 files changed, 77 insertions(+), 36 deletions(-) diff --git a/emulators/dosbox-staging/Makefile b/emulators/dosbox-staging/Makefile index d797f7567b0e..ba0db8a0a691 100644 --- a/emulators/dosbox-staging/Makefile +++ b/emulators/dosbox-staging/Makefile @@ -1,7 +1,6 @@ PORTNAME= dosbox-staging DISTVERSIONPREFIX= v -DISTVERSION= 0.80.1 -PORTREVISION= 2 +DISTVERSION= 0.81.0 CATEGORIES= emulators MAINTAINER= makc@FreeBSD.org @@ -10,20 +9,21 @@ WWW= https://dosbox-staging.github.io/ LICENSE= GPLv2 -LIB_DEPENDS= libiir.so:audio/iir1 \ +LIB_DEPENDS= libz-ng.so:archivers/zlib-ng \ + libiir.so:audio/iir1 \ libopusfile.so:audio/opusfile \ libspeexdsp.so:audio/speexdsp \ libpng.so:graphics/png \ libslirp.so:net/libslirp -USES= compiler:c++14-lang gl meson pkgconfig sdl +USES= compiler:c++17-lang gl meson pkgconfig sdl USE_GL= gl -USE_SDL= sdl2 image2 net2 +USE_SDL= sdl2 net2 USE_GITHUB= yes MESON_ARGS= -Dunit_tests=disabled -Duse_mt32emu=false -LDFLAGS+= -pthread -lz +LDFLAGS+= -pthread OPTIONS_DEFINE= ALSA DOCS FLUIDSYNTH OPTIONS_DEFAULT= FLUIDSYNTH diff --git a/emulators/dosbox-staging/distinfo b/emulators/dosbox-staging/distinfo index 498a8a168ad7..ee81b9f14312 100644 --- a/emulators/dosbox-staging/distinfo +++ b/emulators/dosbox-staging/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1673205573 -SHA256 (dosbox-staging-dosbox-staging-v0.80.1_GH0.tar.gz) = 2ca69e65e6c181197b63388c60487a3bcea804232a28c44c37704e70d49a0392 -SIZE (dosbox-staging-dosbox-staging-v0.80.1_GH0.tar.gz) = 3876041 +TIMESTAMP = 1707996903 +SHA256 (dosbox-staging-dosbox-staging-v0.81.0_GH0.tar.gz) = 9b133dbf2fe8410bb475267a8f26844d56b9025079783ec6a4574841888ae600 +SIZE (dosbox-staging-dosbox-staging-v0.81.0_GH0.tar.gz) = 6943457 diff --git a/emulators/dosbox-staging/files/patch-meson.build b/emulators/dosbox-staging/files/patch-meson.build index 7c0fed11957c..4a4d18d6c0bb 100644 --- a/emulators/dosbox-staging/files/patch-meson.build +++ b/emulators/dosbox-staging/files/patch-meson.build @@ -1,15 +1,15 @@ ---- meson.build.orig 2022-09-30 15:59:10 UTC +--- meson.build.orig 2024-02-11 04:55:05 UTC +++ meson.build -@@ -34,7 +34,7 @@ data_dir = get_option('datadir') +@@ -37,7 +37,7 @@ data_dir = get_option('datadir') licenses_dir = data_dir / 'licenses' / meson.project_name() doc_dir = data_dir / 'doc' / meson.project_name() -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) - -@@ -708,7 +708,7 @@ if host_machine.system() == 'windows' + # Bundle licenses, but skip the ones that are not relevant for + # binary distribution or allow us to not distribute the license text. + install_data( +@@ -1306,7 +1306,7 @@ if host_machine.system() == 'windows' endif executable( diff --git a/emulators/dosbox-staging/pkg-plist b/emulators/dosbox-staging/pkg-plist index b10f6c7fe321..b4965a7d540a 100644 --- a/emulators/dosbox-staging/pkg-plist +++ b/emulators/dosbox-staging/pkg-plist @@ -30,29 +30,34 @@ share/applications/dosbox-staging.desktop %%DATADIR%%/freedos-keyboard/KEYBRD2.SYS %%DATADIR%%/freedos-keyboard/KEYBRD3.SYS %%DATADIR%%/freedos-keyboard/KEYBRD4.SYS -%%DATADIR%%/glshaders/crt/aperture.glsl -%%DATADIR%%/glshaders/crt/caligari.glsl -%%DATADIR%%/glshaders/crt/easymode.glsl -%%DATADIR%%/glshaders/crt/easymode.tweaked.glsl -%%DATADIR%%/glshaders/crt/fakelottes.glsl -%%DATADIR%%/glshaders/crt/fakelottes.tweaked.glsl -%%DATADIR%%/glshaders/crt/geom.glsl -%%DATADIR%%/glshaders/crt/geom.tweaked.glsl -%%DATADIR%%/glshaders/crt/hyllian-updated.glsl -%%DATADIR%%/glshaders/crt/hyllian.glsl -%%DATADIR%%/glshaders/crt/lottes-fast.glsl -%%DATADIR%%/glshaders/crt/lottes-fast.subtle+gain.glsl -%%DATADIR%%/glshaders/crt/lottes.glsl -%%DATADIR%%/glshaders/crt/lottes.tweaked.glsl -%%DATADIR%%/glshaders/crt/mattias.glsl -%%DATADIR%%/glshaders/crt/pi-vertical.glsl -%%DATADIR%%/glshaders/crt/pi.glsl -%%DATADIR%%/glshaders/crt/yee64.glsl -%%DATADIR%%/glshaders/crt/yeetron.glsl -%%DATADIR%%/glshaders/crt/zfast-composite.glsl -%%DATADIR%%/glshaders/crt/zfast.glsl +%%DATADIR%%/glshaders/crt/arcade-1080p.glsl +%%DATADIR%%/glshaders/crt/arcade-1440p.glsl +%%DATADIR%%/glshaders/crt/arcade-4k.glsl +%%DATADIR%%/glshaders/crt/arcade-sharp-1080p.glsl +%%DATADIR%%/glshaders/crt/arcade-sharp-1440p.glsl +%%DATADIR%%/glshaders/crt/arcade-sharp-4k.glsl +%%DATADIR%%/glshaders/crt/cga-1080p.glsl +%%DATADIR%%/glshaders/crt/cga-1440p.glsl +%%DATADIR%%/glshaders/crt/cga-4k.glsl +%%DATADIR%%/glshaders/crt/cga-720p.glsl +%%DATADIR%%/glshaders/crt/composite-1080p.glsl +%%DATADIR%%/glshaders/crt/composite-1440p.glsl +%%DATADIR%%/glshaders/crt/composite-4k.glsl +%%DATADIR%%/glshaders/crt/ega-1080p.glsl +%%DATADIR%%/glshaders/crt/ega-1440p.glsl +%%DATADIR%%/glshaders/crt/ega-4k.glsl +%%DATADIR%%/glshaders/crt/ega-720p.glsl +%%DATADIR%%/glshaders/crt/hercules.glsl +%%DATADIR%%/glshaders/crt/monochrome-hires.glsl +%%DATADIR%%/glshaders/crt/monochrome-lowres.glsl +%%DATADIR%%/glshaders/crt/vga-1080p-fake-double-scan.glsl +%%DATADIR%%/glshaders/crt/vga-1080p.glsl +%%DATADIR%%/glshaders/crt/vga-1440p.glsl +%%DATADIR%%/glshaders/crt/vga-4k.glsl %%DATADIR%%/glshaders/interpolation/catmull-rom.glsl %%DATADIR%%/glshaders/interpolation/sharp.glsl +%%DATADIR%%/glshaders/misc/fixvideo-scanlines.glsl +%%DATADIR%%/glshaders/misc/fixvideo.glsl %%DATADIR%%/glshaders/none.glsl %%DATADIR%%/glshaders/scaler/advinterp2x.glsl %%DATADIR%%/glshaders/scaler/advinterp3x.glsl @@ -253,6 +258,15 @@ share/applications/dosbox-staging.desktop %%DATADIR%%/mapping-freedos.org/CP_30000.TXT %%DATADIR%%/mapping-freedos.org/CP_30006.TXT %%DATADIR%%/mapping-freedos.org/CP_30034.TXT +%%DATADIR%%/mapping-unicode.org/CP_1250.TXT +%%DATADIR%%/mapping-unicode.org/CP_1251.TXT +%%DATADIR%%/mapping-unicode.org/CP_1252.TXT +%%DATADIR%%/mapping-unicode.org/CP_1253.TXT +%%DATADIR%%/mapping-unicode.org/CP_1254.TXT +%%DATADIR%%/mapping-unicode.org/CP_1255.TXT +%%DATADIR%%/mapping-unicode.org/CP_1256.TXT +%%DATADIR%%/mapping-unicode.org/CP_1257.TXT +%%DATADIR%%/mapping-unicode.org/CP_1258.TXT %%DATADIR%%/mapping-unicode.org/CP_437.TXT %%DATADIR%%/mapping-unicode.org/CP_737.TXT %%DATADIR%%/mapping-unicode.org/CP_775.TXT @@ -272,15 +286,36 @@ share/applications/dosbox-staging.desktop %%DATADIR%%/mapping-unicode.org/CP_874.TXT %%DATADIR%%/mapping-unicode.org/license.txt %%DATADIR%%/mapping-wikipedia.org/CP_1117.TXT +%%DATADIR%%/mapping-wikipedia.org/CP_1169.TXT +%%DATADIR%%/mapping-wikipedia.org/CP_1270.TXT +%%DATADIR%%/mapping-wikipedia.org/CP_20866.TXT +%%DATADIR%%/mapping-wikipedia.org/CP_28591.TXT +%%DATADIR%%/mapping-wikipedia.org/CP_28592.TXT +%%DATADIR%%/mapping-wikipedia.org/CP_28593.TXT +%%DATADIR%%/mapping-wikipedia.org/CP_28594.TXT +%%DATADIR%%/mapping-wikipedia.org/CP_28595.TXT +%%DATADIR%%/mapping-wikipedia.org/CP_28596.TXT +%%DATADIR%%/mapping-wikipedia.org/CP_28597.TXT +%%DATADIR%%/mapping-wikipedia.org/CP_28598.TXT +%%DATADIR%%/mapping-wikipedia.org/CP_28600.TXT +%%DATADIR%%/mapping-wikipedia.org/CP_28601.TXT +%%DATADIR%%/mapping-wikipedia.org/CP_28603.TXT +%%DATADIR%%/mapping-wikipedia.org/CP_28604.TXT +%%DATADIR%%/mapping-wikipedia.org/CP_28606.TXT %%DATADIR%%/mapping-wikipedia.org/CP_3021.TXT %%DATADIR%%/mapping-wikipedia.org/CP_3848.TXT +%%DATADIR%%/mapping-wikipedia.org/CP_708.TXT +%%DATADIR%%/mapping-wikipedia.org/CP_720.TXT %%DATADIR%%/mapping-wikipedia.org/CP_773.TXT +%%DATADIR%%/mapping-wikipedia.org/CP_776.TXT %%DATADIR%%/mapping-wikipedia.org/CP_777.TXT %%DATADIR%%/mapping-wikipedia.org/CP_778.TXT %%DATADIR%%/mapping-wikipedia.org/CP_851.TXT %%DATADIR%%/mapping-wikipedia.org/CP_853.TXT %%DATADIR%%/mapping-wikipedia.org/CP_899.TXT %%DATADIR%%/mapping/ASCII.TXT +%%DATADIR%%/mapping/CAPITAL_SMALL.TXT +%%DATADIR%%/mapping/DECOMPOSITION.TXT %%DATADIR%%/mapping/MAIN.TXT %%DATADIR%%/translations/de.lng %%DATADIR%%/translations/en.lng @@ -290,9 +325,15 @@ share/applications/dosbox-staging.desktop %%DATADIR%%/translations/nl.lng %%DATADIR%%/translations/pl.lng %%DATADIR%%/translations/ru.lng +share/icons/hicolor/1024x1024/apps/dosbox-staging.png +share/icons/hicolor/128x128/apps/dosbox-staging.png 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/256x256/apps/dosbox-staging.png share/icons/hicolor/32x32/apps/dosbox-staging.png +share/icons/hicolor/48x48/apps/dosbox-staging.png +share/icons/hicolor/512x512/apps/dosbox-staging.png +share/icons/hicolor/96x96/apps/dosbox-staging.png share/icons/hicolor/scalable/apps/dosbox-staging.svg share/metainfo/dosbox-staging.metainfo.xml