Merge branch 'compiz'

This commit is contained in:
Sergey Popov 2012-06-30 15:08:10 +04:00
commit 84c43082c4
44 changed files with 275 additions and 781 deletions

View File

@ -1,2 +1,3 @@
DIST compizconfig-python-0.8.4.tar.bz2 269812 RMD160 30488991fe80f83b232d2d01bcc2dac2ed189579 SHA1 4e6cfd4d29a9d74c1b0fe21600505006978df9de SHA256 6734ae35ee69d081f35f98a89cd3bccb411a4db7c5b35fbd226270d95ac76f5a
EBUILD compizconfig-python-0.8.4-r9999.ebuild 907 RMD160 08574f7daf02fab3e913f072754db3f5ecab66a3 SHA1 28106644d97cb491f03ec970613a1afb2adcbe09 SHA256 c2f0c4c514a50a5b25ba0966de58d3f63e27294268304eb90f9527e5ad49b691
EBUILD compizconfig-python-0.8.4-r9999.ebuild 741 RMD160 61559f10cd94d14d6e8d41abc4142b2bb67ba3c3 SHA1 907fb08f1dc195cee7d44c6dbe63e9faf4d3b5fe SHA256 aa154161e66f4793cb69f2aa3472b29782593e4a4fc09b9714be251f354355c5
MISC metadata.xml 547 RMD160 7ff4b1d48fadbd0b65d1b4248c5743c524fb5b0b SHA1 d6e1071294f97353127fdb69e00c13837f648940 SHA256 b504e62c3ef8e1a7257e2bfbe60aaef7dd31cf6e8bb917150b2ff4008a9176e7

View File

@ -1,8 +1,8 @@
# Copyright 1999-2010 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/compizconfig-python/compizconfig-python-0.8.4-r3.ebuild,v 1.1 2010/09/08 22:18:08 flameeyes Exp $
# $Header: $
EAPI="3"
EAPI="4"
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
@ -27,11 +27,10 @@ RDEPEND="
DEPEND="${RDEPEND}
dev-python/pyrex
dev-util/pkgconfig"
virtual/pkgconfig"
src_configure() {
python_src_configure \
--disable-dependency-tracking \
--enable-fast-install \
--disable-static
}

View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<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 lang="en">Python bindings for libcompizconfig.</longdescription>
</pkgmetadata>

View File

@ -6,11 +6,9 @@ x11-apps/simple-ccsm::pinkbyte
x11-libs/compiz-bcop::pinkbyte
x11-libs/compizconfig-backend-gconf::pinkbyte
x11-libs/compizconfig-backend-kconfig4::pinkbyte
x11-libs/libcompizconfig::pinkbyte
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

View File

@ -1,2 +1,2 @@
DIST ccsm-0.8.4.tar.bz2 475864 RMD160 d0cf0260afe204c6e931d06d9361087d95bfa6f7 SHA1 1b4d740f8f45d6c58d8de09eda5de632c4393927 SHA256 46b9da032cf29e71aec0823799861d926937ad41f4edea3be718ac6a8532c16d
EBUILD ccsm-0.8.4-r9999.ebuild 825 RMD160 0860e84997f44978f692cd4129abc71ae982ed97 SHA1 8e4c50b981d02fb0d45066de55448356411222e8 SHA256 392ca5523cc55255f1b68db77396265cdd7bf815cbc636a6900b5b8bc98e0b4c
EBUILD ccsm-0.8.4-r9999.ebuild 801 RMD160 77822b826e15f05a5007693ed33bbdce160af349 SHA1 fcff718a72580a208aacb876f0a11d3fcdf5f650 SHA256 465f53f635b1be2addd4ccda2fe9a9c7f8bf2f262b5aab565650aa5cc233c995

View File

@ -1,8 +1,8 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-apps/ccsm/ccsm-0.8.4-r1.ebuild,v 1.2 2011/04/11 19:51:07 arfrever Exp $
EAPI="3"
EAPI="4"
PYTHON_DEPEND="2"
inherit distutils
@ -19,7 +19,6 @@ IUSE=""
DEPEND="
>=dev-python/compizconfig-python-${PV}
>=dev-python/pygtk-2.12:2
dev-python/sexy-python
gnome-base/librsvg
"
RDEPEND="${DEPEND}"

View File

