Update to 1.10.93

.gitignore

@@ -26,3 +26,4 @@
 /weston-1.10.0.tar.xz
 /weston-1.10.91.tar.xz
 /weston-1.10.92.tar.xz
+/weston-1.10.93.tar.xz

0001-update-freerdp-pkgconfig-module-name.patch

@@ -1,27 +0,0 @@
-From cc1a2a718392589b3125be165f57928a668a9d26 Mon Sep 17 00:00:00 2001
-From: Adam Williamson <awilliam@redhat.com>
-Date: Fri, 22 Apr 2016 17:12:33 -0700
-Subject: [PATCH] update freerdp pkgconfig module name
-
-they renamed it to include the major release number.
-https://github.com/FreeRDP/FreeRDP/commit/6fa36081
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 670200c..6dafb7c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -242,7 +242,7 @@ AM_CONDITIONAL([ENABLE_RDP_COMPOSITOR],
-                [test x$enable_rdp_compositor = xyes])
- if test x$enable_rdp_compositor = xyes; then
-   AC_DEFINE([BUILD_RDP_COMPOSITOR], [1], [Build the RDP compositor])
--  PKG_CHECK_MODULES(RDP_COMPOSITOR, [freerdp >= 1.1.0])
-+  PKG_CHECK_MODULES(RDP_COMPOSITOR, [freerdp2 >= 1.1.0])
- 
-   SAVED_CPPFLAGS="$CPPFLAGS"
-   CPPFLAGS="$CPPFLAGS $RDP_COMPOSITOR_CFLAGS"
--- 
-2.5.5
-

0002-pass-width-and-height-to-rfx_context_reset-and-nsc_c.patch

@@ -1,29 +0,0 @@
-From 864bd77bad1c77040764a89bf7aa275d7fc5b5e9 Mon Sep 17 00:00:00 2001
-From: Adam Williamson <awilliam@redhat.com>
-Date: Fri, 22 Apr 2016 17:39:58 -0700
-Subject: [PATCH 2/2] pass width and height to rfx_context_reset and nsc_context_reset
-
-upstream freerdp changed this API in 2e110c7f
----
- src/compositor-rdp.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/compositor-rdp.c b/src/compositor-rdp.c
-index 773b6b5..e47bb79 100644
---- a/src/compositor-rdp.c
-+++ b/src/compositor-rdp.c
-@@ -867,9 +867,9 @@ xf_peer_activate(freerdp_peer* client)
- 		}
- 	}
- 
--	rfx_context_reset(peerCtx->rfx_context);
-+	rfx_context_reset(peerCtx->rfx_context, output->base.width, output->base.height);
- #ifdef HAVE_NSC_RESET
--	nsc_context_reset(peerCtx->nsc_context);
-+	nsc_context_reset(peerCtx->nsc_context, output->base.width, output->base.height);
- #endif
- 
- 	if (peersItem->flags & RDP_PEER_ACTIVATED)
--- 
-2.5.5
-

sources

@@ -1 +1 @@
-de65ad2b4c51affb2a7c43a1638944b4  weston-1.10.92.tar.xz
+b981951c8b5c9116aec89581f595971e  weston-1.10.93.tar.xz

weston.spec

@@ -1,17 +1,11 @@
 Name:           weston
-Version:        1.10.92
+Version:        1.10.93
 Release:        1%{?dist}
 Summary:        Reference compositor for Wayland
 Group:          User Interface/X
 License:        BSD and CC-BY-SA
 URL:            http://wayland.freedesktop.org/
 Source0:        http://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz
-# https://bugs.freedesktop.org/show_bug.cgi?id=94520
-# Update freerdp pkgconfig module name
-Patch0:         0001-update-freerdp-pkgconfig-module-name.patch
-# https://bugs.freedesktop.org/show_bug.cgi?id=94520
-# adjust to a freerdp API change
-Patch1:         0002-pass-width-and-height-to-rfx_context_reset-and-nsc_c.patch
 
 BuildRequires:  cairo-devel >= 1.10.0
 BuildRequires:  glib2-devel
@@ -48,10 +42,6 @@ BuildRequires:  lcms2-devel
 BuildRequires:  colord-devel
 BuildRequires:  freerdp-devel >= 2.0.0
 BuildRequires:  wayland-protocols-devel
-# For autoreconf for Patch0, remove when no longer needed
-BuildRequires:  autoconf
-BuildRequires:  automake
-BuildRequires:  libtool
 
 %description
 Weston is the reference wayland compositor that can run on KMS, under X11
@@ -66,14 +56,8 @@ Common headers for weston
 
 %prep
 %setup -q
-# autosetup does not work with patch1 for some absurd reason
-%patch0 -p1
-%patch1 -p1
 
 %build
-# required for Patch0, drop when no longer needed
-autoreconf -i
-
 %configure --disable-static --disable-setuid-install --enable-xwayland \
            --enable-rdp-compositor
 make %{?_smp_mflags}
@@ -120,6 +104,9 @@ find $RPM_BUILD_ROOT -name \*.la | xargs rm -f
 %{_libdir}/pkgconfig/weston.pc
 
 %changelog
+* Wed May 25 2016 Kalev Lember <klember@redhat.com> - 1.10.93-1
+- Update to 1.10.93
+
 * Wed May 18 2016 Kalev Lember <klember@redhat.com> - 1.10.92-1
 - Update to 1.10.92