Re: [PATCH weston 2/2] Do not install the new helpers macro header file.
On Tue, 16 Jun 2015 13:15:14 -0700 Jon A. Cruz j...@osg.samsung.com wrote: Signed-off-by: Jon A. Cruz j...@osg.samsung.com --- Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 1cfc982..125d8c3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -190,7 +190,6 @@ westoninclude_HEADERS = \ src/timeline-object.h \ shared/matrix.h \ shared/config-parser.h \ - shared/helpers.h\ shared/zalloc.h \ shared/platform.h These two patches look good, pushed: bbdd9bc..360cfb0 master - master Would you fix the license in helpers.h, too, please? Thanks, pq ___ wayland-devel mailing list wayland-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/wayland-devel
Re: [PATCH weston] ivi: Use build dir instead of libexec dir in generated test ini file
On Tue, 16 Jun 2015 13:30:35 -0500 Derek Foreman der...@osg.samsung.com wrote: We don't want to use installed binaries when running tests. Signed-off-by: Derek Foreman der...@osg.samsung.com --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 261798c..a75f6c5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,7 +33,7 @@ tests/weston-ivi.ini : $(srcdir)/ivi-shell/weston.ini.in -e 's|@bindir[@]|$(bindir)|g' \ -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \ -e 's|@abs_top_srcdir[@]|$(abs_top_srcdir)|g' \ - -e 's|@libexecdir[@]|$(libexecdir)|g' \ + -e 's|@libexecdir[@]|$(abs_builddir)|g' \ -e 's|@plugin_prefix[@]|$(abs_top_builddir)/.libs/|g' \ $ $@ R-b me. Pushed: 665b025..bbdd9bc master - master Thanks, pq ___ wayland-devel mailing list wayland-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/wayland-devel
Re: [PATCH v2 wayland 2/2] doc: drop the default doxygen tags
On Wed, 17 Jun 2015 13:28:49 +1000 Peter Hutterer peter.hutte...@who-t.net wrote: Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- Changes to v1: - rebased on top of v2 1/2 doc/doxygen/wayland.doxygen.in | 1743 1 file changed, 1743 deletions(-) Hi, looks good to me. Both patches pushed with my R-b: bc3b66d..82a6fec master - master Thanks, pq ___ wayland-devel mailing list wayland-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/wayland-devel
Re: [PATCH wayland 0/5] Allow building just the scanner
On Wed, 17 Jun 2015 15:13:47 -0500 Derek Foreman der...@osg.samsung.com wrote: Some generic clean ups of the build with the goal being building the scanner without any libs or doc. This is useful because when cross compiling wayland you only need the scanner built natively. It also lets us remove some dependencies for the build host (libffi, signalfd, timerfd, CLOCK_MONOTONIC). We actually have some build boxes that don't support some of this... Derek Foreman (5): build: Move AM_CFLAGS and AM_CPPFLAGS to the top of Makefile.am build: Stop putting FFI_CFLAGS in AM_CFLAGS build: Allow disabling building of wayland libraries build: Build a subset of libwayland_util when not building libraries build: Don't depend on libffi unless we're building libraries Makefile.am | 63 +--- configure.ac | 32 +++--- 2 files changed, 56 insertions(+), 39 deletions(-) Hi, I agree with Quentin's and Peter's comments, but I think addressing those can be follow-ups. This looks good enough to me. Can we have comments at 'endif's saying which 'if' it matches? Those would be nice. R-b me too. Pushed: 1faeb7f..bc3b66d master - master Thanks, pq ___ wayland-devel mailing list wayland-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/wayland-devel
[PATCH wayland] cosmetic: gratuitous whitespace changes in event-loop.c
Signed-off-by: Derek Foreman der...@osg.samsung.com --- src/event-loop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/event-loop.c b/src/event-loop.c index d1e03fa..130c7be 100644 --- a/src/event-loop.c +++ b/src/event-loop.c @@ -199,7 +199,7 @@ wl_event_loop_add_timer(struct wl_event_loop *loop, source-base.interface = timer_source_interface; source-base.fd = timerfd_create(CLOCK_MONOTONIC, - TFD_CLOEXEC | TFD_NONBLOCK); +TFD_CLOEXEC | TFD_NONBLOCK); source-func = func; return add_source(loop, source-base, WL_EVENT_READABLE, data); -- 2.1.4 ___ wayland-devel mailing list wayland-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/wayland-devel
[PATCH weston] build: Use AM_CFLAGS instead of GCC_CFLAGS
AM_CFLAGS is the default for any target that doesn't specify its own cflags. We should use AM_CFLAGS in preference to GCC_CFLAGS so we can change AM_CFLAGS and get all targets. Signed-off-by: Derek Foreman der...@osg.samsung.com --- Makefile.am | 64 ++--- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/Makefile.am b/Makefile.am index 261798c..f0f19cd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -63,7 +63,7 @@ bin_PROGRAMS += weston weston_LDFLAGS = -export-dynamic weston_CPPFLAGS = $(AM_CPPFLAGS) -DIN_WESTON -weston_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS) $(LIBUNWIND_CFLAGS) +weston_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS) $(LIBUNWIND_CFLAGS) weston_LDADD = $(COMPOSITOR_LIBS) $(LIBUNWIND_LIBS) \ $(DLOPEN_LIBS) -lm libshared.la @@ -123,7 +123,7 @@ libsession_helper_la_SOURCES = \ src/weston-launch.h \ src/launcher-util.c \ src/launcher-util.h -libsession_helper_la_CFLAGS = $(GCC_CFLAGS) $(LIBDRM_CFLAGS) $(PIXMAN_CFLAGS) $(COMPOSITOR_CFLAGS) +libsession_helper_la_CFLAGS = $(AM_CFLAGS) $(LIBDRM_CFLAGS) $(PIXMAN_CFLAGS) $(COMPOSITOR_CFLAGS) libsession_helper_la_LIBADD = $(LIBDRM_LIBS) if ENABLE_DBUS @@ -154,7 +154,7 @@ bin_PROGRAMS += weston-launch weston_launch_SOURCES = src/weston-launch.c src/weston-launch.h weston_launch_CPPFLAGS = -DBINDIR='$(bindir)' weston_launch_CFLAGS= \ - $(GCC_CFLAGS) \ + $(AM_CFLAGS)\ $(PAM_CFLAGS) \ $(SYSTEMD_LOGIN_CFLAGS) \ $(LIBDRM_CFLAGS) @@ -200,7 +200,7 @@ gl_renderer_la_LIBADD = $(COMPOSITOR_LIBS) $(EGL_LIBS) gl_renderer_la_CFLAGS =\ $(COMPOSITOR_CFLAGS)\ $(EGL_CFLAGS) \ - $(GCC_CFLAGS) + $(AM_CFLAGS) gl_renderer_la_SOURCES = \ src/gl-renderer.h \ src/gl-renderer.c \ @@ -219,7 +219,7 @@ x11_backend_la_CFLAGS = \ $(PIXMAN_CFLAGS)\ $(CAIRO_CFLAGS) \ $(X11_COMPOSITOR_CFLAGS)\ - $(GCC_CFLAGS) + $(AM_CFLAGS) x11_backend_la_SOURCES = src/compositor-x11.c endif @@ -243,7 +243,7 @@ drm_backend_la_CFLAGS = \ $(COMPOSITOR_CFLAGS)\ $(EGL_CFLAGS) \ $(DRM_COMPOSITOR_CFLAGS)\ - $(GCC_CFLAGS) + $(AM_CFLAGS) drm_backend_la_SOURCES = \ src/compositor-drm.c\ $(INPUT_BACKEND_SOURCES)\ @@ -270,7 +270,7 @@ wayland_backend_la_CFLAGS = \ $(PIXMAN_CFLAGS)\ $(CAIRO_CFLAGS) \ $(WAYLAND_COMPOSITOR_CFLAGS)\ - $(GCC_CFLAGS) + $(AM_CFLAGS) wayland_backend_la_SOURCES = src/compositor-wayland.c nodist_wayland_backend_la_SOURCES =\ protocol/fullscreen-shell-protocol.c\ @@ -292,7 +292,7 @@ rpi_backend_la_LIBADD = $(COMPOSITOR_LIBS) \ libsession-helper.la\ libshared.la rpi_backend_la_CFLAGS =\ - $(GCC_CFLAGS) \ + $(AM_CFLAGS)\ $(COMPOSITOR_CFLAGS)\ $(RPI_COMPOSITOR_CFLAGS)\ $(RPI_BCM_HOST_CFLAGS) @@ -314,7 +314,7 @@ if ENABLE_HEADLESS_COMPOSITOR module_LTLIBRARIES += headless-backend.la headless_backend_la_LDFLAGS = -module -avoid-version headless_backend_la_LIBADD = $(COMPOSITOR_LIBS) libshared.la -headless_backend_la_CFLAGS = $(COMPOSITOR_CFLAGS) $(GCC_CFLAGS) +headless_backend_la_CFLAGS = $(COMPOSITOR_CFLAGS) $(AM_CFLAGS) headless_backend_la_SOURCES = src/compositor-headless.c endif @@ -332,7 +332,7 @@ fbdev_backend_la_CFLAGS = \ $(EGL_CFLAGS) \ $(FBDEV_COMPOSITOR_CFLAGS) \ $(PIXMAN_CFLAGS)\ - $(GCC_CFLAGS) + $(AM_CFLAGS) fbdev_backend_la_SOURCES = \ src/compositor-fbdev.c \ $(INPUT_BACKEND_SOURCES) @@ -347,7 +347,7 @@ rdp_backend_la_LIBADD = $(COMPOSITOR_LIBS) \ rdp_backend_la_CFLAGS =\ $(COMPOSITOR_CFLAGS)\ $(RDP_COMPOSITOR_CFLAGS)\ - $(GCC_CFLAGS) + $(AM_CFLAGS) rdp_backend_la_SOURCES = src/compositor-rdp.c endif @@ -355,7 +355,7 @@ if HAVE_LCMS module_LTLIBRARIES += cms-static.la cms_static_la_LDFLAGS = -module -avoid-version
Re: [PATCH wayland] cosmetic: gratuitous whitespace changes in event-loop.c
On 06/18/2015 09:48 AM, Derek Foreman wrote: Signed-off-by: Derek Foreman der...@osg.samsung.com --- src/event-loop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/event-loop.c b/src/event-loop.c index d1e03fa..130c7be 100644 --- a/src/event-loop.c +++ b/src/event-loop.c @@ -199,7 +199,7 @@ wl_event_loop_add_timer(struct wl_event_loop *loop, source-base.interface = timer_source_interface; source-base.fd = timerfd_create(CLOCK_MONOTONIC, - TFD_CLOEXEC | TFD_NONBLOCK); + TFD_CLOEXEC | TFD_NONBLOCK); source-func = func; return add_source(loop, source-base, WL_EVENT_READABLE, data); Looks good. (Seems like someone had tabs set to 4 and didn't notice.) Reviewed-by: Jon A. Cruz j...@osg.samsung.com -- Jon A. Cruz - Senior Open Source Developer Samsung Open Source Group j...@osg.samsung.com ___ wayland-devel mailing list wayland-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/wayland-devel
Re: [PATCH weston 2/2] Do not install the new helpers macro header file.
On 06/18/2015 05:20 AM, Pekka Paalanen wrote: These two patches look good, pushed: bbdd9bc..360cfb0 master - master Would you fix the license in helpers.h, too, please? I had updated the patches to use what I thought was the newer text. If the committed version doesn't match what we want to use, can someone point me to the preferred version? (I had used the text from one of the recent license change patches, but guess I might have missed the final form) -- Jon A. Cruz - Senior Open Source Developer Samsung Open Source Group j...@osg.samsung.com ___ wayland-devel mailing list wayland-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/wayland-devel
Re: [PATCH wayland] build: Use AM_CFLAGS instead of GCC_CFLAGS everywhere
On 06/18/2015 09:27 AM, Derek Foreman wrote: This will make it easier if we ever want to add new flags to everything in the future. Signed-off-by: Derek Foreman der...@osg.samsung.com --- Makefile.am | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 845c116..58f5595 100644 --- a/Makefile.am +++ b/Makefile.am @@ -34,7 +34,7 @@ else wayland_scanner = wayland-scanner endif -libwayland_util_la_CFLAGS = $(GCC_CFLAGS) +libwayland_util_la_CFLAGS = $(AM_CFLAGS) libwayland_util_la_SOURCES = \ src/wayland-util.c \ src/wayland-util.h @@ -65,7 +65,7 @@ nodist_include_HEADERS =\ protocol/wayland-server-protocol.h \ protocol/wayland-client-protocol.h -libwayland_server_la_CFLAGS = $(FFI_CFLAGS) $(GCC_CFLAGS) -pthread +libwayland_server_la_CFLAGS = $(FFI_CFLAGS) $(AM_CFLAGS) -pthread libwayland_server_la_LIBADD = $(FFI_LIBS) libwayland-util.la -lrt -lm libwayland_server_la_LDFLAGS = -version-info 1:0:1 libwayland_server_la_SOURCES = \ @@ -77,7 +77,7 @@ nodist_libwayland_server_la_SOURCES = \ protocol/wayland-server-protocol.h \ protocol/wayland-protocol.c -libwayland_client_la_CFLAGS = $(FFI_CFLAGS) $(GCC_CFLAGS) -pthread +libwayland_client_la_CFLAGS = $(FFI_CFLAGS) $(AM_CFLAGS) -pthread libwayland_client_la_LIBADD = $(FFI_LIBS) libwayland-util.la -lrt -lm libwayland_client_la_LDFLAGS = -version-info 3:0:3 libwayland_client_la_SOURCES = \ @@ -131,7 +131,7 @@ libwayland_cursor_la_LIBADD = libwayland-client.la pkgconfig_DATA += cursor/wayland-cursor.pc libwayland_cursor_la_CFLAGS =\ - $(GCC_CFLAGS) \ + $(AM_CFLAGS)\ -I$(top_builddir)/src \ -I$(top_srcdir)/src \ -DICONDIR=\$(ICONDIR)\ Looks good. As I mentioned to Derek earlier I had just hit this in the documentation when checking for some other things I was adding (and disentangling for testing). Reviewed-by: Jon A. Cruz j...@osg.samsung.com -- Jon A. Cruz - Senior Open Source Developer Samsung Open Source Group j...@osg.samsung.com ___ wayland-devel mailing list wayland-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/wayland-devel
[PATCH wayland] build: Use AM_CFLAGS instead of GCC_CFLAGS everywhere
This will make it easier if we ever want to add new flags to everything in the future. Signed-off-by: Derek Foreman der...@osg.samsung.com --- Makefile.am | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 845c116..58f5595 100644 --- a/Makefile.am +++ b/Makefile.am @@ -34,7 +34,7 @@ else wayland_scanner = wayland-scanner endif -libwayland_util_la_CFLAGS = $(GCC_CFLAGS) +libwayland_util_la_CFLAGS = $(AM_CFLAGS) libwayland_util_la_SOURCES = \ src/wayland-util.c \ src/wayland-util.h @@ -65,7 +65,7 @@ nodist_include_HEADERS = \ protocol/wayland-server-protocol.h \ protocol/wayland-client-protocol.h -libwayland_server_la_CFLAGS = $(FFI_CFLAGS) $(GCC_CFLAGS) -pthread +libwayland_server_la_CFLAGS = $(FFI_CFLAGS) $(AM_CFLAGS) -pthread libwayland_server_la_LIBADD = $(FFI_LIBS) libwayland-util.la -lrt -lm libwayland_server_la_LDFLAGS = -version-info 1:0:1 libwayland_server_la_SOURCES = \ @@ -77,7 +77,7 @@ nodist_libwayland_server_la_SOURCES = \ protocol/wayland-server-protocol.h \ protocol/wayland-protocol.c -libwayland_client_la_CFLAGS = $(FFI_CFLAGS) $(GCC_CFLAGS) -pthread +libwayland_client_la_CFLAGS = $(FFI_CFLAGS) $(AM_CFLAGS) -pthread libwayland_client_la_LIBADD = $(FFI_LIBS) libwayland-util.la -lrt -lm libwayland_client_la_LDFLAGS = -version-info 3:0:3 libwayland_client_la_SOURCES = \ @@ -131,7 +131,7 @@ libwayland_cursor_la_LIBADD = libwayland-client.la pkgconfig_DATA += cursor/wayland-cursor.pc libwayland_cursor_la_CFLAGS = \ - $(GCC_CFLAGS) \ + $(AM_CFLAGS)\ -I$(top_builddir)/src \ -I$(top_srcdir)/src \ -DICONDIR=\$(ICONDIR)\ -- 2.1.4 ___ wayland-devel mailing list wayland-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/wayland-devel
Re: [PATCH wayland 2/5] build: Stop putting FFI_CFLAGS in AM_CFLAGS
On 18/06/15 02:51 AM, Quentin Glidic wrote: On 2015-06-17 22:13, Derek Foreman wrote: AM_CFLAGS are the defaults passed to anything that doesn't specify its own _CFLAGS, so instead of putting FFI_CFLAGS there, let's just add that to anything that actually needs it. Then please use $(AM_CFLAGS) everywhere $(GCC_CFLAGS) is used alone when overriding _CFLAGS. This way, we can easily add e.g. $(CLANG_CFLAGS) or other generic flags in the future. Could be a follow-up patch. Hmm, good point. follow-up sent. Thanks. The only thing that needs it but didn't have it specifically was libwayland_util (for connection.c) Signed-off-by: Derek Foreman der...@osg.samsung.com --- Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 96ad0be..34f8473 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,7 +9,7 @@ AM_CPPFLAGS =\ -I$(top_srcdir)/src \ -I$(top_builddir)/protocol -AM_CFLAGS = $(GCC_CFLAGS) $(FFI_CFLAGS) +AM_CFLAGS = $(GCC_CFLAGS) aclocaldir = $(datadir)/aclocal dist_aclocal_DATA = wayland-scanner.m4 @@ -39,6 +39,7 @@ nodist_include_HEADERS = \ protocol/wayland-server-protocol.h \ protocol/wayland-client-protocol.h +libwayland_util_la_CFLAGS = $(FFI_CFLAGS) $(GCC_CFLAGS) Like here, it should be $(FFI_CFLAGS) $(AM_CFLAGS) libwayland_util_la_SOURCES =\ src/connection.c\ src/wayland-util.c \ ___ wayland-devel mailing list wayland-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/wayland-devel
Re: [PATCH weston] build: Use AM_CFLAGS instead of GCC_CFLAGS
On 06/18/2015 09:43 AM, Derek Foreman wrote: AM_CFLAGS is the default for any target that doesn't specify its own cflags. We should use AM_CFLAGS in preference to GCC_CFLAGS so we can change AM_CFLAGS and get all targets. Signed-off-by: Derek Foreman der...@osg.samsung.com --- Makefile.am | 64 ++--- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/Makefile.am b/Makefile.am index 261798c..f0f19cd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -63,7 +63,7 @@ bin_PROGRAMS += weston weston_LDFLAGS = -export-dynamic weston_CPPFLAGS = $(AM_CPPFLAGS) -DIN_WESTON -weston_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS) $(LIBUNWIND_CFLAGS) +weston_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS) $(LIBUNWIND_CFLAGS) weston_LDADD = $(COMPOSITOR_LIBS) $(LIBUNWIND_LIBS) \ $(DLOPEN_LIBS) -lm libshared.la @@ -123,7 +123,7 @@ libsession_helper_la_SOURCES =\ src/weston-launch.h \ src/launcher-util.c \ src/launcher-util.h -libsession_helper_la_CFLAGS = $(GCC_CFLAGS) $(LIBDRM_CFLAGS) $(PIXMAN_CFLAGS) $(COMPOSITOR_CFLAGS) +libsession_helper_la_CFLAGS = $(AM_CFLAGS) $(LIBDRM_CFLAGS) $(PIXMAN_CFLAGS) $(COMPOSITOR_CFLAGS) libsession_helper_la_LIBADD = $(LIBDRM_LIBS) if ENABLE_DBUS @@ -154,7 +154,7 @@ bin_PROGRAMS += weston-launch weston_launch_SOURCES = src/weston-launch.c src/weston-launch.h weston_launch_CPPFLAGS = -DBINDIR='$(bindir)' weston_launch_CFLAGS=\ - $(GCC_CFLAGS) \ + $(AM_CFLAGS)\ $(PAM_CFLAGS) \ $(SYSTEMD_LOGIN_CFLAGS) \ $(LIBDRM_CFLAGS) @@ -200,7 +200,7 @@ gl_renderer_la_LIBADD = $(COMPOSITOR_LIBS) $(EGL_LIBS) gl_renderer_la_CFLAGS = \ $(COMPOSITOR_CFLAGS)\ $(EGL_CFLAGS) \ - $(GCC_CFLAGS) + $(AM_CFLAGS) gl_renderer_la_SOURCES = \ src/gl-renderer.h \ src/gl-renderer.c \ @@ -219,7 +219,7 @@ x11_backend_la_CFLAGS = \ $(PIXMAN_CFLAGS)\ $(CAIRO_CFLAGS) \ $(X11_COMPOSITOR_CFLAGS)\ - $(GCC_CFLAGS) + $(AM_CFLAGS) x11_backend_la_SOURCES = src/compositor-x11.c endif @@ -243,7 +243,7 @@ drm_backend_la_CFLAGS = \ $(COMPOSITOR_CFLAGS)\ $(EGL_CFLAGS) \ $(DRM_COMPOSITOR_CFLAGS)\ - $(GCC_CFLAGS) + $(AM_CFLAGS) drm_backend_la_SOURCES = \ src/compositor-drm.c\ $(INPUT_BACKEND_SOURCES)\ @@ -270,7 +270,7 @@ wayland_backend_la_CFLAGS = \ $(PIXMAN_CFLAGS)\ $(CAIRO_CFLAGS) \ $(WAYLAND_COMPOSITOR_CFLAGS)\ - $(GCC_CFLAGS) + $(AM_CFLAGS) wayland_backend_la_SOURCES = src/compositor-wayland.c nodist_wayland_backend_la_SOURCES = \ protocol/fullscreen-shell-protocol.c\ @@ -292,7 +292,7 @@ rpi_backend_la_LIBADD = $(COMPOSITOR_LIBS)\ libsession-helper.la\ libshared.la rpi_backend_la_CFLAGS = \ - $(GCC_CFLAGS) \ + $(AM_CFLAGS)\ $(COMPOSITOR_CFLAGS)\ $(RPI_COMPOSITOR_CFLAGS)\ $(RPI_BCM_HOST_CFLAGS) @@ -314,7 +314,7 @@ if ENABLE_HEADLESS_COMPOSITOR module_LTLIBRARIES += headless-backend.la headless_backend_la_LDFLAGS = -module -avoid-version headless_backend_la_LIBADD = $(COMPOSITOR_LIBS) libshared.la -headless_backend_la_CFLAGS = $(COMPOSITOR_CFLAGS) $(GCC_CFLAGS) +headless_backend_la_CFLAGS = $(COMPOSITOR_CFLAGS) $(AM_CFLAGS) headless_backend_la_SOURCES = src/compositor-headless.c endif @@ -332,7 +332,7 @@ fbdev_backend_la_CFLAGS = \ $(EGL_CFLAGS) \ $(FBDEV_COMPOSITOR_CFLAGS) \ $(PIXMAN_CFLAGS)\ - $(GCC_CFLAGS) + $(AM_CFLAGS) fbdev_backend_la_SOURCES = \ src/compositor-fbdev.c \ $(INPUT_BACKEND_SOURCES) @@ -347,7 +347,7 @@ rdp_backend_la_LIBADD = $(COMPOSITOR_LIBS) \ rdp_backend_la_CFLAGS = \ $(COMPOSITOR_CFLAGS)\ $(RDP_COMPOSITOR_CFLAGS)\ - $(GCC_CFLAGS) + $(AM_CFLAGS) rdp_backend_la_SOURCES = src/compositor-rdp.c endif @@ -355,7 +355,7 @@ if HAVE_LCMS module_LTLIBRARIES +=
Re: [PATCH wayland] build: Build libwayland-private
On Thu, Jun 18, 2015 at 05:47:22PM -0500, Derek Foreman wrote: This splits the bulk of libwayland-util into libwayland-private. libwayland-util (which is just wayland-util.c) is for use with the scanner. libwayland-private is everything else. Most things will want to link both libs. Signed-off-by: Derek Foreman der...@osg.samsung.com Reviewed-by: Peter Hutterer peter.hutte...@who-t.net Cheers, Peter --- Makefile.am | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 58f5595..234f90c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,10 +42,11 @@ libwayland_util_la_SOURCES = \ noinst_LTLIBRARIES = libwayland-util.la if ENABLE_LIBRARIES +noinst_LTLIBRARIES += libwayland-private.la lib_LTLIBRARIES = libwayland-server.la libwayland-client.la -libwayland_util_la_CFLAGS += $(FFI_CFLAGS) -libwayland_util_la_SOURCES +=\ +libwayland_private_la_CFLAGS = $(FFI_CFLAGS) $(AM_CFLAGS) +libwayland_private_la_SOURCES = \ src/connection.c\ src/wayland-os.c\ src/wayland-os.h\ @@ -66,7 +67,7 @@ nodist_include_HEADERS =\ protocol/wayland-client-protocol.h libwayland_server_la_CFLAGS = $(FFI_CFLAGS) $(AM_CFLAGS) -pthread -libwayland_server_la_LIBADD = $(FFI_LIBS) libwayland-util.la -lrt -lm +libwayland_server_la_LIBADD = $(FFI_LIBS) libwayland-private.la libwayland-util.la -lrt -lm libwayland_server_la_LDFLAGS = -version-info 1:0:1 libwayland_server_la_SOURCES = \ src/wayland-server.c\ @@ -78,7 +79,7 @@ nodist_libwayland_server_la_SOURCES = \ protocol/wayland-protocol.c libwayland_client_la_CFLAGS = $(FFI_CFLAGS) $(AM_CFLAGS) -pthread -libwayland_client_la_LIBADD = $(FFI_LIBS) libwayland-util.la -lrt -lm +libwayland_client_la_LIBADD = $(FFI_LIBS) libwayland-private.la libwayland-util.la -lrt -lm libwayland_client_la_LDFLAGS = -version-info 3:0:3 libwayland_client_la_SOURCES = \ src/wayland-client.c @@ -175,6 +176,7 @@ libtest_runner_la_SOURCES = \ tests/test-compositor.h \ tests/test-compositor.c libtest_runner_la_LIBADD = \ + libwayland-private.la \ libwayland-util.la \ libwayland-client.la\ libwayland-server.la\ @@ -229,4 +231,4 @@ os_wrappers_test_LDADD = libtest-runner.la exec_fd_leak_checker_SOURCES = tests/exec-fd-leak-checker.c exec_fd_leak_checker_LDADD = libtest-runner.la -endif +endif #ENABLE_LIBRARIES -- 2.1.4 ___ wayland-devel mailing list wayland-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/wayland-devel
[PATCH wayland] build: Build libwayland-util-light for the scanner
This introduces libwayland-util-light, a small subset of libwayland-util that supplies just the bits the scanner needs. Signed-off-by: Derek Foreman der...@osg.samsung.com --- Makefile.am | 17 ++--- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index 58f5595..a12b46a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,25 +27,28 @@ wayland_scanner = $(top_builddir)/wayland-scanner bin_PROGRAMS = wayland-scanner wayland_scanner_SOURCES = src/scanner.c wayland_scanner_CFLAGS = $(EXPAT_CFLAGS) $(AM_CFLAGS) -wayland_scanner_LDADD = $(EXPAT_LIBS) libwayland-util.la +wayland_scanner_LDADD = $(EXPAT_LIBS) libwayland-util-light.la $(BUILT_SOURCES) : wayland-scanner pkgconfig_DATA += src/wayland-scanner.pc else wayland_scanner = wayland-scanner endif -libwayland_util_la_CFLAGS = $(AM_CFLAGS) -libwayland_util_la_SOURCES = \ +libwayland_util_light_la_CFLAGS = $(AM_CFLAGS) +libwayland_util_light_la_SOURCES = \ src/wayland-util.c \ src/wayland-util.h -noinst_LTLIBRARIES = libwayland-util.la +noinst_LTLIBRARIES = libwayland-util-light.la if ENABLE_LIBRARIES +noinst_LTLIBRARIES += libwayland-util.la lib_LTLIBRARIES = libwayland-server.la libwayland-client.la -libwayland_util_la_CFLAGS += $(FFI_CFLAGS) -libwayland_util_la_SOURCES += \ +libwayland_util_la_CFLAGS = $(FFI_CFLAGS) $(AM_CFLAGS) +libwayland_util_la_SOURCES = \ + src/wayland-util.c \ + src/wayland-util.h \ src/connection.c\ src/wayland-os.c\ src/wayland-os.h\ @@ -229,4 +232,4 @@ os_wrappers_test_LDADD = libtest-runner.la exec_fd_leak_checker_SOURCES = tests/exec-fd-leak-checker.c exec_fd_leak_checker_LDADD = libtest-runner.la -endif +endif #ENABLE_LIBRARIES -- 2.1.4 ___ wayland-devel mailing list wayland-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/wayland-devel
[PATCH wayland] build: Build libwayland-private
This splits the bulk of libwayland-util into libwayland-private. libwayland-util (which is just wayland-util.c) is for use with the scanner. libwayland-private is everything else. Most things will want to link both libs. Signed-off-by: Derek Foreman der...@osg.samsung.com --- Makefile.am | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 58f5595..234f90c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,10 +42,11 @@ libwayland_util_la_SOURCES =\ noinst_LTLIBRARIES = libwayland-util.la if ENABLE_LIBRARIES +noinst_LTLIBRARIES += libwayland-private.la lib_LTLIBRARIES = libwayland-server.la libwayland-client.la -libwayland_util_la_CFLAGS += $(FFI_CFLAGS) -libwayland_util_la_SOURCES += \ +libwayland_private_la_CFLAGS = $(FFI_CFLAGS) $(AM_CFLAGS) +libwayland_private_la_SOURCES =\ src/connection.c\ src/wayland-os.c\ src/wayland-os.h\ @@ -66,7 +67,7 @@ nodist_include_HEADERS = \ protocol/wayland-client-protocol.h libwayland_server_la_CFLAGS = $(FFI_CFLAGS) $(AM_CFLAGS) -pthread -libwayland_server_la_LIBADD = $(FFI_LIBS) libwayland-util.la -lrt -lm +libwayland_server_la_LIBADD = $(FFI_LIBS) libwayland-private.la libwayland-util.la -lrt -lm libwayland_server_la_LDFLAGS = -version-info 1:0:1 libwayland_server_la_SOURCES = \ src/wayland-server.c\ @@ -78,7 +79,7 @@ nodist_libwayland_server_la_SOURCES = \ protocol/wayland-protocol.c libwayland_client_la_CFLAGS = $(FFI_CFLAGS) $(AM_CFLAGS) -pthread -libwayland_client_la_LIBADD = $(FFI_LIBS) libwayland-util.la -lrt -lm +libwayland_client_la_LIBADD = $(FFI_LIBS) libwayland-private.la libwayland-util.la -lrt -lm libwayland_client_la_LDFLAGS = -version-info 3:0:3 libwayland_client_la_SOURCES = \ src/wayland-client.c @@ -175,6 +176,7 @@ libtest_runner_la_SOURCES = \ tests/test-compositor.h \ tests/test-compositor.c libtest_runner_la_LIBADD = \ + libwayland-private.la \ libwayland-util.la \ libwayland-client.la\ libwayland-server.la\ @@ -229,4 +231,4 @@ os_wrappers_test_LDADD = libtest-runner.la exec_fd_leak_checker_SOURCES = tests/exec-fd-leak-checker.c exec_fd_leak_checker_LDADD = libtest-runner.la -endif +endif #ENABLE_LIBRARIES -- 2.1.4 ___ wayland-devel mailing list wayland-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/wayland-devel
Re: Stacking subsurface siblings
On Wed, 17 Jun 2015 09:51:04 -0700 Bill Spitzak spit...@gmail.com wrote: On Wed, Jun 17, 2015 at 9:35 AM, Bill Spitzak spit...@gmail.com wrote: The problem is that the way it works is *not* a tree, but some kind of list. As described the following code: wl_subsurface_place_below(RED-subsurface, GREEN-surface); wl_subsurface_place_below(GREEN-subsurface, BLUE-surface); Produces the order GREEN, RED, BLUE instead. Want to apologize for the top-posting. That is because I am forced to use the gmail web api now, which seems to encourage it. I think this email is correctly formatted, with the quoted text at the top and with irrelevant parts edited out. In response to another email, the reason the result is the order given is that place_below(A,B) is implemented as put A at the start of the list. No, that really should not be how the code works: http://cgit.freedesktop.org/wayland/weston/tree/src/compositor.c?id=1.8.0#n3423 As you can see, it is indeed list operations like I said. You take the given surface first out of the list, and then add it back after the given reference surface in the list. Judging from these two functions, the list is ordered as the head being the top, and the tail being the bottom. So, as far as I understand the code, it really is put the surface immediately below the reference surface. Looking at Arnaud's code and the specification for the initial ordering, the original order as surfaces are created is B, R, G. The parent B is created first, then R is set as child to B, and G is set as another child to B, which should lead to B, R, G. (bottom to top) The first statement produces the list R,G. The second statement then first adds B to the list, producing either R,G,B or R,B,G or B,R,G. Then it moves G to the start of the list, producing G,R,B or G,B,R. Arnaud's code: surf[BLUE] = surface_create(ctx, NULL, 100, 100, 0, 0, 0xffff); if (!surf[BLUE]) die(failed to create root surface); surf[RED] = surface_create(ctx, surf[BLUE], 100, 100, -100, -100, 0x); surf[GREEN] = surface_create(ctx, surf[BLUE], 100, 100, -50, -50, 0xff00ff00); #if 0 wl_subsurface_place_below(surf[GREEN]-subsurface, surf[BLUE]-surface); wl_subsurface_place_below(surf[RED]-subsurface, surf[GREEN]-surface); #else wl_subsurface_place_below(surf[RED]-subsurface, surf[GREEN]-surface); wl_subsurface_place_below(surf[GREEN]-subsurface, surf[BLUE]-surface); #endif I can't see how you come to your conclusion, would you care to explain? If place_below(A,B) was implemented as put A before B in the list then the second statement would produce R,G,B or G,B,R. Although it is possible to produce the expected result, this still allows an unexpected order. I really don't understand what the ambiguity is. As far as I understand, there is no room for interpretation in the specification. That certainly was the intent, anyway. It says what the ordering is when a wl_subsurface is created, and it says what happens on place_above/below. Then, again, I wrote the spec, I know what I mean, so I'm blind to any ambiguities there might be. Thanks, pq ___ wayland-devel mailing list wayland-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/wayland-devel
Re: [PATCH wayland 2/5] build: Stop putting FFI_CFLAGS in AM_CFLAGS
On 2015-06-17 22:13, Derek Foreman wrote: AM_CFLAGS are the defaults passed to anything that doesn't specify its own _CFLAGS, so instead of putting FFI_CFLAGS there, let's just add that to anything that actually needs it. Then please use $(AM_CFLAGS) everywhere $(GCC_CFLAGS) is used alone when overriding _CFLAGS. This way, we can easily add e.g. $(CLANG_CFLAGS) or other generic flags in the future. Could be a follow-up patch. The only thing that needs it but didn't have it specifically was libwayland_util (for connection.c) Signed-off-by: Derek Foreman der...@osg.samsung.com --- Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 96ad0be..34f8473 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,7 +9,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_builddir)/protocol -AM_CFLAGS = $(GCC_CFLAGS) $(FFI_CFLAGS) +AM_CFLAGS = $(GCC_CFLAGS) aclocaldir = $(datadir)/aclocal dist_aclocal_DATA = wayland-scanner.m4 @@ -39,6 +39,7 @@ nodist_include_HEADERS =\ protocol/wayland-server-protocol.h \ protocol/wayland-client-protocol.h +libwayland_util_la_CFLAGS = $(FFI_CFLAGS) $(GCC_CFLAGS) Like here, it should be $(FFI_CFLAGS) $(AM_CFLAGS) libwayland_util_la_SOURCES = \ src/connection.c\ src/wayland-util.c \ -- Quentin “Sardem FF7” Glidic ___ wayland-devel mailing list wayland-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/wayland-devel
Re: [PATCH weston 09/17] src: Update boilerplate from MIT X11 license to MIT Expat license
Le 13/06/2015 00:04, Bryce Harrington a écrit : Signed-off-by: Bryce Harrington br...@osg.samsung.com --- src/animation.c | 35 +++ src/bindings.c| 35 +++ src/clipboard.c | 35 +++ src/cms-colord.c | 35 +++ src/cms-helper.c | 35 +++ src/cms-helper.h | 35 +++ src/cms-static.c | 35 +++ src/compositor-drm.c | 35 +++ Reviewed-By: David FORT cont...@hardening-consulting.com I agree with the changes in the compositor-rdp.c file. -- David FORT website: http://www.hardening-consulting.com/ ___ wayland-devel mailing list wayland-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/wayland-devel
