| 1 |
armin76 09/01/04 20:03:05 |
| 2 |
|
| 3 |
Modified: vnc-4.1.2-r5.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix bug #242350, thanks to Eric Bosch <eric dot bosch at comcast dot net> for the patch |
| 6 |
(Portage version: 2.1.6.4/cvs/Linux 2.6.26-gentoo-r2 ia64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.5 net-misc/vnc/vnc-4.1.2-r5.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/vnc/vnc-4.1.2-r5.ebuild?rev=1.5&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/vnc/vnc-4.1.2-r5.ebuild?rev=1.5&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/vnc/vnc-4.1.2-r5.ebuild?r1=1.4&r2=1.5 |
| 14 |
|
| 15 |
Index: vnc-4.1.2-r5.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.1.2-r5.ebuild,v |
| 18 |
retrieving revision 1.4 |
| 19 |
retrieving revision 1.5 |
| 20 |
diff -u -r1.4 -r1.5 |
| 21 |
--- vnc-4.1.2-r5.ebuild 19 Dec 2008 17:40:11 -0000 1.4 |
| 22 |
+++ vnc-4.1.2-r5.ebuild 4 Jan 2009 20:03:05 -0000 1.5 |
| 23 |
@@ -1,11 +1,12 @@ |
| 24 |
-# Copyright 1999-2008 Gentoo Foundation |
| 25 |
+# Copyright 1999-2009 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.1.2-r5.ebuild,v 1.4 2008/12/19 17:40:11 jer Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.1.2-r5.ebuild,v 1.5 2009/01/04 20:03:05 armin76 Exp $ |
| 29 |
|
| 30 |
EAPI="1" |
| 31 |
|
| 32 |
inherit eutils toolchain-funcs multilib autotools |
| 33 |
|
| 34 |
+OPENGL_DIR="xorg-x11" |
| 35 |
XSERVER_VERSION="1.5.3" |
| 36 |
PATCH="${P}-r5-patches-0.1" |
| 37 |
|
| 38 |
@@ -26,6 +27,7 @@ |
| 39 |
media-libs/freetype |
| 40 |
x11-libs/libSM |
| 41 |
x11-libs/libXtst |
| 42 |
+ app-admin/eselect-opengl |
| 43 |
server? ( |
| 44 |
x11-libs/libXi |
| 45 |
x11-libs/libXfont |
| 46 |
@@ -78,9 +80,21 @@ |
| 47 |
einfo "Stop the build now if you need to add 'server' to USE flags.\n" |
| 48 |
ebeep |
| 49 |
epause 5 |
| 50 |
+ else |
| 51 |
+ ewarn "Forcing on xorg-x11 for new enough glxtokens.h..." |
| 52 |
+ OLD_IMPLEM="$(eselect opengl show)" |
| 53 |
+ eselect opengl set --impl-headers ${OPENGL_DIR} |
| 54 |
fi |
| 55 |
} |
| 56 |
|
| 57 |
+switch_opengl_implem() { |
| 58 |
+ # Switch to the xorg implementation. |
| 59 |
+ # Use new opengl-update that will not reset user selected |
| 60 |
+ # OpenGL interface ... |
| 61 |
+ echo |
| 62 |
+ eselect opengl set ${OLD_IMPLEM} |
| 63 |
+} |
| 64 |
+ |
| 65 |
src_unpack() { |
| 66 |
unpack ${A} |
| 67 |
cd "${S}" |
| 68 |
@@ -193,3 +207,8 @@ |
| 69 |
|
| 70 |
rm "${D}"/usr/$(get_libdir)/librfb.{a,la,so} |
| 71 |
} |
| 72 |
+ |
| 73 |
+pkg_postinst() { |
| 74 |
+ use server && switch_opengl_implem |
| 75 |
+} |
| 76 |
+ |
| 77 |
|
| 78 |
|
| 79 |
|
| 80 |
1.114 net-misc/vnc/ChangeLog |
| 81 |
|
| 82 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/vnc/ChangeLog?rev=1.114&view=markup |
| 83 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/vnc/ChangeLog?rev=1.114&content-type=text/plain |
| 84 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/vnc/ChangeLog?r1=1.113&r2=1.114 |
| 85 |
|
| 86 |
Index: ChangeLog |
| 87 |
=================================================================== |
| 88 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v |
| 89 |
retrieving revision 1.113 |
| 90 |
retrieving revision 1.114 |
| 91 |
diff -u -r1.113 -r1.114 |
| 92 |
--- ChangeLog 19 Dec 2008 17:40:11 -0000 1.113 |
| 93 |
+++ ChangeLog 4 Jan 2009 20:03:05 -0000 1.114 |
| 94 |
@@ -1,6 +1,10 @@ |
| 95 |
# ChangeLog for net-misc/vnc |
| 96 |
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 97 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v 1.113 2008/12/19 17:40:11 jer Exp $ |
| 98 |
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 99 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v 1.114 2009/01/04 20:03:05 armin76 Exp $ |
| 100 |
+ |
| 101 |
+ 04 Jan 2009; Raúl Porcel <armin76@g.o> vnc-4.1.2-r5.ebuild: |
| 102 |
+ Fix bug #242350, thanks to Eric Bosch <eric dot bosch at comcast dot net> |
| 103 |
+ for the patch |
| 104 |
|
| 105 |
19 Dec 2008; Jeroen Roovers <jer@g.o> vnc-4.1.2-r5.ebuild: |
| 106 |
Marked ~hppa (bug #240425). |
Archives