Patchwork [v3,1/2] wayland : Bump to 1.2.0 version

login
register
mail settings
Submitter Ewan LE BIDEAU-CANEVET
Date Oct. 10, 2013, 12:23 p.m.
Message ID <1381407802-16852-1-git-send-email-Ewan.LEBIDEAU-CANEVET@eurogiciel.fr>
Download mbox | patch
Permalink /patch/59609/
State New
Headers show

Comments

Ewan LE BIDEAU-CANEVET - Oct. 10, 2013, 12:23 p.m.
Signed-off-by: Ewan LE BIDEAU-CANEVET <Ewan.LEBIDEAU-CANEVET@eurogiciel.fr>
---
 .../wayland/wayland/just-scanner.patch             |   36 --------------------
 .../wayland/{wayland_1.1.0.bb => wayland_1.2.0.bb} |   18 ++--------
 2 files changed, 2 insertions(+), 52 deletions(-)
 delete mode 100644 meta/recipes-graphics/wayland/wayland/just-scanner.patch
 rename meta/recipes-graphics/wayland/{wayland_1.1.0.bb => wayland_1.2.0.bb} (59%)
Ross Burton - Oct. 10, 2013, 2:16 p.m.
On 10 October 2013 13:23, Ewan LE BIDEAU-CANEVET
<Ewan.LEBIDEAU-CANEVET@eurogiciel.fr> wrote:
> -SRC_URI_append_class-native = " file://just-scanner.patch"

That patch -  as it says - serves a useful purpose.  What is the
rationale for deleting it?  If there's a good reason, please say what
it is.

> -# Wayland installs a M4 macro for other projects to use. This M4 macro includes
> -# a path to a Makefile fragment to get the rules to generate stubs from protocol
> -# description files.  The paths to the sysroot end up incorrect, so fix them.
> -do_configure_append_class-native() {
> -  sed -e 's,@prefix@,${STAGING_DIR_NATIVE},g' \
> -      -e 's,@exec_prefix@,${STAGING_DIR_NATIVE},g' \
> -      -e 's,@bindir@,${STAGING_BINDIR_NATIVE},g' \
> -      -e 's,@datarootdir@,${STAGING_DATADIR_NATIVE},g' \
> -  ${S}/wayland-scanner.m4.in > ${B}/wayland-scanner.m4
> -}

Wayland is still installing this m4 file, so why delete this fix?
From a glance at Wayland 1.2 it looks like it isn't required anymore
as pkgconfig is used to determine the paths, but you need to state
this in the commit message.

Also, there's a 1.2.1 release now.

Ross
Ewan LE BIDEAU-CANEVET - Oct. 10, 2013, 3:44 p.m.
On 10/10/2013 16:16, Burton, Ross wrote:
> On 10 October 2013 13:23, Ewan LE BIDEAU-CANEVET
> <Ewan.LEBIDEAU-CANEVET@eurogiciel.fr> wrote:
>> -SRC_URI_append_class-native = " file://just-scanner.patch"
> That patch -  as it says - serves a useful purpose.  What is the
> rationale for deleting it?  If there's a good reason, please say what
> it is.
>
>> -# Wayland installs a M4 macro for other projects to use. This M4 macro includes
>> -# a path to a Makefile fragment to get the rules to generate stubs from protocol
>> -# description files.  The paths to the sysroot end up incorrect, so fix them.
>> -do_configure_append_class-native() {
>> -  sed -e 's,@prefix@,${STAGING_DIR_NATIVE},g' \
>> -      -e 's,@exec_prefix@,${STAGING_DIR_NATIVE},g' \
>> -      -e 's,@bindir@,${STAGING_BINDIR_NATIVE},g' \
>> -      -e 's,@datarootdir@,${STAGING_DATADIR_NATIVE},g' \
>> -  ${S}/wayland-scanner.m4.in > ${B}/wayland-scanner.m4
>> -}
> Wayland is still installing this m4 file, so why delete this fix?
>  From a glance at Wayland 1.2 it looks like it isn't required anymore
> as pkgconfig is used to determine the paths, but you need to state
> this in the commit message.
This file

wayland-scanner.m4*.**in**  *

doesn't exist anymore. In fact there is only "wayland-scanner.m4"
Run sed command on a missing  file wayland-scanner.m4.in  is now 
useless, correct ?
Furthermore, in wayland-scanner.m4 has no reference to strings

@prefix@
@exec_prefix@
@bindir@
@datarootdir@

