Attachment 160650 Details for Bug 202848 – emulators_advancemess.diff

[patch] emulators_advancemess.diff

emulators_advancemess.diff (text/plain), 8.90 KB, created by tkato432 on 2015-09-02 18:34:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2015-09-02 18:34:08 UTC

Size: 8.90 KB

patch

obsolete

>diff -urN /usr/ports/emulators/advancemess/Makefile emulators/advancemess/Makefile
>--- /usr/ports/emulators/advancemess/Makefile	2015-08-24 03:50:11.353748000 +0900
>+++ emulators/advancemess/Makefile	2015-09-03 00:00:00.000000000 +0900
>@@ -2,47 +2,65 @@
> # $FreeBSD: head/emulators/advancemess/Makefile 380666 2015-03-07 03:19:44Z amdmi3 $
> 
> PORTNAME=	advancemess
>-PORTVERSION=	0.102.0.1
>-PORTREVISION=	7
>+PORTVERSION=	1.4
> CATEGORIES=	emulators
>-MASTER_SITES=	SF/advancemame/${PORTNAME}/${PORTVERSION}
>+MASTER_SITES=	https://github.com/amadvance/advancemame/releases/download/${DISTNAME}/
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	SDL MESS port with advanced TV and monitor video support
> 
>-LICENSE=	GPLv2 # or later
>-LICENSE_FILE=	${WRKSRC}/COPYING
>+LICENSE=	GPLv2 # (or later)
>+#LICENSE_FILE=	${WRKSRC}/COPYING
> 
> LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
>+RUN_DEPENDS=	advancemame>=1.4:${PORTSDIR}/emulators/advancemame
> 
>-USE_GL=		yes
>-USES=		gmake
>+USES=		gmake ncurses
> USE_SDL=	sdl
> GNU_CONFIGURE=	yes
>-LDFLAGS+=	-L${LOCALBASE}/lib
>-CFLAGS+=	-idirafter ${LOCALBASE}/include
>+CONFIGURE_ARGS=	--disable-svgalib --disable-fb --disable-alsa --enable-oss \
>+		--disable-kevent
> 
>-OPTIONS_DEFINE=	FREETYPE SLANG
>-SLANG_DESC=	Enable sLang support (for video driver)
>+CFLAGS+=	-idirafter ${LOCALBASE}/include
>+LDFLAGS+=	-L${LOCALBASE}/lib
> 
>+PORTDOCS=	*
>+PLIST_FILES=	bin/advmess \
>+		man/man1/advmess.1.gz \
>+		share/advance/sysinfo.dat
>+
>+OPTIONS_DEFINE=		FREETYPE SLANG
>+OPTIONS_DEFINE_i386=	ASM
>+OPTIONS_DEFAULT=	FREETYPE
>+OPTIONS_DEFAULT_i386=	ASM
>+
>+ASM_BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
>+ASM_USE=		gcc=any
>+ASM_CONFIGURE_ENABLE=	asm
>+FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
> FREETYPE_CONFIGURE_ENABLE=	freetype
>-FREETYPE_LIB_DEPENDS=		libfreetype.so:${PORTSDIR}/print/freetype2
>-
>-SLANG_CONFIGURE_ENABLE=	slang
> SLANG_LIB_DEPENDS=	libslang.so:${PORTSDIR}/devel/libslang2
>+SLANG_CONFIGURE_ENABLE=	slang
>+SLANG_LDFLAGS=		-lncurses
> 
>-.include <bsd.port.pre.mk>
>-
>-.if ${ARCH} == "i386"
>-BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
>-.endif
>+BROKEN_powerpc=		Does not compile on powerpc
> 
> post-patch:
>-	@${REINPLACE_CMD} -E -e '/pkgdocdir/d' \
>-		-e 's,(bin|man|pkg)dir),DESTDIR)$$(&,' \
>-		${WRKSRC}/advance/advance.mak
>-
>-post-install:
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/advmess
>+	@${REINPLACE_CMD} -e \
>+		's|@@|@|' ${WRKSRC}/Makefile.in
>+	@${REINPLACE_CMD} -e \
>+		'/WHOLE_CFLAGS_OPT/s|-O2|| ; \
>+		 /WHOLE_LDFLAGS/s|-s||' ${WRKSRC}/advance/advance.mak
>+	@${REINPLACE_CMD} -e \
>+		's|-lpthread|-pthread|' ${WRKSRC}/advance/emu.mak
>+
>+do-install:
>+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} advmess \
>+		${STAGEDIR}${PREFIX}/bin)
>+	(cd ${WRKSRC}/support && ${INSTALL_MAN} advmess.1 \
>+		${STAGEDIR}${MANPREFIX}/man/man1)
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/advance
>+	(cd ${WRKSRC}/support && ${INSTALL_DATA} sysinfo.dat \
>+		${STAGEDIR}${PREFIX}/share/advance)
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff -urN /usr/ports/emulators/advancemess/distinfo emulators/advancemess/distinfo
>--- /usr/ports/emulators/advancemess/distinfo	2015-08-24 03:50:11.354150000 +0900
>+++ emulators/advancemess/distinfo	2015-09-03 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (advancemess-0.102.0.1.tar.gz) = 78966d25399a3f70801fb5ac3e93c6fcb14c94991f37d587e9b57bb8a403f7f9
>-SIZE (advancemess-0.102.0.1.tar.gz) = 6903540
>+SHA256 (advancemess-1.4.tar.gz) = 0d78a56075adeb8ffc1716205e195ee4e005d8799067858d398a4e7750151d00
>+SIZE (advancemess-1.4.tar.gz) = 9288257
>diff -urN /usr/ports/emulators/advancemess/files/patch-advance__advance.mak emulators/advancemess/files/patch-advance__advance.mak
>--- /usr/ports/emulators/advancemess/files/patch-advance__advance.mak	2015-08-24 03:50:11.355085000 +0900
>+++ emulators/advancemess/files/patch-advance__advance.mak	1970-01-01 09:00:00.000000000 +0900
>@@ -1,63 +0,0 @@
>---- ./advance/advance.mak.orig	Sun Dec 11 10:10:33 2005
>-+++ ./advance/advance.mak	Sat Jan 20 17:02:36 2007
>-@@ -24,8 +24,6 @@
>- ifneq ($(wildcard $(EMUSRC)),)
>- INSTALL_DIRS += $(OBJ)
>- INSTALL_BINFILES += $(OBJ)/$(EMUNAME)$(EXE)
>--INSTALL_MANFILES += $(DOCOBJ)/advmame.1
>--INSTALL_MANFILES += $(DOCOBJ)/advdev.1
>- ifeq ($(CONF_EMU),mame)
>- INSTALL_DATAFILES += $(srcdir)/support/event.dat
>- INSTALL_DATAFILES += $(srcdir)/support/history.dat
>-@@ -42,40 +40,6 @@
>- INSTALL_BINFILES += $(MENUOBJ)/advmenu$(EXE)
>- INSTALL_MANFILES += $(DOCOBJ)/advmenu.1
>- endif
>--ifeq ($(CONF_LIB_DIRECT),yes)
>--ifneq ($(wildcard $(srcdir)/advance/cfg.mak),)
>--INSTALL_DIRS += $(CFGOBJ)
>--INSTALL_BINFILES += $(CFGOBJ)/advcfg$(EXE)
>--INSTALL_MANFILES += $(DOCOBJ)/advcfg.1
>--endif
>--ifneq ($(wildcard $(srcdir)/advance/v.mak),)
>--INSTALL_DIRS += $(VOBJ)
>--INSTALL_BINFILES += $(VOBJ)/advv$(EXE)
>--INSTALL_MANFILES += $(DOCOBJ)/advv.1
>--endif
>--endif
>--ifneq ($(CONF_SYSTEM),windows)
>--ifneq ($(wildcard $(srcdir)/advance/s.mak),)
>--INSTALL_DIRS += $(SOBJ)
>--INSTALL_BINFILES += $(SOBJ)/advs$(EXE)
>--INSTALL_MANFILES += $(DOCOBJ)/advs.1
>--endif
>--ifneq ($(wildcard $(srcdir)/advance/k.mak),)
>--INSTALL_DIRS += $(KOBJ)
>--INSTALL_BINFILES += $(KOBJ)/advk$(EXE)
>--INSTALL_MANFILES += $(DOCOBJ)/advk.1
>--endif
>--ifneq ($(wildcard $(srcdir)/advance/j.mak),)
>--INSTALL_DIRS += $(JOBJ)
>--INSTALL_BINFILES += $(JOBJ)/advj$(EXE)
>--INSTALL_MANFILES += $(DOCOBJ)/advj.1
>--endif
>--ifneq ($(wildcard $(srcdir)/advance/m.mak),)
>--INSTALL_DIRS += $(MOBJ)
>--INSTALL_BINFILES += $(MOBJ)/advm$(EXE)
>--INSTALL_MANFILES += $(DOCOBJ)/advm.1
>--endif
>--endif
>- 
>- INSTALL_DOCFILES += $(subst $(srcdir)/doc/,$(DOCOBJ)/,$(subst .d,.txt,$(wildcard $(srcdir)/doc/*.d)))
>- INSTALL_DOCFILES += $(subst $(srcdir)/doc/,$(DOCOBJ)/,$(subst .d,.html,$(wildcard $(srcdir)/doc/*.d)))
>-@@ -288,8 +252,8 @@
>- ############################################################################
>- # Common install
>- 
>--pkgdir = $(datadir)/advance
>--pkgdocdir = $(docdir)/advance
>-+pkgdir = $(datadir)/advancemess
>-+pkgdocdir = $(docdir)/advancemess
>- 
>- install-dirs:
>- 	-$(INSTALL_PROGRAM_DIR) $(bindir)
>diff -urN /usr/ports/emulators/advancemess/pkg-descr emulators/advancemess/pkg-descr
>--- /usr/ports/emulators/advancemess/pkg-descr	2015-08-24 03:50:11.354548000 +0900
>+++ emulators/advancemess/pkg-descr	2015-09-03 00:00:00.000000000 +0900
>@@ -1,22 +1,22 @@
>-AdvanceMAME and AdvanceMESS are unofficial MAME and MESS versions with an
>-advanced video support for helping the use with TVs, Arcade Monitors, Fixed
>-Frequencies Monitors and also for PC Monitors.
>-
>-They run in GNU/Linux, Mac OS X, DOS, Windows and in all the other platforms
>-supported by the SDL library.
>-
>-The main difference compared with the official emulators is that the Advance
>-versions are able to program directly the video board to always get a video
>-mode with the correct size and frequency.
>-
>-Generally the Advance emulators are able to use a video mode which doesn't
>-require any stretching or other unneeded effects to match the original arcade
>-display.
>-
>-The direct video board programming is fully supported in Linux and DOS. It's
>-partially supported in Windows. It isn't supported in Mac OS X and other
>-platforms.
>+AdvanceMAME and AdvanceMESS are unofficial MAME and MESS versions with
>+an advanced video support for helping the use with TVs, Arcade Monitors,
>+Fixed Frequencies Monitors and also for PC Monitors.
>+
>+They run in GNU/Linux, Mac OS X, DOS, Windows and in all the other
>+platforms supported by the SDL library.
>+
>+The main difference compared with the official emulators is that the
>+Advance versions are able to program directly the video board to always
>+get a video mode with the correct size and frequency.
>+
>+Generally the Advance emulators are able to use a video mode which
>+doesn't require any stretching or other unneeded effects to match the
>+original arcade display.
>+
>+The direct video board programming is fully supported in Linux and DOS.
>+It's partially supported in Windows. It isn't supported in Mac OS X and
>+other platforms.
> 
> See website for other improvements.
> 
>-WWW: http://advancemame.sourceforge.net/
>+WWW: http://www.advancemame.it/
>diff -urN /usr/ports/emulators/advancemess/pkg-message emulators/advancemess/pkg-message
>--- /usr/ports/emulators/advancemess/pkg-message	2015-08-24 03:50:11.355486000 +0900
>+++ emulators/advancemess/pkg-message	1970-01-01 09:00:00.000000000 +0900
>@@ -1,8 +0,0 @@
>-==============================================================================
>-
>-AdvanceMESS has been installed.
>-
>-The tools included with the distribution, their manpages and documentation are
>-installed by the "games/advancemame" port to avoid conflicts.
>-
>-==============================================================================
>diff -urN /usr/ports/emulators/advancemess/pkg-plist emulators/advancemess/pkg-plist
>--- /usr/ports/emulators/advancemess/pkg-plist	2015-08-24 03:50:11.353254000 +0900
>+++ emulators/advancemess/pkg-plist	1970-01-01 09:00:00.000000000 +0900
>@@ -1,8 +0,0 @@
>-bin/advmess
>-man/man1/advmess.1.gz
>-%%DATADIR%%/sysinfo.dat
>-@dir %%DATADIR%%/artwork
>-@dir %%DATADIR%%/crc
>-@dir %%DATADIR%%/image
>-@dir %%DATADIR%%/rom
>-@dir %%DATADIR%%/sample

Actions: View | Diff

Attachments on bug 202848: 160650 | 165551