From nobody Tue Sep 20 03:15:21 2022 X-Original-To: dev-commits-ports-all@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 4MWmrV1C0nz4cqXY; Tue, 20 Sep 2022 03:15:22 +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 4MWmrV0Txnz3L2G; Tue, 20 Sep 2022 03:15:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663643722; 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=pyGbJjmq2RY140EPk9ZMJSM7sz3MJkXvxPZ6ytFNosA=; b=Y2w5XkHL/EWfWVJN/Sr6iwBZ1gAeTGkO5ngdwR39lKWdp8ie3jlZLm07abz4f975QDQ7hY 3FPYeBTDZXSOdzAsJZpXK/XFm5mfFJOKyc6vsFWdvoio2Kt7eCxo7IOgW1cBekEp5GQOQC egZae6+0cSpeBk/oBwez/hGs4sMtSEKEs5y6SW11t42oel65O4idctNyfN9P6JiCfB923R RCC7ODGsahdcVUBfafbV9MXiUYDRw7iTr7Eeq/Snion708byMsXsduqPGN1NQvOksZGrsG aFvbUombKr04tfxtw61yTZo3AoJ1WXfIO/qkxUapdQ8KZ6vgXf/bkDJa/k0nrg== 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 4MWmrT6fDnzbRT; Tue, 20 Sep 2022 03:15:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28K3FLwP008731; Tue, 20 Sep 2022 03:15:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28K3FL5h008730; Tue, 20 Sep 2022 03:15:21 GMT (envelope-from git) Date: Tue, 20 Sep 2022 03:15:21 GMT Message-Id: <202209200315.28K3FL5h008730@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 9975aa3a3a27 - main - emulators/snes9x-gtk: Update to 1.61; maintain List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9975aa3a3a279b29865da5057ac4e678af0b354f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663643722; 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=pyGbJjmq2RY140EPk9ZMJSM7sz3MJkXvxPZ6ytFNosA=; b=B5fGEdA54ftiOOJD3AcoKtoPWrJOWaYBipA1WJkKzT46B63VjCHgk7aDAdFkn8pSLSOev0 /q+kZNGmvH05fVF39qU9GYFOf/EH3+FJzjzjDNJxhw5qUw2qkd2dBPYwHzAqCkErw682WB whOQAPG7oqRf+8+sNUA/8+yaEFHH3z5ThvHgotMHMHp6AaHmA8Nbkes2ateFAqo61EnlY6 jgmoNxrw49EKg4/qXDpxkvtX2MHmwsVvgNwWnpUeYki5KGFRtLwfZnm261rCMRrGiV8b/N +nIOCFFmLpTCh5R/2jeYDuMpaD7NMurMgBjDpnOOJYYtsoyfKfof7CqCbXMUMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663643722; a=rsa-sha256; cv=none; b=labHPbA3t5q3MVzsqUId7kXhlzSN9lHw4pDgjooKedCQVdiP5urNQ7f5OzhstoWQxX7wdQ KRRkE4e3axb1bNel61RFACUVfciBxMRyDqSE0uDsRsjC74k7awMTh0LD4QA0tHEIiHAFUe ZK/5fQqh4MxFr8x/25oW0xUBs5E8yg5Pw9Ha96FfDb8eCREb3JXt8DCVnIYoVtkwAbbgSo 33kKDKlb1Y/m0zsCEHbODWyWIQODiXHk1WltWFhUKB8hVe3sZfbudhz/PLuwvwlLbAeOUo dT0U4STCfNtW5dcCVfBVcJR3eMTKqYeqidI/MWSKN1iL9eX3CkkN5Kr8KVtKtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=9975aa3a3a279b29865da5057ac4e678af0b354f commit 9975aa3a3a279b29865da5057ac4e678af0b354f Author: Jason E. Hale AuthorDate: 2022-09-20 03:04:40 +0000 Commit: Jason E. Hale CommitDate: 2022-09-20 03:15:12 +0000 emulators/snes9x-gtk: Update to 1.61; maintain This port hasn't been updated in almost 6 years, so quite a bit has changed. See the releases links below for details. Notable changes include switching to the meson build system and using GTK 3 with c++ bindings instead of GTK 2. Some options have been dropped because they are no longer applicable or are now mandatory. https://github.com/snes9xgit/snes9x/releases https://github.com/snes9xgit/snes9x/releases/tag/1.61 --- emulators/snes9x-gtk/Makefile | 93 +++++++--------------- emulators/snes9x-gtk/distinfo | 10 ++- emulators/snes9x-gtk/files/patch-screenshot.cpp | 10 --- .../files/patch-shaders_shader__platform.h | 10 +++ emulators/snes9x-gtk/pkg-plist | 17 ++++ 5 files changed, 64 insertions(+), 76 deletions(-) diff --git a/emulators/snes9x-gtk/Makefile b/emulators/snes9x-gtk/Makefile index c84f309d5f6b..3183239dee21 100644 --- a/emulators/snes9x-gtk/Makefile +++ b/emulators/snes9x-gtk/Makefile @@ -1,91 +1,58 @@ PORTNAME= snes9x -PORTVERSION= 1.54.1 -PORTREVISION= 8 +DISTVERSION= 1.61 CATEGORIES= emulators PKGNAMESUFFIX= -gtk -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jhale@FreeBSD.org COMMENT= Super Nintendo Entertainment System (SNES) Emulator WWW= https://github.com/snes9xgit/snes9x # Commercial users must seek permission from copyright holders. LICENSE= Snes9x LICENSE_NAME= Snes9x License -LICENSE_FILE= ${WRKSRC}/../docs/snes9x-license.txt +LICENSE_FILE= ${WRKSRC}/../LICENSE LICENSE_PERMS= dist-mirror pkg-mirror auto-accept -LIB_DEPENDS= libpng.so:graphics/png +LIB_DEPENDS= libminizip.so:archivers/minizip \ + libepoxy.so:graphics/libepoxy \ + libpng.so:graphics/png +USES= compiler:c++17-lang desktop-file-utils gettext \ + gnome localbase:ldflags meson pkgconfig sdl xorg USE_GITHUB= yes GH_ACCOUNT= snes9xgit - -USES= autoreconf:2.69 compiler:c11 desktop-file-utils gettext gmake \ - gnome localbase perl5 pkgconfig sdl tar:bzip2 xorg -USE_GNOME= cairo gdkpixbuf2 gtk20 intltool libxml2 +GH_TUPLE= KhronosGroup:glslang:bcf6a24:glslang/../shaders/glslang \ + KhronosGroup:SPIRV-Cross:1458bae:spirv/../shaders/SPIRV-Cross +USE_GNOME= gdkpixbuf2 gtkmm30 USE_SDL= sdl2 -USE_XORG= x11 xext -GNU_CONFIGURE= yes -LDFLAGS+= -Wl,--as-needed +USE_XORG= x11 xrandr xext PATCH_WRKSRC= ${WRKSRC}/.. WRKSRC_SUBDIR= gtk -OPTIONS_DEFINE= DEBUG JMA NETPLAY -OPTIONS_GROUP= SOUND VIDEO -OPTIONS_GROUP_SOUND= ALSA PORTAUDIO PULSEAUDIO -OPTIONS_GROUP_VIDEO= OPENGL XRANDR XVIDEO -OPTIONS_DEFAULT= JMA NETPLAY XVIDEO XRANDR - -DEBUG_CONFIGURE_WITH= debug - -JMA_DESC= JMA archive decompression support -JMA_CONFIGURE_WITH= jma-decomp - -NETPLAY_DESC= Network support -NETPLAY_CONFIGURE_WITH= netplay - -OPENGL_CONFIGURE_WITH= opengl -OPENGL_USES= gl -OPENGL_USE= GL=gl,glu - -XRANDR_CONFIGURE_WITH= xrandr -XRANDR_USE= XORG=xrandr - -XVIDEO_CONFIGURE_WITH= xv -XVIDEO_USE= XORG=xv - -ALSA_CONFIGURE_WITH= alsa -ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib -ALSA_USES= compiler:c++11-lang +OPTIONS_MULTI= SOUND +OPTIONS_MULTI_SOUND= ALSA OSS PORTAUDIO PULSEAUDIO +OPTIONS_DEFINE= DEBUGGER NLS WAYLAND XVIDEO +OPTIONS_DEFAULT= OSS WAYLAND XVIDEO +OPTIONS_SUB= yes -PORTAUDIO_CONFIGURE_WITH= portaudio -PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio +ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib +ALSA_MESON_TRUE= alsa -PULSEAUDIO_CONFIGURE_WITH= pulseaudio -PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio +DEBUGGER_DESC= Snes9X debugger +DEBUGGER_MESON_TRUE= debugger -PLIST_FILES= bin/snes9x-gtk \ - share/pixmaps/snes9x.svg \ - share/applications/snes9x.desktop +OSS_MESON_TRUE= oss -.include +PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio +PORTAUDIO_MESON_TRUE= portaudio -.if exists(/usr/lib/libusbhid.a) -CONFIGURE_ARGS+= --with-joystick -.else -CONFIGURE_ARGS+= --without-joystick -.endif +PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio +PULSEAUDIO_MESON_TRUE= pulseaudio -post-patch: - @${REINPLACE_CMD} -e 's|sdl|sdl2|g' -e 's|-ldl||g' \ - ${WRKSRC}/configure.ac +WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland +WAYLAND_MESON_TRUE= wayland -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX} \ - ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX} - ${INSTALL_DATA} ${WRKSRC}/data/snes9x.svg \ - ${STAGEDIR}${PREFIX}/share/pixmaps - ${INSTALL_DATA} ${WRKSRC}/data/snes9x.desktop \ - ${STAGEDIR}${PREFIX}/share/applications +XVIDEO_USE= XORG=xv -.include +.include diff --git a/emulators/snes9x-gtk/distinfo b/emulators/snes9x-gtk/distinfo index 4b22925329a3..dbc73d9a5a1e 100644 --- a/emulators/snes9x-gtk/distinfo +++ b/emulators/snes9x-gtk/distinfo @@ -1,3 +1,7 @@ -TIMESTAMP = 1479034785 -SHA256 (snes9xgit-snes9x-1.54.1_GH0.tar.gz) = 85862a22498bc418c37bd7c81a3089d9cc00af279b91e5f7fa8bea05e2e3027b -SIZE (snes9xgit-snes9x-1.54.1_GH0.tar.gz) = 2186737 +TIMESTAMP = 1663634942 +SHA256 (snes9xgit-snes9x-1.61_GH0.tar.gz) = ce7aad69c3041ba4c33690e9e7d21ceb1b9283d85759b1bf683dfb8c473511bb +SIZE (snes9xgit-snes9x-1.61_GH0.tar.gz) = 3016890 +SHA256 (KhronosGroup-glslang-bcf6a24_GH0.tar.gz) = 89e768efce6c406bb4d0c00c14559106dba83542e3f5385648b5338a80db945c +SIZE (KhronosGroup-glslang-bcf6a24_GH0.tar.gz) = 3183142 +SHA256 (KhronosGroup-SPIRV-Cross-1458bae_GH0.tar.gz) = f3eef2c0f46f8483bc61d687564c45ff6e9f4a38a7be5e6e4e5f59dd787a3785 +SIZE (KhronosGroup-SPIRV-Cross-1458bae_GH0.tar.gz) = 677457 diff --git a/emulators/snes9x-gtk/files/patch-screenshot.cpp b/emulators/snes9x-gtk/files/patch-screenshot.cpp deleted file mode 100644 index 122d12fba7df..000000000000 --- a/emulators/snes9x-gtk/files/patch-screenshot.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- screenshot.cpp.orig 2016-10-15 00:20:34 UTC -+++ screenshot.cpp -@@ -186,6 +186,7 @@ - #include "memmap.h" - #include "display.h" - #include "screenshot.h" -+#include - - - bool8 S9xDoScreenshot (int width, int height) diff --git a/emulators/snes9x-gtk/files/patch-shaders_shader__platform.h b/emulators/snes9x-gtk/files/patch-shaders_shader__platform.h new file mode 100644 index 000000000000..1db69cf88dd0 --- /dev/null +++ b/emulators/snes9x-gtk/files/patch-shaders_shader__platform.h @@ -0,0 +1,10 @@ +--- shaders/shader_platform.h.orig 2022-09-19 23:41:19 UTC ++++ shaders/shader_platform.h +@@ -8,6 +8,7 @@ + #define __SHADER_PLATFORM_H + + #include "port.h" ++#include + + #ifdef SNES9X_GTK + #include diff --git a/emulators/snes9x-gtk/pkg-plist b/emulators/snes9x-gtk/pkg-plist new file mode 100644 index 000000000000..bed7c959c5b8 --- /dev/null +++ b/emulators/snes9x-gtk/pkg-plist @@ -0,0 +1,17 @@ +bin/snes9x-gtk +share/applications/snes9x-gtk.desktop +share/icons/hicolor/128x128/apps/snes9x.png +share/icons/hicolor/16x16/apps/snes9x.png +share/icons/hicolor/24x24/apps/snes9x.png +share/icons/hicolor/256x256/apps/snes9x.png +share/icons/hicolor/32x32/apps/snes9x.png +share/icons/hicolor/64x64/apps/snes9x.png +%%NLS%%share/locale/es/LC_MESSAGES/snes9x-gtk.mo +%%NLS%%share/locale/fr_FR/LC_MESSAGES/snes9x-gtk.mo +%%NLS%%share/locale/ja/LC_MESSAGES/snes9x-gtk.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/snes9x-gtk.mo +%%NLS%%share/locale/ru/LC_MESSAGES/snes9x-gtk.mo +%%NLS%%share/locale/sr@latin/LC_MESSAGES/snes9x-gtk.mo +%%NLS%%share/locale/uk/LC_MESSAGES/snes9x-gtk.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/snes9x-gtk.mo +%%DATADIR%%/cheats.bml