public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Compiz

This commit is contained in:
Michael Raskin 2012-11-25 23:58:04 +04:00
parent f8f54dc8d3
commit 7333c01dba
16 changed files with 88 additions and 345 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/applications/window-managers/compiz/bcop.nix
View File

@ -1,17 +0,0 @@
{ stdenv, fetchurl, pkgconfig, libxslt }:
stdenv.mkDerivation rec {
name = "compiz-bcop-0.8.4";
src = fetchurl {
url = "http://releases.compiz.org/components/compiz-bcop/${name}.tar.bz2";
sha256 = "0kwcvalmx2aab7j3x7s0xqm102i3kr5gh1z8mfws9q4qkqdclnfk";
};
buildInputs = [ pkgconfig libxslt ];
meta = {
homepage = http://www.compiz.org/;
description = "Code generator for Compiz plugins";
};
}

31
pkgs/applications/window-managers/compiz/ccsm.nix
View File

@ -1,31 +0,0 @@
{ stdenv, fetchurl, makeWrapper, intltool, gtk
, python, pygtk, pygobject, pycairo, compizconfig_python }:
stdenv.mkDerivation rec {
name = "ccsm-0.8.4";
src = fetchurl {
url = "http://releases.compiz.org/components/ccsm/${name}.tar.bz2";
sha256 = "0vf16a2nmb0qwwxymvgl86nkfscj3n39jdw2q2p737pj5h1xmfa6";
};
buildInputs = [ makeWrapper python intltool gtk ];
buildPhase = "python setup.py build --prefix=$out";
pythonDeps = [ pygtk pygobject pycairo compizconfig_python ];
installPhase =
''
python setup.py install --prefix=$out
wrapProgram $out/bin/ccsm --prefix PYTHONPATH ":" \
"$(toPythonPath "$pythonDeps $out")"
'';
meta = {
homepage = http://www.compiz.org/;
description = "Compiz settings manager";
platforms = stdenv.lib.platforms.linux;
};
}

20
pkgs/applications/window-managers/compiz/config-python.nix
View File

@ -1,20 +0,0 @@
{ stdenv, fetchurl, pkgconfig, xlibs, libcompizconfig, glib
, python, pyrex }:
stdenv.mkDerivation rec {
name = "compizconfig-python-0.8.4";
src = fetchurl {
url = "http://releases.compiz.org/components/compizconfig-python/${name}.tar.bz2";
sha256 = "0nkgqxddjw324aymzcy5nx6ilhfbpk9rra4qbzrq3l39xqsswd37";
};
buildInputs = [ pkgconfig libcompizconfig glib python pyrex xlibs.xlibs ];
NIX_LDFLAGS = "-lcompizconfig";
meta = {
homepage = http://www.compiz.org/;
description = "Python interface to the Compiz configuration";
};
}

40
pkgs/applications/window-managers/compiz/core.nix
View File

@ -1,40 +0,0 @@
{ stdenv, fetchurl, intltool, pkgconfig, xlibs, mesa, libxml2, libxslt
, libstartup_notification, libpng, glib, gtk, gnome, dbus_glib, librsvg, bzip2 }:
let version = "0.8.6"; in
stdenv.mkDerivation {
name = "compiz-${version}";
src = fetchurl {
url = "http://releases.compiz.org/${version}/compiz-${version}.tar.bz2";
sha256 = "132gmdawjmrmvazm31h3r3wwq97h58hz17yyc9sa6q2nkfsnkpy4";
};
patches =
[ # Allow the path to the Compiz plugin library and metadata
# directories to be overriden through $COMPIZ_PLUGINDIR and
# $COMPIZ_METADATADIR, respectively.
./plugindir-core.patch
# Fix compilation with recent GTK versions.
./gdk-deprecated.patch
];
buildInputs =
[ intltool pkgconfig libpng glib
gtk gnome.libwnck gnome.GConf dbus_glib librsvg bzip2
];
propagatedBuildInputs =
[ xlibs.xlibs xlibs.libXfixes xlibs.libXrandr xlibs.libXrender
xlibs.libXdamage xlibs.libXcomposite xlibs.libXinerama
libstartup_notification mesa libxml2 libxslt
];
meta = {
homepage = http://www.compiz.org/;
description = "A compositing window manager";
platforms = stdenv.lib.platforms.linux;
};
}