@ -1,2 +1,4 @@
AUX fusion-icon-0.1-qt4-interface-subprocess-call.patch 1078 RMD160 ac5eac7a657d4b4c6265b6ec277f1d54f6e190e9 SHA1 07a22c57a8c88c2d2a27eeda0e7f4a9d1bfd6f6d SHA256 24460447499d9236f35b8d5fdcdcdb19e0fd2d8020e3f37aae250b7e51403ad8
DIST fusion-icon-0.1.tar.gz 30508 RMD160 037db986658d112f9c1ed2030e21941dd6748fa4 SHA1 a59d770c9bd3ad28da40648f6a7bfaaf4a1d1a81 SHA256 2e6757fd4fb8ed7d1640fcabfbe10a39f36cf41504eda0dd13605db70273fe79
EBUILD fusion-icon-0.1-r9999.ebuild 1223 RMD160 19b198e746006deaea583a6d2f6136c3567d7631 SHA1 3e8e8ef2df783ca1e0bdb41d8d2939f36d56727a SHA256 78060ca20a40d398c4118efe077d3b8d69426d8c2c1f388a34516b6218dc1d0e
EBUILD fusion-icon-0.1-r9999.ebuild 1316 RMD160 22e252980f0503054139cc55b521d1f2132e09d7 SHA1 88e5d93da7722ee5398fc39b9e494bb59aa687a2 SHA256 791502069d2d04c2ce1c897a33272dbf43b42613f3c0375b6daa3a52a7cb3b68
MISC metadata.xml 546 RMD160 203a25a6390e4f23a12f9dcc9a0957dddc3034c0 SHA1 50388ee01f431eb1629b368fa7450c5da2b19688 SHA256 8d7ce195fc2fc3f56bf751639388f047b6ce6ed7a45031a346683c2302037503

View File

@ -0,0 +1,22 @@
--- FusionIcon/interface_qt4/main.py.orig 2012-06-05 17:54:13.000000000 +0400
+++ FusionIcon/interface_qt4/main.py 2012-06-05 18:01:13.000000000 +0400
@@ -19,6 +19,7 @@
import sys, os, time
from PyQt4 import QtGui, QtCore
from FusionIcon.start import wms, apps, options, decorators, init
+import subprocess
class Build(QtGui.QApplication):
def reload_wm(self):
@@ -63,9 +64,9 @@
actionWD.setChecked(True)
self.Tray.menu = QtGui.QMenu()
if 'ccsm' in apps:
- self.Tray.menu.addAction(apps['ccsm'].label, lambda: run(['ccsm']))
+ self.Tray.menu.addAction(apps['ccsm'].label, lambda: subprocess.call(['ccsm']))
if 'emerald theme manager' in apps:
- self.Tray.menu.addAction(apps['emerald theme manager'].label, lambda: run(apps['emerald theme manager'].command))
+ self.Tray.menu.addAction(apps['emerald theme manager'].label, lambda: subprocess.call(apps['emerald theme manager'].command))
if 'ccsm' in apps or 'emerald theme manager' in apps:
self.Tray.menu.addSeparator()
self.Tray.menu.addAction("Reload Window Manager", self.reload_wm)

View File

@ -1,16 +1,16 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-apps/fusion-icon/fusion-icon-0.1-r2.ebuild,v 1.1 2011/11/13 14:26:29 flameeyes Exp $
EAPI="4"
PYTHON_DEPEND="2"
inherit distutils gnome2-utils
inherit distutils eutils gnome2-utils
MINIMUM_COMPIZ_RELEASE=0.6.0
DESCRIPTION="Compiz Fusion Tray Icon and Manager"
HOMEPAGE="http://compiz-fusion.org"
HOMEPAGE="http://compiz.org"
SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="GPL-2"
@ -37,6 +37,10 @@ pkg_setup() {
python_pkg_setup
}
src_prepare() {
use qt4 && epatch "${FILESDIR}/${P}-qt4-interface-subprocess-call.patch"
}
src_install() {
distutils_src_install

View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<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 lang="en">Compiz Fusion Tray Icon and Manager.</longdescription>
</pkgmetadata>

View File

@ -1,2 +1,3 @@
DIST compiz-bcop-0.8.8.tar.bz2 75886 RMD160 429d9a2bd324d3decd8a7a393f915401d287fcb7 SHA1 9210bd2a537480bdb11df0e3cc5f6d4548fd12da SHA256 0c6eb97f47012c2d621953962df8bf9338d535c546bf2e8088860ba574efb436
EBUILD compiz-bcop-0.8.8-r9999.ebuild 585 RMD160 5e0397555008056c3332ad00867c76ef30b85735 SHA1 b55be421308b687507963b945d5fc36f1ec04b31 SHA256 91e60ed41f619430332289a288f2c42574c64de365b1d5628e500dcd6fd05f14
EBUILD compiz-bcop-0.8.8-r9999.ebuild 554 RMD160 4e5b7d07627e43c63e3f40a5446faba2110543d4 SHA1 7449a49f09b6a64710bc64ec133b78fe208e2ab4 SHA256 290c35fe7319c74b43a499532fd2cf765e76f25b341bb5b3a796edf9e526afe3
MISC metadata.xml 369 RMD160 d16c8f6dab7dcd3a2b4fb8190476b32f04e997b4 SHA1 5df17944c545472cf1405e77b301efb8cba300a3 SHA256 b74b56c2469fc0aa3b285ea3b55ae8947e261f307c63ca1859395830cfd2f2af

View File

@ -1,7 +1,9 @@
# Copyright 1999-2009 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-libs/compiz-bcop/compiz-bcop-0.8.4.ebuild,v 1.1 2009/10/15 16:35:51 mrpouet Exp $
EAPI="4"
DESCRIPTION="Compiz Option code Generator"
HOMEPAGE="http://www.compiz.org/"
SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
@ -13,8 +15,6 @@ IUSE=""
RDEPEND="dev-libs/libxslt"
DEPEND="${RDEPEND}
>=dev-util/pkgconfig-0.19"
virtual/pkgconfig"
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
}
DOCS="AUTHORS ChangeLog INSTALL NEWS README"

