Gentoo Archives: gentoo-commits

From: "Andreas HAttel (dilfridge)" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in kde-base/kwin: ChangeLog kwin-4.6.5-r1.ebuild
Date: Mon, 05 Sep 2011 22:18:44
Message-Id: 20110905221832.6771820051@flycatcher.gentoo.org
1 dilfridge 11/09/05 22:18:32
2
3 Modified: ChangeLog
4 Added: kwin-4.6.5-r1.ebuild
5 Log:
6 Backport fix for Intel DRI mis-detection, bug 380737
7
8 (Portage version: 2.1.10.13/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.240 kde-base/kwin/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kwin/ChangeLog?rev=1.240&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kwin/ChangeLog?rev=1.240&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kwin/ChangeLog?r1=1.239&r2=1.240
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v
20 retrieving revision 1.239
21 retrieving revision 1.240
22 diff -u -r1.239 -r1.240
23 --- ChangeLog 17 Aug 2011 20:49:44 -0000 1.239
24 +++ ChangeLog 5 Sep 2011 22:18:32 -0000 1.240
25 @@ -1,6 +1,12 @@
26 # ChangeLog for kde-base/kwin
27 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.239 2011/08/17 20:49:44 dilfridge Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.240 2011/09/05 22:18:32 dilfridge Exp $
30 +
31 +*kwin-4.6.5-r1 (05 Sep 2011)
32 +
33 + 05 Sep 2011; Andreas K. Huettel <dilfridge@g.o> +kwin-4.6.5-r1.ebuild,
34 + +files/kwin-4.6.5-mesadri.patch:
35 + Backport fix for Intel DRI mis-detection, bug 380737
36
37 17 Aug 2011; Andreas K. Huettel <dilfridge@g.o> -kwin-4.7.0.ebuild,
38 kwin-4.7.0-r1.ebuild, -files/kwin-4.7.0-xcomposite_cmake_automagic.patch:
39
40
41
42 1.1 kde-base/kwin/kwin-4.6.5-r1.ebuild
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kwin/kwin-4.6.5-r1.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kwin/kwin-4.6.5-r1.ebuild?rev=1.1&content-type=text/plain
46
47 Index: kwin-4.6.5-r1.ebuild
48 ===================================================================
49 # Copyright 1999-2011 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51 # $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.6.5-r1.ebuild,v 1.1 2011/09/05 22:18:32 dilfridge Exp $
52
53 EAPI=4
54
55 KMNAME="kdebase-workspace"
56 OPENGL_REQUIRED="optional"
57 inherit kde4-meta
58
59 DESCRIPTION="KDE window manager"
60 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
61 IUSE="debug xcomposite xinerama"
62
63 # NOTE disabled for now: captury? ( media-libs/libcaptury )
64 COMMONDEPEND="
65 $(add_kdebase_dep kephal)
66 $(add_kdebase_dep libkworkspace)
67 $(add_kdebase_dep liboxygenstyle)
68 x11-libs/libXdamage
69 x11-libs/libXfixes
70 >=x11-libs/libXrandr-1.2.1
71 x11-libs/libXrender
72 opengl? (
73 virtual/opengl
74 >=media-libs/mesa-7.10
75 )
76 xcomposite? ( x11-libs/libXcomposite )
77 xinerama? ( x11-libs/libXinerama )
78 "
79 DEPEND="${COMMONDEPEND}
80 x11-proto/damageproto
81 x11-proto/fixesproto
82 x11-proto/randrproto
83 x11-proto/renderproto
84 xcomposite? ( x11-proto/compositeproto )
85 xinerama? ( x11-proto/xineramaproto )
86 "
87 RDEPEND="${COMMONDEPEND}
88 x11-apps/scripts
89 "
90
91 KMEXTRACTONLY="
92 ksmserver/
93 libs/kephal/
94 libs/oxygen/
95 "
96
97 PATCHES=(
98 "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
99 "${FILESDIR}/${PN}-fix-opengl.patch"
100 "${FILESDIR}/${PN}-4.6.5-mesadri.patch"
101 )
102
103 src_prepare() {
104 # NOTE uncomment when enabled again by upstream
105 # if ! use captury; then
106 # sed -e 's:^PKGCONFIG..libcaptury:#DONOTFIND &:' \
107 # -i kwin/effects/CMakeLists.txt || \
108 # die "Making captury optional failed."
109 # fi
110
111 kde4-meta_src_prepare
112 }
113
114 src_configure() {
115 # FIXME Remove when activity API moved away from libkworkspace
116 append-cppflags "-I${EPREFIX}/usr/include/kworkspace"
117
118 mycmakeargs=(
119 $(cmake-utils_use_with opengl OpenGL)
120 $(cmake-utils_use_with xinerama X11_Xinerama)
121 )
122
123 kde4-meta_src_configure
124 }