51
pkgs/applications/window-managers/compiz/default.nix Normal file
View File

@ -0,0 +1,51 @@
{stdenv, fetchurl, cmake, pkgconfig
, libXrender, renderproto, gtk, libwnck, pango, cairo
, GConf, libXdamage, damageproto, libxml2, libxslt, glibmm
, libstartup_notification, libpthreadstubs, libxcb, intltool
, ORBit2, libXau
, dbus, dbus_glib, librsvg, mesa
, libXdmcp, libnotify, python
, hicolor_icon_theme, libjpeg_turbo, libsigcxx, protobuf, pygtk, pythonDBus
, xdg_utils
, gettext, boost, pyrex
}:
let
s = # Generated upstream information
rec {
baseName="compiz";
version="0.9.8.6";
name="compiz-0.9.8.6";
hash="0agz5s11lwrkhk3svz3rwimlb6318ln3zcywlzczwks139svxnk6";
url="https://launchpad.net/compiz/0.9.8/0.9.8.6/+download/compiz-0.9.8.6.tar.bz2";
sha256="0agz5s11lwrkhk3svz3rwimlb6318ln3zcywlzczwks139svxnk6";
};
buildInputs = [cmake pkgconfig
libXrender renderproto gtk libwnck pango cairo
GConf libXdamage damageproto libxml2 libxslt glibmm libstartup_notification
libpthreadstubs libxcb intltool
ORBit2 libXau
dbus dbus_glib librsvg mesa
libXdmcp libnotify python
hicolor_icon_theme libjpeg_turbo libsigcxx protobuf pygtk pythonDBus
xdg_utils
gettext boost pyrex
];
in
stdenv.mkDerivation rec {
inherit (s) name version;
src = fetchurl {
inherit (s) url sha256;
};
inherit buildInputs;
NIX_CFLAGS_COMPILE=" -Wno-error ";
meta = {
description = "Compoziting window manager";
homepage = "http://launchpad.net/compiz/";
license = stdenv.lib.licenses.gpl2;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
inherit (s) version;
};
}

1
pkgs/applications/window-managers/compiz/default.upstream Normal file
View File

@ -0,0 +1 @@
url https://launchpad.net/compiz/+download

14
pkgs/applications/window-managers/compiz/gdk-deprecated.patch
View File

@ -1,14 +0,0 @@
diff -ru -x '*~' compiz-0.8.6-orig//gtk/window-decorator/gtk-window-decorator.c compiz-0.8.6//gtk/window-decorator/gtk-window-decorator.c
--- compiz-0.8.6-orig//gtk/window-decorator/gtk-window-decorator.c 2010-03-28 14:15:35.000000000 +0200
+++ compiz-0.8.6//gtk/window-decorator/gtk-window-decorator.c 2011-03-14 11:00:00.000000000 +0100
@@ -31,10 +31,6 @@
#include <X11/extensions/Xrender.h>
#include <X11/Xregion.h>
-#ifndef GDK_DISABLE_DEPRECATED
-#define GDK_DISABLE_DEPRECATED
-#endif
-
#ifndef GTK_DISABLE_DEPRECATED
#define GTK_DISABLE_DEPRECATED
#endif

22
pkgs/applications/window-managers/compiz/libcompizconfig.nix
View File

