[packages/libvncserver] - updated to 0.9.12 - updated to 0.9.12, uses cmake now - removed outdated linux,noLlibdir patch - a

qboosh qboosh at pld-linux.org
Tue Mar 17 21:22:34 CET 2020 

commit 0233c8c6dc1c0f8cb63541e1f6e823eda3431cdd
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Mar 17 21:23:36 2020 +0100

    - updated to 0.9.12
    - updated to 0.9.12, uses cmake now
    - removed outdated linux,noLlibdir patch
    - added libsuffix patch (fixes install libdir)

 libvncserver-libsuffix.patch | 42 +++++++++++++++++++++++++++
 libvncserver-linux.patch     | 22 --------------
 libvncserver-noLlibdir.patch | 12 --------
 libvncserver.spec            | 68 +++++++++++++++++++++++++++-----------------
 4 files changed, 84 insertions(+), 60 deletions(-)
---
diff --git a/libvncserver.spec b/libvncserver.spec
index a8a73f9..c8445aa 100644
--- a/libvncserver.spec
+++ b/libvncserver.spec
@@ -1,29 +1,28 @@
 #
 # Conditional build:
-%bcond_with	openssl	# use OpenSSL instead of GnuTLS
+%bcond_with	openssl		# use OpenSSL instead of GnuTLS
+%bcond_without	static_libs	# static libraries
 
 Summary:	LibVNCServer - a for easy implementation of VNC/RDP server
 Summary(pl.UTF-8):	LibVNCServer - biblioteka do łatwego implementowania serwera VNC/RDP
 Name:		libvncserver
-Version:	0.9.11
-Release:	3
+Version:	0.9.12
+Release:	1
 License:	GPL v2
 Group:		Libraries
 #Source0Download: https://github.com/LibVNC/libvncserver/releases
 Source0:	https://github.com/LibVNC/libvncserver/archive/LibVNCServer-%{version}.tar.gz
-# Source0-md5:	7f06104d5c009813e95142932c4ddb06
-Patch0:		%{name}-linux.patch
-Patch1:		%{name}-noLlibdir.patch
+# Source0-md5:	dc2ae6433d2ce45b9f60034c7fb9c10a
+Patch0:		%{name}-libsuffix.patch
 URL:		https://github.com/LibVNC/libvncserver/
-BuildRequires:	autoconf >= 2.50
-BuildRequires:	automake
+BuildRequires:	cyrus-sasl-devel >= 2
 %{!?with_openssl:BuildRequires:	gnutls-devel >= 2.4.0}
 BuildRequires:	libgcrypt-devel >= 1.4.0
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
-BuildRequires:	libtool
 BuildRequires:	libva-devel >= 1.2.0
 BuildRequires:	libva-x11-devel >= 1.2.0
+BuildRequires:	lzo-devel
 %{?with_openssl:BuildRequires:	openssl-devel}
 BuildRequires:	pkgconfig
 BuildRequires:	sed >= 4.0
@@ -37,10 +36,10 @@ BuildRequires:	xorg-lib-libXrandr-devel
 BuildRequires:	xorg-lib-libXtst-devel
 BuildRequires:	zlib-devel
 # for noinst client_examples only
-#BuildRequires:	SDL-devel
+#BuildRequires:	SDL2-devel >= 2.0
 #BuildRequires:	gtk+2-devel >= 2.0
 # for vnc2mpg example
-#BuildRequires:	ffmpeg-devel || lame-libs-devel
+#BuildRequires:	ffmpeg-devel >= 3.1.0
 %{!?with_openssl:Requires:	gnutls >= 2.4.0}
 Requires:	libgcrypt >= 1.4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -77,10 +76,12 @@ Summary:	LibVNCServer header files
 Summary(pl.UTF-8):	Pliki nagłówkowe LibVNCServer
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	cyrus-sasl-devel >= 2
 %{!?with_openssl:Requires:	gnutls-devel >= 2.4.0}
 Requires:	libgcrypt-devel >= 1.4.0
 Requires:	libjpeg-devel
 Requires:	libpng-devel
+Requires:	lzo-devel
 %{?with_openssl:Requires:	openssl-devel}
 Requires:	zlib-devel
 
@@ -105,28 +106,42 @@ Statyczne biblioteki LibVNCServer.
 %prep
 %setup -q -n libvncserver-LibVNCServer-%{version}
 %patch0 -p1
-%patch1 -p1
 
 %build
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-	--disable-silent-rules \
-	%{?with_openssl:--without-gnutls} \
-	%{!?with_openssl:--without-ssl}
+%if %{with static_libs}
+install -d build-static
+cd build-static
+%cmake .. \
+	-DBUILD_SHARED_LIBS=OFF \
+	-DWITH_FFMPEG=OFF \
+	%{?with_openssl:-DWITH_GNUTLS=OFF} \
+	%{!?with_openssl:-DWITH_OPENSSL=OFF} \
+	-DWITH_SDL=OFF
+
+%{__make}
+cd ..
+%endif
+
+install -d build
+cd build
+%cmake .. \
+	-DWITH_FFMPEG=OFF \
+	%{?with_openssl:-DWITH_GNUTLS=OFF} \
+	%{!?with_openssl:-DWITH_OPENSSL=OFF} \
+	-DWITH_SDL=OFF
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%if %{with static_libs}
+%{__make} -C build-static install \
 	DESTDIR=$RPM_BUILD_ROOT
+%endif
 
