* [RFC/RFT 0/2] wayland/weston: upgrade to 1.5.0
@ 2014-05-22 16:02 Tim Orling
2014-05-22 16:02 ` [RFC/RFT 1/2] wayland: " Tim Orling
2014-05-22 16:02 ` [RFC/RFT 2/2] weston: " Tim Orling
0 siblings, 2 replies; 7+ messages in thread
From: Tim Orling @ 2014-05-22 16:02 UTC (permalink / raw)
To: openembedded-core
From: Tim Orling <TicoTimo@gmail.com>
The following changes since commit e273301efa0037a13c3a60b4414140364d9c9873:
gstreamer/lame: Better gcc 4.9 fix (2014-05-15 23:27:41 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib timo/wayland-weston-1.5.0
http://git.openembedded.org/openembedded-core-contrib/log/?h=timo/wayland-weston-1.5.0
* has not been functionally tested yet
* for JaMa test-dependencies:
-> make-lcms-configurable.patch does not work as intended, needs attention
-> poppler no longer included in weston
Tim Orling (2):
wayland: upgrade to 1.5.0
weston: upgrade to 1.5.0
...disable-macro-checks-not-used-for-scanner.patch | 2 +-
.../wayland/wayland/just-scanner.patch | 49 ----------------------
.../wayland/{wayland_1.4.0.bb => wayland_1.5.0.bb} | 7 ++--
...emove-dependence-on-wayland-scanner-flags.patch | 30 -------------
.../weston/disable-wayland-scanner-pkg-check.patch | 13 ++++++
.../wayland/weston/make-lcms-configurable.patch | 22 ++++++++++
.../wayland/{weston_1.4.0.bb => weston_1.5.0.bb} | 13 +++---
7 files changed, 47 insertions(+), 89 deletions(-)
delete mode 100644 meta/recipes-graphics/wayland/wayland/just-scanner.patch
rename meta/recipes-graphics/wayland/{wayland_1.4.0.bb => wayland_1.5.0.bb} (89%)
delete mode 100644 meta/recipes-graphics/wayland/weston/0001-remove-dependence-on-wayland-scanner-flags.patch
create mode 100644 meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch
create mode 100644 meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch
rename meta/recipes-graphics/wayland/{weston_1.4.0.bb => weston_1.5.0.bb} (88%)
--
1.8.3.2
^ permalink raw reply [flat|nested] 7+ messages in thread* [RFC/RFT 1/2] wayland: upgrade to 1.5.0 2014-05-22 16:02 [RFC/RFT 0/2] wayland/weston: upgrade to 1.5.0 Tim Orling @ 2014-05-22 16:02 ` Tim Orling 2014-06-03 4:51 ` Robert Yang 2014-05-22 16:02 ` [RFC/RFT 2/2] weston: " Tim Orling 1 sibling, 1 reply; 7+ messages in thread From: Tim Orling @ 2014-05-22 16:02 UTC (permalink / raw) To: openembedded-core From: Tim Orling <TicoTimo@gmail.com> * update disable-macro-checks-not-used-for-scanner.patch = trivial change to non-patched text (+ posix_fallocate) * drop just-scanner.patch, no longer needed Signed-off-by: Tim Orling <TicoTimo@gmail.com> --- ...disable-macro-checks-not-used-for-scanner.patch | 2 +- .../wayland/wayland/just-scanner.patch | 49 ---------------------- .../wayland/{wayland_1.4.0.bb => wayland_1.5.0.bb} | 7 ++-- 3 files changed, 4 insertions(+), 54 deletions(-) delete mode 100644 meta/recipes-graphics/wayland/wayland/just-scanner.patch rename meta/recipes-graphics/wayland/{wayland_1.4.0.bb => wayland_1.5.0.bb} (89%) diff --git a/meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch b/meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch index bf499bb..cd8bc55 100644 --- a/meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch +++ b/meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch @@ -20,7 +20,7 @@ diff --git a/configure.ac b/configure.ac +++ b/configure.ac @@ -41,16 +41,16 @@ AC_SUBST(GCC_CFLAGS) - AC_CHECK_FUNCS([accept4 mkostemp]) + AC_CHECK_FUNCS([accept4 mkostemp posix_fallocate]) -AC_CHECK_DECL(SFD_CLOEXEC,[], - [AC_MSG_ERROR("SFD_CLOEXEC is needed to compile wayland")], diff --git a/meta/recipes-graphics/wayland/wayland/just-scanner.patch b/meta/recipes-graphics/wayland/wayland/just-scanner.patch deleted file mode 100644 index ae9935e..0000000 --- a/meta/recipes-graphics/wayland/wayland/just-scanner.patch +++ /dev/null @@ -1,49 +0,0 @@ -From f674544d4f6f5f763e449207da77a561b22eff97 Mon Sep 17 00:00:00 2001 -From: Valentin Popa <valentin.popa@intel.com> -Date: Fri, 7 Feb 2014 16:36:47 +0200 -Subject: [PATCH] just scanner - -We only build wayland-native for the scanner, so disable the bits we don't -actually need. This gives us a small speed up but importantly should allow -wayland-native to compile on older hosts such as CentOS 5 which currently fails: - -| wayland-1.0.6/src/wayland-server.c:1245: error: 'O_CLOEXEC' undeclared (first use in this function) -| wayland-1.0.6/src/event-loop.c:34:25: error: sys/timerfd.h: No such file or directory -| wayland-1.0.6/src/event-loop.c:199: error: 'CLOCK_MONOTONIC' undeclared (first use in this function) -| wayland-1.0.6/src/event-loop.c:199: error: 'TFD_CLOEXEC' undeclared (first use in this function) -| wayland-1.0.6/src/event-loop.c:268: error: 'SFD_CLOEXEC' undeclared (first use in this function) - -Upstream-Status: Inappropriate -Signed-off-by: Ross Burton <ross.burton@intel.com> -Signed-off-by: Valentin Popa <valentin.popa@intel.com> ---- - Makefile.am | 2 +- - src/Makefile.am | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 99607b0..ecce1f1 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -2,7 +2,7 @@ if BUILD_DOCS - doc_subdir = doc - endif - --SUBDIRS = protocol src $(doc_subdir) tests cursor -+SUBDIRS = protocol src $(doc_subdir) - - ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - -diff --git a/src/Makefile.am b/src/Makefile.am -index 15f44a5..b938d17 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -1,4 +1,4 @@ --lib_LTLIBRARIES = libwayland-server.la libwayland-client.la -+#lib_LTLIBRARIES = libwayland-server.la libwayland-client.la - noinst_LTLIBRARIES = libwayland-util.la - - include_HEADERS = \ --- -1.8.3.2 - diff --git a/meta/recipes-graphics/wayland/wayland_1.4.0.bb b/meta/recipes-graphics/wayland/wayland_1.5.0.bb similarity index 89% rename from meta/recipes-graphics/wayland/wayland_1.4.0.bb rename to meta/recipes-graphics/wayland/wayland_1.5.0.bb index 9f6419d..b1ae59e 100644 --- a/meta/recipes-graphics/wayland/wayland_1.4.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.5.0.bb @@ -11,10 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1d4476a7d98dd5691c53d4d43a510c72 \ file://src/wayland-server.c;endline=21;md5=079ae21dbf98ada52ec23744851b0a5c" SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "332cf9191837be12638a29265ed7cf46" -SRC_URI[sha256sum] = "18f33b9f15b4c8b662fb1968e7636e7926b419dfc48de8a164b3a3d7095c5a58" - -SRC_URI_append_class-native = " file://just-scanner.patch \ +SRC_URI[md5sum] = "1d882776b27329b91d2d500b6d66dd1d" +SRC_URI[sha256sum] = "0069e1e9af888b3e05384380ad8cc6c976ea3e81d08ba19b7675ce1d693a41b5" +SRC_URI_append_class-native = " \ file://disable-macro-checks-not-used-for-scanner.patch \ " EXTRA_OECONF_class-native = "--disable-documentation --enable-scanner" -- 1.8.3.2 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [RFC/RFT 1/2] wayland: upgrade to 1.5.0 2014-05-22 16:02 ` [RFC/RFT 1/2] wayland: " Tim Orling @ 2014-06-03 4:51 ` Robert Yang 2014-06-03 10:15 ` Robert Yang 0 siblings, 1 reply; 7+ messages in thread From: Robert Yang @ 2014-06-03 4:51 UTC (permalink / raw) To: Tim Orling, openembedded-core On 05/23/2014 12:02 AM, Tim Orling wrote: > From: Tim Orling <TicoTimo@gmail.com> > > * update disable-macro-checks-not-used-for-scanner.patch > = trivial change to non-patched text (+ posix_fallocate) > * drop just-scanner.patch, no longer needed I'm afraid that we can't drop this patch, I met the same error on CentOS 5.10 again, as described in the original patch: From f674544d4f6f5f763e449207da77a561b22eff97 Mon Sep 17 00:00:00 2001 From: Valentin Popa <valentin.popa@intel.com> Date: Fri, 7 Feb 2014 16:36:47 +0200 Subject: [PATCH] just scanner We only build wayland-native for the scanner, so disable the bits we don't actually need. This gives us a small speed up but importantly should allow wayland-native to compile on older hosts such as CentOS 5 which currently fails: | wayland-1.0.6/src/wayland-server.c:1245: error: 'O_CLOEXEC' undeclared (first use in this function) | wayland-1.0.6/src/event-loop.c:34:25: error: sys/timerfd.h: No such file or directory | wayland-1.0.6/src/event-loop.c:199: error: 'CLOCK_MONOTONIC' undeclared (first use in this function) | wayland-1.0.6/src/event-loop.c:199: error: 'TFD_CLOEXEC' undeclared (first use in this function) | wayland-1.0.6/src/event-loop.c:268: error: 'SFD_CLOEXEC' undeclared (first use in this function) Upstream-Status: Inappropriate Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Valentin Popa <valentin.popa@intel.com> // Robert > > Signed-off-by: Tim Orling <TicoTimo@gmail.com> > --- > ...disable-macro-checks-not-used-for-scanner.patch | 2 +- > .../wayland/wayland/just-scanner.patch | 49 ---------------------- > .../wayland/{wayland_1.4.0.bb => wayland_1.5.0.bb} | 7 ++-- > 3 files changed, 4 insertions(+), 54 deletions(-) > delete mode 100644 meta/recipes-graphics/wayland/wayland/just-scanner.patch > rename meta/recipes-graphics/wayland/{wayland_1.4.0.bb => wayland_1.5.0.bb} (89%) > > diff --git a/meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch b/meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch > index bf499bb..cd8bc55 100644 > --- a/meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch > +++ b/meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch > @@ -20,7 +20,7 @@ diff --git a/configure.ac b/configure.ac > +++ b/configure.ac > @@ -41,16 +41,16 @@ AC_SUBST(GCC_CFLAGS) > > - AC_CHECK_FUNCS([accept4 mkostemp]) > + AC_CHECK_FUNCS([accept4 mkostemp posix_fallocate]) > > -AC_CHECK_DECL(SFD_CLOEXEC,[], > - [AC_MSG_ERROR("SFD_CLOEXEC is needed to compile wayland")], > diff --git a/meta/recipes-graphics/wayland/wayland/just-scanner.patch b/meta/recipes-graphics/wayland/wayland/just-scanner.patch > deleted file mode 100644 > index ae9935e..0000000 > --- a/meta/recipes-graphics/wayland/wayland/just-scanner.patch > +++ /dev/null > @@ -1,49 +0,0 @@ > -From f674544d4f6f5f763e449207da77a561b22eff97 Mon Sep 17 00:00:00 2001 > -From: Valentin Popa <valentin.popa@intel.com> > -Date: Fri, 7 Feb 2014 16:36:47 +0200 > -Subject: [PATCH] just scanner > - > -We only build wayland-native for the scanner, so disable the bits we don't > -actually need. This gives us a small speed up but importantly should allow > -wayland-native to compile on older hosts such as CentOS 5 which currently fails: > - > -| wayland-1.0.6/src/wayland-server.c:1245: error: 'O_CLOEXEC' undeclared (first use in this function) > -| wayland-1.0.6/src/event-loop.c:34:25: error: sys/timerfd.h: No such file or directory > -| wayland-1.0.6/src/event-loop.c:199: error: 'CLOCK_MONOTONIC' undeclared (first use in this function) > -| wayland-1.0.6/src/event-loop.c:199: error: 'TFD_CLOEXEC' undeclared (first use in this function) > -| wayland-1.0.6/src/event-loop.c:268: error: 'SFD_CLOEXEC' undeclared (first use in this function) > - > -Upstream-Status: Inappropriate > -Signed-off-by: Ross Burton <ross.burton@intel.com> > -Signed-off-by: Valentin Popa <valentin.popa@intel.com> > ---- > - Makefile.am | 2 +- > - src/Makefile.am | 2 +- > - 2 files changed, 2 insertions(+), 2 deletions(-) > - > -diff --git a/Makefile.am b/Makefile.am > -index 99607b0..ecce1f1 100644 > ---- a/Makefile.am > -+++ b/Makefile.am > -@@ -2,7 +2,7 @@ if BUILD_DOCS > - doc_subdir = doc > - endif > - > --SUBDIRS = protocol src $(doc_subdir) tests cursor > -+SUBDIRS = protocol src $(doc_subdir) > - > - ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} > - > -diff --git a/src/Makefile.am b/src/Makefile.am > -index 15f44a5..b938d17 100644 > ---- a/src/Makefile.am > -+++ b/src/Makefile.am > -@@ -1,4 +1,4 @@ > --lib_LTLIBRARIES = libwayland-server.la libwayland-client.la > -+#lib_LTLIBRARIES = libwayland-server.la libwayland-client.la > - noinst_LTLIBRARIES = libwayland-util.la > - > - include_HEADERS = \ > --- > -1.8.3.2 > - > diff --git a/meta/recipes-graphics/wayland/wayland_1.4.0.bb b/meta/recipes-graphics/wayland/wayland_1.5.0.bb > similarity index 89% > rename from meta/recipes-graphics/wayland/wayland_1.4.0.bb > rename to meta/recipes-graphics/wayland/wayland_1.5.0.bb > index 9f6419d..b1ae59e 100644 > --- a/meta/recipes-graphics/wayland/wayland_1.4.0.bb > +++ b/meta/recipes-graphics/wayland/wayland_1.5.0.bb > @@ -11,10 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1d4476a7d98dd5691c53d4d43a510c72 \ > file://src/wayland-server.c;endline=21;md5=079ae21dbf98ada52ec23744851b0a5c" > > SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz" > -SRC_URI[md5sum] = "332cf9191837be12638a29265ed7cf46" > -SRC_URI[sha256sum] = "18f33b9f15b4c8b662fb1968e7636e7926b419dfc48de8a164b3a3d7095c5a58" > - > -SRC_URI_append_class-native = " file://just-scanner.patch \ > +SRC_URI[md5sum] = "1d882776b27329b91d2d500b6d66dd1d" > +SRC_URI[sha256sum] = "0069e1e9af888b3e05384380ad8cc6c976ea3e81d08ba19b7675ce1d693a41b5" > +SRC_URI_append_class-native = " \ > file://disable-macro-checks-not-used-for-scanner.patch \ > " > EXTRA_OECONF_class-native = "--disable-documentation --enable-scanner" > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [RFC/RFT 1/2] wayland: upgrade to 1.5.0 2014-06-03 4:51 ` Robert Yang @ 2014-06-03 10:15 ` Robert Yang 2014-06-03 10:38 ` Burton, Ross 0 siblings, 1 reply; 7+ messages in thread From: Robert Yang @ 2014-06-03 10:15 UTC (permalink / raw) To: Tim Orling, openembedded-core It seems that such a patch will make it work on CentOS: Subject: [PATCH] Makefile.am: just scanner for native We only build wayland-native for the scanner, so disable the bits we don't actually need. This gives us a small speed up but importantly should allow wayland-native to compile on older hosts such as CentOS 5 which currently fails: | wayland-1.0.6/src/wayland-server.c:1245: error: 'O_CLOEXEC' undeclared (first use in this function) | wayland-1.0.6/src/event-loop.c:34:25: error: sys/timerfd.h: No such file or directory | wayland-1.0.6/src/event-loop.c:199: error: 'CLOCK_MONOTONIC' undeclared (first use in this function) | wayland-1.0.6/src/event-loop.c:199: error: 'TFD_CLOEXEC' undeclared (first use in this function) | wayland-1.0.6/src/event-loop.c:268: error: 'SFD_CLOEXEC' undeclared (first use in this function) Upstream-Status: Inappropriate Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Valentin Popa <valentin.popa@intel.com> Updated for 1.5.0 Signed-off-by: Robert Yang <liezhi.yang@windriver.com> --- Makefile.am | 42 +++--------------------------------------- 1 file changed, 3 insertions(+), 39 deletions(-) diff --git a/Makefile.am b/Makefile.am index c15d8b8..53e8560 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,7 +15,6 @@ dist_pkgdata_DATA = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = -lib_LTLIBRARIES = libwayland-server.la libwayland-client.la noinst_LTLIBRARIES = libwayland-util.la include_HEADERS = \ @@ -25,10 +24,6 @@ include_HEADERS = \ src/wayland-egl.h \ src/wayland-version.h -nodist_include_HEADERS = \ - protocol/wayland-server-protocol.h \ - protocol/wayland-client-protocol.h - libwayland_util_la_SOURCES = \ src/connection.c \ src/wayland-util.c \ @@ -38,26 +33,8 @@ libwayland_util_la_SOURCES = \ src/wayland-private.h libwayland_server_la_CFLAGS = $(FFI_CFLAGS) $(GCC_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 = \ - src/wayland-server.c \ - src/wayland-shm.c \ - src/event-loop.c - -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_LIBADD = $(FFI_LIBS) libwayland-util.la -lrt -lm -libwayland_client_la_LDFLAGS = -version-info 2:0:2 -libwayland_client_la_SOURCES = \ - src/wayland-client.c - -nodist_libwayland_client_la_SOURCES = \ - protocol/wayland-client-protocol.h \ - protocol/wayland-protocol.c pkgconfig_DATA += src/wayland-client.pc src/wayland-server.pc @@ -73,13 +50,13 @@ wayland_scanner = wayland-scanner endif protocol/%-protocol.c : $(top_srcdir)/protocol/%.xml - $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) code < $< > $@ + $(AM_V_GEN)$(MKDIR_P) $(dir $@) protocol/%-server-protocol.h : $(top_srcdir)/protocol/%.xml - $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) server-header < $< > $@ + $(AM_V_GEN)$(MKDIR_P) $(dir $@) protocol/%-client-protocol.h : $(top_srcdir)/protocol/%.xml - $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) client-header < $< > $@ + $(AM_V_GEN)$(MKDIR_P) $(dir $@) BUILT_SOURCES = \ $(nodist_libwayland_server_la_SOURCES) \ @@ -91,19 +68,8 @@ EXTRA_DIST = src/wayland-version.h.in -lib_LTLIBRARIES += libwayland-cursor.la - include_HEADERS += cursor/wayland-cursor.h -libwayland_cursor_la_SOURCES = \ - cursor/wayland-cursor.c \ - cursor/os-compatibility.c \ - cursor/os-compatibility.h \ - cursor/cursor-data.h \ - cursor/xcursor.c \ - cursor/xcursor.h -libwayland_cursor_la_LIBADD = libwayland-client.la - pkgconfig_DATA += cursor/wayland-cursor.pc libwayland_cursor_la_CFLAGS = \ @@ -145,8 +111,6 @@ libtest_runner_la_SOURCES = \ tests/test-helpers.c libtest_runner_la_LIBADD = \ libwayland-util.la \ - libwayland-client.la \ - libwayland-server.la \ -lrt -ldl $(FFI_LIBS) // Robert -- 1.8.2.1 On 06/03/2014 12:51 PM, Robert Yang wrote: > > > On 05/23/2014 12:02 AM, Tim Orling wrote: >> From: Tim Orling <TicoTimo@gmail.com> >> >> * update disable-macro-checks-not-used-for-scanner.patch >> = trivial change to non-patched text (+ posix_fallocate) >> * drop just-scanner.patch, no longer needed > > I'm afraid that we can't drop this patch, I met the same error on > CentOS 5.10 again, as described in the original patch: > > From f674544d4f6f5f763e449207da77a561b22eff97 Mon Sep 17 00:00:00 2001 > From: Valentin Popa <valentin.popa@intel.com> > Date: Fri, 7 Feb 2014 16:36:47 +0200 > Subject: [PATCH] just scanner > > We only build wayland-native for the scanner, so disable the bits we don't > actually need. This gives us a small speed up but importantly should allow > wayland-native to compile on older hosts such as CentOS 5 which currently fails: > > | wayland-1.0.6/src/wayland-server.c:1245: error: 'O_CLOEXEC' undeclared (first > use in this function) > | wayland-1.0.6/src/event-loop.c:34:25: error: sys/timerfd.h: No such file or > directory > | wayland-1.0.6/src/event-loop.c:199: error: 'CLOCK_MONOTONIC' undeclared (first > use in this function) > | wayland-1.0.6/src/event-loop.c:199: error: 'TFD_CLOEXEC' undeclared (first use > in this function) > | wayland-1.0.6/src/event-loop.c:268: error: 'SFD_CLOEXEC' undeclared (first use > in this function) > > Upstream-Status: Inappropriate > Signed-off-by: Ross Burton <ross.burton@intel.com> > Signed-off-by: Valentin Popa <valentin.popa@intel.com> > > // Robert > >> >> Signed-off-by: Tim Orling <TicoTimo@gmail.com> >> --- >> ...disable-macro-checks-not-used-for-scanner.patch | 2 +- >> .../wayland/wayland/just-scanner.patch | 49 ---------------------- >> .../wayland/{wayland_1.4.0.bb => wayland_1.5.0.bb} | 7 ++-- >> 3 files changed, 4 insertions(+), 54 deletions(-) >> delete mode 100644 meta/recipes-graphics/wayland/wayland/just-scanner.patch >> rename meta/recipes-graphics/wayland/{wayland_1.4.0.bb => wayland_1.5.0.bb} >> (89%) >> >> diff --git >> a/meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch >> b/meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch >> >> index bf499bb..cd8bc55 100644 >> --- >> a/meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch >> >> +++ >> b/meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch >> >> @@ -20,7 +20,7 @@ diff --git a/configure.ac b/configure.ac >> +++ b/configure.ac >> @@ -41,16 +41,16 @@ AC_SUBST(GCC_CFLAGS) >> >> - AC_CHECK_FUNCS([accept4 mkostemp]) >> + AC_CHECK_FUNCS([accept4 mkostemp posix_fallocate]) >> >> -AC_CHECK_DECL(SFD_CLOEXEC,[], >> - [AC_MSG_ERROR("SFD_CLOEXEC is needed to compile wayland")], >> diff --git a/meta/recipes-graphics/wayland/wayland/just-scanner.patch >> b/meta/recipes-graphics/wayland/wayland/just-scanner.patch >> deleted file mode 100644 >> index ae9935e..0000000 >> --- a/meta/recipes-graphics/wayland/wayland/just-scanner.patch >> +++ /dev/null >> @@ -1,49 +0,0 @@ >> -From f674544d4f6f5f763e449207da77a561b22eff97 Mon Sep 17 00:00:00 2001 >> -From: Valentin Popa <valentin.popa@intel.com> >> -Date: Fri, 7 Feb 2014 16:36:47 +0200 >> -Subject: [PATCH] just scanner >> - >> -We only build wayland-native for the scanner, so disable the bits we don't >> -actually need. This gives us a small speed up but importantly should allow >> -wayland-native to compile on older hosts such as CentOS 5 which currently fails: >> - >> -| wayland-1.0.6/src/wayland-server.c:1245: error: 'O_CLOEXEC' undeclared >> (first use in this function) >> -| wayland-1.0.6/src/event-loop.c:34:25: error: sys/timerfd.h: No such file or >> directory >> -| wayland-1.0.6/src/event-loop.c:199: error: 'CLOCK_MONOTONIC' undeclared >> (first use in this function) >> -| wayland-1.0.6/src/event-loop.c:199: error: 'TFD_CLOEXEC' undeclared (first >> use in this function) >> -| wayland-1.0.6/src/event-loop.c:268: error: 'SFD_CLOEXEC' undeclared (first >> use in this function) >> - >> -Upstream-Status: Inappropriate >> -Signed-off-by: Ross Burton <ross.burton@intel.com> >> -Signed-off-by: Valentin Popa <valentin.popa@intel.com> >> ---- >> - Makefile.am | 2 +- >> - src/Makefile.am | 2 +- >> - 2 files changed, 2 insertions(+), 2 deletions(-) >> - >> -diff --git a/Makefile.am b/Makefile.am >> -index 99607b0..ecce1f1 100644 >> ---- a/Makefile.am >> -+++ b/Makefile.am >> -@@ -2,7 +2,7 @@ if BUILD_DOCS >> - doc_subdir = doc >> - endif >> - >> --SUBDIRS = protocol src $(doc_subdir) tests cursor >> -+SUBDIRS = protocol src $(doc_subdir) >> - >> - ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} >> - >> -diff --git a/src/Makefile.am b/src/Makefile.am >> -index 15f44a5..b938d17 100644 >> ---- a/src/Makefile.am >> -+++ b/src/Makefile.am >> -@@ -1,4 +1,4 @@ >> --lib_LTLIBRARIES = libwayland-server.la libwayland-client.la >> -+#lib_LTLIBRARIES = libwayland-server.la libwayland-client.la >> - noinst_LTLIBRARIES = libwayland-util.la >> - >> - include_HEADERS = \ >> --- >> -1.8.3.2 >> - >> diff --git a/meta/recipes-graphics/wayland/wayland_1.4.0.bb >> b/meta/recipes-graphics/wayland/wayland_1.5.0.bb >> similarity index 89% >> rename from meta/recipes-graphics/wayland/wayland_1.4.0.bb >> rename to meta/recipes-graphics/wayland/wayland_1.5.0.bb >> index 9f6419d..b1ae59e 100644 >> --- a/meta/recipes-graphics/wayland/wayland_1.4.0.bb >> +++ b/meta/recipes-graphics/wayland/wayland_1.5.0.bb >> @@ -11,10 +11,9 @@ LIC_FILES_CHKSUM = >> "file://COPYING;md5=1d4476a7d98dd5691c53d4d43a510c72 \ >> >> file://src/wayland-server.c;endline=21;md5=079ae21dbf98ada52ec23744851b0a5c" >> >> SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz" >> -SRC_URI[md5sum] = "332cf9191837be12638a29265ed7cf46" >> -SRC_URI[sha256sum] = >> "18f33b9f15b4c8b662fb1968e7636e7926b419dfc48de8a164b3a3d7095c5a58" >> - >> -SRC_URI_append_class-native = " file://just-scanner.patch \ >> +SRC_URI[md5sum] = "1d882776b27329b91d2d500b6d66dd1d" >> +SRC_URI[sha256sum] = >> "0069e1e9af888b3e05384380ad8cc6c976ea3e81d08ba19b7675ce1d693a41b5" >> +SRC_URI_append_class-native = " \ >> file://disable-macro-checks-not-used-for-scanner.patch \ >> " >> EXTRA_OECONF_class-native = "--disable-documentation --enable-scanner" >> ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [RFC/RFT 1/2] wayland: upgrade to 1.5.0 2014-06-03 10:15 ` Robert Yang @ 2014-06-03 10:38 ` Burton, Ross 0 siblings, 0 replies; 7+ messages in thread From: Burton, Ross @ 2014-06-03 10:38 UTC (permalink / raw) To: Robert Yang; +Cc: OE-core On 3 June 2014 11:15, Robert Yang <liezhi.yang@windriver.com> wrote: > Subject: [PATCH] Makefile.am: just scanner for native These patches are getting quite intrusive. I wonder if upstream would be happy to move all the scanner parts to a single directory so we can make all ; make install inside there. Ross ^ permalink raw reply [flat|nested] 7+ messages in thread
* [RFC/RFT 2/2] weston: upgrade to 1.5.0 2014-05-22 16:02 [RFC/RFT 0/2] wayland/weston: upgrade to 1.5.0 Tim Orling 2014-05-22 16:02 ` [RFC/RFT 1/2] wayland: " Tim Orling @ 2014-05-22 16:02 ` Tim Orling 2014-05-23 7:05 ` Henning Heinold 1 sibling, 1 reply; 7+ messages in thread From: Tim Orling @ 2014-05-22 16:02 UTC (permalink / raw) To: openembedded-core From: Tim Orling <TicoTimo@gmail.com> * replace 0001-remove-dependence-on-wayland-scanner-flags.patch with disable-wayland-scanner-pkg-check.patch * add make-lcms-configureable.patch (WIP... needs work) = fix for JaMa test-dependencies Signed-off-by: Tim Orling <TicoTimo@gmail.com> --- ...emove-dependence-on-wayland-scanner-flags.patch | 30 ---------------------- .../weston/disable-wayland-scanner-pkg-check.patch | 13 ++++++++++ .../wayland/weston/make-lcms-configurable.patch | 22 ++++++++++++++++ .../wayland/{weston_1.4.0.bb => weston_1.5.0.bb} | 13 ++++++---- 4 files changed, 43 insertions(+), 35 deletions(-) delete mode 100644 meta/recipes-graphics/wayland/weston/0001-remove-dependence-on-wayland-scanner-flags.patch create mode 100644 meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch create mode 100644 meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch rename meta/recipes-graphics/wayland/{weston_1.4.0.bb => weston_1.5.0.bb} (88%) diff --git a/meta/recipes-graphics/wayland/weston/0001-remove-dependence-on-wayland-scanner-flags.patch b/meta/recipes-graphics/wayland/weston/0001-remove-dependence-on-wayland-scanner-flags.patch deleted file mode 100644 index 14606c8..0000000 --- a/meta/recipes-graphics/wayland/weston/0001-remove-dependence-on-wayland-scanner-flags.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a0335393ddde2228c84eda1081b5d7b175f78a94 Mon Sep 17 00:00:00 2001 -From: Valentin Popa <valentin.popa@intel.com> -Date: Fri, 7 Feb 2014 16:59:58 +0200 -Subject: [PATCH] remove dependence on wayland-scanner flags - -weston doesn't make use of wayland-scanner flags, -it only uses the -native- wayland-scanner for protocol. - -Upstream-Status: Pending -Signed-off-by: Valentin Popa <valentin.popa@intel.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index cce1850..8775eb9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -482,7 +482,7 @@ if test x$wayland_scanner = x; then - AC_MSG_ERROR([wayland-scanner is needed to compile weston]) - fi - --PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner) -+#PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner) - AC_PATH_PROG(XMLLINT, xmllint) - AC_ARG_WITH([dtddir], - AS_HELP_STRING([--with-dtddir], --- -1.8.3.2 - diff --git a/meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch b/meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch new file mode 100644 index 0000000..062da5c --- /dev/null +++ b/meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch @@ -0,0 +1,13 @@ +Index: weston-1.5.0/configure.ac +=================================================================== +--- weston-1.5.0.orig/configure.ac ++++ weston-1.5.0/configure.ac +@@ -503,7 +503,7 @@ if test x$wayland_scanner = x; then + AC_MSG_ERROR([wayland-scanner is needed to compile weston]) + fi + +-PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner) ++#PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner) + + AC_CONFIG_FILES([Makefile src/version.h src/weston.pc]) + diff --git a/meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch b/meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch new file mode 100644 index 0000000..817ac70 --- /dev/null +++ b/meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch @@ -0,0 +1,22 @@ +Index: weston-1.5.0/configure.ac +=================================================================== +--- weston-1.5.0.orig/configure.ac ++++ weston-1.5.0/configure.ac +@@ -491,8 +491,16 @@ AC_ARG_ENABLE(demo-clients-install, + enable_demo_clients_install=no) + AM_CONDITIONAL(INSTALL_DEMO_CLIENTS, [test "x$enable_demo_clients_install" = "xyes"]) + ++AC_ARG_ENABLE(lcms, ++ AS_HELP_STRING([--disable-lcms], ++ [disable lcms support]),, ++ enable_lcms=yes) ++ ++AS_IF([test "x$enable_lcms" != "no"], [ + PKG_CHECK_MODULES(LCMS, lcms2, +- [have_lcms=yes], [have_lcms=no]) ++ [have_lcms=yes], [have_lcms=no])], ++ [have_lcms=no]) ++ + if test "x$have_lcms" = xyes; then + AC_DEFINE(HAVE_LCMS, 1, [Have lcms support]) + fi diff --git a/meta/recipes-graphics/wayland/weston_1.4.0.bb b/meta/recipes-graphics/wayland/weston_1.5.0.bb similarity index 88% rename from meta/recipes-graphics/wayland/weston_1.4.0.bb rename to meta/recipes-graphics/wayland/weston_1.5.0.bb index afdc49c..f6ae8c4 100644 --- a/meta/recipes-graphics/wayland/weston_1.4.0.bb +++ b/meta/recipes-graphics/wayland/weston_1.5.0.bb @@ -8,10 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=275efac2559a224527bd4fd593d38466 \ SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://weston.png \ file://weston.desktop \ - file://0001-remove-dependence-on-wayland-scanner-flags.patch" -SRC_URI[md5sum] = "4438d2b1f3c9ba9a4a2b10d89fac6fd0" -SRC_URI[sha256sum] = "74a2319d98e9cdb1acf24659699719aa89ac268cf549759271e326edc5f9ed64" - + file://disable-wayland-scanner-pkg-check.patch \ + file://make-lcms-configurable.patch" +SRC_URI[md5sum] = "8eb40d230efc2411f083c20656534780" +SRC_URI[sha256sum] = "06388ba04ac79aa72d685cc1a8e646ddb2b8cfe11fcc742294f9addac48b7684" inherit autotools pkgconfig useradd @@ -25,7 +25,8 @@ EXTRA_OECONF = "--enable-setuid-install \ --enable-demo-clients-install \ --disable-libunwind \ --disable-rpi-compositor \ - --disable-rdp-compositor" + --disable-rdp-compositor \ + --disable-lcms" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \ @@ -53,6 +54,8 @@ PACKAGECONFIG[vaapi] = "--enable-vaapi-recorder,--disable-vaapi-recorder,libva" PACKAGECONFIG[egl] = "--enable-egl --enable-simple-egl-clients,--disable-egl --disable-simple-egl-clients,virtual/egl" # Weston with cairo glesv2 support PACKAGECONFIG[cairo-glesv2] = "--with-cairo-glesv2,--with-cairo=image,cairo" +# Weston with lcms support +PACKAGECONFIG[lcms] = "--enable-lcms,--disable-lcms,lcms" do_install_append() { # Weston doesn't need the .la files to load modules, so wipe them -- 1.8.3.2 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [RFC/RFT 2/2] weston: upgrade to 1.5.0 2014-05-22 16:02 ` [RFC/RFT 2/2] weston: " Tim Orling @ 2014-05-23 7:05 ` Henning Heinold 0 siblings, 0 replies; 7+ messages in thread From: Henning Heinold @ 2014-05-23 7:05 UTC (permalink / raw) Cc: openembedded-core On Thu, May 22, 2014 at 09:02:20AM -0700, Tim Orling wrote: > From: Tim Orling <TicoTimo@gmail.com> > > * replace 0001-remove-dependence-on-wayland-scanner-flags.patch with > disable-wayland-scanner-pkg-check.patch > * add make-lcms-configureable.patch (WIP... needs work) > = fix for JaMa test-dependencies > > Signed-off-by: Tim Orling <TicoTimo@gmail.com> > --- > ...emove-dependence-on-wayland-scanner-flags.patch | 30 ---------------------- > .../weston/disable-wayland-scanner-pkg-check.patch | 13 ++++++++++ > .../wayland/weston/make-lcms-configurable.patch | 22 ++++++++++++++++ > .../wayland/{weston_1.4.0.bb => weston_1.5.0.bb} | 13 ++++++---- > 4 files changed, 43 insertions(+), 35 deletions(-) > delete mode 100644 meta/recipes-graphics/wayland/weston/0001-remove-dependence-on-wayland-scanner-flags.patch > create mode 100644 meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch > create mode 100644 meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch > rename meta/recipes-graphics/wayland/{weston_1.4.0.bb => weston_1.5.0.bb} (88%) > > diff --git a/meta/recipes-graphics/wayland/weston/0001-remove-dependence-on-wayland-scanner-flags.patch b/meta/recipes-graphics/wayland/weston/0001-remove-dependence-on-wayland-scanner-flags.patch > deleted file mode 100644 > index 14606c8..0000000 > --- a/meta/recipes-graphics/wayland/weston/0001-remove-dependence-on-wayland-scanner-flags.patch > +++ /dev/null > @@ -1,30 +0,0 @@ > -From a0335393ddde2228c84eda1081b5d7b175f78a94 Mon Sep 17 00:00:00 2001 > -From: Valentin Popa <valentin.popa@intel.com> > -Date: Fri, 7 Feb 2014 16:59:58 +0200 > -Subject: [PATCH] remove dependence on wayland-scanner flags > - > -weston doesn't make use of wayland-scanner flags, > -it only uses the -native- wayland-scanner for protocol. > - > -Upstream-Status: Pending > -Signed-off-by: Valentin Popa <valentin.popa@intel.com> > ---- > - configure.ac | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/configure.ac b/configure.ac > -index cce1850..8775eb9 100644 > ---- a/configure.ac > -+++ b/configure.ac > -@@ -482,7 +482,7 @@ if test x$wayland_scanner = x; then > - AC_MSG_ERROR([wayland-scanner is needed to compile weston]) > - fi > - > --PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner) > -+#PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner) > - AC_PATH_PROG(XMLLINT, xmllint) > - AC_ARG_WITH([dtddir], > - AS_HELP_STRING([--with-dtddir], > --- > -1.8.3.2 > - > diff --git a/meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch b/meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch > new file mode 100644 > index 0000000..062da5c > --- /dev/null > +++ b/meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch > @@ -0,0 +1,13 @@ > +Index: weston-1.5.0/configure.ac > +=================================================================== > +--- weston-1.5.0.orig/configure.ac > ++++ weston-1.5.0/configure.ac > +@@ -503,7 +503,7 @@ if test x$wayland_scanner = x; then > + AC_MSG_ERROR([wayland-scanner is needed to compile weston]) > + fi > + > +-PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner) > ++#PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner) > + > + AC_CONFIG_FILES([Makefile src/version.h src/weston.pc]) > + > diff --git a/meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch b/meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch > new file mode 100644 > index 0000000..817ac70 > --- /dev/null > +++ b/meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch > @@ -0,0 +1,22 @@ > +Index: weston-1.5.0/configure.ac > +=================================================================== > +--- weston-1.5.0.orig/configure.ac > ++++ weston-1.5.0/configure.ac > +@@ -491,8 +491,16 @@ AC_ARG_ENABLE(demo-clients-install, > + enable_demo_clients_install=no) > + AM_CONDITIONAL(INSTALL_DEMO_CLIENTS, [test "x$enable_demo_clients_install" = "xyes"]) > + > ++AC_ARG_ENABLE(lcms, > ++ AS_HELP_STRING([--disable-lcms], > ++ [disable lcms support]),, > ++ enable_lcms=yes) > ++ > ++AS_IF([test "x$enable_lcms" != "no"], [ > + PKG_CHECK_MODULES(LCMS, lcms2, > +- [have_lcms=yes], [have_lcms=no]) > ++ [have_lcms=yes], [have_lcms=no])], > ++ [have_lcms=no]) > ++ > + if test "x$have_lcms" = xyes; then > + AC_DEFINE(HAVE_LCMS, 1, [Have lcms support]) > + fi > diff --git a/meta/recipes-graphics/wayland/weston_1.4.0.bb b/meta/recipes-graphics/wayland/weston_1.5.0.bb > similarity index 88% > rename from meta/recipes-graphics/wayland/weston_1.4.0.bb > rename to meta/recipes-graphics/wayland/weston_1.5.0.bb > index afdc49c..f6ae8c4 100644 > --- a/meta/recipes-graphics/wayland/weston_1.4.0.bb > +++ b/meta/recipes-graphics/wayland/weston_1.5.0.bb > @@ -8,10 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=275efac2559a224527bd4fd593d38466 \ > SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ > file://weston.png \ > file://weston.desktop \ > - file://0001-remove-dependence-on-wayland-scanner-flags.patch" > -SRC_URI[md5sum] = "4438d2b1f3c9ba9a4a2b10d89fac6fd0" > -SRC_URI[sha256sum] = "74a2319d98e9cdb1acf24659699719aa89ac268cf549759271e326edc5f9ed64" > - > + file://disable-wayland-scanner-pkg-check.patch \ > + file://make-lcms-configurable.patch" > +SRC_URI[md5sum] = "8eb40d230efc2411f083c20656534780" > +SRC_URI[sha256sum] = "06388ba04ac79aa72d685cc1a8e646ddb2b8cfe11fcc742294f9addac48b7684" > > inherit autotools pkgconfig useradd > > @@ -25,7 +25,8 @@ EXTRA_OECONF = "--enable-setuid-install \ > --enable-demo-clients-install \ > --disable-libunwind \ > --disable-rpi-compositor \ > - --disable-rdp-compositor" > + --disable-rdp-compositor \ > + --disable-lcms" ^^^^^^^^^^^^^^^ Is this needed when you use PACKAGECONFIG later on? > > > PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \ > @@ -53,6 +54,8 @@ PACKAGECONFIG[vaapi] = "--enable-vaapi-recorder,--disable-vaapi-recorder,libva" > PACKAGECONFIG[egl] = "--enable-egl --enable-simple-egl-clients,--disable-egl --disable-simple-egl-clients,virtual/egl" > # Weston with cairo glesv2 support > PACKAGECONFIG[cairo-glesv2] = "--with-cairo-glesv2,--with-cairo=image,cairo" > +# Weston with lcms support > +PACKAGECONFIG[lcms] = "--enable-lcms,--disable-lcms,lcms" > > do_install_append() { > # Weston doesn't need the .la files to load modules, so wipe them Bye Henning ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-06-03 10:38 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-05-22 16:02 [RFC/RFT 0/2] wayland/weston: upgrade to 1.5.0 Tim Orling 2014-05-22 16:02 ` [RFC/RFT 1/2] wayland: " Tim Orling 2014-06-03 4:51 ` Robert Yang 2014-06-03 10:15 ` Robert Yang 2014-06-03 10:38 ` Burton, Ross 2014-05-22 16:02 ` [RFC/RFT 2/2] weston: " Tim Orling 2014-05-23 7:05 ` Henning Heinold
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox