remove compiz, because it is unmasked in main portage tree
This commit is contained in:
parent
9ac249933a
commit
553cfbbf1a
@ -10,6 +10,5 @@ x11-plugins/compiz-plugins-extra::pinkbyte
|
||||
x11-plugins/compiz-plugins-main::pinkbyte
|
||||
x11-plugins/compiz-plugins-unsupported::pinkbyte
|
||||
x11-themes/emerald-themes::pinkbyte
|
||||
x11-wm/compiz::pinkbyte
|
||||
x11-wm/compiz-fusion::pinkbyte
|
||||
x11-wm/emerald::pinkbyte
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
AUX compiz-kde-4.8.patch 755 RMD160 26891333e27ee15959a36850b7895a6212f155df SHA1 fe3231b758dd4dd0c1e429382456e09ce1e01f6c SHA256 4feb22c82d21c9d870d669498badf95c01f735a85f8a5f4d63b4877b6f74df65
|
||||
AUX compiz-manager 9835 RMD160 0c579ebd41c22b4f33edb2d2d5b1e41ac30720ac SHA1 ff39aa8abf43e42895aec6696c3659773f927fd2 SHA256 e387ff9f01b84c572f31643316ed2ce2eacd11a92488e745ebcfd659945c6f1d
|
||||
AUX compiz-no-gconf.patch 630 RMD160 32b6990dff7baf7f3cb04f728ab04d1523f29c46 SHA1 ad1c0a38dcb83c4768031f0b87db4748b2c24b92 SHA256 87467fbe5d4e0d0bb8952f2d5b74d21046d92d49772543aeda137266e055aa67
|
||||
AUX compiz.desktop 273 RMD160 704f0e631cd41d810af323b5fabbbf7eac5a943b SHA1 e244587cc28613ab92568846754e91bb193f0e85 SHA256 28a5459148c7733cdd82e3ecc1f584231d2619c7305b8bf71060db331bf081fb
|
||||
DIST compiz-0.8.8.tar.bz2 1123892 RMD160 430e6ce18e2fc7f6b95907dbc089ec26c2629773 SHA1 ca86f8586f921f084d32c2548a5d2170179a5caf SHA256 3ba555b0d6d536850a227d37d6ebc5cd5b15ee5bad83d7956529a27b870977e3
|
||||
EBUILD compiz-0.8.8-r9999.ebuild 3897 RMD160 522a3592e1e3e853a64659719558cbca5d8f7c44 SHA1 279d1e066d85f6849874aa5108d8d2896f2901eb SHA256 113b42ff6c8d19f752fe5b6f93210f5c6402e8cbc9e23681418cb759b5b657ef
|
||||
MISC metadata.xml 1052 RMD160 0c4df051c8a0f69826ae0aa6720aefac029bc0b3 SHA1 f122572b5bae04ec25616c21d5de04d325937d52 SHA256 14796b4aa92f269135955a5e6be96b32be523de048dcc0bed4731674a12492a2
|
||||
@ -1,174 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
inherit autotools eutils gnome2-utils
|
||||
|
||||
DESCRIPTION="OpenGL window and compositing manager"
|
||||
HOMEPAGE="http://www.compiz.org/"
|
||||
SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2 LGPL-2.1 MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
|
||||
IUSE="+cairo dbus fuse +glib gnome gconf gtk kde +svg"
|
||||
|
||||
COMMONDEPEND="
|
||||
dev-libs/glib:2
|
||||
dev-libs/libxml2:2
|
||||
dev-libs/libxslt
|
||||
media-libs/libpng:0
|
||||
>=media-libs/mesa-6.5.1-r1
|
||||
>=x11-base/xorg-server-1.1.1-r1
|
||||
>=x11-libs/libX11-1.4
|
||||
x11-libs/libxcb
|
||||
x11-libs/libXcomposite
|
||||
x11-libs/libXdamage
|
||||
x11-libs/libXinerama
|
||||
x11-libs/libXrandr
|
||||
x11-libs/libICE
|
||||
x11-libs/libSM
|
||||
>=x11-libs/libXrender-0.8.4
|
||||
>=x11-libs/startup-notification-0.7
|
||||
cairo? (
|
||||
x11-libs/cairo[X]
|
||||
)
|
||||
fuse? ( sys-fs/fuse )
|
||||
gnome? (
|
||||
>=gnome-base/gnome-control-center-2.16.1:2
|
||||
gnome-base/gnome-desktop:2
|
||||
gconf? ( gnome-base/gconf:2 )
|
||||
)
|
||||
gtk? (
|
||||
>=x11-libs/gtk+-2.8.0:2
|
||||
>=x11-libs/libwnck-2.18.3:1
|
||||
x11-libs/pango
|
||||
)
|
||||
kde? (
|
||||
|| (
|
||||
>=kde-base/kwin-4.2.0
|
||||
kde-base/kwin:live
|
||||
)
|
||||
)
|
||||
svg? (
|
||||
>=gnome-base/librsvg-2.14.0:2
|
||||
>=x11-libs/cairo-1.0
|
||||
)
|
||||
dbus? (
|
||||
>=sys-apps/dbus-1.0
|
||||
glib? ( dev-libs/dbus-glib )
|
||||
)
|
||||
"
|
||||
|
||||
DEPEND="${COMMONDEPEND}
|
||||
virtual/pkgconfig
|
||||
x11-proto/damageproto
|
||||
x11-proto/xineramaproto
|
||||
"
|
||||
|
||||
RDEPEND="${COMMONDEPEND}
|
||||
x11-apps/mesa-progs
|
||||
x11-apps/xvinfo
|
||||
"
|
||||
|
||||
DOCS="AUTHORS ChangeLog INSTALL NEWS README TODO"
|
||||
|
||||
src_prepare() {
|
||||
echo "gtk/gnome/compiz-wm.desktop.in" >> "po/POTFILES.skip"
|
||||
echo "metadata/core.xml.in" >> "po/POTFILES.skip"
|
||||
|
||||
if ! use gnome || ! use gconf; then
|
||||
epatch "${FILESDIR}"/${PN}-no-gconf.patch
|
||||
fi
|
||||
# patch for KDE 4.8. Picked up from stuff overlay
|
||||
if use kde; then
|
||||
$(has_version ">=kde-base/kwin-4.8") && epatch "${FILESDIR}"/${PN}-kde-4.8.patch
|
||||
fi
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf=
|
||||
|
||||
# We make gconf optional by itself, but only if gnome is also
|
||||
# enabled, otherwise we simply disable it.
|
||||
if use gnome; then
|
||||
myconf="${myconf} $(use_enable gconf)"
|
||||
else
|
||||
myconf="${myconf} --disable-gconf"
|
||||
fi
|
||||
|
||||
# Add dbus-glib support only when glib support is enabled,
|
||||
# otherwise - disable it.
|
||||
if use glib; then
|
||||
myconf="${myconf} $(use_enable dbus dbus-glib)"
|
||||
else
|
||||
myconf="${myconf} --disable-dbus-glib"
|
||||
fi
|
||||
|
||||
econf \
|
||||
--enable-fast-install \
|
||||
--disable-static \
|
||||
--disable-gnome-keybindings \
|
||||
--with-default-plugins \
|
||||
$(use_enable svg librsvg) \
|
||||
$(use_enable cairo annotate) \
|
||||
$(use_enable dbus) \
|
||||
$(use_enable fuse) \
|
||||
$(use_enable glib) \
|
||||
$(use_enable gnome) \
|
||||
$(use_enable gnome metacity) \
|
||||
$(use_enable gtk) \
|
||||
$(use_enable kde kde4) \
|
||||
--disable-kde \
|
||||
${myconf}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# Run default src_install
|
||||
default
|
||||
|
||||
# Remove unneeded .la files
|
||||
prune_libtool_files
|
||||
|
||||
# Install compiz-manager
|
||||
dobin "${FILESDIR}/compiz-manager"
|
||||
|
||||
# Add the full-path to lspci
|
||||
sed -i "s#lspci#/usr/sbin/lspci#" "${D}/usr/bin/compiz-manager" || die "sed 1 failed"
|
||||
|
||||
# Fix the hardcoded lib paths
|
||||
sed -i "s#/lib/#/$(get_libdir)/#g" "${D}/usr/bin/compiz-manager" || die "sed 2 failed"
|
||||
|
||||
# Create gentoo's config file
|
||||
dodir /etc/xdg/compiz
|
||||
|
||||
cat <<- EOF > "${D}/etc/xdg/compiz/compiz-manager"
|
||||
COMPIZ_BIN_PATH="/usr/bin/"
|
||||
PLUGIN_PATH="/usr/$(get_libdir)/compiz/"
|
||||
LIBGL_NVIDIA="/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.so.1.2"
|
||||
LIBGL_FGLRX="/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.so.1.2"
|
||||
KWIN="$(type -p kwin)"
|
||||
METACITY="$(type -p metacity)"
|
||||
SKIP_CHECKS="yes"
|
||||
EOF
|
||||
|
||||
domenu "${FILESDIR}/compiz.desktop"
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
use gnome && use gconf && gnome2_gconf_savelist
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
use gnome && use gconf && gnome2_gconf_install
|
||||
|
||||
ewarn "If you update to x11-wm/metacity-2.24 after you install ${P},"
|
||||
ewarn "gtk-window-decorator will crash until you reinstall ${PN} again."
|
||||
}
|
||||
|
||||
pkg_prerm() {
|
||||
use gnome && gnome2_gconf_uninstall
|
||||
}
|
||||
@ -1,17 +0,0 @@
|
||||
diff -ur compiz-0.8.8-orig//kde/window-decorator-kde4/window.cpp compiz-0.8.8//kde/window-decorator-kde4/window.cpp
|
||||
--- compiz-0.8.8-orig//kde/window-decorator-kde4/window.cpp 2010-05-21 14:18:14.000000000 +0300
|
||||
+++ compiz-0.8.8//kde/window-decorator-kde4/window.cpp 2012-01-27 21:21:39.000000000 +0200
|
||||
@@ -986,10 +986,10 @@
|
||||
{
|
||||
Atom atom = Atoms::compizWindowBlurDecor;
|
||||
QRegion topQRegion, bottomQRegion, leftQRegion, rightQRegion;
|
||||
- Region topRegion = NULL;
|
||||
- Region bottomRegion = NULL;
|
||||
- Region leftRegion = NULL;
|
||||
- Region rightRegion = NULL;
|
||||
+ ::Region topRegion = NULL;
|
||||
+ ::Region bottomRegion = NULL;
|
||||
+ ::Region leftRegion = NULL;
|
||||
+ ::Region rightRegion = NULL;
|
||||
int size = 0;
|
||||
int w, h;
|
||||
@ -1,384 +0,0 @@
|
||||
#!/bin/sh
|
||||
# Compiz Manager wrapper script
|
||||
#
|
||||
# Copyright (c) 2007 Kristian Lyngstøl <kristian@bohemians.org>
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
#
|
||||
#
|
||||
# Contributions by: Treviño (3v1n0) <trevi55@gmail.com>, Ubuntu Packages
|
||||
#
|
||||
# Much of this code is based on Beryl code, also licensed under the GPL.
|
||||
# This script will detect what options we need to pass to compiz to get it
|
||||
# started, and start a default plugin and possibly window decorator.
|
||||
#
|
||||
|
||||
|
||||
COMPIZ_BIN_PATH="/usr/bin/" # For window decorators and compiz
|
||||
PLUGIN_PATH="/usr/lib/compiz/"
|
||||
GLXINFO="/usr/bin/glxinfo"
|
||||
KWIN="/usr/bin/kwin"
|
||||
METACITY="/usr/bin/metacity"
|
||||
COMPIZ_NAME="compiz" # Final name for compiz (compiz.real)
|
||||
|
||||
# For Xgl LD_PRELOAD
|
||||
LIBGL_NVIDIA="/usr/lib/nvidia/libGL.so.1.2.xlibmesa"
|
||||
LIBGL_FGLRX="/usr/lib/fglrx/libGL.so.1.2.xlibmesa"
|
||||
|
||||
# Minimum amount of memory (in kilo bytes) that nVidia cards need
|
||||
# to be allowed to start
|
||||
# Set to 262144 to require 256MB
|
||||
NVIDIA_MEMORY="65536" # 64MB
|
||||
NVIDIA_SETTINGS="nvidia-settings" # Assume it's in the path by default
|
||||
|
||||
# For detecting what driver is in use, the + is for one or more /'s
|
||||
XORG_DRIVER_PATH="/usr/lib/xorg/modules/drivers/+"
|
||||
|
||||
FALLBACKWM="${METACITY}"
|
||||
FALLBACKWM_OPTIONS="--replace $@"
|
||||
|
||||
# Driver whitelist
|
||||
WHITELIST="nvidia intel ati radeon i810"
|
||||
|
||||
# blacklist based on the pci ids
|
||||
# See http://wiki.compiz-fusion.org/Hardware/Blacklist for details
|
||||
T=" 1002:5954 1002:5854 1002:5955" # ati rs480
|
||||
T="$T 1002:4153" # ATI Rv350
|
||||
T="$T 8086:2982 8086:2992 8086:29a2 8086:2a02 8086:2a12" # intel 965
|
||||
BLACKLIST_PCIIDS="$T"
|
||||
unset T
|
||||
|
||||
COMPIZ_OPTIONS="--ignore-desktop-hints --replace"
|
||||
COMPIZ_PLUGINS=""
|
||||
ENV=""
|
||||
|
||||
# Use emerald by default if it exist
|
||||
USE_EMERALD="yes"
|
||||
|
||||
# No indirect by default
|
||||
INDIRECT="no"
|
||||
|
||||
# Default X.org log if xset q doesn't reveal it
|
||||
XORG_DEFAULT_LOG="/var/log/Xorg.0.log"
|
||||
|
||||
# Set to yes to enable verbose
|
||||
VERBOSE="yes"
|
||||
|
||||
# Echos the arguments if verbose
|
||||
verbose()
|
||||
{
|
||||
if [ "x$VERBOSE" = "xyes" ]; then
|
||||
printf "$*"
|
||||
fi
|
||||
}
|
||||
|
||||
# abort script and run fallback windowmanager
|
||||
abort_with_fallback_wm()
|
||||
{
|
||||
if [ "x$SKIP_CHECKS" = "xyes" ]; then
|
||||
verbose "SKIP_CHECKS is yes, so continuing despite problems.\n"
|
||||
return 0;
|
||||
fi
|
||||
|
||||
verbose "aborting and using fallback: $FALLBACKWM \n"
|
||||
|
||||
if [ -x $FALLBACKWM ]; then
|
||||
exec $FALLBACKWM $FALLBACKWM_OPTIONS
|
||||
else
|
||||
printf "no $FALLBACKWM found, exiting\n"
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
# Check for non power of two texture support
|
||||
check_npot_texture()
|
||||
{
|
||||
verbose "Checking for non power of two support: "
|
||||
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
|
||||
verbose "present. \n";
|
||||
return 0;
|
||||
else
|
||||
verbose "Not present. \n"
|
||||
return 1;
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
# Check for presence of FBConfig
|
||||
check_fbconfig()
|
||||
{
|
||||
verbose "Checking for FBConfig: "
|
||||
if [ "$INDIRECT" = "yes" ]; then
|
||||
$GLXINFO -i | grep -q GLX.*fbconfig
|
||||
FB=$?
|
||||
else
|
||||
$GLXINFO | grep -q GLX.*fbconfig
|
||||
FB=$?
|
||||
fi
|
||||
|
||||
if [ $FB = "0" ]; then
|
||||
unset FB
|
||||
verbose "present. \n"
|
||||
return 0;
|
||||
else
|
||||
unset FB
|
||||
verbose "not present. \n"
|
||||
return 1;
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
# Check for TFP
|
||||
check_tfp()
|
||||
{
|
||||
verbose "Checking for texture_from_pixmap: "
|
||||
if [ $($GLXINFO 2>/dev/null | grep GLX_EXT_texture_from_pixmap -c) -gt 2 ] ; then
|
||||
verbose "present. \n"
|
||||
return 0;
|
||||
else
|
||||
verbose "not present. \n"
|
||||
if [ "$INDIRECT" = "yes" ]; then
|
||||
unset LIBGL_ALWAYS_INDIRECT
|
||||
INDIRECT="no"
|
||||
return 1;
|
||||
else
|
||||
verbose "Trying again with indirect rendering:\n";
|
||||
INDIRECT="yes"
|
||||
export LIBGL_ALWAYS_INDIRECT=1
|
||||
check_tfp;
|
||||
return $?
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
# Check wether the composite extension is present
|
||||
check_composite()
|
||||
{
|
||||
verbose "Checking for Composite extension: "
|
||||
if xdpyinfo -queryExtensions | grep -q Composite ; then
|
||||
verbose "present. \n";
|
||||
return 0;
|
||||
else
|
||||
verbose "not present. \n";
|
||||
return 1;
|
||||
fi
|
||||
}
|
||||
|
||||
# Detects if Xgl is running
|
||||
check_xgl()
|
||||
{
|
||||
verbose "Checking for Xgl: "
|
||||
if xvinfo | grep -q Xgl ; then
|
||||
verbose "present. \n"
|
||||
return 0;
|
||||
else
|
||||
verbose "not present. \n"
|
||||
return 1;
|
||||
fi
|
||||
}
|
||||
|
||||
# Check if the nVidia card has enough video ram to make sense
|
||||
check_nvidia_memory()
|
||||
{
|
||||
MEM=$(${NVIDIA_SETTINGS} -q VideoRam | egrep Attribute\ \'VideoRam\'\ .*: | cut -d: -f3 | sed 's/[^0-9]//g')
|
||||
if [ $MEM -lt $NVIDIA_MEMORY ]; then
|
||||
verbose "Less than ${NVIDIA_MEMORY}kb of memory and nVidia";
|
||||
return 1;
|
||||
fi
|
||||
return 0;
|
||||
}
|
||||
|
||||
# Check for existence if NV-GLX
|
||||
check_nvidia()
|
||||
{
|
||||
if [ ! -z $NVIDIA_INTERNAL_TEST ]; then
|
||||
return $NVIDIA_INTERNAL_TEST;
|
||||
fi
|
||||
verbose "Checking for nVidia: "
|
||||
if xdpyinfo | grep -q NV-GLX ; then
|
||||
verbose "present. \n"
|
||||
NVIDIA_INTERNAL_TEST=0
|
||||
return 0;
|
||||
else
|
||||
verbose "not present. \n"
|
||||
NVIDIA_INTERNAL_TEST=1
|
||||
return 1;
|
||||
fi
|
||||
}
|
||||
|
||||
# Check if the max texture size is large enough compared to the resolution
|
||||
check_texture_size()
|
||||
{
|
||||
TEXTURE_LIMIT=$(glxinfo -l | grep -m1 GL_MAX_TEXTURE_SIZE | sed 's/.*=[^0-9]//g')
|
||||
RESOLUTION=$(xdpyinfo | grep -i dimensions: | sed 's/[^0-9]*pixels.*(.*).*//' | sed 's/[^0-9x]*//')
|
||||
VRES=$(echo $RESOLUTION | sed 's/.*x//')
|
||||
HRES=$(echo $RESOLUTION | sed 's/x.*//')
|
||||
verbose "Comparing resolution ($RESOLUTION) to maximum 3D texture size ($TEXTURE_LIMIT): ";
|
||||
if [ $VRES -gt $TEXTURE_LIMIT ] || [ $HRES -gt $TEXTURE_LIMIT ]; then
|
||||
verbose "Failed.\n"
|
||||
return 1;
|
||||
fi
|
||||
verbose "Passed.\n"
|
||||
return 0
|
||||
}
|
||||
|
||||
# check driver whitelist
|
||||
running_under_whitelisted_driver()
|
||||
{
|
||||
LOG=$(xset q|grep "Log file"|awk '{print $3}')
|
||||
if [ "$LOG" = "" ]; then
|
||||
verbose "xset q doesn't reveal the location of the log file. Using fallback $XORG_DEFAULT_LOG \n"
|
||||
LOG=$XORG_DEFAULT_LOG;
|
||||
fi
|
||||
if [ -z "$LOG" ];then
|
||||
verbose "AIEEEEH, no Log file found \n"
|
||||
verbose "$(xset q) \n"
|
||||
return 0
|
||||
fi
|
||||
for DRV in ${WHITELIST}; do
|
||||
if egrep -q "Loading ${XORG_DRIVER_PATH}${DRV}_drv\.so" $LOG &&
|
||||
! egrep -q "Unloading ${XORG_DRIVER_PATH}${DRV}_drv\.so" $LOG;
|
||||
then
|
||||
return 0
|
||||
fi
|
||||
done
|
||||
verbose "No whitelisted driver found\n"
|
||||
return 1
|
||||
}
|
||||
|
||||
# check pciid blacklist
|
||||
have_blacklisted_pciid()
|
||||
{
|
||||
OUTPUT=$(lspci -n)
|
||||
for ID in ${BLACKLIST_PCIIDS}; do
|
||||
if echo "$OUTPUT" | egrep -q "$ID"; then
|
||||
verbose "Blacklisted PCIID '$ID' found \n"
|
||||
return 0
|
||||
fi
|
||||
done
|
||||
OUTPUT=$(lspci -vn | grep -i VGA)
|
||||
verbose "Detected PCI ID for VGA: $OUTPUT\n"
|
||||
return 1
|
||||
}
|
||||
|
||||
build_env()
|
||||
{
|
||||
if check_nvidia; then
|
||||
ENV="__GL_YIELD=NOTHING "
|
||||
fi
|
||||
if [ "$INDIRECT" = "yes" ]; then
|
||||
ENV="$ENV LIBGL_ALWAYS_INDIRECT=1 "
|
||||
fi
|
||||
if check_xgl; then
|
||||
if [ -f ${LIBGL_NVIDIA} ]; then
|
||||
ENV="$ENV LD_PRELOAD=${LIBGL_NVIDIA}"
|
||||
verbose "Enabling Xgl with nVidia drivers...\n"
|
||||
fi
|
||||
if [ -f ${LIBGL_FGLRX} ]; then
|
||||
ENV="$ENV LD_PRELOAD=${LIBGL_FGLRX}"
|
||||
verbose "Enabling Xgl with fglrx ATi drivers...\n"
|
||||
fi
|
||||
fi
|
||||
|
||||
ENV="$ENV FROM_WRAPPER=yes"
|
||||
|
||||
if [ -n "$ENV" ]; then
|
||||
export $ENV
|
||||
fi
|
||||
}
|
||||
|
||||
build_args()
|
||||
{
|
||||
if [ $INDIRECT = "yes" ]; then
|
||||
COMPIZ_OPTIONS="$COMPIZ_OPTIONS --indirect-rendering "
|
||||
fi
|
||||
if check_nvidia; then
|
||||
COMPIZ_OPTIONS="$COMPIZ_OPTIONS --loose-binding"
|
||||
fi
|
||||
}
|
||||
|
||||
####################
|
||||
# Execution begins here.
|
||||
|
||||
# Read configuration from XDG paths
|
||||
if [ -z "$XDG_CONFIG_DIRS" ]; then
|
||||
test -f /etc/xdg/compiz/compiz-manager && . /etc/xdg/compiz/compiz-manager
|
||||
else
|
||||
test -f $XDG_CONFIG_DIRS/compiz/compiz-manager && . $XDG_CONFIG_DIRS/compiz/compiz-manager
|
||||
fi
|
||||
|
||||
if [ -z "$XDG_CONFIG_HOME" ]; then
|
||||
test -f $HOME/.config/compiz/compiz-manager && . $HOME/.config/compiz/compiz-manager
|
||||
else
|
||||
test -f $XDG_CONFIG_HOME/compiz/compiz-manager && . $XDG_CONFIG_HOME/compiz/compiz-manager
|
||||
fi
|
||||
|
||||
# Don't use compiz when running the failsafe session
|
||||
if [ "x$GNOME_DESKTOP_SESSION_ID" = "xFailsafe" ]; then
|
||||
abort_with_fallback_wm
|
||||
fi
|
||||
|
||||
if [ "x$LIBGL_ALWAYS_INDIRECT" = "x1" ]; then
|
||||
INDIRECT="yes";
|
||||
fi
|
||||
|
||||
# if we run under Xgl, we can skip some tests here
|
||||
if ! check_xgl; then
|
||||
# if vesa or vga are in use, do not even try glxinfo (LP#119341)
|
||||
if ! running_under_whitelisted_driver || have_blacklisted_pciid; then
|
||||
abort_with_fallback_wm
|
||||
fi
|
||||
# check if we have the required bits to run compiz and if not,
|
||||
# fallback
|
||||
if ! check_tfp || ! check_npot_texture || ! check_composite || ! check_texture_size; then
|
||||
abort_with_fallback_wm
|
||||
fi
|
||||
|
||||
if check_nvidia && ! check_nvidia_memory; then
|
||||
abort_with_fallback_wm
|
||||
fi
|
||||
|
||||
if ! check_fbconfig; then
|
||||
abort_with_fallback_wm
|
||||
fi
|
||||
fi
|
||||
|
||||
# load the ccp plugin if present and fallback to plain gconf if not
|
||||
if [ -f ${PLUGIN_PATH}libccp.so ]; then
|
||||
COMPIZ_PLUGINS="$COMPIZ_PLUGINS ccp"
|
||||
elif [ -f ${PLUGIN_PATH}libgconf.so ]; then
|
||||
COMPIZ_PLUGINS="$COMPIZ_PLUGINS glib gconf"
|
||||
fi
|
||||
|
||||
# get environment
|
||||
build_env
|
||||
build_args
|
||||
|
||||
# start the gtk-window-decorator if present
|
||||
if [ -x ${COMPIZ_BIN_PATH}emerald ] && [ "$USE_EMERALD" = "yes" ]; then
|
||||
verbose "Starting emerald\n"
|
||||
${COMPIZ_BIN_PATH}emerald --replace &
|
||||
elif [ -x ${COMPIZ_BIN_PATH}gtk-window-decorator ] && [ -n "$GNOME_DESKTOP_SESSION_ID" ]; then
|
||||
verbose "Starting gtk-window-decorator\n"
|
||||
${COMPIZ_BIN_PATH}gtk-window-decorator --replace &
|
||||
elif [ -x ${COMPIZ_BIN_PATH}kde-window-decorator ] && [ -n "$KDE_FULL_SESSION" ]; then
|
||||
verbose "Starting kde-window-decorator\n"
|
||||
${COMPIZ_BIN_PATH}kde-window-decorator --replace &
|
||||
FALLBACKWM="${KWIN}"
|
||||
fi
|
||||
|
||||
${COMPIZ_BIN_PATH}${COMPIZ_NAME} $COMPIZ_OPTIONS "$@" $COMPIZ_PLUGINS || exec $FALLBACKWM $FALLBACKWM_OPTIONS
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
configure.ac | 4 ++--
|
||||
1 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 7b09153..9c22ea0 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -192,10 +192,10 @@ if test "x$use_gconf" = "xyes"; then
|
||||
if test x"$GCONFTOOL" = xno; then
|
||||
AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
|
||||
fi
|
||||
+else
|
||||
+ AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, test "x$use_gconf" = "xyes")
|
||||
fi
|
||||
|
||||
-AM_GCONF_SOURCE_2
|
||||
-
|
||||
AM_CONDITIONAL(USE_GCONF, test "x$use_gconf" = "xyes")
|
||||
if test "$use_gconf" = yes; then
|
||||
AC_DEFINE(USE_GCONF, 1, [Build gconf plugin])
|
||||
@ -1,12 +0,0 @@
|
||||
[Desktop Entry]
|
||||
Type=Application
|
||||
Encoding=UTF-8
|
||||
Name=Compiz
|
||||
Name[en_GB]=Compiz
|
||||
Exec=compiz ccp
|
||||
NoDisplay=true
|
||||
# name we put on the WM spec check window
|
||||
X-GNOME-WMName=Compiz
|
||||
X-GNOME-Autostart-Phase=WindowManager
|
||||
X-GNOME-Provides=windowmanager
|
||||
X-GNOME-Autostart-Notify=true
|
||||
@ -1,31 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<use>
|
||||
<flag name="fuse">
|
||||
Enables support for the filesystem in userspace plugin through <pkg>sys-fs/fuse</pkg>.
|
||||
</flag>
|
||||
<flag name="gconf">
|
||||
Enable the GConf-based configuration backend; it is not required
|
||||
to work with GNOME, and might actually be faster if it's not
|
||||
used.
|
||||
</flag>
|
||||
<flag name="glib">
|
||||
Build support for glib main loop via <pkg>dev-libs/glib</pkg>.
|
||||
</flag>
|
||||
</use>
|
||||
<maintainer>
|
||||
<email>pinkbyte@mail.ru</email>
|
||||
<name>Pinkbyte</name>
|
||||
<description>Maintainer. Assign bugs to him</description>
|
||||
</maintainer>
|
||||
<maintainer>
|
||||
<email>naota@gentoo.org</email>
|
||||
<name>Naohiro Aota</name>
|
||||
<description>Proxy maintainer. CC him on bugs</description>
|
||||
</maintainer>
|
||||
<herd>desktop-effects</herd>
|
||||
<longdescription>
|
||||
compiz is a compositing window manager that uses 3D graphics acceleration via OpenGL.
|
||||
</longdescription>
|
||||
</pkgmetadata>
|
||||
Loading…
Reference in New Issue
Block a user