Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 7 Jan 2017 13:39:14 +0000 (UTC)
From:      "Jason E. Hale" <jhale@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r430784 - in head/emulators/snes9x-gtk: . files
Message-ID:  <201701071339.v07DdE9s003009@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jhale
Date: Sat Jan  7 13:39:14 2017
New Revision: 430784
URL: https://svnweb.freebsd.org/changeset/ports/430784

Log:
  Update to 1.54.1
  Unbreak fetch (project moved to Github)
  Clean up and fix some broken dependencies
  Regenerate patches with 'make makepatch'
  Use standard options descriptions when possible
  
  PR:		213692 (based on)
  Submitted by:	<timon@timon.net.nz>
  Approved by:	maintainer timeout
  MFH:		2017Q1 (blanket)

Deleted:
  head/emulators/snes9x-gtk/files/patch-gtk-configure
  head/emulators/snes9x-gtk/files/patch-gtk-src-gtk__s9x.cpp
Modified:
  head/emulators/snes9x-gtk/Makefile
  head/emulators/snes9x-gtk/distinfo
  head/emulators/snes9x-gtk/files/patch-screenshot.cpp
  head/emulators/snes9x-gtk/pkg-descr

Modified: head/emulators/snes9x-gtk/Makefile
==============================================================================
--- head/emulators/snes9x-gtk/Makefile	Sat Jan  7 12:29:02 2017	(r430783)
+++ head/emulators/snes9x-gtk/Makefile	Sat Jan  7 13:39:14 2017	(r430784)
@@ -2,61 +2,67 @@
 # $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
-
-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
+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_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 \
@@ -70,6 +76,10 @@ CONFIGURE_ARGS+=	--with-joystick
 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}

Modified: head/emulators/snes9x-gtk/distinfo
==============================================================================
--- head/emulators/snes9x-gtk/distinfo	Sat Jan  7 12:29:02 2017	(r430783)
+++ head/emulators/snes9x-gtk/distinfo	Sat Jan  7 13:39:14 2017	(r430784)
@@ -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

Modified: head/emulators/snes9x-gtk/files/patch-screenshot.cpp
==============================================================================
--- head/emulators/snes9x-gtk/files/patch-screenshot.cpp	Sat Jan  7 12:29:02 2017	(r430783)
+++ head/emulators/snes9x-gtk/files/patch-screenshot.cpp	Sat Jan  7 13:39:14 2017	(r430784)
@@ -1,6 +1,6 @@
---- ../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"

Modified: head/emulators/snes9x-gtk/pkg-descr
==============================================================================
--- head/emulators/snes9x-gtk/pkg-descr	Sat Jan  7 12:29:02 2017	(r430783)
+++ head/emulators/snes9x-gtk/pkg-descr	Sat Jan  7 13:39:14 2017	(r430784)
@@ -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/



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701071339.v07DdE9s003009>