gegl: drop the old 0.2 version, make gegl 0.4 default
This commit is contained in:
parent
1e61298bf5
commit
4cea628efb
|
@ -339,8 +339,6 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||||
|
|
||||||
inherit (pkgs) gnome-user-docs; # added 2019-11-20
|
inherit (pkgs) gnome-user-docs; # added 2019-11-20
|
||||||
|
|
||||||
inherit (pkgs) gegl_0_4; # added 2019-10-31
|
|
||||||
|
|
||||||
inherit (pkgs) gjs; # added 2019-01-05
|
inherit (pkgs) gjs; # added 2019-01-05
|
||||||
|
|
||||||
inherit (pkgs) yelp-tools; # added 2019-11-20
|
inherit (pkgs) yelp-tools; # added 2019-11-20
|
||||||
|
|
|
@ -1,121 +0,0 @@
|
||||||
{ lib
|
|
||||||
, stdenv
|
|
||||||
, fetchurl
|
|
||||||
, pkg-config
|
|
||||||
, vala
|
|
||||||
, gobject-introspection
|
|
||||||
, gtk-doc
|
|
||||||
, docbook-xsl-nons
|
|
||||||
, docbook_xml_dtd_43
|
|
||||||
, glib
|
|
||||||
, babl
|
|
||||||
, libpng
|
|
||||||
, cairo
|
|
||||||
, libjpeg
|
|
||||||
, librsvg
|
|
||||||
, lensfun
|
|
||||||
, libspiro
|
|
||||||
, maxflow
|
|
||||||
, netsurf
|
|
||||||
, pango
|
|
||||||
, poly2tri-c
|
|
||||||
, poppler
|
|
||||||
, bzip2
|
|
||||||
, json-glib
|
|
||||||
, gettext
|
|
||||||
, meson
|
|
||||||
, ninja
|
|
||||||
, libraw
|
|
||||||
, gexiv2
|
|
||||||
, libwebp
|
|
||||||
, luajit
|
|
||||||
, openexr
|
|
||||||
, OpenCL
|
|
||||||
, suitesparse
|
|
||||||
}:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
pname = "gegl";
|
|
||||||
version = "0.4.30";
|
|
||||||
|
|
||||||
outputs = [ "out" "dev" "devdoc" ];
|
|
||||||
outputBin = "dev";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
|
||||||
sha256 = "sha256-wRJ4LPQJaWniMhfM36vkIoTjXVQ1/wxD1A5McPrsqN0=";
|
|
||||||
};
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
|
||||||
pkg-config
|
|
||||||
gettext
|
|
||||||
meson
|
|
||||||
ninja
|
|
||||||
vala
|
|
||||||
gobject-introspection
|
|
||||||
gtk-doc
|
|
||||||
docbook-xsl-nons
|
|
||||||
docbook_xml_dtd_43
|
|
||||||
];
|
|
||||||
|
|
||||||
buildInputs = [
|
|
||||||
libpng
|
|
||||||
cairo
|
|
||||||
libjpeg
|
|
||||||
librsvg
|
|
||||||
lensfun
|
|
||||||
libspiro
|
|
||||||
maxflow
|
|
||||||
netsurf.libnsgif
|
|
||||||
pango
|
|
||||||
poly2tri-c
|
|
||||||
poppler
|
|
||||||
bzip2
|
|
||||||
libraw
|
|
||||||
libwebp
|
|
||||||
gexiv2
|
|
||||||
luajit
|
|
||||||
openexr
|
|
||||||
suitesparse
|
|
||||||
] ++ lib.optional stdenv.isDarwin OpenCL;
|
|
||||||
|
|
||||||
# for gegl-4.0.pc
|
|
||||||
propagatedBuildInputs = [
|
|
||||||
glib
|
|
||||||
json-glib
|
|
||||||
babl
|
|
||||||
];
|
|
||||||
|
|
||||||
mesonFlags = [
|
|
||||||
"-Ddocs=true"
|
|
||||||
"-Dmrg=disabled" # not sure what that is
|
|
||||||
"-Dsdl2=disabled"
|
|
||||||
"-Dpygobject=disabled"
|
|
||||||
"-Dlibav=disabled"
|
|
||||||
"-Dlibv4l=disabled"
|
|
||||||
"-Dlibv4l2=disabled"
|
|
||||||
# Disabled due to multiple vulnerabilities, see
|
|
||||||
# https://github.com/NixOS/nixpkgs/pull/73586
|
|
||||||
"-Djasper=disabled"
|
|
||||||
];
|
|
||||||
|
|
||||||
# TODO: Fix missing math symbols in gegl seamless clone.
|
|
||||||
# It only appears when we use packaged poly2tri-c instead of vendored one.
|
|
||||||
NIX_CFLAGS_COMPILE = "-lm";
|
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
chmod +x tests/opencl/opencl_test.sh
|
|
||||||
patchShebangs tests/ff-load-save/tests_ff_load_save.sh tests/opencl/opencl_test.sh tools/xml_insert.sh
|
|
||||||
'';
|
|
||||||
|
|
||||||
# tests fail to connect to the com.apple.fonts daemon in sandboxed mode
|
|
||||||
doCheck = !stdenv.isDarwin;
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "Graph-based image processing framework";
|
|
||||||
homepage = "https://www.gegl.org";
|
|
||||||
license = licenses.lgpl3Plus;
|
|
||||||
maintainers = with maintainers; [ jtojnar ];
|
|
||||||
platforms = platforms.unix;
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,43 +1,115 @@
|
||||||
{ lib, stdenv
|
{ lib
|
||||||
|
, stdenv
|
||||||
, fetchurl
|
, fetchurl
|
||||||
, pkg-config
|
, pkg-config
|
||||||
|
, vala
|
||||||
|
, gobject-introspection
|
||||||
|
, gtk-doc
|
||||||
|
, docbook-xsl-nons
|
||||||
|
, docbook_xml_dtd_43
|
||||||
|
, glib
|
||||||
, babl
|
, babl
|
||||||
, libpng
|
, libpng
|
||||||
, cairo
|
, cairo
|
||||||
, libjpeg
|
, libjpeg
|
||||||
, librsvg
|
, librsvg
|
||||||
|
, lensfun
|
||||||
|
, libspiro
|
||||||
|
, maxflow
|
||||||
|
, netsurf
|
||||||
, pango
|
, pango
|
||||||
, gtk2
|
, poly2tri-c
|
||||||
|
, poppler
|
||||||
, bzip2
|
, bzip2
|
||||||
, intltool
|
, json-glib
|
||||||
, libintl
|
, gettext
|
||||||
, OpenGL ? null }:
|
, meson
|
||||||
|
, ninja
|
||||||
|
, libraw
|
||||||
|
, gexiv2
|
||||||
|
, libwebp
|
||||||
|
, luajit
|
||||||
|
, openexr
|
||||||
|
, OpenCL
|
||||||
|
, suitesparse
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "gegl";
|
pname = "gegl";
|
||||||
version = "0.2.0";
|
version = "0.4.30";
|
||||||
|
|
||||||
|
outputs = [ "out" "dev" "devdoc" ];
|
||||||
|
outputBin = "dev";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "ftp://ftp.gtk.org/pub/gegl/0.2/${pname}-${version}.tar.bz2";
|
url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "df2e6a0d9499afcbc4f9029c18d9d1e0dd5e8710a75e17c9b1d9a6480dd8d426";
|
sha256 = "sha256-wRJ4LPQJaWniMhfM36vkIoTjXVQ1/wxD1A5McPrsqN0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [( fetchurl {
|
nativeBuildInputs = [
|
||||||
url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/"
|
pkg-config
|
||||||
+ "gegl-0.2.0-CVE-2012-4433.patch?h=packages/gegl&id=57a60fbda5d7bbbd1cc4767cb0724baa80c5e3e9";
|
gettext
|
||||||
sha256 = "0p8mxj3w09nn1cc6cbxrd9hx742c5y27903i608wx6ja3kdjis59";
|
meson
|
||||||
name = "CVE-2012-4433.patch";
|
ninja
|
||||||
})];
|
vala
|
||||||
|
gobject-introspection
|
||||||
|
gtk-doc
|
||||||
|
docbook-xsl-nons
|
||||||
|
docbook_xml_dtd_43
|
||||||
|
];
|
||||||
|
|
||||||
# needs fonts otherwise don't know how to pass them
|
buildInputs = [
|
||||||
configureFlags = [ "--disable-docs" ];
|
libpng
|
||||||
|
cairo
|
||||||
|
libjpeg
|
||||||
|
librsvg
|
||||||
|
lensfun
|
||||||
|
libspiro
|
||||||
|
maxflow
|
||||||
|
netsurf.libnsgif
|
||||||
|
pango
|
||||||
|
poly2tri-c
|
||||||
|
poppler
|
||||||
|
bzip2
|
||||||
|
libraw
|
||||||
|
libwebp
|
||||||
|
gexiv2
|
||||||
|
luajit
|
||||||
|
openexr
|
||||||
|
suitesparse
|
||||||
|
] ++ lib.optional stdenv.isDarwin OpenCL;
|
||||||
|
|
||||||
buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk2 bzip2 intltool libintl ]
|
# for gegl-4.0.pc
|
||||||
++ lib.optional stdenv.isDarwin OpenGL;
|
propagatedBuildInputs = [
|
||||||
|
glib
|
||||||
|
json-glib
|
||||||
|
babl
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
mesonFlags = [
|
||||||
|
"-Ddocs=true"
|
||||||
|
"-Dmrg=disabled" # not sure what that is
|
||||||
|
"-Dsdl2=disabled"
|
||||||
|
"-Dpygobject=disabled"
|
||||||
|
"-Dlibav=disabled"
|
||||||
|
"-Dlibv4l=disabled"
|
||||||
|
"-Dlibv4l2=disabled"
|
||||||
|
# Disabled due to multiple vulnerabilities, see
|
||||||
|
# https://github.com/NixOS/nixpkgs/pull/73586
|
||||||
|
"-Djasper=disabled"
|
||||||
|
];
|
||||||
|
|
||||||
doCheck = false; # fails 3 out of 19 tests
|
# TODO: Fix missing math symbols in gegl seamless clone.
|
||||||
|
# It only appears when we use packaged poly2tri-c instead of vendored one.
|
||||||
|
NIX_CFLAGS_COMPILE = "-lm";
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
chmod +x tests/opencl/opencl_test.sh
|
||||||
|
patchShebangs tests/ff-load-save/tests_ff_load_save.sh tests/opencl/opencl_test.sh tools/xml_insert.sh
|
||||||
|
'';
|
||||||
|
|
||||||
|
# tests fail to connect to the com.apple.fonts daemon in sandboxed mode
|
||||||
|
doCheck = !stdenv.isDarwin;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Graph-based image processing framework";
|
description = "Graph-based image processing framework";
|
||||||
|
|
|
@ -5302,9 +5302,7 @@ in
|
||||||
|
|
||||||
gnome-podcasts = callPackage ../applications/audio/gnome-podcasts { };
|
gnome-podcasts = callPackage ../applications/audio/gnome-podcasts { };
|
||||||
|
|
||||||
gnome-photos = callPackage ../applications/graphics/gnome-photos {
|
gnome-photos = callPackage ../applications/graphics/gnome-photos { };
|
||||||
gegl = gegl_0_4;
|
|
||||||
};
|
|
||||||
|
|
||||||
gnokii = callPackage ../tools/misc/gnokii { };
|
gnokii = callPackage ../tools/misc/gnokii { };
|
||||||
|
|
||||||
|
@ -15131,10 +15129,6 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
gegl = callPackage ../development/libraries/gegl {
|
gegl = callPackage ../development/libraries/gegl {
|
||||||
inherit (darwin.apple_sdk.frameworks) OpenGL;
|
|
||||||
};
|
|
||||||
|
|
||||||
gegl_0_4 = callPackage ../development/libraries/gegl/4.0.nix {
|
|
||||||
inherit (darwin.apple_sdk.frameworks) OpenCL;
|
inherit (darwin.apple_sdk.frameworks) OpenCL;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -24166,7 +24160,6 @@ in
|
||||||
|
|
||||||
gimp = callPackage ../applications/graphics/gimp {
|
gimp = callPackage ../applications/graphics/gimp {
|
||||||
autoreconfHook = buildPackages.autoreconfHook269;
|
autoreconfHook = buildPackages.autoreconfHook269;
|
||||||
gegl = gegl_0_4;
|
|
||||||
lcms = lcms2;
|
lcms = lcms2;
|
||||||
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
|
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
|
||||||
};
|
};
|
||||||
|
@ -24179,7 +24172,6 @@ in
|
||||||
|
|
||||||
glimpse = callPackage ../applications/graphics/glimpse {
|
glimpse = callPackage ../applications/graphics/glimpse {
|
||||||
autoreconfHook = buildPackages.autoreconfHook269;
|
autoreconfHook = buildPackages.autoreconfHook269;
|
||||||
gegl = gegl_0_4;
|
|
||||||
lcms = lcms2;
|
lcms = lcms2;
|
||||||
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
|
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue