* [PATCH 1/5] mesa: update to 13.0.2
@ 2016-12-06 0:19 Andreas Müller
2016-12-06 0:19 ` [PATCH 2/5] libdrm: update to 2.4.74 Andreas Müller
` (3 more replies)
0 siblings, 4 replies; 16+ messages in thread
From: Andreas Müller @ 2016-12-06 0:19 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
meta/recipes-graphics/mesa/{mesa-gl_13.0.1.bb => mesa-gl_13.0.2.bb} | 0
meta/recipes-graphics/mesa/{mesa_13.0.1.bb => mesa_13.0.2.bb} | 4 ++--
2 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/mesa/{mesa-gl_13.0.1.bb => mesa-gl_13.0.2.bb} (100%)
rename meta/recipes-graphics/mesa/{mesa_13.0.1.bb => mesa_13.0.2.bb} (91%)
diff --git a/meta/recipes-graphics/mesa/mesa-gl_13.0.1.bb b/meta/recipes-graphics/mesa/mesa-gl_13.0.2.bb
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-gl_13.0.1.bb
rename to meta/recipes-graphics/mesa/mesa-gl_13.0.2.bb
diff --git a/meta/recipes-graphics/mesa/mesa_13.0.1.bb b/meta/recipes-graphics/mesa/mesa_13.0.2.bb
similarity index 91%
rename from meta/recipes-graphics/mesa/mesa_13.0.1.bb
rename to meta/recipes-graphics/mesa/mesa_13.0.2.bb
index 7c9a4b7..ffdd5b4 100644
--- a/meta/recipes-graphics/mesa/mesa_13.0.1.bb
+++ b/meta/recipes-graphics/mesa/mesa_13.0.2.bb
@@ -17,8 +17,8 @@ SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/mesa-${PV}.tar.xz \
file://0012-vc4-Try-compiling-our-FSes-in-multithreaded-mode-on-.patch \
"
-SRC_URI[md5sum] = "72b7f4d0c2407f367484abd201cb8276"
-SRC_URI[sha256sum] = "71962fb2bf77d33b0ad4a565b490dbbeaf4619099c6d9722f04a73187957a731"
+SRC_URI[md5sum] = "9442c2dee914cde3d1f090371ab04113"
+SRC_URI[sha256sum] = "a6ed622645f4ed61da418bf65adde5bcc4bb79023c36ba7d6b45b389da4416d5"
#because we cannot rely on the fact that all apps will use pkgconfig,
#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
--
2.5.5
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 2/5] libdrm: update to 2.4.74
2016-12-06 0:19 [PATCH 1/5] mesa: update to 13.0.2 Andreas Müller
@ 2016-12-06 0:19 ` Andreas Müller
2016-12-06 0:19 ` [PATCH 3/5] libsdl2: add EXTRA_OECONF[vardepsexclude] = "MACHINE" Andreas Müller
` (2 subsequent siblings)
3 siblings, 0 replies; 16+ messages in thread
From: Andreas Müller @ 2016-12-06 0:19 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
meta/recipes-graphics/drm/{libdrm_2.4.73.bb => libdrm_2.4.74.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/drm/{libdrm_2.4.73.bb => libdrm_2.4.74.bb} (93%)
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.73.bb b/meta/recipes-graphics/drm/libdrm_2.4.74.bb
similarity index 93%
rename from meta/recipes-graphics/drm/libdrm_2.4.73.bb
rename to meta/recipes-graphics/drm/libdrm_2.4.74.bb
index 3315014..c67d356 100644
--- a/meta/recipes-graphics/drm/libdrm_2.4.73.bb
+++ b/meta/recipes-graphics/drm/libdrm_2.4.74.bb
@@ -16,8 +16,8 @@ SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \
file://0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch \
"
-SRC_URI[md5sum] = "bc1cee09cde72ffe3b952e8f50ccdaa8"
-SRC_URI[sha256sum] = "96bfd39242fe168017d95f22e141645a35591f5902a7d98c2fa4ca8c31df5e4d"
+SRC_URI[md5sum] = "31964aa15bdea1a40c5941d4ce0962ee"
+SRC_URI[sha256sum] = "d80dd5a76c401f4c8756dcccd999c63d7e0a3bad258d96a829055cfd86ef840b"
inherit autotools pkgconfig manpages
--
2.5.5
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 3/5] libsdl2: add EXTRA_OECONF[vardepsexclude] = "MACHINE"
2016-12-06 0:19 [PATCH 1/5] mesa: update to 13.0.2 Andreas Müller
2016-12-06 0:19 ` [PATCH 2/5] libdrm: update to 2.4.74 Andreas Müller
@ 2016-12-06 0:19 ` Andreas Müller
2016-12-06 0:24 ` Khem Raj
2016-12-06 0:19 ` [PATCH 4/5] libsdl2: add wayland--protocols to to depends of PACKAGECONFIG[wayland] Andreas Müller
2016-12-06 0:19 ` [PATCH 5/5] libsdl2: fix build on wayland(-dev)less hosts Andreas Müller
3 siblings, 1 reply; 16+ messages in thread
From: Andreas Müller @ 2016-12-06 0:19 UTC (permalink / raw)
To: openembedded-core
fixes Martin's MACHINE checksum test [1]
[1] http://lists.openembedded.org/pipermail/openembedded-core/2016-November/129464.html
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
index ac7312b..b104a43 100644
--- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
+++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
@@ -34,6 +34,7 @@ EXTRA_OECONF = "--disable-oss --disable-esd --disable-arts \
--enable-sdl-dlopen \
--disable-rpath \
WAYLAND_PROTOCOLS_SYSROOT_DIR=${STAGING_DIR}/${MACHINE}"
+EXTRA_OECONF[vardepsexclude] = "MACHINE"
# opengl packageconfig factored out to make it easy for distros
# and BSP layers to pick either (desktop) opengl, gles2, or no GL
--
2.5.5
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 4/5] libsdl2: add wayland--protocols to to depends of PACKAGECONFIG[wayland]
2016-12-06 0:19 [PATCH 1/5] mesa: update to 13.0.2 Andreas Müller
2016-12-06 0:19 ` [PATCH 2/5] libdrm: update to 2.4.74 Andreas Müller
2016-12-06 0:19 ` [PATCH 3/5] libsdl2: add EXTRA_OECONF[vardepsexclude] = "MACHINE" Andreas Müller
@ 2016-12-06 0:19 ` Andreas Müller
2016-12-06 0:19 ` [PATCH 5/5] libsdl2: fix build on wayland(-dev)less hosts Andreas Müller
3 siblings, 0 replies; 16+ messages in thread
From: Andreas Müller @ 2016-12-06 0:19 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
index b104a43..bb75316 100644
--- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
+++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
@@ -54,7 +54,7 @@ PACKAGECONFIG[gles2] = "--enable-video-opengles,--disable-video-opengles,vi
PACKAGECONFIG[opengl] = "--enable-video-opengl,--disable-video-opengl,virtual/libgl"
PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio"
PACKAGECONFIG[tslib] = "--enable-input-tslib,--disable-input-tslib,tslib"
-PACKAGECONFIG[wayland] = "--enable-video-wayland,--disable-video-wayland,wayland libxkbcommon"
+PACKAGECONFIG[wayland] = "--enable-video-wayland,--disable-video-wayland,wayland wayland-protocols libxkbcommon"
PACKAGECONFIG[x11] = "--enable-video-x11,--disable-video-x11,virtual/libx11 libxext libxrandr libxrender"
EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader"
--
2.5.5
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 5/5] libsdl2: fix build on wayland(-dev)less hosts
2016-12-06 0:19 [PATCH 1/5] mesa: update to 13.0.2 Andreas Müller
` (2 preceding siblings ...)
2016-12-06 0:19 ` [PATCH 4/5] libsdl2: add wayland--protocols to to depends of PACKAGECONFIG[wayland] Andreas Müller
@ 2016-12-06 0:19 ` Andreas Müller
2016-12-13 15:31 ` Burton, Ross
3 siblings, 1 reply; 16+ messages in thread
From: Andreas Müller @ 2016-12-06 0:19 UTC (permalink / raw)
To: openembedded-core
* add sysroot prefix to wayland core protocols
* do not use pkg-config to find wayland-scanner
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
...-sysroot-path-so-that-make-finds-our-wayl.patch | 8 +++---
...void-finding-build-host-s-wayland-scanner.patch | 31 ++++++++++++++++++++++
meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb | 1 +
3 files changed, 37 insertions(+), 3 deletions(-)
create mode 100644 meta/recipes-graphics/libsdl2/libsdl2/0002-Avoid-finding-build-host-s-wayland-scanner.patch
diff --git a/meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch b/meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch
index d042430..efc8418 100644
--- a/meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch
+++ b/meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch
@@ -11,18 +11,20 @@ Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
- configure.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ configure.in | 4 +-
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.in b/configure.in
index 726ded3..3376600 100644
--- a/configure.in
+++ b/configure.in
@@ -1206,7 +1206,7 @@ AC_HELP_STRING([--enable-video-wayland-qt-touch], [QtWayland server support for
+ WAYLAND_CFLAGS=`$PKG_CONFIG --cflags wayland-client wayland-egl wayland-cursor xkbcommon`
WAYLAND_LIBS=`$PKG_CONFIG --libs wayland-client wayland-egl wayland-cursor xkbcommon`
WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`
- WAYLAND_CORE_PROTOCOL_DIR=`$PKG_CONFIG --variable=pkgdatadir wayland-client`
+- WAYLAND_CORE_PROTOCOL_DIR=`$PKG_CONFIG --variable=pkgdatadir wayland-client`
- WAYLAND_PROTOCOLS_DIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`
++ WAYLAND_CORE_PROTOCOL_DIR=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-client`
+ WAYLAND_PROTOCOLS_DIR=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`
video_wayland=yes
fi
diff --git a/meta/recipes-graphics/libsdl2/libsdl2/0002-Avoid-finding-build-host-s-wayland-scanner.patch b/meta/recipes-graphics/libsdl2/libsdl2/0002-Avoid-finding-build-host-s-wayland-scanner.patch
new file mode 100644
index 0000000..7837315
--- /dev/null
+++ b/meta/recipes-graphics/libsdl2/libsdl2/0002-Avoid-finding-build-host-s-wayland-scanner.patch
@@ -0,0 +1,31 @@
+From ae879091cf65cb70293b375ec7e61ed12a96d8a7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Fri, 2 Dec 2016 09:39:25 +0100
+Subject: [PATCH] Avoid finding build host's wayland-scanner
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ configure.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 3376600..2aa6ed4 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1204,7 +1204,7 @@ AC_HELP_STRING([--enable-video-wayland-qt-touch], [QtWayland server support for
+ if $PKG_CONFIG --exists wayland-client wayland-scanner wayland-protocols wayland-egl wayland-cursor egl xkbcommon ; then
+ WAYLAND_CFLAGS=`$PKG_CONFIG --cflags wayland-client wayland-egl wayland-cursor xkbcommon`
+ WAYLAND_LIBS=`$PKG_CONFIG --libs wayland-client wayland-egl wayland-cursor xkbcommon`
+- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`
++ AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner])
+ WAYLAND_CORE_PROTOCOL_DIR=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-client`
+ WAYLAND_PROTOCOLS_DIR=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`
+ video_wayland=yes
+--
+2.7.4
+
diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
index bb75316..606e6fb 100644
--- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
+++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
@@ -18,6 +18,7 @@ SRC_URI = " \
http://www.libsdl.org/release/SDL2-${PV}.tar.gz \
file://linkage.patch \
file://0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch \
+ file://0002-Avoid-finding-build-host-s-wayland-scanner.patch \
"
S = "${WORKDIR}/SDL2-${PV}"
--
2.5.5
^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH 3/5] libsdl2: add EXTRA_OECONF[vardepsexclude] = "MACHINE"
2016-12-06 0:19 ` [PATCH 3/5] libsdl2: add EXTRA_OECONF[vardepsexclude] = "MACHINE" Andreas Müller
@ 2016-12-06 0:24 ` Khem Raj
2016-12-06 8:00 ` Andreas Müller
0 siblings, 1 reply; 16+ messages in thread
From: Khem Raj @ 2016-12-06 0:24 UTC (permalink / raw)
To: Andreas Müller; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 1406 bytes --]
There probably is no need to use this additional variable. We can just use
PKG_CONFIG_SYSROOT
On Dec 5, 2016 4:19 PM, "Andreas Müller" <schnitzeltony@googlemail.com>
wrote:
> fixes Martin's MACHINE checksum test [1]
>
> [1] http://lists.openembedded.org/pipermail/openembedded-core/
> 2016-November/129464.html
>
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
> meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
> b/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
> index ac7312b..b104a43 100644
> --- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
> +++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
> @@ -34,6 +34,7 @@ EXTRA_OECONF = "--disable-oss --disable-esd
> --disable-arts \
> --enable-sdl-dlopen \
> --disable-rpath \
> WAYLAND_PROTOCOLS_SYSROOT_DIR=${STAGING_DIR}/${MACHINE}"
> +EXTRA_OECONF[vardepsexclude] = "MACHINE"
>
> # opengl packageconfig factored out to make it easy for distros
> # and BSP layers to pick either (desktop) opengl, gles2, or no GL
> --
> 2.5.5
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
[-- Attachment #2: Type: text/html, Size: 2573 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 3/5] libsdl2: add EXTRA_OECONF[vardepsexclude] = "MACHINE"
2016-12-06 0:24 ` Khem Raj
@ 2016-12-06 8:00 ` Andreas Müller
2016-12-09 2:52 ` Khem Raj
0 siblings, 1 reply; 16+ messages in thread
From: Andreas Müller @ 2016-12-06 8:00 UTC (permalink / raw)
To: Khem Raj; +Cc: Patches and discussions about the oe-core layer
On Tue, Dec 6, 2016 at 1:24 AM, Khem Raj <raj.khem@gmail.com> wrote:
> There probably is no need to use this additional variable. We can just use
> PKG_CONFIG_SYSROOT
Problem is not finding the wrong .pc files. Problem is that the output
of pkg-config must be prefixed to find the protocols.
Andreas
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 3/5] libsdl2: add EXTRA_OECONF[vardepsexclude] = "MACHINE"
2016-12-06 8:00 ` Andreas Müller
@ 2016-12-09 2:52 ` Khem Raj
0 siblings, 0 replies; 16+ messages in thread
From: Khem Raj @ 2016-12-09 2:52 UTC (permalink / raw)
To: Andreas Müller; +Cc: Patches and discussions about the oe-core layer
On Tue, Dec 6, 2016 at 12:00 AM, Andreas Müller
<schnitzeltony@googlemail.com> wrote:
> On Tue, Dec 6, 2016 at 1:24 AM, Khem Raj <raj.khem@gmail.com> wrote:
>> There probably is no need to use this additional variable. We can just use
>> PKG_CONFIG_SYSROOT
> Problem is not finding the wrong .pc files. Problem is that the output
> of pkg-config must be prefixed to find the protocols.
>
I think this patch as such is fine for now.
> Andreas
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 5/5] libsdl2: fix build on wayland(-dev)less hosts
2016-12-06 0:19 ` [PATCH 5/5] libsdl2: fix build on wayland(-dev)less hosts Andreas Müller
@ 2016-12-13 15:31 ` Burton, Ross
2016-12-13 15:42 ` Andreas Müller
0 siblings, 1 reply; 16+ messages in thread
From: Burton, Ross @ 2016-12-13 15:31 UTC (permalink / raw)
To: Andreas Müller; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 5753 bytes --]
I finally merged the sdl/wayland bits of this series but libsdl2 fails for
me:
| GEN gen/wayland-client-protocol.h
| /bin/bash: client-header: command not found
| /bin/bash: client-header: command not found
Ross
On 6 December 2016 at 00:19, Andreas Müller <schnitzeltony@googlemail.com>
wrote:
> * add sysroot prefix to wayland core protocols
> * do not use pkg-config to find wayland-scanner
>
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
> ...-sysroot-path-so-that-make-finds-our-wayl.patch | 8 +++---
> ...void-finding-build-host-s-wayland-scanner.patch | 31
> ++++++++++++++++++++++
> meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb | 1 +
> 3 files changed, 37 insertions(+), 3 deletions(-)
> create mode 100644 meta/recipes-graphics/libsdl2/
> libsdl2/0002-Avoid-finding-build-host-s-wayland-scanner.patch
>
> diff --git a/meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-
> our-sysroot-path-so-that-make-finds-our-wayl.patch
> b/meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-
> our-sysroot-path-so-that-make-finds-our-wayl.patch
> index d042430..efc8418 100644
> --- a/meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-
> our-sysroot-path-so-that-make-finds-our-wayl.patch
> +++ b/meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-
> our-sysroot-path-so-that-make-finds-our-wayl.patch
> @@ -11,18 +11,20 @@ Upstream-Status: Inappropriate [embedded specific]
>
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
> - configure.in | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> + configure.in | 4 +-
> + 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/configure.in b/configure.in
> index 726ded3..3376600 100644
> --- a/configure.in
> +++ b/configure.in
> @@ -1206,7 +1206,7 @@ AC_HELP_STRING([--enable-video-wayland-qt-touch],
> [QtWayland server support for
> + WAYLAND_CFLAGS=`$PKG_CONFIG --cflags wayland-client
> wayland-egl wayland-cursor xkbcommon`
> WAYLAND_LIBS=`$PKG_CONFIG --libs wayland-client
> wayland-egl wayland-cursor xkbcommon`
> WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner
> wayland-scanner`
> - WAYLAND_CORE_PROTOCOL_DIR=`$PKG_CONFIG
> --variable=pkgdatadir wayland-client`
> +- WAYLAND_CORE_PROTOCOL_DIR=`$PKG_CONFIG
> --variable=pkgdatadir wayland-client`
> - WAYLAND_PROTOCOLS_DIR=`$PKG_CONFIG
> --variable=pkgdatadir wayland-protocols`
> ++ WAYLAND_CORE_PROTOCOL_DIR=${
> WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir
> wayland-client`
> + WAYLAND_PROTOCOLS_DIR=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG
> --variable=pkgdatadir wayland-protocols`
> video_wayland=yes
> fi
> diff --git a/meta/recipes-graphics/libsdl2/libsdl2/0002-Avoid-
> finding-build-host-s-wayland-scanner.patch b/meta/recipes-graphics/
> libsdl2/libsdl2/0002-Avoid-finding-build-host-s-wayland-scanner.patch
> new file mode 100644
> index 0000000..7837315
> --- /dev/null
> +++ b/meta/recipes-graphics/libsdl2/libsdl2/0002-Avoid-
> finding-build-host-s-wayland-scanner.patch
> @@ -0,0 +1,31 @@
> +From ae879091cf65cb70293b375ec7e61ed12a96d8a7 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
> +Date: Fri, 2 Dec 2016 09:39:25 +0100
> +Subject: [PATCH] Avoid finding build host's wayland-scanner
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +Upstream-Status: Inappropriate [embedded specific]
> +
> +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> +---
> + configure.in | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/configure.in b/configure.in
> +index 3376600..2aa6ed4 100644
> +--- a/configure.in
> ++++ b/configure.in
> +@@ -1204,7 +1204,7 @@ AC_HELP_STRING([--enable-video-wayland-qt-touch],
> [QtWayland server support for
> + if $PKG_CONFIG --exists wayland-client wayland-scanner
> wayland-protocols wayland-egl wayland-cursor egl xkbcommon ; then
> + WAYLAND_CFLAGS=`$PKG_CONFIG --cflags wayland-client
> wayland-egl wayland-cursor xkbcommon`
> + WAYLAND_LIBS=`$PKG_CONFIG --libs wayland-client
> wayland-egl wayland-cursor xkbcommon`
> +- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner
> wayland-scanner`
> ++ AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner])
> + WAYLAND_CORE_PROTOCOL_DIR=${
> WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir
> wayland-client`
> + WAYLAND_PROTOCOLS_DIR=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG
> --variable=pkgdatadir wayland-protocols`
> + video_wayland=yes
> +--
> +2.7.4
> +
> diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
> b/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
> index bb75316..606e6fb 100644
> --- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
> +++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
> @@ -18,6 +18,7 @@ SRC_URI = " \
> http://www.libsdl.org/release/SDL2-${PV}.tar.gz \
> file://linkage.patch \
> file://0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch
> \
> + file://0002-Avoid-finding-build-host-s-wayland-scanner.patch \
> "
>
> S = "${WORKDIR}/SDL2-${PV}"
> --
> 2.5.5
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
[-- Attachment #2: Type: text/html, Size: 8351 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 5/5] libsdl2: fix build on wayland(-dev)less hosts
2016-12-13 15:31 ` Burton, Ross
@ 2016-12-13 15:42 ` Andreas Müller
2016-12-13 16:10 ` Burton, Ross
0 siblings, 1 reply; 16+ messages in thread
From: Andreas Müller @ 2016-12-13 15:42 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
On Tue, Dec 13, 2016 at 4:31 PM, Burton, Ross <ross.burton@intel.com> wrote:
> I finally merged the sdl/wayland bits of this series but libsdl2 fails for
> me:
>
> | GEN gen/wayland-client-protocol.h
> | /bin/bash: client-header: command not found
> | /bin/bash: client-header: command not found
>
> Ross
Strange - something must be wrong on your machine :)
Seriously: Can you supply full log.do_configure and log.do_complie please?
Andreas
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 5/5] libsdl2: fix build on wayland(-dev)less hosts
2016-12-13 15:42 ` Andreas Müller
@ 2016-12-13 16:10 ` Burton, Ross
2016-12-13 17:46 ` Andreas Müller
0 siblings, 1 reply; 16+ messages in thread
From: Burton, Ross @ 2016-12-13 16:10 UTC (permalink / raw)
To: Andreas Müller; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 490 bytes --]
On 13 December 2016 at 15:42, Andreas Müller <schnitzeltony@googlemail.com>
wrote:
> Strange - something must be wrong on your machine :)
>
config.log says:
configure:19371: checking for Wayland support
configure:19382: checking for wayland-scanner
configure:19415: result: no
configure:19425: result: yes
which results in:
WAYLAND_SCANNER =
This should be fatal, but you're just missing a dependency on
wayland-native. I'll squash it into the patch now.
Ross
[-- Attachment #2: Type: text/html, Size: 1367 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 5/5] libsdl2: fix build on wayland(-dev)less hosts
2016-12-13 16:10 ` Burton, Ross
@ 2016-12-13 17:46 ` Andreas Müller
2016-12-13 17:46 ` Burton, Ross
0 siblings, 1 reply; 16+ messages in thread
From: Andreas Müller @ 2016-12-13 17:46 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
On Tue, Dec 13, 2016 at 5:10 PM, Burton, Ross <ross.burton@intel.com> wrote:
>
> On 13 December 2016 at 15:42, Andreas Müller <schnitzeltony@googlemail.com>
> wrote:
>>
>> Strange - something must be wrong on your machine :)
>
>
> config.log says:
>
> configure:19371: checking for Wayland support
> configure:19382: checking for wayland-scanner
> configure:19415: result: no
> configure:19425: result: yes
>
> which results in:
>
> WAYLAND_SCANNER =
>
> This should be fatal, but you're just missing a dependency on
> wayland-native. I'll squash it into the patch now.
>
> Ross
I thought wayland depends on wayland-native already. Is it possible
that you don't have wayland in your DISTO_FEATURES - honestly have not
tested that on a machine with missing wayland-scanner.
Andreas
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 5/5] libsdl2: fix build on wayland(-dev)less hosts
2016-12-13 17:46 ` Andreas Müller
@ 2016-12-13 17:46 ` Burton, Ross
2016-12-13 17:51 ` Andreas Müller
0 siblings, 1 reply; 16+ messages in thread
From: Burton, Ross @ 2016-12-13 17:46 UTC (permalink / raw)
To: Andreas Müller; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 381 bytes --]
On 13 December 2016 at 17:46, Andreas Müller <schnitzeltony@googlemail.com>
wrote:
> I thought wayland depends on wayland-native already. Is it possible
> that you don't have wayland in your DISTO_FEATURES - honestly have not
> tested that on a machine with missing wayland-scanner.
>
If wayland comes from sstate then it won't pull in the native dependencies.
Ross
[-- Attachment #2: Type: text/html, Size: 803 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 5/5] libsdl2: fix build on wayland(-dev)less hosts
2016-12-13 17:46 ` Burton, Ross
@ 2016-12-13 17:51 ` Andreas Müller
2016-12-13 17:52 ` Andreas Müller
2016-12-13 18:41 ` Burton, Ross
0 siblings, 2 replies; 16+ messages in thread
From: Andreas Müller @ 2016-12-13 17:51 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
On Tue, Dec 13, 2016 at 6:46 PM, Burton, Ross <ross.burton@intel.com> wrote:
>
> On 13 December 2016 at 17:46, Andreas Müller <schnitzeltony@googlemail.com>
> wrote:
>>
>> I thought wayland depends on wayland-native already. Is it possible
>> that you don't have wayland in your DISTO_FEATURES - honestly have not
>> tested that on a machine with missing wayland-scanner.
>
>
> If wayland comes from sstate then it won't pull in the native dependencies.
>
> Ross
Ahh - OK
P.S. This is a good example why recipe specific sysroot is a good
thing - correct?
And
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 5/5] libsdl2: fix build on wayland(-dev)less hosts
2016-12-13 17:51 ` Andreas Müller
@ 2016-12-13 17:52 ` Andreas Müller
2016-12-13 18:41 ` Burton, Ross
1 sibling, 0 replies; 16+ messages in thread
From: Andreas Müller @ 2016-12-13 17:52 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
reas
went out too early :)
On Tue, Dec 13, 2016 at 6:51 PM, Andreas Müller
<schnitzeltony@googlemail.com> wrote:
> On Tue, Dec 13, 2016 at 6:46 PM, Burton, Ross <ross.burton@intel.com> wrote:
>>
>> On 13 December 2016 at 17:46, Andreas Müller <schnitzeltony@googlemail.com>
>> wrote:
>>>
>>> I thought wayland depends on wayland-native already. Is it possible
>>> that you don't have wayland in your DISTO_FEATURES - honestly have not
>>> tested that on a machine with missing wayland-scanner.
>>
>>
>> If wayland comes from sstate then it won't pull in the native dependencies.
>>
>> Ross
> Ahh - OK
>
> P.S. This is a good example why recipe specific sysroot is a good
> thing - correct?
>
> And
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 5/5] libsdl2: fix build on wayland(-dev)less hosts
2016-12-13 17:51 ` Andreas Müller
2016-12-13 17:52 ` Andreas Müller
@ 2016-12-13 18:41 ` Burton, Ross
1 sibling, 0 replies; 16+ messages in thread
From: Burton, Ross @ 2016-12-13 18:41 UTC (permalink / raw)
To: Andreas Müller; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 199 bytes --]
On 13 December 2016 at 17:51, Andreas Müller <schnitzeltony@googlemail.com>
wrote:
> P.S. This is a good example why recipe specific sysroot is a good
> thing - correct?
>
Yeah :)
Ross
[-- Attachment #2: Type: text/html, Size: 615 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2016-12-13 18:42 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-12-06 0:19 [PATCH 1/5] mesa: update to 13.0.2 Andreas Müller
2016-12-06 0:19 ` [PATCH 2/5] libdrm: update to 2.4.74 Andreas Müller
2016-12-06 0:19 ` [PATCH 3/5] libsdl2: add EXTRA_OECONF[vardepsexclude] = "MACHINE" Andreas Müller
2016-12-06 0:24 ` Khem Raj
2016-12-06 8:00 ` Andreas Müller
2016-12-09 2:52 ` Khem Raj
2016-12-06 0:19 ` [PATCH 4/5] libsdl2: add wayland--protocols to to depends of PACKAGECONFIG[wayland] Andreas Müller
2016-12-06 0:19 ` [PATCH 5/5] libsdl2: fix build on wayland(-dev)less hosts Andreas Müller
2016-12-13 15:31 ` Burton, Ross
2016-12-13 15:42 ` Andreas Müller
2016-12-13 16:10 ` Burton, Ross
2016-12-13 17:46 ` Andreas Müller
2016-12-13 17:46 ` Burton, Ross
2016-12-13 17:51 ` Andreas Müller
2016-12-13 17:52 ` Andreas Müller
2016-12-13 18:41 ` Burton, Ross
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.