View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>desktop-effects</herd>
<longdescription lang="en">
BCOP is a code generator that provides an easy way to handle plugin options by
generating parts of the plugin code directly from the xml metadata file.
</longdescription>
</pkgmetadata>

View File

@ -1,2 +1,3 @@
DIST compizconfig-backend-gconf-0.8.8.tar.bz2 248650 RMD160 05d3c3275ed1b27a3d52a7d82f190a701efb8186 SHA1 3869e83a50e82caa4bfda5474a3bf44095ee78dc SHA256 19a8df7f417535db80945cabb9a09c532241e6308406352d12cb5cbc6a1322cc
EBUILD compizconfig-backend-gconf-0.8.8-r9999.ebuild 815 RMD160 075ac9635ad54f599571824b45ccf4a9f5665046 SHA1 fe2861eaa9784bd507efcda5b8ee23cf15d23a3b SHA256 def019b76891bf6dc65d5f87449e768e77ca4ba4612e98b34ff4f889121d6383
EBUILD compizconfig-backend-gconf-0.8.8-r9999.ebuild 632 RMD160 e44614358f75a6b00c8938fefe8bb4aecb504894 SHA1 6fe78f8e22e2bf7e358057086a5b67e781628634 SHA256 6929071d57ae1083f8cec31a6f4b6b02455c7c006b39e399202a50ccb6cd4a7a
MISC metadata.xml 249 RMD160 7c9d8679e16425e3af0ed1f85fdc47dbd10166f0 SHA1 dd3bce5eefa0f61929d3cd807bf82748e1ce249b SHA256 c8b8d5b12f6eda353116502952440183df62381f8499c51afd897d4e0842c6fb

View File

@ -1,8 +1,10 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-libs/compizconfig-backend-gconf/compizconfig-backend-gconf-0.8.4-r2.ebuild,v 1.2 2011/03/21 19:55:08 nirbheek Exp $
# $Header: $
EAPI=2
EAPI="4"
inherit eutils
DESCRIPTION="Compizconfig Gconf Backend"
HOMEPAGE="http://www.compiz.org/"
@ -20,14 +22,15 @@ DEPEND="
"
RDEPEND="${DEPEND}"
DOCS="AUTHORS ChangeLog INSTALL NEWS README"
src_configure() {
econf \
--disable-dependency-tracking \
--enable-fast-install \
--disable-static
}
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
find "${D}" -name '*.la' -delete || die
default
prune_libtool_files
}

View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>desktop-effects</herd>
<longdescription lang="en">The gconf backend for CompizConfig.</longdescription>
</pkgmetadata>

View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>desktop-effects</herd>
<longdescription lang="en">The kconfig backend for CompizConfig.</longdescription>
</pkgmetadata>

View File

@ -1,3 +0,0 @@
AUX libcompizconfig-undefinedref.patch 1204 RMD160 69538e32c526828d1e3d0ae6116f7b62a207edba SHA1 c97312c81ac6ac445d56599c10cf67418f0bd9db SHA256 27c3a644ea5b0b309ec32ed79f4a51f81ec2bc20cc9ccc73525237785052581d
DIST libcompizconfig-0.8.8.tar.bz2 318176 RMD160 bdd9f26d092c6eccfd651ea2735d1544311d731f SHA1 8ea1f15fd9e1e2eb37a9814646659a31a8018fd8 SHA256 50a81aba31d9517587f7d046b7161eb4204ddceb422d09d036a412bb80381490
EBUILD libcompizconfig-0.8.8-r9999.ebuild 847 RMD160 12d37ebe086f2974953713de348639f33271733a SHA1 c8db45ac7597089d190e1d747e3e120b16fd21d9 SHA256 d21a1b7cb72be1783cec39c873991d70a270c871e06303feb3c013d31003da27

