Move OpenGL calls after OpenGL initialization wrt #123762 by Yarda.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild b/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild
new file mode 100644 (file)
index 0000000..22a91d2
--- /dev/null
+++ b/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild,v 1.1 2010/06/06 12:03:37 ssuominen Exp $
+
+EAPI=2
+inherit autotools eutils
+
+DESCRIPTION="OpenGL virtual desktop switching"
+HOMEPAGE="http://desk3d.sourceforge.net/"
+SRC_URI="mirror://sourceforge/desk3d/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+       x11-libs/libXmu
+       x11-libs/libXt
+       x11-libs/libXext
+       x11-libs/libXi
+       x11-libs/libXxf86vm
+       media-libs/imlib2
+       virtual/glut
+       media-libs/freetype"
+DEPEND="${RDEPEND}
+       x11-proto/xf86vidmodeproto
+       x11-proto/xproto"
+
+src_prepare() {
+       epatch "${FILESDIR}"/${P}-gcc4.patch \
+               "${FILESDIR}"/${P}-asneeded.patch \
+               "${FILESDIR}"/${P}-missing-include.patch \
+               "${FILESDIR}"/${P}-gl_init.patch
+       eautoreconf
+}
+
+src_install() {
+       emake DESTDIR="${D}" install || die
+       dodoc AUTHORS TODO ChangeLog README README.windowmanagers
+}
+
+pkg_postinst() {
+       einfo
+       einfo "This ebuild installed a configuration file called /etc/3ddesktop.conf"
+       einfo "The default configuration makes a screenshot of the virtual desktops"
+       einfo "every X seconds. This is non-optimal behavior."
+       einfo
+       einfo "To enable a more intelligent way of updating the virtual desktops,"
+       einfo "execute the following:"
+       einfo
+       einfo "  echo \"AutoAcquire 0\" >> /etc/3ddesktop.conf"
+       einfo
+       einfo "This will cause 3ddesktop to update the virtual desktop snapshots"
+       einfo "only when a 3d desktop switch is required."
+       einfo
+}

diff --git a/x11-misc/3ddesktop/ChangeLog b/x11-misc/3ddesktop/ChangeLog
index ea5037915b51415812286560e8adc7bcaeb3f70e..b97bd9074673819f8d7c4caa7a4e5c0c08c471fa 100644 (file)
--- a/x11-misc/3ddesktop/ChangeLog
+++ b/x11-misc/3ddesktop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/3ddesktop
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/3ddesktop/ChangeLog,v 1.39 2008/12/17 18:48:58 angelos Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/3ddesktop/ChangeLog,v 1.40 2010/06/06 12:03:37 ssuominen Exp $
+
+*3ddesktop-0.2.9-r1 (06 Jun 2010)
+
+  06 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +3ddesktop-0.2.9-r1.ebuild, +files/3ddesktop-0.2.9-gl_init.patch:
+  Move OpenGL calls after OpenGL initialization wrt #123762 by Yarda.
 
   17 Dec 2008; Christoph Mende <angelos@gentoo.org>
   +files/3ddesktop-0.2.9-asneeded.patch,

diff --git a/x11-misc/3ddesktop/Manifest b/x11-misc/3ddesktop/Manifest
index 687b6fce70b47881af32ceda7cf06ee2b6dfd932..9cc1518d25540e12ca979174ac2577b3c085f809 100644 (file)
--- a/x11-misc/3ddesktop/Manifest
+++ b/x11-misc/3ddesktop/Manifest
@@ -1,17 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 3ddesktop-0.2.9-asneeded.patch 234 RMD160 4d46441ab107a7598f50916dcf0a62f7e0061baf SHA1 a1c566ecede4bee635d9f5a3c3777298c47bd948 SHA256 a7b774a780ec313bdf67f7c3252c2826c1a05792cf235f302d1098647438d4f0
 AUX 3ddesktop-0.2.9-gcc4.patch 529 RMD160 2873ccb51a781a8bf0019f7aae018021528f485a SHA1 7bfc06d5434e7f2fd84cfea6a43b348406b12841 SHA256 1a03b4fbe1c23749bc03987774444abaf6affc4223ec17fee34bf7c75a791db9
