commit 21b2858eed88a398d404cb9d20327e8aef3ad3a1 · pyrox.dev/nixpkgs

+2 -5

pkgs/development/libraries/openjpeg/1.x.nix

···

       1
       1
       -
       { callPackage, fetchurl, ... } @ args:

     

       1
       1
       +
       { callPackage, ... } @ args:

     

       2
       2
        
       

     

       3
       3
        
       callPackage ./generic.nix (args // rec {

     

       4
       4
        
         version = "${branch}.2";

     

       5
       5
        
         branch = "1.5";

     

       6
       6
       -
         src = fetchurl {

     

       7
       7
       -
           url = "mirror://gentoo/distfiles/openjpeg-${version}.tar.gz";

     

       8
       8
       -
           sha256 = "11waq9w215zvzxrpv40afyd18qf79mxc28fda80bm3ax98cpppqm";

     

       9
       9
       -
         };

     

       6
       6
       +
         sha256 = "11waq9w215zvzxrpv40afyd18qf79mxc28fda80bm3ax98cpppqm";

     

       10
       7
        
       })

-10

pkgs/development/libraries/openjpeg/2.0.1.nix

···

       1
       1
       -
       { callPackage, fetchurl, ... } @ args:

     

       2
       2
       -
       

     

       3
       3
       -
       callPackage ./generic.nix (args // rec {

     

       4
       4
       -
         version = "${branch}.0.1";

     

       5
       5
       -
         branch = "2";

     

       6
       6
       -
         src = fetchurl {

     

       7
       7
       -
           url = "mirror://sourceforge/openjpeg.mirror/openjpeg-${version}.tar.gz";

     

       8
       8
       -
           sha256 = "1c2xc3nl2mg511b63rk7hrckmy14681p1m44mzw3n1fyqnjm0b0z";

     

       9
       9
       -
         };

     

       10
       10
       -
       })

+7

pkgs/development/libraries/openjpeg/2.0.nix

···

       1
       1
       +
       { callPackage, ... } @ args:

     

       2
       2
       +
       

     

       3
       3
       +
       callPackage ./generic.nix (args // rec {

     

       4
       4
       +
         version = "${branch}.0.1";

     

       5
       5
       +
         branch = "2";

     

       6
       6
       +
         sha256 = "1c2xc3nl2mg511b63rk7hrckmy14681p1m44mzw3n1fyqnjm0b0z";

     

       7
       7
       +
       })

+2 -5

pkgs/development/libraries/openjpeg/2.1.nix

···

       1
       1
       -
       { callPackage, fetchurl, ... } @ args:

     

       1
       1
       +
       { callPackage, ... } @ args:

     

       2
       2
        
       

     

       3
       3
        
       callPackage ./generic.nix (args // rec {

     

       4
       4
        
         version = "${branch}.0";

     

       5
       5
        
         branch = "2.1";

     

       6
       6
       -
         src = fetchurl {

     

       7
       7
       -
           url = "mirror://gentoo/distfiles/openjpeg-${version}.tar.gz";

     

       8
       8
       -
           sha256 = "00zzm303zvv4ijzancrsb1cqbph3pgz0nky92k9qx3fq9y0vnchj";

     

       9
       9
       -
         };

     

       6
       6
       +
         sha256 = "00zzm303zvv4ijzancrsb1cqbph3pgz0nky92k9qx3fq9y0vnchj";

     

       10
       7
        
       })

+27 -42

pkgs/development/libraries/openjpeg/generic.nix

