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

[Matthew Rosewarne]

Author: mukidohime-guest
Date: 2008-03-12 04:51:52 +0000 (Wed, 12 Mar 2008)
New Revision: 9720

Removed:
   branches/kde4/packages/rsibreak/debian/cpu-optimize.mk
Modified:
   branches/kde4/packages/rsibreak/debian/patches/blitzcpuinfo.diff
   branches/kde4/packages/rsibreak/debian/rules
Log:
* Updated MMX business


Deleted: branches/kde4/packages/rsibreak/debian/cpu-optimize.mk

Modified: branches/kde4/packages/rsibreak/debian/patches/blitzcpuinfo.diff
===================================================================
--- branches/kde4/packages/rsibreak/debian/patches/blitzcpuinfo.diff	2008-03-11 23:56:39 UTC (rev 9719)
+++ branches/kde4/packages/rsibreak/debian/patches/blitzcpuinfo.diff	2008-03-12 04:51:52 UTC (rev 9720)
@@ -1,8 +1,6 @@
-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 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2,12 +2,16 @@
  set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
  
  find_package (KDE4 REQUIRED)
@@ -12,31 +10,15 @@
  
  
  add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
--add_definitions (-mmmx)
-+if (HAVE_MMX)
-+  add_definitions (-mmmx)
-+endif (HAVE_MMX)
++execute_process( COMMAND dpkg-architecture -qDEB_BUILD_ARCH_CPU OUTPUT_VARIABLE DEB_BUILD_ARCH_CPU )
++if ( ${DEB_BUILD_ARCH_CPU} MATCHES "amd64|i386" )
+ add_definitions (-mmmx)
++endif ( ${DEB_BUILD_ARCH_CPU} MATCHES "amd64|i386" )
  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
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
 @@ -55,7 +55,7 @@
  
  ########### linking #####################
@@ -46,32 +28,49 @@
  
  ########### install files ###############
  
-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 @@
+--- a/src/grayouteffect.cpp
++++ b/src/grayouteffect.cpp
+@@ -32,10 +32,12 @@
+ #include <string>
+ #include <cstring>
+ 
+-#if 1
++#ifdef __MMX__
  #include <mmintrin.h>
  #endif
  
 +#include <blitzcpu.h>
-+#include <config.h>     // HAVE_MMX
 +
  #include "grayouteffect.h"
  #include "grayouteffect.moc"
  
-@@ -289,8 +292,12 @@
-         quint32 *under  = (quint32*)(m_final + start);
+@@ -73,7 +75,6 @@
+     return (((r << 8) | (b >> 3)) & 0xf81f) | ((g << 3) & 0x07e0);
+ }
+ 
+-#ifndef __MMX__
+ static void scanline_blend(const quint32 *over, const quint8 alpha, const quint32 *under,
+                            quint32 *result, uint length)
+ {
+@@ -91,7 +92,6 @@
+         result[i] = store (dr, dg, db);
+     }
+ }
+-#endif
+ 
+ static void scanline_blend_16(const quint16 *over, const quint8 alpha, const quint16 *under,
+                               quint16 *result, uint length)
+@@ -290,10 +290,11 @@
          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);
+ #ifdef __MMX__
++    if(BlitzCPUInfo::haveExtension(BlitzCPUInfo::MMX))
+         scanline_blend_mmx(over, m_alpha, under, result, m_image->width);
+-#else
+-        scanline_blend(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-03-11 23:56:39 UTC (rev 9719)
+++ branches/kde4/packages/rsibreak/debian/rules	2008-03-12 04:51:52 UTC (rev 9720)
@@ -1,8 +1,3 @@
 #!/usr/bin/make -f
 
 include debian/cdbs/kde.mk
-include debian/cpu-optimize.mk
-
-ifneq (,$(filter $(DEB_BUILD_ARCH_CPU_OPT),mmx))
-	DEB_CMAKE_EXTRA_FLAGS += -DHAVE_MMX:BOOL=ON
-endif