+AUX 3ddesktop-0.2.9-gl_init.patch 522 RMD160 651962762f708140c6075d1830a5dc67a5a66105 SHA1 7a74bde3d778868adaa94f493473e1e23a918568 SHA256 7a291b8f95ddcc59dc822c43c1d34e7a584a50ef3d7b9c2b55347b188769ab7b
 AUX 3ddesktop-0.2.9-missing-include.patch 267 RMD160 329a7fc313be95d431cd02bcb09651be464c4df6 SHA1 08c4ddb9bddaa82c58287596ab5dc680dd67c322 SHA256 ae26c13a1fe7f18f0c5a18bc18e32b0651a905277dca81653f2271adc45faf42
 DIST 3ddesktop-0.2.9.tar.gz 182278 RMD160 86ca9d9df57a83d2f4719ce45708e129bdc75fb4 SHA1 33ff86b559d0c0407ef4c6c989a9fcbf804f7e5f SHA256 8fde969c1aec60685e0a74d2ebcfa1ef570df454288d5774646e2b291515e8c5
+EBUILD 3ddesktop-0.2.9-r1.ebuild 1564 RMD160 a03875b2bfb4fc84329ffd3b3e5fb8d1010aa1b4 SHA1 ca843d5fff2a0d2b252782bda6ad8a18bdcc640c SHA256 1972398ed4ba44bb4a8bcc2095c55e192905323d012e2a9675b7a42fbb14299f
 EBUILD 3ddesktop-0.2.9.ebuild 1546 RMD160 7b9888e1f1dd0a37e80071cf2073829ef600f5b7 SHA1 4cc1f22a1a622a3940fd902b530e933fce92f451 SHA256 70918fb5e5ddbccdf67fb7d1d49cfef416f393c557c94695b5afb9e5dd50901d
-MISC ChangeLog 5054 RMD160 af6aeb29cfd7c322cf23db4bbc25f41646860f55 SHA1 ce3ca097ba7e68464859d5ccb422ebb4fdf91b59 SHA256 d1a3018e5464d9abaf69b44d512db6ef290d09768fa4568c6c1ffd848e8e0521
+MISC ChangeLog 5284 RMD160 6399e296c8e94abe88bd686da57a86ac82b09074 SHA1 aa528fdde67d64d2aba458b0656e6b58af8ebf07 SHA256 fe33133502af0b1adc6cb137a48b87c34298ecb4420aea090ee44f8e318e8089
 MISC metadata.xml 436 RMD160 6f6d32ca0b968c907db7b81a8544c2f7751c3b50 SHA1 b4c065b8fe8f2dff48c51f65956f27868ae3d746 SHA256 66a61581b0078d5c9d1e919a55f753c13a7708dd03a134e7cb413582c1859b7a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAklJSaIACgkQKhnDs22gwa8VZwCfVwc5friG4l7doBpBxgtFz0By
-m8QAoLcPxQFwDHUx4gG8W9/tNZUiLa2x
-=vBLl
------END PGP SIGNATURE-----

diff --git a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-gl_init.patch b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-gl_init.patch
new file mode 100644 (file)
index 0000000..523e8c8
--- /dev/null
+++ b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-gl_init.patch
@@ -0,0 +1,23 @@
+http://bugs.gentoo.org/123762
+
+--- 3ddeskd.cpp
++++ 3ddeskd.cpp
+@@ -2411,15 +2411,15 @@
+ 
+     // initialize opengl
+ 
+-    // our own init function.
+-    gl_init();
+-
+     GLWin.open_display();
+ 
+ 
+     GLWin.create_GL_window("Enhanced 3-dimensional workspace visualization magic machine", 
+                            cfg->options->do_fullscreen);
+ 
++    // our own init function.
++    gl_init();
++
+     cfg->texture_size = GLWin.get_best_texture_size(cfg->texture_size);
+ 
+     // Loads up the correct perspective matrix