public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resurrect openjpeg 2.0.x and use it for mupdf

Browse Source 
mupdf doesn't compile with 2.1 due to API changes

cc @codyopel who made the openjpeg update
This commit is contained in:
Mateusz Kowalczyk 2015-02-25 01:50:06 +00:00
parent ae8eb54c8b
commit cc4a5073e2
6 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/openjpeg/1.x.nix
View File

@ -1,7 +1,10 @@
{ callPackage, ... } @ args: { callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // rec { callPackage ./generic.nix (args // rec {
version = "${branch}.2"; version = "${branch}.2";
branch = "1.5"; branch = "1.5";
sha256 = "11waq9w215zvzxrpv40afyd18qf79mxc28fda80bm3ax98cpppqm"; src = fetchurl {
url = "mirror://gentoo/distfiles/openjpeg-${version}.tar.gz";
sha256 = "11waq9w215zvzxrpv40afyd18qf79mxc28fda80bm3ax98cpppqm";
};
}) })

10
pkgs/development/libraries/openjpeg/2.0.1.nix Normal file
View File

@ -0,0 +1,10 @@
{ callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "${branch}.0.1";
branch = "2";
src = fetchurl {
url = "mirror://sourceforge/openjpeg.mirror/openjpeg-${version}.tar.gz";
sha256 = "1c2xc3nl2mg511b63rk7hrckmy14681p1m44mzw3n1fyqnjm0b0z";
};
})

10
pkgs/development/libraries/openjpeg/2.1.nix Normal file
View File

@ -0,0 +1,10 @@
{ callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "${branch}.0";
branch = "2.1";
src = fetchurl {
url = "mirror://gentoo/distfiles/openjpeg-${version}.tar.gz";
sha256 = "00zzm303zvv4ijzancrsb1cqbph3pgz0nky92k9qx3fq9y0vnchj";
};
})

7
pkgs/development/libraries/openjpeg/2.x.nix
View File

@ -1,7 +0,0 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "${branch}.0";
branch = "2.1";
sha256 = "00zzm303zvv4ijzancrsb1cqbph3pgz0nky92k9qx3fq9y0vnchj";
})

10
pkgs/development/libraries/openjpeg/generic.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, pkgconfig, libpng, libtiff, lcms2, glib/*passthru only*/ { stdenv, cmake, pkgconfig, libpng, libtiff, lcms2, glib/*passthru only*/
, sharedLibsSupport ? true # Build shared libraries , sharedLibsSupport ? true # Build shared libraries
, codecSupport ? true # Codec executables , codecSupport ? true # Codec executables
, mj2Support ? true # MJ2 executables , mj2Support ? true # MJ2 executables
@ -11,7 +11,7 @@
, thirdPartySupport ? false # Third party libraries - OFF: only build when found, ON: always build , thirdPartySupport ? false # Third party libraries - OFF: only build when found, ON: always build
, testsSupport ? false , testsSupport ? false
# Inherit generics # Inherit generics
, branch, sha256, version, ... , branch, src, version, ...
}: }:
assert jpipServerSupport -> (jpipLibSupport && (curl != null) && (fcgi != null)); assert jpipServerSupport -> (jpipLibSupport && (curl != null) && (fcgi != null));
@ -28,11 +28,7 @@ stdenv.mkDerivation rec {
name = "openjpeg-${version}"; name = "openjpeg-${version}";
inherit branch; inherit branch;
inherit version; inherit version;
inherit src;
src = fetchurl {
url = "mirror://gentoo/distfiles/${name}.tar.gz";
inherit sha256;
};
cmakeFlags = [ cmakeFlags = [
(mkFlag sharedLibsSupport "BUILD_SHARED_LIBS") (mkFlag sharedLibsSupport "BUILD_SHARED_LIBS")

9
pkgs/top-level/all-packages.nix
View File

@ -6944,8 +6944,9 @@ let
opal = callPackage ../development/libraries/opal {}; opal = callPackage ../development/libraries/opal {};
openjpeg_1 = callPackage ../development/libraries/openjpeg/1.x.nix { }; openjpeg_1 = callPackage ../development/libraries/openjpeg/1.x.nix { };
openjpeg_2 = callPackage ../development/libraries/openjpeg/2.x.nix { }; openjpeg_2_0_1 = callPackage ../development/libraries/openjpeg/2.0.1.nix { };
openjpeg = openjpeg_2; openjpeg_2_1 = callPackage ../development/libraries/openjpeg/2.1.nix { };
openjpeg = openjpeg_2_1;
openscenegraph = callPackage ../development/libraries/openscenegraph { openscenegraph = callPackage ../development/libraries/openscenegraph {
giflib = giflib_4_1; giflib = giflib_4_1;
@ -11005,7 +11006,9 @@ let
lua = lua5; lua = lua5;
}; };
mupdf = callPackage ../applications/misc/mupdf { }; mupdf = callPackage ../applications/misc/mupdf {
openjpeg = openjpeg_2_0_1;
};
mypaint = callPackage ../applications/graphics/mypaint { }; mypaint = callPackage ../applications/graphics/mypaint { };