···

       1
       1
       -
       { stdenv, cmake, pkgconfig, libpng, libtiff, lcms2, glib/*passthru only*/

     

       2
       2
       -
       , sharedLibsSupport ? true # Build shared libraries

     

       3
       3
       -
       , codecSupport ? true # Codec executables

     

       1
       1
       +
       { stdenv, fetchurl, cmake, pkgconfig

     

       2
       2
       +
       , libpng, libtiff, lcms2

     

       4
       3
        
       , mj2Support ? true # MJ2 executables

     

       5
       4
        
       , jpwlLibSupport ? true # JPWL library & executables

     

       6
       6
       -
       , jpipLibSupport ? true # JPIP library & executables

     

       5
       5
       +
       , jpipLibSupport ? false # JPIP library & executables

     

       7
       6
        
       , jpipServerSupport ? false, curl ? null, fcgi ? null # JPIP Server

     

       8
       7
        
       #, opjViewerSupport ? false, wxGTK ? null # OPJViewer executable

     

       9
       9
       -
       , openjpegJarSupport ? false, jdk ? null # Openjpeg jar (Java)

     

       8
       8
       +
       , openjpegJarSupport ? false # Openjpeg jar (Java)

     

       10
       9
        
       , jp3dSupport ? true # # JP3D comp

     

       11
       10
        
       , thirdPartySupport ? false # Third party libraries - OFF: only build when found, ON: always build

     

       12
       11
        
       , testsSupport ? false

     

       12
       12
       +
       , jdk ? null

     

       13
       13
        
       # Inherit generics

     

       14
       14
       -
       , branch, src, version, ...

     

       14
       14
       +
       , branch, sha256, version, ...

     

       15
       15
        
       }:

     

       16
       16
        
       

     

       17
       17
       -
       assert jpipServerSupport -> (jpipLibSupport && (curl != null) && (fcgi != null));

     

       17
       17
       +
       assert jpipServerSupport -> jpipLibSupport && curl != null && fcgi != null;

     

       18
       18
        
       #assert opjViewerSupport -> (wxGTK != null);

     

       19
       19
       -
       assert openjpegJarSupport -> (jdk != null);

     

       20
       20
       -
       assert testsSupport -> codecSupport;

     

       19
       19
       +
       assert (openjpegJarSupport || jpipLibSupport) -> jdk != null;

     

       21
       20
        
       

     

       22
       21
        
       let

     

       23
       23
       -
         mkFlag = optSet: flag: if optSet then "-D${flag}=ON" else "-D${flag}=OFF";

     

       22
       22
       +
         inherit (stdenv.lib) optional optionals;

     

       23
       23
       +
         mkFlag = optSet: flag: "-D${flag}=${if optSet then "ON" else "OFF"}";

     

       24
       24
        
       in

     

       25
       25
        
       

     

       26
       26
       -
       with stdenv.lib;

     

       27
       26
        
       stdenv.mkDerivation rec {

     

       28
       27
        
         name = "openjpeg-${version}";

     

       29
       29
       -
         inherit branch;

     

       30
       30
       -
         inherit version;

     

       31
       31
       -
         inherit src;

     

       28
       28
       +
         

     

       29
       29
       +
         src = fetchurl {

     

       30
       30
       +
           url = "mirror://sourceforge/openjpeg.mirror/${version}/openjpeg-${version}.tar.gz";

     

       31
       31
       +
           inherit sha256;

     

       32
       32
       +
         };

     

       32
       33
        
       

     

       33
       34
        
         cmakeFlags = [

     

       34
       34
       -
           (mkFlag sharedLibsSupport "BUILD_SHARED_LIBS")

     

       35
       35
       -
           (mkFlag codecSupport "BUILD_CODEC")

     

       35
       35
       +
           "-DCMAKE_INSTALL_NAME_DIR=\${CMAKE_INSTALL_PREFIX}/lib"

     

       36
       36
       +
           "-DBUILD_SHARED_LIBS=ON"

     

       37
       37
       +
           "-DBUILD_CODEC=ON"

     

       36
       38
        
           (mkFlag mj2Support "BUILD_MJ2")

     

       37
       39
        
           (mkFlag jpwlLibSupport "BUILD_JPWL")

     

       38
       40
        
           (mkFlag jpipLibSupport "BUILD_JPIP")

     

       39
       41
        
           (mkFlag jpipServerSupport "BUILD_JPIP_SERVER")

     

       40
       42
        
           #(mkFlag opjViewerSupport "BUILD_VIEWER")

     

       43
       43
       +
           "-DBUILD_VIEWER=OFF"

     

       41
       44
        
           (mkFlag openjpegJarSupport "BUILD_JAVA")

     

       42
       45
        
           (mkFlag jp3dSupport "BUILD_JP3D")

     

       43
       46
        
           (mkFlag thirdPartySupport "BUILD_THIRDPARTY")

     

       44
       47
        
           (mkFlag testsSupport "BUILD_TESTING")

     

       45
       45
       -
         ] ++ stdenv.lib.optionals stdenv.isDarwin

     

       46
       46
       -
         [ "-DCMAKE_INSTALL_NAME_DIR=\${CMAKE_INSTALL_PREFIX}/lib"

     

       47
       48
        
         ];

     

       48
       49
        
       

     

       49
       49
       -
         nativebuildInputs = [ pkgconfig ];

     

       50
       50
       +
         nativeBuildInputs = [ cmake pkgconfig ];

     

       50
       51
        
       

     

       51
       51
       -
         buildInputs = [ cmake ]

     

       52
       52
       +
         buildInputs = [ ]

     

       52
       53
        
           ++ optionals jpipServerSupport [ curl fcgi ]

     

       53
       54
        
           #++ optional opjViewerSupport wxGTK

     

       54
       54
       -
           ++ optional openjpegJarSupport jdk;

     

       55
       55
       +
           ++ optional (openjpegJarSupport || jpipLibSupport) jdk;

     

       55
       56
        
       

     

       56
       57
        
         propagatedBuildInputs = [ libpng libtiff lcms2 ];

     

       57
       58
        
       

     

       58
       58
       -
         postInstall = glib.flattenInclude + ''

     

       59
       59
       -
           mkdir -p "$out/lib/pkgconfig"

     

       60
       60
       -
           cat > "$out/lib/pkgconfig/libopenjp2.pc" <<EOF

     

       61
       61
       -
           prefix=$out

     

       62
       62
       -
           libdir=$out/lib

     

       63
       63
       -
           includedir=$out/include

     

       64
       64
       -
       

     

       65
       65
       -
           Name: openjp2

     

       66
       66
       -
           Description: JPEG2000 library (Part 1 and 2)

     

       67
       67
       -
           URL: http://www.openjpeg.org/

     

       68
       68
       -
           Version: ${version}

     

       69
       69
       -
           Libs: -L$out/lib -lopenjp2

     

       70
       70
       -
           Cflags: -I$out/include

     

       71
       71
       -
           EOF

     

       72
       72
       -
         '';

     

       73
       73
       -
       

     

       74
       59
        
         passthru = {

     

       75
       60
        
           incDir = "openjpeg-${branch}";

     

       76
       61
        
         };

     

       77
       62
        
       

     

       78
       78
       -
         meta = {

     

       63
       63
       +
         meta = with stdenv.lib; {

     

       79
       64
        
           description = "Open-source JPEG 2000 codec written in C language";

     

       80
       80
       -
           homepage    = http://www.openjpeg.org/;

     

       81
       81
       -
           license     = licenses.bsd2;

     

       82
       82
       -
           maintainer  = with maintainers; [ codyopel ];

     

       83
       83
       -
           platforms   = platforms.all;

     

       65
       65
       +
           homepage = http://www.openjpeg.org/;

     

       66
       66
       +
           license = licenses.bsd2;

     

       67
       67
       +
           maintainer = with maintainers; [ codyopel ];

     

       68
       68
       +
           platforms = platforms.all;

     

       84
       69
        
         };

     

       85
       70
        
       }

+2 -2

pkgs/top-level/all-packages.nix

···

       7508
       7508
        
         opal = callPackage ../development/libraries/opal {};

     

       7509
       7509
        
       

     

       7510
       7510
        
         openjpeg_1 = callPackage ../development/libraries/openjpeg/1.x.nix { };

     

       7511
       7511
       -
         openjpeg_2_0_1 = callPackage ../development/libraries/openjpeg/2.0.1.nix { };

     

       7511
       7511
       +
         openjpeg_2_0 = callPackage ../development/libraries/openjpeg/2.0.nix { };

     

       7512
       7512
        
         openjpeg_2_1 = callPackage ../development/libraries/openjpeg/2.1.nix { };

     

       7513
       7513
        
         openjpeg = openjpeg_2_1;

     

       7514
       7514
        
       

     
···

       11884
       11884
        
         maxlib = callPackage ../applications/audio/pd-plugins/maxlib { };

     

       11885
       11885
        
       

     

       11886
       11886
        
         mupdf = callPackage ../applications/misc/mupdf {

     

       11887
       11887
       -
           openjpeg = openjpeg_2_0_1;

     

       11887
       11887
       +
           openjpeg = openjpeg_2_0;

     

       11888
       11888
        
         };

     

       11889
       11889
        
       

     

       11890
       11890
        
         mypaint = callPackage ../applications/graphics/mypaint { };