alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

* Updated the tfp-server-extension patch for 0.5.

Browse source 
svn path=/nixpkgs/trunk/; revision=8596
This commit is contained in:
Eelco Dolstra 2007-04-18 20:16:06 +00:00
parent 1971bb6829
commit 6837f1e465
2 changed files with 50 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/applications/window-managers/compiz/default.nix
View file

@ -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
];

44
pkgs/applications/window-managers/compiz/tfp-server-extension.patch Normal file
View file

@ -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)
{