Backport performance improvement from upstream to 4.6

Package-Manager: portage-2.1.10.15/cvs/Linux x86_64

diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog
index 575765cb05cf4dc097f967eba8e5327e1b405f50..3c431d40f3e731f8cde1ee0a3d3401e9e2698431 100644 (file)
--- a/kde-base/kwin/ChangeLog
+++ b/kde-base/kwin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kwin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.242 2011/09/13 20:12:33 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.243 2011/09/13 20:31:43 dilfridge Exp $
+
+*kwin-4.6.5-r2 (13 Sep 2011)
+
+  13 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org> +kwin-4.6.5-r2.ebuild,
+  +files/kwin-4.6.5-performance.patch:
+  Backport performance improvement from upstream to 4.6
 
 *kwin-4.7.1-r1 (13 Sep 2011)
 

diff --git a/kde-base/kwin/Manifest b/kde-base/kwin/Manifest
index 4ebadeffc4ae6f302843e1a65c128344ada0e1a7..d6f4f88a7576b3ee773b3ea528cc9920e86cac8f 100644 (file)
--- a/kde-base/kwin/Manifest
+++ b/kde-base/kwin/Manifest
@@ -4,6 +4,7 @@ Hash: SHA512
 AUX kwin-4.4.2-xinerama_cmake_automagic.patch 923 RMD160 45519a7e51001e6f16cf4bc13f7ef99eeaff793a SHA1 22102eaa95aa07bce19262842fcda69e0bc751f0 SHA256 c1f605148ba9ea606924c934a3b79bb7b415346a3fbe2e7c1732cc6956a44157
 AUX kwin-4.6.3-desktopnames.patch 1110 RMD160 627e919a4836973b0c45512101ebb6d7160a084f SHA1 a5dda38663f4c9bf30a5fc27063158d83a6514af SHA256 7883a5e98075b7366a38c7003a7620b7283f13e2c226c20301e4c8c0a06f06ad
 AUX kwin-4.6.5-mesadri.patch 1580 RMD160 cf443dd3aaf4405cffe405959beb6efc559c586f SHA1 049150975b9a93df0e3d8f2b9bd58f0ea57913bb SHA256 190404c58b47c829ccd11f6fc89a9939bb181aa8e561e60a0e147a2667a1d452
+AUX kwin-4.6.5-performance.patch 3257 RMD160 693aaf6e9798a2b852be175851dd92a10a3f0f7e SHA1 12daf7237134dbffff069b9ed6cf3dbf60345ea9 SHA256 99b4643137f85a1e2d205c6fb9ddddded1acb892fb1872ead1b54909dfce5db8
 AUX kwin-4.7.1-performance.patch 4905 RMD160 9787a6377600b63110563f3577d113a1a68d5a02 SHA1 4fa046db21e3203771fd29bc0e1c32918862b894 SHA256 9831367acdde4af5d6eb7aea0bedf46c11601c78dfcc77f242257ab90532603f
 AUX kwin-fix-opengl.patch 2039 RMD160 4a0d9a0134083ed87277581e77dd63b4386553fe SHA1 9b6bfca1dded2f878a989e83425faa1c2174adee SHA256 079df31ea30250bae85e693c83d7d67a6d5cf637e6baf13cd421caee7934271a
 DIST kde-workspace-4.7.0.tar.bz2 20049430 RMD160 20520845b336d9485bb2149191ad9f5e6a90824d SHA1 cbc61a20013c746f424681020c29480c6249fd10 SHA256 7e30d1a493b2b8981790a255edf0003bab19bf4dc3e77c37694da495a33a3468
@@ -12,26 +13,27 @@ DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862
 DIST kdebase-workspace-4.6.5.tar.bz2 69241659 RMD160 580bcfe80aeb70dc7c2ef559338a58c41227e476 SHA1 bdcdbf235b3e3941b968f57afd3d490e7ca106e5 SHA256 4df66edf88df327d10d131536e6daebdeae449fb75eebc6bfae67cf3128093c0
 EBUILD kwin-4.6.3-r1.ebuild 1774 RMD160 9407c2e5ab194ad6231f0482b14e616a2e7f4a7b SHA1 4d2720f72d3e14500c8e116f62312e9a721391db SHA256 b06642d5fc28e99122f77c20a691c7ac544df78ecd8a75c7167a094e01a141c0
 EBUILD kwin-4.6.5-r1.ebuild 1807 RMD160 304f603f5ae0c8df0896e42f9cff491fa1a78112 SHA1 0ec293178ec0638a09bfa148e6c2811211f840ff SHA256 48c94ac4786b96e665911a1c07f8013057215d63322e9dac51edb445f1d01f31
