commit ed709ec3a31b74e21944f5f05a86b931462f3180 · pyrox.dev/nixpkgs

+42 -10

pkgs/by-name/li/libavif/package.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
       +
         fetchpatch,

     

       5
       6
        
         libaom,

     

       6
       7
        
         cmake,

     

       7
       8
        
         pkg-config,

     
···

       9
       10
        
         libpng,

     

       10
       11
        
         libjpeg,

     

       11
       12
        
         libwebp,

     

       13
       13
       +
         libxml2,

     

       12
       14
        
         dav1d,

     

       13
       15
        
         libyuv,

     

       14
       16
        
         gdk-pixbuf,

     

       15
       17
        
         makeWrapper,

     

       18
       18
       +
         gtest,

     

       16
       19
        
       }:

     

       17
       20
        
       

     

       18
       21
        
       let

     

       19
       22
        
         gdkPixbufModuleDir = "${placeholder "out"}/${gdk-pixbuf.moduleDir}";

     

       20
       23
        
         gdkPixbufModuleFile = "${placeholder "out"}/${gdk-pixbuf.binaryDir}/avif-loaders.cache";

     

       24
       24
       +
       

     

       25
       25
       +
         libargparse = fetchFromGitHub {

     

       26
       26
       +
           owner = "kmurray";

     

       27
       27
       +
           repo = "libargparse";

     

       28
       28
       +
           rev = "ee74d1b53bd680748af14e737378de57e2a0a954";

     

       29
       29
       +
           hash = "sha256-8RzKNjnX+Bpr6keck5xQL1NdfqMGNLLOUfB+zz5Iac8=";

     

       30
       30
       +
         };

     

       21
       31
        
       in

     

       22
       32
        
       

     

       23
       33
        
       stdenv.mkDerivation rec {

     

       24
       34
        
         pname = "libavif";

     

       25
       25
       -
         version = "1.1.1";

     

       35
       35
       +
         version = "1.2.1";

     

       26
       36
        
       

     

       27
       37
        
         src = fetchFromGitHub {

     

       28
       38
        
           owner = "AOMediaCodec";

     

       29
       39
        
           repo = "libavif";

     

       30
       40
        
           rev = "v${version}";

     

       31
       31
       -
           hash = "sha256-kop1S4A/+hP2YdgoMXP7OMVPc2eoRnHpoBrPnW6KWyM=";

     

       41
       41
       +
           hash = "sha256-cT8Q/VEJ+r971cbuZX92Gf6UX2kMOyZd4Cs2xMxS0Tw=";

     

       32
       42
        
         };

     

       33
       43
        
       

     

       44
       44
       +
         # Adjust some tests to pass on aarch64

     

       45
       45
       +
         # FIXME: remove in next update

     

       46
       46
       +
         patches = [

     

       47
       47
       +
           (fetchpatch {

     

       48
       48
       +
             url = "https://github.com/AOMediaCodec/libavif/commit/1e9ef51f32fa23bd7a94d8c01d5205334bc9c52f.patch";

     

       49
       49
       +
             hash = "sha256-4V7NpuJ+YNm103RMO47TIZaApTm3S6c5RKsjLZFNwYw=";

     

       50
       50
       +
           })

     

       51
       51
       +
       

     

       52
       52
       +
           (fetchpatch {

     

       53
       53
       +
             url = "https://github.com/AOMediaCodec/libavif/commit/0f1618a25c5eba41b6fec947207d0a32ae3cc6c5.patch";

     

       54
       54
       +
             hash = "sha256-ORNhD4QtHmBcOYSajnZn7QMfRC3MF4rgUin/Vw+2ztA=";

     

       55
       55
       +
           })

     

       56
       56
       +
         ];

     

       57
       57
       +
       

     

       58
       58
       +
         postPatch = ''

     

       59
       59
       +
           substituteInPlace contrib/gdk-pixbuf/avif.thumbnailer.in \

     

       60
       60
       +
             --replace-fail '@CMAKE_INSTALL_FULL_BINDIR@/gdk-pixbuf-thumbnailer' "$out/libexec/gdk-pixbuf-thumbnailer-avif"

     

       61
       61
       +
       

     

       62
       62
       +
           ln -s ${libargparse} ext/libargparse

     

       63
       63
       +
         '';

     

       64
       64
       +
       

     

       34
       65
        
         # reco: encode libaom slowest but best, decode dav1d fastest

     

       35
       66
        
       

     

       36
       67
        
         cmakeFlags = [

     

       37
       68
        
           "-DBUILD_SHARED_LIBS=ON"

     

       38
       38
       -
           "-DAVIF_CODEC_AOM=ON" # best encoder (slow but small)

     

       39
       39
       -
           "-DAVIF_CODEC_DAV1D=ON" # best decoder (fast)

     

       40
       40
       -
           "-DAVIF_CODEC_AOM_DECODE=OFF"

     

       69
       69
       +
           "-DAVIF_CODEC_AOM=SYSTEM" # best encoder (slow but small)

     

       70
       70
       +
           "-DAVIF_CODEC_DAV1D=SYSTEM" # best decoder (fast)

     

       41
       71
        
           "-DAVIF_BUILD_APPS=ON"

     

       42
       72
        
           "-DAVIF_BUILD_GDK_PIXBUF=ON"

     

       43
       73
        
           "-DAVIF_LIBSHARPYUV=SYSTEM"

     

       74
       74
       +
           "-DAVIF_LIBXML2=SYSTEM"

     

       75
       75
       +
           "-DAVIF_BUILD_TESTS=ON"

     

       76
       76
       +
           "-DAVIF_GTEST=SYSTEM"

     

       44
       77
        
         ];

     

       45
       78
        
       

     

       46
       79
        
         nativeBuildInputs = [

     
···

       52
       85
        
       

     

       53
       86
        
         buildInputs = [

     

       54
       87
        
           gdk-pixbuf

     

       88
       88
       +
           gtest

     

       55
       89
        
           zlib

     

       56
       90
        
           libpng

     

       57
       91
        
           libjpeg

     

       58
       92
        
           libwebp

     

       93
       93
       +
           libxml2

     

       59
       94
        
         ];

     

       60
       95
        
       

     

       61
       96
        
         propagatedBuildInputs = [

     
···

       64
       99
        
           libyuv

     

       65
       100
        
         ];

     

       66
       101
        
       

     

       67
       67
       -
         postPatch = ''

     

       68
       68
       -
           substituteInPlace contrib/gdk-pixbuf/avif.thumbnailer.in \

     

       69
       69
       -
             --replace '@CMAKE_INSTALL_FULL_BINDIR@/gdk-pixbuf-thumbnailer' "$out/libexec/gdk-pixbuf-thumbnailer-avif"

     

       70
       70
       -
         '';

     

       102
       102
       +
         env.PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = gdkPixbufModuleDir;

     

       71
       103
        
       

     

       72
       72
       -
         env.PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = gdkPixbufModuleDir;

     

       104
       104
       +
         doCheck = true;

     

       73
       105
        
       

     

       74
       106
        
         postInstall =

     

       75
       107
        
           ''

-11

pkgs/by-name/li/libyuv/link-library-against-libjpeg.patch

···

       1
       1
       -
       diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       2
       2
       -
       index 636531ee..af1b0e4e 100644

     

       3
       3
       -
       --- a/CMakeLists.txt

     

       4
       4
       -
       +++ b/CMakeLists.txt

     

       5
       5
       -
       @@ -39,6 +39,7 @@ INCLUDE ( FindJPEG )

     

       6
       6
       -
        if (JPEG_FOUND)

     

       7
       7
       -
          include_directories( ${JPEG_INCLUDE_DIR} )

     

       8
       8
       -
          target_link_libraries( yuvconvert ${JPEG_LIBRARY} )

     

       9
       9
       -
       +  target_link_libraries( ${ly_lib_shared} ${JPEG_LIBRARY} )

     

       10
       10
       -
          add_definitions( -DHAVE_JPEG )

     

       11
       11
       -
        endif()

+19 -10

pkgs/by-name/li/libyuv/package.nix

···

       4
       4
        
         fetchgit,

     

       5
       5
        
         cmake,

     

       6
       6
        
         libjpeg,

     

       7
       7
       +
         gtest,

     

       7
       8
        
       }:

     

       8
       9
        
       

     

       9
       10
        
       stdenv.mkDerivation {

     

       10
       11
        
         pname = "libyuv";

     

       11
       11
       -
         version = "1787"; # Defined in: include/libyuv/version.h

     

       12
       12
       +
         version = "1908"; # Defined in: include/libyuv/version.h

     

       12
       13
        
       

     

       13
       14
        
         src = fetchgit {

     

       14
       15
        
           url = "https://chromium.googlesource.com/libyuv/libyuv.git";

     

       15
       15
       -
           rev = "eb6e7bb63738e29efd82ea3cf2a115238a89fa51"; # refs/heads/stable

     

       16
       16
       -
           hash = "sha256-DtRYoaAXb9ZD2OLiKbzKzH5vzuu+Lzu4eHaDgPB9hjU=";

     

       16
       16
       +
           rev = "b7a857659f8485ee3c6769c27a3e74b0af910746"; # upstream does not do tagged releases

     

       17
       17
       +
           hash = "sha256-4Irs+hlAvr6v5UKXmKHhg4IK3cTWdsFWxt1QTS0rizU=";

     

       17
       18
        
         };

     

       18
       19
        
       

     

       19
       20
        
         nativeBuildInputs = [

     

       20
       21
        
           cmake

     

       21
       22
        
         ];

     

       22
       23
        
       

     

       23
       23
       -
         # NEON does not work on aarch64, we disable it

     

       24
       24
       -
         cmakeFlags = lib.optionals stdenv.hostPlatform.isAarch64 [

     

       25
       25
       -
           "-DCMAKE_CXX_FLAGS=-DLIBYUV_DISABLE_NEON"

     

       24
       24
       +
         cmakeFlags = [

     

       25
       25
       +
           "-DUNIT_TEST=ON"

     

       26
       26
        
         ];

     

       27
       27
        
       

     

       28
       28
       -
         buildInputs = [ libjpeg ];

     

       29
       29
       -
       

     

       30
       30
       -
         patches = [

     

       31
       31
       -
           ./link-library-against-libjpeg.patch

     

       28
       28
       +
         buildInputs = [

     

       29
       29
       +
           libjpeg

     

       30
       30
       +
           gtest

     

       32
       31
        
         ];

     

       33
       32
        
       

     

       34
       33
        
         postPatch = ''

     
···

       38
       37
        
           substituteInPlace $out/lib/pkgconfig/libyuv.pc \

     

       39
       38
        
             --replace "@PREFIX@" "$out" \

     

       40
       39
        
             --replace "@VERSION@" "$version"

     

       40
       40
       +
         '';

     

       41
       41
       +
       

     

       42
       42
       +
         doCheck = true;

     

       43
       43
       +
       

     

       44
       44
       +
         checkPhase = ''

     

       45
       45
       +
           runHook preCheck

     

       46
       46
       +
       

     

       47
       47
       +
           ./libyuv_unittest

     

       48
       48
       +
       

     

       49
       49
       +
           runHook postCheck

     

       41
       50
        
         '';

     

       42
       51
        
       

     

       43
       52
        
         meta = with lib; {

+2 -4

pkgs/development/python-modules/pillow/default.nix

···

       109
       109
        
         ] ++ lib.flatten (lib.attrValues optional-dependencies);

     

       110
       110
        
       

     

       111
       111
        
         pytestFlagsArray = [

     

       112
       112
       -
           # AssertionError:  average pixel value difference 12.0968 > epsilon 11.5000

     

       113
       113
       -
           "--deselect=Tests/test_file_avif.py::TestFileAvif::test_read"

     

       114
       114
       -
           # AssertionError:  average pixel value difference 8.0108 > epsilon 6.0200

     

       115
       115
       -
           "--deselect=Tests/test_file_avif.py::TestFileAvif::test_write_rgb"

     

       112
       112
       +
           # Checks for very precise color values on what's basically white

     

       113
       113
       +
           "--deselect=Tests/test_file_avif.py::TestFileAvif::test_background_from_gif"

     

       116
       114
        
         ];

     

       117
       115
        
       

     

       118
       116
        
         disabledTests =