Merge pull request #215540 from dotlambda/libpgf-7.21.7

libpgf: 7.21.2 -> 7.21.7
This commit is contained in:
Thomas Gerbet 2023-02-09 22:06:04 +01:00 committed by GitHub
commit ce9286c6b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 21 deletions

View file

@ -1,21 +1,29 @@
{ lib, stdenv, fetchzip, autoreconfHook }:
{ lib
, stdenv
, fetchzip
, autoreconfHook
, dos2unix
}:
stdenv.mkDerivation rec {
pname = "libpgf";
version = "7.21.2";
version = "7.21.7";
src = fetchzip {
url = "mirror://sourceforge/${pname}/${pname}/${version}/${pname}.zip";
sha256 = "0l1j5b1d02jn27miggihlppx656i0pc70cn6x89j1rpj33zn0g9r";
hash = "sha256-TAWIuikijfyeTRetZWoMMdB/FeGAR7ZjNssVxUevlVg=";
};
nativeBuildInputs = [ autoreconfHook ];
autoreconfPhase = ''
postPatch = ''
find . -type f | xargs dos2unix
mv README.txt README
sh autogen.sh
'';
nativeBuildInputs = [
autoreconfHook
dos2unix
];
meta = {
homepage = "https://www.libpgf.org/";
description = "Progressive Graphics Format";

View file

@ -1,26 +1,37 @@
{ lib, stdenv, fetchurl, autoconf, automake, libtool, dos2unix, libpgf, freeimage, doxygen }:
{ lib
, stdenv
, fetchzip
, autoreconfHook
, dos2unix
, doxygen
, freeimage
, libpgf
}:
stdenv.mkDerivation rec {
pname = "pgf";
version = "6.14.12";
version = "7.21.7";
src = fetchurl {
url = "mirror://sourceforge/libpgf/pgf-console-src-${version}.tar.gz";
sha256 = "1vfm12cfq3an3xg0679bcwdmjq2x1bbij1iwsmm60hwmrm3zvab0";
src = fetchzip {
url = "mirror://sourceforge/libpgf/libpgf/${version}/pgf-console.zip";
hash = "sha256-W9eXYhbynLtvZQsn724Uw0SZ5TuyK2MwREwYKGFhJj0=";
};
nativeBuildInputs = [ autoconf automake ];
buildInputs = [ libtool dos2unix libpgf freeimage doxygen ];
patchPhase = ''
sed 1i'#include <inttypes.h>' -i src/PGF.cpp
sed s/__int64/int64_t/g -i src/PGF.cpp
rm include/FreeImage.h include/FreeImagePlus.h
postPatch = ''
find . -type f | xargs dos2unix
mv README.txt README
'';
preConfigure = "dos2unix configure.ac; sh autogen.sh";
nativeBuildInputs = [
autoreconfHook
dos2unix
doxygen
];
# configureFlags = optional static "--enable-static --disable-shared";
buildInputs = [
freeimage
libpgf
];
meta = {
homepage = "https://www.libpgf.org/";