+EBUILD kwin-4.6.5-r2.ebuild 1852 RMD160 babe7adb8b386f5af7f2df46095cf8a20f2aae25 SHA1 671b8dbac837e0bc4f37e4762c9197f2d3bf77af SHA256 e147d3108a706ad4e894c4efe1ee97648225d99f6bacb087785d16232006710b
 EBUILD kwin-4.6.5.ebuild 1730 RMD160 65bd55c13d3a82dc04f04ecd9fbf3a7b49f63f2c SHA1 3c42496cd8811dcbffc8b57f2ececee8a5f4122f SHA256 f30d0c21eca9b8ae6186ea0741d59a269d38762e916c1c956223c5728c868072
 EBUILD kwin-4.7.0-r1.ebuild 1609 RMD160 c9473ca41c856b0f42b7e9f07ebb2e4316b03532 SHA1 e9a6cfe51aa6c8bdc4da14f923cc51e5995e4851 SHA256 d34983166fe9dd5a8de33a769e0d58023740a24e59de861b6bf81a433dd096e5
 EBUILD kwin-4.7.1-r1.ebuild 1654 RMD160 868759fc88f51aa8e34f4bd0889317e3de7aaaab SHA1 7d56288802c6736fc55280b79df8337ca45258c5 SHA256 848f3b6d4e07df002806cb9aebd2fdfe933f22fd2286e749c621689845780d26
 EBUILD kwin-4.7.1.ebuild 1603 RMD160 2037bd94e8378f12be17c87d4c3a30bc4a0cf87b SHA1 c01511c8d2cf62de1b341264d4eadee6210d7df8 SHA256 b458ac7abf7069ab87f89001dc3be030e6bd82ee99b37bcd20546aefcded5ff5
-MISC ChangeLog 29729 RMD160 441a3fb6c9356de0ff9f561165f53b7d471f9de9 SHA1 7294cdba95085c0f0c508c496284b0b6086de1af SHA256 ce101052afee60aa0a58107b2f3d583ea97a98b43da2dadc6a1f30618a6336ba
+MISC ChangeLog 29935 RMD160 d4055a4032316f81b8e358001ad06133bba6b2aa SHA1 5f39dd25f40af8d088481173740b18738563eabf SHA256 1ee5bcbea4a59f8906ae25763674358dc0d38d018940c44b692a8e3724589eac
 MISC metadata.xml 229 RMD160 24787dda60325ca5ed6c320b09effa57d9b2f45b SHA1 98698ac5e37a3ed20414deb0de4eb70da74a2add SHA256 1cd96488355a3e48a2b0b12f09ad8e3ea923e199b4fcbf175590cd317b033af7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOb7lPAAoJENwGBM22xffec3sQAI6HRmdNGIbiNk2YjpGPRh9f
