From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B22AA138010 for ; Tue, 25 Sep 2012 16:28:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BDBB321C1DD; Tue, 25 Sep 2012 16:27:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7EA7B21C1DD for ; Tue, 25 Sep 2012 16:27:36 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8F34D33D72F for ; Tue, 25 Sep 2012 16:27:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 48AEFE5444 for ; Tue, 25 Sep 2012 16:27:34 +0000 (UTC) From: "Sergey Popov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergey Popov" Message-ID: <1348590431.0ae9137700d59d6b0b762c24e9222b488c3f1fc0.pinkbyte@gentoo> Subject: [gentoo-commits] proj/desktop-effects:master commit in: x11-wm/compiz/ X-VCS-Repository: proj/desktop-effects X-VCS-Files: x11-wm/compiz/ChangeLog x11-wm/compiz/Manifest x11-wm/compiz/compiz-0.9.8.9999.ebuild X-VCS-Directories: x11-wm/compiz/ X-VCS-Committer: pinkbyte X-VCS-Committer-Name: Sergey Popov X-VCS-Revision: 0ae9137700d59d6b0b762c24e9222b488c3f1fc0 X-VCS-Branch: master Date: Tue, 25 Sep 2012 16:27:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: dc143fdb-a1dc-4fd5-8014-77f0b43f83c7 X-Archives-Hash: bd47c4cb583e2b494000b5c1cc74c940 commit: 0ae9137700d59d6b0b762c24e9222b488c3f1fc0 Author: Sergey Popov gentoo org> AuthorDate: Tue Sep 25 16:27:11 2012 +0000 Commit: Sergey Popov gentoo org> CommitDate: Tue Sep 25 16:27:11 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/desktop-effects.git;a=commit;h=0ae91377 Add live ebuild for monolithic compiz (Portage version: 2.2.0_alpha132/git/Linux x86_64, unsigned Manifest commit) --- x11-wm/compiz/ChangeLog | 5 + x11-wm/compiz/Manifest | 3 +- x11-wm/compiz/compiz-0.9.8.9999.ebuild | 183 ++++++++++++++++++++++++++++++++ 3 files changed, 190 insertions(+), 1 deletions(-) diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog index 8bbe1fc..b8df84a 100644 --- a/x11-wm/compiz/ChangeLog +++ b/x11-wm/compiz/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*compiz-0.9.8.9999 (25 Sep 2012) + + 25 Sep 2012; Sergey Popov +compiz-0.9.8.9999.ebuild: + Add live ebuild for monolithic compiz + 24 Sep 2012; Sergey Popov compiz-0.9.8.2.ebuild: Correct opengl dependencies. Thanks to renesanso for discovering this issue diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest index 3b84d95..708c731 100644 --- a/x11-wm/compiz/Manifest +++ b/x11-wm/compiz/Manifest @@ -2,6 +2,7 @@ AUX compiz-0.9.8.2-sandbox.patch 1473 SHA256 8888c6ac65503f064f4ce9d48e1c0cb8d7b AUX compiz-desktop-gnome-or-not.patch 1527 SHA256 dc5f859f397ab97a07f1f848742d752605ea8a5a2b4ca1a953b024ad44b7ebd8 SHA512 54dd727584c57db136fce6c0a7b7e5c08650057e3dbd9c254ad2f29ea0a78b834dd2f332f605e992c9acc6863ac1de7fcc09efff9dd583f6f8ade65fbdf22353 WHIRLPOOL 2ffa6d128895163e5514ffe3368fa30f12d45341f35a037fbe86c91061071d29e58d7511e67090c92ee71de44bfba724c7e0ac9285156a5d0f7b60f37939c729 DIST compiz-0.9.8.2.tar.bz2 4301066 SHA256 db2dba06d3a25b64678f3feb7470b8348cf07fa8b6be17628cc5fbe1f0508ee1 SHA512 33f69faf91d203db34872202ac180152944579dde8fa8eb1603d45af043ce7eb6cdd9e096b811ad513ca8c07516d1cc1c41f4e238b8b64109141bb7284b21f8b WHIRLPOOL 49eee71363ecb610467e1424cdbf01745f6a9e0ae15e10326e3a6ff22e58b6f83a8cc3e61e3eb56aaa97400e38c0c69db64a34b3cd33d29fb969faf708e878d9 EBUILD compiz-0.9.8.2.ebuild 4166 SHA256 23577874dc5cd113a2d1389b2a1b0077a4bf2600b384bcf5220c1f9844034490 SHA512 ff15426d78d0568a7c45e5901f66bc0fc35f1d581aab9484a692b0f03d5a43f350aabd6172ba11ff2157b57ffed48b2de3309d69b0266073f04e1c9b60e58126 WHIRLPOOL 2be035ec5697f68768eb4385617024fb422e15b1017058f5322c9d783e117a331c296e55173eaefd7a8fc5585bebe78361c1400d5f7b5df29c6c4add30f2b5f5 +EBUILD compiz-0.9.8.9999.ebuild 4527 SHA256 7f1ca1cfc05abdafe082b8987061654e23e210ce9c7a32005be533aa309ff0d6 SHA512 c3bccc80973f2183e705b1c348824d14e7f824ed3e103febdcd712c516b2e90edf845f42371a4481ac8ceb5ffd3e28d2cc4166ddc4815b2f32d46928516ae29f WHIRLPOOL 71325a4c4edf46d7f0923df899e65cc870633303cd1897d0f17ad53ceca285963bc3d57af2af39c8b6217f705a45cb755ff33e692435b96c04fffe27bbd1a13f EBUILD compiz-9999.ebuild 2347 SHA256 47c70cdcf0b0c4221d0eceeb189576e55ebb0b3bf52cfddf5d69d60a1a60bf61 SHA512 8a4b83c66886e8982200e71f30a27c4bee9d08c901eb95c478c8dd700d5f65398141feee364b30732f7047975500077b8bd2fe7ea72a65be71ce578a9c4c6cff WHIRLPOOL 0a72cc1004191fb3133a34905360fc317df168f4861c0a93c2dc26668ef8c52a35e44f4f356b2ff21de61dcab7040e8da4488a3ef4a442fe2ff5f069fd14dcc0 -MISC ChangeLog 13937 SHA256 8b6d607a68825594030179157af6190e36a66e80d1e039f8537dd223feba4df7 SHA512 20b07e049857c0d5af76720248d1419a15d42c1a8075ce13b90ada820c7d2059381c1044a8c4c8ccced44f1b17867fbd87b1e55ab7d8a74466d3795c763d64c0 WHIRLPOOL f631adefe08c7139b3d0962ffba7b0fa5d34469d4c2716684f256dd90c595022f32f15265ebfa66add3fc125d918b7bc0dc6ab00988c87f87b15538ad4419844 +MISC ChangeLog 14089 SHA256 a5324292cf73e6a1c5b7d94a084529d986679faeafeae8d9b2816594acf9a98f SHA512 65aaa7495527c4b6c986dd440c39ebab40b645e18d327d01e8ba81182bc2696c88462e233d5561ca35127a4753e29525b351dda301254159f875422c663ba1af WHIRLPOOL 26ecd9c1f2f02f42f1b9338e07ac444e3488577f425be769ffe976ac5413140795903a11edf4a0ae72ac18d0e37513076c74cc3dd02ed2cd1a4d24ae7c1106fb MISC metadata.xml 534 SHA256 bfe2f2903a5d830f39e2d18d4c7c64d9f5caaa2a85a8eeda80fff0b2a3a0c027 SHA512 b740b4a6df487096c047c5c3ef5964555423d5f4a01dbe223757884182c48e4c91f598569ab978f926899a6a62394648a2de2946a816ffd34f39e15992940eb1 WHIRLPOOL 22e956efd7794c27cda3dedf7b2e878b1ae19e1585264fed04b03d0a578d06ab06c2cbab156db4e36ea87aaff1ee94ead55d6f1e521755a5541819d30550c42d diff --git a/x11-wm/compiz/compiz-0.9.8.9999.ebuild b/x11-wm/compiz/compiz-0.9.8.9999.ebuild new file mode 100644 index 0000000..033f027 --- /dev/null +++ b/x11-wm/compiz/compiz-0.9.8.9999.ebuild @@ -0,0 +1,183 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 + +inherit versionator + +MINOR_VERSION=$(get_version_component_range 4) +MAJOR_BRANCH=$(get_version_component_range 1-3) + +if [[ ${MINOR_VERSION} == 9999 ]]; then + EBZR_REPO_URI="http://bazaar.launchpad.net/~compiz-team/compiz/${MAJOR_BRANCH}" + inherit bzr + KEYWORDS="" + SRC_URI="" +else + KEYWORDS="~amd64 ~x86" + SRC_URI="http://launchpad.net/${PN}/${MAJOR_BRANCH}/${PV}/+download/${P}.tar.bz2" +fi + +inherit eutils cmake-utils gnome2-utils toolchain-funcs + +DESCRIPTION="OpenGL compositing window manager." +HOMEPAGE="https://launchpad.net/compiz" +LICENSE="GPL-2 LGPL-2.1 MIT" +SLOT="0.9" +IUSE="+cairo debug dbus fuse gnome gtk kde +svg test" + +COMMONDEPEND=" + !x11-wm/compiz-fusion + !x11-libs/compiz-bcop + !x11-libs/libcompizconfig + !x11-libs/compizconfig-backend-gconf + !x11-libs/compizconfig-backend-kconfig4 + !x11-plugins/compiz-plugins-main + !x11-plugins/compiz-plugins-extra + !x11-plugins/compiz-plugins-unsupported + !x11-apps/ccsm + !dev-python/compizconfig-python + !x11-apps/fusion-icon + dev-libs/boost + dev-libs/glib:2 + dev-cpp/glibmm + dev-libs/libxml2 + dev-libs/libxslt + dev-python/pyrex + dev-libs/protobuf + media-libs/libpng + x11-base/xorg-server + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXinerama + x11-libs/libICE + x11-libs/libSM + x11-libs/startup-notification + virtual/opengl + virtual/glu + cairo? ( x11-libs/cairo[X] ) + fuse? ( sys-fs/fuse ) + gtk? ( + >=x11-libs/gtk+-2.18.0 + >=x11-libs/libwnck-2.19.4 + x11-libs/pango + gnome? ( + gnome-base/gnome-desktop + gnome-base/gconf + x11-wm/metacity + ) + ) + kde? ( kde-base/kwin:4 ) + svg? ( + gnome-base/librsvg:2 + x11-libs/cairo + ) + dbus? ( sys-apps/dbus )" + +DEPEND="${COMMONDEPEND} + app-admin/chrpath + virtual/pkgconfig + x11-proto/damageproto + x11-proto/xineramaproto + test? ( + dev-cpp/gtest + dev-cpp/gmock + )" + +RDEPEND="${COMMONDEPEND} + dev-python/pygtk + x11-apps/mesa-progs + x11-apps/xvinfo + x11-themes/hicolor-icon-theme" + +# TODO: +# - Remove automagic dependency for coverage report generation tools +# - Fix Xig-0 automagic resolving('CMake Warning at tests/integration/xig/CMakeLists.txt:30 (message): Xig not found, you will not be able to run X Server integration tests') +# - Check proper compilation with missing gettext/intltool +# - CFLAGS are NOT respected, this needs to be fixed +# - Default decorator exec command in ccsm is bad +# - Check all dependencies once more +# - Check CMakeFiles.txt this subdirectories : +# cmake - ? +# src +# compizconfig +# plugins +# tests - ? + +pkg_pretend() { + if [[ ${MERGE_TYPE} != binary ]]; then + [[ $(gcc-major-version) -lt 4 ]] || \ + ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \ + && die "Sorry, but gcc 4.6 or higher is required." + fi +} + +src_unpack() { + if [[ ${MINOR_VERSION} == 9999 ]]; then + bzr_src_unpack + else + default + fi +} + +src_prepare() { + epatch "${FILESDIR}/${PN}-0.9.8.2-sandbox.patch" + + echo "gtk/gnome/compiz-wm.desktop.in" >> "${S}/po/POTFILES.skip" + echo "metadata/core.xml.in" >> "${S}/po/POTFILES.skip" + + # Fix wrong path for icons + sed -i 's:DataDir = "@prefix@/share":DataDir = "/usr/share":' compizconfig/ccsm/ccm/Constants.py.in + + base_src_prepare +} + +src_configure() { + local mycmakeargs=( + "$(cmake-utils_use_use gnome GCONF)" + "$(cmake-utils_use_use gnome GNOME)" + "$(cmake-utils_use_use gnome GSETTINGS)" + "$(cmake-utils_use_use gtk GTK)" + "$(cmake-utils_use_use kde KDE4)" + "$(cmake-utils_use test COMPIZ_BUILD_TESTING)" + "-DCMAKE_INSTALL_PREFIX=/usr" + "-DCMAKE_C_FLAGS=$(usex debug '-DDEBUG -ggdb' '')" + "-DCMAKE_CXX_FLAGS=$(usex debug '-DDEBUG -ggdb' '')" + "-DCOMPIZ_DEFAULT_PLUGINS=ccp" + "-DCOMPIZ_DISABLE_SCHEMAS_INSTALL=ON" + "-DCOMPIZ_PACKAGING_ENABLED=ON" + ) + cmake-utils_src_configure +} + +src_install() { + pushd "${CMAKE_BUILD_DIR}" + # Fix paths to avoid sandbox access violation + # 'emake DESTDIR=${D} install' does not work with compiz cmake files! + for i in `find . -type f -name "cmake_install.cmake"`;do + sed -e "s|/usr|${D}/usr|g" -i "${i}" || die "sed failed" + done + emake install + popd +} + +pkg_preinst() { + use gnome && gnome2_gconf_savelist +} + +pkg_postinst() { + use gnome && gnome2_gconf_install + if use dbus; then + ewarn "The dbus plugin is known to crash compiz in this version. Disable" + ewarn "it if you experience crashes when plugins are enabled/disabled." + fi +} + +pkg_prerm() { + use gnome && gnome2_gconf_uninstall +}