View File

@ -1,41 +0,0 @@
From adf3fefc4afa6225afedaf5f92b0501dafa99c65 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Diego=20'Flameeyes'=20Petten=C3=B2?= <flameeyes@gmail.com>
Date: Sat, 30 Aug 2008 14:51:46 +0200
Subject: [PATCH] Fix undefined references for XStringToKeysym.
The XStringToKeysym function comes from libX11, link to it to not have
undefined references in the shared library.
---
configure.ac | 2 ++
src/Makefile.am | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/configure.ac b/configure.ac
index 1668771..b8bc4cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,6 +91,8 @@ AC_SUBST(plugindir)
PKG_CHECK_MODULES(LIBXML2, "libxml-2.0")
AC_SUBST(LIBXML2_REQUIRES)
+PKG_CHECK_MODULES(X11, x11)
+
AC_CHECK_HEADERS([sys/inotify.h], [have_inotify=yes], [have_inotify=no])
globalmetadata=$datadir/compizconfig/global.xml
diff --git a/src/Makefile.am b/src/Makefile.am
index ac7424f..9bd9722 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,7 +22,7 @@ libcompizconfig_la_SOURCES = \
ccs-private.h \
iniparser.h
-libcompizconfig_la_LIBADD = @LIBXML2_LIBS@
+libcompizconfig_la_LIBADD = @LIBXML2_LIBS@ $(X11_LIBS)
lib_LTLIBRARIES=libcompizconfig.la
--
1.6.0.1

View File

@ -1,38 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-libs/libcompizconfig/libcompizconfig-0.8.4-r2.ebuild,v 1.2 2011/03/21 19:52:57 nirbheek Exp $
EAPI="2"
DESCRIPTION="Compiz Configuration System"
HOMEPAGE="http://www.compiz.org/"
SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE=""
RDEPEND="
dev-libs/libxml2:2
dev-libs/protobuf
>=x11-wm/compiz-${PV}
"
DEPEND="${RDEPEND}
>=dev-util/intltool-0.41
>=dev-util/pkgconfig-0.19
"
RESTRICT="test"
src_configure() {
econf \
--disable-dependency-tracking \
--enable-fast-install \
--disable-static
}
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
find "${D}" -name '*.la' -delete || die
}

View File

@ -1,4 +1,5 @@
AUX compiz-plugins-extra-0.8.8-libnotify.patch 701 RMD160 be292728a4da1e3647919feb8c377fd3b079d001 SHA1 f4a1db4145840d4ef61be6d08f35c44726b66798 SHA256 8ebc9f57ed80476387a8142facd60e231dd1aa70ff5df508421cd7ca27616bcc
AUX compiz-plugins-extra-no-gconf.patch 585 RMD160 bb3b291eab783be7f9754d724d3a96618fe2e614 SHA1 564d6614cc157397ae24347a731a9f4d65bf30f8 SHA256 0567850b07c3973f1b4bfd5c36a1e240a57e45a1714b63637ecec577febfc13f
DIST compiz-plugins-extra-0.8.8.tar.bz2 2689953 RMD160 948fc491075f202759a31a3395fcd31deb6fa101 SHA1 ce592993696c0b5d4e0bb13171897b4c25b3844e SHA256 bdce203098c62370b01b87741b04d3d9bc37e918789acce07120c4f081d5bbe3
EBUILD compiz-plugins-extra-0.8.8-r9999.ebuild 1564 RMD160 28cf176862dd4bb9cfee9b434ab691090e9490f0 SHA1 ffedde3e900095a8b784856285f07937006da03a SHA256 59504a217dcdbbe674c9f21932d9a1a1e3b7981b5c1f0ebce02240196f89256a
EBUILD compiz-plugins-extra-0.8.8-r9999.ebuild 1362 RMD160 cf9e0bcd591be126171e7265917d05b0dd2b6d1e SHA1 368395db9f46b20bca12cbb081f7f1e0110dd42f SHA256 14c848899c5e850fb57573461c87112965937116874aac9c5a2f1418fa8bdee4
MISC metadata.xml 635 RMD160 254ac795726f3ed90c85945f1c3bca9597cfc1d2 SHA1 cae4d4184b4530628dac878f077bca339b2fec24 SHA256 e2023c254ee05395db536f19d88d1735ddcec97e260a50a5db717249e0f3ba93

View File

