Attachment #223322 for bug #254335

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

Lines 2-9 Link Here

(-)Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= dhewm3	4	PORTNAME= dhewm3
5	PORTVERSION= 1.5.0	5	PORTVERSION= 1.5.1
6	PORTREVISION= 2
7	CATEGORIES= games	6	CATEGORIES= games
8		7
9	MAINTAINER= amdmi3@FreeBSD.org	8	MAINTAINER= amdmi3@FreeBSD.org
Lines 21-26 Link Here
21		20
22	USES= cmake compiler:c++11-lang jpeg openal:al sdl	21	USES= cmake compiler:c++11-lang jpeg openal:al sdl
23	USE_SDL= sdl2	22	USE_SDL= sdl2
		23	CMAKE_ON= REPRODUCIBLE_BUILD
24		24
25	LDFLAGS_i386= -Wl,-znotext	25	LDFLAGS_i386= -Wl,-znotext
26		26

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1545068726	1	TIMESTAMP = 1615751907
2	SHA256 (dhewm-dhewm3-1.5.0_GH0.tar.gz) = fd299c8a2db1ecde15f861e4a883a5d61e5da0c74e26f89fb50b52b978fe8212	2	SHA256 (dhewm-dhewm3-1.5.1_GH0.tar.gz) = febaef022ff216435a2ff86f4e1526ac9bccbc401b03bed495a0a2f0b4edfb53
3	SIZE (dhewm-dhewm3-1.5.0_GH0.tar.gz) = 5373978	3	SIZE (dhewm-dhewm3-1.5.1_GH0.tar.gz) = 5400574




From 12fa28b260c89d39fc4fe83ed02d92da172257a3 Mon Sep 17 00:00:00 2001
From: yamir <yamir@localhost.localdomain>
Date: Sun, 7 Jul 2019 18:07:39 +0200
Subject: [PATCH] Fix ppc64le build

---
 neo/idlib/math/Simd_AltiVec.cpp | 2 +-
 neo/idlib/math/Simd_AltiVec.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/neo/idlib/math/Simd_AltiVec.cpp b/neo/idlib/math/Simd_AltiVec.cpp
index 96ac930a..8f8ab4ea 100644
--- idlib/math/Simd_AltiVec.cpp
+++ idlib/math/Simd_AltiVec.cpp
@@ -45,7 +45,7 @@ If you have questions concerning this license or the applicable additional terms
 //
 //===============================================================
 
-#if defined(__GNUC__) && defined(__ALTIVEC__)
+#if defined(MACOS_X) && defined(__GNUC__) && defined(__ALTIVEC__)
 
 #ifdef PPC_INTRINSICS
 	// for square root estimate instruction
diff --git a/neo/idlib/math/Simd_AltiVec.h b/neo/idlib/math/Simd_AltiVec.h
index 2a5776eb..d5080824 100644
--- idlib/math/Simd_AltiVec.h
+++ idlib/math/Simd_AltiVec.h
@@ -110,7 +110,7 @@ If you have questions concerning this license or the applicable additional terms
 //#define DRAWVERT_PADDED
 
 class idSIMD_AltiVec : public idSIMD_Generic {
-#if defined(__GNUC__) && defined(__ALTIVEC__)
+#if defined(MACOS_X) && defined(__GNUC__) && defined(__ALTIVEC__)
 public:
 
 	virtual const char * VPCALL GetName( void ) const;




https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=235668:

On powerpc* platforms vecLib/vecLib.h is included by default. This
header is only available on Mac OS X, so remove it. It doesn't seem
to be actually needed to compile this port

--- renderer/tr_main.cpp.orig	2019-02-11 12:39:53 UTC
+++ renderer/tr_main.cpp
@@ -26,7 +26,7 @@ If you have questions concerning this license or the a
 ===========================================================================
 */
 
-#ifdef __ppc__
+#if defined(__ppc__) && defined(__APPLE__)
 #include <vecLib/vecLib.h>
 #endif
 #if defined(__GNUC__) && defined(__SSE2__)

Return to bug 254335

Lines 1-36 Link Here

(-)files/patch-fix-ppc64le-build (-36 lines)
1	From 12fa28b260c89d39fc4fe83ed02d92da172257a3 Mon Sep 17 00:00:00 2001
2	From: yamir <yamir@localhost.localdomain>
3	Date: Sun, 7 Jul 2019 18:07:39 +0200
4	Subject: [PATCH] Fix ppc64le build
5
6	---
7	neo/idlib/math/Simd_AltiVec.cpp \| 2 +-
8	neo/idlib/math/Simd_AltiVec.h \| 2 +-
9	2 files changed, 2 insertions(+), 2 deletions(-)
10
11	diff --git a/neo/idlib/math/Simd_AltiVec.cpp b/neo/idlib/math/Simd_AltiVec.cpp
12	index 96ac930a..8f8ab4ea 100644
13	--- idlib/math/Simd_AltiVec.cpp
14	+++ idlib/math/Simd_AltiVec.cpp
15	@@ -45,7 +45,7 @@ If you have questions concerning this license or the applicable additional terms
16	//
17	//===============================================================
18
19	-#if defined(__GNUC__) && defined(__ALTIVEC__)
20	+#if defined(MACOS_X) && defined(__GNUC__) && defined(__ALTIVEC__)
21
22	#ifdef PPC_INTRINSICS
23	// for square root estimate instruction
24	diff --git a/neo/idlib/math/Simd_AltiVec.h b/neo/idlib/math/Simd_AltiVec.h
25	index 2a5776eb..d5080824 100644
26	--- idlib/math/Simd_AltiVec.h
27	+++ idlib/math/Simd_AltiVec.h
28	@@ -110,7 +110,7 @@ If you have questions concerning this license or the applicable additional terms
29	//#define DRAWVERT_PADDED
30
31	class idSIMD_AltiVec : public idSIMD_Generic {
32	-#if defined(__GNUC__) && defined(__ALTIVEC__)
33	+#if defined(MACOS_X) && defined(__GNUC__) && defined(__ALTIVEC__)
34	public:
35
36	virtual const char * VPCALL GetName( void ) const;

Lines 1-17 Link Here

(-)files/patch-renderer_tr__main.cpp (-17 lines)
1	https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=235668:
2
3	On powerpc* platforms vecLib/vecLib.h is included by default. This
4	header is only available on Mac OS X, so remove it. It doesn't seem
5	to be actually needed to compile this port
6
7	--- renderer/tr_main.cpp.orig 2019-02-11 12:39:53 UTC
8	+++ renderer/tr_main.cpp
9	@@ -26,7 +26,7 @@ If you have questions concerning this license or the a
10	===========================================================================
11	*/
12
13	-#ifdef __ppc__
14	+#if defined(__ppc__) && defined(__APPLE__)
15	#include <vecLib/vecLib.h>
16	#endif
17	#if defined(__GNUC__) && defined(__SSE2__)