From 32ed009833266f52b3f59baaf9ecb4a1b5219112 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Fri, 10 Mar 2017 17:32:48 +0100 Subject: [PATCH] - updated to 0.9.11 (note: new sonames) - removed obsolete format_string (applied) and outdated va patch (unmaintained h264 support has been dropped) --- format_string.patch | 14 -------------- libvncserver-va.patch | 11 ----------- libvncserver.spec | 16 +++++++--------- 3 files changed, 7 insertions(+), 34 deletions(-) delete mode 100644 format_string.patch delete mode 100644 libvncserver-va.patch diff --git a/format_string.patch b/format_string.patch deleted file mode 100644 index cb01012..0000000 --- a/format_string.patch +++ /dev/null @@ -1,14 +0,0 @@ -Description: Use format string argument with fprintf. -Author: Luca Falavigna - ---- LibVNCServer-0.9.9/client_examples/gtkvncviewer.c~ 2012-05-04 16:19:00.000000000 +0200 -+++ LibVNCServer-0.9.9/client_examples/gtkvncviewer.c 2013-11-03 09:40:26.573431061 +0100 -@@ -563,7 +563,7 @@ - - time (&log_clock); - strftime (buf, 255, "%d/%m/%Y %X ", localtime (&log_clock)); -- fprintf (stdout, buf); -+ fprintf (stdout, "%s", buf); - - vfprintf (stdout, format, args); - fflush (stdout); diff --git a/libvncserver-va.patch b/libvncserver-va.patch deleted file mode 100644 index 6a18e3c..0000000 --- a/libvncserver-va.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libvncserver-LibVNCServer-0.9.10/libvncclient/h264.c.orig 2014-12-06 20:18:09.065973169 +0100 -+++ libvncserver-LibVNCServer-0.9.10/libvncclient/h264.c 2014-12-06 20:18:11.122639750 +0100 -@@ -250,7 +250,7 @@ - va_sp_param_buf_id[i] = VA_INVALID_ID; - va_d_param_buf_id[i] = VA_INVALID_ID; - } -- va_status = vaCreateSurfaces(va_dpy, width, height, VA_RT_FORMAT_YUV420, SURFACE_NUM, &va_surface_id[0]); -+ va_status = vaCreateSurfaces(va_dpy, VA_RT_FORMAT_YUV420, width, height, &va_surface_id[0], SURFACE_NUM, NULL, 0); - CHECK_VASTATUS(va_status, "vaCreateSurfaces"); - for (i = 0; i < SURFACE_NUM; ++i) { - DebugLog(("%s: va_surface_id[%d] = %p\n", __FUNCTION__, i, va_surface_id[i])); diff --git a/libvncserver.spec b/libvncserver.spec index 36a1198..f6851e7 100644 --- a/libvncserver.spec +++ b/libvncserver.spec @@ -5,15 +5,14 @@ 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.10 -Release: 3 +Version: 0.9.11 +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: e1b888fae717b06896f8aec100163d27 +# Source0-md5: 7f06104d5c009813e95142932c4ddb06 Patch0: %{name}-linux.patch -Patch1: format_string.patch -Patch2: %{name}-va.patch URL: https://github.com/LibVNC/libvncserver/ BuildRequires: autoconf >= 2.50 BuildRequires: automake @@ -27,6 +26,7 @@ BuildRequires: libva-x11-devel >= 1.2.0 %{?with_openssl:BuildRequires: openssl-devel} BuildRequires: pkgconfig BuildRequires: sed >= 4.0 +BuildRequires: systemd-devel >= 1:209 BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-lib-libXdamage-devel BuildRequires: xorg-lib-libXext-devel @@ -104,8 +104,6 @@ Statyczne biblioteki LibVNCServer. %prep %setup -q -n libvncserver-LibVNCServer-%{version} %patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build %{__libtoolize} @@ -138,9 +136,9 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README TODO %attr(755,root,root) %{_libdir}/libvncclient.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libvncclient.so.0 +%attr(755,root,root) %ghost %{_libdir}/libvncclient.so.1 %attr(755,root,root) %{_libdir}/libvncserver.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libvncserver.so.0 +%attr(755,root,root) %ghost %{_libdir}/libvncserver.so.1 %files devel %defattr(644,root,root,755) -- 2.44.0