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

pfstools: 1.8.5 -> 2.0.5

Browse Source
This commit is contained in:
Julien Dehos 2016-07-22 19:17:18 +02:00 committed by Rok Garbas
parent a086b62a3d
commit d49902e03a
No known key found for this signature in database
GPG Key ID: A0E01EF44C27BF00
3 changed files with 60 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkgs/tools/graphics/pfstools/default.nix
View File

@ -1,24 +1,31 @@
{stdenv, fetchurl, libtiff, openexr, imagemagick, libjpeg, qt4, mesa, { stdenv, fetchurl, cmake, pkgconfig, openexr, ilmbase, zlib, imagemagick, mesa, freeglut, fftwFloat, fftw, gsl, libexif, perl, opencv, qt4 }:
freeglut, bzip2, libX11, libpng, expat, pkgconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pfstools-1.8.5"; name = "pfstools";
version = "2.0.5";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/pfstools/${name}.tar.gz"; url = "mirror://sourceforge/${name}/${version}/${name}-${version}.tgz";
sha256 = "01kk2r8afrb3vrhm8abfjdhhan97lzpapc4n8w1mpdp3kv9miy9c"; sha256 = "1fyc2c7jzr7k797c2dqyyvapzc3szxwcp48r382yxz2yq558xgd9";
}; };
configureFlags = "--with-moc=${qt4}/bin/moc"; outputs = [ "dev" "out" "doc"];
buildInputs = [ libtiff openexr imagemagick libjpeg qt4 mesa freeglut cmakeFlags = ''
bzip2 libX11 libpng expat ]; -DWITH_MATLAB=false
'';
nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openexr zlib imagemagick mesa freeglut fftwFloat fftw gsl libexif perl opencv qt4 ];
meta = { nativeBuildInputs = [ cmake pkgconfig ];
homepage = http://pfstools.sourceforge.net/;
patches = [ ./threads.patch ./pfstools.patch ];
meta = with stdenv.lib; {
homepage = "http://pfstools.sourceforge.net/";
description = "Toolkit for manipulation of HDR images"; description = "Toolkit for manipulation of HDR images";
license = "GPL"; platforms = platforms.linux;
license = licenses.lgpl2;
maintainers = [ maintainers.juliendehos ];
}; };
} }

21
pkgs/tools/graphics/pfstools/pfstools.patch Normal file
View File

@ -0,0 +1,21 @@
--- a/CMakeLists.txt 2016-05-26 11:31:16.000000000 +0200
+++ b/CMakeLists.txt 2016-07-22 19:07:22.074669909 +0200
@@ -320,12 +320,12 @@
# ======== libexif ==========
-find_package(EXIF)
-if( NOT EXIF_FOUND )
- message( "EXIF library (libexif) not found. 'pfsalign' will not be compiled" )
-else( NOT EXIF_FOUND )
- message(STATUS "libexif library found.")
-endif( NOT EXIF_FOUND )
+find_package( PkgConfig REQUIRED )
+pkg_check_modules( MYPKG REQUIRED libexif IlmBase )
+if( MYPKG_FOUND )
+ message( STATUS "libexif and IlmBase found." )
+endif( MYPKG_FOUND )
+include_directories( ${MYPKG_INCLUDE_DIRS} )
# ======== Config and sub dirs ===========

20
pkgs/tools/graphics/pfstools/threads.patch Normal file
View File

@ -0,0 +1,20 @@
--- a/src/fileformat/CMakeLists.txt 2016-05-26 11:31:23.000000000 +0200
+++ b/src/fileformat/CMakeLists.txt 2016-07-21 23:19:56.510958771 +0200
@@ -53,13 +53,15 @@
if( OPENEXR_FOUND )
include_directories("${OPENEXR_INCLUDE_DIR}")
+ find_package (Threads)
+
add_executable(pfsinexr pfsinexr.cpp "${GETOPT_OBJECT}")
- target_link_libraries(pfsinexr pfs ${OPENEXR_LIBRARIES})
+ target_link_libraries(pfsinexr pfs ${OPENEXR_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
install (TARGETS pfsinexr DESTINATION bin)
install (FILES pfsinexr.1 DESTINATION ${MAN_DIR})
add_executable(pfsoutexr pfsoutexr.cpp "${GETOPT_OBJECT}")
- target_link_libraries(pfsoutexr pfs ${OPENEXR_LIBRARIES})
+ target_link_libraries(pfsoutexr pfs ${OPENEXR_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
install (TARGETS pfsoutexr DESTINATION bin)
install (FILES pfsoutexr.1 DESTINATION ${MAN_DIR})
endif( OPENEXR_FOUND )