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: kwin-4.8.0.ebuild ChangeLog kwin-4.8.1.ebuild
Date: Wed, 07 Mar 2012 17:14:18
Message-Id: 20120307171406.BC7E52004B@flycatcher.gentoo.org
1 dilfridge 12/03/07 17:14:06
2
3 Modified: kwin-4.8.0.ebuild ChangeLog kwin-4.8.1.ebuild
4 Log:
5 kwin-4.8 needs at least some opengl to build, bug 402029
6
7 (Portage version: 2.1.10.49/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.2 kde-base/kwin/kwin-4.8.0.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kwin/kwin-4.8.0.ebuild?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kwin/kwin-4.8.0.ebuild?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kwin/kwin-4.8.0.ebuild?r1=1.1&r2=1.2
15
16 Index: kwin-4.8.0.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.8.0.ebuild,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- kwin-4.8.0.ebuild 25 Jan 2012 18:17:07 -0000 1.1
23 +++ kwin-4.8.0.ebuild 7 Mar 2012 17:14:06 -0000 1.2
24 @@ -1,19 +1,20 @@
25 # Copyright 1999-2012 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.8.0.ebuild,v 1.1 2012/01/25 18:17:07 johu Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.8.0.ebuild,v 1.2 2012/03/07 17:14:06 dilfridge Exp $
29
30 EAPI=4
31
32 KMNAME="kde-workspace"
33 -OPENGL_REQUIRED="optional"
34 +OPENGL_REQUIRED="always"
35 inherit kde4-meta
36
37 DESCRIPTION="KDE window manager"
38 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
39 -IUSE="debug gles xinerama"
40 +IUSE="debug gles opengl xinerama"
41
42 COMMONDEPEND="
43 $(add_kdebase_dep kactivities)
44 + $(add_kdebase_dep kdelibs opengl)
45 $(add_kdebase_dep kephal)
46 $(add_kdebase_dep libkworkspace)
47 $(add_kdebase_dep liboxygenstyle)
48 @@ -51,11 +52,8 @@
49 "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
50 )
51
52 -# normally, you can use just gles or opengl or none
53 -#REQUIRED_USE="opengl? ( !gles ) gles? ( !opengl )"
54 -
55 -# right now, upstream requires opengl to always be enabled with gles
56 -REQUIRED_USE="gles? ( opengl )"
57 +# you need one of these
58 +REQUIRED_USE="!opengl? ( gles ) !gles? ( opengl )"
59
60 src_configure() {
61 # FIXME Remove when activity API moved away from libkworkspace
62
63
64
65 1.266 kde-base/kwin/ChangeLog
66
67 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kwin/ChangeLog?rev=1.266&view=markup
68 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kwin/ChangeLog?rev=1.266&content-type=text/plain
69 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kwin/ChangeLog?r1=1.265&r2=1.266
70
71 Index: ChangeLog
72 ===================================================================
73 RCS file: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v
74 retrieving revision 1.265
75 retrieving revision 1.266
76 diff -u -r1.265 -r1.266
77 --- ChangeLog 6 Mar 2012 23:35:21 -0000 1.265
78 +++ ChangeLog 7 Mar 2012 17:14:06 -0000 1.266
79 @@ -1,6 +1,10 @@
80 # ChangeLog for kde-base/kwin
81 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
82 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.265 2012/03/06 23:35:21 dilfridge Exp $
83 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.266 2012/03/07 17:14:06 dilfridge Exp $
84 +
85 + 07 Mar 2012; Andreas K. Huettel <dilfridge@g.o> kwin-4.8.0.ebuild,
86 + kwin-4.8.1.ebuild:
87 + kwin-4.8 needs at least some opengl to build, bug 402029
88
89 *kwin-4.8.1 (06 Mar 2012)
90
91
92
93
94 1.2 kde-base/kwin/kwin-4.8.1.ebuild
95
96 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kwin/kwin-4.8.1.ebuild?rev=1.2&view=markup
97 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kwin/kwin-4.8.1.ebuild?rev=1.2&content-type=text/plain
98 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kwin/kwin-4.8.1.ebuild?r1=1.1&r2=1.2
99
100 Index: kwin-4.8.1.ebuild
101 ===================================================================
102 RCS file: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.8.1.ebuild,v
103 retrieving revision 1.1
104 retrieving revision 1.2
105 diff -u -r1.1 -r1.2
106 --- kwin-4.8.1.ebuild 6 Mar 2012 23:35:21 -0000 1.1
107 +++ kwin-4.8.1.ebuild 7 Mar 2012 17:14:06 -0000 1.2
108 @@ -1,19 +1,20 @@
109 # Copyright 1999-2012 Gentoo Foundation
110 # Distributed under the terms of the GNU General Public License v2
111 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.8.1.ebuild,v 1.1 2012/03/06 23:35:21 dilfridge Exp $
112 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.8.1.ebuild,v 1.2 2012/03/07 17:14:06 dilfridge Exp $
113
114 EAPI=4
115
116 KMNAME="kde-workspace"
117 -OPENGL_REQUIRED="optional"
118 +OPENGL_REQUIRED="always"
119 inherit kde4-meta
120
121 DESCRIPTION="KDE window manager"
122 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
123 -IUSE="debug gles xinerama"
124 +IUSE="debug gles opengl xinerama"
125
126 COMMONDEPEND="
127 $(add_kdebase_dep kactivities)
128 + $(add_kdebase_dep kdelibs opengl)
129 $(add_kdebase_dep kephal)
130 $(add_kdebase_dep libkworkspace)
131 $(add_kdebase_dep liboxygenstyle)
132 @@ -51,11 +52,8 @@
133 "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
134 )
135
136 -# normally, you can use just gles or opengl or none
137 -#REQUIRED_USE="opengl? ( !gles ) gles? ( !opengl )"
138 -
139 -# right now, upstream requires opengl to always be enabled with gles
140 -REQUIRED_USE="gles? ( opengl )"
141 +# you need one of these
142 +REQUIRED_USE="!opengl? ( gles ) !gles? ( opengl )"
143
144 src_configure() {
145 # FIXME Remove when activity API moved away from libkworkspace