svn commit: r414186 - in head/games/q2pro: . files
Alexey Dokuchaev
danfe at FreeBSD.org
Thu Apr 28 18:02:20 UTC 2016
Author: danfe
Date: Thu Apr 28 18:02:18 2016
New Revision: 414186
URL: https://svnweb.freebsd.org/changeset/ports/414186
Log:
- Fix run-time crash after png_set_gray_1_2_4_to_8() was renamed to
png_set_expand_gray_1_2_4_to_8() in the PNG library
- Make sure that software renderer works in !i386 build mode
- Remove bogus compile options from the CFLAGS; default CFLAGS are
already being respected
- Simplify OPTIONS: do not force users to select at least one of the
client or server, it is not very useful and just complicate things
- Report correct SVN revision number in the version string
- Spell ``renderer'' correctly in the option descriptions
Modified:
head/games/q2pro/Makefile
head/games/q2pro/files/patch-build__pre.mk
head/games/q2pro/files/patch-build__ref_soft.mk
Modified: head/games/q2pro/Makefile
==============================================================================
--- head/games/q2pro/Makefile Thu Apr 28 16:59:27 2016 (r414185)
+++ head/games/q2pro/Makefile Thu Apr 28 18:02:18 2016 (r414186)
@@ -3,7 +3,7 @@
PORTNAME= q2pro
PORTVERSION= ${SVN_REV}
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= games
MASTER_SITES= LOCAL/alepulver
@@ -23,18 +23,16 @@ MAKE_ENV= LIBDIR="${LIBDIR}"
PLIST_SUB= LIBDIR="${LIBDIR:S|${PREFIX}/||}"
LIBDIR= ${PREFIX}/lib/${PORTNAME}
-OPTIONS_DEFINE= GAME GL SOFT UI
+OPTIONS_DEFINE= CLIENT DEDICATED GAME GL SOFT UI
OPTIONS_DEFINE_i386= ASM
-OPTIONS_MULTI= FLAVOR
-OPTIONS_MULTI_FLAVOR= CLIENT DEDICATED
OPTIONS_DEFAULT= CLIENT DEDICATED GL SOFT UI
-OPTIONS_DEFAULT_I386= ASM
+OPTIONS_DEFAULT_i386= ASM
CLIENT_DESC= Build client
DEDICATED_DESC= Build dedicated server
GAME_DESC= Build main game (default mod)
-GL_DESC= Build OpenGL render
-SOFT_DESC= Build software render
+GL_DESC= Build OpenGL renderer
+SOFT_DESC= Build software renderer
UI_DESC= Build user interface (for client menus)
.include <bsd.port.options.mk>
@@ -90,9 +88,11 @@ MAKE_ENV+= USE_X86_ASM=yes
.endif
post-patch:
-# Resolve name collision with jpeg-8
@${REINPLACE_CMD} -e 's|jpeg_mem_src|local_jpeg_mem_src|' \
- ${WRKSRC}/ref_shared/r_images.c
+ -e '/png_set_gray_1_2_4_to_8/s|png_set|&_expand|' \
+ ${WRKSRC}/ref_shared/r_images.c
+ @${REINPLACE_CMD} -E 's|[[:digit:]]+|${SVN_REV}|' \
+ ${WRKSRC}/include/version.h
do-install:
@${MKDIR} ${STAGEDIR}${LIBDIR}/baseq2
Modified: head/games/q2pro/files/patch-build__pre.mk
==============================================================================
--- head/games/q2pro/files/patch-build__pre.mk Thu Apr 28 16:59:27 2016 (r414185)
+++ head/games/q2pro/files/patch-build__pre.mk Thu Apr 28 18:02:18 2016 (r414186)
@@ -1,6 +1,15 @@
--- build/pre.mk.orig Sun Feb 4 16:13:21 2007
+++ build/pre.mk Sun Feb 4 16:27:54 2007
-@@ -48,10 +48,10 @@
+@@ -25,7 +25,7 @@ CFLAGS+=-g
+ LDFLAGS+=-g
+ else
+ #CFLAGS += -march=i686 -msse2 -mfpmath=sse -O2 -fno-strict-aliasing -DNDEBUG
+-CFLAGS+=-ffloat-store -O2 -fno-strict-aliasing -DNDEBUG
++CFLAGS+= -DNDEBUG
+ LDFLAGS+=-s
+ endif
+
+@@ -48,10 +48,10 @@ SRCFILES_WIN32=#blank
ASMFILES_WIN32=#blank
VPATH_WIN32=$(RCDIR)
Modified: head/games/q2pro/files/patch-build__ref_soft.mk
==============================================================================
--- head/games/q2pro/files/patch-build__ref_soft.mk Thu Apr 28 16:59:27 2016 (r414185)
+++ head/games/q2pro/files/patch-build__ref_soft.mk Thu Apr 28 18:02:18 2016 (r414186)
@@ -1,6 +1,6 @@
--- build/ref_soft.mk.orig Wed Feb 14 18:10:04 2007
+++ build/ref_soft.mk Wed Feb 14 18:15:42 2007
-@@ -43,6 +43,7 @@
+@@ -43,6 +43,7 @@ SRCFILES = q_shared.c \
sw_sird.c \
r_images.c
@@ -8,12 +8,15 @@
ASMFILES = r_aclipa.s \
r_draw16.s \
r_drawa.s \
-@@ -53,7 +54,7 @@
+@@ -53,7 +54,10 @@ ASMFILES = r_aclipa.s \
r_varsa.s \
d_polysa.s \
sys_dosa.s
-
++else
++CFLAGS += -DC_ONLY
+endif
++
RESFILES += ref_soft.rc
SRCFILES_WIN32 = q_shwin.c
More information about the svn-ports-head
mailing list