1 |
commit: a4553898463dc1518334bd23589ed135db4a3709 |
2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 26 22:40:14 2018 +0000 |
4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 26 22:40:30 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4553898 |
7 |
|
8 |
x11-wm/compiz: remove last rited package |
9 |
|
10 |
x11-wm/compiz/Manifest | 1 - |
11 |
x11-wm/compiz/compiz-0.8.8-r3.ebuild | 158 ------------ |
12 |
x11-wm/compiz/files/compiz-gcc-4.7.patch | 38 --- |
13 |
x11-wm/compiz/files/compiz-manager | 384 ------------------------------ |
14 |
x11-wm/compiz/files/compiz-no-gconf.patch | 20 -- |
15 |
x11-wm/compiz/files/compiz.desktop | 11 - |
16 |
x11-wm/compiz/metadata.xml | 18 -- |
17 |
7 files changed, 630 deletions(-) |
18 |
|
19 |
diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest |
20 |
deleted file mode 100644 |
21 |
index f5e1baa4c0e..00000000000 |
22 |
--- a/x11-wm/compiz/Manifest |
23 |
+++ /dev/null |
24 |
@@ -1 +0,0 @@ |
25 |
-DIST compiz-0.8.8.tar.bz2 1123892 BLAKE2B 0de05006efca091cc136c018fa265c42364d7c97654f8fc75e5b5ed80b0b30f50f20b1acd273dafccd2bfb592b1e7d4652ad45c4d3290c16edf5d5138a5be184 SHA512 6e3bad018835fdbc1b0e5ecb51a46a77a6531d46d77ee3ae4169273632ea9a6839c78300b18e2198c41698517efa65ded75387785b0c5bbbb6da41498451b644 |
26 |
|
27 |
diff --git a/x11-wm/compiz/compiz-0.8.8-r3.ebuild b/x11-wm/compiz/compiz-0.8.8-r3.ebuild |
28 |
deleted file mode 100644 |
29 |
index 36d5c22ae14..00000000000 |
30 |
--- a/x11-wm/compiz/compiz-0.8.8-r3.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,158 +0,0 @@ |
33 |
-# Copyright 1999-2016 Gentoo Foundation |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=5 |
37 |
- |
38 |
-inherit autotools eutils gnome2-utils |
39 |
- |
40 |
-DESCRIPTION="OpenGL window and compositing manager" |
41 |
-HOMEPAGE="http://www.compiz.org/" |
42 |
-SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2" |
43 |
- |
44 |
-LICENSE="GPL-2 LGPL-2.1 MIT" |
45 |
-SLOT="0" |
46 |
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
47 |
-IUSE="+cairo dbus fuse gnome gconf gtk +svg" |
48 |
- |
49 |
-COMMONDEPEND=" |
50 |
- >=dev-libs/glib-2 |
51 |
- dev-libs/libxml2 |
52 |
- dev-libs/libxslt |
53 |
- media-libs/libpng:0= |
54 |
- >=media-libs/mesa-6.5.1-r1 |
55 |
- >=x11-base/xorg-server-1.1.1-r1 |
56 |
- >=x11-libs/libX11-1.4 |
57 |
- x11-libs/libxcb |
58 |
- x11-libs/libXcomposite |
59 |
- x11-libs/libXdamage |
60 |
- x11-libs/libXinerama |
61 |
- x11-libs/libXrandr |
62 |
- x11-libs/libICE |
63 |
- x11-libs/libSM |
64 |
- >=x11-libs/libXrender-0.8.4 |
65 |
- >=x11-libs/startup-notification-0.7 |
66 |
- virtual/glu |
67 |
- cairo? ( |
68 |
- x11-libs/cairo[X] |
69 |
- ) |
70 |
- dbus? ( |
71 |
- >=sys-apps/dbus-1.0 |
72 |
- dev-libs/dbus-glib |
73 |
- ) |
74 |
- fuse? ( sys-fs/fuse ) |
75 |
- gnome? ( |
76 |
- >=gnome-base/gnome-control-center-2.16.1:2 |
77 |
- gnome-base/gnome-desktop:2 |
78 |
- gconf? ( gnome-base/gconf:2 ) |
79 |
- ) |
80 |
- gtk? ( |
81 |
- >=x11-libs/gtk+-2.8.0:2 |
82 |
- >=x11-libs/libwnck-2.18.3:1 |
83 |
- x11-libs/pango |
84 |
- ) |
85 |
- svg? ( |
86 |
- >=gnome-base/librsvg-2.14.0:2 |
87 |
- >=x11-libs/cairo-1.0 |
88 |
- ) |
89 |
-" |
90 |
- |
91 |
-DEPEND="${COMMONDEPEND} |
92 |
- virtual/pkgconfig |
93 |
- x11-proto/damageproto |
94 |
- x11-proto/xineramaproto |
95 |
-" |
96 |
- |
97 |
-RDEPEND="${COMMONDEPEND} |
98 |
- x11-apps/mesa-progs |
99 |
- x11-apps/xdpyinfo |
100 |
- x11-apps/xset |
101 |
- x11-apps/xvinfo |
102 |
-" |
103 |
- |
104 |
-DOCS=( AUTHORS ChangeLog NEWS README TODO ) |
105 |
- |
106 |
-src_prepare() { |
107 |
- echo gtk/gnome/compiz-wm.desktop.in >> po/POTFILES.skip |
108 |
- echo metadata/core.xml.in >> po/POTFILES.skip |
109 |
- |
110 |
- # Patch for compatibility with gcc 4.7 |
111 |
- epatch "${FILESDIR}"/${PN}-gcc-4.7.patch |
112 |
- |
113 |
- if ! use gnome || ! use gconf; then |
114 |
- epatch "${FILESDIR}"/${PN}-no-gconf.patch |
115 |
- fi |
116 |
- eautoreconf |
117 |
-} |
118 |
- |
119 |
-src_configure() { |
120 |
- local myconf |
121 |
- |
122 |
- # We make gconf optional by itself, but only if gnome is also |
123 |
- # enabled, otherwise we simply disable it. |
124 |
- if use gnome; then |
125 |
- myconf="${myconf} $(use_enable gconf)" |
126 |
- else |
127 |
- myconf="${myconf} --disable-gconf" |
128 |
- fi |
129 |
- |
130 |
- econf \ |
131 |
- --enable-fast-install \ |
132 |
- --disable-static \ |
133 |
- --disable-gnome-keybindings \ |
134 |
- --with-default-plugins \ |
135 |
- $(use_enable svg librsvg) \ |
136 |
- $(use_enable cairo annotate) \ |
137 |
- $(use_enable dbus) \ |
138 |
- $(use_enable dbus dbus-glib) \ |
139 |
- $(use_enable fuse) \ |
140 |
- $(use_enable gnome) \ |
141 |
- $(use_enable gnome metacity) \ |
142 |
- $(use_enable gtk) \ |
143 |
- --disable-kde4 \ |
144 |
- --disable-kde \ |
145 |
- ${myconf} |
146 |
-} |
147 |
- |
148 |
-src_install() { |
149 |
- default |
150 |
- prune_libtool_files --all |
151 |
- |
152 |
- # Install compiz-manager |
153 |
- dobin "${FILESDIR}"/compiz-manager |
154 |
- |
155 |
- # Add the full-path to lspci |
156 |
- sed -i "s#lspci#/usr/sbin/lspci#" "${D}/usr/bin/compiz-manager" || die |
157 |
- |
158 |
- # Fix the hardcoded lib paths |
159 |
- sed -i "s#/lib/#/$(get_libdir)/#g" "${D}/usr/bin/compiz-manager" || die |
160 |
- |
161 |
- # Create gentoo's config file |
162 |
- dodir /etc/xdg/compiz |
163 |
- |
164 |
- cat <<- EOF > "${D}/etc/xdg/compiz/compiz-manager" |
165 |
- COMPIZ_BIN_PATH="/usr/bin/" |
166 |
- PLUGIN_PATH="/usr/$(get_libdir)/compiz/" |
167 |
- LIBGL_NVIDIA="/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.so.1.2" |
168 |
- LIBGL_FGLRX="/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.so.1.2" |
169 |
- KWIN="$(type -p kwin)" |
170 |
- METACITY="$(type -p metacity)" |
171 |
- SKIP_CHECKS="yes" |
172 |
- EOF |
173 |
- |
174 |
- domenu "${FILESDIR}"/compiz.desktop |
175 |
-} |
176 |
- |
177 |
-pkg_preinst() { |
178 |
- use gnome && use gconf && gnome2_gconf_savelist |
179 |
-} |
180 |
- |
181 |
-pkg_postinst() { |
182 |
- use gnome && use gconf && gnome2_gconf_install |
183 |
- |
184 |
- ewarn "If you update to x11-wm/metacity-2.24 after you install ${P}," |
185 |
- ewarn "gtk-window-decorator will crash until you reinstall ${PN} again." |
186 |
-} |
187 |
- |
188 |
-pkg_prerm() { |
189 |
- use gnome && gnome2_gconf_uninstall |
190 |
-} |
191 |
|
192 |
diff --git a/x11-wm/compiz/files/compiz-gcc-4.7.patch b/x11-wm/compiz/files/compiz-gcc-4.7.patch |
193 |
deleted file mode 100644 |
194 |
index 28315baec5b..00000000000 |
195 |
--- a/x11-wm/compiz/files/compiz-gcc-4.7.patch |
196 |
+++ /dev/null |
197 |
@@ -1,38 +0,0 @@ |
198 |
---- kde/window-decorator-kde4/window.cpp 2010-05-21 11:18:14.000000000 +0000 |
199 |
-+++ kde/window-decorator-kde4/window.cpp 2012-09-12 18:05:00.000000000 +0000 |
200 |
-@@ -59,6 +59,9 @@ |
201 |
- |
202 |
- #include "paintredirector.h" |
203 |
- |
204 |
-+// header for gcc-4.7 compatibility |
205 |
-+#include "unistd.h" |
206 |
-+ |
207 |
- KWD::Window::Window (WId parentId, |
208 |
- WId clientId, |
209 |
- WId frame, |
210 |
---- configure.ac.orig 2012-09-12 23:39:54.093812000 +0400 |
211 |
-+++ configure.ac 2012-09-12 23:40:37.253686000 +0400 |
212 |
-@@ -72,11 +72,6 @@ |
213 |
- *) CFLAGS="$CFLAGS -Wnested-externs" ;; |
214 |
- esac |
215 |
- |
216 |
-- case " $CFLAGS " in |
217 |
-- *[[\ \ ]]-D_FORTIFY_SOURCE=2[[\ \ ]]*) ;; |
218 |
-- *) CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" ;; |
219 |
-- esac |
220 |
-- |
221 |
- if test "x$enable_ansi" = "xyes"; then |
222 |
- case " $CFLAGS " in |
223 |
- *[[\ \ ]]-ansi[[\ \ ]]*) ;; |
224 |
-@@ -95,11 +90,6 @@ |
225 |
- *[[\ \ ]]-Wall[[\ \ ]]*) ;; |
226 |
- *) CXXFLAGS="$CXXFLAGS -Wall" ;; |
227 |
- esac |
228 |
-- |
229 |
-- case " $CXXFLAGS " in |
230 |
-- *[[\ \ ]]-D_FORTIFY_SOURCE=2[[\ \ ]]*) ;; |
231 |
-- *) CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2" ;; |
232 |
-- esac |
233 |
- fi |
234 |
- |
235 |
- AC_C_BIGENDIAN |
236 |
|
237 |
diff --git a/x11-wm/compiz/files/compiz-manager b/x11-wm/compiz/files/compiz-manager |
238 |
deleted file mode 100644 |
239 |
index 74d45da2590..00000000000 |
240 |
--- a/x11-wm/compiz/files/compiz-manager |
241 |
+++ /dev/null |
242 |
@@ -1,384 +0,0 @@ |
243 |
-#!/bin/sh |
244 |
-# Compiz Manager wrapper script |
245 |
-# |
246 |
-# Copyright (c) 2007 Kristian Lyngstøl <kristian@×××××××××.org> |
247 |
-# |
248 |
-# This program is free software; you can redistribute it and/or modify |
249 |
-# it under the terms of the GNU General Public License as published by |
250 |
-# the Free Software Foundation; either version 2 of the License, or |
251 |
-# (at your option) any later version. |
252 |
-# |
253 |
-# This program is distributed in the hope that it will be useful, |
254 |
-# but WITHOUT ANY WARRANTY; without even the implied warranty of |
255 |
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
256 |
-# GNU General Public License for more details. |
257 |
-# |
258 |
-# |
259 |
-# You should have received a copy of the GNU General Public License |
260 |
-# along with this program; if not, write to the Free Software |
261 |
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
262 |
-# |
263 |
-# |
264 |
-# Contributions by: Treviño (3v1n0) <trevi55@×××××.com>, Ubuntu Packages |
265 |
-# |
266 |
-# Much of this code is based on Beryl code, also licensed under the GPL. |
267 |
-# This script will detect what options we need to pass to compiz to get it |
268 |
-# started, and start a default plugin and possibly window decorator. |
269 |
-# |
270 |
- |
271 |
- |
272 |
-COMPIZ_BIN_PATH="/usr/bin/" # For window decorators and compiz |
273 |
-PLUGIN_PATH="/usr/lib/compiz/" |
274 |
-GLXINFO="/usr/bin/glxinfo" |
275 |
-KWIN="/usr/bin/kwin" |
276 |
-METACITY="/usr/bin/metacity" |
277 |
-COMPIZ_NAME="compiz" # Final name for compiz (compiz.real) |
278 |
- |
279 |
-# For Xgl LD_PRELOAD |
280 |
-LIBGL_NVIDIA="/usr/lib/nvidia/libGL.so.1.2.xlibmesa" |
281 |
-LIBGL_FGLRX="/usr/lib/fglrx/libGL.so.1.2.xlibmesa" |
282 |
- |
283 |
-# Minimum amount of memory (in kilo bytes) that nVidia cards need |
284 |
-# to be allowed to start |
285 |
-# Set to 262144 to require 256MB |
286 |
-NVIDIA_MEMORY="65536" # 64MB |
287 |
-NVIDIA_SETTINGS="nvidia-settings" # Assume it's in the path by default |
288 |
- |
289 |
-# For detecting what driver is in use, the + is for one or more /'s |
290 |
-XORG_DRIVER_PATH="/usr/lib/xorg/modules/drivers/+" |
291 |
- |
292 |
-FALLBACKWM="${METACITY}" |
293 |
-FALLBACKWM_OPTIONS="--replace $@" |
294 |
- |
295 |
-# Driver whitelist |
296 |
-WHITELIST="nvidia intel ati radeon i810" |
297 |
- |
298 |
-# blacklist based on the pci ids |
299 |
-# See http://wiki.compiz-fusion.org/Hardware/Blacklist for details |
300 |
-T=" 1002:5954 1002:5854 1002:5955" # ati rs480 |
301 |
-T="$T 1002:4153" # ATI Rv350 |
302 |
-T="$T 8086:2982 8086:2992 8086:29a2 8086:2a02 8086:2a12" # intel 965 |
303 |
-BLACKLIST_PCIIDS="$T" |
304 |
-unset T |
305 |
- |
306 |
-COMPIZ_OPTIONS="--ignore-desktop-hints --replace" |
307 |
-COMPIZ_PLUGINS="" |
308 |
-ENV="" |
309 |
- |
310 |
-# Use emerald by default if it exist |
311 |
-USE_EMERALD="yes" |
312 |
- |
313 |
-# No indirect by default |
314 |
-INDIRECT="no" |
315 |
- |
316 |
-# Default X.org log if xset q doesn't reveal it |
317 |
-XORG_DEFAULT_LOG="/var/log/Xorg.0.log" |
318 |
- |
319 |
-# Set to yes to enable verbose |
320 |
-VERBOSE="yes" |
321 |
- |
322 |
-# Echos the arguments if verbose |
323 |
-verbose() |
324 |
-{ |
325 |
- if [ "x$VERBOSE" = "xyes" ]; then |
326 |
- printf "$*" |
327 |
- fi |
328 |
-} |
329 |
- |
330 |
-# abort script and run fallback windowmanager |
331 |
-abort_with_fallback_wm() |
332 |
-{ |
333 |
- if [ "x$SKIP_CHECKS" = "xyes" ]; then |
334 |
- verbose "SKIP_CHECKS is yes, so continuing despite problems.\n" |
335 |
- return 0; |
336 |
- fi |
337 |
- |
338 |
- verbose "aborting and using fallback: $FALLBACKWM \n" |
339 |
- |
340 |
- if [ -x $FALLBACKWM ]; then |
341 |
- exec $FALLBACKWM $FALLBACKWM_OPTIONS |
342 |
- else |
343 |
- printf "no $FALLBACKWM found, exiting\n" |
344 |
- exit 1 |
345 |
- fi |
346 |
-} |
347 |
- |
348 |
-# Check for non power of two texture support |
349 |
-check_npot_texture() |
350 |
-{ |
351 |
- verbose "Checking for non power of two support: " |
352 |
- if glxinfo 2> /dev/null | egrep -q '(GL_ARB_texture_non_power_of_two|GL_NV_texture_rectangle|GL_EXT_texture_rectangle|GL_ARB_texture_rectangle)' ; then |
353 |
- verbose "present. \n"; |
354 |
- return 0; |
355 |
- else |
356 |
- verbose "Not present. \n" |
357 |
- return 1; |
358 |
- fi |
359 |
- |
360 |
-} |
361 |
- |
362 |
-# Check for presence of FBConfig |
363 |
-check_fbconfig() |
364 |
-{ |
365 |
- verbose "Checking for FBConfig: " |
366 |
- if [ "$INDIRECT" = "yes" ]; then |
367 |
- $GLXINFO -i | grep -q GLX.*fbconfig |
368 |
- FB=$? |
369 |
- else |
370 |
- $GLXINFO | grep -q GLX.*fbconfig |
371 |
- FB=$? |
372 |
- fi |
373 |
- |
374 |
- if [ $FB = "0" ]; then |
375 |
- unset FB |
376 |
- verbose "present. \n" |
377 |
- return 0; |
378 |
- else |
379 |
- unset FB |
380 |
- verbose "not present. \n" |
381 |
- return 1; |
382 |
- fi |
383 |
-} |
384 |
- |
385 |
- |
386 |
-# Check for TFP |
387 |
-check_tfp() |
388 |
-{ |
389 |
- verbose "Checking for texture_from_pixmap: " |
390 |
- if [ $($GLXINFO 2>/dev/null | grep GLX_EXT_texture_from_pixmap -c) -gt 2 ] ; then |
391 |
- verbose "present. \n" |
392 |
- return 0; |
393 |
- else |
394 |
- verbose "not present. \n" |
395 |
- if [ "$INDIRECT" = "yes" ]; then |
396 |
- unset LIBGL_ALWAYS_INDIRECT |
397 |
- INDIRECT="no" |
398 |
- return 1; |
399 |
- else |
400 |
- verbose "Trying again with indirect rendering:\n"; |
401 |
- INDIRECT="yes" |
402 |
- export LIBGL_ALWAYS_INDIRECT=1 |
403 |
- check_tfp; |
404 |
- return $? |
405 |
- fi |
406 |
- fi |
407 |
-} |
408 |
- |
409 |
-# Check wether the composite extension is present |
410 |
-check_composite() |
411 |
-{ |
412 |
- verbose "Checking for Composite extension: " |
413 |
- if xdpyinfo -queryExtensions | grep -q Composite ; then |
414 |
- verbose "present. \n"; |
415 |
- return 0; |
416 |
- else |
417 |
- verbose "not present. \n"; |
418 |
- return 1; |
419 |
- fi |
420 |
-} |
421 |
- |
422 |
-# Detects if Xgl is running |
423 |
-check_xgl() |
424 |
-{ |
425 |
- verbose "Checking for Xgl: " |
426 |
- if xvinfo | grep -q Xgl ; then |
427 |
- verbose "present. \n" |
428 |
- return 0; |
429 |
- else |
430 |
- verbose "not present. \n" |
431 |
- return 1; |
432 |
- fi |
433 |
-} |
434 |
- |
435 |
-# Check if the nVidia card has enough video ram to make sense |
436 |
-check_nvidia_memory() |
437 |
-{ |
438 |
- MEM=$(${NVIDIA_SETTINGS} -q VideoRam | egrep Attribute\ \'VideoRam\'\ .*: | cut -d: -f3 | sed 's/[^0-9]//g') |
439 |
- if [ $MEM -lt $NVIDIA_MEMORY ]; then |
440 |
- verbose "Less than ${NVIDIA_MEMORY}kb of memory and nVidia"; |
441 |
- return 1; |
442 |
- fi |
443 |
- return 0; |
444 |
-} |
445 |
- |
446 |
-# Check for existence if NV-GLX |
447 |
-check_nvidia() |
448 |
-{ |
449 |
- if [ ! -z $NVIDIA_INTERNAL_TEST ]; then |
450 |
- return $NVIDIA_INTERNAL_TEST; |
451 |
- fi |
452 |
- verbose "Checking for nVidia: " |
453 |
- if xdpyinfo | grep -q NV-GLX ; then |
454 |
- verbose "present. \n" |
455 |
- NVIDIA_INTERNAL_TEST=0 |
456 |
- return 0; |
457 |
- else |
458 |
- verbose "not present. \n" |
459 |
- NVIDIA_INTERNAL_TEST=1 |
460 |
- return 1; |
461 |
- fi |
462 |
-} |
463 |
- |
464 |
-# Check if the max texture size is large enough compared to the resolution |
465 |
-check_texture_size() |
466 |
-{ |
467 |
- TEXTURE_LIMIT=$(glxinfo -l | grep -m1 GL_MAX_TEXTURE_SIZE | sed 's/.*=[^0-9]//g') |
468 |
- RESOLUTION=$(xdpyinfo | grep -i dimensions: | sed 's/[^0-9]*pixels.*(.*).*//' | sed 's/[^0-9x]*//') |
469 |
- VRES=$(echo $RESOLUTION | sed 's/.*x//') |
470 |
- HRES=$(echo $RESOLUTION | sed 's/x.*//') |
471 |
- verbose "Comparing resolution ($RESOLUTION) to maximum 3D texture size ($TEXTURE_LIMIT): "; |
472 |
- if [ $VRES -gt $TEXTURE_LIMIT ] || [ $HRES -gt $TEXTURE_LIMIT ]; then |
473 |
- verbose "Failed.\n" |
474 |
- return 1; |
475 |
- fi |
476 |
- verbose "Passed.\n" |
477 |
- return 0 |
478 |
-} |
479 |
- |
480 |
-# check driver whitelist |
481 |
-running_under_whitelisted_driver() |
482 |
-{ |
483 |
- LOG=$(xset q|grep "Log file"|awk '{print $3}') |
484 |
- if [ "$LOG" = "" ]; then |
485 |
- verbose "xset q doesn't reveal the location of the log file. Using fallback $XORG_DEFAULT_LOG \n" |
486 |
- LOG=$XORG_DEFAULT_LOG; |
487 |
- fi |
488 |
- if [ -z "$LOG" ];then |
489 |
- verbose "AIEEEEH, no Log file found \n" |
490 |
- verbose "$(xset q) \n" |
491 |
- return 0 |
492 |
- fi |
493 |
- for DRV in ${WHITELIST}; do |
494 |
- if egrep -q "Loading ${XORG_DRIVER_PATH}${DRV}_drv\.so" $LOG && |
495 |
- ! egrep -q "Unloading ${XORG_DRIVER_PATH}${DRV}_drv\.so" $LOG; |
496 |
- then |
497 |
- return 0 |
498 |
- fi |
499 |
- done |
500 |
- verbose "No whitelisted driver found\n" |
501 |
- return 1 |
502 |
-} |
503 |
- |
504 |
-# check pciid blacklist |
505 |
-have_blacklisted_pciid() |
506 |
-{ |
507 |
- OUTPUT=$(lspci -n) |
508 |
- for ID in ${BLACKLIST_PCIIDS}; do |
509 |
- if echo "$OUTPUT" | egrep -q "$ID"; then |
510 |
- verbose "Blacklisted PCIID '$ID' found \n" |
511 |
- return 0 |
512 |
- fi |
513 |
- done |
514 |
- OUTPUT=$(lspci -vn | grep -i VGA) |
515 |
- verbose "Detected PCI ID for VGA: $OUTPUT\n" |
516 |
- return 1 |
517 |
-} |
518 |
- |
519 |
-build_env() |
520 |
-{ |
521 |
- if check_nvidia; then |
522 |
- ENV="__GL_YIELD=NOTHING " |
523 |
- fi |
524 |
- if [ "$INDIRECT" = "yes" ]; then |
525 |
- ENV="$ENV LIBGL_ALWAYS_INDIRECT=1 " |
526 |
- fi |
527 |
- if check_xgl; then |
528 |
- if [ -f ${LIBGL_NVIDIA} ]; then |
529 |
- ENV="$ENV LD_PRELOAD=${LIBGL_NVIDIA}" |
530 |
- verbose "Enabling Xgl with nVidia drivers...\n" |
531 |
- fi |
532 |
- if [ -f ${LIBGL_FGLRX} ]; then |
533 |
- ENV="$ENV LD_PRELOAD=${LIBGL_FGLRX}" |
534 |
- verbose "Enabling Xgl with fglrx ATi drivers...\n" |
535 |
- fi |
536 |
- fi |
537 |
- |
538 |
- ENV="$ENV FROM_WRAPPER=yes" |
539 |
- |
540 |
- if [ -n "$ENV" ]; then |
541 |
- export $ENV |
542 |
- fi |
543 |
-} |
544 |
- |
545 |
-build_args() |
546 |
-{ |
547 |
- if [ $INDIRECT = "yes" ]; then |
548 |
- COMPIZ_OPTIONS="$COMPIZ_OPTIONS --indirect-rendering " |
549 |
- fi |
550 |
- if check_nvidia; then |
551 |
- COMPIZ_OPTIONS="$COMPIZ_OPTIONS --loose-binding" |
552 |
- fi |
553 |
-} |
554 |
- |
555 |
-#################### |
556 |
-# Execution begins here. |
557 |
- |
558 |
-# Read configuration from XDG paths |
559 |
-if [ -z "$XDG_CONFIG_DIRS" ]; then |
560 |
- test -f /etc/xdg/compiz/compiz-manager && . /etc/xdg/compiz/compiz-manager |
561 |
-else |
562 |
- test -f $XDG_CONFIG_DIRS/compiz/compiz-manager && . $XDG_CONFIG_DIRS/compiz/compiz-manager |
563 |
-fi |
564 |
- |
565 |
-if [ -z "$XDG_CONFIG_HOME" ]; then |
566 |
- test -f $HOME/.config/compiz/compiz-manager && . $HOME/.config/compiz/compiz-manager |
567 |
-else |
568 |
- test -f $XDG_CONFIG_HOME/compiz/compiz-manager && . $XDG_CONFIG_HOME/compiz/compiz-manager |
569 |
-fi |
570 |
- |
571 |
-# Don't use compiz when running the failsafe session |
572 |
-if [ "x$GNOME_DESKTOP_SESSION_ID" = "xFailsafe" ]; then |
573 |
- abort_with_fallback_wm |
574 |
-fi |
575 |
- |
576 |
-if [ "x$LIBGL_ALWAYS_INDIRECT" = "x1" ]; then |
577 |
- INDIRECT="yes"; |
578 |
-fi |
579 |
- |
580 |
-# if we run under Xgl, we can skip some tests here |
581 |
-if ! check_xgl; then |
582 |
- # if vesa or vga are in use, do not even try glxinfo (LP#119341) |
583 |
- if ! running_under_whitelisted_driver || have_blacklisted_pciid; then |
584 |
- abort_with_fallback_wm |
585 |
- fi |
586 |
- # check if we have the required bits to run compiz and if not, |
587 |
- # fallback |
588 |
- if ! check_tfp || ! check_npot_texture || ! check_composite || ! check_texture_size; then |
589 |
- abort_with_fallback_wm |
590 |
- fi |
591 |
- |
592 |
- if check_nvidia && ! check_nvidia_memory; then |
593 |
- abort_with_fallback_wm |
594 |
- fi |
595 |
- |
596 |
- if ! check_fbconfig; then |
597 |
- abort_with_fallback_wm |
598 |
- fi |
599 |
-fi |
600 |
- |
601 |
-# load the ccp plugin if present and fallback to plain gconf if not |
602 |
-if [ -f ${PLUGIN_PATH}libccp.so ]; then |
603 |
- COMPIZ_PLUGINS="$COMPIZ_PLUGINS ccp" |
604 |
-elif [ -f ${PLUGIN_PATH}libgconf.so ]; then |
605 |
- COMPIZ_PLUGINS="$COMPIZ_PLUGINS glib gconf" |
606 |
-fi |
607 |
- |
608 |
-# get environment |
609 |
-build_env |
610 |
-build_args |
611 |
- |
612 |
-# start the gtk-window-decorator if present |
613 |
-if [ -x ${COMPIZ_BIN_PATH}emerald ] && [ "$USE_EMERALD" = "yes" ]; then |
614 |
- verbose "Starting emerald\n" |
615 |
- ${COMPIZ_BIN_PATH}emerald --replace & |
616 |
-elif [ -x ${COMPIZ_BIN_PATH}gtk-window-decorator ] && [ -n "$GNOME_DESKTOP_SESSION_ID" ]; then |
617 |
- verbose "Starting gtk-window-decorator\n" |
618 |
- ${COMPIZ_BIN_PATH}gtk-window-decorator --replace & |
619 |
-elif [ -x ${COMPIZ_BIN_PATH}kde-window-decorator ] && [ -n "$KDE_FULL_SESSION" ]; then |
620 |
- verbose "Starting kde-window-decorator\n" |
621 |
- ${COMPIZ_BIN_PATH}kde-window-decorator --replace & |
622 |
- FALLBACKWM="${KWIN}" |
623 |
-fi |
624 |
- |
625 |
-${COMPIZ_BIN_PATH}${COMPIZ_NAME} $COMPIZ_OPTIONS "$@" $COMPIZ_PLUGINS || exec $FALLBACKWM $FALLBACKWM_OPTIONS |
626 |
- |
627 |
|
628 |
diff --git a/x11-wm/compiz/files/compiz-no-gconf.patch b/x11-wm/compiz/files/compiz-no-gconf.patch |
629 |
deleted file mode 100644 |
630 |
index d43e84de681..00000000000 |
631 |
--- a/x11-wm/compiz/files/compiz-no-gconf.patch |
632 |
+++ /dev/null |
633 |
@@ -1,20 +0,0 @@ |
634 |
- configure.ac | 4 ++-- |
635 |
- 1 files changed, 2 insertions(+), 2 deletions(-) |
636 |
- |
637 |
-diff --git a/configure.ac b/configure.ac |
638 |
-index 7b09153..9c22ea0 100644 |
639 |
---- a/configure.ac |
640 |
-+++ b/configure.ac |
641 |
-@@ -192,10 +192,10 @@ if test "x$use_gconf" = "xyes"; then |
642 |
- if test x"$GCONFTOOL" = xno; then |
643 |
- AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf]) |
644 |
- fi |
645 |
-+else |
646 |
-+ AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, test "x$use_gconf" = "xyes") |
647 |
- fi |
648 |
- |
649 |
--AM_GCONF_SOURCE_2 |
650 |
-- |
651 |
- AM_CONDITIONAL(USE_GCONF, test "x$use_gconf" = "xyes") |
652 |
- if test "$use_gconf" = yes; then |
653 |
- AC_DEFINE(USE_GCONF, 1, [Build gconf plugin]) |
654 |
|
655 |
diff --git a/x11-wm/compiz/files/compiz.desktop b/x11-wm/compiz/files/compiz.desktop |
656 |
deleted file mode 100644 |
657 |
index 22cf642b236..00000000000 |
658 |
--- a/x11-wm/compiz/files/compiz.desktop |
659 |
+++ /dev/null |
660 |
@@ -1,11 +0,0 @@ |
661 |
-[Desktop Entry] |
662 |
-Type=Application |
663 |
-Name=Compiz |
664 |
-Name[en_GB]=Compiz |
665 |
-Exec=compiz ccp |
666 |
-NoDisplay=true |
667 |
-# name we put on the WM spec check window |
668 |
-X-GNOME-WMName=Compiz |
669 |
-X-GNOME-Autostart-Phase=WindowManager |
670 |
-X-GNOME-Provides=windowmanager |
671 |
-X-GNOME-Autostart-Notify=true |
672 |
|
673 |
diff --git a/x11-wm/compiz/metadata.xml b/x11-wm/compiz/metadata.xml |
674 |
deleted file mode 100644 |
675 |
index 3c7523d4790..00000000000 |
676 |
--- a/x11-wm/compiz/metadata.xml |
677 |
+++ /dev/null |
678 |
@@ -1,18 +0,0 @@ |
679 |
-<?xml version="1.0" encoding="UTF-8"?> |
680 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
681 |
-<pkgmetadata> |
682 |
- <!-- maintainer-needed --> |
683 |
- <use> |
684 |
- <flag name="fuse"> |
685 |
- Enables support for the filesystem in userspace plugin through <pkg>sys-fs/fuse</pkg>. |
686 |
- </flag> |
687 |
- <flag name="gconf"> |
688 |
- Enable the GConf-based configuration backend; it is not required |
689 |
- to work with GNOME, and might actually be faster if it's not |
690 |
- used. |
691 |
- </flag> |
692 |
- </use> |
693 |
- <longdescription> |
694 |
- compiz is a compositing window manager that uses 3D graphics acceleration via OpenGL. |
695 |
- </longdescription> |
696 |
-</pkgmetadata> |