Same comment as to first overlay the original w/o any changes and make changes in a separate patch. Also, please see additional comments below.
On Fri, Aug 22, 2014 at 06:55:22PM +0530, Karthik Ramanan wrote: > For DRM based devices, it is desired to stick with version 1.3.0 > due to some known issues and limitations with omapdrm and other > dependent foundation software > > Signed-off-by: Karthik Ramanan <[email protected]> > --- > .../recipes-graphics/wayland/just-scanner.patch | 36 > ++++++++++++++++++++ > .../recipes-graphics/wayland/wayland.inc | 5 +++ > .../recipes-graphics/wayland/wayland_1.3.0.bb | 34 ++++++++++++++++++ > 3 files changed, 75 insertions(+) > create mode 100644 > meta-arago-extras/recipes-graphics/wayland/just-scanner.patch > create mode 100644 meta-arago-extras/recipes-graphics/wayland/wayland.inc > create mode 100644 > meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb > > diff --git a/meta-arago-extras/recipes-graphics/wayland/just-scanner.patch > b/meta-arago-extras/recipes-graphics/wayland/just-scanner.patch > new file mode 100644 > index 0000000..c72d2d5 > --- /dev/null > +++ b/meta-arago-extras/recipes-graphics/wayland/just-scanner.patch > @@ -0,0 +1,36 @@ > +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 <[email protected]> > + > +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-arago-extras/recipes-graphics/wayland/wayland.inc > b/meta-arago-extras/recipes-graphics/wayland/wayland.inc > new file mode 100644 > index 0000000..8eb445d > --- /dev/null > +++ b/meta-arago-extras/recipes-graphics/wayland/wayland.inc > @@ -0,0 +1,5 @@ > +HOMEPAGE = "http://wayland.freedesktop.org/"; > +LICENSE = "MIT" > +LIC_FILES_CHKSUM = "file://COPYING;md5=1d4476a7d98dd5691c53d4d43a510c72" > + > +inherit autotools pkgconfig > diff --git a/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb > b/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb > new file mode 100644 > index 0000000..54a5a45 > --- /dev/null > +++ b/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb > @@ -0,0 +1,34 @@ > +require wayland.inc > + > +inherit autotools pkgconfig > + > +# We need wayland-native for the wayland-scanner utility > +BBCLASSEXTEND = "native" > + > +DEPENDS_virtclass-native = "expat-native libffi-native" > +DEPENDS = "expat libffi wayland-native" > + > +EXTRA_OECONF_virtclass-native = "--disable-documentation" > +EXTRA_OECONF = "--disable-documentation --disable-scanner" > + > +DISTRO_FEATURES_append = "wayland x11" You can't and shouldn't do that in a recipe ^^^ If you want your recipe to require some specific distro features, please list them in REQUIRED_DISTRO_FEATURES variable. > +PR = "r1" > + > +SRC_URI = "git://anongit.freedesktop.org/wayland/wayland;protocol=git" > +SRC_URI_append_class-native = " file://just-scanner.patch" > + > +S = "${WORKDIR}/git" > + > +FILESEXTRAPATHS_prepend := "${THISDIR}:" > + > +SRCREV = "2c3dbb89031f120fb191492634e53a583f99d57d" > + > +# Wayland installs a M4 macro for other projects to use, which uses the > target > +# pkg-config to find files. Replace pkg-config with pkg-config-native. > +do_install_append_class-native() { > + sed -e 's,PKG_CHECK_MODULES(.*),,g' \ > + -e 's,$PKG_CONFIG,pkg-config-native,g' \ > + -i ${D}/${datadir}/aclocal/wayland-scanner.m4 > +} > + > -- > 1.7.9.5 > > _______________________________________________ > meta-arago mailing list > [email protected] > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