-eWa0DOabiGqSCsegB33CNTGcO/g/cE+WczidD6cVbb4IABVZdfqojNDAI+eKm0c8
-4jSwBL/iLWM7TDmsfnqYkxQuXFT4bVpxRiIF15x2DyaXx8rpQsyWZQ/8q/T7rgiO
-coN23TekFjsdsYG0Vji5aZp7e14MzH/WnKGveRojgr6L2VcDIu04mc7DzZ/li539
-Eg+WvP6G0ghA/4dffDE5u2CakR681gff3B+AGF2n4amaW2pl5Uh6N7XizVfMS7wN
-IQvm/B/jO4nrUkr6+8UOdzIqUBkyekMfzifNnfI+2CGw5wZPX4yQAtIY9krHPc6u
-sZnfwf9AIIO8cqe0jgodSZCsp3dqM6dHHKL3bmZN+bakJ8xn9AKjIIUJxfYfnEm1
-gugES/+y1a1LK8QOaVEqQXI0suoqdVaiRJ75KhXTqvaUaQ932tyXIIvedGqAHcwV
-4sg7AYviVTxxy2H7tOKls/6rHtu2WzGKYJUeUjHdbvDaGjCf15FDcm4XrYNjlqEK
-5g4JOC26MuwwR3Rv1CJyfOnc5eyC8purb9CGdMJRsbPFuyJM1kEKmt6AEWS3S/Ty
-XOcgiQDftkCMYiivnDiO6rf1EsgZ4MDoFBZmKBsX/bQeIy/if43NslItetbMXSgB
-CBaZnIt65I9Li2nrGQe9
-=ffdg
+iQIcBAEBCgAGBQJOb73HAAoJENwGBM22xffelpAP/3xMoHfwGTBLgMiaHNXPnxvD
+sCDvpGHSnPLENnToUr2flAgYVzbychgnZwvyfVWftP+X2rGywbLhAN3g8QEeQ0bM
+DjCjnoKzxZYXgV8P6mA6TDaA9t9cMYVO+TwHd/0MfvNUk9BmxmaCLzXY0ZpyVgb1
+Hr2dLly4zc9izDP8QCzFQV5RsL+ZhX7SbokdInfw4H/kCdushh7IdINbms4EGZXb
+eKCXJ5OQX93xmQ1hK82HJHG2VEKAaW/oPQ+56kIpQHmO/GRNSdJEv8OS/YxKzils
+BKcDYmeh9zlQDu4sSu8rlZwQAfWp1NrSxGrpKH2vNNAsmLJwbXIkzPfBroaEjLoz
+nAQx5YBjqOBHSlrr7Tuy0rSpvWoMy407cvHzYQVRx9BiAfO1WpsC57yfm6i7U3hV
+i53oEKcsKtrUG7QHOxgdw0J9J84YagKWGIfPb8zrrJ73PYRJgVhMmudJPyAZRzyB
+uXXL9/of+1ocNaJ4AvnDlmN5w2fJmX7EGeKRxaiGeheGcWNGdTU858/7AEC+Fy5h
+MMvqc5nSM1cILiRWO6qWoAeXyI9s5pSPyq4r2od5sBvGMQ48caaS3RxjXK5xwDP6
+kXdwIMzqwTdf6lAN/ub1+n/m1FFoSfj/KJiCIGtDMdO79uHiKUrTZMqiC8P8vTfQ
+CmyVrqY0CpqSpaqKhtK1
+=lf3a
 -----END PGP SIGNATURE-----

