[Wayland-bugs] [Bug 94520] lastest freerdp changes rfx/nsc_context_reset signature

[bugzilla-daemon at freedesktop.org]

https://bugs.freedesktop.org/show_bug.cgi?id=94520

--- Comment #2 from Adam Williamson <adamw at happyassassin.net> ---
I saw this too, and came up with something similar:

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)


Dunno whether it's better to use output or settings. Although, going by the
rest of the code, aren't the settings values strings or something, since the
code keeps running them through int() ?

I also have a patch for the pkgconfig module name change, which is obviously
trivial:

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"

-- 
You are receiving this mail because:
You are the assignee for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/wayland-bugs/attachments/20160423/60d18682/attachment.html>