Index: branches/2017Q1/emulators/snes9x-gtk/Makefile =================================================================== --- branches/2017Q1/emulators/snes9x-gtk/Makefile (revision 430784) +++ branches/2017Q1/emulators/snes9x-gtk/Makefile (revision 430785) @@ -1,81 +1,91 @@ # Created by: okeeblow # $FreeBSD$ PORTNAME= snes9x -PORTVERSION= 1.53r81 -PORTREVISION= 5 +PORTVERSION= 1.54.1 CATEGORIES= emulators -MASTER_SITES= http://snes9x-gtk.googlecode.com/files/ PKGNAMESUFFIX= -gtk -DISTNAME= snes9x-1.53-src MAINTAINER= root@cooltrainer.org -COMMENT= Super Nintendo Entertainment System(SNES) Emulator +COMMENT= Super Nintendo Entertainment System (SNES) Emulator LICENSE= Snes9x LICENSE_NAME= Snes9x License -LICENSE_FILE= ${WRKDIR}/${DISTNAME}/docs/snes9x-license.txt +LICENSE_FILE= ${WRKSRC}/../docs/snes9x-license.txt LICENSE_PERMS= dist-mirror pkg-mirror auto-accept -BROKEN= Unfetchable (google code has gone away) - LIB_DEPENDS= libpng.so:graphics/png -USE_XORG= x11 sm ice xext -USES= gettext gmake perl5 desktop-file-utils pkgconfig tar:bzip2 desktop-file-utils -USE_GNOME= gtk20 intltool libglade2 libxml2 -GNU_CONFIGURE= yes +USE_GITHUB= yes +GH_ACCOUNT= snes9xgit + +USES= autoreconf desktop-file-utils gettext gmake \ + localbase perl5 pkgconfig tar:bzip2 +USE_GNOME= cairo gdkpixbuf2 gtk20 intltool libxml2 USE_SDL= sdl2 -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +USE_XORG= x11 xext +GNU_CONFIGURE= yes +LDFLAGS+= -Wl,--as-needed -WRKSRC= ${WRKDIR}/${DISTNAME}/gtk +PATCH_WRKSRC= ${WRKSRC}/.. +WRKSRC_SUBDIR= gtk NO_CDROM= Commercial users must seek permission from copyright holders. -OPTIONS_DEFINE= DEBUG OPENGL JMA NETPLAY XV XRANDR ALSA PORTAUDIO PULSEAUDIO -OPTIONS_DEFAULT= JMA NETPLAY XV XRANDR -JMA_DESC= Enable JMA archive decompression support -NETPLAY_DESC= Enable network support -XV_DESC= Enable XVideo output on GTK -XRANDR_DESC= Enable XRandR support on GTK -PORTAUDIO_DESC= Enable PortAudio support -GTK2_DESC= Use GTK 2.x interface toolkit +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 -OPENGL_CONFIGURE_WITH= opengl -OPENGL_USE= GL=glu -JMA_CONFIGURE_WITH= jma-decomp -NETPLAY_CONFIGURE_WITH= netplay -XV_CONFIGURE_WITH= xv -XV_USE= XORG=xv -XRANDR_CONFIGURE_WITH= xrandr -XRANDR_USE= XORG=xrandr -ALSA_CONFIGURE_WITH= alsa -ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib -ALSA_USES= compiler:c++11-lang +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_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 + PORTAUDIO_CONFIGURE_WITH= portaudio -PORTAUDIO_LIB_DEPENDS= libportaudio.so.2:audio/portaudio2 +PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio + PULSEAUDIO_CONFIGURE_WITH= pulseaudio -PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio +PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PLIST_FILES= bin/snes9x-gtk \ share/pixmaps/snes9x.svg \ share/applications/snes9x.desktop .include .if exists(/usr/lib/libusbhid.a) CONFIGURE_ARGS+= --with-joystick .else CONFIGURE_ARGS+= --without-joystick .endif + +post-patch: + @${REINPLACE_CMD} -e 's|sdl|sdl2|g' -e 's|-ldl||g' \ + ${WRKSRC}/configure.ac 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 .include Index: branches/2017Q1/emulators/snes9x-gtk/distinfo =================================================================== --- branches/2017Q1/emulators/snes9x-gtk/distinfo (revision 430784) +++ branches/2017Q1/emulators/snes9x-gtk/distinfo (revision 430785) @@ -1,2 +1,3 @@ -SHA256 (snes9x-1.53-src.tar.bz2) = 9f7c5d2d0fa3fe753611cf94e8879b73b8bb3c0eab97cdbcb6ab7376efa78dc3 -SIZE (snes9x-1.53-src.tar.bz2) = 1838746 +TIMESTAMP = 1479034785 +SHA256 (snes9xgit-snes9x-1.54.1_GH0.tar.gz) = 85862a22498bc418c37bd7c81a3089d9cc00af279b91e5f7fa8bea05e2e3027b +SIZE (snes9xgit-snes9x-1.54.1_GH0.tar.gz) = 2186737 Index: branches/2017Q1/emulators/snes9x-gtk/files/patch-gtk-src-gtk__s9x.cpp =================================================================== --- branches/2017Q1/emulators/snes9x-gtk/files/patch-gtk-src-gtk__s9x.cpp (revision 430784) +++ branches/2017Q1/emulators/snes9x-gtk/files/patch-gtk-src-gtk__s9x.cpp (nonexistent) @@ -1,19 +0,0 @@ ---- src/gtk_s9x.cpp.orig 2013-10-25 03:47:08.000000000 -0700 -+++ src/gtk_s9x.cpp 2013-10-25 03:47:32.000000000 -0700 -@@ -44,6 +44,7 @@ - - g_thread_init (NULL); - gdk_threads_init (); -+ gdk_threads_enter(); - - gtk_init (&argc, &argv); - -@@ -127,6 +128,8 @@ - - gtk_main (); - -+ gdk_threads_leave(); -+ - return 0; - } - Property changes on: branches/2017Q1/emulators/snes9x-gtk/files/patch-gtk-src-gtk__s9x.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2017Q1/emulators/snes9x-gtk/files/patch-gtk-configure =================================================================== --- branches/2017Q1/emulators/snes9x-gtk/files/patch-gtk-configure (revision 430784) +++ branches/2017Q1/emulators/snes9x-gtk/files/patch-gtk-configure (nonexistent) @@ -1,11 +0,0 @@ ---- configure.orig 2013-10-25 02:52:16.000000000 -0700 -+++ configure 2013-10-25 02:52:43.000000000 -0700 -@@ -6316,7 +6316,7 @@ - CFLAGS="$CFLAGS -fomit-frame-pointer" - fi - --LIBS="$LIBS -lX11 -ldl -lXext" -+LIBS="$LIBS -lX11 -lXext" - - ZSNESFX='#ZSNESFX=yes' - ZSNESC4='#ZSNESC4=yes' Property changes on: branches/2017Q1/emulators/snes9x-gtk/files/patch-gtk-configure ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2017Q1/emulators/snes9x-gtk/files/patch-screenshot.cpp =================================================================== --- branches/2017Q1/emulators/snes9x-gtk/files/patch-screenshot.cpp (revision 430784) +++ branches/2017Q1/emulators/snes9x-gtk/files/patch-screenshot.cpp (revision 430785) @@ -1,10 +1,10 @@ ---- ../screenshot.cpp.orig 2010-02-23 00:19:36.132640984 -0500 -+++ ../screenshot.cpp 2010-02-23 00:19:59.151074837 -0500 -@@ -182,6 +182,7 @@ +--- 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) Index: branches/2017Q1/emulators/snes9x-gtk/pkg-descr =================================================================== --- branches/2017Q1/emulators/snes9x-gtk/pkg-descr (revision 430784) +++ branches/2017Q1/emulators/snes9x-gtk/pkg-descr (revision 430785) @@ -1,3 +1,3 @@ -Super Nintendo Entertainment System(SNES) Emulator with GTK GUI +Super Nintendo Entertainment System (SNES) Emulator with GTK+2 GUI -WWW: http://code.google.com/p/snes9x-gtk/ +WWW: https://github.com/snes9xgit/snes9x/ Index: branches/2017Q1 =================================================================== --- branches/2017Q1 (revision 430784) +++ branches/2017Q1 (revision 430785) Property changes on: branches/2017Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r430784