use pkgconfig to find libvncserver

diff --git a/DirectFB.spec b/DirectFB.spec
index 0dc6959246f509ea755268545a6f5dcde289c353..2a2cdac812a17efb8e8dcce2fdd3f0c97e92f5bc 100644 (file)
--- a/DirectFB.spec
+++ b/DirectFB.spec
@@ -54,6 +54,7 @@ Patch13:      ffmpeg3.patch
 Patch14:       %{name}-tslib.patch
 Patch15:       %{name}-libtimidity.patch
 Patch16:       ffmpeg4.patch
+Patch17:       vnc-pc.patch
 URL:           http://www.directfb.net/
 BuildRequires: EGL-devel
 BuildRequires: Mesa-libgbm-devel
@@ -84,7 +85,7 @@ BuildRequires:        libtiff-devel >= 4
 BuildRequires: libtimidity-devel >= 0.2.0
 BuildRequires: libtool
 BuildRequires: libvdpau-devel >= 0.3
-BuildRequires: libvncserver-devel
+BuildRequires: libvncserver-devel >= 0.9.8
 BuildRequires: libvorbis-devel >= 1:1.0.0
 BuildRequires: libwebp-devel >= 0.2.1
 %{?with_multi:BuildRequires:   linux-fusion-devel >= 9.0.1}
@@ -956,6 +957,7 @@ Statyczna biblioteka sawman.
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
 
 # video drivers
 %{__sed} -i -e 's/checkfor_\(cle266\|cyber5k\|radeon\|savage\|unichrome\|vmware\)=no/checkfor_\1=yes/' configure.in

diff --git a/vnc-pc.patch b/vnc-pc.patch
new file mode 100644 (file)
index 0000000..4d0c9a3
--- /dev/null
+++ b/vnc-pc.patch
@@ -0,0 +1,21 @@
+--- DirectFB-1.7.7/configure.in.orig   2022-06-07 13:00:38.865311931 +0200
++++ DirectFB-1.7.7/configure.in        2022-06-07 13:14:44.304420860 +0200
+@@ -1212,15 +1212,10 @@
+                              [build with VNC support @<:@default=auto@:>@]),
+               [], [enable_vnc=yes])
+ if test "$enable_vnc" = "yes"; then
+-  AC_PATH_PROG(VNC_CONFIG, libvncserver-config, no)
+-  if test "$VNC_CONFIG" = "no"; then
+-    enable_vnc=no
++  PKG_CHECK_MODULES(VNC, [libvncserver], [enable_vnc=yes], [enable_vnc=no
+     AC_MSG_WARN([
+-*** libvncserver-config not found -- building without VNC support. See http://libvncserver.sourceforge.net])
+-  else
+-    VNC_CFLAGS=`$VNC_CONFIG --cflags`
+-    VNC_LIBS=`$VNC_CONFIG --libs`
+-  fi
++*** libvncserver package not found -- building without VNC support. See http://libvncserver.sourceforge.net])
++    ])
+ fi
+ 
+ AM_CONDITIONAL(VNC_CORE, test "$enable_vnc" = "yes")