@ -1,22 +0,0 @@
{ stdenv, fetchurl,intltool, pkgconfig, xlibs, libxml2, libxslt, compiz }:
stdenv.mkDerivation rec {
name = "libcompizconfig-0.8.4";
src = fetchurl {
url = "http://releases.compiz.org/components/libcompizconfig/${name}.tar.bz2";
sha256 = "0adhl2nc2zrswl5n4a8ipymffq6yjwnxgpkv6rsk7sqvby9kwca1";
};
patches =
[ # See ./core.nix.
./plugindir-libcompizconfig.patch
];
buildInputs = [ pkgconfig intltool xlibs.libX11 compiz libxml2 libxslt ];
meta = {
homepage = http://www.compiz.org/;
description = "Compiz configuration library";
};
}

39
pkgs/applications/window-managers/compiz/plugindir-core.patch
View File

@ -1,39 +0,0 @@
diff -ru -x '*~' compiz-0.8.6-orig/src/metadata.c compiz-0.8.6/src/metadata.c
--- compiz-0.8.6-orig/src/metadata.c 2010-03-28 14:15:35.000000000 +0200
+++ compiz-0.8.6/src/metadata.c 2010-10-20 00:22:47.000000000 +0200
@@ -146,7 +146,7 @@
compAddMetadataFromFile (CompMetadata *metadata,
const char *file)
{
- char *home;
+ char *home, *metadatadir;
Bool status = FALSE;
home = getenv ("HOME");
@@ -163,7 +163,10 @@
}
}
- status |= addMetadataFromFilename (metadata, METADATADIR, file);
+ metadatadir = getenv("COMPIZ_METADATADIR");
+ if (!metadatadir) metadatadir = METADATADIR;
+
+ status |= addMetadataFromFilename (metadata, metadatadir, file);
if (!status)
{
compLogMessage ("core", CompLogLevelWarn,
diff -ru -x '*~' compiz-0.8.6-orig/src/plugin.c compiz-0.8.6/src/plugin.c
--- compiz-0.8.6-orig/src/plugin.c 2010-03-28 14:15:35.000000000 +0200
+++ compiz-0.8.6/src/plugin.c 2010-10-20 00:25:16.000000000 +0200
@@ -579,7 +579,10 @@
}
}
- status = (*loaderLoadPlugin) (p, PLUGINDIR, name);
+ plugindir = getenv("COMPIZ_PLUGINDIR");
+ if (!plugindir) plugindir = PLUGINDIR;
+
+ status = (*loaderLoadPlugin) (p, plugindir, name);
if (status)
return p;

39
pkgs/applications/window-managers/compiz/plugindir-libcompizconfig.patch
View File

@ -1,39 +0,0 @@
diff -ru -x '*~' libcompizconfig-0.8.4-orig/src/compiz.cpp libcompizconfig-0.8.4/src/compiz.cpp
--- libcompizconfig-0.8.4-orig/src/compiz.cpp 2009-10-14 02:36:04.000000000 +0200
+++ libcompizconfig-0.8.4/src/compiz.cpp 2010-10-20 00:35:28.000000000 +0200
@@ -3004,7 +3004,10 @@
}
}
- loadPluginFromXMLFile (context, xmlName, (char *) METADATADIR);
+ char *metadatadir = getenv("COMPIZ_METADATADIR");
+ if (!metadatadir) metadatadir = METADATADIR;
+
+ loadPluginFromXMLFile (context, xmlName, metadatadir);
free (xmlName);
}
@@ -3031,7 +3034,10 @@
free (homeplugins);
}
}
- loadPluginsFromXMLFiles (context, (char *)METADATADIR);
+
+ char *metadatadir = getenv("COMPIZ_METADATADIR");
+ if (!metadatadir) metadatadir = METADATADIR;
+ loadPluginsFromXMLFiles (context, metadatadir);
if (home && strlen (home))
{
@@ -3043,7 +3049,10 @@
free (homeplugins);
}
}
- loadPluginsFromName (context, (char *)PLUGINDIR);
+
+ char *plugindir = getenv("COMPIZ_PLUGINDIR");
+ if (!plugindir) plugindir = PLUGINDIR;
+ loadPluginsFromName (context, plugindir);
}
static void

