Re: [OE-core] [PATCH 1/2] libdrm: Add PACKAGECONFIG support for all meson options
I can't replicate the error, I don't think util-macros is needed anymore. Ross On 10 July 2018 at 10:52, Martin Jansa wrote: > On Tue, Jul 10, 2018 at 10:41:10AM +0100, Burton, Ross wrote: >> On 10 July 2018 at 09:07, Martin Jansa wrote: >> > * Use the same defaults as meson does, with few modifications based on >> > previous EXTRA_OEMESON >> > * move libpciaccess dependency to new intel PACKAGECONFIG >> > * add dependency on util-macros which was previously pulled by >> > libpciaccess, because it's still needed even with intel disabled: >> > | configure.ac:34: error: must install xorg-macros 1.12 or later >> > before running autoconf/autogen >> >> Why is configure giving you an error message when Meson is being used? > > Because this error message is almost a year old from: > http://git.openembedded.org/openembedded-core-contrib/commit/?h=jansa/qemu=2eb3926cc54fef8e8cdd39cc20fbdc129aa1e52f > switch to meson just pushed me to send this part upstream instead of > rebasing it forever. > > I can update it with meson version of the error if you want. > > -- > Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] libdrm: Add PACKAGECONFIG support for all meson options
On Tue, Jul 10, 2018 at 10:41:10AM +0100, Burton, Ross wrote: > On 10 July 2018 at 09:07, Martin Jansa wrote: > > * Use the same defaults as meson does, with few modifications based on > > previous EXTRA_OEMESON > > * move libpciaccess dependency to new intel PACKAGECONFIG > > * add dependency on util-macros which was previously pulled by > > libpciaccess, because it's still needed even with intel disabled: > > | configure.ac:34: error: must install xorg-macros 1.12 or later > > before running autoconf/autogen > > Why is configure giving you an error message when Meson is being used? Because this error message is almost a year old from: http://git.openembedded.org/openembedded-core-contrib/commit/?h=jansa/qemu=2eb3926cc54fef8e8cdd39cc20fbdc129aa1e52f switch to meson just pushed me to send this part upstream instead of rebasing it forever. I can update it with meson version of the error if you want. -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] libdrm: Add PACKAGECONFIG support for all meson options
On 10 July 2018 at 09:07, Martin Jansa wrote: > * Use the same defaults as meson does, with few modifications based on > previous EXTRA_OEMESON > * move libpciaccess dependency to new intel PACKAGECONFIG > * add dependency on util-macros which was previously pulled by > libpciaccess, because it's still needed even with intel disabled: > | configure.ac:34: error: must install xorg-macros 1.12 or later > before running autoconf/autogen Why is configure giving you an error message when Meson is being used? Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] libdrm: Add PACKAGECONFIG support for all meson options
* Use the same defaults as meson does, with few modifications based on
previous EXTRA_OEMESON
* move libpciaccess dependency to new intel PACKAGECONFIG
* add dependency on util-macros which was previously pulled by
libpciaccess, because it's still needed even with intel disabled:
| configure.ac:34: error: must install xorg-macros 1.12 or later
before running autoconf/autogen
Signed-off-by: Martin Jansa
---
meta/recipes-graphics/drm/libdrm_2.4.92.bb | 26 --
1 file changed, 19 insertions(+), 7 deletions(-)
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.92.bb
b/meta/recipes-graphics/drm/libdrm_2.4.92.bb
index 347090cd5f..1526553254 100644
--- a/meta/recipes-graphics/drm/libdrm_2.4.92.bb
+++ b/meta/recipes-graphics/drm/libdrm_2.4.92.bb
@@ -8,7 +8,7 @@ SECTION = "x11/base"
LICENSE = "MIT"
LIC_FILES_CHKSUM =
"file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71"
PROVIDES = "drm"
-DEPENDS = "libpthread-stubs libpciaccess"
+DEPENDS = "libpthread-stubs util-macros"
SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \
file://musl-ioctl.patch"
@@ -17,12 +17,24 @@ SRC_URI[sha256sum] =
"e9e48fdb4de139dc4d9880aa1473158a16ff6aff63d14341367bd30a51
inherit meson pkgconfig manpages
-EXTRA_OEMESON = "-Dvalgrind=false \
- -Dcairo-tests=false \
- -Dinstall-test-programs=true \
- -Domap=true \
- -Detnaviv=true"
-
+PACKAGECONFIG ??= "libkms intel radeon amdgpu nouveau vmwgfx omap freedreno
vc4 etnaviv install-test-programs"
+PACKAGECONFIG[libkms] = "-Dlibkms=true,-Dlibkms=false"
+PACKAGECONFIG[intel] = "-Dintel=true,-Dintel=false,libpciaccess"
+PACKAGECONFIG[radeon] = "-Dradeon=true,-Dradeon=false"
+PACKAGECONFIG[amdgpu] = "-Damdgpu=true,-Damdgpu=false"
+PACKAGECONFIG[nouveau] = "-Dnouveau=true,-Dnouveau=false"
+PACKAGECONFIG[vmwgfx] = "-Dvmwgfx=true,-Dvmwgfx=false"
+PACKAGECONFIG[omap] = "-Domap=true,-Domap=false"
+PACKAGECONFIG[exynos] = "-Dexynos=true,-Dexynos=false"
+PACKAGECONFIG[freedreno] = "-Dfreedreno=true,-Dfreedreno=false"
+PACKAGECONFIG[tegra] = "-Dtegra=true,-Dtegra=false"
+PACKAGECONFIG[vc4] = "-Dvc4=true,-Dvc4=false"
+PACKAGECONFIG[etnaviv] = "-Detnaviv=true,-Detnaviv=false"
+PACKAGECONFIG[freedreno-kgsl] = "-Dfreedreno-kgsl=true,-Dfreedreno-kgsl=false"
+PACKAGECONFIG[valgrind] = "-Dvalgrind=true,-Dvalgrind=false,valgrind"
+PACKAGECONFIG[install-test-programs] =
"-Dinstall-test-programs=true,-Dinstall-test-programs=false"
+PACKAGECONFIG[cairo-tests] = "-Dcairo-tests=true,-Dcairo-tests=false"
+PACKAGECONFIG[udev] = "-Dudev=true,-Dudev=false,udev"
PACKAGECONFIG[manpages] = "-Dman-pages=true,-Dman-pages=false,libxslt-native
xmlto-native"
ALLOW_EMPTY_${PN}-drivers = "1"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