@ -1,8 +1,8 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.6-r1.ebuild,v 1.5 2011/03/21 19:47:45 nirbheek Exp $
EAPI="2"
EAPI="4"
inherit autotools eutils gnome2-utils
@ -15,12 +15,10 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="gconf libnotify"
MY_PV="0.8.4"
RDEPEND="
>=gnome-base/librsvg-2.14.0:2
virtual/jpeg:0
>=x11-libs/compiz-bcop-${MY_PV}
>=x11-libs/compiz-bcop-${PV}
>=x11-plugins/compiz-plugins-main-${PV}
>=x11-wm/compiz-${PV}[gconf?]
libnotify? ( x11-libs/libnotify )
@ -28,27 +26,25 @@ RDEPEND="
DEPEND="${RDEPEND}
>=dev-util/intltool-0.35
>=dev-util/pkgconfig-0.19
virtual/pkgconfig
>=sys-devel/gettext-0.15
x11-libs/cairo
gconf? ( gnome-base/gconf:2 )
"
DOCS="AUTHORS ChangeLog INSTALL NEWS README TODO"
src_prepare() {
if ! use gconf; then
epatch "${FILESDIR}"/${PN}-no-gconf.patch
fi
epatch "${FILESDIR}/${P}-libnotify.patch"
# required to apply the above patch
intltoolize --copy --force || die "intltoolize failed"
eautoreconf || die "eautoreconf failed"
eautoreconf
}
src_configure() {
econf \
--disable-dependency-tracking \
--enable-fast-install \
--disable-static \
$(use_enable gconf schemas) \
@ -56,8 +52,8 @@ src_configure() {
}
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
find "${D}" -name '*.la' -delete || die
default
prune_libtool_files
}
pkg_preinst() {

View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>desktop-effects</herd>
<longdescription lang="en">
>Package with several compiz-fusion plugins:
addhelper, bench, crashhandler, cubecaps, cubereflex, extrawm, fadedesktop, firepaint, gears,
goto-viewport, group, mblur, reflex, scalefilter, showdesktop, splash, trailfocus, widget.
</longdescription>
<use>
<flag name="gconf">
Install GConf schemas for the plugins, needed when using the GConf-based
configuration backend in <pkg>x11-wm/compiz</pkg>.
</flag>
</use>
</pkgmetadata>

View File

@ -1,3 +1,4 @@
AUX compiz-plugins-main-no-gconf.patch 586 RMD160 1222325cbec30e35030c930cd3a9358a3b975047 SHA1 95ef3484e60b4f3c4d0bced6b0fb654e7cbcff89 SHA256 bc13b648e2198dd3611ba4f4734540903a740570a2c181dc666dd1e66f13e1da
DIST compiz-plugins-main-0.8.8.tar.bz2 1230627 RMD160 b6835f95d2f5e3e46bf36fe4e5347b08debcda19 SHA1 3c99841b744ae6c4a3edf2019626484880607dc6 SHA256 c79278b5369660d6274661a2c196f1cb016ef2b5d34e30bd18dbaeb241bee248
EBUILD compiz-plugins-main-0.8.8-r9999.ebuild 1403 RMD160 f080d6b5f7b678ef28cbc4e00369f292f9d89bc3 SHA1 d87a87334f3c0c25e5a798ab72b20e1052683c36 SHA256 7aa45b32b82a440595bd9ad9ec8cb65b7402fed4bfc18428d46dc3fb8c1961c8
EBUILD compiz-plugins-main-0.8.8-r9999.ebuild 1199 RMD160 02afe6e70cb5bc8feed60ac8bb6e284ad4e815b8 SHA1 4bfeb171a8743ed3c4cc42b0a8e8d1ab929bc0e0 SHA256 4abdd82b1872e7f636c105535080d2b1d0c7a3ff8ff5b455c0ac7a2a58980baa
MISC metadata.xml 612 RMD160 2c509701c4d10caa747d3d5ecdac89d591d92fba SHA1 fa635c34711c80e4f7d430c67421aeb7839daca1 SHA256 70c3031e9483ffa40727107ea5272d67501f24a44d2e7040356572490c4e34a6

View File

@ -1,8 +1,8 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.6-r1.ebuild,v 1.4 2011/03/21 19:50:33 nirbheek Exp $
EAPI="2"
EAPI="4"
inherit autotools eutils gnome2-utils
@ -15,44 +15,40 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="gconf"
MY_PV="0.8.4"
RDEPEND="
>=gnome-base/librsvg-2.14.0:2
virtual/jpeg:0
x11-libs/cairo
>=x11-libs/compiz-bcop-${MY_PV}
>=x11-libs/compiz-bcop-${PV}
>=x11-wm/compiz-${PV}[gconf?]
"
DEPEND="${RDEPEND}
>=dev-util/intltool-0.35
>=dev-util/pkgconfig-0.19
virtual/pkgconfig
>=sys-devel/gettext-0.15
gconf? ( gnome-base/gconf:2 )
"
DOCS="AUTHORS ChangeLog INSTALL NEWS README TODO"
src_prepare() {
if ! use gconf; then
epatch "${FILESDIR}"/${PN}-no-gconf.patch
# required to apply the above patch
intltoolize --copy --force || die "intltoolize failed"
eautoreconf || die "eautoreconf failed"
eautoreconf
fi
}
src_configure() {
econf \
--disable-dependency-tracking \
--enable-fast-install \
--disable-static \
$(use_enable gconf schemas)
}
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
find "${D}" -name '*.la' -delete || die
default
prune_libtool_files
}
pkg_preinst() {

View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>desktop-effects</herd>
<longdescription lang="en">
Package with the base compiz-fusion plugins:
animation, colourfilter, expo, ezoom, jpeg, neg, opacify, put, resizeinfo, ring,
scaleaddon, shift, snap, text, thumbnail, vpswitch,, wall, winrules, workarounds.
</longdescription>
<use>
<flag name="gconf">
Install GConf schemas for the plugins, needed when using the GConf-based
configuration backend in <pkg>x11-wm/compiz</pkg>.
</flag>
</use>
</pkgmetadata>

View File

@ -1,2 +1,3 @@
DIST compiz-plugins-unsupported-0.8.8.tar.bz2 1155793 RMD160 d5aa9550ca8fadf3c968f5f9820b66b111b990bc SHA1 e3d47d2c5bb61b57b859c3541453136046f4e80a SHA256 0b2ed265eda34dd60e1155280cb944bef07499f5f8178fc2498c243b2809481e
EBUILD compiz-plugins-unsupported-0.8.8-r9999.ebuild 869 RMD160 728263ad82309c682dcc0bf346764b5bfa403c11 SHA1 006140e282292cea3e0590d57aedc777317757a4 SHA256 e5f0823eb5f8945cadca6eb3945d93221a53f4992d264a6e6ae40026b8e360ec
EBUILD compiz-plugins-unsupported-0.8.8-r9999.ebuild 833 RMD160 09dc20fa30fd770c05f8c4fa2adce437afe68af0 SHA1 0482daae6eab28912ba5ed91c0fe1765ddc59c45 SHA256 b7d066171cf19a3815a47fce78015cf14a89af8469a349d37d1a85ef2678061b
MISC metadata.xml 586 RMD160 95d079833d5993cddce7367e5750dd30597688fe SHA1 3ef0bd09dcd77a37767f7163ce3af6f8957e0312 SHA256 628eb48cfaa4a337b9d01b233404238deff5e2dfc2618490c0737fce00fd8f8a

View File

@ -1,8 +1,8 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-unsupported/compiz-plugins-unsupported-0.8.4-r1.ebuild,v 1.3 2011/03/21 19:51:02 nirbheek Exp $
EAPI="2"
EAPI="4"
DESCRIPTION="Compiz Fusion Window Decorator Unsupported Plugins"
HOMEPAGE="http://www.compiz.org/"
@ -23,13 +23,11 @@ RDEPEND="
DEPEND="${RDEPEND}
>=dev-util/intltool-0.35
>=dev-util/pkgconfig-0.19
virtual/pkgconfig
>=sys-devel/gettext-0.15
x11-libs/cairo
"
RESTRICT="mirror"
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
}
DOCS="AUTHORS ChangeLog INSTALL NEWS README TODO"

