rev 9242 - in branches/kde4/packages/rsibreak/debian: . patches

[Matthew Rosewarne]

Author: mukidohime-guest
Date: 2008-02-02 05:15:52 +0000 (Sat, 02 Feb 2008)
New Revision: 9242

Modified:
   branches/kde4/packages/rsibreak/debian/patches/blitzcpuinfo.diff
   branches/kde4/packages/rsibreak/debian/rules
Log:
* only build MMX code on x86


Modified: branches/kde4/packages/rsibreak/debian/patches/blitzcpuinfo.diff
===================================================================
--- branches/kde4/packages/rsibreak/debian/patches/blitzcpuinfo.diff	2008-02-02 04:58:15 UTC (rev 9241)
+++ branches/kde4/packages/rsibreak/debian/patches/blitzcpuinfo.diff	2008-02-02 05:15:52 UTC (rev 9242)
@@ -1,6 +1,8 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2,6 +2,7 @@
+Index: rsibreak-4.0.0/CMakeLists.txt
+===================================================================
+--- rsibreak-4.0.0.orig/CMakeLists.txt	2008-02-02 04:54:59.119428946 +0000
++++ rsibreak-4.0.0/CMakeLists.txt	2008-02-02 04:57:27.496429134 +0000
+@@ -2,12 +2,15 @@
  set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
  
  find_package (KDE4 REQUIRED)
@@ -8,8 +10,33 @@
  include(KDE4Defaults)
  macro_optional_find_package(Plasma)
  
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
+ 
+ add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+-add_definitions (-mmmx)
++if (HAVE_MMX)
++  add_definitions (-mmmx)
++endif (HAVE_MMX)
+ include_directories ( ${KDE4_INCLUDES} ${BLITZ_INCLUDES} )
+ ADD_SUBDIRECTORY( icons ) 
+ ADD_SUBDIRECTORY( src ) 
+Index: rsibreak-4.0.0/config.h.cmake
+===================================================================
+--- rsibreak-4.0.0.orig/config.h.cmake	2008-02-02 04:54:59.174428401 +0000
++++ rsibreak-4.0.0/config.h.cmake	2008-02-02 04:55:49.820427475 +0000
+@@ -1,6 +1,9 @@
+ #ifndef CONFIG_H
+ #define CONFIG_H
+ 
++/* Defined to 1 if the assembler supports MMX instructions. */
++#cmakedefine HAVE_MMX 1
++
+ #cmakedefine HAVE_LIBXSS
+ 
+ #endif
+Index: rsibreak-4.0.0/src/CMakeLists.txt
+===================================================================
+--- rsibreak-4.0.0.orig/src/CMakeLists.txt	2008-02-02 04:54:59.135429435 +0000
++++ rsibreak-4.0.0/src/CMakeLists.txt	2008-02-02 04:55:49.843427489 +0000
 @@ -55,7 +55,7 @@
  
  ########### linking #####################
@@ -19,26 +46,31 @@
  
  ########### install files ###############
  
---- a/src/grayouteffect.cpp
-+++ b/src/grayouteffect.cpp
-@@ -36,6 +36,8 @@
+Index: rsibreak-4.0.0/src/grayouteffect.cpp
+===================================================================
+--- rsibreak-4.0.0.orig/src/grayouteffect.cpp	2008-02-02 04:54:59.164429252 +0000
++++ rsibreak-4.0.0/src/grayouteffect.cpp	2008-02-02 04:55:49.846427708 +0000
+@@ -36,6 +36,9 @@
  #include <mmintrin.h>
  #endif
  
 +#include <blitzcpu.h>
++#include <config.h>     // HAVE_MMX
 +
  #include "grayouteffect.h"
  #include "grayouteffect.moc"
  
-@@ -289,8 +291,10 @@
+@@ -289,8 +292,12 @@
          quint32 *under  = (quint32*)(m_final + start);
          quint32 *result = (quint32*)(m_image->data + start);
  
 -        scanline_blend_mmx(over, m_alpha, under, result, m_image->width);
 -        //scanline_blend(over, m_alpha, under, result, m_image->width);
++#ifdef HAVE_MMX
 +        if(BlitzCPUInfo::haveExtension(BlitzCPUInfo::MMX))
 +                scanline_blend_mmx(over, m_alpha, under, result, m_image->width);
 +        else
++#endif
 +                scanline_blend(over, m_alpha, under, result, m_image->width);
      }
  }

Modified: branches/kde4/packages/rsibreak/debian/rules
===================================================================
--- branches/kde4/packages/rsibreak/debian/rules	2008-02-02 04:58:15 UTC (rev 9241)
+++ branches/kde4/packages/rsibreak/debian/rules	2008-02-02 05:15:52 UTC (rev 9242)
@@ -1,3 +1,8 @@
 #!/usr/bin/make -f
 
 include debian/cdbs/kde.mk
+include debian/cdbs/cpu-optimize.mk
+
+ifneq (,$(filter $(DEB_BUILD_ARCH_CPU_OPT),mmx))
+	DEB_CMAKE_EXTRA_FLAGS += -DHAVE_MMX:BOOL=ON
+endif