| Message ID | 20230224093850.3393567-3-zboszor@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/4] bindgen-cli: Add new recipe | expand |
On 24/02/2023 10:38:49+0100, Zoltan Boszormenyi wrote: > There is another OpenCL frontend called "rusticl" now. > > Signed-off-by: Zolt�n B�sz�rm�nyi <zboszor@gmail.com> > --- > meta/recipes-graphics/mesa/mesa.inc | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc > index 70f9b6fc17..9ec10c49ca 100644 > --- a/meta/recipes-graphics/mesa/mesa.inc > +++ b/meta/recipes-graphics/mesa/mesa.inc > @@ -115,9 +115,9 @@ PACKAGECONFIG[gles] = "-Dgles1=enabled -Dgles2=enabled, -Dgles1=disabled -Dgles2 > # "egl" requires "opengl" > PACKAGECONFIG[egl] = "-Degl=enabled, -Degl=disabled" > > -# "opencl" requires libclc from meta-clang and spirv-tools from OE-Core > +# "clover" requires libclc from meta-clang and spirv-tools from OE-Core > OPENCL_NATIVE = "${@bb.utils.contains('PACKAGECONFIG', 'freedreno', '-Dopencl-native=true', '', d)}" > -PACKAGECONFIG[opencl] = "-Dgallium-opencl=icd -Dopencl-spirv=true ${OPENCL_NATIVE},-Dgallium-opencl=disabled -Dopencl-spirv=false,libclc spirv-tools" > +PACKAGECONFIG[clover] = "-Dgallium-opencl=icd -Dopencl-spirv=true ${OPENCL_NATIVE},-Dgallium-opencl=disabled -Dopencl-spirv=false,libclc spirv-tools" Are we allowed to do that? It will break anyone using "opencl" in there PACKAGECONFIG > > PACKAGECONFIG[broadcom] = "" > PACKAGECONFIG[etnaviv] = "" > @@ -196,7 +196,7 @@ DEV_PKG_DEPENDENCY = "" > # development package of libgles3. > RDEPENDS:libgles3-mesa-dev += "libgles2-mesa-dev" > > -RDEPENDS:libopencl-mesa += "${@bb.utils.contains('PACKAGECONFIG', 'opencl', 'libclc spirv-tools', '', d)}" > +RDEPENDS:libopencl-mesa += "${@bb.utils.contains('PACKAGECONFIG', 'clover', 'libclc spirv-tools', '', d)}" > > PACKAGES =+ "libegl-mesa libegl-mesa-dev \ > libosmesa libosmesa-dev \ > @@ -242,7 +242,7 @@ python __anonymous() { > ("gles", "libgles1", "libglesv1-cm1"), > ("gles", "libgles2", "libglesv2-2"), > ("gles", "libgles3",), > - ("opencl", "libopencl",)): > + ("clover", "libopencl",)): > if not p[0] in pkgconfig: > continue > mlprefix = d.getVar("MLPREFIX") > -- > 2.39.2 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#177666): https://lists.openembedded.org/g/openembedded-core/message/177666 > Mute This Topic: https://lists.openembedded.org/mt/97202945/3617179 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com] > -=-=-=-=-=-=-=-=-=-=-=- >
On Fri, 24 Feb 2023 at 13:29, Alexandre Belloni via lists.openembedded.org <alexandre.belloni=bootlin.com@lists.openembedded.org> wrote: > > -PACKAGECONFIG[opencl] = "-Dgallium-opencl=icd -Dopencl-spirv=true ${OPENCL_NATIVE},-Dgallium-opencl=disabled -Dopencl-spirv=false,libclc spirv-tools" > > +PACKAGECONFIG[clover] = "-Dgallium-opencl=icd -Dopencl-spirv=true ${OPENCL_NATIVE},-Dgallium-opencl=disabled -Dopencl-spirv=false,libclc spirv-tools" > > Are we allowed to do that? It will break anyone using "opencl" in there > PACKAGECONFIG It's a part of the implicit agreement that bumping master revision to a newer master revision can and does break stuff. In this case 'opencl' is ambigous about what opencl implementation you get. Curl's 'ssl' option was recently renamed to 'openssl' for the same reason, and broke builds similarly. Alex
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 70f9b6fc17..9ec10c49ca 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -115,9 +115,9 @@ PACKAGECONFIG[gles] = "-Dgles1=enabled -Dgles2=enabled, -Dgles1=disabled -Dgles2 # "egl" requires "opengl" PACKAGECONFIG[egl] = "-Degl=enabled, -Degl=disabled" -# "opencl" requires libclc from meta-clang and spirv-tools from OE-Core +# "clover" requires libclc from meta-clang and spirv-tools from OE-Core OPENCL_NATIVE = "${@bb.utils.contains('PACKAGECONFIG', 'freedreno', '-Dopencl-native=true', '', d)}" -PACKAGECONFIG[opencl] = "-Dgallium-opencl=icd -Dopencl-spirv=true ${OPENCL_NATIVE},-Dgallium-opencl=disabled -Dopencl-spirv=false,libclc spirv-tools" +PACKAGECONFIG[clover] = "-Dgallium-opencl=icd -Dopencl-spirv=true ${OPENCL_NATIVE},-Dgallium-opencl=disabled -Dopencl-spirv=false,libclc spirv-tools" PACKAGECONFIG[broadcom] = "" PACKAGECONFIG[etnaviv] = "" @@ -196,7 +196,7 @@ DEV_PKG_DEPENDENCY = "" # development package of libgles3. RDEPENDS:libgles3-mesa-dev += "libgles2-mesa-dev" -RDEPENDS:libopencl-mesa += "${@bb.utils.contains('PACKAGECONFIG', 'opencl', 'libclc spirv-tools', '', d)}" +RDEPENDS:libopencl-mesa += "${@bb.utils.contains('PACKAGECONFIG', 'clover', 'libclc spirv-tools', '', d)}" PACKAGES =+ "libegl-mesa libegl-mesa-dev \ libosmesa libosmesa-dev \ @@ -242,7 +242,7 @@ python __anonymous() { ("gles", "libgles1", "libglesv1-cm1"), ("gles", "libgles2", "libglesv2-2"), ("gles", "libgles3",), - ("opencl", "libopencl",)): + ("clover", "libopencl",)): if not p[0] in pkgconfig: continue mlprefix = d.getVar("MLPREFIX")
There is another OpenCL frontend called "rusticl" now. Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com> --- meta/recipes-graphics/mesa/mesa.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)