-# obsoleted by pkg-config
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libvnc*.la
+%{__make} -C build install \
+	DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -136,7 +151,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README TODO
+%doc AUTHORS ChangeLog NEWS README.md TODO
 %attr(755,root,root) %{_libdir}/libvncclient.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libvncclient.so.1
 %attr(755,root,root) %{_libdir}/libvncserver.so.*.*.*
@@ -144,14 +159,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/libvncserver-config
 %attr(755,root,root) %{_libdir}/libvncclient.so
 %attr(755,root,root) %{_libdir}/libvncserver.so
 %{_includedir}/rfb
 %{_pkgconfigdir}/libvncclient.pc
 %{_pkgconfigdir}/libvncserver.pc
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libvncclient.a
 %{_libdir}/libvncserver.a
+%endif
diff --git a/libvncserver-libsuffix.patch b/libvncserver-libsuffix.patch
new file mode 100644
index 0000000..df5b146
--- /dev/null
+++ b/libvncserver-libsuffix.patch
@@ -0,0 +1,42 @@
+--- libvncserver-LibVNCServer-0.9.12/libvncclient.pc.cmakein.orig	2019-01-06 20:09:30.000000000 +0100
++++ libvncserver-LibVNCServer-0.9.12/libvncclient.pc.cmakein	2020-03-17 20:55:42.261756560 +0100
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=@CMAKE_INSTALL_PREFIX@/lib
++libdir=@CMAKE_INSTALL_PREFIX@/lib at LIB_SUFFIX@
+ includedir=@CMAKE_INSTALL_PREFIX@/include
+ 
+ Name: LibVNCClient
+--- libvncserver-LibVNCServer-0.9.12/libvncserver.pc.cmakein.orig	2019-01-06 20:09:30.000000000 +0100
++++ libvncserver-LibVNCServer-0.9.12/libvncserver.pc.cmakein	2020-03-17 20:55:53.121697726 +0100
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=@CMAKE_INSTALL_PREFIX@/lib
++libdir=@CMAKE_INSTALL_PREFIX@/lib at LIB_SUFFIX@
+ includedir=@CMAKE_INSTALL_PREFIX@/include
+ 
+ Name: LibVNCServer
+--- libvncserver-LibVNCServer-0.9.12/CMakeLists.txt.orig	2019-01-06 20:09:30.000000000 +0100
++++ libvncserver-LibVNCServer-0.9.12/CMakeLists.txt	2020-03-17 21:15:24.452018752 +0100
+@@ -666,8 +666,8 @@
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libvncclient.pc.cmakein ${CMAKE_CURRENT_BINARY_DIR}/libvncclient.pc @ONLY)
+ 
+ 
+-install_targets(/lib vncserver)
+-install_targets(/lib vncclient)
++install_targets(/lib${LIB_SUFFIX} vncserver)
++install_targets(/lib${LIB_SUFFIX} vncclient)
+ install_files(/include/rfb FILES
+     rfb/keysym.h
+     rfb/rfb.h
+@@ -677,7 +677,7 @@
+     rfb/rfbregion.h
+ )
+ 
+-install_files(/lib/pkgconfig FILES
++install_files(/lib${LIB_SUFFIX}/pkgconfig FILES
+     libvncserver.pc
+     libvncclient.pc
+ )
diff --git a/libvncserver-linux.patch b/libvncserver-linux.patch
deleted file mode 100644
index 3ea13ca..0000000
--- a/libvncserver-linux.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- LibVNCServer-0.9.8/configure.ac.orig	2011-03-29 13:58:56.000000000 +0200
-+++ LibVNCServer-0.9.8/configure.ac	2011-04-21 19:24:48.099385243 +0200
-@@ -781,8 +781,8 @@
- AC_FUNC_STRFTIME
- AC_FUNC_VPRINTF
- AC_FUNC_FORK
--AC_CHECK_LIB(nsl,gethostbyname)
--AC_CHECK_LIB(socket,socket)
-+AC_SEARCH_LIBS(gethostbyname,nsl)
-+AC_SEARCH_LIBS(socket,socket)
- 
- uname_s=`(uname -s) 2>/dev/null`
- if test "x$uname_s" = "xHP-UX"; then
-@@ -801,7 +801,7 @@
- AM_CONDITIONAL(CYGIPC, test "$HAVE_CYGIPC" = "true")
- 
- # Check if /usr/include/linux exists, if so, define LINUX
--AM_CONDITIONAL(LINUX, test -d /usr/include/linux)
-+AM_CONDITIONAL(LINUX, true)
- 
- # Check for OS X specific header
- AC_CHECK_HEADER(ApplicationServices/ApplicationServices.h, HAVE_OSX="true")
diff --git a/libvncserver-noLlibdir.patch b/libvncserver-noLlibdir.patch
deleted file mode 100644
index cd6e126..0000000
--- a/libvncserver-noLlibdir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- libvncserver-LibVNCServer-0.9.11/libvncserver-config.in.orig	2016-12-30 14:01:28.000000000 +0100
-+++ libvncserver-LibVNCServer-0.9.11/libvncserver-config.in	2017-07-10 16:41:58.569474193 +0200
-@@ -57,6 +57,9 @@
-     --libs)
-       libs=""
-       for dir in $libdir; do
-+        if [ "$dir" = "@libdir@" ]; then
-+          continue
-+        fi
-         libs="$libs -L$dir"
-         if [ "`uname`" = "SunOS" ]; then
-           # why only Solaris??
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libvncserver.git/commitdiff/0233c8c6dc1c0f8cb63541e1f6e823eda3431cdd

More information about the pld-cvs-commit mailing list