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

[Matthew Rosewarne]

Author: mukidohime-guest
Date: 2008-02-01 19:46:59 +0000 (Fri, 01 Feb 2008)
New Revision: 9217

Added:
   branches/kde4/packages/rsibreak/debian/patches/blitzcpuinfo.diff
Removed:
   branches/kde4/packages/rsibreak/debian/patches/grayouteffect.diff
   branches/kde4/packages/rsibreak/debian/patches/remove_mmmx
Modified:
   branches/kde4/packages/rsibreak/debian/changelog
   branches/kde4/packages/rsibreak/debian/control
   branches/kde4/packages/rsibreak/debian/patches/series
Log:
* RSIBreak MMX-detection using qimageblitz

SOMEBODY REALLY SHOULD TEST THIS


Modified: branches/kde4/packages/rsibreak/debian/changelog
===================================================================
--- branches/kde4/packages/rsibreak/debian/changelog	2008-02-01 17:45:25 UTC (rev 9216)
+++ branches/kde4/packages/rsibreak/debian/changelog	2008-02-01 19:46:59 UTC (rev 9217)
@@ -1,7 +1,8 @@
 rsibreak (4.0.0-2) experimental; urgency=low
 
   +++ Changes by Matthew Rosewarne:
-  
+
+  * Add runtime MMX detection from QImageBlitz.
   * Tweak package description.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 30 Jan 2008 22:16:08 -0500

Modified: branches/kde4/packages/rsibreak/debian/control
===================================================================
--- branches/kde4/packages/rsibreak/debian/control	2008-02-01 17:45:25 UTC (rev 9216)
+++ branches/kde4/packages/rsibreak/debian/control	2008-02-01 19:46:59 UTC (rev 9217)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <trigger+debian at space-based.de>, Daniel Queirolo <danf.1979 at gmail.com>
-Build-Depends: cdbs, debhelper (>= 5), cmake, quilt, kdelibs5-dev (>= 4:4.0.0), libplasma-dev, libxss-dev, libphonon-dev
+Build-Depends: cdbs, debhelper (>= 5), cmake, quilt, kdelibs5-dev (>= 4:4.0.0), libplasma-dev, libxss-dev, libphonon-dev, libqimageblitz-dev
 Standards-Version: 3.7.3
 Homepage: http://www.rsibreak.org/
 

Added: branches/kde4/packages/rsibreak/debian/patches/blitzcpuinfo.diff
===================================================================
--- branches/kde4/packages/rsibreak/debian/patches/blitzcpuinfo.diff	                        (rev 0)
+++ branches/kde4/packages/rsibreak/debian/patches/blitzcpuinfo.diff	2008-02-01 19:46:59 UTC (rev 9217)
@@ -0,0 +1,45 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2,6 +2,7 @@
+ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
+ 
+ find_package (KDE4 REQUIRED)
++find_package (Blitz REQUIRED)
+ include(KDE4Defaults)
+ macro_optional_find_package(Plasma)
+ 
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -55,7 +55,7 @@
+ 
+ ########### linking #####################
+ 
+-TARGET_LINK_LIBRARIES(rsibreak ${KDE4_KIO_LIBS} ${KDE4_KNOTIFYCONFIG_LIBS} librsibreak ${IDLE_DETECTION_LIB} )
++TARGET_LINK_LIBRARIES(rsibreak ${BLITZ_LIBRARIES} ${KDE4_KIO_LIBS} ${KDE4_KNOTIFYCONFIG_LIBS} librsibreak ${IDLE_DETECTION_LIB} )
+ 
+ ########### install files ###############
+ 
+--- a/src/grayouteffect.cpp
++++ b/src/grayouteffect.cpp
+@@ -36,6 +36,8 @@
+ #include <mmintrin.h>
+ #endif
+ 
++#include <blitzcpu.h>
++
+ #include "grayouteffect.h"
+ #include "grayouteffect.moc"
+ 
+@@ -289,8 +291,10 @@
+         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);
++        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);
+     }
+ }
+ 

Deleted: branches/kde4/packages/rsibreak/debian/patches/grayouteffect.diff

Deleted: branches/kde4/packages/rsibreak/debian/patches/remove_mmmx

Modified: branches/kde4/packages/rsibreak/debian/patches/series
===================================================================
--- branches/kde4/packages/rsibreak/debian/patches/series	2008-02-01 17:45:25 UTC (rev 9216)
+++ branches/kde4/packages/rsibreak/debian/patches/series	2008-02-01 19:46:59 UTC (rev 9217)
@@ -1,2 +1 @@
-grayouteffect.diff
-remove_mmmx
+blitzcpuinfo.diff