30
pkgs/applications/window-managers/compiz/plugins-extra.nix
View File

@ -1,30 +0,0 @@
{ stdenv, fetchurl, intltool, pkgconfig, compiz, compiz_bcop
, compiz_plugins_main, getopt, libjpeg, cairo, pango, gnome }:
let version = "0.8.6"; in
stdenv.mkDerivation rec {
name = "compiz-plugins-extra-${version}";
src = fetchurl {
url = "http://releases.compiz.org/${version}/${name}.tar.bz2";
sha256 = "1qbxfi332bbadm0ah48frnrl9dkczl111s5a91a0cqz5v7nbw4g1";
};
patches =
[ # Support scaling wallpapers to the maximum size while still
# respecting the aspect ratio.
./wallpaper-maxpect.patch
];
NIX_CFLAGS_COMPILE = "-I${compiz_plugins_main}/include/compiz";
buildInputs =
[ intltool pkgconfig compiz compiz_bcop compiz_plugins_main getopt gnome.GConf ];
meta = {
homepage = http://www.compiz.org/;
description = "Extra plugins for Compiz";
platforms = stdenv.lib.platforms.linux;
};
}

22
pkgs/applications/window-managers/compiz/plugins-main.nix
View File

@ -1,22 +0,0 @@
{ stdenv, fetchurl, intltool, pkgconfig, compiz, compiz_bcop
, getopt, libjpeg, cairo, pango, gnome }:
let version = "0.8.6"; in
stdenv.mkDerivation rec {
name = "compiz-plugins-main-${version}";
src = fetchurl {
url = "http://releases.compiz.org/${version}/${name}.tar.bz2";
sha256 = "1nfn3r4q7wvzfkdh9hrm5zc816xa8cs2s7cliz0fmnqikcs4zp36";
};
buildInputs =
[ intltool pkgconfig compiz compiz_bcop getopt libjpeg cairo pango gnome.GConf ];
meta = {
homepage = http://www.compiz.org/;
description = "Main plugins for Compiz";
platforms = stdenv.lib.platforms.linux;
};
}

58
pkgs/applications/window-managers/compiz/wallpaper-maxpect.patch
View File

