From 47216a62d39a31b419739008fcbbe982481cb348 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 1 Jul 2018 11:05:29 +0200 Subject: [PATCH 1/7] libde265: init at 1.0.3 --- .../libraries/libde265/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/libde265/default.nix diff --git a/pkgs/development/libraries/libde265/default.nix b/pkgs/development/libraries/libde265/default.nix new file mode 100644 index 00000000000..07823072bad --- /dev/null +++ b/pkgs/development/libraries/libde265/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }: + +stdenv.mkDerivation rec { + version = "1.0.3"; + name = "libde265-${version}"; + + src = fetchFromGitHub { + owner = "strukturag"; + repo = "libde265"; + rev = "v${version}"; + sha256 = "049g77f6c5sbk1h534zi9akj3y5h8zwnca5c9kqqjkn7f17irk10"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + meta = { + homepage = "https://github.com/strukturag/libde265"; + description = "Open h.265 video codec implementation"; + license = stdenv.lib.licenses.lgpl3; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ gebner ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b1219690d7..71a947b7070 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10018,6 +10018,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; + libde265 = callPackage ../development/libraries/libde265 {}; + libdevil = callPackage ../development/libraries/libdevil { inherit (darwin.apple_sdk.frameworks) OpenGL; }; From 055a355c0b7f06408e2e16e53d1d3de7575d0614 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 1 Jul 2018 11:05:44 +0200 Subject: [PATCH 2/7] libheif: init at 1.3.2 --- .../development/libraries/libheif/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/libraries/libheif/default.nix diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/development/libraries/libheif/default.nix new file mode 100644 index 00000000000..d4555573ded --- /dev/null +++ b/pkgs/development/libraries/libheif/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, libde265, x265, pkgconfig, libpng, libjpeg }: + +stdenv.mkDerivation rec { + version = "1.3.2"; + name = "libheif-${version}"; + + src = fetchFromGitHub { + owner = "strukturag"; + repo = "libheif"; + rev = "v${version}"; + sha256 = "0hk8mzig2kp5f94j4jwqxzjrm7ffk16ffvxl92rf0afsh6vgnz7w"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libde265 x265 libpng libjpeg ]; + propagatedBuildInputs = [ x265 ]; + + meta = { + homepage = "http://www.libheif.org/"; + description = "ISO/IEC 23008-12:2017 HEIF image file format decoder and encoder"; + license = stdenv.lib.licenses.lgpl3; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ gebner ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71a947b7070..ef3ffdf7bab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10234,6 +10234,8 @@ with pkgs; libhdhomerun = callPackage ../development/libraries/libhdhomerun { }; + libheif = callPackage ../development/libraries/libheif {}; + libhttpseverywhere = callPackage ../development/libraries/libhttpseverywhere { }; libHX = callPackage ../development/libraries/libHX { }; From e68343289506773785c2990272b48013b7e90422 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 1 Jul 2018 11:05:59 +0200 Subject: [PATCH 3/7] imagemagick7: add heif support --- pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index fb390c0995e..d8c11f33439 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg -, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp +, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif , ApplicationServices , buildPlatform, hostPlatform }: @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib fontconfig freetype ghostscript - libpng libtiff libxml2 + libpng libtiff libxml2 libheif ] ++ lib.optionals (!hostPlatform.isMinGW) [ openexr librsvg openjpeg ] From 69d139befc89c449dd26c89d9c577004881702fe Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 1 Jul 2018 11:06:10 +0200 Subject: [PATCH 4/7] gimp: add heif support --- pkgs/applications/graphics/gimp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index f92594f08e1..4acc7cf3758 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -2,7 +2,7 @@ , pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, poppler_data, libtiff , libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, shared-mime-info , python2Packages, libexif, gettext, xorg, glib-networking, libmypaint, gexiv2 -, harfbuzz, mypaint-brushes, libwebp, libgudev, openexr +, harfbuzz, mypaint-brushes, libwebp, libheif, libgudev, openexr , AppKit, Cocoa, gtk-mac-integration }: let @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { buildInputs = [ babl gegl gtk2 glib gdk_pixbuf pango cairo gexiv2 harfbuzz isocodes freetype fontconfig lcms libpng libjpeg poppler poppler_data libtiff openexr - libmng librsvg libwmf zlib libzip ghostscript aalib shared-mime-info libwebp + libmng librsvg libwmf zlib libzip ghostscript aalib shared-mime-info libwebp libheif python pygtk libexif xorg.libXpm glib-networking libmypaint mypaint-brushes ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ] ++ stdenv.lib.optionals stdenv.isLinux [ libgudev ]; From a3c82197d9a13c7837f577bac93ea69fc93026a0 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 1 Jul 2018 14:09:22 +0200 Subject: [PATCH 5/7] imagemagick: heif support --- pkgs/applications/graphics/ImageMagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 3af6e19b701..b767f11da00 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg -, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, fftw +, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, fftw, libheif, libde265 , ApplicationServices , buildPlatform, hostPlatform }: @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib fontconfig freetype ghostscript - libpng libtiff libxml2 + libpng libtiff libxml2 libheif libde265 ] ++ lib.optionals (!hostPlatform.isMinGW) [ openexr librsvg openjpeg ] From a2922b045317b74048ced6757c0fc41389298421 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 1 Jul 2018 14:09:50 +0200 Subject: [PATCH 6/7] krita: 4.0.3 -> 4.1.0 --- pkgs/applications/graphics/krita/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 690253947a1..e7e93ffab1d 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -5,15 +5,16 @@ , boost, libraw, fftw, eigen, exiv2, lcms2, gsl, openexr , openjpeg, opencolorio, vc, poppler_qt5, curl, ilmbase , qtmultimedia, qtx11extras +, python3 }: mkDerivation rec { name = "krita-${version}"; - version = "4.0.3"; + version = "4.1.0"; src = fetchurl { url = "https://download.kde.org/stable/krita/${version}/${name}.tar.gz"; - sha256 = "0zmn29dzqncc80pvy9ymgyzqw8x1ryq8b4x5mr4sz15iyj7xgspr"; + sha256 = "1mbyybc7h3sblbaklvz0cci3ys4zcyi616fgdn06p62v2vw2sybq"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; @@ -24,6 +25,7 @@ mkDerivation rec { boost libraw fftw eigen exiv2 lcms2 gsl openexr openjpeg opencolorio vc poppler_qt5 curl ilmbase qtmultimedia qtx11extras + python3 ]; NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ]; From 02b7eef8084487ef284b3ef612c54413b6e55701 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 1 Jul 2018 14:09:58 +0200 Subject: [PATCH 7/7] krita: heif and gif support --- pkgs/applications/graphics/krita/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index e7e93ffab1d..1fd19162a4f 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -2,7 +2,7 @@ , karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons , kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem , kio, kcrash -, boost, libraw, fftw, eigen, exiv2, lcms2, gsl, openexr +, boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib , openjpeg, opencolorio, vc, poppler_qt5, curl, ilmbase , qtmultimedia, qtx11extras , python3 @@ -22,7 +22,7 @@ mkDerivation rec { buildInputs = [ karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons ki18n kitemmodels kitemviews kwindowsystem kio kcrash - boost libraw fftw eigen exiv2 lcms2 gsl openexr + boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib openjpeg opencolorio vc poppler_qt5 curl ilmbase qtmultimedia qtx11extras python3