summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch34
-rw-r--r--meta/recipes-graphics/libsdl2/libsdl2/0002-Avoid-finding-build-host-s-wayland-scanner.patch31
-rw-r--r--meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb4
-rw-r--r--meta/recipes-graphics/wayland/wayland-protocols/usesysrootprefixforpkgdatadirvariable.patch27
-rw-r--r--meta/recipes-graphics/wayland/wayland-protocols_1.10.bb1
-rw-r--r--meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch33
-rw-r--r--meta/recipes-graphics/wayland/wayland_1.14.0.bb1
-rw-r--r--meta/recipes-graphics/wayland/weston_2.0.0.bb1
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg.inc1
9 files changed, 63 insertions, 70 deletions
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
deleted file mode 100644
index efc84188f3..0000000000
--- a/meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From b44808e43130dcd13b43e5b978b9b24aeb4c134c Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Thu, 20 Oct 2016 14:57:51 +0200
4Subject: [PATCH] prepend our sysroot path so that make finds our
5 wayland-protocol files
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10Upstream-Status: Inappropriate [embedded specific]
11
12Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
13---
14 configure.in | 4 +-
15 1 file changed, 2 insertions(+), 2 deletions(-)
16
17diff --git a/configure.in b/configure.in
18index 726ded3..3376600 100644
19--- a/configure.in
20+++ b/configure.in
21@@ -1206,7 +1206,7 @@ AC_HELP_STRING([--enable-video-wayland-qt-touch], [QtWayland server support for
22 WAYLAND_CFLAGS=`$PKG_CONFIG --cflags wayland-client wayland-egl wayland-cursor xkbcommon`
23 WAYLAND_LIBS=`$PKG_CONFIG --libs wayland-client wayland-egl wayland-cursor xkbcommon`
24 WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`
25- WAYLAND_CORE_PROTOCOL_DIR=`$PKG_CONFIG --variable=pkgdatadir wayland-client`
26- WAYLAND_PROTOCOLS_DIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`
27+ WAYLAND_CORE_PROTOCOL_DIR=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-client`
28+ WAYLAND_PROTOCOLS_DIR=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`
29 video_wayland=yes
30 fi
31 fi
32--
332.5.5
34
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
deleted file mode 100644
index 7837315f1c..0000000000
--- a/meta/recipes-graphics/libsdl2/libsdl2/0002-Avoid-finding-build-host-s-wayland-scanner.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From ae879091cf65cb70293b375ec7e61ed12a96d8a7 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Fri, 2 Dec 2016 09:39:25 +0100
4Subject: [PATCH] Avoid finding build host's wayland-scanner
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Upstream-Status: Inappropriate [embedded specific]
10
11Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
12---
13 configure.in | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/configure.in b/configure.in
17index 3376600..2aa6ed4 100644
18--- a/configure.in
19+++ b/configure.in
20@@ -1204,7 +1204,7 @@ AC_HELP_STRING([--enable-video-wayland-qt-touch], [QtWayland server support for
21 if $PKG_CONFIG --exists wayland-client wayland-scanner wayland-protocols wayland-egl wayland-cursor egl xkbcommon ; then
22 WAYLAND_CFLAGS=`$PKG_CONFIG --cflags wayland-client wayland-egl wayland-cursor xkbcommon`
23 WAYLAND_LIBS=`$PKG_CONFIG --libs wayland-client wayland-egl wayland-cursor xkbcommon`
24- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`
25+ AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner])
26 WAYLAND_CORE_PROTOCOL_DIR=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-client`
27 WAYLAND_PROTOCOLS_DIR=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`
28 video_wayland=yes
29--
302.7.4
31
diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
index 12d3aaf6f0..032f45bb20 100644
--- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
+++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
@@ -17,8 +17,6 @@ DEPENDS_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtu
17SRC_URI = " \ 17SRC_URI = " \
18 http://www.libsdl.org/release/SDL2-${PV}.tar.gz \ 18 http://www.libsdl.org/release/SDL2-${PV}.tar.gz \
19 file://linkage.patch \ 19 file://linkage.patch \
20 file://0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch \
21 file://0002-Avoid-finding-build-host-s-wayland-scanner.patch \
22 file://fix-build-failure-on-ppc.patch \ 20 file://fix-build-failure-on-ppc.patch \
23" 21"
24 22
@@ -35,7 +33,7 @@ EXTRA_OECONF = "--disable-oss --disable-esd --disable-arts \
35 --enable-pthreads \ 33 --enable-pthreads \
36 --enable-sdl-dlopen \ 34 --enable-sdl-dlopen \
37 --disable-rpath \ 35 --disable-rpath \
38 WAYLAND_PROTOCOLS_SYSROOT_DIR=${RECIPE_SYSROOT}" 36 "
39 37
40# opengl packageconfig factored out to make it easy for distros 38# opengl packageconfig factored out to make it easy for distros
41# and BSP layers to pick either (desktop) opengl, gles2, or no GL 39# and BSP layers to pick either (desktop) opengl, gles2, or no GL
diff --git a/meta/recipes-graphics/wayland/wayland-protocols/usesysrootprefixforpkgdatadirvariable.patch b/meta/recipes-graphics/wayland/wayland-protocols/usesysrootprefixforpkgdatadirvariable.patch
new file mode 100644
index 0000000000..0922a4d2c2
--- /dev/null
+++ b/meta/recipes-graphics/wayland/wayland-protocols/usesysrootprefixforpkgdatadirvariable.patch
@@ -0,0 +1,27 @@
1From 875130ee3cbcf62266901ef4b91b9a0fb6adad43 Mon Sep 17 00:00:00 2001
2From: Tomek Bury <tomek.bury@broadcom.com>
3Date: Fri, 4 Aug 2017 16:16:38 +0100
4Subject: Use sysroot prefix for pkgdatadir variable
5
6The pc_sysroot is automatically added to cflags and libs but not
7to 'pkg-config --variable'
8
9Upstream-Status: Backport [https://cgit.freedesktop.org/wayland/wayland-protocols/commit/?id=875130ee3cbcf62266901ef4b91b9a0fb6adad43]
10
11Reviewed-by: Daniel Stone <daniels@collabora.com>
12
13diff --git a/wayland-protocols.pc.in b/wayland-protocols.pc.in
14index a26744c..379be06 100644
15--- a/wayland-protocols.pc.in
16+++ b/wayland-protocols.pc.in
17@@ -1,6 +1,6 @@
18 prefix=@prefix@
19 datarootdir=@datarootdir@
20-pkgdatadir=@datadir@/@PACKAGE@
21+pkgdatadir=${pc_sysrootdir}@datadir@/@PACKAGE@
22
23 Name: Wayland Protocols
24 Description: Wayland protocol files
25--
26cgit v0.10.2
27
diff --git a/meta/recipes-graphics/wayland/wayland-protocols_1.10.bb b/meta/recipes-graphics/wayland/wayland-protocols_1.10.bb
index 4f9e9f32bf..1ff12c607b 100644
--- a/meta/recipes-graphics/wayland/wayland-protocols_1.10.bb
+++ b/meta/recipes-graphics/wayland/wayland-protocols_1.10.bb
@@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \
10 file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53" 10 file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53"
11 11
12SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ 12SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
13 file://usesysrootprefixforpkgdatadirvariable.patch \
13 " 14 "
14SRC_URI[md5sum] = "84a7846c2b6a6a3e265fc9be36453e60" 15SRC_URI[md5sum] = "84a7846c2b6a6a3e265fc9be36453e60"
15SRC_URI[sha256sum] = "5719c51d7354864983171c5083e93a72ac99229e2b460c4bb10513de08839c0a" 16SRC_URI[sha256sum] = "5719c51d7354864983171c5083e93a72ac99229e2b460c4bb10513de08839c0a"
diff --git a/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch b/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch
new file mode 100644
index 0000000000..9fb1252284
--- /dev/null
+++ b/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch
@@ -0,0 +1,33 @@
1Fix wayland-client and wayland-scanner pc files
2
3Upstream-Status: Pending
4
5Signed-off-by: Fabien Lahoudere <fabien.lahoudere@collabora.co.uk>
6
7Index: wayland-1.14.0/src/wayland-client.pc.in
8===================================================================
9--- wayland-1.14.0.orig/src/wayland-client.pc.in
10+++ wayland-1.14.0/src/wayland-client.pc.in
11@@ -1,7 +1,7 @@
12 prefix=@prefix@
13 exec_prefix=@exec_prefix@
14 datarootdir=@datarootdir@
15-pkgdatadir=@datadir@/@PACKAGE@
16+pkgdatadir=${pc_sysrootdir}@datadir@/@PACKAGE@
17 libdir=@libdir@
18 includedir=@includedir@
19
20Index: wayland-1.14.0/src/wayland-scanner.pc.in
21===================================================================
22--- wayland-1.14.0.orig/src/wayland-scanner.pc.in
23+++ wayland-1.14.0/src/wayland-scanner.pc.in
24@@ -1,8 +1,8 @@
25 prefix=@prefix@
26 exec_prefix=@exec_prefix@
27 datarootdir=@datarootdir@
28 pkgdatadir=@datadir@/@PACKAGE@
29-wayland_scanner=@bindir@/wayland-scanner
30+wayland_scanner=wayland-scanner
31
32 Name: Wayland Scanner
33 Description: Wayland scanner
diff --git a/meta/recipes-graphics/wayland/wayland_1.14.0.bb b/meta/recipes-graphics/wayland/wayland_1.14.0.bb
index 2a2489d658..1a9ff9807b 100644
--- a/meta/recipes-graphics/wayland/wayland_1.14.0.bb
+++ b/meta/recipes-graphics/wayland/wayland_1.14.0.bb
@@ -13,6 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \
13DEPENDS = "expat libxml2 libffi wayland-native" 13DEPENDS = "expat libxml2 libffi wayland-native"
14 14
15SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ 15SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
16 file://fixpathinpcfiles.patch \
16 " 17 "
17SRC_URI[md5sum] = "0235f6075c32c3be61cff94fa0b9f108" 18SRC_URI[md5sum] = "0235f6075c32c3be61cff94fa0b9f108"
18SRC_URI[sha256sum] = "ed80cabc0961a759a42092e2c39aabfc1ec9a13c86c98bbe2b812f008da27ab8" 19SRC_URI[sha256sum] = "ed80cabc0961a759a42092e2c39aabfc1ec9a13c86c98bbe2b812f008da27ab8"
diff --git a/meta/recipes-graphics/wayland/weston_2.0.0.bb b/meta/recipes-graphics/wayland/weston_2.0.0.bb
index 54b07bd6b9..8160f5556d 100644
--- a/meta/recipes-graphics/wayland/weston_2.0.0.bb
+++ b/meta/recipes-graphics/wayland/weston_2.0.0.bb
@@ -25,7 +25,6 @@ DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native"
25 25
26EXTRA_OECONF = "--enable-setuid-install \ 26EXTRA_OECONF = "--enable-setuid-install \
27 --disable-rdp-compositor \ 27 --disable-rdp-compositor \
28 WAYLAND_PROTOCOLS_SYSROOT_DIR=${RECIPE_SYSROOT} \
29 " 28 "
30EXTRA_OECONF_append_qemux86 = "\ 29EXTRA_OECONF_append_qemux86 = "\
31 WESTON_NATIVE_BACKEND=fbdev-backend.so \ 30 WESTON_NATIVE_BACKEND=fbdev-backend.so \
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 863d80ce43..e8025de55f 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -117,7 +117,6 @@ EXTRA_OECONF += "--with-fop=no \
117 --sysconfdir=/etc/X11 \ 117 --sysconfdir=/etc/X11 \
118 --localstatedir=/var \ 118 --localstatedir=/var \
119 --with-xkb-output=/var/lib/xkb \ 119 --with-xkb-output=/var/lib/xkb \
120 WAYLAND_PROTOCOLS_SYSROOT_DIR=${RECIPE_SYSROOT} \
121" 120"
122 121
123OPENGL_PKGCONFIGS = "dri glx glamor dri3 xshmfence" 122OPENGL_PKGCONFIGS = "dri glx glamor dri3 xshmfence"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-18 08:56:10 +0000