svn commit: r547526 - in head/emulators/jzintv: . files
Ganael LAPLANCHE
martymac at FreeBSD.org
Fri Sep 4 10:44:04 UTC 2020
Author: martymac
Date: Fri Sep 4 10:44:02 2020
New Revision: 547526
URL: https://svnweb.freebsd.org/changeset/ports/547526
Log:
Fix build with llvm11 (duplicate symbol errors)
While here, rework a few things:
- add missing dependencies
- re-generate patches using 'makepatch' target
Added:
head/emulators/jzintv/files/patch-src-asm-frasmdat.h (contents, props changed)
head/emulators/jzintv/files/patch-src-gif-gif_enc.c (contents, props changed)
head/emulators/jzintv/files/patch-src-gif-gif_enc.h (contents, props changed)
head/emulators/jzintv/files/patch-src_Makefile.freebsd (contents, props changed)
Deleted:
head/emulators/jzintv/files/patch-Makefile.freebsd
Modified:
head/emulators/jzintv/Makefile
head/emulators/jzintv/files/patch-src-imasm-parser.cpp
Modified: head/emulators/jzintv/Makefile
==============================================================================
--- head/emulators/jzintv/Makefile Fri Sep 4 10:42:57 2020 (r547525)
+++ head/emulators/jzintv/Makefile Fri Sep 4 10:44:02 2020 (r547526)
@@ -14,10 +14,11 @@ COMMENT= Portable Intellivision(TM) Emulator
LICENSE= GPLv2
-USES= alias gmake sdl xorg zip
+USES= alias dos2unix gmake sdl xorg zip
USE_XORG= x11 xau xdmcp
USE_SDL= sdl
+DOS2UNIX_GLOB= *.[ch]
CPPFLAGS+= -I${LOCALBASE}/include `${SDL_CONFIG} --cflags`
LDFLAGS+= -L${LOCALBASE}/lib `${SDL_CONFIG} --libs` -lm
WRKSRC= ${WRKDIR}/jzintv-1.0-beta4
Added: head/emulators/jzintv/files/patch-src-asm-frasmdat.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/jzintv/files/patch-src-asm-frasmdat.h Fri Sep 4 10:44:02 2020 (r547526)
@@ -0,0 +1,11 @@
+--- src/asm/frasmdat.h.orig 2010-12-24 04:00:49 UTC
++++ src/asm/frasmdat.h
+@@ -146,7 +146,7 @@ extern int listflag;
+ extern int hexvalid, hexflag;
+ Global FILE *romoutf, *binoutf, *cfgoutf, *loutf;
+ Global char *loutfn;
+-Global int listlineno;
++extern int listlineno;
+ extern int errorcnt, warncnt;
+
+
Added: head/emulators/jzintv/files/patch-src-gif-gif_enc.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/jzintv/files/patch-src-gif-gif_enc.c Fri Sep 4 10:44:02 2020 (r547526)
@@ -0,0 +1,11 @@
+--- src/gif/gif_enc.c.orig 2009-10-03 20:33:17 UTC
++++ src/gif/gif_enc.c
+@@ -30,7 +30,7 @@ LOCAL int gif_img_sz = 0;
+ LOCAL int gen_mpi(uint_8 *src, uint_8 *xtra, uint_8 *dst,
+ int cnt, uint_8 *pal);
+
+-int gif_best_stats[6];
++int gif_best_stat[6];
+
+ /* ======================================================================== */
+ /* GIF_START -- Starts a single or multi-frame GIF. */
Added: head/emulators/jzintv/files/patch-src-gif-gif_enc.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/jzintv/files/patch-src-gif-gif_enc.h Fri Sep 4 10:44:02 2020 (r547526)
@@ -0,0 +1,11 @@
+--- src/gif/gif_enc.h.orig 2006-07-03 05:04:46 UTC
++++ src/gif/gif_enc.h
+@@ -21,7 +21,7 @@ typedef struct gif_t
+ uint_8 *vid, *pal;
+ } gif_t;
+
+-int gif_best_stat[6];
++extern int gif_best_stat[6];
+
+ /* ======================================================================== */
+ /* GIF_START -- Starts a single or multi-frame GIF. */
Modified: head/emulators/jzintv/files/patch-src-imasm-parser.cpp
==============================================================================
--- head/emulators/jzintv/files/patch-src-imasm-parser.cpp Fri Sep 4 10:42:57 2020 (r547525)
+++ head/emulators/jzintv/files/patch-src-imasm-parser.cpp Fri Sep 4 10:44:02 2020 (r547526)
@@ -1,6 +1,6 @@
---- src/imasm/parser.cpp.orig 2010-11-01 07:19:01.000000000 +0100
-+++ src/imasm/parser.cpp 2013-10-29 06:17:34.000000000 +0100
-@@ -65,7 +65,7 @@
+--- src/imasm/parser.cpp.orig 2010-11-01 06:19:01 UTC
++++ src/imasm/parser.cpp
+@@ -65,7 +65,7 @@ int stricmp_(const char *str1, const char *str2)
Parser::~Parser()
{
@@ -9,7 +9,7 @@
for (itr = m_macroMap.begin(); itr != m_macroMap.end(); itr++)
{
-@@ -583,7 +583,7 @@
+@@ -583,7 +583,7 @@ int Parser::FindMacros(string &sLine, string &sOut)
macro *Parser::GetMacroPtr(const char *macName)
{
Added: head/emulators/jzintv/files/patch-src_Makefile.freebsd
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/jzintv/files/patch-src_Makefile.freebsd Fri Sep 4 10:44:02 2020 (r547526)
@@ -0,0 +1,43 @@
+--- src/Makefile.freebsd.orig 2007-11-06 08:31:28 UTC
++++ src/Makefile.freebsd
+@@ -18,8 +18,8 @@ R=../rom
+ ##############################################################################
+ P = export PATH;
+
+-SDL_CFLAGS := $(shell sdl-config --cflags)
+-SDL_LFLAGS := $(shell sdl-config --libs)
++#SDL_CFLAGS := $(shell sdl-config --cflags)
++#SDL_LFLAGS := $(shell sdl-config --libs)
+
+ # Set "X" to be the executable extension
+ X =
+@@ -45,14 +45,14 @@ RM = rm -f
+ #OPT_FLAGS = -ggdb
+ #OPT_FLAGS = -O
+ #OPT_FLAGS = -O2 -ggdb
+- OPT_FLAGS = -O3 -fomit-frame-pointer -fprefetch-loop-arrays #-DBENCHMARK_STIC
++#OPT_FLAGS = -O3 -fomit-frame-pointer -fprefetch-loop-arrays #-DBENCHMARK_STIC
+ #OPT_FLAGS = -O2 -pg -ggdb -DLOCAL=
+ #OPT_FLAGS = -tpp6 -axMiKW -ip -vec_report3 -opt_report -ansi_alias -restrict -DHAVE_RESTRICT -align -O3 -Ob1 # -ipo # intel icc flags
+
+-CFLAGS ?= $(OPT_FLAGS) $(WARN) -I. -I.. $(DEF_FLAGS) $(EXTRA)
+-CXXFLAGS ?= $(OPT_FLAGS) $(WARNXX) -I. -I.. $(DEF_FLAGS) $(EXTRA)
++CFLAGS += $(CPPFLAGS) $(OPT_FLAGS) $(WARN) -I. -I.. $(DEF_FLAGS) $(EXTRA)
++CXXFLAGS += $(OPT_FLAGS) $(WARNXX) -I. -I.. $(DEF_FLAGS) $(EXTRA)
+ #LFLAGS = /usr/local/lib/libgcc_s.so -L../lib
+-LFLAGS = -L../lib
++LFLAGS += $(LDFLAGS) -L../lib
+
+
+ OBJS=jzintv.o
+@@ -61,8 +61,8 @@ TOCLEAN=$(B)/jzintv core
+
+ PROGS=$(PROG)
+
+-CFLAGS += $(SDL_CFLAGS)
+-LFLAGS += $(SDL_LFLAGS)
++#CFLAGS += $(SDL_CFLAGS)
++#LFLAGS += $(SDL_LFLAGS)
+
+ ##############################################################################
+ ## Generic build-rules
More information about the svn-ports-head
mailing list