diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2010-08-07 04:37:51 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2010-08-07 04:37:51 +0000 |
| commit | 8d0fb91bb839f7b94decd615759e8e09b52a350c (patch) | |
| tree | f6283783a91d7b6b8d84b9fb1a7cfb974979adaa | |
| parent | Ensure we always build with C locale (bug #331419). (diff) | |
| download | gentoo-2-8d0fb91bb839f7b94decd615759e8e09b52a350c.tar.gz gentoo-2-8d0fb91bb839f7b94decd615759e8e09b52a350c.tar.bz2 gentoo-2-8d0fb91bb839f7b94decd615759e8e09b52a350c.zip | |
Fixed mesa patch (bug #331473).
(Portage version: 2.2_rc67/cvs/Linux x86_64)
| -rw-r--r-- | app-emulation/virtualbox-ose/ChangeLog | 7 | ||||
| -rw-r--r-- | app-emulation/virtualbox-ose/files/virtualbox-ose-3.2.8-mesa-check.patch | 23 |
2 files changed, 18 insertions, 12 deletions
diff --git a/app-emulation/virtualbox-ose/ChangeLog b/app-emulation/virtualbox-ose/ChangeLog index 1c02b47a9c85..c745f5acc0c9 100644 --- a/app-emulation/virtualbox-ose/ChangeLog +++ b/app-emulation/virtualbox-ose/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-emulation/virtualbox-ose # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/ChangeLog,v 1.71 2010/08/06 23:51:23 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/ChangeLog,v 1.72 2010/08/07 04:37:50 polynomial-c Exp $ + + 07 Aug 2010; Lars Wendler <polynomial-c@gentoo.org> + files/virtualbox-ose-3.2.8-mesa-check.patch: + Fixed virtualbox-ose-3.2.8-mesa-check.patch which was fscked up by me. + Thanks to Willard Dawson (bug #331473). *virtualbox-ose-3.2.8 (06 Aug 2010) diff --git a/app-emulation/virtualbox-ose/files/virtualbox-ose-3.2.8-mesa-check.patch b/app-emulation/virtualbox-ose/files/virtualbox-ose-3.2.8-mesa-check.patch index da82d564c025..6813a1744695 100644 --- a/app-emulation/virtualbox-ose/files/virtualbox-ose-3.2.8-mesa-check.patch +++ b/app-emulation/virtualbox-ose/files/virtualbox-ose-3.2.8-mesa-check.patch @@ -1,5 +1,5 @@ ---- VirtualBox-3.2.8_OSE/configure -+++ VirtualBox-3.2.8_OSE/configure +--- configure ++++ configure @@ -1225,10 +1225,7 @@ XCloseDisplay(dpy); } @@ -12,24 +12,25 @@ } -@@ -1345,20 +1342,6 @@ - #include <X11/Xmu/StdCmap.h> +@@ -1382,21 +1379,6 @@ + #include <GL/glu.h> extern "C" int main(void) { - Display *dpy; -- int scrn_num; -- Screen *scrn; +- int major, minor; - - dpy = XOpenDisplay(NULL); - if (dpy) - { -- scrn_num = DefaultScreen(dpy); -- scrn = ScreenOfDisplay(dpy, scrn_num); -- Status status = XmuLookupStandardColormap(dpy, RootWindowOfScreen(scrn), 0, -- 24, XA_RGB_DEFAULT_MAP, False, True); -- printf("Status = %x\n", status); +- Bool glx_version = glXQueryVersion(dpy, &major, &minor); - XCloseDisplay(dpy); +- if (glx_version) +- { +- printf("found version %u.%u, OK.\n", major, minor); +- return 0; +- } - } +- printf("found (inactive), OK.\n"); return 0; } EOF |