So if we let this instruction wayland-scanner.m4 will  be cleared. So 
this leads to build faillure.

> Also, there's a 1.2.1 release now.
You're right :). I have started this work few weeks ago.
I noticed that there is a 1.3.0 version, and I have started to take a 
look on it. I'll probably post my work in 1 or 2 weeks.


As I saw , we need to do the same change (Remove : 
do_configure_append_class-native function => last existing 
wayland-scanner.m4.in was in 1.1.0 version.)

Apologies for removing your just-scanner.patch file, my mistake.


Ewan
Ross Burton - Oct. 10, 2013, 3:59 p.m.
On 10 October 2013 16:44, Ewan LE BIDEAU-CANEVET
<ewan.lebideau-canevet@eurogiciel.fr> wrote:
> Wayland is still installing this m4 file, so why delete this fix?
> From a glance at Wayland 1.2 it looks like it isn't required anymore
> as pkgconfig is used to determine the paths, but you need to state
> this in the commit message.
>
> This file
>
> wayland-scanner.m4.in
>
> doesn't exist anymore. In fact there is only "wayland-scanner.m4"
> Run sed command on a missing  file wayland-scanner.m4.in  is now useless,
> correct ?
> Furthermore, in wayland-scanner.m4 has no reference to strings
>
> @prefix@
> @exec_prefix@
> @bindir@
> @datarootdir@
>
> So if we let this instruction wayland-scanner.m4 will  be cleared. So this
> leads to build faillure.

Sure, but this rationale needs to be in the commit message, ideally
after verifying that the pkgconfig file doesn't have the same problem
that the m4 had.

Ross

Patch

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 234a9c5..0000000
--- a/meta/recipes-graphics/wayland/wayland/just-scanner.patch
+++ /dev/null
@@ -1,36 +0,0 @@ 
-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>
-
-diff --git a/Makefile.am b/Makefile.am
-index 306d7b3..571fe89 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,7 +2,7 @@ if BUILD_DOCS
- doc_subdir = doc
- endif
- 
--SUBDIRS = src protocol $(doc_subdir) tests cursor
-+SUBDIRS = src protocol $(doc_subdir)
- 
- ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
- 
-diff --git a/src/Makefile.am b/src/Makefile.am
-index e1d04ea..702342e 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 =				\
diff --git a/meta/recipes-graphics/wayland/wayland_1.1.0.bb b/meta/recipes-graphics/wayland/wayland_1.2.0.bb
similarity index 59%
rename from meta/recipes-graphics/wayland/wayland_1.1.0.bb
rename to meta/recipes-graphics/wayland/wayland_1.2.0.bb
index a71402e..f001b43 100644
--- a/meta/recipes-graphics/wayland/wayland_1.1.0.bb
+++ b/meta/recipes-graphics/wayland/wayland_1.2.0.bb
@@ -11,11 +11,8 @@  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] = "d2dc9398a83692cafc16eba6e45f85d8"
-SRC_URI[sha256sum] = "2ef587cf1a0e52b6dee44eeb9c288110e8180819abf4e419d247dfe234867a5c"
-
-SRC_URI_append_class-native = " file://just-scanner.patch"
-
+SRC_URI[md5sum] = "48d375afb15f3e68a72cf7b4fd8f4a63"
+SRC_URI[sha256sum] = "6b0439a017185bc5b2fed96c178bed3abf7f19188f3078f4d69fd3ce222d654c"
 inherit autotools pkgconfig
 
 # We need wayland-native for the wayland-scanner utility
@@ -26,14 +23,3 @@  DEPENDS = "expat libffi wayland-native"
 
 EXTRA_OECONF_virtclass-native = "--disable-documentation"
 EXTRA_OECONF = "--disable-documentation --disable-scanner"
-
-# Wayland installs a M4 macro for other projects to use. This M4 macro includes
-# a path to a Makefile fragment to get the rules to generate stubs from protocol
-# description files.  The paths to the sysroot end up incorrect, so fix them.
-do_configure_append_class-native() {
-  sed -e 's,@prefix@,${STAGING_DIR_NATIVE},g' \
-      -e 's,@exec_prefix@,${STAGING_DIR_NATIVE},g' \
-      -e 's,@bindir@,${STAGING_BINDIR_NATIVE},g' \
-      -e 's,@datarootdir@,${STAGING_DATADIR_NATIVE},g' \
-  ${S}/wayland-scanner.m4.in > ${B}/wayland-scanner.m4
-}