[rbdoom3bfg] 05/06: Refresh patch 80-disable-cpu-features.patch, applied mostly upstream

[Tobias Frost]

This is an automated email from the git hooks/post-receive script.

tobi pushed a commit to branch master
in repository rbdoom3bfg.

commit d3b9253cf63c41f37b25abdc24cc60928ec397a6
Author: Tobias Frost <tobi at coldtobi.de>
Date:   Sat Jul 4 10:53:21 2015 +0200

     Refresh patch 80-disable-cpu-features.patch, applied mostly upstream
---
 debian/changelog                             |  1 +
 debian/patches/80-disable-cpu-features.patch | 55 +++-------------------------
 2 files changed, 6 insertions(+), 50 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 013223a..cb0a434 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ rbdoom3bfg (1.0.3+repack1+git20150625-1) UNRELEASED; urgency=medium
   * New uptream git snapshot.
   * Refresh 10-lowercase-executeable.patch
   * Remove 75-local-no-precompiled-header.patch -- applied upstream
+  * Refresh patch 80-disable-cpu-features.patch, applied mostly upstream
 
  -- Tobias Frost <tobi at debian.org>  Sat, 04 Jul 2015 10:09:40 +0200
 
diff --git a/debian/patches/80-disable-cpu-features.patch b/debian/patches/80-disable-cpu-features.patch
index b304d4c..1466a4b 100644
--- a/debian/patches/80-disable-cpu-features.patch
+++ b/debian/patches/80-disable-cpu-features.patch
@@ -8,62 +8,17 @@ Applied-Upstream: https://github.com/RobertBeckebans/RBDOOM-3-BFG/commit/9d4c468
 Last-Update: 2015-06-24
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/neo/CMakeLists.txt
-+++ b/neo/CMakeLists.txt
-@@ -39,6 +39,12 @@
- option(USE_SYSTEM_LIBGLEW
-                 "Use the system libglew instead of the bundled one" OFF)
- 
-+set(CPU_TYPE "" CACHE STRING "When set, passes this string as CPU-ID which will be embedded into the binary.")
-+
-+set(CPU_OPTIMIZATION "-mmmx -msse -msse2" CACHE STRING "Which CPU specific optimitations should be used beside the compiler's default?")
-+
-+option(USE_INTRINSICS "Compile using intrinsics (e.g mmx, sse, msse2)" ON)
-+
- if(UNIX)
- 	set(OPENAL TRUE)
- endif()
-@@ -64,7 +70,15 @@
- 	#add_definitions(-Wall)
- 	add_definitions(-Werror=format-security)
- 	add_definitions(-Werror=format)
--	add_definitions(-mmmx -msse -msse2)
-+	if(CPU_TYPE)
-+		add_definitions(-DCPUSTRING="${CPU_TYPE}")
-+	endif()
-+	if (CPU_OPTIMIZATION)
-+		add_definitions(${CPU_OPTIMIZATION})
-+	endif()
-+	if (USE_INTRINSICS)
-+		add_definitions(-DUSE_INTRINSICS)
-+	endif()
- 	if(WIN32)
- 		# require msvcr70.dll or newer for _aligned_malloc etc
- 		# I think it is from Visual C++ .NET 2002, so it should be available on any remotely modern system.
---- a/neo/idlib/sys/sys_defines.h
-+++ b/neo/idlib/sys/sys_defines.h
-@@ -104,10 +104,14 @@
- 
- #elif defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__)
- 
-+#ifndef CPUSTRING
- #if defined(__i386__)
- #define	CPUSTRING						"x86"
- #elif defined(__x86_64__)
- #define CPUSTRING						"x86_86"
-+#else
-+#error unknown CPU
-+#endif
- #endif
- 
- #if defined(__FreeBSD__)
 --- a/neo/idlib/sys/sys_intrinsics.h
 +++ b/neo/idlib/sys/sys_intrinsics.h
-@@ -29,8 +29,6 @@
+@@ -29,12 +29,6 @@
  #ifndef __SYS_INTRIINSICS_H__
  #define __SYS_INTRIINSICS_H__
  
+-#if !defined(USE_INTRINSICS)
+-#if defined(WIN32) || defined(__i386__) || defined(__x86_64__)
 -#define USE_INTRINSICS
+-#endif
+-#endif
 -
  #if defined(USE_INTRINSICS)
  #include <emmintrin.h>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git