1 |
commit: 550070056dea1c8bcb6290cb1daba3fc93fd0172 |
2 |
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Dec 31 10:09:37 2012 +0000 |
4 |
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Dec 31 10:09:37 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/desktop-effects.git;a=commit;h=55007005 |
7 |
|
8 |
Version bump |
9 |
|
10 |
Package-Manager: portage-2.2.0_alpha144 |
11 |
|
12 |
--- |
13 |
x11-wm/compiz/ChangeLog | 5 + |
14 |
x11-wm/compiz/Manifest | 4 +- |
15 |
x11-wm/compiz/compiz-0.9.8.6.ebuild | 183 +++++++++++++++++++++++++++++++++++ |
16 |
3 files changed, 191 insertions(+), 1 deletions(-) |
17 |
|
18 |
diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog |
19 |
index 35334da..be5ca14 100644 |
20 |
--- a/x11-wm/compiz/ChangeLog |
21 |
+++ b/x11-wm/compiz/ChangeLog |
22 |
@@ -2,6 +2,11 @@ |
23 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
24 |
# $Header: $ |
25 |
|
26 |
+*compiz-0.9.8.6 (31 Dec 2012) |
27 |
+ |
28 |
+ 31 Dec 2012; Sergey Popov <pinkbyte@g.o> +compiz-0.9.8.6.ebuild: |
29 |
+ Version bump |
30 |
+ |
31 |
03 Oct 2012; Sergey Popov <pinkbyte@g.o> -compiz-9999.ebuild: |
32 |
Remove old compiz live ebuild |
33 |
|
34 |
|
35 |
diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest |
36 |
index ac402af..a9a307f 100644 |
37 |
--- a/x11-wm/compiz/Manifest |
38 |
+++ b/x11-wm/compiz/Manifest |
39 |
@@ -1,7 +1,9 @@ |
40 |
AUX compiz-0.9.8.2-sandbox.patch 1473 SHA256 8888c6ac65503f064f4ce9d48e1c0cb8d7b9668850ca8eca6c30b8be0460a138 SHA512 5b637165e8739e7e60314ee84db02da6d9f9834cfe28b6c0f97482204f19dcca678a3ea38be80d57ad2d42fcce38f32e9f8a3919c22f9c45cb6dc47cd69a382b WHIRLPOOL 229b0728affccaf83aaa99beaecd74cacd757c316126201f29f59b2f49cea8eb4d17c8dc20f4f217ec7505e4f02a201f7f91ebdb7739db1ddd0c8ab822410c4e |
41 |
AUX compiz-desktop-gnome-or-not.patch 1527 SHA256 dc5f859f397ab97a07f1f848742d752605ea8a5a2b4ca1a953b024ad44b7ebd8 SHA512 54dd727584c57db136fce6c0a7b7e5c08650057e3dbd9c254ad2f29ea0a78b834dd2f332f605e992c9acc6863ac1de7fcc09efff9dd583f6f8ade65fbdf22353 WHIRLPOOL 2ffa6d128895163e5514ffe3368fa30f12d45341f35a037fbe86c91061071d29e58d7511e67090c92ee71de44bfba724c7e0ac9285156a5d0f7b60f37939c729 |
42 |
DIST compiz-0.9.8.2.tar.bz2 4301066 SHA256 db2dba06d3a25b64678f3feb7470b8348cf07fa8b6be17628cc5fbe1f0508ee1 SHA512 33f69faf91d203db34872202ac180152944579dde8fa8eb1603d45af043ce7eb6cdd9e096b811ad513ca8c07516d1cc1c41f4e238b8b64109141bb7284b21f8b WHIRLPOOL 49eee71363ecb610467e1424cdbf01745f6a9e0ae15e10326e3a6ff22e58b6f83a8cc3e61e3eb56aaa97400e38c0c69db64a34b3cd33d29fb969faf708e878d9 |
43 |
+DIST compiz-0.9.8.6.tar.bz2 4337444 SHA256 66dabe751a414ffed9a7dcb33f2c456198456be479fcadc78433731a822eff29 SHA512 f1aa7b2d3ece2622670c04036f8e5a9703c7cb241c96b68ecb4ae8aafcc06b7228484553f474cd496239858599e20e28f90d7358428ad876beda7f62e244a9fa WHIRLPOOL cb304b43d3ff4afbec463967006b0fa97c80ea95d577b6ffe210b1f4ac0f154543c3d88c21c7e9eac2c40cf4f072cc76bdf5404b8d2f3eb1e0d86e046f4c79b0 |
44 |
EBUILD compiz-0.9.8.2.ebuild 4166 SHA256 23577874dc5cd113a2d1389b2a1b0077a4bf2600b384bcf5220c1f9844034490 SHA512 ff15426d78d0568a7c45e5901f66bc0fc35f1d581aab9484a692b0f03d5a43f350aabd6172ba11ff2157b57ffed48b2de3309d69b0266073f04e1c9b60e58126 WHIRLPOOL 2be035ec5697f68768eb4385617024fb422e15b1017058f5322c9d783e117a331c296e55173eaefd7a8fc5585bebe78361c1400d5f7b5df29c6c4add30f2b5f5 |
45 |
+EBUILD compiz-0.9.8.6.ebuild 4527 SHA256 7f1ca1cfc05abdafe082b8987061654e23e210ce9c7a32005be533aa309ff0d6 SHA512 c3bccc80973f2183e705b1c348824d14e7f824ed3e103febdcd712c516b2e90edf845f42371a4481ac8ceb5ffd3e28d2cc4166ddc4815b2f32d46928516ae29f WHIRLPOOL 71325a4c4edf46d7f0923df899e65cc870633303cd1897d0f17ad53ceca285963bc3d57af2af39c8b6217f705a45cb755ff33e692435b96c04fffe27bbd1a13f |
46 |
EBUILD compiz-0.9.8.9999.ebuild 4527 SHA256 7f1ca1cfc05abdafe082b8987061654e23e210ce9c7a32005be533aa309ff0d6 SHA512 c3bccc80973f2183e705b1c348824d14e7f824ed3e103febdcd712c516b2e90edf845f42371a4481ac8ceb5ffd3e28d2cc4166ddc4815b2f32d46928516ae29f WHIRLPOOL 71325a4c4edf46d7f0923df899e65cc870633303cd1897d0f17ad53ceca285963bc3d57af2af39c8b6217f705a45cb755ff33e692435b96c04fffe27bbd1a13f |
47 |
-MISC ChangeLog 14193 SHA256 1444c51853a776764578b0847f32378608535030e6899a422ed84d883f14b0a6 SHA512 b8abe89961196e6886706818f7a46db3d011cb2b95ef2a0d8d3a0f81fdc6035bdf26159fd3803ec28e39d1d101dd8cda92034642197f48090b3cb4ca758e65a8 WHIRLPOOL f615f72947146eff1148e844c913bf7485ce8a32ba883e118c35383e406bd14acc88eb47613779f6e2a073be1e317916512b8fecb6a0003822a1b87501b9ab33 |
48 |
+MISC ChangeLog 14314 SHA256 720d08127a1b04f706c3edf45a799dd19f295bd6a229de72027e0bd452456705 SHA512 f8aa49ecdb766ae26b05728d9713d48e169b92b59ebaf3aec5c399aa871bf24724657027297272cb05c1a32b3808d1fa2ab58b1b7dda3a274aaf86e48220c1a8 WHIRLPOOL c201f9173207a06d44ad1ad5655302f9aba0b5d87021f70be320bd2f03b5694b5865947fe9e5b179794f2409d682ff435da9d2f1757142ab1bf6bf314118c00f |
49 |
MISC metadata.xml 534 SHA256 bfe2f2903a5d830f39e2d18d4c7c64d9f5caaa2a85a8eeda80fff0b2a3a0c027 SHA512 b740b4a6df487096c047c5c3ef5964555423d5f4a01dbe223757884182c48e4c91f598569ab978f926899a6a62394648a2de2946a816ffd34f39e15992940eb1 WHIRLPOOL 22e956efd7794c27cda3dedf7b2e878b1ae19e1585264fed04b03d0a578d06ab06c2cbab156db4e36ea87aaff1ee94ead55d6f1e521755a5541819d30550c42d |
50 |
|
51 |
diff --git a/x11-wm/compiz/compiz-0.9.8.6.ebuild b/x11-wm/compiz/compiz-0.9.8.6.ebuild |
52 |
new file mode 100644 |
53 |
index 0000000..033f027 |
54 |
--- /dev/null |
55 |
+++ b/x11-wm/compiz/compiz-0.9.8.6.ebuild |
56 |
@@ -0,0 +1,183 @@ |
57 |
+# Copyright 1999-2012 Gentoo Foundation |
58 |
+# Distributed under the terms of the GNU General Public License v2 |
59 |
+# $Header: $ |
60 |
+ |
61 |
+EAPI=4 |
62 |
+ |
63 |
+inherit versionator |
64 |
+ |
65 |
+MINOR_VERSION=$(get_version_component_range 4) |
66 |
+MAJOR_BRANCH=$(get_version_component_range 1-3) |
67 |
+ |
68 |
+if [[ ${MINOR_VERSION} == 9999 ]]; then |
69 |
+ EBZR_REPO_URI="http://bazaar.launchpad.net/~compiz-team/compiz/${MAJOR_BRANCH}" |
70 |
+ inherit bzr |
71 |
+ KEYWORDS="" |
72 |
+ SRC_URI="" |
73 |
+else |
74 |
+ KEYWORDS="~amd64 ~x86" |
75 |
+ SRC_URI="http://launchpad.net/${PN}/${MAJOR_BRANCH}/${PV}/+download/${P}.tar.bz2" |
76 |
+fi |
77 |
+ |
78 |
+inherit eutils cmake-utils gnome2-utils toolchain-funcs |
79 |
+ |
80 |
+DESCRIPTION="OpenGL compositing window manager." |
81 |
+HOMEPAGE="https://launchpad.net/compiz" |
82 |
+LICENSE="GPL-2 LGPL-2.1 MIT" |
83 |
+SLOT="0.9" |
84 |
+IUSE="+cairo debug dbus fuse gnome gtk kde +svg test" |
85 |
+ |
86 |
+COMMONDEPEND=" |
87 |
+ !x11-wm/compiz-fusion |
88 |
+ !x11-libs/compiz-bcop |
89 |
+ !x11-libs/libcompizconfig |
90 |
+ !x11-libs/compizconfig-backend-gconf |
91 |
+ !x11-libs/compizconfig-backend-kconfig4 |
92 |
+ !x11-plugins/compiz-plugins-main |
93 |
+ !x11-plugins/compiz-plugins-extra |
94 |
+ !x11-plugins/compiz-plugins-unsupported |
95 |
+ !x11-apps/ccsm |
96 |
+ !dev-python/compizconfig-python |
97 |
+ !x11-apps/fusion-icon |
98 |
+ dev-libs/boost |
99 |
+ dev-libs/glib:2 |
100 |
+ dev-cpp/glibmm |
101 |
+ dev-libs/libxml2 |
102 |
+ dev-libs/libxslt |
103 |
+ dev-python/pyrex |
104 |
+ dev-libs/protobuf |
105 |
+ media-libs/libpng |
106 |
+ x11-base/xorg-server |
107 |
+ x11-libs/libX11 |
108 |
+ x11-libs/libXcomposite |
109 |
+ x11-libs/libXdamage |
110 |
+ x11-libs/libXext |
111 |
+ x11-libs/libXrandr |
112 |
+ x11-libs/libXrender |
113 |
+ x11-libs/libXinerama |
114 |
+ x11-libs/libICE |
115 |
+ x11-libs/libSM |
116 |
+ x11-libs/startup-notification |
117 |
+ virtual/opengl |
118 |
+ virtual/glu |
119 |
+ cairo? ( x11-libs/cairo[X] ) |
120 |
+ fuse? ( sys-fs/fuse ) |
121 |
+ gtk? ( |
122 |
+ >=x11-libs/gtk+-2.18.0 |
123 |
+ >=x11-libs/libwnck-2.19.4 |
124 |
+ x11-libs/pango |
125 |
+ gnome? ( |
126 |
+ gnome-base/gnome-desktop |
127 |
+ gnome-base/gconf |
128 |
+ x11-wm/metacity |
129 |
+ ) |
130 |
+ ) |
131 |
+ kde? ( kde-base/kwin:4 ) |
132 |
+ svg? ( |
133 |
+ gnome-base/librsvg:2 |
134 |
+ x11-libs/cairo |
135 |
+ ) |
136 |
+ dbus? ( sys-apps/dbus )" |
137 |
+ |
138 |
+DEPEND="${COMMONDEPEND} |
139 |
+ app-admin/chrpath |
140 |
+ virtual/pkgconfig |
141 |
+ x11-proto/damageproto |
142 |
+ x11-proto/xineramaproto |
143 |
+ test? ( |
144 |
+ dev-cpp/gtest |
145 |
+ dev-cpp/gmock |
146 |
+ )" |
147 |
+ |
148 |
+RDEPEND="${COMMONDEPEND} |
149 |
+ dev-python/pygtk |
150 |
+ x11-apps/mesa-progs |
151 |
+ x11-apps/xvinfo |
152 |
+ x11-themes/hicolor-icon-theme" |
153 |
+ |
154 |
+# TODO: |
155 |
+# - Remove automagic dependency for coverage report generation tools |
156 |
+# - 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') |
157 |
+# - Check proper compilation with missing gettext/intltool |
158 |
+# - CFLAGS are NOT respected, this needs to be fixed |
159 |
+# - Default decorator exec command in ccsm is bad |
160 |
+# - Check all dependencies once more |
161 |
+# - Check CMakeFiles.txt this subdirectories : |
162 |
+# cmake - ? |
163 |
+# src |
164 |
+# compizconfig |
165 |
+# plugins |
166 |
+# tests - ? |
167 |
+ |
168 |
+pkg_pretend() { |
169 |
+ if [[ ${MERGE_TYPE} != binary ]]; then |
170 |
+ [[ $(gcc-major-version) -lt 4 ]] || \ |
171 |
+ ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \ |
172 |
+ && die "Sorry, but gcc 4.6 or higher is required." |
173 |
+ fi |
174 |
+} |
175 |
+ |
176 |
+src_unpack() { |
177 |
+ if [[ ${MINOR_VERSION} == 9999 ]]; then |
178 |
+ bzr_src_unpack |
179 |
+ else |
180 |
+ default |
181 |
+ fi |
182 |
+} |
183 |
+ |
184 |
+src_prepare() { |
185 |
+ epatch "${FILESDIR}/${PN}-0.9.8.2-sandbox.patch" |
186 |
+ |
187 |
+ echo "gtk/gnome/compiz-wm.desktop.in" >> "${S}/po/POTFILES.skip" |
188 |
+ echo "metadata/core.xml.in" >> "${S}/po/POTFILES.skip" |
189 |
+ |
190 |
+ # Fix wrong path for icons |
191 |
+ sed -i 's:DataDir = "@prefix@/share":DataDir = "/usr/share":' compizconfig/ccsm/ccm/Constants.py.in |
192 |
+ |
193 |
+ base_src_prepare |
194 |
+} |
195 |
+ |
196 |
+src_configure() { |
197 |
+ local mycmakeargs=( |
198 |
+ "$(cmake-utils_use_use gnome GCONF)" |
199 |
+ "$(cmake-utils_use_use gnome GNOME)" |
200 |
+ "$(cmake-utils_use_use gnome GSETTINGS)" |
201 |
+ "$(cmake-utils_use_use gtk GTK)" |
202 |
+ "$(cmake-utils_use_use kde KDE4)" |
203 |
+ "$(cmake-utils_use test COMPIZ_BUILD_TESTING)" |
204 |
+ "-DCMAKE_INSTALL_PREFIX=/usr" |
205 |
+ "-DCMAKE_C_FLAGS=$(usex debug '-DDEBUG -ggdb' '')" |
206 |
+ "-DCMAKE_CXX_FLAGS=$(usex debug '-DDEBUG -ggdb' '')" |
207 |
+ "-DCOMPIZ_DEFAULT_PLUGINS=ccp" |
208 |
+ "-DCOMPIZ_DISABLE_SCHEMAS_INSTALL=ON" |
209 |
+ "-DCOMPIZ_PACKAGING_ENABLED=ON" |
210 |
+ ) |
211 |
+ cmake-utils_src_configure |
212 |
+} |
213 |
+ |
214 |
+src_install() { |
215 |
+ pushd "${CMAKE_BUILD_DIR}" |
216 |
+ # Fix paths to avoid sandbox access violation |
217 |
+ # 'emake DESTDIR=${D} install' does not work with compiz cmake files! |
218 |
+ for i in `find . -type f -name "cmake_install.cmake"`;do |
219 |
+ sed -e "s|/usr|${D}/usr|g" -i "${i}" || die "sed failed" |
220 |
+ done |
221 |
+ emake install |
222 |
+ popd |
223 |
+} |
224 |
+ |
225 |
+pkg_preinst() { |
226 |
+ use gnome && gnome2_gconf_savelist |
227 |
+} |
228 |
+ |
229 |
+pkg_postinst() { |
230 |
+ use gnome && gnome2_gconf_install |
231 |
+ if use dbus; then |
232 |
+ ewarn "The dbus plugin is known to crash compiz in this version. Disable" |
233 |
+ ewarn "it if you experience crashes when plugins are enabled/disabled." |
234 |
+ fi |
235 |
+} |
236 |
+ |
237 |
+pkg_prerm() { |
238 |
+ use gnome && gnome2_gconf_uninstall |
239 |
+} |