@ -1,58 +0,0 @@
diff -x '*~' -ru compiz-plugins-extra-0.8.6-orig/metadata/wallpaper.xml.in compiz-plugins-extra-0.8.6/metadata/wallpaper.xml.in
--- compiz-plugins-extra-0.8.6-orig/metadata/wallpaper.xml.in 2010-03-29 16:09:17.000000000 +0200
+++ compiz-plugins-extra-0.8.6/metadata/wallpaper.xml.in 2010-10-21 00:23:18.000000000 +0200
@@ -24,7 +24,7 @@
<_long>Image position.</_long>
<type>int</type>
<min>0</min>
- <max>4</max>
+ <max>5</max>
<desc>
<value>0</value>
<_name>Scale and Crop</_name>
@@ -45,6 +45,10 @@
<value>4</value>
<_name>Center Tiled</_name>
</desc>
+ <desc>
+ <value>5</value>
+ <_name>Centered Maxpect</_name>
+ </desc>
</option>
<option name="bg_fill_type" type="list">
<_short>Fill type</_short>
diff -x '*~' -ru compiz-plugins-extra-0.8.6-orig/src/wallpaper/wallpaper.c compiz-plugins-extra-0.8.6/src/wallpaper/wallpaper.c
--- compiz-plugins-extra-0.8.6-orig/src/wallpaper/wallpaper.c 2010-03-29 16:09:18.000000000 +0200
+++ compiz-plugins-extra-0.8.6/src/wallpaper/wallpaper.c 2010-10-21 01:09:10.000000000 +0200
@@ -697,12 +697,12 @@
tmpMatrix = back->imgTex.matrix;
- if (back->imagePos == BgImagePosScaleAndCrop)
+ if ((back->imagePos == BgImagePosScaleAndCrop) || (back->imagePos == BgImagePosCenteredMaxpect))
{
s1 = (float) s->width / back->width;
s2 = (float) s->height / back->height;
- s1 = MAX (s1, s2);
+ s1 = back->imagePos == BgImagePosScaleAndCrop ? MAX (s1, s2) : MIN (s1, s2);
tmpMatrix.xx /= s1;
tmpMatrix.yy /= s1;
@@ -711,6 +711,16 @@
tmpMatrix.x0 -= x * tmpMatrix.xx;
y = (s->height - ((int)back->height * s1)) / 2.0;
tmpMatrix.y0 -= y * tmpMatrix.yy;
+
+ if (back->imagePos == BgImagePosCenteredMaxpect)
+ {
+ reg = &tmpRegion;
+
+ tmpRegion.extents.x1 = MAX (0, x);
+ tmpRegion.extents.y1 = MAX (0, y);
+ tmpRegion.extents.x2 = MIN (s->width, x + ((int) back->width * s1));
+ tmpRegion.extents.y2 = MIN (s->height, y + ((int) back->height * s1));
+ }
}
else if (back->imagePos == BgImagePosScaled)
{

30
pkgs/development/tools/misc/intltool/default.nix Normal file
View File

@ -0,0 +1,30 @@
{stdenv, fetchurl, perl, perlXMLParser}:
let
s = # Generated upstream information
rec {
baseName="intltool";
version="0.50.2";
name="intltool-0.50.2";
hash="01j4yd7i84n9nk4ccs6yifg84pp68nr9by57jdbhj7dpdxf5rwk7";
url="https://launchpad.net/intltool/trunk/0.50.2/+download/intltool-0.50.2.tar.gz";
sha256="01j4yd7i84n9nk4ccs6yifg84pp68nr9by57jdbhj7dpdxf5rwk7";
};
propagatedBuildInputs = [perl perlXMLParser];
buildInputs = [];
in
stdenv.mkDerivation rec {
inherit (s) name version;
src = fetchurl {
inherit (s) url sha256;
};
inherit propagatedBuildInputs buildInputs;
meta = {
description = "Translation helper tool";
homepage = "http://launchpad.net/intltool/";
license = stdenv.lib.licenses.gpl2plus;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
inherit (s) version;
};
}

1
pkgs/development/tools/misc/intltool/default.upstream Normal file
View File

@ -0,0 +1 @@
url https://launchpad.net/intltool/+download

18
pkgs/top-level/all-packages.nix
View File

@ -3987,6 +3987,7 @@ let
iniparser = callPackage ../development/libraries/iniparser { };
intltool = gnome.intltool;
intltool_standalone = callPackage ../development/tools/misc/intltool {};
irrlicht3843 = callPackage ../development/libraries/irrlicht { };
@ -6690,11 +6691,10 @@ let
cmus = callPackage ../applications/audio/cmus { };
compiz = callPackage ../applications/window-managers/compiz/core.nix { };
compiz_ccsm = callPackage ../applications/window-managers/compiz/ccsm.nix { };
compizconfig_python = callPackage ../applications/window-managers/compiz/config-python.nix { };
compiz = callPackage ../applications/window-managers/compiz {
inherit (gnome) GConf ORBit2;
intltool = intltool_standalone;
};
coriander = callPackage ../applications/video/coriander {
inherit (gnome) libgnomeui GConf;
@ -6702,14 +6702,6 @@ let
csound = callPackage ../applications/audio/csound { };
libcompizconfig = callPackage ../applications/window-managers/compiz/libcompizconfig.nix { };
compiz_bcop = callPackage ../applications/window-managers/compiz/bcop.nix { };
compiz_plugins_main = callPackage ../applications/window-managers/compiz/plugins-main.nix { };
compiz_plugins_extra = callPackage ../applications/window-managers/compiz/plugins-extra.nix { };
cinepaint = callPackage ../applications/graphics/cinepaint {
fltk = fltk13;
libpng = libpng12;