[rbdoom3bfg] 01/01: Again, patch incomplete. Now also submitting the cpu information.

[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 1aa74906e698f73febdf43424b57c92dcf660948
Author: Tobias Frost <tobi at coldtobi.de>
Date:   Sat Jun 13 15:49:09 2015 +0200

    Again, patch incomplete. Now also submitting the cpu information.
---
 debian/changelog                             |  6 ++++++
 debian/patches/80-disable-cpu-features.patch | 22 +++++++++++++++++++++-
 debian/rules                                 |  3 ++-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 63fdb93..9d63a3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+rbdoom3bfg (1.0.3+repack1-4) unstable; urgency=medium
+
+  * Again, patch incomplete. Now also submitting the cpu information.
+
+ -- Tobias Frost <tobi at debian.org>  Sat, 13 Jun 2015 15:48:59 +0200
+
 rbdoom3bfg (1.0.3+repack1-3) unstable; urgency=medium
 
   * The patch to disable the CPU features was incomplete: We need also to undef
diff --git a/debian/patches/80-disable-cpu-features.patch b/debian/patches/80-disable-cpu-features.patch
index 99471fd..fa21121 100644
--- a/debian/patches/80-disable-cpu-features.patch
+++ b/debian/patches/80-disable-cpu-features.patch
@@ -8,12 +8,15 @@ Last-Update: 2015-06-12
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/neo/CMakeLists.txt
 +++ b/neo/CMakeLists.txt
-@@ -61,7 +61,7 @@
+@@ -61,7 +61,10 @@
  	#add_definitions(-Wall)
  	add_definitions(-Werror=format-security)
  	add_definitions(-Werror=format)
 -	add_definitions(-mmmx -msse -msse2)
 +#	add_definitions(-mmmx -msse -msse2)
++	if(CPU_TYPE)
++		add_definitions(-DCPUSTRING="${CPU_TYPE}")
++	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.
@@ -30,3 +33,20 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  #if defined(USE_INTRINSICS)
  #include <emmintrin.h>
+--- 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__)
+ 
++#if not defined(CPUSTRING)
+ #if defined(__i386__)
+ #define	CPUSTRING						"x86"
+ #elif defined(__x86_64__)
+ #define CPUSTRING						"x86_86"
++#else
++#error unknown CPU
++#endif
+ #endif
+ 
+ #if defined(__FreeBSD__)
diff --git a/debian/rules b/debian/rules
index 692e0eb..08d3b66 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,8 @@ override_dh_auto_configure:
 	dh_auto_configure -- -G "Unix Makefiles" \
 	 -DSDL2=ON -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
 	 -DUSE_SYSTEM_ZLIB=ON -DUSE_SYSTEM_LIBPNG=ON \
-	 -DUSE_SYSTEM_LIBJPEG=ON -DUSE_SYSTEM_LIBGLEW=ON
+	 -DUSE_SYSTEM_LIBJPEG=ON -DUSE_SYSTEM_LIBGLEW=ON \
+	 -DCPU_TYPE=$(DEB_BUILD_ARCH_CPU)
 
          #-DCMAKE_BUILD_TYPE=RelWithDebInfo
 

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