diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-04-18 20:16:06 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-04-18 20:16:06 +0000 |
| commit | 6837f1e46589fa2cc61bd167a8111fb36f118538 (patch) | |
| tree | ac3de22d31f1bfe2de92f5ce53d0fb2c67bcf470 /pkgs/applications/window-managers | |
| parent | 1971bb682966f16eeeade80abe385b277dbdcc02 (diff) | |
| download | nixlib-6837f1e46589fa2cc61bd167a8111fb36f118538.tar nixlib-6837f1e46589fa2cc61bd167a8111fb36f118538.tar.gz nixlib-6837f1e46589fa2cc61bd167a8111fb36f118538.tar.bz2 nixlib-6837f1e46589fa2cc61bd167a8111fb36f118538.tar.lz nixlib-6837f1e46589fa2cc61bd167a8111fb36f118538.tar.xz nixlib-6837f1e46589fa2cc61bd167a8111fb36f118538.tar.zst nixlib-6837f1e46589fa2cc61bd167a8111fb36f118538.zip | |
* Updated the tfp-server-extension patch for 0.5.
svn path=/nixpkgs/trunk/; revision=8596
Diffstat (limited to 'pkgs/applications/window-managers')
| -rw-r--r-- | pkgs/applications/window-managers/compiz/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/applications/window-managers/compiz/tfp-server-extension.patch | 44 |
2 files changed, 50 insertions, 7 deletions
diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix index b7005c2e62e4..3ba52518d38e 100644 --- a/pkgs/applications/window-managers/compiz/default.nix +++ b/pkgs/applications/window-managers/compiz/default.nix @@ -4,15 +4,14 @@ }: stdenv.mkDerivation { - name = "compiz-0.3.6"; + name = "compiz-0.5.0"; src = fetchurl { - url = http://xorg.freedesktop.org/archive/individual/app/compiz-0.3.6.tar.bz2; - sha256 = "0z7cprg510x1sjzsj8h02l1q5h7qvhcn7z94b7a48pxv124z7qpg"; - }; - patches = fetchurl { - url = http://gandalfn.club.fr/ubuntu/compiz-patch/02-tfp-server-extension.patch; - sha256 = "1hi53ajypmgsyfz7cziccdk9f8mn3pfl255yjzl0v15nv5kacmiq"; + url = http://xorg.freedesktop.org/archive/individual/app/compiz-0.5.0.tar.gz; + sha256 = "1fac5fc37b218k34lpxqlhs7srqxm7jly0hfncs3ghmjmxdlj03y"; }; + patches = [ + ./tfp-server-extension.patch + ]; buildInputs = [ pkgconfig libXrender xextproto gtk libwnck GConf ]; diff --git a/pkgs/applications/window-managers/compiz/tfp-server-extension.patch b/pkgs/applications/window-managers/compiz/tfp-server-extension.patch new file mode 100644 index 000000000000..51910b5d0574 --- /dev/null +++ b/pkgs/applications/window-managers/compiz/tfp-server-extension.patch @@ -0,0 +1,44 @@ +diff -rc compiz-0.5.0-orig/src/screen.c compiz-0.5.0/src/screen.c +*** compiz-0.5.0-orig/src/screen.c 2007-04-02 20:15:30.000000000 +0200 +--- compiz-0.5.0/src/screen.c 2007-04-18 21:52:43.000000000 +0200 +*************** +*** 1533,1539 **** + Window *children; + unsigned int nchildren; + int defaultDepth, nvisinfo, nElements, value, i; +! const char *glxExtensions, *glExtensions; + XSetWindowAttributes attrib; + GLfloat globalAmbient[] = { 0.1f, 0.1f, 0.1f, 0.1f }; + GLfloat ambientLight[] = { 0.0f, 0.0f, 0.0f, 0.0f }; +--- 1533,1540 ---- + Window *children; + unsigned int nchildren; + int defaultDepth, nvisinfo, nElements, value, i; +! const char *glxExtensions = NULL, *glExtensions; +! const char *glxServerExtensions = NULL; + XSetWindowAttributes attrib; + GLfloat globalAmbient[] = { 0.1f, 0.1f, 0.1f, 0.1f }; + GLfloat ambientLight[] = { 0.0f, 0.0f, 0.0f, 0.0f }; +*************** +*** 1793,1800 **** + if (glXIsDirect (dpy, s->ctx) == indirectRendering) + i++; + + glxExtensions = glXQueryExtensionsString (dpy, screenNum); +! if (!strstr (glxExtensions, "GLX_EXT_texture_from_pixmap")) + { + if (i > 0) + { +--- 1794,1805 ---- + if (glXIsDirect (dpy, s->ctx) == indirectRendering) + i++; + ++ glxServerExtensions = glXQueryServerString(dpy, ++ screenNum, GLX_EXTENSIONS ); + glxExtensions = glXQueryExtensionsString (dpy, screenNum); +! +! if (!strstr (indirectRendering ? glxServerExtensions : glxExtensions, +! "GLX_EXT_texture_from_pixmap")) + { + if (i > 0) + { |