use pkgconfig to find imlib2

diff --git a/DirectFB.spec b/DirectFB.spec
index 2a2cdac812a17efb8e8dcce2fdd3f0c97e92f5bc..f885b600d1bb0d60149af4ad5fcb6ec91e54c9d6 100644 (file)
--- a/DirectFB.spec
+++ b/DirectFB.spec
@@ -55,6 +55,7 @@ Patch14:      %{name}-tslib.patch
 Patch15:       %{name}-libtimidity.patch
 Patch16:       ffmpeg4.patch
 Patch17:       vnc-pc.patch
+Patch18:       imlib2-pc.patch
 URL:           http://www.directfb.net/
 BuildRequires: EGL-devel
 BuildRequires: Mesa-libgbm-devel
@@ -70,7 +71,7 @@ BuildRequires:        automake
 BuildRequires: freetype-devel >= 2.0.2
 %{?with_flash:BuildRequires:   gplflash-devel >= 0.4.10-5}
 %{?with_gstreamer:BuildRequires:       gstreamer-plugins-base-devel >= 1.0}
-BuildRequires: imlib2-devel
+BuildRequires: imlib2-devel >= 1.1.0
 BuildRequires: jasper-devel
 BuildRequires: libcddb-devel >= 1.0.0
 BuildRequires: libdrm-devel
@@ -958,6 +959,7 @@ Statyczna biblioteka sawman.
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
 
 # video drivers
 %{__sed} -i -e 's/checkfor_\(cle266\|cyber5k\|radeon\|savage\|unichrome\|vmware\)=no/checkfor_\1=yes/' configure.in

diff --git a/imlib2-pc.patch b/imlib2-pc.patch
new file mode 100644 (file)
index 0000000..4ef0e5b
--- /dev/null
+++ b/imlib2-pc.patch
@@ -0,0 +1,20 @@
+--- DirectFB-1.7.7/configure.in.orig   2022-06-07 13:14:44.304420860 +0200
++++ DirectFB-1.7.7/configure.in        2022-06-07 13:23:58.864663661 +0200
+@@ -1452,15 +1452,9 @@
+                              [build Imlib2 image provider @<:@default=no@:>@]),
+               [], [enable_imlib2=no])
+ if test "x$enable_imlib2" = "xyes"; then
+-  AC_PATH_PROG(IMLIB2_CONFIG, imlib2-config, no)
+-  if test "x$IMLIB2_CONFIG" = xno; then
++  PKG_CHECK_MODULES(IMLIB2, [imlib2], [imlib2=yes], [imlib2=no
+     AC_MSG_WARN([*** Imlib2 library not found, building without Imlib2 support ***])
+-    imlib2="no"
+-  else
+-    IMLIB2_CFLAGS=`imlib2-config --cflags`
+-    IMLIB2_LIBS=`imlib2-config --libs`
+-    imlib2="yes"
+-  fi
++    ])
+ fi
+ 
+ AC_SUBST(IMLIB2_LIBS)