Attachment #243102 for bug #272314

View | Details | Raw Unified | Return to bug 272314
Collapse All | Expand All

Lines 1-9 Link Here

(-)b/games/xonotic/Makefile (-4 / +8 lines)
1	PORTNAME= xonotic	1	PORTNAME= xonotic
2	PORTVERSION= 0.8.5	2	PORTVERSION= 0.8.6
3	PORTREVISION= 2	3	PORTREVISION= 0
4	CATEGORIES= games	4	CATEGORIES= games
5	MASTER_SITES= http://nl.dl.xonotic.org/ \	5	MASTER_SITES= http://dl.xonotic.org/ \
6	http://mirror.bitmissile.com/xonotic/releases/	6	http://download.evil-ant-colony.org/xonotic/ \
		7	https://xonotic.antzucaro.com/ \
		8	https://ocv.xonotic.au/downloads/
7		9
8	MAINTAINER= amdmi3@FreeBSD.org	10	MAINTAINER= amdmi3@FreeBSD.org
9	COMMENT= Fast-paced, chaotic, and intense multiplayer first person shooter	11	COMMENT= Fast-paced, chaotic, and intense multiplayer first person shooter
Lines 47-52 DEDICATED_DESC= Build dedicated server Link Here
47	DEDICATED_ALL_TARGET= sv-release	49	DEDICATED_ALL_TARGET= sv-release
48		50
49	post-patch:	51	post-patch:
		52	@${REINPLACE_CMD} -e 's,xonotic-sdl,xonotic,' \
		53	${WRKSRC}/misc/logos/xonotic.desktop
50	@${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},' \	54	@${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},' \
51	${BUILD_WRKSRC}/makefile ${BUILD_WRKSRC}/makefile.inc	55	${BUILD_WRKSRC}/makefile ${BUILD_WRKSRC}/makefile.inc
52		56

Lines 1-3 Link Here

(-)b/games/xonotic/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1656693570	1	TIMESTAMP = 1688216494
2	SHA256 (xonotic-0.8.5.zip) = 0f92aa238362aeb059b9d9026a9bd38d6217423a35c19f126fb39e38736e37e5	2	SHA256 (xonotic-0.8.6.zip) = 50850f8d800e7499722f6ea61e478e96464a375494b5a24da93aa0598cbe964d
3	SIZE (xonotic-0.8.5.zip) = 1228561792	3	SIZE (xonotic-0.8.6.zip) = 1238439495

Removed Link Here

(-)a/games/xonotic/files/patch-misc_logos_xonotic.desktop (-11 lines)
1	--- misc/logos/xonotic.desktop.orig 2022-06-27 17:32:04 UTC
2	+++ misc/logos/xonotic.desktop
3	@@ -6,7 +6,7 @@ Comment=Multiplayer, deathmatch oriented first person
4	Comment[de]=Deathmatch- und Mehrspieler-orientierter Ego-Shooter
5	Comment[fr]=Jeu de tir à la première personne multijoueur
6	Icon=xonotic
7	-Exec=xonotic-sdl
8	+Exec=xonotic
9	Terminal=false
10	PrefersNonDefaultGPU=true
11	StartupNotify=false

Lines 1-6 Link Here

(-)b/games/xonotic/files/patch-source_darkplaces_makefile (-2 / +2 lines)
1	--- source/darkplaces/makefile.orig 2017-04-05 10:52:46 UTC	1	--- source/darkplaces/makefile.orig
2	+++ source/darkplaces/makefile	2	+++ source/darkplaces/makefile
3	@@ -234,9 +234,9 @@ endif	3	@@ -240,9 +240,9 @@
4		4
5	DP_LINK_ZLIB?=shared	5	DP_LINK_ZLIB?=shared
6	DP_LINK_JPEG?=shared	6	DP_LINK_JPEG?=shared




