Hello community,
here is the log from the commit of package libva for openSUSE:Factory checked
in at 2013-03-20 11:46:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libva (Old)
and /work/SRC/openSUSE:Factory/.libva.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libva", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/libva/libva.changes 2012-11-19
14:00:10.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libva.new/libva.changes 2013-03-20
11:46:39.000000000 +0100
@@ -1,0 +2,8 @@
+Tue Mar 19 10:43:16 UTC 2013 - kkhere....@gmail.com
+
+- Version 1.1.1 - 18.Mar.2013
+ This minor version brings the following changes:
+ * Support wayland 1.0 protocol (Rob Bradford)
+ * Automake 1.13 fixups (Armin K)
+
+-------------------------------------------------------------------
Old:
----
libva-1.1.0.tar.xz
New:
----
libva-1.1.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libva.spec ++++++
--- /var/tmp/diff_new_pack.tkwO97/_old 2013-03-20 11:46:47.000000000 +0100
+++ /var/tmp/diff_new_pack.tkwO97/_new 2013-03-20 11:46:47.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libva
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
#
Name: libva
-Version: 1.1.0
+Version: 1.1.1
Release: 0
Summary: Video Acceleration (VA) API for Linux
License: MIT
++++++ libva-1.1.0.tar.xz -> libva-1.1.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libva-1.1.0/.gitignore new/libva-1.1.1/.gitignore
--- old/libva-1.1.0/.gitignore 2012-10-04 15:30:51.000000000 +0200
+++ new/libva-1.1.1/.gitignore 2013-03-19 02:42:21.000000000 +0100
@@ -14,6 +14,7 @@
TAGS
aclocal.m4
autom4te.cache
+compile
config.guess
config.h
config.h.in
@@ -33,6 +34,7 @@
install-sh
libtool
ltmain.sh
+/m4
missing
stamp-h1
/test/basic/test_01
@@ -52,6 +54,7 @@
/test/encode/avcenc
/test/encode/h264encode
/test/putsurface/putsurface
+/test/putsurface/putsurface_wayland
/test/transcode/mpeg2transcode
/test/v4l_h264/decode/decode
/test/v4l_h264/encode/encode
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libva-1.1.0/NEWS new/libva-1.1.1/NEWS
--- old/libva-1.1.0/NEWS 2012-10-04 15:30:51.000000000 +0200
+++ new/libva-1.1.1/NEWS 2013-03-19 02:42:21.000000000 +0100
@@ -1,6 +1,10 @@
-libva NEWS -- summary of user visible changes. 2012-10-04
+libva NEWS -- summary of user visible changes. 2013-03-19
Copyright (C) 2009-2011 Intel Corporation
+Version 1.1.1 - 19.Mar.2013
+* Support wayland 1.0 protocol (Rob Bradford)
+* Automake 1.13 fixups (Armin K)
+
Version 1.1.0 - 04.Oct.2012
* API: add Wayland support
* API: add raw DRM support for headless pipelines
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libva-1.1.0/autogen.sh new/libva-1.1.1/autogen.sh
--- old/libva-1.1.0/autogen.sh 2012-10-04 15:30:51.000000000 +0200
+++ new/libva-1.1.1/autogen.sh 2013-03-19 02:42:21.000000000 +0100
@@ -46,6 +46,6 @@
cd "$olddir"
-if test -z "$NO_CONFIGURE"; then
+if test -z "$NOCONFIGURE"; then
$srcdir/configure "$@" && echo "Now type 'make' to compile $PROJECT."
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libva-1.1.0/configure.ac new/libva-1.1.1/configure.ac
--- old/libva-1.1.0/configure.ac 2012-10-04 15:30:51.000000000 +0200
+++ new/libva-1.1.1/configure.ac 2013-03-19 02:42:21.000000000 +0100
@@ -42,7 +42,7 @@
# - reset micro version to zero when VA-API major or minor version is changed
m4_define([libva_major_version], [m4_eval(va_api_major_version + 1)])
m4_define([libva_minor_version], [m4_eval(va_api_minor_version - 32)])
-m4_define([libva_micro_version], [0])
+m4_define([libva_micro_version], [1])
m4_define([libva_pre_version], [0])
m4_define([libva_version],
@@ -78,7 +78,7 @@
m4_define([libdrm_version], [2.4])
# Wayland minimum version number
-m4_define([wayland_api_version], [0.95.0])
+m4_define([wayland_api_version], [1.0.0])
AC_PREREQ(2.57)
AC_INIT([libva], [libva_version], [waldo.bast...@intel.com], libva)
@@ -86,7 +86,7 @@
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([dist-bzip2])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
TODAY="`LC_ALL=C date +'%a, %d %b %Y %X %z'`"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libva-1.1.0/dummy_drv_video/Makefile.am
new/libva-1.1.1/dummy_drv_video/Makefile.am
--- old/libva-1.1.0/dummy_drv_video/Makefile.am 2012-10-04 15:30:51.000000000
+0200
+++ new/libva-1.1.1/dummy_drv_video/Makefile.am 2013-03-19 02:42:21.000000000
+0100
@@ -20,7 +20,7 @@
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-INCLUDES = -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_srcdir)
if BUILD_DUMMY_DRIVER
dummy_drv_video_la_LTLIBRARIES = dummy_drv_video.la
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libva-1.1.0/test/common/va_display_wayland.c
new/libva-1.1.1/test/common/va_display_wayland.c
--- old/libva-1.1.0/test/common/va_display_wayland.c 2012-10-04
15:30:51.000000000 +0200
+++ new/libva-1.1.1/test/common/va_display_wayland.c 2013-03-19
02:42:21.000000000 +0100
@@ -33,42 +33,39 @@
struct display {
struct wl_display *display;
+ struct wl_registry *registry;
struct wl_compositor *compositor;
struct wl_shell *shell;
struct wl_shell_surface *shell_surface;
struct wl_surface *surface;
unsigned int ref_count;
int event_fd;
- unsigned int event_mask;
};
static struct display *g_display;
static void
-display_handle_global(
- struct wl_display *display,
- uint32_t id,
- const char *interface,
- uint32_t version,
- void *data
+registry_handle_global(
+ void *data,
+ struct wl_registry *registry,
+ uint32_t id,
+ const char *interface,
+ uint32_t version
)
{
struct display * const d = data;
if (strcmp(interface, "wl_compositor") == 0)
- d->compositor = wl_display_bind(display, id, &wl_compositor_interface);
+ d->compositor =
+ wl_registry_bind(registry, id, &wl_compositor_interface, 1);
else if (strcmp(interface, "wl_shell") == 0)
- d->shell = wl_display_bind(display, id, &wl_shell_interface);
+ d->shell = wl_registry_bind(registry, id, &wl_shell_interface, 1);
}
-static int
-event_mask_update(uint32_t mask, void *data)
-{
- struct display * const d = data;
-
- d->event_mask = mask;
- return 0;
-}
+static const struct wl_registry_listener registry_listener = {
+ registry_handle_global,
+ NULL,
+};
static VADisplay
va_open_display_wayland(void)
@@ -91,9 +88,10 @@
return NULL;
}
wl_display_set_user_data(d->display, d);
- wl_display_add_global_listener(d->display, display_handle_global, d);
- d->event_fd = wl_display_get_fd(d->display, event_mask_update, d);
- wl_display_iterate(d->display, d->event_mask);
+ d->registry = wl_display_get_registry(d->display);
+ wl_registry_add_listener(d->registry, ®istry_listener, d);
+ d->event_fd = wl_display_get_fd(d->display);
+ wl_display_dispatch(d->display);
d->ref_count = 1;
g_display = d;
@@ -182,6 +180,7 @@
dst_rect->x, dst_rect->y, dst_rect->width, dst_rect->height
);
+ wl_surface_commit(d->surface);
wl_display_flush(d->display);
return VA_STATUS_SUCCESS;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libva-1.1.0/test/decode/Makefile.am
new/libva-1.1.1/test/decode/Makefile.am
--- old/libva-1.1.0/test/decode/Makefile.am 2012-10-04 15:30:51.000000000
+0200
+++ new/libva-1.1.1/test/decode/Makefile.am 2013-03-19 02:42:21.000000000
+0100
@@ -22,7 +22,7 @@
bin_PROGRAMS = mpeg2vldemo loadjpeg
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/test/common \
$(NULL)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libva-1.1.0/test/encode/Makefile.am
new/libva-1.1.1/test/encode/Makefile.am
--- old/libva-1.1.0/test/encode/Makefile.am 2012-10-04 15:30:51.000000000
+0200
+++ new/libva-1.1.1/test/encode/Makefile.am 2013-03-19 02:42:21.000000000
+0100
@@ -25,7 +25,7 @@
bin_PROGRAMS += h264encode
endif
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/va \
$(NULL)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libva-1.1.0/test/putsurface/Makefile.am
new/libva-1.1.1/test/putsurface/Makefile.am
--- old/libva-1.1.0/test/putsurface/Makefile.am 2012-10-04 15:30:51.000000000
+0200
+++ new/libva-1.1.1/test/putsurface/Makefile.am 2013-03-19 02:42:21.000000000
+0100
@@ -22,7 +22,7 @@
bin_PROGRAMS = putsurface
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_builddir) \
$(NULL)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libva-1.1.0/test/putsurface/putsurface_common.c
new/libva-1.1.1/test/putsurface/putsurface_common.c
--- old/libva-1.1.0/test/putsurface/putsurface_common.c 2012-10-04
15:30:51.000000000 +0200
+++ new/libva-1.1.1/test/putsurface/putsurface_common.c 2013-03-19
02:42:21.000000000 +0100
@@ -190,7 +190,7 @@
while (surface_id == VA_INVALID_SURFACE)
surface_id = get_next_free_surface(&index);
- if (verbose) printf("Thread %x Display surface 0x%p,\n", (unsigned
int)drawable, (void *)surface_id);
+ if (verbose) printf("Thread: %p Display surface 0x%x,\n", drawable,
surface_id);
if (multi_thread)
upload_surface(va_dpy, surface_id, box_width, row_shift,
display_field);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libva-1.1.0/test/putsurface/putsurface_wayland.c
new/libva-1.1.1/test/putsurface/putsurface_wayland.c
--- old/libva-1.1.0/test/putsurface/putsurface_wayland.c 2012-10-04
15:30:51.000000000 +0200
+++ new/libva-1.1.1/test/putsurface/putsurface_wayland.c 2013-03-19
02:42:21.000000000 +0100
@@ -102,7 +102,7 @@
struct wl_display *display;
struct wl_compositor *compositor;
struct wl_shell *shell;
- uint32_t mask;
+ struct wl_registry *registry;
int event_fd;
};
@@ -153,7 +153,7 @@
if (wl_drawable->redraw_pending) {
wl_display_flush(d->display);
while (wl_drawable->redraw_pending)
- wl_display_iterate(wl_drawable->display, WL_DISPLAY_READABLE);
+ wl_display_dispatch(wl_drawable->display);
}
va_status = vaGetSurfaceBufferWl(va_dpy, va_surface, VA_FRAME_PICTURE,
&buffer);
@@ -169,35 +169,33 @@
wl_display_flush(d->display);
wl_drawable->redraw_pending = 1;
callback = wl_surface_frame(wl_drawable->surface);
+ wl_surface_commit(wl_drawable->surface);
wl_callback_add_listener(callback, &frame_callback_listener, wl_drawable);
return VA_STATUS_SUCCESS;
}
static void
-display_handle_global(
- struct wl_display *display,
- uint32_t id,
- const char *interface,
- uint32_t version,
- void *data
+registry_handle_global(
+ void *data,
+ struct wl_registry *registry,
+ uint32_t id,
+ const char *interface,
+ uint32_t version
)
{
struct display * const d = data;
if (strcmp(interface, "wl_compositor") == 0)
- d->compositor = wl_display_bind(display, id, &wl_compositor_interface);
+ d->compositor =
+ wl_registry_bind(registry, id, &wl_compositor_interface, 1);
else if (strcmp(interface, "wl_shell") == 0)
- d->shell = wl_display_bind(display, id, &wl_shell_interface);
+ d->shell = wl_registry_bind(registry, id, &wl_shell_interface, 1);
}
-static int
-event_mask_update(uint32_t mask, void *data)
-{
- struct display * const d = data;
-
- d->mask = mask;
- return 0;
-}
+static const struct wl_registry_listener registry_listener = {
+ registry_handle_global,
+ NULL,
+};
static void *
open_display(void)
@@ -213,9 +211,10 @@
return NULL;
wl_display_set_user_data(d->display, d);
- wl_display_add_global_listener(d->display, display_handle_global, d);
- d->event_fd = wl_display_get_fd(d->display, event_mask_update, d);
- wl_display_iterate(d->display, d->mask);
+ d->registry = wl_display_get_registry(d->display);
+ wl_registry_add_listener(d->registry, ®istry_listener, d);
+ d->event_fd = wl_display_get_fd(d->display);
+ wl_display_dispatch(d->display);
return d->display;
}
@@ -298,9 +297,6 @@
if (check_event == 0)
return 0;
- if (!(d->mask & WL_DISPLAY_READABLE))
- return 0;
-
tv.tv_sec = 0;
tv.tv_usec = 0;
do {
@@ -313,7 +309,7 @@
break;
}
if (retval == 1)
- wl_display_iterate(d->display, WL_DISPLAY_READABLE);
+ wl_display_dispatch(d->display);
} while (retval > 0);
#if 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libva-1.1.0/va/Makefile.am
new/libva-1.1.1/va/Makefile.am
--- old/libva-1.1.0/va/Makefile.am 2012-10-04 15:30:51.000000000 +0200
+++ new/libva-1.1.1/va/Makefile.am 2013-03-19 02:42:21.000000000 +0100
@@ -22,7 +22,7 @@
SUBDIRS =
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-DVA_DRIVERS_PATH="\"$(LIBVA_DRIVERS_PATH)\""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libva-1.1.0/va/drm/Makefile.am
new/libva-1.1.1/va/drm/Makefile.am
--- old/libva-1.1.0/va/drm/Makefile.am 2012-10-04 15:30:51.000000000 +0200
+++ new/libva-1.1.1/va/drm/Makefile.am 2013-03-19 02:42:21.000000000 +0100
@@ -20,7 +20,7 @@
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-INCLUDES = \
+AM_CPPFLAGS = \
-DLINUX \
-I$(top_srcdir) \
-I$(top_srcdir)/va \
@@ -45,7 +45,7 @@
if USE_X11
source_c += va_drm_auth_x11.c
-INCLUDES += $(X11_CFLAGS)
+AM_CPPFLAGS += $(X11_CFLAGS)
endif
noinst_LTLIBRARIES = libva_drm.la
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libva-1.1.0/va/egl/Makefile.am
new/libva-1.1.1/va/egl/Makefile.am
--- old/libva-1.1.0/va/egl/Makefile.am 2012-10-04 15:30:51.000000000 +0200
+++ new/libva-1.1.1/va/egl/Makefile.am 2013-03-19 02:42:21.000000000 +0100
@@ -20,7 +20,7 @@
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-INCLUDES = \
+AM_CPPFLAGS = \
-DLINUX \
-I$(top_srcdir) \
-I$(top_srcdir)/va \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libva-1.1.0/va/glx/Makefile.am
new/libva-1.1.1/va/glx/Makefile.am
--- old/libva-1.1.0/va/glx/Makefile.am 2012-10-04 15:30:51.000000000 +0200
+++ new/libva-1.1.1/va/glx/Makefile.am 2013-03-19 02:42:21.000000000 +0100
@@ -20,7 +20,7 @@
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-INCLUDES = \
+AM_CPPFLAGS = \
-DLINUX \
-I$(top_srcdir) \
-I$(top_srcdir)/va \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libva-1.1.0/va/wayland/Makefile.am
new/libva-1.1.1/va/wayland/Makefile.am
--- old/libva-1.1.0/va/wayland/Makefile.am 2012-10-04 15:30:51.000000000
+0200
+++ new/libva-1.1.1/va/wayland/Makefile.am 2013-03-19 02:42:21.000000000
+0100
@@ -22,7 +22,7 @@
SUBDIRS = protocol
-INCLUDES = \
+AM_CPPFLAGS = \
-DLINUX \
-I$(top_srcdir) \
-I$(top_srcdir)/va \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libva-1.1.0/va/wayland/va_wayland_drm.c
new/libva-1.1.1/va/wayland/va_wayland_drm.c
--- old/libva-1.1.0/va/wayland/va_wayland_drm.c 2012-10-04 15:30:51.000000000
+0200
+++ new/libva-1.1.1/va/wayland/va_wayland_drm.c 2013-03-19 02:42:21.000000000
+0100
@@ -44,6 +44,7 @@
struct va_wayland_context base;
void *handle;
struct wl_drm *drm;
+ struct wl_registry *registry;
void *drm_interface;
unsigned int is_authenticated : 1;
} VADisplayContextWaylandDRM;
@@ -142,6 +143,28 @@
}
}
+static void
+registry_handle_global(
+ void *data,
+ struct wl_registry *registry,
+ uint32_t id,
+ const char *interface,
+ uint32_t version
+)
+{
+ struct va_wayland_drm_context *wl_drm_ctx = data;
+
+ if (strcmp(interface, "wl_drm") == 0) {
+ wl_drm_ctx->drm =
+ wl_registry_bind(wl_drm_ctx->registry, id,
wl_drm_ctx->drm_interface, 1);
+ }
+}
+
+static const struct wl_registry_listener registry_listener = {
+ registry_handle_global,
+ NULL,
+};
+
bool
va_wayland_drm_create(VADisplayContextP pDisplayContext)
{
@@ -168,14 +191,6 @@
drm_state->auth_type = 0;
ctx->drm_state = drm_state;
- id = wl_display_get_global(ctx->native_dpy, "wl_drm", 1);
- if (!id) {
- wl_display_roundtrip(ctx->native_dpy);
- id = wl_display_get_global(ctx->native_dpy, "wl_drm", 1);
- if (!id)
- return false;
- }
-
wl_drm_ctx->handle = dlopen(LIBWAYLAND_DRM_NAME, RTLD_LAZY|RTLD_LOCAL);
if (!wl_drm_ctx->handle)
return false;
@@ -185,8 +200,14 @@
if (!wl_drm_ctx->drm_interface)
return false;
- wl_drm_ctx->drm =
- wl_display_bind(ctx->native_dpy, id, wl_drm_ctx->drm_interface);
+ wl_drm_ctx->registry = wl_display_get_registry(ctx->native_dpy);
+ wl_registry_add_listener(wl_drm_ctx->registry, ®istry_listener,
wl_drm_ctx);
+ wl_display_roundtrip(ctx->native_dpy);
+
+ /* registry_handle_global should have been called by the
+ * wl_display_roundtrip above
+ */
+
if (!wl_drm_ctx->drm)
return false;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libva-1.1.0/va/wayland/va_wayland_emgd.c
new/libva-1.1.1/va/wayland/va_wayland_emgd.c
--- old/libva-1.1.0/va/wayland/va_wayland_emgd.c 2012-10-04
15:30:51.000000000 +0200
+++ new/libva-1.1.1/va/wayland/va_wayland_emgd.c 2013-03-19
02:42:21.000000000 +0100
@@ -40,6 +40,7 @@
struct wl_emgd *emgd;
void *emgd_interface;
unsigned int is_created : 1;
+ struct wl_registry *registry;
} VADisplayContextWaylandEMGD;
static inline void
@@ -86,6 +87,28 @@
}
}
+static void
+registry_handle_global(
+ void *data,
+ struct wl_registry *registry,
+ uint32_t id,
+ const char *interface,
+ uint32_t version
+)
+{
+ VADisplayContextWaylandEMGD *wl_emgd_ctx = data;
+
+ if (strcmp(interface, "wl_emgd") == 0) {
+ wl_emgd_ctx->emgd =
+ wl_registry_bind(registry, id, wl_emgd_ctx->emgd_interface, 1);
+ }
+}
+
+static const struct wl_registry_listener registry_listener = {
+ registry_handle_global,
+ NULL,
+};
+
bool
va_wayland_emgd_create(VADisplayContextP pDisplayContext)
{
@@ -112,14 +135,6 @@
drm_state->auth_type = 0;
ctx->drm_state = drm_state;
- id = wl_display_get_global(ctx->native_dpy, "wl_emgd", 1);
- if (!id) {
- wl_display_roundtrip(ctx->native_dpy);
- id = wl_display_get_global(ctx->native_dpy, "wl_emgd", 1);
- if (!id)
- return false;
- }
-
wl_emgd_ctx->handle = dlopen(LIBWAYLAND_EMGD_NAME, RTLD_LAZY|RTLD_LOCAL);
if (!wl_emgd_ctx->handle)
return false;
@@ -129,8 +144,13 @@
if (!wl_emgd_ctx->emgd_interface)
return false;
- wl_emgd_ctx->emgd =
- wl_display_bind(ctx->native_dpy, id, wl_emgd_ctx->emgd_interface);
+ wl_emgd_ctx->registry = wl_display_get_registry(ctx->native_dpy);
+ wl_registry_add_listener(wl_emgd_ctx->registry, ®istry_listener,
wl_emgd_ctx);
+ wl_display_roundtrip(ctx->native_dpy);
+
+ /* registry_handle_global should have been called by the
+ * wl_display_roundtrip above
+ */
if (!wl_emgd_ctx->emgd)
return false;
return true;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libva-1.1.0/va/x11/Makefile.am
new/libva-1.1.1/va/x11/Makefile.am
--- old/libva-1.1.0/va/x11/Makefile.am 2012-10-04 15:30:51.000000000 +0200
+++ new/libva-1.1.1/va/x11/Makefile.am 2013-03-19 02:42:21.000000000 +0100
@@ -20,7 +20,7 @@
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-INCLUDES = \
+AM_CPPFLAGS = \
-DLINUX \
-I$(top_srcdir) \
-I$(top_srcdir)/va \
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