View File

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<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 lang="en">
Package with several compiz-fusion plugins:
fakeargb, mswitch, snow, tile.
</longdescription>
</pkgmetadata>

View File

@ -1,2 +1,3 @@
DIST emerald-themes-0.5.2.tar.bz2 1563758 RMD160 e61676b946ba13eb05b0417aadac6ea1294e0254 SHA1 98a1c03592e883d15b3579f28b45cd7d8432ce94 SHA256 1c2c77a0fff352569a2f013e8b6c1fd99e2b6f9185c9a64d2cf2e918d9de4841
EBUILD emerald-themes-0.5.2-r9999.ebuild 551 RMD160 794351d8ebe7697b14f4f77a70e01062e78edc2d SHA1 52b60593193f4b25bdb481564f2b6f60a3107d64 SHA256 2620c5ceaf3d23dbc3592f220a32875174117eb998545770b83cb5d4a9bd19f2
EBUILD emerald-themes-0.5.2-r9999.ebuild 530 RMD160 f922a6aa806ae00fe1c184f0b21b4149e58493ec SHA1 e7014852e0787f80754033c6c14895fd2f1c9a25 SHA256 dc2599bad94e58af86747ab033d7dd48ecb81ed20e9212f76f537df59786da30
MISC metadata.xml 552 RMD160 8769c7ed16bc9acedc84729a1c790f3249a54f85 SHA1 818ea438eeb6369cc10bb921cfde8fdeabc697ec SHA256 49b9624c20ec8bd9ac98f1f458d7dd8d8a2f9215f2bbfff61b1096cb6f2b1b9c