--- source/darkplaces/makefile.inc.orig
+++ source/darkplaces/makefile.inc
@@ -197,7 +197,7 @@
 #OPTIM_RELEASE=-O2 -fno-strict-aliasing -fno-math-errno -fno-trapping-math -fno-signaling-nans -fcx-limited-range -funroll-loops $(CPUOPTIMIZATIONS)
 #OPTIM_RELEASE=-O2 -fno-strict-aliasing -funroll-loops $(CPUOPTIMIZATIONS)
 #OPTIM_RELEASE=-O2 -fno-strict-aliasing $(CPUOPTIMIZATIONS)
 #OPTIM_RELEASE=-O3 -fno-strict-aliasing $(CPUOPTIMIZATIONS)
-OPTIM_RELEASE=-O3 -fno-strict-aliasing -fno-math-errno -fno-trapping-math $(CPUOPTIMIZATIONS)
+OPTIM_RELEASE=$(CFLAGS) -O3 -fno-strict-aliasing -fno-math-errno -fno-trapping-math $(CPUOPTIMIZATIONS)
 # NOTE: *never* *ever* use the -ffast-math or -funsafe-math-optimizations flag
 # Also, since gcc 5, -ffinite-math-only makes NaN and zero compare equal inside engine code but not inside QC, which causes error spam for seemingly valid QC code like if (x != 0) return 1 / x;
 
- 

Return to bug 272314

Lines 1-11 Link Here

(-)b/games/xonotic/files/patch-source_darkplaces_makefile.inc (-6 / +5 lines)
1	--- source/darkplaces/makefile.inc.orig 2022-06-27 17:32:38 UTC	1	--- source/darkplaces/makefile.inc.orig
2	+++ source/darkplaces/makefile.inc	2	+++ source/darkplaces/makefile.inc
3	@@ -194,7 +194,7 @@ OPTIM_DEBUG=$(CPUOPTIMIZATIONS)	3	@@ -197,7 +197,7 @@
4	#OPTIM_RELEASE=-O2 -fno-strict-aliasing -fno-math-errno -fno-trapping-math -fno-signaling-nans -fcx-limited-range -funroll-loops $(CPUOPTIMIZATIONS)
5	#OPTIM_RELEASE=-O2 -fno-strict-aliasing -funroll-loops $(CPUOPTIMIZATIONS)	4	#OPTIM_RELEASE=-O2 -fno-strict-aliasing -funroll-loops $(CPUOPTIMIZATIONS)
6	#OPTIM_RELEASE=-O2 -fno-strict-aliasing $(CPUOPTIMIZATIONS)	5	#OPTIM_RELEASE=-O2 -fno-strict-aliasing $(CPUOPTIMIZATIONS)
7	-OPTIM_RELEASE=-O3 -fno-strict-aliasing $(CPUOPTIMIZATIONS)	6	#OPTIM_RELEASE=-O3 -fno-strict-aliasing $(CPUOPTIMIZATIONS)
8	+OPTIM_RELEASE=${CFLAGS} -fno-strict-aliasing $(CPUOPTIMIZATIONS)	7	-OPTIM_RELEASE=-O3 -fno-strict-aliasing -fno-math-errno -fno-trapping-math $(CPUOPTIMIZATIONS)
		8	+OPTIM_RELEASE=$(CFLAGS) -O3 -fno-strict-aliasing -fno-math-errno -fno-trapping-math $(CPUOPTIMIZATIONS)
9	# NOTE: never ever use the -ffast-math or -funsafe-math-optimizations flag	9	# NOTE: never ever use the -ffast-math or -funsafe-math-optimizations flag
10	# Also, since gcc 5, -ffinite-math-only makes NaN and zero compare equal inside engine code but not inside QC, which causes error spam for seemingly valid QC code like if (x != 0) return 1 / x;	10	# Also, since gcc 5, -ffinite-math-only makes NaN and zero compare equal inside engine code but not inside QC, which causes error spam for seemingly valid QC code like if (x != 0) return 1 / x;
11		11
12	-