Merge pull request #18988 from groxxda/cogl-cleanup

clutter, cogl: remove old versions

pkgs/desktops/gnome-3/3.20/default.nix

@@ -46,14 +46,12 @@ let
   ];
 
   inherit (pkgs) glib gtk2 webkitgtk24x webkitgtk212x gtk3 gtkmm3 libcanberra_gtk2
-    clutter-gst clutter_gtk;
+    clutter clutter-gst clutter_gtk cogl;
   inherit (pkgs.gnome2) ORBit2;
   libsoup = pkgs.libsoup.override { gnomeSupport = true; };
   libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
   orbit = ORBit2;
   gnome3 = self // { recurseForDerivations = false; };
-  clutter = pkgs.clutter_1_26;
-  cogl = pkgs.cogl_1_22;
   gtk = gtk3;
   gtkmm = gtkmm3;
   gtkvnc = pkgs.gtkvnc.override { enableGTK3 = true; };

pkgs/development/libraries/clutter/1.26.nix

@@ -1,52 +0,0 @@
-{ stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes
-, libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib, 
-gobjectIntrospection 
-}:
-
-let
-  ver_maj = "1.26";
-  ver_min = "0";
-in
-stdenv.mkDerivation rec {
-  name = "clutter-${ver_maj}.${ver_min}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz";
-    sha256 = "01nfjd4k7j2n3agpx2d9ncff86nfsqv4n23465rb9zmk4iw4wlb7";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  propagatedBuildInputs =
-    [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango
-      atk json_glib gobjectIntrospection
-    ];
-
-  configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK
-
-  #doCheck = true; # no tests possible without a display
-
-  meta = {
-    description = "Clutter, a library for creating fast, dynamic graphical user interfaces";
-
-    longDescription =
-      '' Clutter is free software library for creating fast, compelling,
-         portable, and dynamic graphical user interfaces.  It is a core part
-         of MeeGo, and is supported by the open source community.  Its
-         development is sponsored by Intel.
-
-         Clutter uses OpenGL for rendering (and optionally OpenGL|ES for use
-         on mobile and embedded platforms), but wraps an easy to use,
-         efficient, flexible API around GL's complexity.
-
-         Clutter enforces no particular user interface style, but provides a
-         rich, generic foundation for higher-level toolkits tailored to
-         specific needs.
-      '';
-
-    license = stdenv.lib.licenses.lgpl2Plus;
-    homepage = http://www.clutter-project.org/;
-
-    maintainers = with stdenv.lib.maintainers; [ urkud lethalman ];
-    platforms = stdenv.lib.platforms.mesaPlatforms;
-  };
-}

pkgs/development/libraries/clutter/default.nix

@@ -1,24 +1,24 @@
 { stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes
 , libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib, 
-gobjectIntrospection, gtk3
+gobjectIntrospection 
 }:
 
 let
-  ver_maj = "1.16";
+  ver_maj = "1.26";
-  ver_min = "2";
+  ver_min = "0";
 in
 stdenv.mkDerivation rec {
   name = "clutter-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz";
-    sha256 = "0hnz6fnrkc7ixrm2x83sxyha32p9896d7ilzhvxwfgzlh26fidqc";
+    sha256 = "01nfjd4k7j2n3agpx2d9ncff86nfsqv4n23465rb9zmk4iw4wlb7";
   };
 
   nativeBuildInputs = [ pkgconfig ];
   propagatedBuildInputs =
     [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango
-      atk json_glib gobjectIntrospection gtk3
+      atk json_glib gobjectIntrospection
     ];
 
   configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK

pkgs/development/libraries/cogl/1.22.nix

@@ -1,56 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, mesa_noglu, glib, gdk_pixbuf, xorg, libintlOrEmpty
-, pangoSupport ? true, pango, cairo, gobjectIntrospection
-, gstreamerSupport ? true, gst_all_1 }:
-
-let
-  ver_maj = "1.22";
-  ver_min = "0";
-in
-stdenv.mkDerivation rec {
-  name = "cogl-${ver_maj}.${ver_min}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/cogl/${ver_maj}/${name}.tar.xz";
-    sha256 = "689dfb5d14fc1106e9d2ded0f7930dcf7265d0bc84fa846b4f03941633eeaa91";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  configureFlags = [
-    "--enable-introspection"
-    "--enable-kms-egl-platform"
-  ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst"
-    ++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ];
-
-  propagatedBuildInputs = with xorg; [
-      glib gdk_pixbuf gobjectIntrospection
-      mesa_noglu libXrandr libXfixes libXcomposite libXdamage
-    ]
-    ++ libintlOrEmpty
-    ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer
-                                               gst_all_1.gst-plugins-base ];
-
-  buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ];
-
-  COGL_PANGO_DEP_CFLAGS
-    = stdenv.lib.optionalString (stdenv.isDarwin && pangoSupport)
-      "-I${pango.dev}/include/pango-1.0 -I${cairo.dev}/include/cairo";
-
-  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
-
-  #doCheck = true; # all tests fail (no idea why)
-
-  meta = with stdenv.lib; {
-    description = "A small open source library for using 3D graphics hardware for rendering";
-    maintainers = with maintainers; [ lovek323 ];
-
-    longDescription = ''
-      Cogl is a small open source library for using 3D graphics hardware for
-      rendering. The API departs from the flat state machine style of OpenGL
-      and is designed to make it easy to write orthogonal components that can
-      render without stepping on each other's toes.
-    '';
-
-    platforms = stdenv.lib.platforms.mesaPlatforms;
-  };
-}

pkgs/development/libraries/cogl/default.nix

@@ -3,7 +3,7 @@
 , gstreamerSupport ? true, gst_all_1 }:
 
 let
-  ver_maj = "1.16";
+  ver_maj = "1.22";
   ver_min = "0";
 in
 stdenv.mkDerivation rec {
@@ -11,17 +11,16 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/cogl/${ver_maj}/${name}.tar.xz";
-    sha256 = "153014xygwyz9wmvgfwjxncqgc0qqvcy6b3jx1zdl3q5d9iw9hkm";
+    sha256 = "689dfb5d14fc1106e9d2ded0f7930dcf7265d0bc84fa846b4f03941633eeaa91";
   };
 
   nativeBuildInputs = [ pkgconfig ];
 
   configureFlags = [
     "--enable-introspection"
-    "--enable-gles1"
-    "--enable-gles2"
     "--enable-kms-egl-platform"
-  ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst";
+  ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst"
+    ++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ];
 
   propagatedBuildInputs = with xorg; [
       glib gdk_pixbuf gobjectIntrospection

pkgs/top-level/all-packages.nix

@@ -6563,17 +6563,10 @@ in
 
   clutter = callPackage ../development/libraries/clutter { };
 
-  clutter_1_26 = callPackage ../development/libraries/clutter/1.26.nix {
-    cogl = cogl_1_22;
-  };
-
   clutter-gst = callPackage ../development/libraries/clutter-gst {
-    inherit (gnome3) cogl clutter;
   };
 
-  clutter_gtk = callPackage ../development/libraries/clutter-gtk {
+  clutter_gtk = callPackage ../development/libraries/clutter-gtk { };
-    inherit (gnome3) clutter;
-  };
 
   cminpack = callPackage ../development/libraries/cminpack { };
 
@@ -6581,8 +6574,6 @@ in
 
   cogl = callPackage ../development/libraries/cogl { };
 
-  cogl_1_22 = callPackage ../development/libraries/cogl/1.22.nix { };
-
   coin3d = callPackage ../development/libraries/coin3d { };
 
   CoinMP = callPackage ../development/libraries/CoinMP { };