@@ -34,14 +34,16 @@

 # PATCH-FIX-UPSTREAM -- https://bugs.gentoo.org/692708

 Patch2:         iscan-2.30.4.2-sscanf.patch

 Patch3:         iscan-data.patch

+Patch4:         iscan.patch

 BuildRequires:  gcc-c++

 BuildRequires:  gettext-tools

-BuildRequires:  libjpeg-devel

 BuildRequires:  libtool

 BuildRequires:  systemd

 BuildRequires:  update-desktop-files

+BuildRequires:  pkg-config

 BuildRequires:  pkgconfig(gimp-2.0)

 BuildRequires:  pkgconfig(gtk+-2.0)

+BuildRequires:  pkgconfig(libjpeg)

 BuildRequires:  pkgconfig(libpng16)

 BuildRequires:  pkgconfig(libtiff-4)

 BuildRequires:  pkgconfig(libusb-1.0)

@@ -88,7 +90,6 @@

 autoreconf -vif

 CFLAGS='%optflags -Wno-deprecated-declarations'

 CXXFLAGS="${CFLAGS}"

-LDFLAGS="${LDFLAGS} -ldl -lpng16"

 %configure \

   --sbindir=%{_bindir} \

   --enable-dependency-reduction \

​

@@ -0,0 +1,36 @@

+--- a/configure.ac

++++ b/configure.ac

+@@ -282,6 +282,7 @@ AC_DEFUN([ISCAN_FILE_FORMAT],

+         AC_HELP_STRING([--enable-$1],

+                [ensure support for the $3 file format]),

+         [if test "x$enable_$1" != xno; then

++          PKG_CHECK_MODULES($3, $4)

+             iff_header="`echo $2 | $as_tr_sh`"

+             AC_CHECK_HEADERS([$2])

+             if test `eval echo '$ac_cv_header_'$iff_header` \

+@@ -292,9 +293,9 @@ AC_DEFUN([ISCAN_FILE_FORMAT],

+         [AC_CHECK_HEADERS([$2])])

+    ])

+ 

+-ISCAN_FILE_FORMAT(jpeg,jpeglib.h,JPEG)

+-ISCAN_FILE_FORMAT(png,png.h,PNG)

+-ISCAN_FILE_FORMAT(tiff,tiffio.h,TIFF)

++ISCAN_FILE_FORMAT(jpeg,jpeglib.h,JPEG,libjpeg)

++ISCAN_FILE_FORMAT(png,png.h,PNG,libpng)

++ISCAN_FILE_FORMAT(tiff,tiffio.h,TIFF,libtiff-4)

+ 

+ 

+ dnl  Support for performance measurements.

+--- a/lib/Makefile.am

++++ b/lib/Makefile.am

+@@ -27,8 +27,8 @@ SUBDIRS = \

+ 

+ if ENABLE_FRONTEND

+ noinst_LTLIBRARIES = libimage-stream.la

+-libimage_stream_la_CPPFLAGS = -I$(top_srcdir)/include

+-libimage_stream_la_LDFLAGS = -static

++libimage_stream_la_CPPFLAGS = -I$(top_srcdir)/include $(PNG_CFLAGS) $(JPEG_CFLAGS) $(TIFF_CFLAGS)

++libimage_stream_la_LDFLAGS = -static $(PNG_LIBS) $(JPEG_LIBS) $(TIFF_LIBS)

+ libimage_stream_la_LIBADD  = \

+   $(LIBLTDL) \

+   $(top_builddir)/lib/pdf/libpdf.la

​