rev 12869 - kde-extras/rsibreak/trunk/debian/patches

[Xavier Vello]

Author: wdgt-guest
Date: 2008-12-07 22:08:14 +0000 (Sun, 07 Dec 2008)
New Revision: 12869

Added:
   kde-extras/rsibreak/trunk/debian/patches/10-blitzcpuinfo.diff
   kde-extras/rsibreak/trunk/debian/patches/series
Removed:
   kde-extras/rsibreak/trunk/debian/patches/03_libtool_update.diff
   kde-extras/rsibreak/trunk/debian/patches/04_am_maintainer_mode.diff
   kde-extras/rsibreak/trunk/debian/patches/05_pedantic-errors.diff
   kde-extras/rsibreak/trunk/debian/patches/11_fix_used_libs.diff
   kde-extras/rsibreak/trunk/debian/patches/12_fix_accel.diff
   kde-extras/rsibreak/trunk/debian/patches/13_reduce_memfootprint.diff
   kde-extras/rsibreak/trunk/debian/patches/14_add_globals.diff
   kde-extras/rsibreak/trunk/debian/patches/15_fix_accel_2.diff
   kde-extras/rsibreak/trunk/debian/patches/98_buildprep.diff
Log:
update to 0.9.0 - part 2



Deleted: kde-extras/rsibreak/trunk/debian/patches/03_libtool_update.diff

Deleted: kde-extras/rsibreak/trunk/debian/patches/04_am_maintainer_mode.diff

Deleted: kde-extras/rsibreak/trunk/debian/patches/05_pedantic-errors.diff

Added: kde-extras/rsibreak/trunk/debian/patches/10-blitzcpuinfo.diff
===================================================================
--- kde-extras/rsibreak/trunk/debian/patches/10-blitzcpuinfo.diff	                        (rev 0)
+++ kde-extras/rsibreak/trunk/debian/patches/10-blitzcpuinfo.diff	2008-12-07 22:08:14 UTC (rev 12869)
@@ -0,0 +1,82 @@
+Index: b/CMakeLists.txt
+===================================================================
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2,12 +2,16 @@
+ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
+ 
+ find_package (KDE4 REQUIRED)
++find_package (Blitz REQUIRED)
+ include(KDE4Defaults)
+ macro_optional_find_package(Plasma)
+ 
+ 
+ add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
++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: b/src/CMakeLists.txt
+===================================================================
+--- 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 ###############
+ 
+Index: b/src/grayouteffect.cpp
+===================================================================
+--- a/src/grayouteffect.cpp
++++ b/src/grayouteffect.cpp
+@@ -34,10 +34,12 @@
+ #include <string>
+ #include <cstring>
+ 
+-#if 1
++#ifdef __MMX__
+ #include <mmintrin.h>
+ #endif
+ 
++#include <blitzcpu.h>
++
+ #include "grayouteffect.moc"
+ 
+ static int inline multiply(int a, int b)
+@@ -74,7 +76,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)
+ {
+@@ -92,7 +93,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)
+@@ -291,10 +291,11 @@
+         quint32 *result = (quint32*)(m_image->data + start);
+ 
+ #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);
+     }
+ }
+ 

Deleted: kde-extras/rsibreak/trunk/debian/patches/11_fix_used_libs.diff

Deleted: kde-extras/rsibreak/trunk/debian/patches/12_fix_accel.diff

Deleted: kde-extras/rsibreak/trunk/debian/patches/13_reduce_memfootprint.diff

Deleted: kde-extras/rsibreak/trunk/debian/patches/14_add_globals.diff

Deleted: kde-extras/rsibreak/trunk/debian/patches/15_fix_accel_2.diff

Deleted: kde-extras/rsibreak/trunk/debian/patches/98_buildprep.diff

Added: kde-extras/rsibreak/trunk/debian/patches/series
===================================================================
--- kde-extras/rsibreak/trunk/debian/patches/series	                        (rev 0)
+++ kde-extras/rsibreak/trunk/debian/patches/series	2008-12-07 22:08:14 UTC (rev 12869)
@@ -0,0 +1 @@
+10-blitzcpuinfo.diff