diff --git a/kde-base/kwin/files/kwin-4.6.5-performance.patch b/kde-base/kwin/files/kwin-4.6.5-performance.patch
new file mode 100644 (file)
index 0000000..a706370
--- /dev/null
+++ b/kde-base/kwin/files/kwin-4.6.5-performance.patch
@@ -0,0 +1,84 @@
+diff -ruN kwin-4.6.5.orig/kwin/effects.cpp kwin-4.6.5/kwin/effects.cpp
+--- kwin-4.6.5.orig/kwin/effects.cpp   2011-02-25 23:10:02.000000000 +0100
++++ kwin-4.6.5/kwin/effects.cpp        2011-09-13 22:25:18.943156120 +0200
+@@ -156,7 +156,7 @@
+     {
+     if( current_paint_screen < loaded_effects.size())
+         {
+-        loaded_effects[current_paint_screen++].second->prePaintScreen( data, time );
++        loaded_effects.at(current_paint_screen++).second->prePaintScreen( data, time );
+         --current_paint_screen;
+         }
+     // no special final code
+@@ -166,7 +166,7 @@
+     {
+     if( current_paint_screen < loaded_effects.size())
+         {
+-        loaded_effects[current_paint_screen++].second->paintScreen( mask, region, data );
++        loaded_effects.at(current_paint_screen++).second->paintScreen( mask, region, data );
+         --current_paint_screen;
+         }
+     else
+@@ -177,7 +177,7 @@
+     {
+     if( current_paint_screen < loaded_effects.size())
+         {
+-        loaded_effects[current_paint_screen++].second->postPaintScreen();
++        loaded_effects.at(current_paint_screen++).second->postPaintScreen();
+         --current_paint_screen;
+         }
+     // no special final code
+@@ -187,7 +187,7 @@
+     {
+     if( current_paint_window < loaded_effects.size())
+         {
+-        loaded_effects[current_paint_window++].second->prePaintWindow( w, data, time );
++        loaded_effects.at(current_paint_window++).second->prePaintWindow( w, data, time );
+         --current_paint_window;
+         }
+     // no special final code
+@@ -197,7 +197,7 @@
+     {
+     if( current_paint_window < loaded_effects.size())
+         {
+-        loaded_effects[current_paint_window++].second->paintWindow( w, mask, region, data );
++        loaded_effects.at(current_paint_window++).second->paintWindow( w, mask, region, data );
+         --current_paint_window;
+         }
+     else
+@@ -208,7 +208,7 @@
+     {
+     if( current_paint_effectframe < loaded_effects.size())
+         {
+-        loaded_effects[current_paint_effectframe++].second->paintEffectFrame( frame, region, opacity, frameOpacity );
++        loaded_effects.at(current_paint_effectframe++).second->paintEffectFrame( frame, region, opacity, frameOpacity );
+         --current_paint_effectframe;
+         }
+     else
+@@ -222,7 +222,7 @@
+     {
+     if( current_paint_window < loaded_effects.size())
+         {
+-        loaded_effects[current_paint_window++].second->postPaintWindow( w );
++        loaded_effects.at(current_paint_window++).second->postPaintWindow( w );
+         --current_paint_window;
+         }
+     // no special final code
+@@ -240,7 +240,7 @@
+     {
+     if( current_draw_window < loaded_effects.size())
+         {
+-        loaded_effects[current_draw_window++].second->drawWindow( w, mask, region, data );
++        loaded_effects.at(current_draw_window++).second->drawWindow( w, mask, region, data );
+         --current_draw_window;
+         }
+     else
+@@ -251,7 +251,7 @@
+     {
+     if( current_build_quads < loaded_effects.size())
+         {
+-        loaded_effects[current_build_quads++].second->buildQuads( w, quadList );
++        loaded_effects.at(current_build_quads++).second->buildQuads( w, quadList );
+         --current_build_quads;
+         }
+     }

diff --git a/kde-base/kwin/kwin-4.6.5-r2.ebuild b/kde-base/kwin/kwin-4.6.5-r2.ebuild
new file mode 100644 (file)
index 0000000..322fad1
--- /dev/null
+++ b/kde-base/kwin/kwin-4.6.5-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.6.5-r2.ebuild,v 1.1 2011/09/13 20:31:43 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kdebase-workspace"
+OPENGL_REQUIRED="optional"
+inherit kde4-meta
+
+DESCRIPTION="KDE window manager"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug xcomposite xinerama"
+
+# NOTE disabled for now: captury? ( media-libs/libcaptury )
+COMMONDEPEND="
+       $(add_kdebase_dep kephal)
+       $(add_kdebase_dep libkworkspace)
+       $(add_kdebase_dep liboxygenstyle)
+       x11-libs/libXdamage
+       x11-libs/libXfixes
+       >=x11-libs/libXrandr-1.2.1
+       x11-libs/libXrender
+       opengl? (
+               virtual/opengl
+               >=media-libs/mesa-7.10
+       )
+       xcomposite? ( x11-libs/libXcomposite )
+       xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${COMMONDEPEND}
+       x11-proto/damageproto
+       x11-proto/fixesproto
+       x11-proto/randrproto
+       x11-proto/renderproto
+       xcomposite? ( x11-proto/compositeproto )
+       xinerama? ( x11-proto/xineramaproto )
+"
+RDEPEND="${COMMONDEPEND}
+       x11-apps/scripts
+"
+
+KMEXTRACTONLY="
+       ksmserver/
+       libs/kephal/
+       libs/oxygen/
+"
+
+PATCHES=(
+       "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
+       "${FILESDIR}/${PN}-fix-opengl.patch"
+       "${FILESDIR}/${PN}-4.6.5-mesadri.patch"
+       "${FILESDIR}/${PN}-4.6.5-performance.patch"
+)
+
+src_prepare() {
+# NOTE uncomment when enabled again by upstream
+#      if ! use captury; then
+#              sed -e 's:^PKGCONFIG..libcaptury:#DONOTFIND &:' \
+#                      -i kwin/effects/CMakeLists.txt || \
+#                      die "Making captury optional failed."
+#      fi
+
+       kde4-meta_src_prepare
+}
+
+src_configure() {
+       # FIXME Remove when activity API moved away from libkworkspace
+       append-cppflags "-I${EPREFIX}/usr/include/kworkspace"
+
+       mycmakeargs=(
+               $(cmake-utils_use_with opengl OpenGL)
+               $(cmake-utils_use_with xinerama X11_Xinerama)
+       )
+
+       kde4-meta_src_configure
+}