Commit 4d6557cd authored by Robert Schütz's avatar Robert Schütz
Browse files

pfstools: drop

parent 80b8379d
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -17855,7 +17855,7 @@ self: {
      badPlatforms = lib.platforms.darwin;
      hydraPlatforms = lib.platforms.none;
    }
  ) { inherit (pkgs) pfstools; };
  ) { pfstools = null; };
  HERA = callPackage (
    {
+0 −91
Original line number Diff line number Diff line
{
  lib,
  stdenv,
  fetchurl,
  cmake,
  pkg-config,
  wrapQtAppsHook,
  openexr,
  zlib,
  imagemagick6,
  libGLU,
  libGL,
  libglut,
  fftwFloat,
  fftw,
  gsl,
  libexif,
  perl,
  qtbase,
  netpbm,
  enableUnfree ? false,
  opencv,
}:

stdenv.mkDerivation rec {
  pname = "pfstools";
  version = "2.2.0";

  src = fetchurl {
    url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tgz";
    sha256 = "sha256-m/aESYVmMibCGZjutDwmGsuOSziRuakbcpVUQGKJ18o=";
  };

  outputs = [
    "out"
    "dev"
    "man"
  ];

  cmakeFlags = [ "-DWITH_MATLAB=false" ];

  preConfigure = ''
    sed -e 's|#include( ''${PROJECT_SRC_DIR}/cmake/FindNETPBM.cmake )|include( ''${PROJECT_SOURCE_DIR}/cmake/FindNETPBM.cmake )|' -i CMakeLists.txt

    rm cmake/FindNETPBM.cmake
    echo "SET(NETPBM_LIBRARY `find ${lib.getLib netpbm} -name "*${stdenv.hostPlatform.extensions.sharedLibrary}*" -type f`)" >> cmake/FindNETPBM.cmake
    echo "SET(NETPBM_LIBRARIES `find ${lib.getLib netpbm} -name "*${stdenv.hostPlatform.extensions.sharedLibrary}*" -type f`)" >> cmake/FindNETPBM.cmake
    echo "SET(NETPBM_INCLUDE_DIR ${lib.getDev netpbm}/include/netpbm)" >> cmake/FindNETPBM.cmake
    echo "INCLUDE(FindPackageHandleStandardArgs)" >> cmake/FindNETPBM.cmake
    echo "FIND_PACKAGE_HANDLE_STANDARD_ARGS(NETPBM DEFAULT_MSG NETPBM_LIBRARY NETPBM_INCLUDE_DIR)" >> cmake/FindNETPBM.cmake
  '';

  nativeBuildInputs = [
    cmake
    pkg-config
    wrapQtAppsHook
  ];
  buildInputs = [
    openexr
    zlib
    imagemagick6
    fftwFloat
    fftw
    gsl
    libexif
    perl
    qtbase
    netpbm
  ]
  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
    libGLU
    libGL
    libglut
  ]
  ++ lib.optional enableUnfree (opencv.override { enableUnfree = true; });

  patches = [
    ./glut.patch
    ./threads.patch
    ./pfstools.patch
    ./pfsalign.patch
  ];

  meta = {
    homepage = "https://pfstools.sourceforge.net/";
    description = "Toolkit for manipulation of HDR images";
    platforms = lib.platforms.linux;
    license = lib.licenses.lgpl2;
    maintainers = [ lib.maintainers.juliendehos ];
  };
}
+0 −12
Original line number Diff line number Diff line
--- a/src/pfsglview/CMakeLists.txt	2022-04-04 23:21:11.164016369 +0300
+++ b/src/pfsglview/CMakeLists.txt	2022-04-04 23:21:32.757878750 +0300
@@ -11,8 +11,7 @@
 
 add_executable(pfsglview pfsglview.cpp picture_io.cpp module.cpp m_histogram.cpp m_status.cpp m_on_screen_display.cpp)
 
-# TODO: Use ${GLUT_LIBRARY} instead.
-target_link_libraries(pfsglview ${OPENGL_LIBRARIES} ${GLUT_glut_LIBRARY} pfs)
+target_link_libraries(pfsglview ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES} pfs)
 
 install (TARGETS pfsglview DESTINATION bin)
 install (FILES pfsglview.1 DESTINATION ${MAN_DIR})
+0 −12
Original line number Diff line number Diff line
--- a/src/camera/CMakeLists.txt 2017-11-13 18:38:27.000000000 +0100
+++ b/src/camera/CMakeLists.txt 2018-12-30 14:55:30.235571520 +0100
@@ -9,7 +9,7 @@ target_link_libraries(${TRG} pfs)
 install (TARGETS ${TRG} DESTINATION bin)
 install (FILES ${TRG}.1 DESTINATION ${MAN_DIR})
 
-if( OpenCV_FOUND AND EXIF_FOUND )
+if( OpenCV_FOUND AND MYPKG_FOUND )
 
        set(TRG pfsalign)
        add_executable(${TRG} ${TRG}.cpp  "${GETOPT_OBJECT}")
+0 −21
Original line number Diff line number Diff line
--- 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 ===========
 
Loading