From 67f0a216e5c8cec5a1d1787c57dbf8b4fb56ccf9 Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Wed, 2 Sep 2020 16:36:38 +0200 Subject: [PATCH 01/58] hspell: fix cross-platform build issues hspell uses a couple of binaries it generates during it's own build. These will cause the build to fail later in cross-platform builds as these binaries have the wrong executable format. Using a hspell to bootstrap it's own build natively resolves this issue. --- pkgs/development/libraries/hspell/default.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/hspell/default.nix b/pkgs/development/libraries/hspell/default.nix index 8501bf88b6d..813bbef26b7 100644 --- a/pkgs/development/libraries/hspell/default.nix +++ b/pkgs/development/libraries/hspell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, zlib }: +{ stdenv, fetchurl, perl, zlib, buildPackages }: stdenv.mkDerivation rec { name = "${passthru.pname}-${passthru.version}"; @@ -16,7 +16,18 @@ stdenv.mkDerivation rec { }; patchPhase = ''patchShebangs .''; - buildInputs = [ perl zlib ]; + preBuild = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + make CC=${buildPackages.stdenv.cc}/bin/cc find_sizes + mv find_sizes find_sizes_build + make clean + + substituteInPlace Makefile --replace "./find_sizes" "./find_sizes_build" + substituteInPlace Makefile --replace "ar cr" "${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar cr" + substituteInPlace Makefile --replace "ranlib" "${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib" + substituteInPlace Makefile --replace "STRIP=strip" "STRIP=${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip" + ''; + nativeBuildInputs = [ perl zlib ]; +# buildInputs = [ zlib ]; meta = with stdenv.lib; { description = "Hebrew spell checker"; From a4414f45b5fb00f19e39aa38b9cf5dee9b64daf9 Mon Sep 17 00:00:00 2001 From: Las Date: Wed, 7 Oct 2020 23:12:22 +0000 Subject: [PATCH 02/58] maintainers: add l-as --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4e7d4746385..4293ed14a9d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4937,6 +4937,16 @@ fingerprint = "5A9A 1C9B 2369 8049 3B48 CF5B 81A1 5409 4816 2372"; }]; }; + l-as = { + email = "las@protonmail.ch"; + github = "L-as"; + githubId = 22075344; + keys = [{ + longkeyid = "rsa2048/0xAC458A7D1087D025"; + fingerprint = "A093 EA17 F450 D4D1 60A0 1194 AC45 8A7D 1087 D025"; + }]; + name = "Las Safin"; + }; laikq = { email = "gwen@quasebarth.de"; github = "laikq"; From 96d50327bc590822210fae445fa6f3261a8f4642 Mon Sep 17 00:00:00 2001 From: Las Date: Sun, 3 Jan 2021 19:26:08 +0000 Subject: [PATCH 03/58] libtiff: export private headers for freeimage They are exported under the dev_private output so that they aren't available automatically to dependening libraries. This also switches to cmake to simplify the patch. --- pkgs/development/libraries/libtiff/default.nix | 17 ++++++++++++++--- .../development/libraries/libtiff/headers.patch | 13 +++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/libtiff/headers.patch diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 6d410962182..2f5ccc8c98f 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -2,6 +2,7 @@ , fetchurl , pkgconfig +, cmake , zlib , libjpeg @@ -17,15 +18,25 @@ stdenv.mkDerivation rec { sha256 = "0d46bdvxdiv59lxnb0xz9ywm8arsr6xsapi5s6y6vnys2wjz6aax"; }; - outputs = [ "bin" "dev" "out" "man" "doc" ]; + # FreeImage needs this patch + patches = [ ./headers.patch ]; - nativeBuildInputs = [ pkgconfig ]; + outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ]; + + postFixup = '' + moveToOutput include/tif_dir.h $dev_private + moveToOutput include/tif_config.h $dev_private + moveToOutput include/tiffiop.h $dev_private + ''; + + nativeBuildInputs = [ cmake pkgconfig ]; propagatedBuildInputs = [ zlib libjpeg xz ]; #TODO: opengl support (bogus configure detection) enableParallelBuilding = true; - doCheck = true; # not cross; + doInstallCheck = true; + installCheckTarget = "test"; meta = with stdenv.lib; { description = "Library and utilities for working with the TIFF image file format"; diff --git a/pkgs/development/libraries/libtiff/headers.patch b/pkgs/development/libraries/libtiff/headers.patch new file mode 100644 index 00000000000..5a00502ef28 --- /dev/null +++ b/pkgs/development/libraries/libtiff/headers.patch @@ -0,0 +1,13 @@ +diff -ruN a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt +--- a/libtiff/CMakeLists.txt 2019-05-31 13:05:22.849705817 +0000 ++++ b/libtiff/CMakeLists.txt 2020-11-27 21:50:03.527831837 +0000 +@@ -42,6 +42,9 @@ + libtiffxx.map) + + set(tiff_HEADERS ++ tiffiop.h ++ ${CMAKE_CURRENT_BINARY_DIR}/tif_config.h ++ tif_dir.h + tiff.h + tiffio.h + tiffvers.h) From 2cc1925c040c7a564079cf187a187031d5f2c0b1 Mon Sep 17 00:00:00 2001 From: Las Date: Mon, 4 Jan 2021 22:20:49 +0000 Subject: [PATCH 04/58] libjpeg-turbo: include transupp functionality for freeimage The transupp.h header is exported in the dev_private output. --- ...le-transupp.c-as-part-of-the-library.patch | 104 ++++++++++++++++++ .../libraries/libjpeg-turbo/default.nix | 11 +- 2 files changed, 112 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/libjpeg-turbo/0001-Compile-transupp.c-as-part-of-the-library.patch diff --git a/pkgs/development/libraries/libjpeg-turbo/0001-Compile-transupp.c-as-part-of-the-library.patch b/pkgs/development/libraries/libjpeg-turbo/0001-Compile-transupp.c-as-part-of-the-library.patch new file mode 100644 index 00000000000..0a09a8845c1 --- /dev/null +++ b/pkgs/development/libraries/libjpeg-turbo/0001-Compile-transupp.c-as-part-of-the-library.patch @@ -0,0 +1,104 @@ +From 4a0584f7c05641143151ebdc1be1163bebf9d35d Mon Sep 17 00:00:00 2001 +From: Las +Date: Sun, 3 Jan 2021 18:35:37 +0000 +Subject: [PATCH] Compile transupp.c as part of the library + +The exported symbols are made weak to not conflict with users +of the library that already vendor this functionality. +--- + CMakeLists.txt | 4 ++-- + transupp.c | 14 +++++++------- + 2 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0ca6f98..a9a0fae 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -533,7 +533,7 @@ set(JPEG_SOURCES jcapimin.c jcapistd.c jccoefct.c jccolor.c jcdctmgr.c jchuff.c + jdatasrc.c jdcoefct.c jdcolor.c jddctmgr.c jdhuff.c jdicc.c jdinput.c + jdmainct.c jdmarker.c jdmaster.c jdmerge.c jdphuff.c jdpostct.c jdsample.c + jdtrans.c jerror.c jfdctflt.c jfdctfst.c jfdctint.c jidctflt.c jidctfst.c +- jidctint.c jidctred.c jquant1.c jquant2.c jutils.c jmemmgr.c jmemnobs.c) ++ jidctint.c jidctred.c jquant1.c jquant2.c jutils.c jmemmgr.c jmemnobs.c transupp.c) + + if(WITH_ARITH_ENC OR WITH_ARITH_DEC) + set(JPEG_SOURCES ${JPEG_SOURCES} jaricom.c) +@@ -1489,7 +1489,7 @@ install(EXPORT ${CMAKE_PROJECT_NAME}Targets + + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h + ${CMAKE_CURRENT_SOURCE_DIR}/jerror.h ${CMAKE_CURRENT_SOURCE_DIR}/jmorecfg.h +- ${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h ${CMAKE_CURRENT_SOURCE_DIR}/transupp.h + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + + include(cmakescripts/BuildPackages.cmake) +diff --git a/transupp.c b/transupp.c +index 6e86077..2da49a7 100644 +--- a/transupp.c ++++ b/transupp.c +@@ -1386,7 +1386,7 @@ jt_read_integer(const char **strptr, JDIMENSION *result) + * This code is loosely based on XParseGeometry from the X11 distribution. + */ + +-GLOBAL(boolean) ++GLOBAL(boolean) __attribute__((weak)) + jtransform_parse_crop_spec(jpeg_transform_info *info, const char *spec) + { + info->crop = FALSE; +@@ -1486,7 +1486,7 @@ trim_bottom_edge(jpeg_transform_info *info, JDIMENSION full_height) + * and transformation is not perfect. Otherwise returns TRUE. + */ + +-GLOBAL(boolean) ++GLOBAL(boolean) __attribute__((weak)) + jtransform_request_workspace(j_decompress_ptr srcinfo, + jpeg_transform_info *info) + { +@@ -2033,7 +2033,7 @@ adjust_exif_parameters(JOCTET *data, unsigned int length, JDIMENSION new_width, + * to jpeg_write_coefficients(). + */ + +-GLOBAL(jvirt_barray_ptr *) ++GLOBAL(jvirt_barray_ptr *) __attribute__((weak)) + jtransform_adjust_parameters(j_decompress_ptr srcinfo, j_compress_ptr dstinfo, + jvirt_barray_ptr *src_coef_arrays, + jpeg_transform_info *info) +@@ -2152,7 +2152,7 @@ jtransform_adjust_parameters(j_decompress_ptr srcinfo, j_compress_ptr dstinfo, + * Note that some transformations will modify the source data arrays! + */ + +-GLOBAL(void) ++GLOBAL(void) __attribute__((weak)) + jtransform_execute_transform(j_decompress_ptr srcinfo, j_compress_ptr dstinfo, + jvirt_barray_ptr *src_coef_arrays, + jpeg_transform_info *info) +@@ -2264,7 +2264,7 @@ jtransform_execute_transform(j_decompress_ptr srcinfo, j_compress_ptr dstinfo, + * (may use custom action then) + */ + +-GLOBAL(boolean) ++GLOBAL(boolean) __attribute__((weak)) + jtransform_perfect_transform(JDIMENSION image_width, JDIMENSION image_height, + int MCU_width, int MCU_height, + JXFORM_CODE transform) +@@ -2303,7 +2303,7 @@ jtransform_perfect_transform(JDIMENSION image_width, JDIMENSION image_height, + * This must be called before jpeg_read_header() to have the desired effect. + */ + +-GLOBAL(void) ++GLOBAL(void) __attribute__((weak)) + jcopy_markers_setup(j_decompress_ptr srcinfo, JCOPY_OPTION option) + { + #ifdef SAVE_MARKERS_SUPPORTED +@@ -2331,7 +2331,7 @@ jcopy_markers_setup(j_decompress_ptr srcinfo, JCOPY_OPTION option) + * JFIF APP0 or Adobe APP14 markers if selected. + */ + +-GLOBAL(void) ++GLOBAL(void) __attribute__((weak)) + jcopy_markers_execute(j_decompress_ptr srcinfo, j_compress_ptr dstinfo, + JCOPY_OPTION option) + { +-- +2.29.2 + diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index c4e81d034fc..95b15fce7b0 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -15,11 +15,16 @@ stdenv.mkDerivation rec { sha256 = "0njdxfmyk8smj8bbd6fs3lxjaq3lybivwgg16gpnbiyl984dpi9b"; }; - patches = - stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt") + # This is needed by freeimage + patches = [ ./0001-Compile-transupp.c-as-part-of-the-library.patch ] + ++ stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt") ./mingw-boolean.patch; - outputs = [ "bin" "dev" "out" "man" "doc" ]; + outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ]; + + postFixup = '' + moveToOutput include/transupp.h $dev_private + ''; nativeBuildInputs = [ cmake nasm ]; From be94ded77feb048e181d3cda4abddee66fd3d63d Mon Sep 17 00:00:00 2001 From: Las Date: Sun, 10 Jan 2021 16:18:38 +0000 Subject: [PATCH 05/58] freeimage: 3.18.0 -> unstable-2020-07-04, unbundle dependencies, fix aarch64 support The unreleased version of freeimage contains many important fixes, amongst others CVEs, and is taken from the svn repository (r1859). We also unbundle all the dependencies to make it fit into the Nixpkgs ecosystem. All the changes needed to unbundle and make it compile with Nix is contained in unbundle.diff. Fixes #77653 Replaces #77655 --- .../libraries/freeimage/default.nix | 54 +- .../libraries/freeimage/dylib.patch | 16 - .../libraries/freeimage/unbundle.diff | 584 ++++++++++++++++++ 3 files changed, 606 insertions(+), 48 deletions(-) delete mode 100644 pkgs/development/libraries/freeimage/dylib.patch create mode 100644 pkgs/development/libraries/freeimage/unbundle.diff diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix index c31f858850c..5714131416d 100644 --- a/pkgs/development/libraries/freeimage/default.nix +++ b/pkgs/development/libraries/freeimage/default.nix @@ -1,48 +1,40 @@ -{ lib, stdenv, fetchurl, unzip, darwin }: - -# TODO: consider unvendoring various dependencies (libpng, libjpeg, -# libwebp, zlib, ...) +{ lib, stdenv, fetchsvn, darwin, libtiff +, libpng, zlib, libwebp, libraw, openexr, openjpeg +, libjpeg, jxrlib, pkg-config }: stdenv.mkDerivation { - name = "freeimage-3.18.0"; + pname = "freeimage"; + version = "unstable-2020-07-04"; - src = fetchurl { - url = "mirror://sourceforge/freeimage/FreeImage3180.zip"; - sha256 = "1z9qwi9mlq69d5jipr3v2jika2g0kszqdzilggm99nls5xl7j4zl"; + src = fetchsvn { + url = "svn://svn.code.sf.net/p/freeimage/svn/"; + rev = "1859"; + sha256 = "1d94935aqbkb994nqkw7m8xcynyz9rm6k7k59igrbjak8b63qpi6"; }; + sourceRoot = "svn-r1859/FreeImage/trunk"; - patches = lib.optional stdenv.isDarwin ./dylib.patch; + # Ensure that the bundled libraries are not used at all + prePatch = "rm -rf Source/Lib* Source/OpenEXR Source/ZLib"; + patches = [ ./unbundle.diff ]; - buildInputs = [ unzip ] ++ lib.optional stdenv.isDarwin darwin.cctools; - - prePatch = if stdenv.isDarwin then '' - sed -e 's/$(shell xcrun -find clang)/clang/g' \ - -e 's/$(shell xcrun -find clang++)/clang++/g' \ - -e "s|PREFIX = /usr/local|PREFIX = $out|" \ - -e 's|-Wl,-syslibroot $(MACOSX_SYSROOT)||g' \ - -e 's|-isysroot $(MACOSX_SYSROOT)||g' \ - -e 's| install -d -m 755 -o root -g wheel $(INCDIR) $(INSTALLDIR)||' \ - -e 's| -m 644 -o root -g wheel||g' \ - -i ./Makefile.osx - # Fix LibJXR performance timers - sed 's|^SRCS = \(.*\)$|SRCS = \1 Source/LibJXR/image/sys/perfTimerANSI.c|' -i ./Makefile.srcs - '' else '' - sed -e s@/usr/@$out/@ \ - -e 's@-o root -g root@@' \ - -e 's@ldconfig@echo not running ldconfig@' \ - -i Makefile.gnu Makefile.fip - ''; + nativeBuildInputs = [ pkg-config ] ++ lib.optional stdenv.isDarwin darwin.cctools; + buildInputs = [ libtiff libtiff.dev_private libpng zlib libwebp libraw openexr openjpeg libjpeg libjpeg.dev_private jxrlib ]; postBuild = lib.optionalString (!stdenv.isDarwin) '' make -f Makefile.fip ''; + INCDIR = "${placeholder "out"}/include"; + INSTALLDIR = "${placeholder "out"}/lib"; + preInstall = '' - mkdir -p $out/include $out/lib + mkdir -p $INCDIR $INSTALLDIR ''; postInstall = lib.optionalString (!stdenv.isDarwin) '' make -f Makefile.fip install + '' + lib.optionalString stdenv.isDarwin '' + ln -s $out/lib/libfreeimage.3.dylib $out/lib/libfreeimage.dylib ''; enableParallelBuilding = true; @@ -51,9 +43,7 @@ stdenv.mkDerivation { description = "Open Source library for accessing popular graphics image file formats"; homepage = "http://freeimage.sourceforge.net/"; license = "GPL"; - maintainers = with lib.maintainers; [viric]; + maintainers = with lib.maintainers; [viric l-as]; platforms = with lib.platforms; unix; - # see https://github.com/NixOS/nixpkgs/issues/77653 - broken = stdenv.isAarch64; }; } diff --git a/pkgs/development/libraries/freeimage/dylib.patch b/pkgs/development/libraries/freeimage/dylib.patch deleted file mode 100644 index 0d8188aca70..00000000000 --- a/pkgs/development/libraries/freeimage/dylib.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/Makefile.osx -+++ b/Makefile.osx -@@ -60,1 +60,1 @@ --FreeImage: $(STATICLIB) -+FreeImage: $(STATICLIB) $(SHAREDLIB) -@@ -87,7 +87,7 @@ --$(SHAREDLIB): $(SHAREDLIB)-i386 $(SHAREDLIB)-x86_64 -- $(LIPO) -create $(SHAREDLIB)-i386 $(SHAREDLIB)-x86_64 -output $(SHAREDLIB) -+#$(SHAREDLIB): $(SHAREDLIB)-i386 $(SHAREDLIB)-x86_64 -+# $(LIPO) -create $(SHAREDLIB)-i386 $(SHAREDLIB)-x86_64 -output $(SHAREDLIB) - - $(SHAREDLIB)-i386: $(MODULES_I386) - $(CPP_I386) -arch i386 -dynamiclib $(LIBRARIES_I386) -o $@ $(MODULES_I386) - --$(SHAREDLIB)-x86_64: $(MODULES_X86_64) -+$(SHAREDLIB): $(MODULES_X86_64) diff --git a/pkgs/development/libraries/freeimage/unbundle.diff b/pkgs/development/libraries/freeimage/unbundle.diff new file mode 100644 index 00000000000..22dac720155 --- /dev/null +++ b/pkgs/development/libraries/freeimage/unbundle.diff @@ -0,0 +1,584 @@ +diff --git a/Makefile.fip b/Makefile.fip +index 660a026..86b3040 100644 +--- a/Makefile.fip ++++ b/Makefile.fip +@@ -11,32 +11,21 @@ INSTALLDIR ?= $(DESTDIR)/usr/lib + # Converts cr/lf to just lf + DOS2UNIX = dos2unix + +-LIBRARIES = -lstdc++ ++LIBRARIES = -lstdc++ $(shell pkg-config --libs OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib libjxr libjpeg) + + MODULES = $(SRCS:.c=.o) + MODULES := $(MODULES:.cpp=.o) + ++INCLUDE += $(shell pkg-config --cflags OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib libjxr libjpeg) ++ + # C flags + CFLAGS ?= -std=c99 -O3 -fPIC -fexceptions -fvisibility=hidden +-# OpenJPEG +-CFLAGS += -DOPJ_STATIC +-# LibRaw +-CFLAGS += -DNO_LCMS +-# LibJXR +-CFLAGS += -DDISABLE_PERF_MEASUREMENT -D__ANSI__ + CFLAGS += $(INCLUDE) + + # C++ flags + CXXFLAGS ?= -std=c++0x -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy +-# LibJXR +-CXXFLAGS += -D__ANSI__ + CXXFLAGS += $(INCLUDE) + +-ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64) +- CFLAGS += -fPIC +- CXXFLAGS += -fPIC +-endif +- + TARGET = freeimageplus + STATICLIB = lib$(TARGET).a + SHAREDLIB = lib$(TARGET)-$(VER_MAJOR).$(VER_MINOR).so +@@ -76,10 +65,10 @@ $(SHAREDLIB): $(MODULES) + + install: + install -d $(INCDIR) $(INSTALLDIR) +- install -m 644 -o root -g root $(HEADER) $(INCDIR) +- install -m 644 -o root -g root $(HEADERFIP) $(INCDIR) +- install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR) +- install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR) ++ install -m 644 $(HEADER) $(INCDIR) ++ install -m 644 $(HEADERFIP) $(INCDIR) ++ install -m 644 $(STATICLIB) $(INSTALLDIR) ++ install -m 755 $(SHAREDLIB) $(INSTALLDIR) + ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME) + ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME) + +diff --git a/Makefile.gnu b/Makefile.gnu +index a4f2601..be95476 100644 +--- a/Makefile.gnu ++++ b/Makefile.gnu +@@ -11,32 +11,21 @@ INSTALLDIR ?= $(DESTDIR)/usr/lib + # Converts cr/lf to just lf + DOS2UNIX = dos2unix + +-LIBRARIES = -lstdc++ ++LIBRARIES = -lstdc++ $(shell pkg-config --libs OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib libjxr libjpeg) + + MODULES = $(SRCS:.c=.o) + MODULES := $(MODULES:.cpp=.o) + ++INCLUDE += $(shell pkg-config --cflags OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib libjxr libjpeg) ++ + # C flags + CFLAGS ?= -std=c99 -O3 -fPIC -fexceptions -fvisibility=hidden +-# OpenJPEG +-CFLAGS += -DOPJ_STATIC +-# LibRaw +-CFLAGS += -DNO_LCMS +-# LibJXR +-CFLAGS += -DDISABLE_PERF_MEASUREMENT -D__ANSI__ + CFLAGS += $(INCLUDE) + + # C++ flags + CXXFLAGS ?= -std=c++0x -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy +-# LibJXR +-CXXFLAGS += -D__ANSI__ + CXXFLAGS += $(INCLUDE) + +-ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64) +- CFLAGS += -fPIC +- CXXFLAGS += -fPIC +-endif +- + TARGET = freeimage + STATICLIB = lib$(TARGET).a + SHAREDLIB = lib$(TARGET)-$(VER_MAJOR).$(VER_MINOR).so +@@ -75,12 +64,11 @@ $(SHAREDLIB): $(MODULES) + + install: + install -d $(INCDIR) $(INSTALLDIR) +- install -m 644 -o root -g root $(HEADER) $(INCDIR) +- install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR) +- install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR) ++ install -m 644 $(HEADER) $(INCDIR) ++ install -m 644 $(STATICLIB) $(INSTALLDIR) ++ install -m 755 $(SHAREDLIB) $(INSTALLDIR) + ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME) + ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME) +-# ldconfig + + clean: + rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME) +diff --git a/Makefile.osx b/Makefile.osx +index c39121d..3800e39 100644 +--- a/Makefile.osx ++++ b/Makefile.osx +@@ -10,24 +10,25 @@ MACOSX_SYSROOT = $(shell xcrun --show-sdk-path) + MACOSX_DEPLOYMENT_TARGET = 10.11 + + # General configuration variables: +-CC_I386 = $(shell xcrun -find clang) +-CC_X86_64 = $(shell xcrun -find clang) +-CPP_I386 = $(shell xcrun -find clang++) +-CPP_X86_64 = $(shell xcrun -find clang++) ++CC_I386 = clang ++CC_X86_64 = clang ++CPP_I386 = clang++ ++CPP_X86_64 = clang++ + MACOSX_DEPLOY = -mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET) + COMPILERFLAGS = -Os -fexceptions -fvisibility=hidden -DNO_LCMS -D__ANSI__ + COMPILERFLAGS_I386 = -arch i386 + COMPILERFLAGS_X86_64 = -arch x86_64 + COMPILERPPFLAGS = -Wno-ctor-dtor-privacy -D__ANSI__ -std=c++11 -stdlib=libc++ -Wc++11-narrowing +-INCLUDE += +-INCLUDE_I386 = -isysroot $(MACOSX_SYSROOT) +-INCLUDE_X86_64 = -isysroot $(MACOSX_SYSROOT) ++INCLUDE += $(shell pkg-config --cflags OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib libjxr libjpeg) ++INCLUDE_I386 = ++INCLUDE_X86_64 = + CFLAGS_I386 = $(COMPILERFLAGS) $(COMPILERFLAGS_I386) $(INCLUDE) $(INCLUDE_I386) $(MACOSX_DEPLOY) + CFLAGS_X86_64 = $(COMPILERFLAGS) $(COMPILERFLAGS_X86_64) $(INCLUDE) $(INCLUDE_X86_64) $(MACOSX_DEPLOY) + CPPFLAGS_I386 = $(COMPILERPPFLAGS) $(CFLAGS_I386) + CPPFLAGS_X86_64 = $(COMPILERPPFLAGS) $(CFLAGS_X86_64) +-LIBRARIES_I386 = $(MACOSX_DEPLOY) -Wl,-syslibroot $(MACOSX_SYSROOT) +-LIBRARIES_X86_64 = $(MACOSX_DEPLOY) -Wl,-syslibroot $(MACOSX_SYSROOT) ++LIBS = $(shell pkg-config --libs OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib libjxr libjpeg) ++LIBRARIES_I386 = $(LIBS) $(MACOSX_DEPLOY) ++LIBRARIES_X86_64 = $(LIBS) $(MACOSX_DEPLOY) + LIBTOOL = libtool + LIPO = lipo + +@@ -57,7 +58,7 @@ dist: FreeImage + cp *.a Dist + cp Source/FreeImage.h Dist + +-FreeImage: $(STATICLIB) ++FreeImage: $(STATICLIB) $(SHAREDLIB) + + $(STATICLIB): $(STATICLIB)-x86_64 + cp -p $(STATICLIB)-x86_64 $(STATICLIB) +@@ -84,13 +85,10 @@ $(STATICLIB)-i386: $(MODULES_I386) + $(STATICLIB)-x86_64: $(MODULES_X86_64) + $(LIBTOOL) -arch_only x86_64 -o $@ $(MODULES_X86_64) + +-$(SHAREDLIB): $(SHAREDLIB)-i386 $(SHAREDLIB)-x86_64 +- $(LIPO) -create $(SHAREDLIB)-i386 $(SHAREDLIB)-x86_64 -output $(SHAREDLIB) +- + $(SHAREDLIB)-i386: $(MODULES_I386) + $(CPP_I386) -arch i386 -dynamiclib $(LIBRARIES_I386) -o $@ $(MODULES_I386) + +-$(SHAREDLIB)-x86_64: $(MODULES_X86_64) ++$(SHAREDLIB): $(MODULES_X86_64) + $(CPP_X86_64) -arch x86_64 -dynamiclib $(LIBRARIES_X86_64) -o $@ $(MODULES_X86_64) + + .c.o-i386: +@@ -106,9 +104,8 @@ $(SHAREDLIB)-x86_64: $(MODULES_X86_64) + $(CPP_X86_64) $(CPPFLAGS_X86_64) -c $< -o $@ + + install: +- install -d -m 755 -o root -g wheel $(INCDIR) $(INSTALLDIR) +- install -m 644 -o root -g wheel $(HEADER) $(INCDIR) +- install -m 644 -o root -g wheel $(SHAREDLIB) $(STATICLIB) $(INSTALLDIR) ++ install $(HEADER) $(INCDIR) ++ install $(SHAREDLIB) $(STATICLIB) $(INSTALLDIR) + ranlib -sf $(INSTALLDIR)/$(STATICLIB) + ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(LIBNAME) + +diff --git a/Makefile.srcs b/Makefile.srcs +index 0b8d3a0..b706fd0 100644 +--- a/Makefile.srcs ++++ b/Makefile.srcs +@@ -1,6 +1,6 @@ + VER_MAJOR = 3 + VER_MINOR = 19.0 +-SRCS = ./Source/FreeImage/BitmapAccess.cpp ./Source/FreeImage/ColorLookup.cpp ./Source/FreeImage/ConversionRGBA16.cpp ./Source/FreeImage/ConversionRGBAF.cpp ./Source/FreeImage/FreeImage.cpp ./Source/FreeImage/FreeImageC.c ./Source/FreeImage/FreeImageIO.cpp ./Source/FreeImage/GetType.cpp ./Source/FreeImage/LFPQuantizer.cpp ./Source/FreeImage/MemoryIO.cpp ./Source/FreeImage/PixelAccess.cpp ./Source/FreeImage/J2KHelper.cpp ./Source/FreeImage/MNGHelper.cpp ./Source/FreeImage/Plugin.cpp ./Source/FreeImage/PluginBMP.cpp ./Source/FreeImage/PluginCUT.cpp ./Source/FreeImage/PluginDDS.cpp ./Source/FreeImage/PluginEXR.cpp ./Source/FreeImage/PluginG3.cpp ./Source/FreeImage/PluginGIF.cpp ./Source/FreeImage/PluginHDR.cpp ./Source/FreeImage/PluginICO.cpp ./Source/FreeImage/PluginIFF.cpp ./Source/FreeImage/PluginJ2K.cpp ./Source/FreeImage/PluginJNG.cpp ./Source/FreeImage/PluginJP2.cpp ./Source/FreeImage/PluginJPEG.cpp ./Source/FreeImage/PluginJXR.cpp ./Source/FreeImage/PluginKOALA.cpp ./Source/FreeImage/PluginMNG.cpp ./Source/FreeImage/PluginPCD.cpp ./Source/FreeImage/PluginPCX.cpp ./Source/FreeImage/PluginPFM.cpp ./Source/FreeImage/PluginPICT.cpp ./Source/FreeImage/PluginPNG.cpp ./Source/FreeImage/PluginPNM.cpp ./Source/FreeImage/PluginPSD.cpp ./Source/FreeImage/PluginRAS.cpp ./Source/FreeImage/PluginRAW.cpp ./Source/FreeImage/PluginSGI.cpp ./Source/FreeImage/PluginTARGA.cpp ./Source/FreeImage/PluginTIFF.cpp ./Source/FreeImage/PluginWBMP.cpp ./Source/FreeImage/PluginWebP.cpp ./Source/FreeImage/PluginXBM.cpp ./Source/FreeImage/PluginXPM.cpp ./Source/FreeImage/PSDParser.cpp ./Source/FreeImage/TIFFLogLuv.cpp ./Source/FreeImage/Conversion.cpp ./Source/FreeImage/Conversion16_555.cpp ./Source/FreeImage/Conversion16_565.cpp ./Source/FreeImage/Conversion24.cpp ./Source/FreeImage/Conversion32.cpp ./Source/FreeImage/Conversion4.cpp ./Source/FreeImage/Conversion8.cpp ./Source/FreeImage/ConversionFloat.cpp ./Source/FreeImage/ConversionRGB16.cpp ./Source/FreeImage/ConversionRGBF.cpp ./Source/FreeImage/ConversionType.cpp ./Source/FreeImage/ConversionUINT16.cpp ./Source/FreeImage/Halftoning.cpp ./Source/FreeImage/tmoColorConvert.cpp ./Source/FreeImage/tmoDrago03.cpp ./Source/FreeImage/tmoFattal02.cpp ./Source/FreeImage/tmoReinhard05.cpp ./Source/FreeImage/ToneMapping.cpp ./Source/FreeImage/NNQuantizer.cpp ./Source/FreeImage/WuQuantizer.cpp ./Source/FreeImage/CacheFile.cpp ./Source/FreeImage/MultiPage.cpp ./Source/FreeImage/ZLibInterface.cpp ./Source/Metadata/Exif.cpp ./Source/Metadata/FIRational.cpp ./Source/Metadata/FreeImageTag.cpp ./Source/Metadata/IPTC.cpp ./Source/Metadata/TagConversion.cpp ./Source/Metadata/TagLib.cpp ./Source/Metadata/XTIFF.cpp ./Source/FreeImageToolkit/Background.cpp ./Source/FreeImageToolkit/BSplineRotate.cpp ./Source/FreeImageToolkit/Channels.cpp ./Source/FreeImageToolkit/ClassicRotate.cpp ./Source/FreeImageToolkit/Colors.cpp ./Source/FreeImageToolkit/CopyPaste.cpp ./Source/FreeImageToolkit/Display.cpp ./Source/FreeImageToolkit/Flip.cpp ./Source/FreeImageToolkit/JPEGTransform.cpp ./Source/FreeImageToolkit/MultigridPoissonSolver.cpp ./Source/FreeImageToolkit/Rescale.cpp ./Source/FreeImageToolkit/Resize.cpp Source/LibJPEG/jaricom.c Source/LibJPEG/jcapimin.c Source/LibJPEG/jcapistd.c Source/LibJPEG/jcarith.c Source/LibJPEG/jccoefct.c Source/LibJPEG/jccolor.c Source/LibJPEG/jcdctmgr.c Source/LibJPEG/jchuff.c Source/LibJPEG/jcinit.c Source/LibJPEG/jcmainct.c Source/LibJPEG/jcmarker.c Source/LibJPEG/jcmaster.c Source/LibJPEG/jcomapi.c Source/LibJPEG/jcparam.c Source/LibJPEG/jcprepct.c Source/LibJPEG/jcsample.c Source/LibJPEG/jctrans.c Source/LibJPEG/jdapimin.c Source/LibJPEG/jdapistd.c Source/LibJPEG/jdarith.c Source/LibJPEG/jdatadst.c Source/LibJPEG/jdatasrc.c Source/LibJPEG/jdcoefct.c Source/LibJPEG/jdcolor.c Source/LibJPEG/jddctmgr.c Source/LibJPEG/jdhuff.c Source/LibJPEG/jdinput.c Source/LibJPEG/jdmainct.c Source/LibJPEG/jdmarker.c Source/LibJPEG/jdmaster.c Source/LibJPEG/jdmerge.c Source/LibJPEG/jdpostct.c Source/LibJPEG/jdsample.c Source/LibJPEG/jdtrans.c Source/LibJPEG/jerror.c Source/LibJPEG/jfdctflt.c Source/LibJPEG/jfdctfst.c Source/LibJPEG/jfdctint.c Source/LibJPEG/jidctflt.c Source/LibJPEG/jidctfst.c Source/LibJPEG/jidctint.c Source/LibJPEG/jmemmgr.c Source/LibJPEG/jmemnobs.c Source/LibJPEG/jquant1.c Source/LibJPEG/jquant2.c Source/LibJPEG/jutils.c Source/LibJPEG/transupp.c Source/LibPNG/png.c Source/LibPNG/pngerror.c Source/LibPNG/pngget.c Source/LibPNG/pngmem.c Source/LibPNG/pngpread.c Source/LibPNG/pngread.c Source/LibPNG/pngrio.c Source/LibPNG/pngrtran.c Source/LibPNG/pngrutil.c Source/LibPNG/pngset.c Source/LibPNG/pngtrans.c Source/LibPNG/pngwio.c Source/LibPNG/pngwrite.c Source/LibPNG/pngwtran.c Source/LibPNG/pngwutil.c Source/LibTIFF4/tif_aux.c Source/LibTIFF4/tif_close.c Source/LibTIFF4/tif_codec.c Source/LibTIFF4/tif_color.c Source/LibTIFF4/tif_compress.c Source/LibTIFF4/tif_dir.c Source/LibTIFF4/tif_dirinfo.c Source/LibTIFF4/tif_dirread.c Source/LibTIFF4/tif_dirwrite.c Source/LibTIFF4/tif_dumpmode.c Source/LibTIFF4/tif_error.c Source/LibTIFF4/tif_extension.c Source/LibTIFF4/tif_fax3.c Source/LibTIFF4/tif_fax3sm.c Source/LibTIFF4/tif_flush.c Source/LibTIFF4/tif_getimage.c Source/LibTIFF4/tif_jpeg.c Source/LibTIFF4/tif_luv.c Source/LibTIFF4/tif_lzma.c Source/LibTIFF4/tif_lzw.c Source/LibTIFF4/tif_next.c Source/LibTIFF4/tif_ojpeg.c Source/LibTIFF4/tif_open.c Source/LibTIFF4/tif_packbits.c Source/LibTIFF4/tif_pixarlog.c Source/LibTIFF4/tif_predict.c Source/LibTIFF4/tif_print.c Source/LibTIFF4/tif_read.c Source/LibTIFF4/tif_strip.c Source/LibTIFF4/tif_swab.c Source/LibTIFF4/tif_thunder.c Source/LibTIFF4/tif_tile.c Source/LibTIFF4/tif_version.c Source/LibTIFF4/tif_warning.c Source/LibTIFF4/tif_write.c Source/LibTIFF4/tif_zip.c Source/ZLib/adler32.c Source/ZLib/compress.c Source/ZLib/crc32.c Source/ZLib/deflate.c Source/ZLib/gzclose.c Source/ZLib/gzlib.c Source/ZLib/gzread.c Source/ZLib/gzwrite.c Source/ZLib/infback.c Source/ZLib/inffast.c Source/ZLib/inflate.c Source/ZLib/inftrees.c Source/ZLib/trees.c Source/ZLib/uncompr.c Source/ZLib/zutil.c Source/LibOpenJPEG/bio.c Source/LibOpenJPEG/cio.c Source/LibOpenJPEG/dwt.c Source/LibOpenJPEG/event.c Source/LibOpenJPEG/function_list.c Source/LibOpenJPEG/image.c Source/LibOpenJPEG/invert.c Source/LibOpenJPEG/j2k.c Source/LibOpenJPEG/jp2.c Source/LibOpenJPEG/mct.c Source/LibOpenJPEG/mqc.c Source/LibOpenJPEG/openjpeg.c Source/LibOpenJPEG/opj_clock.c Source/LibOpenJPEG/pi.c Source/LibOpenJPEG/raw.c Source/LibOpenJPEG/t1.c Source/LibOpenJPEG/t2.c Source/LibOpenJPEG/tcd.c Source/LibOpenJPEG/tgt.c Source/OpenEXR/IexMath/IexMathFpu.cpp Source/OpenEXR/IlmImf/b44ExpLogTable.cpp Source/OpenEXR/IlmImf/ImfAcesFile.cpp Source/OpenEXR/IlmImf/ImfAttribute.cpp Source/OpenEXR/IlmImf/ImfB44Compressor.cpp Source/OpenEXR/IlmImf/ImfBoxAttribute.cpp Source/OpenEXR/IlmImf/ImfChannelList.cpp Source/OpenEXR/IlmImf/ImfChannelListAttribute.cpp Source/OpenEXR/IlmImf/ImfChromaticities.cpp Source/OpenEXR/IlmImf/ImfChromaticitiesAttribute.cpp Source/OpenEXR/IlmImf/ImfCompositeDeepScanLine.cpp Source/OpenEXR/IlmImf/ImfCompressionAttribute.cpp Source/OpenEXR/IlmImf/ImfCompressor.cpp Source/OpenEXR/IlmImf/ImfConvert.cpp Source/OpenEXR/IlmImf/ImfCRgbaFile.cpp Source/OpenEXR/IlmImf/ImfDeepCompositing.cpp Source/OpenEXR/IlmImf/ImfDeepFrameBuffer.cpp Source/OpenEXR/IlmImf/ImfDeepImageStateAttribute.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineInputFile.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineInputPart.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineOutputFile.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineOutputPart.cpp Source/OpenEXR/IlmImf/ImfDeepTiledInputFile.cpp Source/OpenEXR/IlmImf/ImfDeepTiledInputPart.cpp Source/OpenEXR/IlmImf/ImfDeepTiledOutputFile.cpp Source/OpenEXR/IlmImf/ImfDeepTiledOutputPart.cpp Source/OpenEXR/IlmImf/ImfDoubleAttribute.cpp Source/OpenEXR/IlmImf/ImfDwaCompressor.cpp Source/OpenEXR/IlmImf/ImfEnvmap.cpp Source/OpenEXR/IlmImf/ImfEnvmapAttribute.cpp Source/OpenEXR/IlmImf/ImfFastHuf.cpp Source/OpenEXR/IlmImf/ImfFloatAttribute.cpp Source/OpenEXR/IlmImf/ImfFloatVectorAttribute.cpp Source/OpenEXR/IlmImf/ImfFrameBuffer.cpp Source/OpenEXR/IlmImf/ImfFramesPerSecond.cpp Source/OpenEXR/IlmImf/ImfGenericInputFile.cpp Source/OpenEXR/IlmImf/ImfGenericOutputFile.cpp Source/OpenEXR/IlmImf/ImfHeader.cpp Source/OpenEXR/IlmImf/ImfHuf.cpp Source/OpenEXR/IlmImf/ImfInputFile.cpp Source/OpenEXR/IlmImf/ImfInputPart.cpp Source/OpenEXR/IlmImf/ImfInputPartData.cpp Source/OpenEXR/IlmImf/ImfIntAttribute.cpp Source/OpenEXR/IlmImf/ImfIO.cpp Source/OpenEXR/IlmImf/ImfKeyCode.cpp Source/OpenEXR/IlmImf/ImfKeyCodeAttribute.cpp Source/OpenEXR/IlmImf/ImfLineOrderAttribute.cpp Source/OpenEXR/IlmImf/ImfLut.cpp Source/OpenEXR/IlmImf/ImfMatrixAttribute.cpp Source/OpenEXR/IlmImf/ImfMisc.cpp Source/OpenEXR/IlmImf/ImfMultiPartInputFile.cpp Source/OpenEXR/IlmImf/ImfMultiPartOutputFile.cpp Source/OpenEXR/IlmImf/ImfMultiView.cpp Source/OpenEXR/IlmImf/ImfOpaqueAttribute.cpp Source/OpenEXR/IlmImf/ImfOutputFile.cpp Source/OpenEXR/IlmImf/ImfOutputPart.cpp Source/OpenEXR/IlmImf/ImfOutputPartData.cpp Source/OpenEXR/IlmImf/ImfPartType.cpp Source/OpenEXR/IlmImf/ImfPizCompressor.cpp Source/OpenEXR/IlmImf/ImfPreviewImage.cpp Source/OpenEXR/IlmImf/ImfPreviewImageAttribute.cpp Source/OpenEXR/IlmImf/ImfPxr24Compressor.cpp Source/OpenEXR/IlmImf/ImfRational.cpp Source/OpenEXR/IlmImf/ImfRationalAttribute.cpp Source/OpenEXR/IlmImf/ImfRgbaFile.cpp Source/OpenEXR/IlmImf/ImfRgbaYca.cpp Source/OpenEXR/IlmImf/ImfRle.cpp Source/OpenEXR/IlmImf/ImfRleCompressor.cpp Source/OpenEXR/IlmImf/ImfScanLineInputFile.cpp Source/OpenEXR/IlmImf/ImfStandardAttributes.cpp Source/OpenEXR/IlmImf/ImfStdIO.cpp Source/OpenEXR/IlmImf/ImfStringAttribute.cpp Source/OpenEXR/IlmImf/ImfStringVectorAttribute.cpp Source/OpenEXR/IlmImf/ImfSystemSpecific.cpp Source/OpenEXR/IlmImf/ImfTestFile.cpp Source/OpenEXR/IlmImf/ImfThreading.cpp Source/OpenEXR/IlmImf/ImfTileDescriptionAttribute.cpp Source/OpenEXR/IlmImf/ImfTiledInputFile.cpp Source/OpenEXR/IlmImf/ImfTiledInputPart.cpp Source/OpenEXR/IlmImf/ImfTiledMisc.cpp Source/OpenEXR/IlmImf/ImfTiledOutputFile.cpp Source/OpenEXR/IlmImf/ImfTiledOutputPart.cpp Source/OpenEXR/IlmImf/ImfTiledRgbaFile.cpp Source/OpenEXR/IlmImf/ImfTileOffsets.cpp Source/OpenEXR/IlmImf/ImfTimeCode.cpp Source/OpenEXR/IlmImf/ImfTimeCodeAttribute.cpp Source/OpenEXR/IlmImf/ImfVecAttribute.cpp Source/OpenEXR/IlmImf/ImfVersion.cpp Source/OpenEXR/IlmImf/ImfWav.cpp Source/OpenEXR/IlmImf/ImfZip.cpp Source/OpenEXR/IlmImf/ImfZipCompressor.cpp Source/OpenEXR/Imath/ImathBox.cpp Source/OpenEXR/Imath/ImathColorAlgo.cpp Source/OpenEXR/Imath/ImathFun.cpp Source/OpenEXR/Imath/ImathMatrixAlgo.cpp Source/OpenEXR/Imath/ImathRandom.cpp Source/OpenEXR/Imath/ImathShear.cpp Source/OpenEXR/Imath/ImathVec.cpp Source/OpenEXR/Iex/IexBaseExc.cpp Source/OpenEXR/Iex/IexThrowErrnoExc.cpp Source/OpenEXR/Half/half.cpp Source/OpenEXR/IlmThread/IlmThread.cpp Source/OpenEXR/IlmThread/IlmThreadMutex.cpp Source/OpenEXR/IlmThread/IlmThreadPool.cpp Source/OpenEXR/IlmThread/IlmThreadSemaphore.cpp Source/OpenEXR/IexMath/IexMathFloatExc.cpp Source/LibRawLite/internal/dcraw_common.cpp Source/LibRawLite/internal/dcraw_fileio.cpp Source/LibRawLite/internal/demosaic_packs.cpp Source/LibRawLite/src/libraw_c_api.cpp Source/LibRawLite/src/libraw_cxx.cpp Source/LibRawLite/src/libraw_datastream.cpp Source/LibWebP/src/dec/alpha_dec.c Source/LibWebP/src/dec/buffer_dec.c Source/LibWebP/src/dec/frame_dec.c Source/LibWebP/src/dec/idec_dec.c Source/LibWebP/src/dec/io_dec.c Source/LibWebP/src/dec/quant_dec.c Source/LibWebP/src/dec/tree_dec.c Source/LibWebP/src/dec/vp8l_dec.c Source/LibWebP/src/dec/vp8_dec.c Source/LibWebP/src/dec/webp_dec.c Source/LibWebP/src/demux/anim_decode.c Source/LibWebP/src/demux/demux.c Source/LibWebP/src/dsp/alpha_processing.c Source/LibWebP/src/dsp/alpha_processing_mips_dsp_r2.c Source/LibWebP/src/dsp/alpha_processing_neon.c Source/LibWebP/src/dsp/alpha_processing_sse2.c Source/LibWebP/src/dsp/alpha_processing_sse41.c Source/LibWebP/src/dsp/cost.c Source/LibWebP/src/dsp/cost_mips32.c Source/LibWebP/src/dsp/cost_mips_dsp_r2.c Source/LibWebP/src/dsp/cost_neon.c Source/LibWebP/src/dsp/cost_sse2.c Source/LibWebP/src/dsp/cpu.c Source/LibWebP/src/dsp/dec.c Source/LibWebP/src/dsp/dec_clip_tables.c Source/LibWebP/src/dsp/dec_mips32.c Source/LibWebP/src/dsp/dec_mips_dsp_r2.c Source/LibWebP/src/dsp/dec_msa.c Source/LibWebP/src/dsp/dec_neon.c Source/LibWebP/src/dsp/dec_sse2.c Source/LibWebP/src/dsp/dec_sse41.c Source/LibWebP/src/dsp/enc.c Source/LibWebP/src/dsp/enc_avx2.c Source/LibWebP/src/dsp/enc_mips32.c Source/LibWebP/src/dsp/enc_mips_dsp_r2.c Source/LibWebP/src/dsp/enc_msa.c Source/LibWebP/src/dsp/enc_neon.c Source/LibWebP/src/dsp/enc_sse2.c Source/LibWebP/src/dsp/enc_sse41.c Source/LibWebP/src/dsp/filters.c Source/LibWebP/src/dsp/filters_mips_dsp_r2.c Source/LibWebP/src/dsp/filters_msa.c Source/LibWebP/src/dsp/filters_neon.c Source/LibWebP/src/dsp/filters_sse2.c Source/LibWebP/src/dsp/lossless.c Source/LibWebP/src/dsp/lossless_enc.c Source/LibWebP/src/dsp/lossless_enc_mips32.c Source/LibWebP/src/dsp/lossless_enc_mips_dsp_r2.c Source/LibWebP/src/dsp/lossless_enc_msa.c Source/LibWebP/src/dsp/lossless_enc_neon.c Source/LibWebP/src/dsp/lossless_enc_sse2.c Source/LibWebP/src/dsp/lossless_enc_sse41.c Source/LibWebP/src/dsp/lossless_mips_dsp_r2.c Source/LibWebP/src/dsp/lossless_msa.c Source/LibWebP/src/dsp/lossless_neon.c Source/LibWebP/src/dsp/lossless_sse2.c Source/LibWebP/src/dsp/rescaler.c Source/LibWebP/src/dsp/rescaler_mips32.c Source/LibWebP/src/dsp/rescaler_mips_dsp_r2.c Source/LibWebP/src/dsp/rescaler_msa.c Source/LibWebP/src/dsp/rescaler_neon.c Source/LibWebP/src/dsp/rescaler_sse2.c Source/LibWebP/src/dsp/ssim.c Source/LibWebP/src/dsp/ssim_sse2.c Source/LibWebP/src/dsp/upsampling.c Source/LibWebP/src/dsp/upsampling_mips_dsp_r2.c Source/LibWebP/src/dsp/upsampling_msa.c Source/LibWebP/src/dsp/upsampling_neon.c Source/LibWebP/src/dsp/upsampling_sse2.c Source/LibWebP/src/dsp/upsampling_sse41.c Source/LibWebP/src/dsp/yuv.c Source/LibWebP/src/dsp/yuv_mips32.c Source/LibWebP/src/dsp/yuv_mips_dsp_r2.c Source/LibWebP/src/dsp/yuv_neon.c Source/LibWebP/src/dsp/yuv_sse2.c Source/LibWebP/src/dsp/yuv_sse41.c Source/LibWebP/src/enc/alpha_enc.c Source/LibWebP/src/enc/analysis_enc.c Source/LibWebP/src/enc/backward_references_cost_enc.c Source/LibWebP/src/enc/backward_references_enc.c Source/LibWebP/src/enc/config_enc.c Source/LibWebP/src/enc/cost_enc.c Source/LibWebP/src/enc/filter_enc.c Source/LibWebP/src/enc/frame_enc.c Source/LibWebP/src/enc/histogram_enc.c Source/LibWebP/src/enc/iterator_enc.c Source/LibWebP/src/enc/near_lossless_enc.c Source/LibWebP/src/enc/picture_csp_enc.c Source/LibWebP/src/enc/picture_enc.c Source/LibWebP/src/enc/picture_psnr_enc.c Source/LibWebP/src/enc/picture_rescale_enc.c Source/LibWebP/src/enc/picture_tools_enc.c Source/LibWebP/src/enc/predictor_enc.c Source/LibWebP/src/enc/quant_enc.c Source/LibWebP/src/enc/syntax_enc.c Source/LibWebP/src/enc/token_enc.c Source/LibWebP/src/enc/tree_enc.c Source/LibWebP/src/enc/vp8l_enc.c Source/LibWebP/src/enc/webp_enc.c Source/LibWebP/src/mux/anim_encode.c Source/LibWebP/src/mux/muxedit.c Source/LibWebP/src/mux/muxinternal.c Source/LibWebP/src/mux/muxread.c Source/LibWebP/src/utils/bit_reader_utils.c Source/LibWebP/src/utils/bit_writer_utils.c Source/LibWebP/src/utils/color_cache_utils.c Source/LibWebP/src/utils/filters_utils.c Source/LibWebP/src/utils/huffman_encode_utils.c Source/LibWebP/src/utils/huffman_utils.c Source/LibWebP/src/utils/quant_levels_dec_utils.c Source/LibWebP/src/utils/quant_levels_utils.c Source/LibWebP/src/utils/random_utils.c Source/LibWebP/src/utils/rescaler_utils.c Source/LibWebP/src/utils/thread_utils.c Source/LibWebP/src/utils/utils.c Source/LibJXR/image/decode/decode.c Source/LibJXR/image/decode/JXRTranscode.c Source/LibJXR/image/decode/postprocess.c Source/LibJXR/image/decode/segdec.c Source/LibJXR/image/decode/strdec.c Source/LibJXR/image/decode/strdec_x86.c Source/LibJXR/image/decode/strInvTransform.c Source/LibJXR/image/decode/strPredQuantDec.c Source/LibJXR/image/encode/encode.c Source/LibJXR/image/encode/segenc.c Source/LibJXR/image/encode/strenc.c Source/LibJXR/image/encode/strenc_x86.c Source/LibJXR/image/encode/strFwdTransform.c Source/LibJXR/image/encode/strPredQuantEnc.c Source/LibJXR/image/sys/adapthuff.c Source/LibJXR/image/sys/image.c Source/LibJXR/image/sys/strcodec.c Source/LibJXR/image/sys/strPredQuant.c Source/LibJXR/image/sys/strTransform.c Source/LibJXR/jxrgluelib/JXRGlue.c Source/LibJXR/jxrgluelib/JXRGlueJxr.c Source/LibJXR/jxrgluelib/JXRGluePFC.c Source/LibJXR/jxrgluelib/JXRMeta.c +-INCLS = ./Examples/OpenGL/TextureManager/TextureManager.h ./Examples/Plugin/PluginCradle.h ./Examples/Generic/FIIO_Mem.h ./Source/MapIntrospector.h ./Source/CacheFile.h ./Source/LibJPEG/cderror.h ./Source/LibJPEG/jmorecfg.h ./Source/LibJPEG/transupp.h ./Source/LibJPEG/jpeglib.h ./Source/LibJPEG/jversion.h ./Source/LibJPEG/jinclude.h ./Source/LibJPEG/jerror.h ./Source/LibJPEG/jconfig.h ./Source/LibJPEG/jdct.h ./Source/LibJPEG/cdjpeg.h ./Source/LibJPEG/jmemsys.h ./Source/LibJPEG/jpegint.h ./Source/Plugin.h ./Source/Metadata/FreeImageTag.h ./Source/Metadata/FIRational.h ./Source/ToneMapping.h ./Source/LibTIFF4/tiffconf.vc.h ./Source/LibTIFF4/tif_config.h ./Source/LibTIFF4/tif_fax3.h ./Source/LibTIFF4/tif_config.vc.h ./Source/LibTIFF4/tiffvers.h ./Source/LibTIFF4/tiffio.h ./Source/LibTIFF4/tif_config.wince.h ./Source/LibTIFF4/tiffconf.wince.h ./Source/LibTIFF4/tiff.h ./Source/LibTIFF4/uvcode.h ./Source/LibTIFF4/tif_dir.h ./Source/LibTIFF4/t4.h ./Source/LibTIFF4/tif_predict.h ./Source/LibTIFF4/tiffiop.h ./Source/LibTIFF4/tiffconf.h ./Source/LibWebP/src/dec/alphai_dec.h ./Source/LibWebP/src/dec/common_dec.h ./Source/LibWebP/src/dec/vp8i_dec.h ./Source/LibWebP/src/dec/webpi_dec.h ./Source/LibWebP/src/dec/vp8li_dec.h ./Source/LibWebP/src/dec/vp8_dec.h ./Source/LibWebP/src/enc/cost_enc.h ./Source/LibWebP/src/enc/histogram_enc.h ./Source/LibWebP/src/enc/vp8li_enc.h ./Source/LibWebP/src/enc/backward_references_enc.h ./Source/LibWebP/src/enc/vp8i_enc.h ./Source/LibWebP/src/utils/bit_reader_utils.h ./Source/LibWebP/src/utils/endian_inl_utils.h ./Source/LibWebP/src/utils/huffman_encode_utils.h ./Source/LibWebP/src/utils/bit_writer_utils.h ./Source/LibWebP/src/utils/random_utils.h ./Source/LibWebP/src/utils/bit_reader_inl_utils.h ./Source/LibWebP/src/utils/quant_levels_dec_utils.h ./Source/LibWebP/src/utils/color_cache_utils.h ./Source/LibWebP/src/utils/thread_utils.h ./Source/LibWebP/src/utils/filters_utils.h ./Source/LibWebP/src/utils/rescaler_utils.h ./Source/LibWebP/src/utils/huffman_utils.h ./Source/LibWebP/src/utils/quant_levels_utils.h ./Source/LibWebP/src/utils/utils.h ./Source/LibWebP/src/mux/muxi.h ./Source/LibWebP/src/mux/animi.h ./Source/LibWebP/src/webp/mux.h ./Source/LibWebP/src/webp/types.h ./Source/LibWebP/src/webp/format_constants.h ./Source/LibWebP/src/webp/demux.h ./Source/LibWebP/src/webp/encode.h ./Source/LibWebP/src/webp/decode.h ./Source/LibWebP/src/webp/mux_types.h ./Source/LibWebP/src/dsp/msa_macro.h ./Source/LibWebP/src/dsp/yuv.h ./Source/LibWebP/src/dsp/common_sse41.h ./Source/LibWebP/src/dsp/neon.h ./Source/LibWebP/src/dsp/common_sse2.h ./Source/LibWebP/src/dsp/quant.h ./Source/LibWebP/src/dsp/lossless_common.h ./Source/LibWebP/src/dsp/mips_macro.h ./Source/LibWebP/src/dsp/dsp.h ./Source/LibWebP/src/dsp/lossless.h ./Source/FreeImageIO.h ./Source/FreeImage.h ./Source/FreeImage/PSDParser.h ./Source/FreeImage/J2KHelper.h ./Source/ZLib/trees.h ./Source/ZLib/inffixed.h ./Source/ZLib/inflate.h ./Source/ZLib/zlib.h ./Source/ZLib/zconf.h ./Source/ZLib/inftrees.h ./Source/ZLib/zutil.h ./Source/ZLib/inffast.h ./Source/ZLib/crc32.h ./Source/ZLib/gzguts.h ./Source/ZLib/deflate.h ./Source/Quantizers.h ./Source/LibOpenJPEG/cio.h ./Source/LibOpenJPEG/mqc.h ./Source/LibOpenJPEG/cidx_manager.h ./Source/LibOpenJPEG/function_list.h ./Source/LibOpenJPEG/indexbox_manager.h ./Source/LibOpenJPEG/opj_config.h ./Source/LibOpenJPEG/opj_clock.h ./Source/LibOpenJPEG/event.h ./Source/LibOpenJPEG/opj_codec.h ./Source/LibOpenJPEG/pi.h ./Source/LibOpenJPEG/dwt.h ./Source/LibOpenJPEG/tgt.h ./Source/LibOpenJPEG/invert.h ./Source/LibOpenJPEG/opj_malloc.h ./Source/LibOpenJPEG/raw.h ./Source/LibOpenJPEG/jp2.h ./Source/LibOpenJPEG/bio.h ./Source/LibOpenJPEG/t2.h ./Source/LibOpenJPEG/mct.h ./Source/LibOpenJPEG/t1.h ./Source/LibOpenJPEG/t1_luts.h ./Source/LibOpenJPEG/j2k.h ./Source/LibOpenJPEG/opj_stdint.h ./Source/LibOpenJPEG/opj_config_private.h ./Source/LibOpenJPEG/opj_includes.h ./Source/LibOpenJPEG/opj_intmath.h ./Source/LibOpenJPEG/image.h ./Source/LibOpenJPEG/opj_inttypes.h ./Source/LibOpenJPEG/openjpeg.h ./Source/LibOpenJPEG/tcd.h ./Source/LibRawLite/libraw/libraw_version.h ./Source/LibRawLite/libraw/libraw_const.h ./Source/LibRawLite/libraw/libraw.h ./Source/LibRawLite/libraw/libraw_types.h ./Source/LibRawLite/libraw/libraw_alloc.h ./Source/LibRawLite/libraw/libraw_datastream.h ./Source/LibRawLite/libraw/libraw_internal.h ./Source/LibRawLite/internal/dmp_include.h ./Source/LibRawLite/internal/libraw_const.h ./Source/LibRawLite/internal/var_defines.h ./Source/LibRawLite/internal/x3f_tools.h ./Source/LibRawLite/internal/defines.h ./Source/LibRawLite/internal/dcraw_fileio_defs.h ./Source/LibRawLite/internal/dcraw_defs.h ./Source/LibRawLite/internal/libraw_cxx_defs.h ./Source/LibRawLite/internal/libraw_internal_funcs.h ./Source/LibPNG/png.h ./Source/LibPNG/pngdebug.h ./Source/LibPNG/pnginfo.h ./Source/LibPNG/pnglibconf.h ./Source/LibPNG/pngstruct.h ./Source/LibPNG/pngpriv.h ./Source/LibPNG/pngconf.h ./Source/LibJXR/common/include/wmspecstrings_strict.h ./Source/LibJXR/common/include/wmspecstring.h ./Source/LibJXR/common/include/guiddef.h ./Source/LibJXR/common/include/wmsal.h ./Source/LibJXR/common/include/wmspecstrings_undef.h ./Source/LibJXR/common/include/wmspecstrings_adt.h ./Source/LibJXR/jxrgluelib/JXRGlue.h ./Source/LibJXR/jxrgluelib/JXRMeta.h ./Source/LibJXR/image/sys/xplatform_image.h ./Source/LibJXR/image/sys/strTransform.h ./Source/LibJXR/image/sys/windowsmediaphoto.h ./Source/LibJXR/image/sys/strcodec.h ./Source/LibJXR/image/sys/ansi.h ./Source/LibJXR/image/sys/perfTimer.h ./Source/LibJXR/image/sys/common.h ./Source/LibJXR/image/decode/decode.h ./Source/LibJXR/image/x86/x86.h ./Source/LibJXR/image/encode/encode.h ./Source/Utilities.h ./Source/FreeImageToolkit/Resize.h ./Source/FreeImageToolkit/Filters.h ./Source/OpenEXR/OpenEXRConfig.h ./Source/OpenEXR/IexMath/IexMathFloatExc.h ./Source/OpenEXR/IexMath/IexMathFpu.h ./Source/OpenEXR/IexMath/IexMathIeeeExc.h ./Source/OpenEXR/IlmThread/IlmThread.h ./Source/OpenEXR/IlmThread/IlmThreadMutex.h ./Source/OpenEXR/IlmThread/IlmThreadForward.h ./Source/OpenEXR/IlmThread/IlmThreadExport.h ./Source/OpenEXR/IlmThread/IlmThreadSemaphore.h ./Source/OpenEXR/IlmThread/IlmThreadPool.h ./Source/OpenEXR/IlmThread/IlmThreadNamespace.h ./Source/OpenEXR/Iex/IexErrnoExc.h ./Source/OpenEXR/Iex/IexMacros.h ./Source/OpenEXR/Iex/IexForward.h ./Source/OpenEXR/Iex/IexExport.h ./Source/OpenEXR/Iex/IexThrowErrnoExc.h ./Source/OpenEXR/Iex/IexNamespace.h ./Source/OpenEXR/Iex/IexMathExc.h ./Source/OpenEXR/Iex/IexBaseExc.h ./Source/OpenEXR/Iex/Iex.h ./Source/OpenEXR/Imath/ImathColorAlgo.h ./Source/OpenEXR/Imath/ImathNamespace.h ./Source/OpenEXR/Imath/ImathVec.h ./Source/OpenEXR/Imath/ImathGL.h ./Source/OpenEXR/Imath/ImathSphere.h ./Source/OpenEXR/Imath/ImathEuler.h ./Source/OpenEXR/Imath/ImathLimits.h ./Source/OpenEXR/Imath/ImathQuat.h ./Source/OpenEXR/Imath/ImathRoots.h ./Source/OpenEXR/Imath/ImathFun.h ./Source/OpenEXR/Imath/ImathExport.h ./Source/OpenEXR/Imath/ImathShear.h ./Source/OpenEXR/Imath/ImathPlane.h ./Source/OpenEXR/Imath/ImathForward.h ./Source/OpenEXR/Imath/ImathHalfLimits.h ./Source/OpenEXR/Imath/ImathFrustumTest.h ./Source/OpenEXR/Imath/ImathMatrixAlgo.h ./Source/OpenEXR/Imath/ImathVecAlgo.h ./Source/OpenEXR/Imath/ImathInterval.h ./Source/OpenEXR/Imath/ImathBox.h ./Source/OpenEXR/Imath/ImathFrame.h ./Source/OpenEXR/Imath/ImathColor.h ./Source/OpenEXR/Imath/ImathMath.h ./Source/OpenEXR/Imath/ImathLine.h ./Source/OpenEXR/Imath/ImathBoxAlgo.h ./Source/OpenEXR/Imath/ImathFrustum.h ./Source/OpenEXR/Imath/ImathExc.h ./Source/OpenEXR/Imath/ImathLineAlgo.h ./Source/OpenEXR/Imath/ImathRandom.h ./Source/OpenEXR/Imath/ImathInt64.h ./Source/OpenEXR/Imath/ImathGLU.h ./Source/OpenEXR/Imath/ImathPlatform.h ./Source/OpenEXR/Imath/ImathMatrix.h ./Source/OpenEXR/IlmImf/ImfDeepScanLineOutputPart.h ./Source/OpenEXR/IlmImf/ImfDeepScanLineInputFile.h ./Source/OpenEXR/IlmImf/ImfIO.h ./Source/OpenEXR/IlmImf/ImfStdIO.h ./Source/OpenEXR/IlmImf/ImfPreviewImage.h ./Source/OpenEXR/IlmImf/ImfAttribute.h ./Source/OpenEXR/IlmImf/ImfDwaCompressor.h ./Source/OpenEXR/IlmImf/ImfChannelList.h ./Source/OpenEXR/IlmImf/ImfInt64.h ./Source/OpenEXR/IlmImf/ImfGenericOutputFile.h ./Source/OpenEXR/IlmImf/ImfHuf.h ./Source/OpenEXR/IlmImf/ImfOptimizedPixelReading.h ./Source/OpenEXR/IlmImf/b44ExpLogTable.h ./Source/OpenEXR/IlmImf/ImfMultiPartOutputFile.h ./Source/OpenEXR/IlmImf/ImfTileDescriptionAttribute.h ./Source/OpenEXR/IlmImf/ImfFastHuf.h ./Source/OpenEXR/IlmImf/dwaLookups.h ./Source/OpenEXR/IlmImf/ImfCompositeDeepScanLine.h ./Source/OpenEXR/IlmImf/ImfDeepFrameBuffer.h ./Source/OpenEXR/IlmImf/ImfInputPartData.h ./Source/OpenEXR/IlmImf/ImfAcesFile.h ./Source/OpenEXR/IlmImf/ImfRgbaYca.h ./Source/OpenEXR/IlmImf/ImfThreading.h ./Source/OpenEXR/IlmImf/ImfWav.h ./Source/OpenEXR/IlmImf/ImfChromaticitiesAttribute.h ./Source/OpenEXR/IlmImf/ImfDwaCompressorSimd.h ./Source/OpenEXR/IlmImf/ImfNamespace.h ./Source/OpenEXR/IlmImf/ImfMatrixAttribute.h ./Source/OpenEXR/IlmImf/ImfTimeCodeAttribute.h ./Source/OpenEXR/IlmImf/ImfInputFile.h ./Source/OpenEXR/IlmImf/ImfDeepScanLineInputPart.h ./Source/OpenEXR/IlmImf/ImfFloatAttribute.h ./Source/OpenEXR/IlmImf/ImfPxr24Compressor.h ./Source/OpenEXR/IlmImf/ImfCompressor.h ./Source/OpenEXR/IlmImf/ImfCRgbaFile.h ./Source/OpenEXR/IlmImf/ImfOutputFile.h ./Source/OpenEXR/IlmImf/ImfTiledInputPart.h ./Source/OpenEXR/IlmImf/ImfRationalAttribute.h ./Source/OpenEXR/IlmImf/ImfTileOffsets.h ./Source/OpenEXR/IlmImf/ImfInputStreamMutex.h ./Source/OpenEXR/IlmImf/ImfIntAttribute.h ./Source/OpenEXR/IlmImf/ImfTiledOutputPart.h ./Source/OpenEXR/IlmImf/ImfPartType.h ./Source/OpenEXR/IlmImf/ImfTiledInputFile.h ./Source/OpenEXR/IlmImf/ImfStringAttribute.h ./Source/OpenEXR/IlmImf/ImfDeepTiledOutputPart.h ./Source/OpenEXR/IlmImf/ImfRleCompressor.h ./Source/OpenEXR/IlmImf/ImfChromaticities.h ./Source/OpenEXR/IlmImf/ImfTestFile.h ./Source/OpenEXR/IlmImf/ImfInputPart.h ./Source/OpenEXR/IlmImf/ImfXdr.h ./Source/OpenEXR/IlmImf/ImfOutputPart.h ./Source/OpenEXR/IlmImf/ImfExport.h ./Source/OpenEXR/IlmImf/ImfRgba.h ./Source/OpenEXR/IlmImf/ImfLineOrder.h ./Source/OpenEXR/IlmImf/ImfCompression.h ./Source/OpenEXR/IlmImf/ImfTiledMisc.h ./Source/OpenEXR/IlmImf/ImfFramesPerSecond.h ./Source/OpenEXR/IlmImf/ImfZipCompressor.h ./Source/OpenEXR/IlmImf/ImfKeyCodeAttribute.h ./Source/OpenEXR/IlmImf/ImfFloatVectorAttribute.h ./Source/OpenEXR/IlmImf/ImfMultiPartInputFile.h ./Source/OpenEXR/IlmImf/ImfDeepTiledOutputFile.h ./Source/OpenEXR/IlmImf/ImfDeepScanLineOutputFile.h ./Source/OpenEXR/IlmImf/ImfRational.h ./Source/OpenEXR/IlmImf/ImfDeepImageStateAttribute.h ./Source/OpenEXR/IlmImf/ImfChannelListAttribute.h ./Source/OpenEXR/IlmImf/ImfDeepCompositing.h ./Source/OpenEXR/IlmImf/ImfOutputPartData.h ./Source/OpenEXR/IlmImf/ImfDeepTiledInputPart.h ./Source/OpenEXR/IlmImf/ImfPreviewImageAttribute.h ./Source/OpenEXR/IlmImf/ImfFrameBuffer.h ./Source/OpenEXR/IlmImf/ImfDeepImageState.h ./Source/OpenEXR/IlmImf/ImfOpaqueAttribute.h ./Source/OpenEXR/IlmImf/ImfEnvmapAttribute.h ./Source/OpenEXR/IlmImf/ImfPizCompressor.h ./Source/OpenEXR/IlmImf/ImfStringVectorAttribute.h ./Source/OpenEXR/IlmImf/ImfMultiView.h ./Source/OpenEXR/IlmImf/ImfAutoArray.h ./Source/OpenEXR/IlmImf/ImfLut.h ./Source/OpenEXR/IlmImf/ImfTiledOutputFile.h ./Source/OpenEXR/IlmImf/ImfBoxAttribute.h ./Source/OpenEXR/IlmImf/ImfCheckedArithmetic.h ./Source/OpenEXR/IlmImf/ImfB44Compressor.h ./Source/OpenEXR/IlmImf/ImfSystemSpecific.h ./Source/OpenEXR/IlmImf/ImfRgbaFile.h ./Source/OpenEXR/IlmImf/ImfTimeCode.h ./Source/OpenEXR/IlmImf/ImfVecAttribute.h ./Source/OpenEXR/IlmImf/ImfDeepTiledInputFile.h ./Source/OpenEXR/IlmImf/ImfZip.h ./Source/OpenEXR/IlmImf/ImfConvert.h ./Source/OpenEXR/IlmImf/ImfMisc.h ./Source/OpenEXR/IlmImf/ImfHeader.h ./Source/OpenEXR/IlmImf/ImfForward.h ./Source/OpenEXR/IlmImf/ImfPartHelper.h ./Source/OpenEXR/IlmImf/ImfKeyCode.h ./Source/OpenEXR/IlmImf/ImfVersion.h ./Source/OpenEXR/IlmImf/ImfStandardAttributes.h ./Source/OpenEXR/IlmImf/ImfPixelType.h ./Source/OpenEXR/IlmImf/ImfName.h ./Source/OpenEXR/IlmImf/ImfSimd.h ./Source/OpenEXR/IlmImf/ImfArray.h ./Source/OpenEXR/IlmImf/ImfOutputStreamMutex.h ./Source/OpenEXR/IlmImf/ImfTiledRgbaFile.h ./Source/OpenEXR/IlmImf/ImfRle.h ./Source/OpenEXR/IlmImf/ImfScanLineInputFile.h ./Source/OpenEXR/IlmImf/ImfDoubleAttribute.h ./Source/OpenEXR/IlmImf/ImfGenericInputFile.h ./Source/OpenEXR/IlmImf/ImfEnvmap.h ./Source/OpenEXR/IlmImf/ImfLineOrderAttribute.h ./Source/OpenEXR/IlmImf/ImfTileDescription.h ./Source/OpenEXR/IlmImf/ImfCompressionAttribute.h ./Source/OpenEXR/IlmBaseConfig.h ./Source/OpenEXR/Half/halfFunction.h ./Source/OpenEXR/Half/halfExport.h ./Source/OpenEXR/Half/half.h ./Source/OpenEXR/Half/eLut.h ./Source/OpenEXR/Half/halfLimits.h ./Source/OpenEXR/Half/toFloat.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/FreeImageIO.Net.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/Stdafx.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/resource.h ./Wrapper/FreeImagePlus/dist/x64/FreeImagePlus.h ./Wrapper/FreeImagePlus/FreeImagePlus.h ./Wrapper/FreeImagePlus/test/fipTest.h ./TestAPI/TestSuite.h ++SRCS = ./Source/FreeImage/BitmapAccess.cpp ./Source/FreeImage/ColorLookup.cpp ./Source/FreeImage/ConversionRGBA16.cpp ./Source/FreeImage/ConversionRGBAF.cpp ./Source/FreeImage/FreeImage.cpp ./Source/FreeImage/FreeImageC.c ./Source/FreeImage/FreeImageIO.cpp ./Source/FreeImage/GetType.cpp ./Source/FreeImage/LFPQuantizer.cpp ./Source/FreeImage/MemoryIO.cpp ./Source/FreeImage/PixelAccess.cpp ./Source/FreeImage/J2KHelper.cpp ./Source/FreeImage/MNGHelper.cpp ./Source/FreeImage/Plugin.cpp ./Source/FreeImage/PluginBMP.cpp ./Source/FreeImage/PluginCUT.cpp ./Source/FreeImage/PluginDDS.cpp ./Source/FreeImage/PluginEXR.cpp ./Source/FreeImage/PluginG3.cpp ./Source/FreeImage/PluginGIF.cpp ./Source/FreeImage/PluginHDR.cpp ./Source/FreeImage/PluginICO.cpp ./Source/FreeImage/PluginIFF.cpp ./Source/FreeImage/PluginJ2K.cpp ./Source/FreeImage/PluginJNG.cpp ./Source/FreeImage/PluginJP2.cpp ./Source/FreeImage/PluginJPEG.cpp ./Source/FreeImage/PluginJXR.cpp ./Source/FreeImage/PluginKOALA.cpp ./Source/FreeImage/PluginMNG.cpp ./Source/FreeImage/PluginPCD.cpp ./Source/FreeImage/PluginPCX.cpp ./Source/FreeImage/PluginPFM.cpp ./Source/FreeImage/PluginPICT.cpp ./Source/FreeImage/PluginPNG.cpp ./Source/FreeImage/PluginPNM.cpp ./Source/FreeImage/PluginPSD.cpp ./Source/FreeImage/PluginRAS.cpp ./Source/FreeImage/PluginRAW.cpp ./Source/FreeImage/PluginSGI.cpp ./Source/FreeImage/PluginTARGA.cpp ./Source/FreeImage/PluginTIFF.cpp ./Source/FreeImage/PluginWBMP.cpp ./Source/FreeImage/PluginWebP.cpp ./Source/FreeImage/PluginXBM.cpp ./Source/FreeImage/PluginXPM.cpp ./Source/FreeImage/PSDParser.cpp ./Source/FreeImage/TIFFLogLuv.cpp ./Source/FreeImage/Conversion.cpp ./Source/FreeImage/Conversion16_555.cpp ./Source/FreeImage/Conversion16_565.cpp ./Source/FreeImage/Conversion24.cpp ./Source/FreeImage/Conversion32.cpp ./Source/FreeImage/Conversion4.cpp ./Source/FreeImage/Conversion8.cpp ./Source/FreeImage/ConversionFloat.cpp ./Source/FreeImage/ConversionRGB16.cpp ./Source/FreeImage/ConversionRGBF.cpp ./Source/FreeImage/ConversionType.cpp ./Source/FreeImage/ConversionUINT16.cpp ./Source/FreeImage/Halftoning.cpp ./Source/FreeImage/tmoColorConvert.cpp ./Source/FreeImage/tmoDrago03.cpp ./Source/FreeImage/tmoFattal02.cpp ./Source/FreeImage/tmoReinhard05.cpp ./Source/FreeImage/ToneMapping.cpp ./Source/FreeImage/NNQuantizer.cpp ./Source/FreeImage/WuQuantizer.cpp ./Source/FreeImage/CacheFile.cpp ./Source/FreeImage/MultiPage.cpp ./Source/FreeImage/ZLibInterface.cpp ./Source/Metadata/Exif.cpp ./Source/Metadata/FIRational.cpp ./Source/Metadata/FreeImageTag.cpp ./Source/Metadata/IPTC.cpp ./Source/Metadata/TagConversion.cpp ./Source/Metadata/TagLib.cpp ./Source/Metadata/XTIFF.cpp ./Source/FreeImageToolkit/Background.cpp ./Source/FreeImageToolkit/BSplineRotate.cpp ./Source/FreeImageToolkit/Channels.cpp ./Source/FreeImageToolkit/ClassicRotate.cpp ./Source/FreeImageToolkit/Colors.cpp ./Source/FreeImageToolkit/CopyPaste.cpp ./Source/FreeImageToolkit/Display.cpp ./Source/FreeImageToolkit/Flip.cpp ./Source/FreeImageToolkit/JPEGTransform.cpp ./Source/FreeImageToolkit/MultigridPoissonSolver.cpp ./Source/FreeImageToolkit/Rescale.cpp ./Source/FreeImageToolkit/Resize.cpp ++INCLS = ./Examples/OpenGL/TextureManager/TextureManager.h ./Examples/Generic/FIIO_Mem.h ./Examples/Plugin/PluginCradle.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/resource.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/FreeImageIO.Net.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/Stdafx.h ./Wrapper/FreeImagePlus/FreeImagePlus.h ./Wrapper/FreeImagePlus/test/fipTest.h ./TestAPI/TestSuite.h ./Source/FreeImage.h ./Source/FreeImage/PSDParser.h ./Source/FreeImage/J2KHelper.h ./Source/FreeImageToolkit/Filters.h ./Source/FreeImageToolkit/Resize.h ./Source/Metadata/FreeImageTag.h ./Source/Metadata/FIRational.h ./Source/ToneMapping.h ./Source/FreeImageIO.h ./Source/Plugin.h ./Source/CacheFile.h ./Source/Utilities.h ./Source/MapIntrospector.h ./Source/Quantizers.h + +-INCLUDE = -I. -ISource -ISource/Metadata -ISource/FreeImageToolkit -ISource/LibJPEG -ISource/LibPNG -ISource/LibTIFF4 -ISource/ZLib -ISource/LibOpenJPEG -ISource/OpenEXR -ISource/OpenEXR/Half -ISource/OpenEXR/Iex -ISource/OpenEXR/IlmImf -ISource/OpenEXR/IlmThread -ISource/OpenEXR/Imath -ISource/OpenEXR/IexMath -ISource/LibRawLite -ISource/LibRawLite/dcraw -ISource/LibRawLite/internal -ISource/LibRawLite/libraw -ISource/LibRawLite/src -ISource/LibWebP -ISource/LibJXR -ISource/LibJXR/common/include -ISource/LibJXR/image/sys -ISource/LibJXR/jxrgluelib ++INCLUDE = -I. -ISource -ISource/Metadata -ISource/FreeImageToolkit +diff --git a/Source/FreeImage.h b/Source/FreeImage.h +index e8f1da6..235563e 100644 +--- a/Source/FreeImage.h ++++ b/Source/FreeImage.h +@@ -155,8 +155,8 @@ typedef uint8_t BYTE; + typedef uint16_t WORD; + typedef uint32_t DWORD; + typedef int32_t LONG; +-typedef int64_t INT64; +-typedef uint64_t UINT64; ++#define INT64 int64_t ++#define UINT64 uint64_t + #else + // MS is not C99 ISO compliant + typedef long BOOL; +diff --git a/Source/FreeImage/J2KHelper.cpp b/Source/FreeImage/J2KHelper.cpp +index 1776c3b..538f1c5 100644 +--- a/Source/FreeImage/J2KHelper.cpp ++++ b/Source/FreeImage/J2KHelper.cpp +@@ -21,7 +21,7 @@ + + #include "FreeImage.h" + #include "Utilities.h" +-#include "../LibOpenJPEG/openjpeg.h" ++#include + #include "J2KHelper.h" + + // -------------------------------------------------------------------------- +diff --git a/Source/FreeImage/PluginEXR.cpp b/Source/FreeImage/PluginEXR.cpp +index b286430..9bf3ada 100644 +--- a/Source/FreeImage/PluginEXR.cpp ++++ b/Source/FreeImage/PluginEXR.cpp +@@ -28,16 +28,16 @@ + #pragma warning (disable : 4800) // ImfVersion.h - 'const int' : forcing value to bool 'true' or 'false' (performance warning) + #endif + +-#include "../OpenEXR/IlmImf/ImfIO.h" +-#include "../OpenEXR/Iex/Iex.h" +-#include "../OpenEXR/IlmImf/ImfOutputFile.h" +-#include "../OpenEXR/IlmImf/ImfInputFile.h" +-#include "../OpenEXR/IlmImf/ImfRgbaFile.h" +-#include "../OpenEXR/IlmImf/ImfChannelList.h" +-#include "../OpenEXR/IlmImf/ImfRgba.h" +-#include "../OpenEXR/IlmImf/ImfArray.h" +-#include "../OpenEXR/IlmImf/ImfPreviewImage.h" +-#include "../OpenEXR/Half/half.h" ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + + + // ========================================================== +diff --git a/Source/FreeImage/PluginG3.cpp b/Source/FreeImage/PluginG3.cpp +index 0a083b4..e2f1241 100644 +--- a/Source/FreeImage/PluginG3.cpp ++++ b/Source/FreeImage/PluginG3.cpp +@@ -20,7 +20,7 @@ + // Use at your own risk! + // ========================================================== + +-#include "../LibTIFF4/tiffiop.h" ++#include + + #include "FreeImage.h" + #include "Utilities.h" +diff --git a/Source/FreeImage/PluginJ2K.cpp b/Source/FreeImage/PluginJ2K.cpp +index b8bcfc8..621a903 100644 +--- a/Source/FreeImage/PluginJ2K.cpp ++++ b/Source/FreeImage/PluginJ2K.cpp +@@ -21,7 +21,7 @@ + + #include "FreeImage.h" + #include "Utilities.h" +-#include "../LibOpenJPEG/openjpeg.h" ++#include + #include "J2KHelper.h" + + // ========================================================== +diff --git a/Source/FreeImage/PluginJP2.cpp b/Source/FreeImage/PluginJP2.cpp +index 742fe2c..c57f626 100644 +--- a/Source/FreeImage/PluginJP2.cpp ++++ b/Source/FreeImage/PluginJP2.cpp +@@ -21,7 +21,7 @@ + + #include "FreeImage.h" + #include "Utilities.h" +-#include "../LibOpenJPEG/openjpeg.h" ++#include + #include "J2KHelper.h" + + // ========================================================== +diff --git a/Source/FreeImage/PluginJPEG.cpp b/Source/FreeImage/PluginJPEG.cpp +index 8db177d..a7de637 100644 +--- a/Source/FreeImage/PluginJPEG.cpp ++++ b/Source/FreeImage/PluginJPEG.cpp +@@ -35,9 +35,9 @@ extern "C" { + #undef FAR + #include + +-#include "../LibJPEG/jinclude.h" +-#include "../LibJPEG/jpeglib.h" +-#include "../LibJPEG/jerror.h" ++#include ++#include ++#include + } + + #include "FreeImage.h" +@@ -484,116 +484,6 @@ marker_is_icc(jpeg_saved_marker_ptr marker) { + return FALSE; + } + +-/** +- See if there was an ICC profile in the JPEG file being read; +- if so, reassemble and return the profile data. +- +- TRUE is returned if an ICC profile was found, FALSE if not. +- If TRUE is returned, *icc_data_ptr is set to point to the +- returned data, and *icc_data_len is set to its length. +- +- IMPORTANT: the data at **icc_data_ptr has been allocated with malloc() +- and must be freed by the caller with free() when the caller no longer +- needs it. (Alternatively, we could write this routine to use the +- IJG library's memory allocator, so that the data would be freed implicitly +- at jpeg_finish_decompress() time. But it seems likely that many apps +- will prefer to have the data stick around after decompression finishes.) +- +- NOTE: if the file contains invalid ICC APP2 markers, we just silently +- return FALSE. You might want to issue an error message instead. +-*/ +-static BOOL +-jpeg_read_icc_profile(j_decompress_ptr cinfo, JOCTET **icc_data_ptr, unsigned *icc_data_len) { +- jpeg_saved_marker_ptr marker; +- int num_markers = 0; +- int seq_no; +- JOCTET *icc_data; +- unsigned total_length; +- +- const int MAX_SEQ_NO = 255; // sufficient since marker numbers are bytes +- BYTE marker_present[MAX_SEQ_NO+1]; // 1 if marker found +- unsigned data_length[MAX_SEQ_NO+1]; // size of profile data in marker +- unsigned data_offset[MAX_SEQ_NO+1]; // offset for data in marker +- +- *icc_data_ptr = NULL; // avoid confusion if FALSE return +- *icc_data_len = 0; +- +- /** +- this first pass over the saved markers discovers whether there are +- any ICC markers and verifies the consistency of the marker numbering. +- */ +- +- memset(marker_present, 0, (MAX_SEQ_NO + 1)); +- +- for(marker = cinfo->marker_list; marker != NULL; marker = marker->next) { +- if (marker_is_icc(marker)) { +- if (num_markers == 0) { +- // number of markers +- num_markers = GETJOCTET(marker->data[13]); +- } +- else if (num_markers != GETJOCTET(marker->data[13])) { +- return FALSE; // inconsistent num_markers fields +- } +- // sequence number +- seq_no = GETJOCTET(marker->data[12]); +- if (seq_no <= 0 || seq_no > num_markers) { +- return FALSE; // bogus sequence number +- } +- if (marker_present[seq_no]) { +- return FALSE; // duplicate sequence numbers +- } +- marker_present[seq_no] = 1; +- data_length[seq_no] = marker->data_length - ICC_HEADER_SIZE; +- } +- } +- +- if (num_markers == 0) +- return FALSE; +- +- /** +- check for missing markers, count total space needed, +- compute offset of each marker's part of the data. +- */ +- +- total_length = 0; +- for(seq_no = 1; seq_no <= num_markers; seq_no++) { +- if (marker_present[seq_no] == 0) { +- return FALSE; // missing sequence number +- } +- data_offset[seq_no] = total_length; +- total_length += data_length[seq_no]; +- } +- +- if (total_length <= 0) +- return FALSE; // found only empty markers ? +- +- // allocate space for assembled data +- icc_data = (JOCTET *) malloc(total_length * sizeof(JOCTET)); +- if (icc_data == NULL) +- return FALSE; // out of memory +- +- // and fill it in +- for (marker = cinfo->marker_list; marker != NULL; marker = marker->next) { +- if (marker_is_icc(marker)) { +- JOCTET FAR *src_ptr; +- JOCTET *dst_ptr; +- unsigned length; +- seq_no = GETJOCTET(marker->data[12]); +- dst_ptr = icc_data + data_offset[seq_no]; +- src_ptr = marker->data + ICC_HEADER_SIZE; +- length = data_length[seq_no]; +- while (length--) { +- *dst_ptr++ = *src_ptr++; +- } +- } +- } +- +- *icc_data_ptr = icc_data; +- *icc_data_len = total_length; +- +- return TRUE; +-} +- + /** + Read JPEG_APPD marker (IPTC or Adobe Photoshop profile) + */ +diff --git a/Source/FreeImage/PluginJXR.cpp b/Source/FreeImage/PluginJXR.cpp +index 85c6ff3..163a93b 100644 +--- a/Source/FreeImage/PluginJXR.cpp ++++ b/Source/FreeImage/PluginJXR.cpp +@@ -23,7 +23,7 @@ + #include "Utilities.h" + #include "../Metadata/FreeImageTag.h" + +-#include "../LibJXR/jxrgluelib/JXRGlue.h" ++#include + + // ========================================================== + // Plugin Interface +diff --git a/Source/FreeImage/PluginPNG.cpp b/Source/FreeImage/PluginPNG.cpp +index 661f160..504fafe 100644 +--- a/Source/FreeImage/PluginPNG.cpp ++++ b/Source/FreeImage/PluginPNG.cpp +@@ -40,8 +40,8 @@ + + // ---------------------------------------------------------- + +-#include "../ZLib/zlib.h" +-#include "../LibPNG/png.h" ++#include ++#include + + // ---------------------------------------------------------- + +diff --git a/Source/FreeImage/PluginRAW.cpp b/Source/FreeImage/PluginRAW.cpp +index ab0499f..2d3c9fd 100644 +--- a/Source/FreeImage/PluginRAW.cpp ++++ b/Source/FreeImage/PluginRAW.cpp +@@ -19,12 +19,16 @@ + // Use at your own risk! + // ========================================================== + +-#include "../LibRawLite/libraw/libraw.h" ++#include + + #include "FreeImage.h" + #include "Utilities.h" + #include "../Metadata/FreeImageTag.h" + ++// What an ugly hack ++#undef INT64 ++#undef UINT64 ++ + // ========================================================== + // Plugin Interface + // ========================================================== +diff --git a/Source/FreeImage/PluginTIFF.cpp b/Source/FreeImage/PluginTIFF.cpp +index a805319..3e318ba 100644 +--- a/Source/FreeImage/PluginTIFF.cpp ++++ b/Source/FreeImage/PluginTIFF.cpp +@@ -37,9 +37,9 @@ + + #include "FreeImage.h" + #include "Utilities.h" +-#include "../LibTIFF4/tiffiop.h" ++#include + #include "../Metadata/FreeImageTag.h" +-#include "../OpenEXR/Half/half.h" ++#include + + #include "FreeImageIO.h" + #include "PSDParser.h" +diff --git a/Source/FreeImage/PluginWebP.cpp b/Source/FreeImage/PluginWebP.cpp +index 7c9f62f..c401447 100644 +--- a/Source/FreeImage/PluginWebP.cpp ++++ b/Source/FreeImage/PluginWebP.cpp +@@ -24,9 +24,9 @@ + + #include "../Metadata/FreeImageTag.h" + +-#include "../LibWebP/src/webp/decode.h" +-#include "../LibWebP/src/webp/encode.h" +-#include "../LibWebP/src/webp/mux.h" ++#include ++#include ++#include + + // ========================================================== + // Plugin Interface +diff --git a/Source/FreeImage/ZLibInterface.cpp b/Source/FreeImage/ZLibInterface.cpp +index 3ab6d32..0973475 100644 +--- a/Source/FreeImage/ZLibInterface.cpp ++++ b/Source/FreeImage/ZLibInterface.cpp +@@ -19,10 +19,9 @@ + // Use at your own risk! + // ========================================================== + +-#include "../ZLib/zlib.h" ++#include + #include "FreeImage.h" + #include "Utilities.h" +-#include "../ZLib/zutil.h" /* must be the last header because of error C3163 in VS2008 (_vsnprintf defined in stdio.h) */ + + /** + Compresses a source buffer into a target buffer, using the ZLib library. +@@ -115,7 +114,8 @@ FreeImage_ZLibGZip(BYTE *target, DWORD target_size, BYTE *source, DWORD source_s + return 0; + case Z_OK: { + // patch header, setup crc and length (stolen from mod_trace_output) +- BYTE *p = target + 8; *p++ = 2; *p = OS_CODE; // xflags, os_code ++ // OS_CODE is 0x03 on unix it seems, not sure how important this is ++ BYTE *p = target + 8; *p++ = 2; *p = 0x03; // xflags, os_code + crc = crc32(crc, source, source_size); + memcpy(target + 4 + dest_len, &crc, 4); + memcpy(target + 8 + dest_len, &source_size, 4); +diff --git a/Source/FreeImageToolkit/JPEGTransform.cpp b/Source/FreeImageToolkit/JPEGTransform.cpp +index 6f9ba8e..836bc90 100644 +--- a/Source/FreeImageToolkit/JPEGTransform.cpp ++++ b/Source/FreeImageToolkit/JPEGTransform.cpp +@@ -26,10 +26,10 @@ extern "C" { + #undef FAR + #include + +-#include "../LibJPEG/jinclude.h" +-#include "../LibJPEG/jpeglib.h" +-#include "../LibJPEG/jerror.h" +-#include "../LibJPEG/transupp.h" ++#include ++#include ++#include ++#include + } + + #include "FreeImage.h" +diff --git a/Source/Metadata/XTIFF.cpp b/Source/Metadata/XTIFF.cpp +index d5be902..b6ecd11 100644 +--- a/Source/Metadata/XTIFF.cpp ++++ b/Source/Metadata/XTIFF.cpp +@@ -29,7 +29,7 @@ + #pragma warning (disable : 4786) // identifier was truncated to 'number' characters + #endif + +-#include "../LibTIFF4/tiffiop.h" ++#include + + #include "FreeImage.h" + #include "Utilities.h" +diff --git a/fipMakefile.srcs b/fipMakefile.srcs +index 15ec099..72ba4fb 100644 +--- a/fipMakefile.srcs ++++ b/fipMakefile.srcs +@@ -1,4 +1,4 @@ + VER_MAJOR = 3 + VER_MINOR = 19.0 +-SRCS = ./Source/FreeImage/BitmapAccess.cpp ./Source/FreeImage/ColorLookup.cpp ./Source/FreeImage/ConversionRGBA16.cpp ./Source/FreeImage/ConversionRGBAF.cpp ./Source/FreeImage/FreeImage.cpp ./Source/FreeImage/FreeImageC.c ./Source/FreeImage/FreeImageIO.cpp ./Source/FreeImage/GetType.cpp ./Source/FreeImage/LFPQuantizer.cpp ./Source/FreeImage/MemoryIO.cpp ./Source/FreeImage/PixelAccess.cpp ./Source/FreeImage/J2KHelper.cpp ./Source/FreeImage/MNGHelper.cpp ./Source/FreeImage/Plugin.cpp ./Source/FreeImage/PluginBMP.cpp ./Source/FreeImage/PluginCUT.cpp ./Source/FreeImage/PluginDDS.cpp ./Source/FreeImage/PluginEXR.cpp ./Source/FreeImage/PluginG3.cpp ./Source/FreeImage/PluginGIF.cpp ./Source/FreeImage/PluginHDR.cpp ./Source/FreeImage/PluginICO.cpp ./Source/FreeImage/PluginIFF.cpp ./Source/FreeImage/PluginJ2K.cpp ./Source/FreeImage/PluginJNG.cpp ./Source/FreeImage/PluginJP2.cpp ./Source/FreeImage/PluginJPEG.cpp ./Source/FreeImage/PluginJXR.cpp ./Source/FreeImage/PluginKOALA.cpp ./Source/FreeImage/PluginMNG.cpp ./Source/FreeImage/PluginPCD.cpp ./Source/FreeImage/PluginPCX.cpp ./Source/FreeImage/PluginPFM.cpp ./Source/FreeImage/PluginPICT.cpp ./Source/FreeImage/PluginPNG.cpp ./Source/FreeImage/PluginPNM.cpp ./Source/FreeImage/PluginPSD.cpp ./Source/FreeImage/PluginRAS.cpp ./Source/FreeImage/PluginRAW.cpp ./Source/FreeImage/PluginSGI.cpp ./Source/FreeImage/PluginTARGA.cpp ./Source/FreeImage/PluginTIFF.cpp ./Source/FreeImage/PluginWBMP.cpp ./Source/FreeImage/PluginWebP.cpp ./Source/FreeImage/PluginXBM.cpp ./Source/FreeImage/PluginXPM.cpp ./Source/FreeImage/PSDParser.cpp ./Source/FreeImage/TIFFLogLuv.cpp ./Source/FreeImage/Conversion.cpp ./Source/FreeImage/Conversion16_555.cpp ./Source/FreeImage/Conversion16_565.cpp ./Source/FreeImage/Conversion24.cpp ./Source/FreeImage/Conversion32.cpp ./Source/FreeImage/Conversion4.cpp ./Source/FreeImage/Conversion8.cpp ./Source/FreeImage/ConversionFloat.cpp ./Source/FreeImage/ConversionRGB16.cpp ./Source/FreeImage/ConversionRGBF.cpp ./Source/FreeImage/ConversionType.cpp ./Source/FreeImage/ConversionUINT16.cpp ./Source/FreeImage/Halftoning.cpp ./Source/FreeImage/tmoColorConvert.cpp ./Source/FreeImage/tmoDrago03.cpp ./Source/FreeImage/tmoFattal02.cpp ./Source/FreeImage/tmoReinhard05.cpp ./Source/FreeImage/ToneMapping.cpp ./Source/FreeImage/NNQuantizer.cpp ./Source/FreeImage/WuQuantizer.cpp ./Source/FreeImage/CacheFile.cpp ./Source/FreeImage/MultiPage.cpp ./Source/FreeImage/ZLibInterface.cpp ./Source/Metadata/Exif.cpp ./Source/Metadata/FIRational.cpp ./Source/Metadata/FreeImageTag.cpp ./Source/Metadata/IPTC.cpp ./Source/Metadata/TagConversion.cpp ./Source/Metadata/TagLib.cpp ./Source/Metadata/XTIFF.cpp ./Source/FreeImageToolkit/Background.cpp ./Source/FreeImageToolkit/BSplineRotate.cpp ./Source/FreeImageToolkit/Channels.cpp ./Source/FreeImageToolkit/ClassicRotate.cpp ./Source/FreeImageToolkit/Colors.cpp ./Source/FreeImageToolkit/CopyPaste.cpp ./Source/FreeImageToolkit/Display.cpp ./Source/FreeImageToolkit/Flip.cpp ./Source/FreeImageToolkit/JPEGTransform.cpp ./Source/FreeImageToolkit/MultigridPoissonSolver.cpp ./Source/FreeImageToolkit/Rescale.cpp ./Source/FreeImageToolkit/Resize.cpp Source/LibJPEG/jaricom.c Source/LibJPEG/jcapimin.c Source/LibJPEG/jcapistd.c Source/LibJPEG/jcarith.c Source/LibJPEG/jccoefct.c Source/LibJPEG/jccolor.c Source/LibJPEG/jcdctmgr.c Source/LibJPEG/jchuff.c Source/LibJPEG/jcinit.c Source/LibJPEG/jcmainct.c Source/LibJPEG/jcmarker.c Source/LibJPEG/jcmaster.c Source/LibJPEG/jcomapi.c Source/LibJPEG/jcparam.c Source/LibJPEG/jcprepct.c Source/LibJPEG/jcsample.c Source/LibJPEG/jctrans.c Source/LibJPEG/jdapimin.c Source/LibJPEG/jdapistd.c Source/LibJPEG/jdarith.c Source/LibJPEG/jdatadst.c Source/LibJPEG/jdatasrc.c Source/LibJPEG/jdcoefct.c Source/LibJPEG/jdcolor.c Source/LibJPEG/jddctmgr.c Source/LibJPEG/jdhuff.c Source/LibJPEG/jdinput.c Source/LibJPEG/jdmainct.c Source/LibJPEG/jdmarker.c Source/LibJPEG/jdmaster.c Source/LibJPEG/jdmerge.c Source/LibJPEG/jdpostct.c Source/LibJPEG/jdsample.c Source/LibJPEG/jdtrans.c Source/LibJPEG/jerror.c Source/LibJPEG/jfdctflt.c Source/LibJPEG/jfdctfst.c Source/LibJPEG/jfdctint.c Source/LibJPEG/jidctflt.c Source/LibJPEG/jidctfst.c Source/LibJPEG/jidctint.c Source/LibJPEG/jmemmgr.c Source/LibJPEG/jmemnobs.c Source/LibJPEG/jquant1.c Source/LibJPEG/jquant2.c Source/LibJPEG/jutils.c Source/LibJPEG/transupp.c Source/LibPNG/png.c Source/LibPNG/pngerror.c Source/LibPNG/pngget.c Source/LibPNG/pngmem.c Source/LibPNG/pngpread.c Source/LibPNG/pngread.c Source/LibPNG/pngrio.c Source/LibPNG/pngrtran.c Source/LibPNG/pngrutil.c Source/LibPNG/pngset.c Source/LibPNG/pngtrans.c Source/LibPNG/pngwio.c Source/LibPNG/pngwrite.c Source/LibPNG/pngwtran.c Source/LibPNG/pngwutil.c Source/LibTIFF4/tif_aux.c Source/LibTIFF4/tif_close.c Source/LibTIFF4/tif_codec.c Source/LibTIFF4/tif_color.c Source/LibTIFF4/tif_compress.c Source/LibTIFF4/tif_dir.c Source/LibTIFF4/tif_dirinfo.c Source/LibTIFF4/tif_dirread.c Source/LibTIFF4/tif_dirwrite.c Source/LibTIFF4/tif_dumpmode.c Source/LibTIFF4/tif_error.c Source/LibTIFF4/tif_extension.c Source/LibTIFF4/tif_fax3.c Source/LibTIFF4/tif_fax3sm.c Source/LibTIFF4/tif_flush.c Source/LibTIFF4/tif_getimage.c Source/LibTIFF4/tif_jpeg.c Source/LibTIFF4/tif_luv.c Source/LibTIFF4/tif_lzma.c Source/LibTIFF4/tif_lzw.c Source/LibTIFF4/tif_next.c Source/LibTIFF4/tif_ojpeg.c Source/LibTIFF4/tif_open.c Source/LibTIFF4/tif_packbits.c Source/LibTIFF4/tif_pixarlog.c Source/LibTIFF4/tif_predict.c Source/LibTIFF4/tif_print.c Source/LibTIFF4/tif_read.c Source/LibTIFF4/tif_strip.c Source/LibTIFF4/tif_swab.c Source/LibTIFF4/tif_thunder.c Source/LibTIFF4/tif_tile.c Source/LibTIFF4/tif_version.c Source/LibTIFF4/tif_warning.c Source/LibTIFF4/tif_write.c Source/LibTIFF4/tif_zip.c Source/ZLib/adler32.c Source/ZLib/compress.c Source/ZLib/crc32.c Source/ZLib/deflate.c Source/ZLib/gzclose.c Source/ZLib/gzlib.c Source/ZLib/gzread.c Source/ZLib/gzwrite.c Source/ZLib/infback.c Source/ZLib/inffast.c Source/ZLib/inflate.c Source/ZLib/inftrees.c Source/ZLib/trees.c Source/ZLib/uncompr.c Source/ZLib/zutil.c Source/LibOpenJPEG/bio.c Source/LibOpenJPEG/cio.c Source/LibOpenJPEG/dwt.c Source/LibOpenJPEG/event.c Source/LibOpenJPEG/function_list.c Source/LibOpenJPEG/image.c Source/LibOpenJPEG/invert.c Source/LibOpenJPEG/j2k.c Source/LibOpenJPEG/jp2.c Source/LibOpenJPEG/mct.c Source/LibOpenJPEG/mqc.c Source/LibOpenJPEG/openjpeg.c Source/LibOpenJPEG/opj_clock.c Source/LibOpenJPEG/pi.c Source/LibOpenJPEG/raw.c Source/LibOpenJPEG/t1.c Source/LibOpenJPEG/t2.c Source/LibOpenJPEG/tcd.c Source/LibOpenJPEG/tgt.c Source/OpenEXR/IexMath/IexMathFpu.cpp Source/OpenEXR/IlmImf/b44ExpLogTable.cpp Source/OpenEXR/IlmImf/ImfAcesFile.cpp Source/OpenEXR/IlmImf/ImfAttribute.cpp Source/OpenEXR/IlmImf/ImfB44Compressor.cpp Source/OpenEXR/IlmImf/ImfBoxAttribute.cpp Source/OpenEXR/IlmImf/ImfChannelList.cpp Source/OpenEXR/IlmImf/ImfChannelListAttribute.cpp Source/OpenEXR/IlmImf/ImfChromaticities.cpp Source/OpenEXR/IlmImf/ImfChromaticitiesAttribute.cpp Source/OpenEXR/IlmImf/ImfCompositeDeepScanLine.cpp Source/OpenEXR/IlmImf/ImfCompressionAttribute.cpp Source/OpenEXR/IlmImf/ImfCompressor.cpp Source/OpenEXR/IlmImf/ImfConvert.cpp Source/OpenEXR/IlmImf/ImfCRgbaFile.cpp Source/OpenEXR/IlmImf/ImfDeepCompositing.cpp Source/OpenEXR/IlmImf/ImfDeepFrameBuffer.cpp Source/OpenEXR/IlmImf/ImfDeepImageStateAttribute.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineInputFile.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineInputPart.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineOutputFile.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineOutputPart.cpp Source/OpenEXR/IlmImf/ImfDeepTiledInputFile.cpp Source/OpenEXR/IlmImf/ImfDeepTiledInputPart.cpp Source/OpenEXR/IlmImf/ImfDeepTiledOutputFile.cpp Source/OpenEXR/IlmImf/ImfDeepTiledOutputPart.cpp Source/OpenEXR/IlmImf/ImfDoubleAttribute.cpp Source/OpenEXR/IlmImf/ImfDwaCompressor.cpp Source/OpenEXR/IlmImf/ImfEnvmap.cpp Source/OpenEXR/IlmImf/ImfEnvmapAttribute.cpp Source/OpenEXR/IlmImf/ImfFastHuf.cpp Source/OpenEXR/IlmImf/ImfFloatAttribute.cpp Source/OpenEXR/IlmImf/ImfFloatVectorAttribute.cpp Source/OpenEXR/IlmImf/ImfFrameBuffer.cpp Source/OpenEXR/IlmImf/ImfFramesPerSecond.cpp Source/OpenEXR/IlmImf/ImfGenericInputFile.cpp Source/OpenEXR/IlmImf/ImfGenericOutputFile.cpp Source/OpenEXR/IlmImf/ImfHeader.cpp Source/OpenEXR/IlmImf/ImfHuf.cpp Source/OpenEXR/IlmImf/ImfInputFile.cpp Source/OpenEXR/IlmImf/ImfInputPart.cpp Source/OpenEXR/IlmImf/ImfInputPartData.cpp Source/OpenEXR/IlmImf/ImfIntAttribute.cpp Source/OpenEXR/IlmImf/ImfIO.cpp Source/OpenEXR/IlmImf/ImfKeyCode.cpp Source/OpenEXR/IlmImf/ImfKeyCodeAttribute.cpp Source/OpenEXR/IlmImf/ImfLineOrderAttribute.cpp Source/OpenEXR/IlmImf/ImfLut.cpp Source/OpenEXR/IlmImf/ImfMatrixAttribute.cpp Source/OpenEXR/IlmImf/ImfMisc.cpp Source/OpenEXR/IlmImf/ImfMultiPartInputFile.cpp Source/OpenEXR/IlmImf/ImfMultiPartOutputFile.cpp Source/OpenEXR/IlmImf/ImfMultiView.cpp Source/OpenEXR/IlmImf/ImfOpaqueAttribute.cpp Source/OpenEXR/IlmImf/ImfOutputFile.cpp Source/OpenEXR/IlmImf/ImfOutputPart.cpp Source/OpenEXR/IlmImf/ImfOutputPartData.cpp Source/OpenEXR/IlmImf/ImfPartType.cpp Source/OpenEXR/IlmImf/ImfPizCompressor.cpp Source/OpenEXR/IlmImf/ImfPreviewImage.cpp Source/OpenEXR/IlmImf/ImfPreviewImageAttribute.cpp Source/OpenEXR/IlmImf/ImfPxr24Compressor.cpp Source/OpenEXR/IlmImf/ImfRational.cpp Source/OpenEXR/IlmImf/ImfRationalAttribute.cpp Source/OpenEXR/IlmImf/ImfRgbaFile.cpp Source/OpenEXR/IlmImf/ImfRgbaYca.cpp Source/OpenEXR/IlmImf/ImfRle.cpp Source/OpenEXR/IlmImf/ImfRleCompressor.cpp Source/OpenEXR/IlmImf/ImfScanLineInputFile.cpp Source/OpenEXR/IlmImf/ImfStandardAttributes.cpp Source/OpenEXR/IlmImf/ImfStdIO.cpp Source/OpenEXR/IlmImf/ImfStringAttribute.cpp Source/OpenEXR/IlmImf/ImfStringVectorAttribute.cpp Source/OpenEXR/IlmImf/ImfSystemSpecific.cpp Source/OpenEXR/IlmImf/ImfTestFile.cpp Source/OpenEXR/IlmImf/ImfThreading.cpp Source/OpenEXR/IlmImf/ImfTileDescriptionAttribute.cpp Source/OpenEXR/IlmImf/ImfTiledInputFile.cpp Source/OpenEXR/IlmImf/ImfTiledInputPart.cpp Source/OpenEXR/IlmImf/ImfTiledMisc.cpp Source/OpenEXR/IlmImf/ImfTiledOutputFile.cpp Source/OpenEXR/IlmImf/ImfTiledOutputPart.cpp Source/OpenEXR/IlmImf/ImfTiledRgbaFile.cpp Source/OpenEXR/IlmImf/ImfTileOffsets.cpp Source/OpenEXR/IlmImf/ImfTimeCode.cpp Source/OpenEXR/IlmImf/ImfTimeCodeAttribute.cpp Source/OpenEXR/IlmImf/ImfVecAttribute.cpp Source/OpenEXR/IlmImf/ImfVersion.cpp Source/OpenEXR/IlmImf/ImfWav.cpp Source/OpenEXR/IlmImf/ImfZip.cpp Source/OpenEXR/IlmImf/ImfZipCompressor.cpp Source/OpenEXR/Imath/ImathBox.cpp Source/OpenEXR/Imath/ImathColorAlgo.cpp Source/OpenEXR/Imath/ImathFun.cpp Source/OpenEXR/Imath/ImathMatrixAlgo.cpp Source/OpenEXR/Imath/ImathRandom.cpp Source/OpenEXR/Imath/ImathShear.cpp Source/OpenEXR/Imath/ImathVec.cpp Source/OpenEXR/Iex/IexBaseExc.cpp Source/OpenEXR/Iex/IexThrowErrnoExc.cpp Source/OpenEXR/Half/half.cpp Source/OpenEXR/IlmThread/IlmThread.cpp Source/OpenEXR/IlmThread/IlmThreadMutex.cpp Source/OpenEXR/IlmThread/IlmThreadPool.cpp Source/OpenEXR/IlmThread/IlmThreadSemaphore.cpp Source/OpenEXR/IexMath/IexMathFloatExc.cpp Source/LibRawLite/internal/dcraw_common.cpp Source/LibRawLite/internal/dcraw_fileio.cpp Source/LibRawLite/internal/demosaic_packs.cpp Source/LibRawLite/src/libraw_c_api.cpp Source/LibRawLite/src/libraw_cxx.cpp Source/LibRawLite/src/libraw_datastream.cpp Source/LibWebP/src/dec/alpha_dec.c Source/LibWebP/src/dec/buffer_dec.c Source/LibWebP/src/dec/frame_dec.c Source/LibWebP/src/dec/idec_dec.c Source/LibWebP/src/dec/io_dec.c Source/LibWebP/src/dec/quant_dec.c Source/LibWebP/src/dec/tree_dec.c Source/LibWebP/src/dec/vp8l_dec.c Source/LibWebP/src/dec/vp8_dec.c Source/LibWebP/src/dec/webp_dec.c Source/LibWebP/src/demux/anim_decode.c Source/LibWebP/src/demux/demux.c Source/LibWebP/src/dsp/alpha_processing.c Source/LibWebP/src/dsp/alpha_processing_mips_dsp_r2.c Source/LibWebP/src/dsp/alpha_processing_neon.c Source/LibWebP/src/dsp/alpha_processing_sse2.c Source/LibWebP/src/dsp/alpha_processing_sse41.c Source/LibWebP/src/dsp/cost.c Source/LibWebP/src/dsp/cost_mips32.c Source/LibWebP/src/dsp/cost_mips_dsp_r2.c Source/LibWebP/src/dsp/cost_neon.c Source/LibWebP/src/dsp/cost_sse2.c Source/LibWebP/src/dsp/cpu.c Source/LibWebP/src/dsp/dec.c Source/LibWebP/src/dsp/dec_clip_tables.c Source/LibWebP/src/dsp/dec_mips32.c Source/LibWebP/src/dsp/dec_mips_dsp_r2.c Source/LibWebP/src/dsp/dec_msa.c Source/LibWebP/src/dsp/dec_neon.c Source/LibWebP/src/dsp/dec_sse2.c Source/LibWebP/src/dsp/dec_sse41.c Source/LibWebP/src/dsp/enc.c Source/LibWebP/src/dsp/enc_avx2.c Source/LibWebP/src/dsp/enc_mips32.c Source/LibWebP/src/dsp/enc_mips_dsp_r2.c Source/LibWebP/src/dsp/enc_msa.c Source/LibWebP/src/dsp/enc_neon.c Source/LibWebP/src/dsp/enc_sse2.c Source/LibWebP/src/dsp/enc_sse41.c Source/LibWebP/src/dsp/filters.c Source/LibWebP/src/dsp/filters_mips_dsp_r2.c Source/LibWebP/src/dsp/filters_msa.c Source/LibWebP/src/dsp/filters_neon.c Source/LibWebP/src/dsp/filters_sse2.c Source/LibWebP/src/dsp/lossless.c Source/LibWebP/src/dsp/lossless_enc.c Source/LibWebP/src/dsp/lossless_enc_mips32.c Source/LibWebP/src/dsp/lossless_enc_mips_dsp_r2.c Source/LibWebP/src/dsp/lossless_enc_msa.c Source/LibWebP/src/dsp/lossless_enc_neon.c Source/LibWebP/src/dsp/lossless_enc_sse2.c Source/LibWebP/src/dsp/lossless_enc_sse41.c Source/LibWebP/src/dsp/lossless_mips_dsp_r2.c Source/LibWebP/src/dsp/lossless_msa.c Source/LibWebP/src/dsp/lossless_neon.c Source/LibWebP/src/dsp/lossless_sse2.c Source/LibWebP/src/dsp/rescaler.c Source/LibWebP/src/dsp/rescaler_mips32.c Source/LibWebP/src/dsp/rescaler_mips_dsp_r2.c Source/LibWebP/src/dsp/rescaler_msa.c Source/LibWebP/src/dsp/rescaler_neon.c Source/LibWebP/src/dsp/rescaler_sse2.c Source/LibWebP/src/dsp/ssim.c Source/LibWebP/src/dsp/ssim_sse2.c Source/LibWebP/src/dsp/upsampling.c Source/LibWebP/src/dsp/upsampling_mips_dsp_r2.c Source/LibWebP/src/dsp/upsampling_msa.c Source/LibWebP/src/dsp/upsampling_neon.c Source/LibWebP/src/dsp/upsampling_sse2.c Source/LibWebP/src/dsp/upsampling_sse41.c Source/LibWebP/src/dsp/yuv.c Source/LibWebP/src/dsp/yuv_mips32.c Source/LibWebP/src/dsp/yuv_mips_dsp_r2.c Source/LibWebP/src/dsp/yuv_neon.c Source/LibWebP/src/dsp/yuv_sse2.c Source/LibWebP/src/dsp/yuv_sse41.c Source/LibWebP/src/enc/alpha_enc.c Source/LibWebP/src/enc/analysis_enc.c Source/LibWebP/src/enc/backward_references_cost_enc.c Source/LibWebP/src/enc/backward_references_enc.c Source/LibWebP/src/enc/config_enc.c Source/LibWebP/src/enc/cost_enc.c Source/LibWebP/src/enc/filter_enc.c Source/LibWebP/src/enc/frame_enc.c Source/LibWebP/src/enc/histogram_enc.c Source/LibWebP/src/enc/iterator_enc.c Source/LibWebP/src/enc/near_lossless_enc.c Source/LibWebP/src/enc/picture_csp_enc.c Source/LibWebP/src/enc/picture_enc.c Source/LibWebP/src/enc/picture_psnr_enc.c Source/LibWebP/src/enc/picture_rescale_enc.c Source/LibWebP/src/enc/picture_tools_enc.c Source/LibWebP/src/enc/predictor_enc.c Source/LibWebP/src/enc/quant_enc.c Source/LibWebP/src/enc/syntax_enc.c Source/LibWebP/src/enc/token_enc.c Source/LibWebP/src/enc/tree_enc.c Source/LibWebP/src/enc/vp8l_enc.c Source/LibWebP/src/enc/webp_enc.c Source/LibWebP/src/mux/anim_encode.c Source/LibWebP/src/mux/muxedit.c Source/LibWebP/src/mux/muxinternal.c Source/LibWebP/src/mux/muxread.c Source/LibWebP/src/utils/bit_reader_utils.c Source/LibWebP/src/utils/bit_writer_utils.c Source/LibWebP/src/utils/color_cache_utils.c Source/LibWebP/src/utils/filters_utils.c Source/LibWebP/src/utils/huffman_encode_utils.c Source/LibWebP/src/utils/huffman_utils.c Source/LibWebP/src/utils/quant_levels_dec_utils.c Source/LibWebP/src/utils/quant_levels_utils.c Source/LibWebP/src/utils/random_utils.c Source/LibWebP/src/utils/rescaler_utils.c Source/LibWebP/src/utils/thread_utils.c Source/LibWebP/src/utils/utils.c Source/LibJXR/image/decode/decode.c Source/LibJXR/image/decode/JXRTranscode.c Source/LibJXR/image/decode/postprocess.c Source/LibJXR/image/decode/segdec.c Source/LibJXR/image/decode/strdec.c Source/LibJXR/image/decode/strdec_x86.c Source/LibJXR/image/decode/strInvTransform.c Source/LibJXR/image/decode/strPredQuantDec.c Source/LibJXR/image/encode/encode.c Source/LibJXR/image/encode/segenc.c Source/LibJXR/image/encode/strenc.c Source/LibJXR/image/encode/strenc_x86.c Source/LibJXR/image/encode/strFwdTransform.c Source/LibJXR/image/encode/strPredQuantEnc.c Source/LibJXR/image/sys/adapthuff.c Source/LibJXR/image/sys/image.c Source/LibJXR/image/sys/strcodec.c Source/LibJXR/image/sys/strPredQuant.c Source/LibJXR/image/sys/strTransform.c Source/LibJXR/jxrgluelib/JXRGlue.c Source/LibJXR/jxrgluelib/JXRGlueJxr.c Source/LibJXR/jxrgluelib/JXRGluePFC.c Source/LibJXR/jxrgluelib/JXRMeta.c Wrapper/FreeImagePlus/src/fipImage.cpp Wrapper/FreeImagePlus/src/fipMemoryIO.cpp Wrapper/FreeImagePlus/src/fipMetadataFind.cpp Wrapper/FreeImagePlus/src/fipMultiPage.cpp Wrapper/FreeImagePlus/src/fipTag.cpp Wrapper/FreeImagePlus/src/fipWinImage.cpp Wrapper/FreeImagePlus/src/FreeImagePlus.cpp +-INCLUDE = -I. -ISource -ISource/Metadata -ISource/FreeImageToolkit -ISource/LibJPEG -ISource/LibPNG -ISource/LibTIFF4 -ISource/ZLib -ISource/LibOpenJPEG -ISource/OpenEXR -ISource/OpenEXR/Half -ISource/OpenEXR/Iex -ISource/OpenEXR/IlmImf -ISource/OpenEXR/IlmThread -ISource/OpenEXR/Imath -ISource/OpenEXR/IexMath -ISource/LibRawLite -ISource/LibRawLite/dcraw -ISource/LibRawLite/internal -ISource/LibRawLite/libraw -ISource/LibRawLite/src -ISource/LibWebP -ISource/LibJXR -ISource/LibJXR/common/include -ISource/LibJXR/image/sys -ISource/LibJXR/jxrgluelib -IWrapper/FreeImagePlus ++SRCS = ./Source/FreeImage/BitmapAccess.cpp ./Source/FreeImage/ColorLookup.cpp ./Source/FreeImage/ConversionRGBA16.cpp ./Source/FreeImage/ConversionRGBAF.cpp ./Source/FreeImage/FreeImage.cpp ./Source/FreeImage/FreeImageC.c ./Source/FreeImage/FreeImageIO.cpp ./Source/FreeImage/GetType.cpp ./Source/FreeImage/LFPQuantizer.cpp ./Source/FreeImage/MemoryIO.cpp ./Source/FreeImage/PixelAccess.cpp ./Source/FreeImage/J2KHelper.cpp ./Source/FreeImage/MNGHelper.cpp ./Source/FreeImage/Plugin.cpp ./Source/FreeImage/PluginBMP.cpp ./Source/FreeImage/PluginCUT.cpp ./Source/FreeImage/PluginDDS.cpp ./Source/FreeImage/PluginEXR.cpp ./Source/FreeImage/PluginG3.cpp ./Source/FreeImage/PluginGIF.cpp ./Source/FreeImage/PluginHDR.cpp ./Source/FreeImage/PluginICO.cpp ./Source/FreeImage/PluginIFF.cpp ./Source/FreeImage/PluginJ2K.cpp ./Source/FreeImage/PluginJNG.cpp ./Source/FreeImage/PluginJP2.cpp ./Source/FreeImage/PluginJPEG.cpp ./Source/FreeImage/PluginJXR.cpp ./Source/FreeImage/PluginKOALA.cpp ./Source/FreeImage/PluginMNG.cpp ./Source/FreeImage/PluginPCD.cpp ./Source/FreeImage/PluginPCX.cpp ./Source/FreeImage/PluginPFM.cpp ./Source/FreeImage/PluginPICT.cpp ./Source/FreeImage/PluginPNG.cpp ./Source/FreeImage/PluginPNM.cpp ./Source/FreeImage/PluginPSD.cpp ./Source/FreeImage/PluginRAS.cpp ./Source/FreeImage/PluginRAW.cpp ./Source/FreeImage/PluginSGI.cpp ./Source/FreeImage/PluginTARGA.cpp ./Source/FreeImage/PluginTIFF.cpp ./Source/FreeImage/PluginWBMP.cpp ./Source/FreeImage/PluginWebP.cpp ./Source/FreeImage/PluginXBM.cpp ./Source/FreeImage/PluginXPM.cpp ./Source/FreeImage/PSDParser.cpp ./Source/FreeImage/TIFFLogLuv.cpp ./Source/FreeImage/Conversion.cpp ./Source/FreeImage/Conversion16_555.cpp ./Source/FreeImage/Conversion16_565.cpp ./Source/FreeImage/Conversion24.cpp ./Source/FreeImage/Conversion32.cpp ./Source/FreeImage/Conversion4.cpp ./Source/FreeImage/Conversion8.cpp ./Source/FreeImage/ConversionFloat.cpp ./Source/FreeImage/ConversionRGB16.cpp ./Source/FreeImage/ConversionRGBF.cpp ./Source/FreeImage/ConversionType.cpp ./Source/FreeImage/ConversionUINT16.cpp ./Source/FreeImage/Halftoning.cpp ./Source/FreeImage/tmoColorConvert.cpp ./Source/FreeImage/tmoDrago03.cpp ./Source/FreeImage/tmoFattal02.cpp ./Source/FreeImage/tmoReinhard05.cpp ./Source/FreeImage/ToneMapping.cpp ./Source/FreeImage/NNQuantizer.cpp ./Source/FreeImage/WuQuantizer.cpp ./Source/FreeImage/CacheFile.cpp ./Source/FreeImage/MultiPage.cpp ./Source/FreeImage/ZLibInterface.cpp ./Source/Metadata/Exif.cpp ./Source/Metadata/FIRational.cpp ./Source/Metadata/FreeImageTag.cpp ./Source/Metadata/IPTC.cpp ./Source/Metadata/TagConversion.cpp ./Source/Metadata/TagLib.cpp ./Source/Metadata/XTIFF.cpp ./Source/FreeImageToolkit/Background.cpp ./Source/FreeImageToolkit/BSplineRotate.cpp ./Source/FreeImageToolkit/Channels.cpp ./Source/FreeImageToolkit/ClassicRotate.cpp ./Source/FreeImageToolkit/Colors.cpp ./Source/FreeImageToolkit/CopyPaste.cpp ./Source/FreeImageToolkit/Display.cpp ./Source/FreeImageToolkit/Flip.cpp ./Source/FreeImageToolkit/JPEGTransform.cpp ./Source/FreeImageToolkit/MultigridPoissonSolver.cpp ./Source/FreeImageToolkit/Rescale.cpp ./Source/FreeImageToolkit/Resize.cpp Wrapper/FreeImagePlus/src/fipImage.cpp Wrapper/FreeImagePlus/src/fipMemoryIO.cpp Wrapper/FreeImagePlus/src/fipMetadataFind.cpp Wrapper/FreeImagePlus/src/fipMultiPage.cpp Wrapper/FreeImagePlus/src/fipTag.cpp Wrapper/FreeImagePlus/src/fipWinImage.cpp Wrapper/FreeImagePlus/src/FreeImagePlus.cpp ++INCLUDE = -I. -ISource -ISource/Metadata -ISource/FreeImageToolkit -IWrapper/FreeImagePlus From a438a94d3250847aacf48662ec52d811cd0f1e25 Mon Sep 17 00:00:00 2001 From: Atemu Date: Mon, 11 Jan 2021 07:02:30 +0100 Subject: [PATCH 06/58] linux: make SECURITY_LOCKDOWN_LSM optional Not supported on kernels <5.4 --- pkgs/os-specific/linux/kernel/common-config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index c4ecf666fcd..e1b6da0216d 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -424,7 +424,7 @@ let MODULE_SIG = no; # r13y, generates a random key during build and bakes it in # Depends on MODULE_SIG and only really helps when you sign your modules # and enforce signatures which we don't do by default. - SECURITY_LOCKDOWN_LSM = no; + SECURITY_LOCKDOWN_LSM = option no; } // optionalAttrs (!stdenv.hostPlatform.isAarch32) { # Detect buffer overflows on the stack From 1b36c9794834e68878d6b406b4afd4c0794b9ea7 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 11 Jan 2021 09:44:19 -0500 Subject: [PATCH 07/58] all-packages.nix: fix eval of kdeFrameworks for kora-icon-theme Fixes: #102168 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b90ce3922b4..2d5a7ff5dfd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19918,7 +19918,7 @@ in kopia = callPackage ../tools/backup/kopia { }; kora-icon-theme = callPackage ../data/icons/kora-icon-theme { - inherit (kdeFrameworks) breeze-icons; + inherit (libsForQt5.kdeFrameworks) breeze-icons; }; koreader = callPackage ../applications/misc/koreader {}; From 569b841e4c260b5f34d5753db1c0a59cdbad4da8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 11 Jan 2021 19:51:08 +0100 Subject: [PATCH 08/58] efivar: don't use lto at all https://github.com/NixOS/nixpkgs/pull/109007#issuecomment-758150833 --- pkgs/tools/system/efivar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix index 3300e0b2751..46741c1408a 100644 --- a/pkgs/tools/system/efivar/default.nix +++ b/pkgs/tools/system/efivar/default.nix @@ -40,8 +40,8 @@ stdenv.mkDerivation rec { }) ]; # We have no LTO here since commit 22284b07. With GCC 10 that triggers a warning. - postPatch = if stdenv.isi686 then "sed '/^OPTIMIZE /s/-flto//' -i Make.defaults" else null; - NIX_CFLAGS_COMPILE = if stdenv.isi686 then "-Wno-error=stringop-truncation" else null; + postPatch = "sed '/^OPTIMIZE /s/-flto//' -i Make.defaults"; + NIX_CFLAGS_COMPILE = "-Wno-error=stringop-truncation"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ popt ]; From e2531f09bc5a60c53755f6892f5a00162a80c36d Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 7 Jan 2021 19:29:15 +0300 Subject: [PATCH 09/58] libcap_ng: 0.8 -> 0.8.2 --- pkgs/os-specific/linux/libcap-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/libcap-ng/default.nix b/pkgs/os-specific/linux/libcap-ng/default.nix index 27f4ddcce18..bad98f6af86 100644 --- a/pkgs/os-specific/linux/libcap-ng/default.nix +++ b/pkgs/os-specific/linux/libcap-ng/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "libcap-ng"; # When updating make sure to test that the version with # all of the python bindings still works - version = "0.8"; + version = "0.8.2"; src = fetchurl { url = "${meta.homepage}/${pname}-${version}.tar.gz"; - sha256 = "08cy59iassiwbmfxa5v0kb374r80290vv32f5q1mnip11av26kgi"; + sha256 = "1sasp1n154aqy9fz0knlb966svm7xg1zjhg1vr4q839bgjvq7h2j"; }; nativeBuildInputs = [ swig ]; From 0d9b2c4b16b3ba6124475afab1c6a31624ab7c5b Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 7 Jan 2021 19:27:26 +0300 Subject: [PATCH 10/58] libcap: 2.44 -> 2.46 --- pkgs/os-specific/linux/libcap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index ab78a3a33d8..dadc8ae4986 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -7,11 +7,11 @@ assert usePam -> pam != null; stdenv.mkDerivation rec { pname = "libcap"; - version = "2.44"; + version = "2.46"; src = fetchurl { url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${pname}-${version}.tar.xz"; - sha256 = "1qf80lifygbnxwvqjf8jz5j24n6fqqx4ixnkbf76xs2vrmcq664j"; + sha256 = "1d6q447wf0iagiyzhfdqcj4cv0dmzc49i0czwikrcv7s2cad3lsf"; }; patches = lib.optional isStatic ./no-shared-lib.patch; From 116fb2a6107edc9aa2c600f31faa9219248ad05e Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 12 Jan 2021 11:23:32 +0300 Subject: [PATCH 11/58] libcap: use full path to bash --- pkgs/os-specific/linux/libcap/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index dadc8ae4986..89dd59d498a 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -34,11 +34,8 @@ stdenv.mkDerivation rec { ]; prePatch = '' - # use relative bash path - substituteInPlace progs/capsh.c --replace "/bin/bash" "bash" - - # ensure capsh can find bash in $PATH - substituteInPlace progs/capsh.c --replace execve execvpe + # use full path to bash + substituteInPlace progs/capsh.c --replace "/bin/bash" "${stdenv.shell}" # set prefixes substituteInPlace Make.Rules \ From 7be71af02ac527e1f0aae30abfed0392e8077733 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 12 Jan 2021 18:04:59 +0100 Subject: [PATCH 12/58] go: Introduce environment variable GO_NO_VENDOR_CHECKS to relax go vendor checks This is used in https://github.com/tweag/gomod2nix to reconstruct a vendor metadata file. With the vendor checks we need a lot more metadata which isn't relevant for building packages, especially since we've already locked the dependency graph ahead of time This has been ported from FreeBSD: https://reviews.freebsd.org/D24122 --- pkgs/development/compilers/go/1.14.nix | 1 + pkgs/development/compilers/go/1.15.nix | 1 + .../go/go_no_vendor_checks-1_14.patch | 23 +++++++++++++++++++ .../compilers/go/go_no_vendor_checks.patch | 23 +++++++++++++++++++ 4 files changed, 48 insertions(+) create mode 100644 pkgs/development/compilers/go/go_no_vendor_checks-1_14.patch create mode 100644 pkgs/development/compilers/go/go_no_vendor_checks.patch diff --git a/pkgs/development/compilers/go/1.14.nix b/pkgs/development/compilers/go/1.14.nix index a37d5c3d2cf..88c2f058b53 100644 --- a/pkgs/development/compilers/go/1.14.nix +++ b/pkgs/development/compilers/go/1.14.nix @@ -143,6 +143,7 @@ stdenv.mkDerivation rec { ./go-1.9-skip-flaky-20072.patch ./skip-external-network-tests.patch ./skip-nohup-tests.patch + ./go_no_vendor_checks-1_14.patch # fix rare TestDontCacheBrokenHTTP2Conn failure (fetchpatch { diff --git a/pkgs/development/compilers/go/1.15.nix b/pkgs/development/compilers/go/1.15.nix index 47bf9cebd4c..01cd7546746 100644 --- a/pkgs/development/compilers/go/1.15.nix +++ b/pkgs/development/compilers/go/1.15.nix @@ -152,6 +152,7 @@ stdenv.mkDerivation rec { ./skip-external-network-tests-1.15.patch ./skip-nohup-tests.patch ./skip-cgo-tests-1.15.patch + ./go_no_vendor_checks.patch ] ++ [ # breaks under load: https://github.com/golang/go/issues/25628 (if stdenv.isAarch32 diff --git a/pkgs/development/compilers/go/go_no_vendor_checks-1_14.patch b/pkgs/development/compilers/go/go_no_vendor_checks-1_14.patch new file mode 100644 index 00000000000..53e4ba78ff1 --- /dev/null +++ b/pkgs/development/compilers/go/go_no_vendor_checks-1_14.patch @@ -0,0 +1,23 @@ +Starting from go1.14, go verifes that vendor/modules.txt matches the requirements +and replacements listed in the main module go.mod file, and it is a hard failure if +vendor/modules.txt is missing. + +Relax module consistency checks and switch back to pre go1.14 behaviour if +vendor/modules.txt is missing regardless of go version requirement in go.mod. + +This has been ported from FreeBSD: https://reviews.freebsd.org/D24122 +See https://github.com/golang/go/issues/37948 for discussion. + +diff --git a/src/cmd/go/internal/modload/init.go b/src/cmd/go/internal/modload/init.go +index 71f68efbcc..3c566d04dd 100644 +--- a/src/cmd/go/internal/modload/init.go ++++ b/src/cmd/go/internal/modload/init.go +@@ -133,7 +133,7 @@ func checkVendorConsistency() { + readVendorList() + + pre114 := false +- if modFile.Go == nil || semver.Compare("v"+modFile.Go.Version, "v1.14") < 0 { ++ if modFile.Go == nil || semver.Compare("v"+modFile.Go.Version, "v1.14") < 0 || (os.Getenv("GO_NO_VENDOR_CHECKS") == "1" && len(vendorMeta) == 0) { + // Go versions before 1.14 did not include enough information in + // vendor/modules.txt to check for consistency. + // If we know that we're on an earlier version, relax the consistency check. diff --git a/pkgs/development/compilers/go/go_no_vendor_checks.patch b/pkgs/development/compilers/go/go_no_vendor_checks.patch new file mode 100644 index 00000000000..45ff4360f0d --- /dev/null +++ b/pkgs/development/compilers/go/go_no_vendor_checks.patch @@ -0,0 +1,23 @@ +Starting from go1.14, go verifes that vendor/modules.txt matches the requirements +and replacements listed in the main module go.mod file, and it is a hard failure if +vendor/modules.txt is missing. + +Relax module consistency checks and switch back to pre go1.14 behaviour if +vendor/modules.txt is missing regardless of go version requirement in go.mod. + +This has been ported from FreeBSD: https://reviews.freebsd.org/D24122 +See https://github.com/golang/go/issues/37948 for discussion. + +diff --git a/src/cmd/go/internal/modload/vendor.go b/src/cmd/go/internal/modload/vendor.go +index 71f68efbcc..3c566d04dd 100644 +--- a/src/cmd/go/internal/modload/vendor.go ++++ b/src/cmd/go/internal/modload/vendor.go +@@ -133,7 +133,7 @@ func checkVendorConsistency() { + readVendorList() + + pre114 := false +- if modFile.Go == nil || semver.Compare("v"+modFile.Go.Version, "v1.14") < 0 { ++ if modFile.Go == nil || semver.Compare("v"+modFile.Go.Version, "v1.14") < 0 || (os.Getenv("GO_NO_VENDOR_CHECKS") == "1" && len(vendorMeta) == 0) { + // Go versions before 1.14 did not include enough information in + // vendor/modules.txt to check for consistency. + // If we know that we're on an earlier version, relax the consistency check. From 42865ca61658a7f16907ad032d6050debda6d5d8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 11 Jan 2021 17:55:00 -0800 Subject: [PATCH 13/58] python3Packages.paramiko: 2.7.1 -> 2.7.2 --- pkgs/development/python-modules/paramiko/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix index 41951f1d893..c2237f68524 100644 --- a/pkgs/development/python-modules/paramiko/default.nix +++ b/pkgs/development/python-modules/paramiko/default.nix @@ -1,7 +1,6 @@ { pkgs , buildPythonPackage , fetchPypi -, fetchpatch , cryptography , bcrypt , invoke @@ -14,20 +13,13 @@ buildPythonPackage rec { pname = "paramiko"; - version = "2.7.1"; + version = "2.7.2"; src = fetchPypi { inherit pname version; - sha256 = "920492895db8013f6cc0179293147f830b8c7b21fdfc839b6bad760c27459d9f"; + sha256 = "7f36f4ba2c0d81d219f4595e35f70d56cc94f9ac40a6acdf51d6ca210ce65035"; }; - patches = [ - # fix RSA key loading with cryptography 3.1, remove >2.7.1 - (fetchpatch { - url = "https://github.com/paramiko/paramiko/commit/81064206bf3cec2ca4372257ff138481e1227b91.patch"; - sha256 = "01b87ffgyvd6rilp1w1kf7lk29z706ch39nwl21ifklqpjhmazww"; - }) - ]; checkInputs = [ invoke pytest mock pytest-relaxed ]; propagatedBuildInputs = [ bcrypt cryptography pynacl pyasn1 ]; From 93794d7b1a9d9eb4b66683ed22854351705bc7e2 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 11 Jan 2021 17:55:40 -0800 Subject: [PATCH 14/58] python3Packages.sshtunnel: 0.3.1 -> 0.4.0 --- pkgs/development/python-modules/sshtunnel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sshtunnel/default.nix b/pkgs/development/python-modules/sshtunnel/default.nix index 5254b5c4dcc..90e4962d3e8 100644 --- a/pkgs/development/python-modules/sshtunnel/default.nix +++ b/pkgs/development/python-modules/sshtunnel/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "0.3.1"; + version = "0.4.0"; pname = "sshtunnel"; src = fetchPypi { inherit pname version; - sha256 = "e0cac8a6a154c7a9651b42038e3f6cf35bb88c8ee4b94822b28a5b2fe7140f95"; + sha256 = "sha256-58sOp3Tbgb+RhE2yLecqQKro97D5u5ug9mbUdO9r+fw="; }; propagatedBuildInputs = [ paramiko ]; From e85084a85bd18646c297a2fef7b5fba8abe68a1c Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 13 Jan 2021 17:53:31 +0100 Subject: [PATCH 15/58] rav1e: 0.4.0-alpha -> 0.4.0 --- pkgs/tools/video/rav1e/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix index ae300f47b19..ca3fd72e878 100644 --- a/pkgs/tools/video/rav1e/default.nix +++ b/pkgs/tools/video/rav1e/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "rav1e"; - version = "0.4.0-alpha"; + version = "0.4.0"; src = stdenv.mkDerivation rec { name = "${pname}-${version}-source"; @@ -11,12 +11,12 @@ rustPlatform.buildRustPackage rec { owner = "xiph"; repo = "rav1e"; rev = "v${version}"; - sha256 = "1fw1gxi8330kfhl9hfzpn0lcmyn5604lc74d6g6iadzz2hmv4mb9"; + sha256 = "09w4476x6bdmh9pv4lchrzvfvbjvxxraa9f4dlbwgli89lcg9fcf"; }; cargoLock = fetchurl { - url = "https://github.com/xiph/rav1e/releases/download/v0.4.0-alpha/Cargo.lock"; - sha256 = "002s2wlzpifn5p2ahdrjdkjl48c1wr6fslg0if4gf9qpl8qj05fl"; + url = "https://github.com/xiph/rav1e/releases/download/v${version}/Cargo.lock"; + sha256 = "0rkyi010z6qmwdpvzlzyrrhs8na929g11lszhbqx5y0gh3y5nyik"; }; installPhase = '' @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "1i5ldqb77rrhfxxf9krp7f6yj3h6rsqak6hf23fd2znhgmi7psb1"; + cargoSha256 = "1iza2cws28hd4a3q90mc90l8ql4bsgapdznfr6bl65cjam43i5sg"; nativeBuildInputs = [ nasm cargo-c ]; postBuild = '' From 091a4ef01e5f5d8e6d4f32e19f6212a4423eb5a2 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Sun, 27 Dec 2020 01:11:42 -0800 Subject: [PATCH 16/58] coreutils: Apply sys_getdents patch unconditionally Also breaks build for riscv64. --- pkgs/tools/misc/coreutils/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 1a0c9b2e10c..9c811a16e74 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -29,9 +29,8 @@ stdenv.mkDerivation (rec { sha256 = "sha256-RFjY3nhJ30TMqxXhaxVIsoUiTbul8I+sBwwcDgvMTPo="; }; - patches = optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch - # included on coreutils master; TODO: apply unconditionally, I guess - ++ optional stdenv.hostPlatform.isAarch64 ./sys-getdents-undeclared.patch + patches = [ ./sys-getdents-undeclared.patch ] + ++ optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch # fix gnulib tests on 32-bit ARM. Included on coreutils master. # https://lists.gnu.org/r/bug-gnulib/2020-08/msg00225.html ++ optional stdenv.hostPlatform.isAarch32 ./fix-gnulib-tests-arm.patch; From 79851ec5934647ce34812943c77cd2a348b5a3ce Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 14 Jan 2021 12:12:21 +0100 Subject: [PATCH 17/58] mesa: 20.3.2 -> 20.3.3 (#109310) The "util: Disable memstream for Apple builds" patch got backported: https://gitlab.freedesktop.org/mesa/mesa/-/commit/6a006c35675636cb0d2cbfdfb1681b6639e0664d --- pkgs/development/libraries/mesa/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 55264888e2a..4f0a1c19ca3 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -31,7 +31,7 @@ with stdenv.lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "20.3.2"; + version = "20.3.3"; branch = versions.major version; in @@ -46,7 +46,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "0gakhsj5qgm4wran7nlnz7kzgg3aj0a8f4q4dfbznfnjhnv03q6c"; + sha256 = "0mnic7mfv5lgnn3swj7lbif8bl8pi2czlgr01jhq5s9q90nj2kpp"; }; prePatch = "patchShebangs ."; @@ -65,12 +65,6 @@ stdenv.mkDerivation { url = "https://gitlab.freedesktop.org/mesa/mesa/commit/aebbf819df6d1e.patch"; sha256 = "17248hyzg43d73c86p077m4lv1pkncaycr3l27hwv9k4ija9zl8q"; }) - # Fix for pre macOS SDK 10.13: - (fetchpatch { # util: Disable memstream for Apple builds - # MR: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8269 - url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/f4403f70fe5bf2ec41af5546122f0d78caffa984.patch"; - sha256 = "03j2aj255m7ms848nkb41vj3s3yb72zb5rz3w3fzp5l9wzzargw5"; - }) ]; postPatch = '' From 085577513f0287af96c56432bc4730883752b6e9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 14 Jan 2021 19:02:20 +0000 Subject: [PATCH 18/58] brave: 1.18.77 -> 1.18.78 --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 9eed9b627e6..a286915e878 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -88,11 +88,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.18.77"; + version = "1.18.78"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "AV3bqtWaoy6AVnt8K/Qo+7hguAIsPJPZhgLSeOvJ7JY="; + sha256 = "3M5W3BWGHtP+kfZZsH1nVzyGAsub4gjXyBwO8kR/Qvs="; }; dontConfigure = true; From 09e2b9aa82207ec2814be8c44d37bcb94a3408b8 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 15 Jan 2021 04:22:33 +0000 Subject: [PATCH 19/58] wavpack: 5.3.0 -> 5.4.0 https://github.com/dbry/WavPack/releases/tag/5.4.0 --- pkgs/development/libraries/wavpack/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix index 78794430860..e723fa48f23 100644 --- a/pkgs/development/libraries/wavpack/default.nix +++ b/pkgs/development/libraries/wavpack/default.nix @@ -1,21 +1,25 @@ -{ stdenv, fetchurl, libiconv }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libiconv }: stdenv.mkDerivation rec { pname = "wavpack"; - version = "5.3.0"; + version = "5.4.0"; enableParallelBuilding = true; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; - src = fetchurl { - url = "http://www.wavpack.com/${pname}-${version}.tar.bz2"; - sha256 = "00baiag7rlkzc6545dqdp4p5sr7xc3n97n7qdkgx58c544x0pw5n"; + src = fetchFromGitHub { + owner = "dbry"; + repo = "WavPack"; + rev = version; + sha256 = "1b6szk2vmnqnv5w7h8yc1iazjlidlraq1lwjbmc3fi0snbn6qj44"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Hybrid audio compression format"; - homepage = "http://www.wavpack.com/"; + homepage = "https://www.wavpack.com/"; + changelog = "https://github.com/dbry/WavPack/releases/tag/${version}"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ codyopel ]; From 2982fa466ee3352975a6f8c0d76ad20c72e388a5 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 8 Jan 2021 15:56:07 +0100 Subject: [PATCH 20/58] lvm2: 2.03.10 -> 2.03.11 https://github.com/lvmteam/lvm2/blob/v2_03_11/WHATS_NEW [VDO](https://github.com/dm-vdo/vdo) support is built by default now, but is disabled in nixpkgs, because it can't find `vdoformat`. AFAICT the kernel support for that still isn't upstream and it still seems kind of experimental, so I'd just ignore that for now and add it once it's either upstream of if anyone actually wants to use it. --- pkgs/os-specific/linux/lvm2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index a7666cc6a7f..687ab98fd51 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -16,11 +16,11 @@ assert enableDmeventd -> enableCmdlib; stdenv.mkDerivation rec { pname = "lvm2" + stdenv.lib.optionalString enableDmeventd "with-dmeventd"; - version = "2.03.10"; + version = "2.03.11"; src = fetchurl { url = "https://mirrors.kernel.org/sourceware/lvm2/LVM2.${version}.tgz"; - sha256 = "1l0fkn9abrgk5mfn6jfh9qhdr86b59l1c5pk6lp8jh0491d69las"; + sha256 = "1m4xpda8vbyd89ca0w8nacvnl4j34yzsa625gn990fb5sh84ab44"; }; nativeBuildInputs = [ pkgconfig ]; From 6f7f01a2448283427301bcfa1927f01c361943e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 6 Jan 2021 00:32:27 +0100 Subject: [PATCH 21/58] pytestCheckHook: Add disabledTestFiles option --- doc/languages-frameworks/python.section.md | 4 ++++ .../interpreters/python/hooks/pytest-check-hook.sh | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 2dea2cb1bcc..71193ed0cc0 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -610,6 +610,10 @@ Using the example above, the analagous pytestCheckHook usage would be: "download" "update" ]; + + disabledTestFiles = [ + "tests/test_failing.py" + ]; ``` This is expecially useful when tests need to be conditionallydisabled, diff --git a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh index bfd2bfa7583..c2079fa84f9 100644 --- a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh +++ b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh @@ -2,6 +2,7 @@ echo "Sourcing pytest-check-hook" declare -ar disabledTests +declare -ar disabledTestFiles function _concatSep { local result @@ -36,6 +37,13 @@ function pytestCheckPhase() { disabledTestsString=$(_pytestComputeDisabledTestsString "${disabledTests[@]}") args+=" -k \""$disabledTestsString"\"" fi + for file in "${disabledTestFiles[@]}"; do + if [ ! -f "$file" ]; then + echo "Disabled test file \"$file\" does not exist. Aborting" + exit 1 + fi + args+=" --ignore=$file" + done args+=" ${pytestFlagsArray[@]}" eval "@pythonCheckInterpreter@ $args" From a93ea0fbd72e75908d05cc8a206aa7b908632fc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 6 Jan 2021 00:45:39 +0100 Subject: [PATCH 22/58] pythonPackages.cheroot: Use disabledTestFiles --- .../python-modules/cheroot/default.nix | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index c9d3094d595..e5c7c23e2e4 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, isPy3k +{ lib +, stdenv +, fetchPypi +, buildPythonPackage +, isPy3k , jaraco_functools , jaraco_text , more-itertools @@ -33,7 +37,8 @@ buildPythonPackage rec { # install_requires jaraco_functools - more-itertools six + more-itertools + six ]; checkInputs = [ @@ -49,10 +54,6 @@ buildPythonPackage rec { trustme ]; - # avoid attempting to use 3 packages not available on nixpkgs - # (jaraco.apt, jaraco.context, yg.lockfile) - pytestFlagsArray = [ "--ignore=cheroot/test/test_wsgi.py" ]; - # Disable doctest plugin because times out # Disable xdist (-n arg) because it's incompatible with testmon # Deselect test_bind_addr_unix on darwin because times out @@ -64,7 +65,7 @@ buildPythonPackage rec { rm pytest.ini ''; - disabledTests= [ + disabledTests = [ "tls" # touches network "peercreds_unix_sock" # test urls no longer allowed ] ++ lib.optionals stdenv.isDarwin [ @@ -72,6 +73,12 @@ buildPythonPackage rec { "bind_addr_unix" ]; + disabledTestFiles = [ + # avoid attempting to use 3 packages not available on nixpkgs + # (jaraco.apt, jaraco.context, yg.lockfile) + "cheroot/test/test_wsgi.py" + ]; + # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; From d07276113a2a98680777d456dcdc9b24305bb6cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Sun, 17 Jan 2021 00:03:46 +0100 Subject: [PATCH 23/58] SDL2: 2.0.12 -> 2.0.14 --- pkgs/development/libraries/SDL2/default.nix | 4 ++-- .../libraries/SDL2/find-headers.patch | 17 ++++++++--------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 31624bee2fb..b2dd5039d4c 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -25,11 +25,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "SDL2"; - version = "2.0.12"; + version = "2.0.14"; src = fetchurl { url = "https://www.libsdl.org/release/${pname}-${version}.tar.gz"; - sha256 = "0qy8wbqvfkb5ps8kxgaaf2zzpkjqbsw712hlp74znbn0jpv6i4il"; + sha256 = "1g1jahknv5r4yhh1xq5sf0md20ybdw1zh1i15lry26sq39bmn8fq"; }; dontDisableStatic = withStatic; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/SDL2/find-headers.patch b/pkgs/development/libraries/SDL2/find-headers.patch index 69dde41c7e2..a2e0c483703 100644 --- a/pkgs/development/libraries/SDL2/find-headers.patch +++ b/pkgs/development/libraries/SDL2/find-headers.patch @@ -1,6 +1,6 @@ -diff -ru3 SDL2-2.0.12/sdl2-config.cmake.in SDL2-2.0.12-new/sdl2-config.cmake.in ---- SDL2-2.0.12/sdl2-config.cmake.in 2020-03-11 02:36:18.000000000 +0100 -+++ SDL2-2.0.12-new/sdl2-config.cmake.in 2020-11-11 11:59:05.178703826 +0100 +diff -ru3 SDL2-2.0.14/sdl2-config.cmake.in SDL2-2.0.14-new/sdl2-config.cmake.in +--- SDL2-2.0.14/sdl2-config.cmake.in 2020-12-21 18:44:36.000000000 +0100 ++++ SDL2-2.0.14-new/sdl2-config.cmake.in 2021-01-16 23:53:40.721121792 +0100 @@ -6,7 +6,8 @@ set(SDL2_PREFIX "@prefix@") set(SDL2_EXEC_PREFIX "@prefix@") @@ -18,7 +18,7 @@ diff -ru3 SDL2-2.0.12/sdl2-config.cmake.in SDL2-2.0.12-new/sdl2-config.cmake.in - INTERFACE_INCLUDE_DIRECTORIES "@includedir@/SDL2" + INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIRS}" IMPORTED_LINK_INTERFACE_LANGUAGES "C" - IMPORTED_LOCATION "@libdir@/libSDL2.so" + IMPORTED_LOCATION "@libdir@/${CMAKE_SHARED_LIBRARY_PREFIX}SDL2${CMAKE_SHARED_LIBRARY_SUFFIX}" INTERFACE_LINK_LIBRARIES "${SDL2_EXTRA_LINK_FLAGS}") add_library(SDL2::SDL2-static STATIC IMPORTED) @@ -26,12 +26,11 @@ diff -ru3 SDL2-2.0.12/sdl2-config.cmake.in SDL2-2.0.12-new/sdl2-config.cmake.in - INTERFACE_INCLUDE_DIRECTORIES "@includedir@/SDL2" + INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIRS}" IMPORTED_LINK_INTERFACE_LANGUAGES "C" - IMPORTED_LOCATION "@libdir@/libSDL2.a" + IMPORTED_LOCATION "@libdir@/${CMAKE_STATIC_LIBRARY_PREFIX}SDL2${CMAKE_STATIC_LIBRARY_SUFFIX}" INTERFACE_LINK_LIBRARIES "${SDL2_EXTRA_LINK_FLAGS_STATIC}") -Només a SDL2-2.0.12-new/: sdl2-config.cmake.in.orig -diff -ru3 SDL2-2.0.12/sdl2-config.in SDL2-2.0.12-new/sdl2-config.in ---- SDL2-2.0.12/sdl2-config.in 2020-03-11 02:36:18.000000000 +0100 -+++ SDL2-2.0.12-new/sdl2-config.in 2020-11-11 11:56:26.432955479 +0100 +diff -ru3 SDL2-2.0.14/sdl2-config.in SDL2-2.0.14-new/sdl2-config.in +--- SDL2-2.0.14/sdl2-config.in 2020-12-21 18:44:36.000000000 +0100 ++++ SDL2-2.0.14-new/sdl2-config.in 2021-01-16 23:57:11.940353171 +0100 @@ -42,7 +42,11 @@ echo @SDL_VERSION@ ;; From 46c2884ae0bea836e81f9c609dcad8e273f6dcc3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 18 Jan 2021 15:55:34 +0000 Subject: [PATCH 24/58] enchant: 2.2.13 -> 2.2.15 --- pkgs/development/libraries/enchant/2.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix index 02215a30418..0399f701d64 100644 --- a/pkgs/development/libraries/enchant/2.x.nix +++ b/pkgs/development/libraries/enchant/2.x.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "enchant"; - version = "2.2.13"; + version = "2.2.15"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "084aqsrkzz2c1ls47p759d9bsi26d0m6wq9901k37483g46zkfga"; + sha256 = "sha256-Ow8iFVeBFfKOKmqlSbNRKGADlDBL151vKLDTs9b0bAM="; }; nativeBuildInputs = [ From 5dc5cd4e130b10bdca42f23b048a3d3c01e56c7c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 19 Jan 2021 08:00:10 +0000 Subject: [PATCH 25/58] btrfs-progs: 5.9 -> 5.10 --- pkgs/tools/filesystems/btrfs-progs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 84ceea384c3..ec9cd7ca61a 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "5.9"; + version = "5.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "14d7hz07kfczfgmy1ixkgccjn393gpkjn7givz5kwxddcnk5i4xq"; + sha256 = "sha256-5xoNbdUE86XZV/zpowKB62Hs+ZHIrzFf4AYaG5eh0CE="; }; nativeBuildInputs = [ From fe12a9949491438ffc79792ea66d31e3522603d4 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 19 Jan 2021 13:01:21 +0100 Subject: [PATCH 26/58] libdrm: 2.4.103 -> 2.4.104 Announcement: https://lists.freedesktop.org/archives/dri-devel/2021-January/293654.html Additional changes: - docutils is a new bild-time dependency for rst2man. - Fix the license (BSD -> MIT). The licensing is a bit complicated but at least the main license is MIT [0],[1],[2]. - Add myself as maintainer. - Extend the meta information. - Some minor cleanups and style improvements. [0]: https://pkgs.alpinelinux.org/packages?name=libdrm [1]: https://www.freshports.org/graphics/libdrm [2]: https://src.fedoraproject.org/rpms/libdrm/blob/master/f/libdrm.spec --- pkgs/development/libraries/libdrm/default.nix | 35 +++++++++++++------ 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 3b5daad854c..e575624f815 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,19 +1,20 @@ -{ stdenv, lib, fetchurl, pkg-config, meson, ninja, libpthreadstubs, libpciaccess -, withValgrind ? valgrind-light.meta.available, valgrind-light, fetchpatch +{ stdenv, lib, fetchurl, pkg-config, meson, ninja, docutils +, libpthreadstubs, libpciaccess +, withValgrind ? valgrind-light.meta.available, valgrind-light }: stdenv.mkDerivation rec { pname = "libdrm"; - version = "2.4.103"; + version = "2.4.104"; src = fetchurl { url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "08h2nnf4w96b4ql7485mvjgbbsb8rwc0qa93fdm1cq34pbyszq1z"; + sha256 = "1jqvx9c23hgwhq109zqj6vg3ng40pcvh3r1k2fn1a424qasxhsnn"; }; outputs = [ "out" "dev" "bin" ]; - nativeBuildInputs = [ pkg-config meson ninja ]; + nativeBuildInputs = [ pkg-config meson ninja docutils ]; buildInputs = [ libpthreadstubs libpciaccess ] ++ lib.optional withValgrind valgrind-light; @@ -34,12 +35,24 @@ stdenv.mkDerivation rec { "-Detnaviv=true" ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-Dintel=false"; - enableParallelBuilding = true; + meta = with lib; { + homepage = "https://gitlab.freedesktop.org/mesa/drm"; + downloadPage = "https://dri.freedesktop.org/libdrm/"; + description = "Direct Rendering Manager library and headers"; + longDescription = '' + A userspace library for accessing the DRM (Direct Rendering Manager) on + Linux, BSD and other operating systems that support the ioctl interface. + The library provides wrapper functions for the ioctls to avoid exposing + the kernel interface directly, and for chipsets with drm memory manager, + support for tracking relocations and buffers. + New functionality in the kernel DRM drivers typically requires a new + libdrm, but a new libdrm will always work with an older kernel. - meta = { - homepage = "https://dri.freedesktop.org/libdrm/"; - description = "Library for accessing the kernel's Direct Rendering Manager"; - license = "bsd"; - platforms = lib.platforms.unix; + libdrm is a low-level library, typically used by graphics drivers such as + the Mesa drivers, the X drivers, libva and similar projects. + ''; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ primeos ]; }; } From cecd2c83626ad2722df40a18a6dfc19e7a10b22c Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Tue, 19 Jan 2021 15:19:58 +0100 Subject: [PATCH 27/58] dnsmasq: 2.82 -> 2.83, pname + version CVEs: CVE-2020-25681 CVE-2020-25682 CVE-2020-25683 CVE-2020-25687 CVE-2020-25684 CVE-2020-25685 CVE-2020-25686 --- pkgs/tools/networking/dnsmasq/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index b8b88e19395..d92408b3669 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -12,11 +12,12 @@ let ]); in stdenv.mkDerivation rec { - name = "dnsmasq-2.82"; + pname = "dnsmasq"; + version = "2.83"; src = fetchurl { - url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.xz"; - sha256 = "0cn1xd1s6xs78jmrmwjnh9m6w3q38pk6dyqy2phvasqiyd33cll4"; + url = "http://www.thekelleys.org.uk/dnsmasq/${pname}-${version}.tar.xz"; + sha256 = "1sjamz1v588qf35m8z6wcqkjk5w12bqhj7d7p48dj8jyn3lgghgz"; }; postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' From 645f41fb116ee56215a00a1bba1c3dbe8abc0f7e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 20 Jan 2021 02:02:48 +0000 Subject: [PATCH 28/58] libwacom: 1.6 -> 1.7 --- pkgs/development/libraries/libwacom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index fe9aaaed125..ea5c27dd1b8 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libwacom"; - version = "1.6"; + version = "1.7"; outputs = [ "out" "dev" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "linuxwacom"; repo = "libwacom"; rev = "libwacom-${version}"; - sha256 = "10wphlk5v591mlvcyr6bjqp60zmhbpqg3lmsq9dza738v97ws8ci"; + sha256 = "sha256-kF4Q3ACiVlUbEjS2YqwHA42QknKMLqX9US31PmXtS/I="; }; nativeBuildInputs = [ pkg-config meson ninja doxygen ]; From 78a5845e3976463702486a0f11dcbd50801a745d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 20 Jan 2021 03:04:31 +0000 Subject: [PATCH 29/58] libfabric: 1.11.1 -> 1.11.2 --- pkgs/os-specific/linux/libfabric/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/libfabric/default.nix b/pkgs/os-specific/linux/libfabric/default.nix index b1f9bada315..b1ed0a72405 100644 --- a/pkgs/os-specific/linux/libfabric/default.nix +++ b/pkgs/os-specific/linux/libfabric/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libfabric"; - version = "1.11.1"; + version = "1.11.2"; enableParallelBuilding = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "ofiwg"; repo = pname; rev = "v${version}"; - sha256 = "17qq96mlfhbkbmsvbazhxzkjnh6x37xlh3r0ngp0rfqbl05z2pcr"; + sha256 = "sha256-Xy7A1hjz4O13bMZ0RbOuxEzVkVW5+WKC+MOH5rcGzH0="; }; nativeBuildInputs = [ pkg-config autoreconfHook ] ; From c6ef337e57cb05d9d225171f2bb758ca8721f5c8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 20 Jan 2021 04:37:54 +0000 Subject: [PATCH 30/58] mob: 0.0.25 -> 1.1.0 --- pkgs/applications/misc/mob/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mob/default.nix b/pkgs/applications/misc/mob/default.nix index 821dc1ccc3c..96c8d8cf32a 100644 --- a/pkgs/applications/misc/mob/default.nix +++ b/pkgs/applications/misc/mob/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { pname = "mob"; - version = "0.0.25"; + version = "1.1.0"; goPackagePath = "github.com/remotemobprogramming/mob"; src = fetchFromGitHub { rev = "v${version}"; owner = "remotemobprogramming"; repo = pname; - sha256 = "1gs0mv4j66278srrck7llvi5gnfdqxz3a489qn5sx3mw46yx5q93"; + sha256 = "sha256-C63tGMd+kGQc99k7L8SKlijlEBaBCiksAghsg6WC8Bw="; }; meta = with lib; { From 9b45a8e56553dea33f406aef53e6a9efbf7ec482 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 20 Jan 2021 05:07:49 +0000 Subject: [PATCH 31/58] melonDS: 0.9 -> 0.9.1 --- pkgs/misc/emulators/melonDS/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/melonDS/default.nix b/pkgs/misc/emulators/melonDS/default.nix index dbf658b8fce..f8d43cc8999 100644 --- a/pkgs/misc/emulators/melonDS/default.nix +++ b/pkgs/misc/emulators/melonDS/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "melonDS"; - version = "0.9"; + version = "0.9.1"; src = fetchFromGitHub { owner = "Arisotura"; repo = pname; rev = version; - sha256 = "0m45m1ch0az8l3d3grjbqvi5vvydbffxwka9w3k3qiia50m7fnph"; + sha256 = "sha256-bvi0Y+zwfEcsZMNxoH85hxwIGn0UIYlg/ZaE6yJ7vlo="; }; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; From 8580a01ea47f47d6e74fedf8d8d96124155f2dd6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 20 Jan 2021 05:02:08 +0000 Subject: [PATCH 32/58] alephone-marathon: 20190331 -> 20200904 --- pkgs/games/alephone/marathon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/alephone/marathon/default.nix b/pkgs/games/alephone/marathon/default.nix index 1d0787067af..4518215a337 100644 --- a/pkgs/games/alephone/marathon/default.nix +++ b/pkgs/games/alephone/marathon/default.nix @@ -3,13 +3,13 @@ alephone.makeWrapper rec { pname = "marathon"; desktopName = "Marathon"; - version = "20190331"; + version = "20200904"; icon = alephone.icons + "/marathon.png"; zip = fetchurl { url = "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/Marathon-${version}-Data.zip"; - sha256 = "1d18a7hn8s50rqcs9i72ak5fq5a76hwk7nylfinrxjb134c9vlpz"; + sha256 = "sha256-x5M8RkxH+Rn8hUJIIq/AFC5Ibn0zF95BqZIDEwM6wVg="; }; meta = { From 2e258c1358edcd8166e10d11d6e92798f625f215 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 20 Jan 2021 23:50:13 +0000 Subject: [PATCH 33/58] powerline-go: 1.18.0 -> 1.20.0 --- pkgs/tools/misc/powerline-go/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/powerline-go/default.nix b/pkgs/tools/misc/powerline-go/default.nix index 2b46e25c67e..eedcf6b80a5 100644 --- a/pkgs/tools/misc/powerline-go/default.nix +++ b/pkgs/tools/misc/powerline-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "powerline-go"; - version = "1.18.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "justjanne"; repo = pname; rev = "v${version}"; - sha256 = "0dni842xzc8r6wbdfax25940jvxp69zk8xklczkjmyxqawvsxnjh"; + sha256 = "sha256-Pge57OXNE0MY2rlspVsqxdoe1r/XWjrq/q9ygdns2c8="; }; - vendorSha256 = "0dkgp9vlb76la0j439w0rb548qg5v8648zryk3rqgfhd4qywlk11"; + vendorSha256 = "sha256-HYF6aKz+P241EKmupEoretadlrh9FBRx6nIER66jofg="; doCheck = false; From 799804ca6242887f952db3159435037e9e6c83ed Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 21 Jan 2021 00:27:47 +0000 Subject: [PATCH 34/58] prometheus-pushgateway: 1.3.0 -> 1.3.1 --- pkgs/servers/monitoring/prometheus/pushgateway.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index 0d47211005f..db9e0f0658f 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "pushgateway"; - version = "1.3.0"; + version = "1.3.1"; rev = "v${version}"; goPackagePath = "github.com/prometheus/pushgateway"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "pushgateway"; - sha256 = "0ll6s8yqcx3fgn6gzmfb1bsfykl0ra6383nyw1kjbj260w200gls"; + sha256 = "sha256-z8xM9rq7wKH7bwzjSmGh+2pO5Y10szmIH82ztRrOCNs="; }; buildUser = "nix@nixpkgs"; From e48b0ede04e07de95a7974a7829f9ae4ffd1a334 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Thu, 21 Jan 2021 11:36:35 +0100 Subject: [PATCH 35/58] asciidoc: 8.6.9 -> 9.0.4 (#102398) Main motivation was to port it to Python3 which is due to #101964. So: - Switch from asciidoc to asciidoc-py3 - Switch from Python 2 to Python 3 - This needs autoreconfHook now - We also need to do some patching in a2x.py - Switch to patchShebangs (more readable) - Only input w3m if we actually build with it --- pkgs/tools/typesetting/asciidoc/default.nix | 34 ++++++++++++--------- pkgs/top-level/all-packages.nix | 9 +++--- 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index 1326c917593..61af8102f51 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -1,5 +1,5 @@ -{ fetchurl, lib, stdenv, python2 - +{ fetchurl, lib, stdenv, python3 +, fetchFromGitHub, autoreconfHook , enableStandardFeatures ? false , sourceHighlight ? null , highlight ? null @@ -144,14 +144,17 @@ let in stdenv.mkDerivation rec { - name = "asciidoc-8.6.9"; + pname = "asciidoc"; + version = "9.0.4"; - src = fetchurl { - url = "mirror://sourceforge/asciidoc/${name}.tar.gz"; - sha256 = "1w71nk527lq504njmaf0vzr93pgahkgzzxzglrq6bay8cw2rvnvq"; + src = fetchFromGitHub { + owner = "asciidoc"; + repo = "asciidoc-py3"; + rev = version; + sha256 = "1gspxw5i0axymxdjzj5rmhf10gyl2gqr666gz141nv042l9dm5vi"; }; - buildInputs = [ python2 unzip ]; + nativeBuildInputs = [ python3 unzip autoreconfHook ]; # install filters early, so their shebangs are patched too patchPhase = with lib; '' @@ -212,7 +215,7 @@ stdenv.mkDerivation rec { # the odp backend already has that fix. Copy it here until fixed upstream. sed -i "s|'/etc/asciidoc/backends/odt/asciidoc.ott'|os.path.dirname(__file__),'asciidoc.ott'|" \ "$out/etc/asciidoc/backends/odt/a2x-backend.py" - '' + optionalString enableStandardFeatures '' + '' + (if enableStandardFeatures then '' sed -e "s|dot|${graphviz}/bin/dot|g" \ -e "s|neato|${graphviz}/bin/neato|g" \ -e "s|twopi|${graphviz}/bin/twopi|g" \ @@ -222,7 +225,8 @@ stdenv.mkDerivation rec { sed -e "s|run('latex|run('${texlive}/bin/latex|g" \ -e "s|cmd = 'dvipng'|cmd = '${texlive}/bin/dvipng'|g" \ - -i "filters/latex/latex2png.py" + -e "s|cmd = 'dvisvgm'|cmd = '${texlive}/bin/dvisvgm'|g" \ + -i "filters/latex/latex2img.py" sed -e "s|run('abc2ly|run('${lilypond}/bin/abc2ly|g" \ -e "s|run('lilypond|run('${lilypond}/bin/lilypond|g" \ @@ -249,11 +253,13 @@ stdenv.mkDerivation rec { -e "s|^XMLLINT =.*|XMLLINT = '${libxml2.bin}/bin/xmllint'|" \ -e "s|^EPUBCHECK =.*|EPUBCHECK = 'nixpkgs_is_missing_epubcheck'|" \ -i a2x.py - '' + '' - for n in $(find "$out" . -name \*.py); do - sed -i -e "s,^#![[:space:]]*.*/bin/env python,#!${python2}/bin/python,g" "$n" - chmod +x "$n" - done + '' else '' + sed -e "s|^ENV =.*|ENV = dict(XML_CATALOG_FILES='${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xsl_ns}/xml/xsl/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml')|" \ + -e "s|^XSLTPROC =.*|XSLTPROC = '${libxslt.bin}/bin/xsltproc'|" \ + -e "s|^XMLLINT =.*|XMLLINT = '${libxml2.bin}/bin/xmllint'|" \ + -i a2x.py + '') + '' + patchShebangs . sed -i -e "s,/etc/vim,,g" Makefile.in ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5985483c4ed..02391ee772d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2820,20 +2820,21 @@ in arpoison = callPackage ../tools/networking/arpoison { }; asciidoc = callPackage ../tools/typesetting/asciidoc { - inherit (python2Packages) matplotlib numpy aafigure recursivePthLoader; - w3m = w3m-batch; + inherit (python3.pkgs) matplotlib numpy aafigure recursivePthLoader; enableStandardFeatures = false; }; asciidoc-full = appendToName "full" (asciidoc.override { - inherit (python2Packages) pygments; + inherit (python3.pkgs) pygments; texlive = texlive.combine { inherit (texlive) scheme-minimal dvipng; }; + w3m = w3m-batch; enableStandardFeatures = true; }); asciidoc-full-with-plugins = appendToName "full-with-plugins" (asciidoc.override { - inherit (python2Packages) pygments; + inherit (python3.pkgs) pygments; texlive = texlive.combine { inherit (texlive) scheme-minimal dvipng; }; + w3m = w3m-batch; enableStandardFeatures = true; enableExtraPlugins = true; }); From 9d8900b8a40e7aad722c78242f9ded2f9546df03 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 21 Jan 2021 13:16:48 +0100 Subject: [PATCH 36/58] scons: 4.0.1 -> 4.1.0 --- pkgs/development/tools/build-managers/scons/common.nix | 8 ++++++++ pkgs/development/tools/build-managers/scons/default.nix | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/scons/common.nix b/pkgs/development/tools/build-managers/scons/common.nix index 7a15c193423..f38b909d5a0 100644 --- a/pkgs/development/tools/build-managers/scons/common.nix +++ b/pkgs/development/tools/build-managers/scons/common.nix @@ -16,11 +16,19 @@ python3Packages.buildPythonApplication rec { postPatch = lib.optionalString (lib.versionAtLeast version "4.0.0") '' substituteInPlace setup.cfg \ --replace "build/dist" "dist" + '' + lib.optionalString (lib.versionAtLeast version "4.1.0") '' + substituteInPlace setup.cfg \ + --replace "build/doc/man/" "" ''; # The release tarballs don't contain any tests (runtest.py and test/*): doCheck = lib.versionOlder version "4.0.0"; + postInstall = lib.optionalString (lib.versionAtLeast version "4.1.0") '' + mkdir -p "$out/share/man/man1" + mv "$out/"*.1 "$out/share/man/man1/" + ''; + meta = with stdenv.lib; { description = "An improved, cross-platform substitute for Make"; longDescription = '' diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index eb86d595597..4b07eb0501d 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -12,7 +12,7 @@ in { sha256 = "1yzq2gg9zwz9rvfn42v5jzl3g4qf1khhny6zfbi2hib55zvg60bq"; }).override { python3Packages = python2Packages; }; scons_latest = mkScons { - version = "4.0.1"; - sha256 = "0z00l9wzaiqyjq0hapbvsjclvcfjjjq04kmxi7ffq966nl2d2bkj"; + version = "4.1.0"; + sha256 = "11axk03142ziax6i3wwy9qpqp7r3i7h5jg9y2xzph9i15rv8vlkj"; }; } From 53029f20705a598cd3426b2b11ac50ffed37e075 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Wed, 20 Jan 2021 00:15:24 +0000 Subject: [PATCH 37/58] linuxHeaders: 5.10.4 -> 5.10.9 --- pkgs/os-specific/linux/kernel-headers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index cadf65a7220..b4e1d19e64b 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -69,12 +69,12 @@ let in { inherit makeLinuxHeaders; - linuxHeaders = let version = "5.10.4"; in + linuxHeaders = let version = "5.10.9"; in makeLinuxHeaders { inherit version; src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1v2nbpp21c3fkw23dgrrfznnnlvi0538kj8wrlb2m6g94rn3jklh"; + sha256 = "0la7dklpy6xd79fkzavpmlfyrc60kmmwz491msd95dmvv06kwwvz"; }; patches = [ ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms From 4bdcddf9aac73d1ca1ace4eb26c14af18c1b0a31 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 31 Dec 2020 00:19:10 -0600 Subject: [PATCH 38/58] gcc: allow stripping gcc libraries When cross compiling to the same kernel / arch combination, it is safe to use strip of libraries. This happens when cross-compiling musl programs. dontStrip is now set in each gcc compiler instead of in gcc/builder.sh. Fixes #75476 --- pkgs/development/compilers/gcc/10/default.nix | 4 ++-- pkgs/development/compilers/gcc/6/default.nix | 4 ++-- pkgs/development/compilers/gcc/7/default.nix | 4 ++-- pkgs/development/compilers/gcc/8/default.nix | 4 ++-- pkgs/development/compilers/gcc/9/default.nix | 4 ++-- pkgs/development/compilers/gcc/builder.sh | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index c31e7c426e0..ecbe7c9eb4b 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -28,8 +28,8 @@ , threadsCross ? null # for MinGW , crossStageStatic ? false , # Strip kills static libs of other archs (hence no cross) - stripped ? stdenv.hostPlatform == stdenv.buildPlatform - && stdenv.targetPlatform == stdenv.hostPlatform + stripped ? stdenv.hostPlatform.system == stdenv.buildPlatform.system + && stdenv.targetPlatform.system == stdenv.hostPlatform.system , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 908f7e0f699..ed97e6a0ce8 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -36,8 +36,8 @@ , threadsCross ? null # for MinGW , crossStageStatic ? false , # Strip kills static libs of other archs (hence no cross) - stripped ? stdenv.hostPlatform == stdenv.buildPlatform - && stdenv.targetPlatform == stdenv.hostPlatform + stripped ? stdenv.hostPlatform.system == stdenv.buildPlatform.system + && stdenv.targetPlatform.system == stdenv.hostPlatform.system , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index d950d6ac35b..4bd776e6f8b 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -26,8 +26,8 @@ , threadsCross ? null # for MinGW , crossStageStatic ? false , # Strip kills static libs of other archs (hence no cross) - stripped ? stdenv.hostPlatform == stdenv.buildPlatform - && stdenv.targetPlatform == stdenv.hostPlatform + stripped ? stdenv.hostPlatform.system == stdenv.buildPlatform.system + && stdenv.targetPlatform.system == stdenv.hostPlatform.system , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 683a9edfe09..d9234a75530 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -26,8 +26,8 @@ , threadsCross ? null # for MinGW , crossStageStatic ? false , # Strip kills static libs of other archs (hence no cross) - stripped ? stdenv.hostPlatform == stdenv.buildPlatform - && stdenv.targetPlatform == stdenv.hostPlatform + stripped ? stdenv.hostPlatform.system == stdenv.buildPlatform.system + && stdenv.targetPlatform.system == stdenv.hostPlatform.system , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 7827cb98505..40af21a1fa3 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -29,8 +29,8 @@ , threadsCross ? null # for MinGW , crossStageStatic ? false , # Strip kills static libs of other archs (hence no cross) - stripped ? stdenv.hostPlatform == stdenv.buildPlatform - && stdenv.targetPlatform == stdenv.hostPlatform + stripped ? stdenv.hostPlatform.system == stdenv.buildPlatform.system + && stdenv.targetPlatform.system == stdenv.hostPlatform.system , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index 7d104b96624..e6d41d7b29a 100644 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -147,9 +147,9 @@ if test "$noSysDirs" = "1"; then fi fi -if test -n "${targetConfig-}"; then - # The host strip will destroy some important details of the objects - dontStrip=1 +if [ -n "${targetConfig-}" ]; then + # if stripping gcc, include target directory too + stripDebugList="${stripDebugList-lib lib32 lib64 libexec bin sbin} $targetConfig" fi eval "$oldOpts" From ed32406c747a98a141b9cfeaa9f850473fc0cc6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 16 Jan 2021 11:32:03 +0100 Subject: [PATCH 39/58] python3Packages.multidict: 5.0.2 -> 5.1.0 --- pkgs/development/python-modules/multidict/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index 43cbbbc6b77..555011a314d 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -1,25 +1,22 @@ { lib , fetchPypi , buildPythonPackage -, pytest, pytestrunner, pytestcov +, pytestCheckHook, pytestrunner, pytestcov , isPy3k -, isPy38 }: buildPythonPackage rec { pname = "multidict"; - version = "5.0.2"; + version = "5.1.0"; src = fetchPypi { inherit pname version; - sha256 = "e5bf89fe57f702a046c7ec718fe330ed50efd4bcf74722940db2eb0919cddb1c"; + sha256 = "25b4e5f22d3a37ddf3effc0710ba692cfc792c2b9edfb9c05aefe823256e84d5"; }; - checkInputs = [ pytest pytestrunner pytestcov ]; + checkInputs = [ pytestCheckHook pytestrunner pytestcov ]; disabled = !isPy3k; - # pickle files needed for 3.8 https://github.com/aio-libs/multidict/pull/363 - doCheck = !isPy38; meta = with lib; { description = "Multidict implementation"; From 59eefd2ebef4dc103254db6eeffe3639de6fea6c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 22 Jan 2021 14:36:27 +0000 Subject: [PATCH 40/58] libjack2: 1.9.16 -> 1.9.17 --- pkgs/misc/jackaudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index f10b5a6718d..24d2b5e135c 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation rec { name = "${prefix}jack2-${version}"; - version = "1.9.16"; + version = "1.9.17"; src = fetchFromGitHub { owner = "jackaudio"; repo = "jack2"; rev = "v${version}"; - sha256 = "0pzgrjy5fi2nif2j442fs3j2bbshxpnmq9kzwcqz54wx1w8fzdfr"; + sha256 = "sha256-T6UJpLsXrsIL3HaChfVP52w0v9DCs/sJqty2/kAWNfE="; }; nativeBuildInputs = [ pkg-config python makeWrapper wafHook ]; From 906ddaf3598de8b59842cd27efb5dae1e8b7bbac Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 21 Jan 2021 23:31:51 +0000 Subject: [PATCH 41/58] fftw: 3.3.8 -> 3.3.9 --- pkgs/development/libraries/fftw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index f0632e1460a..9385903b3f5 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -6,7 +6,7 @@ assert stdenv.cc.isClang -> llvmPackages != null; assert elem precision [ "single" "double" "long-double" "quad-precision" ]; let - version = "3.3.8"; + version = "3.3.9"; withDoc = stdenv.cc.isGNU; in @@ -18,7 +18,7 @@ stdenv.mkDerivation { "http://fftw.org/fftw-${version}.tar.gz" "ftp://ftp.fftw.org/pub/fftw/fftw-${version}.tar.gz" ]; - sha256 = "00z3k8fq561wq2khssqg0kallk0504dzlx989x3vvicjdqpjc4v1"; + sha256 = "sha256-vyx85AsEroEa9xTetRJRDMLBe5q51t3PSf5Eh+6nrz0="; }; outputs = [ "out" "dev" "man" ] From e73020d217c5fde7ea2434bd9061b3f16fd4a5d6 Mon Sep 17 00:00:00 2001 From: peter woodman Date: Fri, 22 Jan 2021 15:30:50 -0500 Subject: [PATCH 42/58] alsaLib: fix build under musl-libc (#110413) * alsaLib: fix build under musl-libc there's a commit in upstream master that fixes the build issue here. this patch is also applied in alpine linux. * alsaLib: explainer for DL_ORIGIN patch --- pkgs/os-specific/linux/alsa-lib/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix index cea26646672..2511c88f3f1 100644 --- a/pkgs/os-specific/linux/alsa-lib/default.nix +++ b/pkgs/os-specific/linux/alsa-lib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsa-ucm-conf, alsa-topology-conf }: +{ lib, stdenv, fetchurl, fetchpatch, alsa-ucm-conf, alsa-topology-conf }: stdenv.mkDerivation rec { pname = "alsa-lib"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { patches = [ ./alsa-plugin-conf-multilib.patch + (fetchpatch { + # plucked from upstream master, delete in next release + # without this patch alsa 1.2.4 fails to compile against musl-libc + # due to an overly conservative ifdef gate in a new feature + name = "fix-dlo.patch"; + url = "https://github.com/alsa-project/alsa-lib/commit/ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e.patch"; + sha256 = "QQP4C1dSnJP1MNKt2el7Wn3KmtwtYzvyIHWdrHs+Jw4="; + }) ]; enableParallelBuilding = true; From b833f741e189a495bd27668f17a35b48781069cc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 20 Jan 2021 14:30:23 +0000 Subject: [PATCH 43/58] openldap: 2.4.56 -> 2.4.57 --- pkgs/development/libraries/openldap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 4d4ec1763f0..a71b2a61910 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "openldap"; - version = "2.4.56"; + version = "2.4.57"; src = fetchurl { url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/${pname}-${version}.tgz"; - sha256 = "1q0m26kbab96r73y0dll0c36411kvfillal0i75kngy9cc1hwli5"; + sha256 = "sha256-x7pH4ebstbQ289Qygd9Xq+/6mSYhQa7IImKLwiD2tFo="; }; # TODO: separate "out" and "bin" From 552628ec52ee6a8f9aab0abcb500337a1c22a0de Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 20 Jan 2021 13:43:28 +0000 Subject: [PATCH 44/58] p11-kit: 0.23.21 -> 0.23.22 --- pkgs/development/libraries/p11-kit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index 0e09d563ea1..5e99c644ebe 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "p11-kit"; - version = "0.23.21"; + version = "0.23.22"; src = fetchFromGitHub { owner = "p11-glue"; repo = pname; rev = version; - sha256 = "1w24brn8j3vwfp07p2hldw2ci06pk1cx1dvjk8jjxkccp20fk958"; + sha256 = "sha256-erWqElJr0iESNUk9EZiJRmSMYhns8GxuFLNw7mIIIWs="; }; outputs = [ "out" "dev"]; From f2339096e771f90c46bc7112664e0bda6ab80c6d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 20 Jan 2021 09:32:15 +0000 Subject: [PATCH 45/58] lzip: 1.21 -> 1.22 --- pkgs/tools/compression/lzip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix index 9826347cfbb..aa6b6d31a89 100644 --- a/pkgs/tools/compression/lzip/default.nix +++ b/pkgs/tools/compression/lzip/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "lzip"; - version = "1.21"; + version = "1.22"; nativeBuildInputs = [ texinfo ]; src = fetchurl { url = "mirror://savannah/lzip/${pname}-${version}.tar.gz"; - sha256 = "12qdcw5k1cx77brv9yxi1h4dzwibhfmdpigrj43nfk8nscwm12z4"; + sha256 = "sha256-wzQtQuZxOcFluLEo0DO1yWiToTrF8lkzGQMVIU6HqUg="; }; configureFlags = [ From 1bb324009930c3343b1098d2050b6bda85d51c1a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 20 Jan 2021 04:55:18 +0000 Subject: [PATCH 46/58] modemmanager: 1.14.8 -> 1.14.10 --- pkgs/tools/networking/modem-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/modem-manager/default.nix b/pkgs/tools/networking/modem-manager/default.nix index ec74d1a47a0..06102ac2d90 100644 --- a/pkgs/tools/networking/modem-manager/default.nix +++ b/pkgs/tools/networking/modem-manager/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "modem-manager"; - version = "1.14.8"; + version = "1.14.10"; package = "ModemManager"; src = fetchurl { url = "https://www.freedesktop.org/software/${package}/${package}-${version}.tar.xz"; - sha256 = "15cjy7zzsxagx649vz0990avin47vpgdmm4ss2msggdla6x2c6py"; + sha256 = "sha256-TqYLN1p2HhfnuwlbyolFee0OjjOyc9xpi1y+A5R/NX8="; }; nativeBuildInputs = [ vala gobject-introspection gettext pkg-config ]; From eff939dcca9b127654eb0b5824007bc52515a6f1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 20 Jan 2021 03:25:24 +0000 Subject: [PATCH 47/58] libqmi: 1.26.6 -> 1.26.8 --- pkgs/development/libraries/libqmi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index e616fae9250..7bd3fa97029 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libqmi"; - version = "1.26.6"; + version = "1.26.8"; src = fetchurl { url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; - sha256 = "1fbwz6534q6n4bgabdx4svbgkf4mdyisjh3y51jjd94p22xn66d7"; + sha256 = "sha256-73bclasKBjIaG9Jeh1SJy6Esn2YRl0ygE1zwZ7sgyWA="; }; outputs = [ "out" "dev" "devdoc" ]; From ca0599728f77511df3e738c84525e442415062f7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 19 Jan 2021 18:12:21 +0000 Subject: [PATCH 48/58] libarchive: 3.5.0 -> 3.5.1 --- pkgs/development/libraries/libarchive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index a8fb7e38265..f53d1b1a12f 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -12,13 +12,13 @@ assert xarSupport -> libxml2 != null; stdenv.mkDerivation rec { pname = "libarchive"; - version = "3.5.0"; + version = "3.5.1"; src = fetchFromGitHub { owner = "libarchive"; repo = "libarchive"; rev = "v${version}"; - sha256 = "0dj01ayyac3q5a62rqxyskr4fjiq6iappd85zn3rx64xny5fl07d"; + sha256 = "sha256-RFPhe4PCq8OLwa6c7ir+5u9jBsUxS5M/fcZYAG9W6R0="; }; outputs = [ "out" "lib" "dev" ]; From 74c652e023e755def47eaf5395f1142b3c973417 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 19 Jan 2021 08:47:17 +0000 Subject: [PATCH 49/58] cmake: 3.19.2 -> 3.19.3 --- pkgs/development/tools/build-managers/cmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 67adc2438c7..5e5875cc36c 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -20,12 +20,12 @@ stdenv.mkDerivation rec { + lib.optionalString useNcurses "-cursesUI" + lib.optionalString withQt5 "-qt5UI" + lib.optionalString useQt4 "-qt4UI"; - version = "3.19.2"; + version = "3.19.3"; src = fetchurl { url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt - sha256 = "1w67w0ak6vf37501dlz9yhnzlvvpw1w10n2nm3hi7yxp4cxzvq73"; + sha256 = "sha256-P6ynwTFJSh401m6fiXL/U2nkjUGeqM6qPcFbTBE2dzI="; }; patches = [ From d34e3142b246744b33e6469a60f265a469d350f1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 21 Jan 2021 00:02:48 +0000 Subject: [PATCH 50/58] libpulseaudio: 14.0 -> 14.2 --- pkgs/servers/pulseaudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 32aa421ebf0..bebe4801c65 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { name = "${if libOnly then "lib" else ""}pulseaudio-${version}"; - version = "14.0"; + version = "14.2"; src = fetchurl { url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${version}.tar.xz"; - sha256 = "0qf20rgg0ysrnvg3359j56ndls07qmfn5rsy9r85bc42jdfpfd58"; + sha256 = "sha256-ddP3dCwa5EkEmkyIkA5FS4s1DsqoxUTzSIolYqn/ZvE="; }; outputs = [ "out" "dev" ]; From a1a23a0710c7818c5756d80030d2697b79e0fc28 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 20 Jan 2021 18:04:28 +0000 Subject: [PATCH 51/58] openresolv: 3.11.0 -> 3.12.0 --- pkgs/tools/networking/openresolv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix index 068b3e4ae89..bc7db4fc6f3 100644 --- a/pkgs/tools/networking/openresolv/default.nix +++ b/pkgs/tools/networking/openresolv/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "openresolv"; - version = "3.11.0"; + version = "3.12.0"; src = fetchurl { url = "mirror://roy/openresolv/${pname}-${version}.tar.xz"; - sha256 = "0g7wb2880hbr0x99n73m7fgjm7lcdbpxfy2i620zxcq73qfrvspa"; + sha256 = "sha256-QrMFCOhXoihTXGMeqsk2hi2G7KaMFLXAvzh7oXa5G5c="; }; buildInputs = [ makeWrapper ]; From 80c367cf1beee543c7d5f4b5199ed0cb006f0c4e Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 13 Jan 2021 23:08:41 +0000 Subject: [PATCH 52/58] ed: 1.16 -> 1.17 See https://lists.gnu.org/archive/html/info-gnu/2021-01/msg00010.html for release information --- pkgs/applications/editors/ed/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix index 3ceb037583a..a6ab483a7b0 100644 --- a/pkgs/applications/editors/ed/default.nix +++ b/pkgs/applications/editors/ed/default.nix @@ -7,12 +7,12 @@ # files. stdenv.mkDerivation (rec { - name = "ed-${version}"; - version = "1.16"; + pname = "ed"; + version = "1.17"; src = fetchurl { - url = "mirror://gnu/ed/${name}.tar.lz"; - sha256 = "0b4b1lwizvng9bvpcjnmpj2i80xz9xw2w8nfff27b2h4mca7mh6g"; + url = "mirror://gnu/ed/${pname}-${version}.tar.lz"; + sha256 = "0m2yrkfjjraakxr98nsiakqrn351h99n706x9asgmdi57j43kpki"; }; nativeBuildInputs = [ lzip ]; From 733b53313cabc0dc4e3b9de0819fee4286578ff6 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 21 Jan 2021 15:55:37 +0000 Subject: [PATCH 53/58] glibc: 2.32-25 -> 2.32-35 --- .../{2.32-25.patch.gz => 2.32-35.patch.gz} | Bin 42959 -> 51693 bytes pkgs/development/libraries/glibc/common.nix | 10 +++++----- 2 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/development/libraries/glibc/{2.32-25.patch.gz => 2.32-35.patch.gz} (82%) diff --git a/pkgs/development/libraries/glibc/2.32-25.patch.gz b/pkgs/development/libraries/glibc/2.32-35.patch.gz similarity index 82% rename from pkgs/development/libraries/glibc/2.32-25.patch.gz rename to pkgs/development/libraries/glibc/2.32-35.patch.gz index d26ba012df60003da98ddaf59bf08a18000134a4..f77e490ebf54be2a568479fd38d4059d72818c77 100644 GIT binary patch delta 8897 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 2.32-25.patch.gz + $ git checkout origin/release/2.32/master; git describe + glibc-2.32-35-g082798622d + $ git show --reverse glibc-2.32.. | gzip -n -9 --rsyncable - > 2.32-35.patch.gz */ - ./2.32-25.patch.gz + ./2.32-35.patch.gz /* Allow NixOS and Nix to handle the locale-archive. */ ./nix-locale-archive.patch From 67000665ddf42fb2e08155a81a4fbf09f4c193dd Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 11 Jan 2021 22:54:05 +0000 Subject: [PATCH 54/58] findutils: 4.7.0 -> 4.8.0 See https://lists.gnu.org/archive/html/info-gnu/2021-01/msg00008.html for release announcement. --- pkgs/tools/misc/findutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 18881ef181d..9b55a4a86b8 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "findutils"; - version = "4.7.0"; + version = "4.8.0"; src = fetchurl { url = "mirror://gnu/findutils/${pname}-${version}.tar.xz"; - sha256 = "16kqz9yz98dasmj70jwf5py7jk558w96w0vgp3zf9xsqk3gzpzn5"; + sha256 = "0r3i72hnw0a30khlczi9k2c51aamaj6kfmp5mk3844nrjxz7n4jp"; }; postPatch = '' From 049359d262cfbb7003b7997e0ff8250a2705e052 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 21 Jan 2021 09:47:53 +1000 Subject: [PATCH 55/58] sqlite: 3.34.0 -> 3.34.1 https://www.sqlite.org/releaselog/3_34_1.html --- pkgs/development/libraries/sqlite/default.nix | 6 +++--- pkgs/development/libraries/sqlite/tools.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index fe10e0fc7ae..d2a1ed905ea 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -10,12 +10,12 @@ in stdenv.mkDerivation rec { pname = "sqlite"; - version = "3.34.0"; + version = "3.34.1"; # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { - url = "https://sqlite.org/2020/sqlite-autoconf-${archiveVersion version}.tar.gz"; - sha256 = "1vlsvlp5nvhd5pdjpmdczfsv7mml2gsalykl6x3palbxwgxbfvdz"; + url = "https://sqlite.org/2021/sqlite-autoconf-${archiveVersion version}.tar.gz"; + sha256 = "129ynp0qbxrfj1ys9hdi0jk8svds0cwfzl31af7bicqp25cclfra"; }; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index 3ec528719e9..b423e557a56 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -4,11 +4,11 @@ let archiveVersion = import ./archive-version.nix lib; mkTool = { pname, makeTarget, description, homepage }: stdenv.mkDerivation rec { inherit pname; - version = "3.34.0"; + version = "3.34.1"; src = assert version == sqlite.version; fetchurl { - url = "https://sqlite.org/2020/sqlite-src-${archiveVersion version}.zip"; - sha256 = "0giklai05shqalj1wwadi9hg5dx6vff8nrblqh9xxljnrq701hm5"; + url = "https://sqlite.org/2021/sqlite-src-${archiveVersion version}.zip"; + sha256 = "0giklai05shqalj1wwadi9hg5dx6vff8nrblqh9xxljnrq701h00"; }; nativeBuildInputs = [ unzip ]; From a761d5ed1b2d9677faf5d5f4e36b5c6a227f8a8b Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 23 Jan 2021 16:49:22 -0800 Subject: [PATCH 56/58] cmake: fix build on darwin Fixes missing CoreFoundation declarations since bump to 3.19.3, e.g. `error: unknown type name 'CFUUIDRef'` ApplicationServices.h transitively includes CoreFoundation.h, but as we patch ApplicationServices out of CMake, the CF symbols were not visible. Previously this was not a concern, as they were not needed until https://github.com/Kitware/CMake/commit/d250b67722abcfe1bcd22511943f3e032ef1ef3d --- .../build-managers/cmake/application-services.patch | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/application-services.patch b/pkgs/development/tools/build-managers/cmake/application-services.patch index 75873d6055c..f64e220eb29 100644 --- a/pkgs/development/tools/build-managers/cmake/application-services.patch +++ b/pkgs/development/tools/build-managers/cmake/application-services.patch @@ -14,15 +14,16 @@ diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.c index a5ce5d18f4..3d6838ce82 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx -@@ -43,11 +43,6 @@ +@@ -43,11 +43,10 @@ struct cmLinkImplementation; --#if !defined(CMAKE_BOOTSTRAP) && defined(__APPLE__) + #if !defined(CMAKE_BOOTSTRAP) && defined(__APPLE__) -# define HAVE_APPLICATION_SERVICES -# include --#endif -- ++# include + #endif + #if !defined(CMAKE_BOOTSTRAP) # include "cmXMLParser.h" From 4acf7fd6bc131f0d36ab2353db0a8c9fccc00855 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 24 Jan 2021 08:45:38 +0100 Subject: [PATCH 57/58] Revert "findutils: 4.7.0 -> 4.8.0" Broke darwin stdenv https://github.com/NixOS/nixpkgs/pull/110647#issuecomment-766300643 This reverts commit 67000665ddf42fb2e08155a81a4fbf09f4c193dd. --- pkgs/tools/misc/findutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 9b55a4a86b8..18881ef181d 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "findutils"; - version = "4.8.0"; + version = "4.7.0"; src = fetchurl { url = "mirror://gnu/findutils/${pname}-${version}.tar.xz"; - sha256 = "0r3i72hnw0a30khlczi9k2c51aamaj6kfmp5mk3844nrjxz7n4jp"; + sha256 = "16kqz9yz98dasmj70jwf5py7jk558w96w0vgp3zf9xsqk3gzpzn5"; }; postPatch = '' From 351b28d469b5c29b06b7f6cac4f6bd36513f2606 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sun, 24 Jan 2021 15:44:43 -0800 Subject: [PATCH 58/58] libtiff: fix build on darwin Now that libtiff is using cmake, we need to let cmake set the build rpath for the tests to pass on darwin. The rpaths are rewritten at installation so the output libraries should be unaffected. --- pkgs/development/libraries/libtiff/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 15ed6b6ed18..2fad2988898 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation rec { sha256 = "0d46bdvxdiv59lxnb0xz9ywm8arsr6xsapi5s6y6vnys2wjz6aax"; }; + cmakeFlags = if stdenv.isDarwin then [ + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + ] else null; + # FreeImage needs this patch patches = [ ./headers.patch ];