On Fri, May 13, 2022 at 08:16:44PM -0700, Ryan Freeman wrote:
> Hi ports@,
>
> Here is an update to nestopia 1.51.1. I sent an earlier version of this to
> bentley@, ready to get wider testing now.
>
> Upstream has eliminated the libretro bits in lieu of letting libretro
> themselves be the upstream. bentley@ gave his blessing for the creation
> of a separate libretro-nestopia port, this will be posted shortly.
>
> Upstream was also kind enough to roll a real source archive for 1.51.1 so
> no GH_* vars needed... kudos to upstream!
>
> GTK3 has been removed in lieu of fltk.
>
> Tested some games and they run perfectly smooth with this version (use
> fullscreen if running under some sort of compositing manager including
> mutter/gnome, else you get non-smoothness.)
>
> I should note that at least for me, nestopia 1.49 wasn't running smooth
> at all, quite choppy.
>
> I suspect a Quirks.pm entry is needed with the libretro package ending up
> outside this one, a hint would be appreciated there.
>
> Passed portcheck and {port-,}lib-depends-check
> Builds and tests good on amd64.
Re-tested against current ports checkout and snapshot, and the original
diff was busted. Reattached, and it should work this time ;)
Index: Makefile
===================================================================
RCS file: /cvs/ports/emulators/nestopia/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile 31 Mar 2022 17:12:50 -0000 1.24
+++ Makefile 27 May 2022 02:17:06 -0000
@@ -1,13 +1,6 @@
-COMMENT-main = accurate Nintendo Entertainment System emulator
-COMMENT-libretro = Nintendo Entertainment System core for retroarch
+COMMENT = accurate Nintendo Entertainment System emulator
-V = 1.49
-DISTNAME = nestopia-$V
-PKGNAME-libretro = libretro-nestopia-$V
-REVISION-main = 1
-REVISION-libretro = 0
-
-MULTI_PACKAGES = -main -libretro
+DISTNAME = nestopia-1.51.1
.include <bsd.port.arch.mk>
@@ -20,10 +13,9 @@ MAINTAINER = Anthony J. Bentley <anthon
# GPLv2+
PERMIT_PACKAGE = Yes
-WANTLIB-main += ${COMPILER_LIBCXX} SDL2 ao archive atk-1.0 c cairo
-WANTLIB-main += cairo-gobject epoxy gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
-WANTLIB-main += gobject-2.0 gtk-3 intl m pango-1.0 pangocairo-1.0 z harfbuzz
-WANTLIB-libretro = ${COMPILER_LIBCXX} m pthread
+WANTLIB += ${COMPILER_LIBCXX} GL GLU X11 Xau Xcursor Xdmcp Xext
+WANTLIB += Xfixes Xft Xinerama c fontconfig m z
+WANTLIB += SDL2 fltk fltk_gl fltk_images jpeg png archive
COMPILER = base-clang ports-gcc base-gcc
@@ -31,26 +23,19 @@ MASTER_SITES = ${MASTER_SITE_SOURCEFORG
EXTRACT_SUFX = .tgz
BUILD_DEPENDS = devel/autoconf-archive
-RUN_DEPENDS-main = devel/desktop-file-utils \
+RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+3,-guic
-LIB_DEPENDS-main = archivers/libarchive \
- audio/libao \
+LIB_DEPENDS = archivers/libarchive \
devel/sdl2 \
- x11/gtk+3
-LIB_DEPENDS-libretro = ${MODGCC4_CPPLIBDEP}
+ x11/fltk
MAKE_FLAGS = CC="${CC}" \
CXX="${CXX}" \
- CFLAGS="${CFLAGS} `sdl2-config --cflags` \
- `pkg-config --cflags gtk+-3.0`" \
- CXXFLAGS="${CFLAGS} `sdl2-config --cflags` \
- `pkg-config --cflags gtk+-3.0` \
- -Ilibretro-common/include -Wno-narrowing"
+ CFLAGS="${CFLAGS} `sdl2-config --cflags`" \
+ CXXFLAGS="${CFLAGS} `sdl2-config --cflags`
-Wno-narrowing"
FAKE_FLAGS = PREFIX="${WRKINST}/${TRUEPREFIX}"
CONFIGURE_STYLE = autoreconf
-CONFIGURE_ARGS = --enable-gui \
- --with-ao
USE_GMAKE = Yes
@@ -58,15 +43,5 @@ NO_TEST = Yes
AUTOCONF_VERSION = 2.69
AUTOMAKE_VERSION = 1.15
-
-post-build:
- cd ${WRKSRC}/libretro && \
- ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \
- -f ${MAKE_FILE} ${ALL_TARGET}
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/lib/libretro
- ${INSTALL_DATA} ${WRKSRC}/libretro/nestopia_libretro.so \
- ${PREFIX}/lib/libretro
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/emulators/nestopia/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 1 Apr 2019 06:34:37 -0000 1.5
+++ distinfo 27 May 2022 02:17:06 -0000
@@ -1,2 +1,2 @@
-SHA256 (nestopia-1.49.tgz) = ZT5qOTdriDGWoykmaRrvAHHMiB0yVtLwOUwkigEFYLo=
-SIZE (nestopia-1.49.tgz) = 1294779
+SHA256 (nestopia-1.51.1.tgz) = jhd4DxKPpHJENoPv7fmFbnkjwIa10zwsgwjjJHTRgvs=
+SIZE (nestopia-1.51.1.tgz) = 1634059
Index: patches/patch-libretro_Makefile
===================================================================
RCS file: patches/patch-libretro_Makefile
diff -N patches/patch-libretro_Makefile
--- patches/patch-libretro_Makefile 11 Mar 2022 18:59:40 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-Index: libretro/Makefile
---- libretro/Makefile.orig
-+++ libretro/Makefile
-@@ -52,7 +52,7 @@ unixcygpath = /$(subst :,,$(call unixpath,$1))
- ifeq ($(platform), unix)
- TARGET := $(TARGET_NAME)_libretro.so
- fpic := -fPIC
-- SHARED := -shared -Wl,-version-script=link.T -Wl,-no-undefined
-+ SHARED := -shared -Wl,-version-script=link.T
- ifeq ($(shell uname -s), Haiku)
- LDFLAGS += -lroot
- endif
Index: pkg/DESCR
===================================================================
RCS file: pkg/DESCR
diff -N pkg/DESCR
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/DESCR 27 May 2022 02:17:06 -0000
@@ -0,0 +1,9 @@
+Nestopia is an accuracy-focused emulator for the Nintendo Entertainment
+System/Famicom (and Famicom Disk System). It is a computer program that
+acts like a physical piece of hardware. In other words, this is a method
+of preserving videogame history, with the welcome side effect of
+allowing you to play NES games on a modern computer.
+
+Nestopia uses highly optimized cycle exact emulation, allowing it to run
+titles that rely on precise timing, many of which break under inferior
+emulators.
Index: pkg/DESCR-libretro
===================================================================
RCS file: pkg/DESCR-libretro
diff -N pkg/DESCR-libretro
--- pkg/DESCR-libretro 5 Aug 2016 05:26:42 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-libretro-nestopia provides a Nintendo Entertainment System emulation core to
-the RetroArch emulator frontend, based on Nestopia.
Index: pkg/DESCR-main
===================================================================
RCS file: pkg/DESCR-main
diff -N pkg/DESCR-main
--- pkg/DESCR-main 5 Aug 2016 05:26:42 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-Nestopia is an accuracy-focused emulator for the Nintendo Entertainment
-System/Famicom (and Famicom Disk System). It is a computer program that
-acts like a physical piece of hardware. In other words, this is a method
-of preserving videogame history, with the welcome side effect of
-allowing you to play NES games on a modern computer.
-
-Nestopia uses highly optimized cycle exact emulation, allowing it to run
-titles that rely on precise timing, many of which break under inferior
-emulators.
Index: pkg/PLIST
===================================================================
RCS file: pkg/PLIST
diff -N pkg/PLIST
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PLIST 27 May 2022 02:17:06 -0000
@@ -0,0 +1,32 @@
+@pkgpath emulators/nestopia
+@bin bin/nestopia
+share/applications/nestopia.desktop
+share/doc/nestopia/
+share/doc/nestopia/ChangeLog
+share/doc/nestopia/README.md
+share/doc/nestopia/readme.html
+share/icons/
+share/icons/hicolor/
+share/icons/hicolor/128x128/
+share/icons/hicolor/128x128/apps/
+share/icons/hicolor/128x128/apps/nestopia.png
+share/icons/hicolor/32x32/
+share/icons/hicolor/32x32/apps/
+share/icons/hicolor/32x32/apps/nestopia.png
+share/icons/hicolor/48x48/
+share/icons/hicolor/48x48/apps/
+share/icons/hicolor/48x48/apps/nestopia.png
+share/icons/hicolor/64x64/
+share/icons/hicolor/64x64/apps/
+share/icons/hicolor/64x64/apps/nestopia.png
+share/icons/hicolor/96x96/
+share/icons/hicolor/96x96/apps/
+share/icons/hicolor/96x96/apps/nestopia.png
+share/icons/hicolor/scalable/
+share/icons/hicolor/scalable/apps/
+share/icons/hicolor/scalable/apps/nespad.svg
+share/icons/hicolor/scalable/apps/nestopia.svg
+share/nestopia/
+share/nestopia/NstDatabase.xml
+@tag update-desktop-database
+@tag gtk-update-icon-cache %D/share/icons/hicolor
Index: pkg/PLIST-libretro
===================================================================
RCS file: pkg/PLIST-libretro
diff -N pkg/PLIST-libretro
--- pkg/PLIST-libretro 11 Mar 2022 18:59:40 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-lib/libretro/
-lib/libretro/nestopia_libretro.so
Index: pkg/PLIST-main
===================================================================
RCS file: pkg/PLIST-main
diff -N pkg/PLIST-main
--- pkg/PLIST-main 11 Mar 2022 18:59:40 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-@pkgpath emulators/nestopia
-@bin bin/nestopia
-share/applications/nestopia.desktop
-share/doc/nestopia/
-share/doc/nestopia/AUTHORS
-share/doc/nestopia/ChangeLog
-share/doc/nestopia/README.md
-share/doc/nestopia/readme.html
-share/icons/hicolor/128x128/apps/nestopia.png
-share/icons/hicolor/32x32/apps/nestopia.png
-share/icons/hicolor/48x48/apps/nestopia.png
-share/icons/hicolor/64x64/apps/nestopia.png
-share/icons/hicolor/96x96/apps/nestopia.png
-share/icons/hicolor/scalable/apps/nespad.svg
-share/icons/hicolor/scalable/apps/nestopia.svg
-share/nestopia/
-share/nestopia/NstDatabase.xml
-@tag update-desktop-database
-@tag gtk-update-icon-cache %D/share/icons/hicolor