View File

@ -1,10 +1,12 @@
# Copyright 1999-2007 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-themes/emerald-themes/emerald-themes-0.5.2.ebuild,v 1.3 2007/10/24 18:39:26 hanno Exp $
EAPI="4"
DESCRIPTION="Emerald window decorator themes"
HOMEPAGE="http://compiz-fusion.org"
SRC_URI="http://releases.compiz-fusion.org/${PV}/${P}.tar.bz2"
HOMEPAGE="http://compiz.org"
SRC_URI="http://cgit.compiz.org/fusion/decorators/${PV}/snapshot/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
@ -12,6 +14,4 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE=""
DEPEND="x11-wm/emerald"
src_install() {
emake DESTDIR="${D}" install || die "make install failed"
}
DOCS="ChangeLog INSTALL NEWS README"

View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<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 lang="en">Emerald themes are the themes for emerald
</longdescription>
</pkgmetadata>

View File

@ -1 +1,2 @@
EBUILD compiz-fusion-0.8.8-r9999.ebuild 949 RMD160 4add77884ee9a1748380fea43a006e65673dce92 SHA1 010a6adc9efc137416183da723bb940787605cd9 SHA256 5c6efe9ec0ac7a25371bd2b7bc244a572749f5938bbfa2de37c718b5e5d7179b
EBUILD compiz-fusion-0.8.8-r9999.ebuild 921 RMD160 58670a46b4433f671f92710969af0115112a9e67 SHA1 b2fc05c4b0e576ea12a2666b05f46854dc1887d9 SHA256 3fbf908c0ef42720c823dba6abc49d8a65c922de3356b8817fda4cf8ec3a6305
MISC metadata.xml 801 RMD160 9d2805e7d33affba8b59d94d7420c98e4eec5a84 SHA1 2da7331db432c98bdd46a656e58778eaa10a92f0 SHA256 7593757771b16ac2a917e7d58f9467ea6cd30e4fad8fa7fdd76d4448200b6317

View File

@ -1,4 +1,4 @@
# Copyright 1999-2010 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz-fusion/compiz-fusion-0.8.6.ebuild,v 1.1 2010/04/03 06:13:26 jmbsvicetto Exp $
@ -11,17 +11,15 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="emerald gnome kde unsupported"
MY_PV=0.8.4
RDEPEND="
>=x11-wm/compiz-${PV}
>=x11-plugins/compiz-plugins-main-${PV}
>=x11-plugins/compiz-plugins-extra-${PV}
unsupported? ( >=x11-plugins/compiz-plugins-unsupported-${MY_PV} )
>=x11-apps/ccsm-${MY_PV}
emerald? ( >=x11-wm/emerald-${MY_PV} )
gnome? ( >=x11-libs/compizconfig-backend-gconf-${MY_PV} )
kde? ( >=x11-libs/compizconfig-backend-kconfig4-${MY_PV} )"
unsupported? ( >=x11-plugins/compiz-plugins-unsupported-${PV} )
>=x11-apps/ccsm-0.8.4
emerald? ( >=x11-wm/emerald-${PV} )
gnome? ( >=x11-libs/compizconfig-backend-gconf-${PV} )
kde? ( >=x11-libs/compizconfig-backend-kconfig4-${PV} )"
pkg_postinst() {
ewarn "If you want to try out simple-ccsm, you'll need to emerge it"

View File

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<use>
<flag name="emerald">Install the <pkg>x11-wm/emerald</pkg> package.</flag>
<flag name="unsupported">Install the <pkg>x11-plugins/compiz-fusion-plugins-unsupported</pkg> package.</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-fusion is a community-driven project that is aimed at extending the compiz window manager.
</longdescription>
</pkgmetadata>

View File

@ -1,6 +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 4099 RMD160 dba149ddbe7bcba96386692b43f3cff3df37d955 SHA1 92b10e36baca2463602f3725688e2d1092959bf6 SHA256 6147360a9606905e9c4e5513788c21628b1266a88282e49ab0dde9f95d395e9d

View File

@ -1,168 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.8.6-r3.ebuild,v 1.3 2011/11/11 22:54:51 ssuominen Exp $
EAPI="2"
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 gnome gconf gtk kde +svg"
COMMONDEPEND="
dev-libs/glib:2
dev-libs/libxml2:2
dev-libs/libxslt
media-libs/libpng
>=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 )
"
DEPEND="${COMMONDEPEND}
dev-util/pkgconfig
x11-proto/damageproto
x11-proto/xineramaproto
"
RDEPEND="${COMMONDEPEND}
x11-apps/mesa-progs
x11-apps/xvinfo
"
src_prepare() {
echo "gtk/gnome/compiz-wm.desktop.in" >> "${S}/po/POTFILES.skip"
echo "metadata/core.xml.in" >> "${S}/po/POTFILES.skip"
# fix cont corruption, bug #343861
# epatch "${FILESDIR}"/${P}-r2-fontcorruption.patch
# epatch "${FILESDIR}"/${P}-gdk-display-deprecated.patch
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
econf \
--disable-dependency-tracking \
--enable-fast-install \
--disable-static \
--disable-gnome-keybindings \
--with-default-plugins \
$(use_enable svg librsvg) \
$(use_enable cairo annotate) \
$(use_enable dbus) \
$(use_enable dbus dbus-glib) \
$(use_enable fuse) \
$(use_enable gnome) \
$(use_enable gnome metacity) \
$(use_enable gtk) \
$(use_enable kde kde4) \
--disable-kde \
${myconf}
}
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
find "${D}" -name '*.la' -delete || die
# Install compiz-manager
dobin "${FILESDIR}/compiz-manager" || die "dobin failed"
# 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 || die "dodir failed"
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
dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
insinto "/usr/share/applications"
doins "${FILESDIR}/compiz.desktop" || die "Failed to install 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
}

