rev 9230 - in branches/kde4/packages/blitz/debian: . patches

[Matthew Rosewarne]

Author: mukidohime-guest
Date: 2008-02-02 03:23:05 +0000 (Sat, 02 Feb 2008)
New Revision: 9230

Added:
   branches/kde4/packages/blitz/debian/patches/10_skip_cpu_check.diff
Removed:
   branches/kde4/packages/blitz/debian/patches/10_no_cpu_optimizations.diff
Modified:
   branches/kde4/packages/blitz/debian/changelog
   branches/kde4/packages/blitz/debian/patches/series
   branches/kde4/packages/blitz/debian/rules
Log:
* force CPU optimisations


Modified: branches/kde4/packages/blitz/debian/changelog
===================================================================
--- branches/kde4/packages/blitz/debian/changelog	2008-02-02 03:17:09 UTC (rev 9229)
+++ branches/kde4/packages/blitz/debian/changelog	2008-02-02 03:23:05 UTC (rev 9230)
@@ -1,9 +1,11 @@
 qimageblitz (1:0.0.4-2) UNRELEASED; urgency=low
 
-  * ... 
+  +++ Changes by Matthew Rosewarne:
 
- -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Tue, 22 Jan 2008 01:50:07 +0100
+  * Forcibly enable CPU optimizations.
 
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 22 Jan 2008 01:50:07 +0100
+
 qimageblitz (1:0.0.4-1) unstable; urgency=low
 
   * New upstream release.

Deleted: branches/kde4/packages/blitz/debian/patches/10_no_cpu_optimizations.diff

Added: branches/kde4/packages/blitz/debian/patches/10_skip_cpu_check.diff
===================================================================
--- branches/kde4/packages/blitz/debian/patches/10_skip_cpu_check.diff	                        (rev 0)
+++ branches/kde4/packages/blitz/debian/patches/10_skip_cpu_check.diff	2008-02-02 03:23:05 UTC (rev 9230)
@@ -0,0 +1,23 @@
+--- a/blitz/CMakeLists.txt
++++ b/blitz/CMakeLists.txt
+@@ -17,13 +17,13 @@
+ 
+ CHECK_INCLUDE_FILE(stdint.h HAVE_STDINT_H)
+ 
+-if(NOT MSVC)
+-  CHECK_CXX_SOURCE_COMPILES(" int main() { __asm__(\"pxor %mm0, %mm0\") ; }" HAVE_MMX)
+-  CHECK_CXX_SOURCE_COMPILES(" int main() { __asm__(\"xorps %xmm0, %xmm0\"); }" HAVE_SSE)
+-  CHECK_CXX_SOURCE_COMPILES(" int main() { __asm__(\"xorpd %xmm0, %xmm0\"); }" HAVE_SSE2)
+-  CHECK_CXX_SOURCE_COMPILES(" int main() { __asm__(\"pi2fd %mm0, %mm0\"); }" HAVE_3DNOW)
+-  CHECK_CXX_SOURCE_COMPILES(" int main() { __asm__(\"mtspr 256, %0; vand %%v0, %%v0, %%v0\" : : \"r\"(-1) ); }" HAVE_ALTIVEC)
+-endif(NOT MSVC)
++#if(NOT MSVC)
++#  CHECK_CXX_SOURCE_COMPILES(" int main() { __asm__(\"pxor %mm0, %mm0\") ; }" HAVE_MMX)
++#  CHECK_CXX_SOURCE_COMPILES(" int main() { __asm__(\"xorps %xmm0, %xmm0\"); }" HAVE_SSE)
++#  CHECK_CXX_SOURCE_COMPILES(" int main() { __asm__(\"xorpd %xmm0, %xmm0\"); }" HAVE_SSE2)
++#  CHECK_CXX_SOURCE_COMPILES(" int main() { __asm__(\"pi2fd %mm0, %mm0\"); }" HAVE_3DNOW)
++#  CHECK_CXX_SOURCE_COMPILES(" int main() { __asm__(\"mtspr 256, %0; vand %%v0, %%v0, %%v0\" : : \"r\"(-1) ); }" HAVE_ALTIVEC)
++#endif(NOT MSVC)
+ 
+ SET(BLITZ_LIB_MAJOR_VERSION "4")
+ SET(BLITZ_LIB_MINOR_VERSION "0")

Modified: branches/kde4/packages/blitz/debian/patches/series
===================================================================
--- branches/kde4/packages/blitz/debian/patches/series	2008-02-02 03:17:09 UTC (rev 9229)
+++ branches/kde4/packages/blitz/debian/patches/series	2008-02-02 03:23:05 UTC (rev 9230)
@@ -1,2 +1,2 @@
-10_no_cpu_optimizations.diff
+10_skip_cpu_check.diff
 11_.gnu.note.diff

Modified: branches/kde4/packages/blitz/debian/rules
===================================================================
--- branches/kde4/packages/blitz/debian/rules	2008-02-02 03:17:09 UTC (rev 9229)
+++ branches/kde4/packages/blitz/debian/rules	2008-02-02 03:23:05 UTC (rev 9230)
@@ -1,3 +1,7 @@
 #!/usr/bin/make -f
 THIS_SHOULD_GO_TO_UNSTABLE=1
 include debian/cdbs/kde.mk
+include debian/cdbs/cpu-optimize.mk
+
+DEB_CMAKE_EXTRA_FLAGS += \
+			$(shell echo $(foreach cpuopt,$(DEB_BUILD_ARCH_CPU_OPT),-DHAVE_$(cpuopt):BOOL=ON) | tr '[:lower:]' '[:upper:]')