View File

@ -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;

View File

@ -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

View File

@ -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])

View File

@ -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

View File

@ -1,3 +1,4 @@
AUX emerald-0.8.8-pkgconfig-pollution.patch 353 RMD160 bf3505f23e43b853524f0a12016a8b06762e7420 SHA1 7efec914dfe6b8bfe53386ce5d96d58a95eab9c7 SHA256 bd4540b8ed94d5b7ba747a0285244564bae9d84cdba7a0fda3e2962d57e82224
DIST emerald-0.8.8.tar.bz2 528715 RMD160 a7c7a04f5ef3edb7816a693204872a1274ccab11 SHA1 a5deb2ae135d1c4dac7b57b2a0415f320ae7c0aa SHA256 239285ced20e817f5303e935d922236f828ca905b264833005a330df2089e8a3
EBUILD emerald-0.8.8-r9999.ebuild 1238 RMD160 65948c9a5e6602f4a10ecd04a029ad5f0ed64790 SHA1 271a49199097b144222879b803374cec1bafb3ad SHA256 3ed9629c2b0d82dd961f45917c886245db9e5bf303205fcc7d23625d9484ee56
EBUILD emerald-0.8.8-r9999.ebuild 1027 RMD160 51f11ccb048d7eb4728c92a1d4aeb1c268cbc7bc SHA1 25f5f49435a8557fcc1af3eb1e86990f9a589de9 SHA256 959c9f6470b808566bbe985624b6b5be21d1edd04e7000996a918fa1a89e4fff
MISC metadata.xml 590 RMD160 66ff91a1e058455b046973e4ff73be1d43b710f2 SHA1 4025df2069c71f7df0bf5a9cce2e7076fce18720 SHA256 618fb504ee42fb3a3e1b22e241ee413a7b5049ed41ac304c38c51c16229df0c3

View File

@ -1,8 +1,8 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-wm/emerald/emerald-0.8.4-r2.ebuild,v 1.4 2011/09/14 20:47:24 ssuominen Exp $
EAPI="2"
EAPI="4"
inherit eutils
@ -27,28 +27,25 @@ RDEPEND="
DEPEND="${RDEPEND}
>=dev-util/intltool-0.35
>=dev-util/pkgconfig-0.19
virtual/pkgconfig
>=sys-devel/gettext-0.15
"
DOCS="AUTHORS ChangeLog INSTALL NEWS README TODO"
src_prepare() {
# Fix pkg-config file pollution wrt #380197
epatch "${FILESDIR}"/${P}-pkgconfig-pollution.patch
# fix build with gtk+-2.22 - bug 341143
sed -i -e '/#define G[DT]K_DISABLE_DEPRECATED/s:^://:' \
include/emerald.h || die
}
src_configure() {
econf \
--disable-dependency-tracking \
--disable-static \
--enable-fast-install \
--disable-mime-update || die "econf failed"
--disable-mime-update
}
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
find "${D}" -name '*.la' -delete || die
default
prune_libtool_files
}

View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<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 lang="en">Emerald is a 3D window decorator for compositing window managers such as compiz.</longdescription>
</pkgmetadata>