Re: [oe] [meta-networking][PATCH 1/2] spice: append -Wno-error=address-of-packed-member only for target
On 9/27/19 3:48 AM, Adrian Bunk wrote: On Thu, Sep 26, 2019 at 04:26:54PM +, Martin Jansa wrote: * with older native gcc on host this will break spice-native with: cc1: error: -Werror=address-of-packed-member: no option -Waddress-of-packed-member Signed-off-by: Martin Jansa --- meta-networking/recipes-support/spice/spice_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-support/spice/spice_git.bb b/meta-networking/recipes-support/spice/spice_git.bb index 30e939ac07..2829a59d15 100644 --- a/meta-networking/recipes-support/spice/spice_git.bb +++ b/meta-networking/recipes-support/spice/spice_git.bb @@ -37,7 +37,7 @@ DEPENDS_append_class-nativesdk = "nativesdk-openssl" export PYTHON="${STAGING_BINDIR_NATIVE}/python-native/python" export PYTHONPATH="${PKG_CONFIG_SYSROOT_DIR}${libdir}/python2.7/site-packages" -CFLAGS_append = " -Wno-error=address-of-packed-member" +CFLAGS_append_class-target = " -Wno-error=address-of-packed-member" Yes, the error was the same as you mentioned in the commit message, and "bitbake spice-native" works with this change. ... Least hassle would be CFLAGS_append = " -Wno-error" "bitbake nativesdk-spice" works with this change, otherwise, it doesn't work. This patch works for me. // Robert cu Adrian -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-xfce][PATCH v2 2/2] xfce4-panel: upgrade 4.14.0 -> 4.14.1
* important bugfix release: systray draws icons properly when compositing is disabled * while at it renumber patches Signed-off-by: Andreas Müller --- ...dm-tool.patch => 0002-use-lxdm-to-replace-dm-tool.patch} | 0 .../{xfce4-panel_4.14.0.bb => xfce4-panel_4.14.1.bb}| 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) rename meta-xfce/recipes-xfce/xfce4-panel/files/{0001-use-lxdm-to-replace-dm-tool.patch => 0002-use-lxdm-to-replace-dm-tool.patch} (100%) rename meta-xfce/recipes-xfce/xfce4-panel/{xfce4-panel_4.14.0.bb => xfce4-panel_4.14.1.bb} (87%) diff --git a/meta-xfce/recipes-xfce/xfce4-panel/files/0001-use-lxdm-to-replace-dm-tool.patch b/meta-xfce/recipes-xfce/xfce4-panel/files/0002-use-lxdm-to-replace-dm-tool.patch similarity index 100% rename from meta-xfce/recipes-xfce/xfce4-panel/files/0001-use-lxdm-to-replace-dm-tool.patch rename to meta-xfce/recipes-xfce/xfce4-panel/files/0002-use-lxdm-to-replace-dm-tool.patch diff --git a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.14.0.bb b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.14.1.bb similarity index 87% rename from meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.14.0.bb rename to meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.14.1.bb index 749c3fea4..a1b571e68 100644 --- a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.14.0.bb +++ b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.14.1.bb @@ -8,11 +8,11 @@ inherit xfce gtk-doc gobject-introspection distro_features_check remove-libtool REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[md5sum] = "940e8b430e28093a2e56e390055bcd51" -SRC_URI[sha256sum] = "d5f8f3bd7e142139987e5e62cda26135a424baabb5e47aa0c23b4169d0a66ef4" +SRC_URI[md5sum] = "3323588f1c18f04891e013243da1e355" +SRC_URI[sha256sum] = "9c3c78b49ddfac7d42a804e6a6ad9d22ad64ec60bbe17d8724bc52d3e3f6d114" SRC_URI += " \ file://0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \ -file://0001-use-lxdm-to-replace-dm-tool.patch \ +file://0002-use-lxdm-to-replace-dm-tool.patch \ " python populate_packages_prepend() { -- 2.21.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-xfce][PATCH v2 1/2] catfish: upgrade 1.4.9 -> 1.4.10
Signed-off-by: Andreas Müller --- .../catfish/{catfish_1.4.9.bb => catfish_1.4.10.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-xfce/recipes-apps/catfish/{catfish_1.4.9.bb => catfish_1.4.10.bb} (72%) diff --git a/meta-xfce/recipes-apps/catfish/catfish_1.4.9.bb b/meta-xfce/recipes-apps/catfish/catfish_1.4.10.bb similarity index 72% rename from meta-xfce/recipes-apps/catfish/catfish_1.4.9.bb rename to meta-xfce/recipes-apps/catfish/catfish_1.4.10.bb index eec525b88..602368b3a 100644 --- a/meta-xfce/recipes-apps/catfish/catfish_1.4.9.bb +++ b/meta-xfce/recipes-apps/catfish/catfish_1.4.10.bb @@ -9,8 +9,8 @@ DEPENDS += "python3-distutils-extra-native" B = "${S}" -SRC_URI[md5sum] = "829824fba33e86d03345bbc718e7b2d9" -SRC_URI[sha256sum] = "29a39b85804336e4819dceff203693a5904b7e11d7e024b49b5aab2649ed944e" +SRC_URI[md5sum] = "1b8e7bfd955364b7912fb0a248329b3a" +SRC_URI[sha256sum] = "2573a004105031f871c92fed22a0c4b15bb96f2dff6e36c4f2959f56b62e343d" FILES_${PN} += "${datadir}/metainfo" -- 2.21.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH 1/2] spice: append -Wno-error=address-of-packed-member only for target
On Thu, Sep 26, 2019 at 04:26:54PM +, Martin Jansa wrote: > * with older native gcc on host this will break spice-native with: > cc1: error: -Werror=address-of-packed-member: no option > -Waddress-of-packed-member > > Signed-off-by: Martin Jansa > --- > meta-networking/recipes-support/spice/spice_git.bb | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta-networking/recipes-support/spice/spice_git.bb > b/meta-networking/recipes-support/spice/spice_git.bb > index 30e939ac07..2829a59d15 100644 > --- a/meta-networking/recipes-support/spice/spice_git.bb > +++ b/meta-networking/recipes-support/spice/spice_git.bb > @@ -37,7 +37,7 @@ DEPENDS_append_class-nativesdk = "nativesdk-openssl" > export PYTHON="${STAGING_BINDIR_NATIVE}/python-native/python" > export > PYTHONPATH="${PKG_CONFIG_SYSROOT_DIR}${libdir}/python2.7/site-packages" > > -CFLAGS_append = " -Wno-error=address-of-packed-member" > +CFLAGS_append_class-target = " -Wno-error=address-of-packed-member" >... Least hassle would be CFLAGS_append = " -Wno-error" cu Adrian -- "Is there not promise of rain?" Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. "Only a promise," Lao Er said. Pearl S. Buck - Dragon Seed -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe] [PATCH] renderdoc: add new recipe
On Thu, 26 Sep 2019, Khem Raj wrote: On Thu, Sep 26, 2019 at 8:10 AM Adrian Ratiu wrote: Hello, On Thu, 26 Sep 2019, Khem Raj wrote: > https://errors.yoctoproject.org/Errors/Details/272045/ Is using COMPATIBLE_MACHINE to stop the recipe from being built on mips an acceptable solution? Something like: COMPATIBLE_MACHINE_mipsarch = "(^$)" I think we need to understand the whole set of arches it supports just doing mips will fix one of the CI builds Agreed. I'm on it, expect a v2 by the end of the week. Thank you! > > On Thu, Sep 26, 2019 at 1:02 AM Adrian Ratiu wrote: >> >> RenderDoc is a MIT licensed stand-alone multi-platform graphics >> debugger that allows easy frame by frame capture and detailed >> introspection of any applications using Vulkan, OpenGL, OpenGL ES, >> and others. >> >> Signed-off-by: Adrian Ratiu >> --- >> ...d-instead-of-cross-compiling-shim-bi.patch | 57 +++ >> ...eLists.txt-remove-flag-unsupported-b.patch | 48 >> .../renderdoc/renderdoc_1.4.bb| 29 ++ >> 3 files changed, 134 insertions(+) >> create mode 100644 meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch >> create mode 100644 meta-oe/recipes-graphics/renderdoc/renderdoc/0002-q-renderdoc-CMakeLists.txt-remove-flag-unsupported-b.patch >> create mode 100644 meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb >> >> diff --git a/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch b/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch >> new file mode 100644 >> index 0..e96dedfc3 >> --- /dev/null >> +++ b/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch >> @@ -0,0 +1,57 @@ >> +From 41a8c9b5ac13066770baee476ebf9828371f4dad Mon Sep 17 00:00:00 2001 >> +From: Adrian Ratiu >> +Date: Tue, 24 Sep 2019 16:07:18 +0300 >> +Subject: [PATCH] renderdoc: use xxd instead of cross-compiling shim binary >> + >> +Renderdoc's attempt to cross compile an xxd replacement by directly >> +calling a host cross-compiler breaks under OE's recipe specific >> +sysroots protection because this is not a native recipe, so we just >> +use xxd-native instead. >> + >> +Upstream-Status: Inappropriate [embedded-specific] >> + >> +--- >> + renderdoc/CMakeLists.txt | 23 +-- >> + 1 file changed, 1 insertion(+), 22 deletions(-) >> + >> +diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt >> +index 5cb7440a4..453a034ba 100644 >> +--- a/renderdoc/CMakeLists.txt >> b/renderdoc/CMakeLists.txt >> +@@ -370,26 +370,6 @@ set(data >> + set(data_objects) >> + >> + if(UNIX) >> +-# If we're cross-compiling, include-bin will get built for the target and we >> +-# then can't execute it. Instead, we force calling c++ (which we can safely >> +-# assume is present) directly to build the binary >> +- >> +-if(CMAKE_CROSSCOMPILING) >> +-set(HOST_NATIVE_CPP_COMPILER c++ CACHE STRING "Command to run to compile a .cpp into an executable. Default is just c++") >> +- >> +-add_custom_command(OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin >> +-WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} >> +-COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} >> +-COMMAND ${HOST_NATIVE_CPP_COMPILER} 3rdparty/include-bin/main.cpp -o ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin >> +-DEPENDS 3rdparty/include-bin/main.cpp) >> +-set(INCLUDE_BIN_EXE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin") >> +-set(INCLUDE_BIN_DEP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin") >> +-else() >> +-add_executable(include-bin 3rdparty/include-bin/main.cpp) >> +-set(INCLUDE_BIN_EXE $) >> +-set(INCLUDE_BIN_DEP include-bin) >> +-endif() >> +- >> + foreach(res ${data}) >> + set(in ${res}) >> + set(working_dir ${CMAKE_CURRENT_SOURCE_DIR}) >> +@@ -399,8 +379,7 @@ if(UNIX) >> + add_custom_command(OUTPUT ${out_src} >> + WORKING_DIRECTORY ${working_dir} >> + COMMAND ${CMAKE_COMMAND} -E make_directory ${out_src_dir} >> +-COMMAND ${INCLUDE_BIN_EXE} ${in} ${out_src} >> +-DEPENDS ${INCLUDE_BIN_DEP} >> ++COMMAND xxd -i ${in} ${out_src} >> + DEPENDS ${res}) >> + >> + list(APPEND data_objects ${out_src}) >> diff --git a/meta-oe/recipes-graphics/renderdoc/renderdoc/0002-q-renderdoc-CMakeLists.txt-remove-flag-unsupported-b.patch b/meta-oe/recipes-graphics/renderdoc/renderdoc/0002-q-renderdoc-CMakeLists.txt-remove-flag-unsupported-b.patch >> new file mode 100644 >> index 0..8cfac3b0e >> --- /dev/null >> +++
Re: [oe] [meta-networking][PATCH 1/2] spice: append -Wno-error=address-of-packed-member only for target
On 9/26/19 9:26 AM, Martin Jansa wrote: * with older native gcc on host this will break spice-native with: cc1: error: -Werror=address-of-packed-member: no option -Waddress-of-packed-member Signed-off-by: Martin Jansa --- meta-networking/recipes-support/spice/spice_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-support/spice/spice_git.bb b/meta-networking/recipes-support/spice/spice_git.bb index 30e939ac07..2829a59d15 100644 --- a/meta-networking/recipes-support/spice/spice_git.bb +++ b/meta-networking/recipes-support/spice/spice_git.bb @@ -37,7 +37,7 @@ DEPENDS_append_class-nativesdk = "nativesdk-openssl" export PYTHON="${STAGING_BINDIR_NATIVE}/python-native/python" export PYTHONPATH="${PKG_CONFIG_SYSROOT_DIR}${libdir}/python2.7/site-packages" -CFLAGS_append = " -Wno-error=address-of-packed-member" +CFLAGS_append_class-target = " -Wno-error=address-of-packed-member" There are hosts with newer version of gcc and I think they will start to fail. So I guess we could try to use ${@oe.utils.host_gcc_version(d, taskcontextonly=True)} to deduce host gcc version, another option is to add something like --disable-werror and move on. PACKAGECONFIG_class-nativesdk = "" PACKAGECONFIG ?= "sasl" -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH 1/2] spice: append -Wno-error=address-of-packed-member only for target
It looks like it's also needed for nativesdk. Will send v2 soon. On Thu, Sep 26, 2019 at 6:26 PM Martin Jansa wrote: > * with older native gcc on host this will break spice-native with: > cc1: error: -Werror=address-of-packed-member: no option > -Waddress-of-packed-member > > Signed-off-by: Martin Jansa > --- > meta-networking/recipes-support/spice/spice_git.bb | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta-networking/recipes-support/spice/spice_git.bb > b/meta-networking/recipes-support/spice/spice_git.bb > index 30e939ac07..2829a59d15 100644 > --- a/meta-networking/recipes-support/spice/spice_git.bb > +++ b/meta-networking/recipes-support/spice/spice_git.bb > @@ -37,7 +37,7 @@ DEPENDS_append_class-nativesdk = "nativesdk-openssl" > export PYTHON="${STAGING_BINDIR_NATIVE}/python-native/python" > export > PYTHONPATH="${PKG_CONFIG_SYSROOT_DIR}${libdir}/python2.7/site-packages" > > -CFLAGS_append = " -Wno-error=address-of-packed-member" > +CFLAGS_append_class-target = " -Wno-error=address-of-packed-member" > > PACKAGECONFIG_class-nativesdk = "" > PACKAGECONFIG ?= "sasl" > -- > 2.17.1 > > -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe] [PATCH] renderdoc: add new recipe
On Thu, Sep 26, 2019 at 8:10 AM Adrian Ratiu wrote: > > Hello, > > On Thu, 26 Sep 2019, Khem Raj wrote: > > https://errors.yoctoproject.org/Errors/Details/272045/ > > Is using COMPATIBLE_MACHINE to stop the recipe from being built on > mips an acceptable solution? Something like: > > COMPATIBLE_MACHINE_mipsarch = "(^$)" > I think we need to understand the whole set of arches it supports just doing mips will fix one of the CI builds > > > > On Thu, Sep 26, 2019 at 1:02 AM Adrian Ratiu > > wrote: > >> > >> RenderDoc is a MIT licensed stand-alone multi-platform graphics > >> debugger that allows easy frame by frame capture and detailed > >> introspection of any applications using Vulkan, OpenGL, OpenGL ES, > >> and others. > >> > >> Signed-off-by: Adrian Ratiu > >> --- > >> ...d-instead-of-cross-compiling-shim-bi.patch | 57 +++ > >> ...eLists.txt-remove-flag-unsupported-b.patch | 48 > >> .../renderdoc/renderdoc_1.4.bb| 29 ++ > >> 3 files changed, 134 insertions(+) > >> create mode 100644 > >> meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch > >> create mode 100644 > >> meta-oe/recipes-graphics/renderdoc/renderdoc/0002-q-renderdoc-CMakeLists.txt-remove-flag-unsupported-b.patch > >> create mode 100644 meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb > >> > >> diff --git > >> a/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch > >> > >> b/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch > >> new file mode 100644 > >> index 0..e96dedfc3 > >> --- /dev/null > >> +++ > >> b/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch > >> @@ -0,0 +1,57 @@ > >> +From 41a8c9b5ac13066770baee476ebf9828371f4dad Mon Sep 17 00:00:00 2001 > >> +From: Adrian Ratiu > >> +Date: Tue, 24 Sep 2019 16:07:18 +0300 > >> +Subject: [PATCH] renderdoc: use xxd instead of cross-compiling shim binary > >> + > >> +Renderdoc's attempt to cross compile an xxd replacement by directly > >> +calling a host cross-compiler breaks under OE's recipe specific > >> +sysroots protection because this is not a native recipe, so we just > >> +use xxd-native instead. > >> + > >> +Upstream-Status: Inappropriate [embedded-specific] > >> + > >> +--- > >> + renderdoc/CMakeLists.txt | 23 +-- > >> + 1 file changed, 1 insertion(+), 22 deletions(-) > >> + > >> +diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt > >> +index 5cb7440a4..453a034ba 100644 > >> +--- a/renderdoc/CMakeLists.txt > >> b/renderdoc/CMakeLists.txt > >> +@@ -370,26 +370,6 @@ set(data > >> + set(data_objects) > >> + > >> + if(UNIX) > >> +-# If we're cross-compiling, include-bin will get built for the > >> target and we > >> +-# then can't execute it. Instead, we force calling c++ (which we can > >> safely > >> +-# assume is present) directly to build the binary > >> +- > >> +-if(CMAKE_CROSSCOMPILING) > >> +-set(HOST_NATIVE_CPP_COMPILER c++ CACHE STRING "Command to run to > >> compile a .cpp into an executable. Default is just c++") > >> +- > >> +-add_custom_command(OUTPUT > >> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin > >> +-WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} > >> +-COMMAND ${CMAKE_COMMAND} -E make_directory > >> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} > >> +-COMMAND ${HOST_NATIVE_CPP_COMPILER} > >> 3rdparty/include-bin/main.cpp -o > >> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin > >> +-DEPENDS 3rdparty/include-bin/main.cpp) > >> +-set(INCLUDE_BIN_EXE > >> "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin") > >> +-set(INCLUDE_BIN_DEP > >> "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin") > >> +-else() > >> +-add_executable(include-bin 3rdparty/include-bin/main.cpp) > >> +-set(INCLUDE_BIN_EXE $) > >> +-set(INCLUDE_BIN_DEP include-bin) > >> +-endif() > >> +- > >> + foreach(res ${data}) > >> + set(in ${res}) > >> + set(working_dir ${CMAKE_CURRENT_SOURCE_DIR}) > >> +@@ -399,8 +379,7 @@ if(UNIX) > >> + add_custom_command(OUTPUT ${out_src} > >> + WORKING_DIRECTORY ${working_dir} > >> + COMMAND ${CMAKE_COMMAND} -E make_directory ${out_src_dir} > >> +-COMMAND ${INCLUDE_BIN_EXE} ${in} ${out_src} > >> +-DEPENDS ${INCLUDE_BIN_DEP} > >> ++COMMAND xxd -i ${in} ${out_src} > >> + DEPENDS ${res}) > >> + > >> + list(APPEND data_objects ${out_src}) > >> diff --git > >> a/meta-oe/recipes-graphics/renderdoc/renderdoc/0002-q-renderdoc-CMakeLists.txt-remove-flag-unsupported-b.patch > >> > >> b/meta-oe/recipes-graphics/renderdoc/renderdoc/0002-q-renderdoc-CMakeLists.txt-remove-flag-unsupported-b.patch > >> new file
[oe] [meta-networking][PATCH 1/2] spice: append -Wno-error=address-of-packed-member only for target
* with older native gcc on host this will break spice-native with: cc1: error: -Werror=address-of-packed-member: no option -Waddress-of-packed-member Signed-off-by: Martin Jansa --- meta-networking/recipes-support/spice/spice_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-support/spice/spice_git.bb b/meta-networking/recipes-support/spice/spice_git.bb index 30e939ac07..2829a59d15 100644 --- a/meta-networking/recipes-support/spice/spice_git.bb +++ b/meta-networking/recipes-support/spice/spice_git.bb @@ -37,7 +37,7 @@ DEPENDS_append_class-nativesdk = "nativesdk-openssl" export PYTHON="${STAGING_BINDIR_NATIVE}/python-native/python" export PYTHONPATH="${PKG_CONFIG_SYSROOT_DIR}${libdir}/python2.7/site-packages" -CFLAGS_append = " -Wno-error=address-of-packed-member" +CFLAGS_append_class-target = " -Wno-error=address-of-packed-member" PACKAGECONFIG_class-nativesdk = "" PACKAGECONFIG ?= "sasl" -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 2/2] Revert "spice: Drop broken native"
This reverts commit 5f32fd6b08d79b9a4d1bffb9b2bcbc535a5b27d2. * fixed by restricting -Wno-error=address-of-packed-member only for target, spice-native is still useful for qemu-native when spice PACKAGECONFIG is enabled Signed-off-by: Martin Jansa --- meta-networking/recipes-support/spice/spice_git.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-support/spice/spice_git.bb b/meta-networking/recipes-support/spice/spice_git.bb index 2829a59d15..39bee99a4a 100644 --- a/meta-networking/recipes-support/spice/spice_git.bb +++ b/meta-networking/recipes-support/spice/spice_git.bb @@ -39,6 +39,7 @@ export PYTHONPATH="${PKG_CONFIG_SYSROOT_DIR}${libdir}/python2.7/site-packages" CFLAGS_append_class-target = " -Wno-error=address-of-packed-member" +PACKAGECONFIG_class-native = "" PACKAGECONFIG_class-nativesdk = "" PACKAGECONFIG ?= "sasl" @@ -53,6 +54,6 @@ PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,libxinerama," COMPATIBLE_HOST = '(x86_64|i.86).*-linux' -BBCLASSEXTEND = "nativesdk" +BBCLASSEXTEND = "native nativesdk" EXTRA_OECONF_append_toolchain-clang = " --disable-werror" -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH 8/8] spice: Drop broken native
I assume it was failing for you with: cc1: error: -Werror=address-of-packed-member: no option -Waddress-of-packed-member I'll send revert of this change and new change to append -Wno-error=address-of-packed-member only for target: CFLAGS_append_class-target = " -Wno-error=address-of-packed-member" Please test it and report back if it works for you. On Thu, Sep 26, 2019 at 5:44 PM Martin Jansa wrote: > Can you check config.log to see what is broken on your native compiler? > > It was building fine for me and it's dependency of qemu-native when spice > PACKAGECONFIG is enabled, so I would say it's still useful. > > Maybe your host has really old gcc or something? > > On Wed, Sep 25, 2019 at 11:36 AM Robert Yang > wrote: > >> $ bitbake spice-native >> checking whether the C compiler works... no >> configure: error: in >> `/path/to/spice-native/0.14.2+gitAUTOINC+7cbd70b931_4fc4c2db36-r0/build': >> configure: error: C compiler cannot create executables >> >> It's a broken native recipe which means no ones need it any more, so >> remove it. >> >> Signed-off-by: Robert Yang >> --- >> meta-networking/recipes-support/spice/spice_git.bb | 3 +-- >> 1 file changed, 1 insertion(+), 2 deletions(-) >> >> diff --git a/meta-networking/recipes-support/spice/spice_git.bb >> b/meta-networking/recipes-support/spice/spice_git.bb >> index 552f81d..30e939a 100644 >> --- a/meta-networking/recipes-support/spice/spice_git.bb >> +++ b/meta-networking/recipes-support/spice/spice_git.bb >> @@ -39,7 +39,6 @@ export >> PYTHONPATH="${PKG_CONFIG_SYSROOT_DIR}${libdir}/python2.7/site-packages" >> >> CFLAGS_append = " -Wno-error=address-of-packed-member" >> >> -PACKAGECONFIG_class-native = "" >> PACKAGECONFIG_class-nativesdk = "" >> PACKAGECONFIG ?= "sasl" >> >> @@ -54,6 +53,6 @@ PACKAGECONFIG[xinerama] = >> "--enable-xinerama,--disable-xinerama,libxinerama," >> >> COMPATIBLE_HOST = '(x86_64|i.86).*-linux' >> >> -BBCLASSEXTEND = "native nativesdk" >> +BBCLASSEXTEND = "nativesdk" >> >> EXTRA_OECONF_append_toolchain-clang = " --disable-werror" >> -- >> 2.7.4 >> >> -- >> ___ >> Openembedded-devel mailing list >> Openembedded-devel@lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel >> > -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH 8/8] spice: Drop broken native
Can you check config.log to see what is broken on your native compiler? It was building fine for me and it's dependency of qemu-native when spice PACKAGECONFIG is enabled, so I would say it's still useful. Maybe your host has really old gcc or something? On Wed, Sep 25, 2019 at 11:36 AM Robert Yang wrote: > $ bitbake spice-native > checking whether the C compiler works... no > configure: error: in > `/path/to/spice-native/0.14.2+gitAUTOINC+7cbd70b931_4fc4c2db36-r0/build': > configure: error: C compiler cannot create executables > > It's a broken native recipe which means no ones need it any more, so > remove it. > > Signed-off-by: Robert Yang > --- > meta-networking/recipes-support/spice/spice_git.bb | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/meta-networking/recipes-support/spice/spice_git.bb > b/meta-networking/recipes-support/spice/spice_git.bb > index 552f81d..30e939a 100644 > --- a/meta-networking/recipes-support/spice/spice_git.bb > +++ b/meta-networking/recipes-support/spice/spice_git.bb > @@ -39,7 +39,6 @@ export > PYTHONPATH="${PKG_CONFIG_SYSROOT_DIR}${libdir}/python2.7/site-packages" > > CFLAGS_append = " -Wno-error=address-of-packed-member" > > -PACKAGECONFIG_class-native = "" > PACKAGECONFIG_class-nativesdk = "" > PACKAGECONFIG ?= "sasl" > > @@ -54,6 +53,6 @@ PACKAGECONFIG[xinerama] = > "--enable-xinerama,--disable-xinerama,libxinerama," > > COMPATIBLE_HOST = '(x86_64|i.86).*-linux' > > -BBCLASSEXTEND = "native nativesdk" > +BBCLASSEXTEND = "nativesdk" > > EXTRA_OECONF_append_toolchain-clang = " --disable-werror" > -- > 2.7.4 > > -- > ___ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel > -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-webserver][PATCH] nginx: fix install paths
Yes, thanks. From c936d2d6f9db956432b187c0ca28cecd3ffc3bb2 Mon Sep 17 00:00:00 2001 From: Gaylord CHARLES Date: Tue, 24 Sep 2019 18:56:45 +0200 Subject: [PATCH] nginx: fix install paths - Use path variable instead of /usr - Replace the absolute path symlink with a relative one (using lnr) Signed-off-by: Gaylord CHARLES --- meta-webserver/recipes-httpd/nginx/nginx.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-webserver/recipes-httpd/nginx/nginx.inc index 29e7efc14..6af42d72d 100644 --- a/meta-webserver/recipes-httpd/nginx/nginx.inc +++ b/meta-webserver/recipes-httpd/nginx/nginx.inc @@ -92,9 +92,9 @@ do_install () { >> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf fi install -d ${D}${sysconfdir}/${BPN} -ln -snf ${localstatedir}/run/${BPN} ${D}${sysconfdir}/${BPN}/run +lnr ${D}${localstatedir}/run/${BPN} ${D}${sysconfdir}/${BPN}/run install -d ${D}${NGINX_WWWDIR} -mv ${D}/usr/html ${D}${NGINX_WWWDIR}/ +mv ${D}${exec_prefix}/html ${D}${NGINX_WWWDIR}/ chown ${NGINX_USER}:www-data -R ${D}${NGINX_WWWDIR} install -d ${D}${sysconfdir}/init.d -- 2.20.1 Le jeu. 26 sept. 2019 à 15:11, Khem Raj a écrit : > On Thu, Sep 26, 2019 at 2:47 AM Gaylord Charles > wrote: > > > > Ok, thank you. I was not sure of this part. > > I was trying to fix this error : > > > > ERROR: nginx-native-1.15.7-r0 do_populate_sysroot: sstate found an > absolute path symlink > /home/gaylord/Projets/box/bbb/tmp/work/x86_64-linux/nginx-native/1.15.7-r0/sysroot-destdir/home/gaylord/Projets/box/bbb/tmp/work/x86_64-linux/nginx-native/1.15.7-r0/recipe-sysroot-native/etc/nginx/run > pointing at > /home/gaylord/Projets/box/bbb/tmp/work/x86_64-linux/nginx-native/1.15.7-r0/recipe-sysroot-native/var/run/nginx. > Please replace this with a relative link. > > > > right. Perhaps use lnr since that will work across all distros > > > Le mer. 25 sept. 2019 à 15:22, Khem Raj a écrit : > >> > >> > >> > >> On 9/25/19 2:20 AM, Gaylord Charles wrote: > >> > Hello, > >> > > >> > This patch fixes Nginx install paths. I tried to build the native > variant > >> > for testing purpose and had errors. > >> > > >> > Regards, > >> > Gaylord Charles > >> > > >> > From b6dc845b645cc8667b2d89412c292c0801de9270 Mon Sep 17 00:00:00 2001 > >> > From: Gaylord CHARLES > >> > Date: Tue, 24 Sep 2019 18:56:45 +0200 > >> > Subject: [PATCH] nginx: fix install paths > >> > > >> > - Use path variable instead of /usr > >> > - Replace the absolute path symlink with a relative one > >> > > >> > Signed-off-by: Gaylord CHARLES > >> > --- > >> > meta-webserver/recipes-httpd/nginx/nginx.inc | 4 ++-- > >> > 1 file changed, 2 insertions(+), 2 deletions(-) > >> > > >> > diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc > >> > b/meta-webserver/recipes-httpd/nginx/nginx.inc > >> > index 29e7efc14..1e9d2e1a4 100644 > >> > --- a/meta-webserver/recipes-httpd/nginx/nginx.inc > >> > +++ b/meta-webserver/recipes-httpd/nginx/nginx.inc > >> > @@ -92,9 +92,9 @@ do_install () { > >> > >> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf > >> > fi > >> > install -d ${D}${sysconfdir}/${BPN} > >> > -ln -snf ${localstatedir}/run/${BPN} ${D}${sysconfdir}/${BPN}/run > >> > +ln -snf ../../var/run/${BPN} ${D}${sysconfdir}/${BPN}/run > >> > >> localstatedir variable could have stayed there, any particular reason to > >> drop it in favor of hardcoding /var > >> > >> > install -d ${D}${NGINX_WWWDIR} > >> > -mv ${D}/usr/html ${D}${NGINX_WWWDIR}/ > >> > +mv ${D}${exec_prefix}/html ${D}${NGINX_WWWDIR}/ > >> > chown ${NGINX_USER}:www-data -R ${D}${NGINX_WWWDIR} > >> > > >> > install -d ${D}${sysconfdir}/init.d > >> > > -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe] [PATCH] renderdoc: add new recipe
Hello, On Thu, 26 Sep 2019, Khem Raj wrote: https://errors.yoctoproject.org/Errors/Details/272045/ Is using COMPATIBLE_MACHINE to stop the recipe from being built on mips an acceptable solution? Something like: COMPATIBLE_MACHINE_mipsarch = "(^$)" On Thu, Sep 26, 2019 at 1:02 AM Adrian Ratiu wrote: RenderDoc is a MIT licensed stand-alone multi-platform graphics debugger that allows easy frame by frame capture and detailed introspection of any applications using Vulkan, OpenGL, OpenGL ES, and others. Signed-off-by: Adrian Ratiu --- ...d-instead-of-cross-compiling-shim-bi.patch | 57 +++ ...eLists.txt-remove-flag-unsupported-b.patch | 48 .../renderdoc/renderdoc_1.4.bb| 29 ++ 3 files changed, 134 insertions(+) create mode 100644 meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch create mode 100644 meta-oe/recipes-graphics/renderdoc/renderdoc/0002-q-renderdoc-CMakeLists.txt-remove-flag-unsupported-b.patch create mode 100644 meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb diff --git a/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch b/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch new file mode 100644 index 0..e96dedfc3 --- /dev/null +++ b/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch @@ -0,0 +1,57 @@ +From 41a8c9b5ac13066770baee476ebf9828371f4dad Mon Sep 17 00:00:00 2001 +From: Adrian Ratiu +Date: Tue, 24 Sep 2019 16:07:18 +0300 +Subject: [PATCH] renderdoc: use xxd instead of cross-compiling shim binary + +Renderdoc's attempt to cross compile an xxd replacement by directly +calling a host cross-compiler breaks under OE's recipe specific +sysroots protection because this is not a native recipe, so we just +use xxd-native instead. + +Upstream-Status: Inappropriate [embedded-specific] + +--- + renderdoc/CMakeLists.txt | 23 +-- + 1 file changed, 1 insertion(+), 22 deletions(-) + +diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt +index 5cb7440a4..453a034ba 100644 +--- a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt +@@ -370,26 +370,6 @@ set(data + set(data_objects) + + if(UNIX) +-# If we're cross-compiling, include-bin will get built for the target and we +-# then can't execute it. Instead, we force calling c++ (which we can safely +-# assume is present) directly to build the binary +- +-if(CMAKE_CROSSCOMPILING) +-set(HOST_NATIVE_CPP_COMPILER c++ CACHE STRING "Command to run to compile a .cpp into an executable. Default is just c++") +- +-add_custom_command(OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin +-WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +-COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} +-COMMAND ${HOST_NATIVE_CPP_COMPILER} 3rdparty/include-bin/main.cpp -o ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin +-DEPENDS 3rdparty/include-bin/main.cpp) +-set(INCLUDE_BIN_EXE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin") +-set(INCLUDE_BIN_DEP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin") +-else() +-add_executable(include-bin 3rdparty/include-bin/main.cpp) +-set(INCLUDE_BIN_EXE $) +-set(INCLUDE_BIN_DEP include-bin) +-endif() +- + foreach(res ${data}) + set(in ${res}) + set(working_dir ${CMAKE_CURRENT_SOURCE_DIR}) +@@ -399,8 +379,7 @@ if(UNIX) + add_custom_command(OUTPUT ${out_src} + WORKING_DIRECTORY ${working_dir} + COMMAND ${CMAKE_COMMAND} -E make_directory ${out_src_dir} +-COMMAND ${INCLUDE_BIN_EXE} ${in} ${out_src} +-DEPENDS ${INCLUDE_BIN_DEP} ++COMMAND xxd -i ${in} ${out_src} + DEPENDS ${res}) + + list(APPEND data_objects ${out_src}) diff --git a/meta-oe/recipes-graphics/renderdoc/renderdoc/0002-q-renderdoc-CMakeLists.txt-remove-flag-unsupported-b.patch b/meta-oe/recipes-graphics/renderdoc/renderdoc/0002-q-renderdoc-CMakeLists.txt-remove-flag-unsupported-b.patch new file mode 100644 index 0..8cfac3b0e --- /dev/null +++ b/meta-oe/recipes-graphics/renderdoc/renderdoc/0002-q-renderdoc-CMakeLists.txt-remove-flag-unsupported-b.patch @@ -0,0 +1,48 @@ +From 40511a6f4dc6311c8cf7f2954d1202ede55881ff Mon Sep 17 00:00:00 2001 +From: Adrian Ratiu +Date: Wed, 25 Sep 2019 19:31:14 +0300 +Subject: [PATCH] (q)renderdoc/CMakeLists.txt: remove flag unsupported by GCC + +-Wno-unknown-warning is not supported by GCC, only by Clang so we +remove it because newer GCC versions like 9.2.0 will complain, older +versions would just ignore it. + +Upstream-Status: Pending [https://github.com/baldurk/renderdoc/pull/1530] + +Signed-off-by: Adrian Ratiu + +--- +
Re: [oe] [meta-oe] [PATCH] renderdoc: add new recipe
https://errors.yoctoproject.org/Errors/Details/272045/ On Thu, Sep 26, 2019 at 1:02 AM Adrian Ratiu wrote: > > RenderDoc is a MIT licensed stand-alone multi-platform graphics > debugger that allows easy frame by frame capture and detailed > introspection of any applications using Vulkan, OpenGL, OpenGL ES, > and others. > > Signed-off-by: Adrian Ratiu > --- > ...d-instead-of-cross-compiling-shim-bi.patch | 57 +++ > ...eLists.txt-remove-flag-unsupported-b.patch | 48 > .../renderdoc/renderdoc_1.4.bb| 29 ++ > 3 files changed, 134 insertions(+) > create mode 100644 > meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch > create mode 100644 > meta-oe/recipes-graphics/renderdoc/renderdoc/0002-q-renderdoc-CMakeLists.txt-remove-flag-unsupported-b.patch > create mode 100644 meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb > > diff --git > a/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch > > b/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch > new file mode 100644 > index 0..e96dedfc3 > --- /dev/null > +++ > b/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch > @@ -0,0 +1,57 @@ > +From 41a8c9b5ac13066770baee476ebf9828371f4dad Mon Sep 17 00:00:00 2001 > +From: Adrian Ratiu > +Date: Tue, 24 Sep 2019 16:07:18 +0300 > +Subject: [PATCH] renderdoc: use xxd instead of cross-compiling shim binary > + > +Renderdoc's attempt to cross compile an xxd replacement by directly > +calling a host cross-compiler breaks under OE's recipe specific > +sysroots protection because this is not a native recipe, so we just > +use xxd-native instead. > + > +Upstream-Status: Inappropriate [embedded-specific] > + > +--- > + renderdoc/CMakeLists.txt | 23 +-- > + 1 file changed, 1 insertion(+), 22 deletions(-) > + > +diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt > +index 5cb7440a4..453a034ba 100644 > +--- a/renderdoc/CMakeLists.txt > b/renderdoc/CMakeLists.txt > +@@ -370,26 +370,6 @@ set(data > + set(data_objects) > + > + if(UNIX) > +-# If we're cross-compiling, include-bin will get built for the target > and we > +-# then can't execute it. Instead, we force calling c++ (which we can > safely > +-# assume is present) directly to build the binary > +- > +-if(CMAKE_CROSSCOMPILING) > +-set(HOST_NATIVE_CPP_COMPILER c++ CACHE STRING "Command to run to > compile a .cpp into an executable. Default is just c++") > +- > +-add_custom_command(OUTPUT > ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin > +-WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} > +-COMMAND ${CMAKE_COMMAND} -E make_directory > ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} > +-COMMAND ${HOST_NATIVE_CPP_COMPILER} > 3rdparty/include-bin/main.cpp -o ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin > +-DEPENDS 3rdparty/include-bin/main.cpp) > +-set(INCLUDE_BIN_EXE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin") > +-set(INCLUDE_BIN_DEP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin") > +-else() > +-add_executable(include-bin 3rdparty/include-bin/main.cpp) > +-set(INCLUDE_BIN_EXE $) > +-set(INCLUDE_BIN_DEP include-bin) > +-endif() > +- > + foreach(res ${data}) > + set(in ${res}) > + set(working_dir ${CMAKE_CURRENT_SOURCE_DIR}) > +@@ -399,8 +379,7 @@ if(UNIX) > + add_custom_command(OUTPUT ${out_src} > + WORKING_DIRECTORY ${working_dir} > + COMMAND ${CMAKE_COMMAND} -E make_directory ${out_src_dir} > +-COMMAND ${INCLUDE_BIN_EXE} ${in} ${out_src} > +-DEPENDS ${INCLUDE_BIN_DEP} > ++COMMAND xxd -i ${in} ${out_src} > + DEPENDS ${res}) > + > + list(APPEND data_objects ${out_src}) > diff --git > a/meta-oe/recipes-graphics/renderdoc/renderdoc/0002-q-renderdoc-CMakeLists.txt-remove-flag-unsupported-b.patch > > b/meta-oe/recipes-graphics/renderdoc/renderdoc/0002-q-renderdoc-CMakeLists.txt-remove-flag-unsupported-b.patch > new file mode 100644 > index 0..8cfac3b0e > --- /dev/null > +++ > b/meta-oe/recipes-graphics/renderdoc/renderdoc/0002-q-renderdoc-CMakeLists.txt-remove-flag-unsupported-b.patch > @@ -0,0 +1,48 @@ > +From 40511a6f4dc6311c8cf7f2954d1202ede55881ff Mon Sep 17 00:00:00 2001 > +From: Adrian Ratiu > +Date: Wed, 25 Sep 2019 19:31:14 +0300 > +Subject: [PATCH] (q)renderdoc/CMakeLists.txt: remove flag unsupported by GCC > + > +-Wno-unknown-warning is not supported by GCC, only by Clang so we > +remove it because newer GCC versions like 9.2.0 will complain, older > +versions would just ignore it. > + > +Upstream-Status: Pending [https://github.com/baldurk/renderdoc/pull/1530] > + > +Signed-off-by: Adrian
Re: [oe] [meta-webserver][PATCH] nginx: fix install paths
On Thu, Sep 26, 2019 at 2:47 AM Gaylord Charles wrote: > > Ok, thank you. I was not sure of this part. > I was trying to fix this error : > > ERROR: nginx-native-1.15.7-r0 do_populate_sysroot: sstate found an absolute > path symlink > /home/gaylord/Projets/box/bbb/tmp/work/x86_64-linux/nginx-native/1.15.7-r0/sysroot-destdir/home/gaylord/Projets/box/bbb/tmp/work/x86_64-linux/nginx-native/1.15.7-r0/recipe-sysroot-native/etc/nginx/run > pointing at > /home/gaylord/Projets/box/bbb/tmp/work/x86_64-linux/nginx-native/1.15.7-r0/recipe-sysroot-native/var/run/nginx. > Please replace this with a relative link. > right. Perhaps use lnr since that will work across all distros > Le mer. 25 sept. 2019 à 15:22, Khem Raj a écrit : >> >> >> >> On 9/25/19 2:20 AM, Gaylord Charles wrote: >> > Hello, >> > >> > This patch fixes Nginx install paths. I tried to build the native variant >> > for testing purpose and had errors. >> > >> > Regards, >> > Gaylord Charles >> > >> > From b6dc845b645cc8667b2d89412c292c0801de9270 Mon Sep 17 00:00:00 2001 >> > From: Gaylord CHARLES >> > Date: Tue, 24 Sep 2019 18:56:45 +0200 >> > Subject: [PATCH] nginx: fix install paths >> > >> > - Use path variable instead of /usr >> > - Replace the absolute path symlink with a relative one >> > >> > Signed-off-by: Gaylord CHARLES >> > --- >> > meta-webserver/recipes-httpd/nginx/nginx.inc | 4 ++-- >> > 1 file changed, 2 insertions(+), 2 deletions(-) >> > >> > diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc >> > b/meta-webserver/recipes-httpd/nginx/nginx.inc >> > index 29e7efc14..1e9d2e1a4 100644 >> > --- a/meta-webserver/recipes-httpd/nginx/nginx.inc >> > +++ b/meta-webserver/recipes-httpd/nginx/nginx.inc >> > @@ -92,9 +92,9 @@ do_install () { >> > >> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf >> > fi >> > install -d ${D}${sysconfdir}/${BPN} >> > -ln -snf ${localstatedir}/run/${BPN} ${D}${sysconfdir}/${BPN}/run >> > +ln -snf ../../var/run/${BPN} ${D}${sysconfdir}/${BPN}/run >> >> localstatedir variable could have stayed there, any particular reason to >> drop it in favor of hardcoding /var >> >> > install -d ${D}${NGINX_WWWDIR} >> > -mv ${D}/usr/html ${D}${NGINX_WWWDIR}/ >> > +mv ${D}${exec_prefix}/html ${D}${NGINX_WWWDIR}/ >> > chown ${NGINX_USER}:www-data -R ${D}${NGINX_WWWDIR} >> > >> > install -d ${D}${sysconfdir}/init.d >> > -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python] [PATCH] python-urllib3: upgrade 1.25.5 -> 1.25.6
Signed-off-by: Zang Ruochen --- meta-python/recipes-devtools/python/python-urllib3.inc| 4 ++-- .../python/{python-urllib3_1.25.5.bb => python-urllib3_1.25.6.bb} | 0 .../python/{python3-urllib3_1.25.5.bb => python3-urllib3_1.25.6.bb} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename meta-python/recipes-devtools/python/{python-urllib3_1.25.5.bb => python-urllib3_1.25.6.bb} (100%) rename meta-python/recipes-devtools/python/{python3-urllib3_1.25.5.bb => python3-urllib3_1.25.6.bb} (100%) diff --git a/meta-python/recipes-devtools/python/python-urllib3.inc b/meta-python/recipes-devtools/python/python-urllib3.inc index 8825e2f..398b5f2 100644 --- a/meta-python/recipes-devtools/python/python-urllib3.inc +++ b/meta-python/recipes-devtools/python/python-urllib3.inc @@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/shazow/urllib3; LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=65715c2eb961313d71b297dd5a04f85e" -SRC_URI[md5sum] = "4dac6043f7603c5082ef6d629c6d81b3" -SRC_URI[sha256sum] = "2f3eadfea5d92bc7899e75b5968410b749a054b492d5a6379c1344a1481bc2cb" +SRC_URI[md5sum] = "a7504a9fcb7ed4ffa482fe098c80b6d4" +SRC_URI[sha256sum] = "9a107b99a5393caf59c7aa3c1249c16e6879447533d0887f4336dde834c7be86" RDEPENDS_${PN} += "\ ${PYTHON_PN}-certifi \ diff --git a/meta-python/recipes-devtools/python/python-urllib3_1.25.5.bb b/meta-python/recipes-devtools/python/python-urllib3_1.25.6.bb similarity index 100% rename from meta-python/recipes-devtools/python/python-urllib3_1.25.5.bb rename to meta-python/recipes-devtools/python/python-urllib3_1.25.6.bb diff --git a/meta-python/recipes-devtools/python/python3-urllib3_1.25.5.bb b/meta-python/recipes-devtools/python/python3-urllib3_1.25.6.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-urllib3_1.25.5.bb rename to meta-python/recipes-devtools/python/python3-urllib3_1.25.6.bb -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-webserver][PATCH] nginx: fix install paths
Ok, thank you. I was not sure of this part. I was trying to fix this error : ERROR: nginx-native-1.15.7-r0 do_populate_sysroot: sstate found an absolute path symlink /home/gaylord/Projets/box/bbb/tmp/work/x86_64-linux/nginx-native/1.15.7-r0/sysroot-destdir/home/gaylord/Projets/box/bbb/tmp/work/x86_64-linux/nginx-native/1.15.7-r0/recipe-sysroot-native/etc/nginx/run pointing at /home/gaylord/Projets/box/bbb/tmp/work/x86_64-linux/nginx-native/1.15.7-r0/recipe-sysroot-native/var/run/nginx. Please replace this with a relative link. Le mer. 25 sept. 2019 à 15:22, Khem Raj a écrit : > > > On 9/25/19 2:20 AM, Gaylord Charles wrote: > > Hello, > > > > This patch fixes Nginx install paths. I tried to build the native variant > > for testing purpose and had errors. > > > > Regards, > > Gaylord Charles > > > > From b6dc845b645cc8667b2d89412c292c0801de9270 Mon Sep 17 00:00:00 2001 > > From: Gaylord CHARLES > > Date: Tue, 24 Sep 2019 18:56:45 +0200 > > Subject: [PATCH] nginx: fix install paths > > > > - Use path variable instead of /usr > > - Replace the absolute path symlink with a relative one > > > > Signed-off-by: Gaylord CHARLES > > --- > > meta-webserver/recipes-httpd/nginx/nginx.inc | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc > > b/meta-webserver/recipes-httpd/nginx/nginx.inc > > index 29e7efc14..1e9d2e1a4 100644 > > --- a/meta-webserver/recipes-httpd/nginx/nginx.inc > > +++ b/meta-webserver/recipes-httpd/nginx/nginx.inc > > @@ -92,9 +92,9 @@ do_install () { > > >> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf > > fi > > install -d ${D}${sysconfdir}/${BPN} > > -ln -snf ${localstatedir}/run/${BPN} ${D}${sysconfdir}/${BPN}/run > > +ln -snf ../../var/run/${BPN} ${D}${sysconfdir}/${BPN}/run > > localstatedir variable could have stayed there, any particular reason to > drop it in favor of hardcoding /var > > > install -d ${D}${NGINX_WWWDIR} > > -mv ${D}/usr/html ${D}${NGINX_WWWDIR}/ > > +mv ${D}${exec_prefix}/html ${D}${NGINX_WWWDIR}/ > > chown ${NGINX_USER}:www-data -R ${D}${NGINX_WWWDIR} > > > > install -d ${D}${sysconfdir}/init.d > > > -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-xfce][PATCH 1/2] xfce-panel/systray: Draw icons/background properly when compositing is disabled
On Thu, Sep 26, 2019 at 9:12 AM Andreas Müller wrote: > > * this was the last long lasting xfce bug that annoyed me > * while at it renumber patches > > Signed-off-by: Andreas Müller > --- > ...=> 0002-use-lxdm-to-replace-dm-tool.patch} | 0 > ...-icons-without-compositing-Bug-14577.patch | 80 +++ > .../xfce4-panel/xfce4-panel_4.14.0.bb | 3 +- > 3 files changed, 82 insertions(+), 1 deletion(-) > rename > meta-xfce/recipes-xfce/xfce4-panel/files/{0001-use-lxdm-to-replace-dm-tool.patch > => 0002-use-lxdm-to-replace-dm-tool.patch} (100%) > create mode 100644 > meta-xfce/recipes-xfce/xfce4-panel/files/0003-systray-Fix-icons-without-compositing-Bug-14577.patch > > diff --git > a/meta-xfce/recipes-xfce/xfce4-panel/files/0001-use-lxdm-to-replace-dm-tool.patch > > b/meta-xfce/recipes-xfce/xfce4-panel/files/0002-use-lxdm-to-replace-dm-tool.patch > similarity index 100% > rename from > meta-xfce/recipes-xfce/xfce4-panel/files/0001-use-lxdm-to-replace-dm-tool.patch > rename to > meta-xfce/recipes-xfce/xfce4-panel/files/0002-use-lxdm-to-replace-dm-tool.patch > diff --git > a/meta-xfce/recipes-xfce/xfce4-panel/files/0003-systray-Fix-icons-without-compositing-Bug-14577.patch > > b/meta-xfce/recipes-xfce/xfce4-panel/files/0003-systray-Fix-icons-without-compositing-Bug-14577.patch > new file mode 100644 > index 0..12cc3f0dc > --- /dev/null > +++ > b/meta-xfce/recipes-xfce/xfce4-panel/files/0003-systray-Fix-icons-without-compositing-Bug-14577.patch > @@ -0,0 +1,80 @@ > +From f6f70cce417fd2982c2ce6f01016ed01deb6a9ae Mon Sep 17 00:00:00 2001 > +From: "Ivan A. Melnikov" > +Date: Mon, 23 Sep 2019 16:18:10 +0400 > +Subject: [PATCH] systray: Fix icons without compositing (Bug #14577) > + > +Wrapper window uses RGBA visual when it's available; > +systray manager should try to do the same for > +the transparent or parent-relative background to work. > + > +That means that the manager and icons will work with > +RGBA visual even if the screen is not compositing; so > +we should always force-redraw the icons. > + > +Refs: https://bugzilla.xfce.org/show_bug.cgi?id=14577 > +Signed-off-by: Ivan A. Melnikov > + > +Upstream-Status: Accepted [1] > + > +[1] > https://git.xfce.org/xfce/xfce4-panel/commit?id=820de57c44c381e47091d3a7e214852bf8fafb53 > +--- > + plugins/systray/systray-manager.c | 10 ++ > + plugins/systray/systray.c | 10 -- > + 2 files changed, 6 insertions(+), 14 deletions(-) > + > +diff --git a/plugins/systray/systray-manager.c > b/plugins/systray/systray-manager.c > +index 68836554..4915649c 100644 > +--- a/plugins/systray/systray-manager.c > b/plugins/systray/systray-manager.c > +@@ -751,6 +751,7 @@ static void > + systray_manager_set_visual (SystrayManager *manager) > + { > + GdkDisplay *display; > ++ GdkVisual *visual; > + Visual *xvisual; > + Atom visual_atom; > + gulong data[1]; > +@@ -768,11 +769,12 @@ systray_manager_set_visual (SystrayManager *manager) > + visual_atom = gdk_x11_get_xatom_by_name_for_display (display, > + "_NET_SYSTEM_TRAY_VISUAL"); > + > +- if (gdk_screen_is_composited (gtk_widget_get_screen (manager->invisible)) > +- && (gdk_screen_get_rgba_visual (screen) != NULL)) > ++ visual = gdk_screen_get_rgba_visual (screen); > ++ panel_debug (PANEL_DEBUG_SYSTRAY, "rgba visual is %p", visual); > ++ if (visual != NULL) > + { > +- /* get the rgba visual */ > +- xvisual = GDK_VISUAL_XVISUAL (gdk_screen_get_rgba_visual (screen)); > ++ /* use the rgba visual */ > ++ xvisual = GDK_VISUAL_XVISUAL (visual); > + } > + else > + { > +diff --git a/plugins/systray/systray.c b/plugins/systray/systray.c > +index 3fb9520c..beae1973 100644 > +--- a/plugins/systray/systray.c > b/plugins/systray/systray.c > +@@ -728,19 +728,9 @@ systray_plugin_box_draw (GtkWidget *box, > + gpointer user_data) > + { > + SystrayPlugin *plugin = XFCE_SYSTRAY_PLUGIN (user_data); > +- GdkScreen *screen; > +- > + panel_return_if_fail (XFCE_IS_SYSTRAY_PLUGIN (plugin)); > + panel_return_if_fail (cr != NULL); > + > +- screen = gtk_widget_get_screen (GTK_WIDGET (plugin)); > +- > +- if (G_LIKELY (screen != NULL)) > +-{ > +- if (!gdk_screen_is_composited (screen)) > +-return; > +-} > +- > + /* separately draw all the composed tray icons after gtk > +* handled the draw event */ > + gtk_container_foreach (GTK_CONTAINER (box), > +-- > +2.21.0 > + > diff --git a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.14.0.bb > b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.14.0.bb > index 749c3fea4..faec9b2b7 100644 > --- a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.14.0.bb > +++ b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.14.0.bb > @@ -12,7 +12,8 @@ SRC_URI[md5sum] = "940e8b430e28093a2e56e390055bcd51" > SRC_URI[sha256sum] = > "d5f8f3bd7e142139987e5e62cda26135a424baabb5e47aa0c23b4169d0a66ef4" > SRC_URI += "
[oe] [meta-oe] [PATCH] renderdoc: add new recipe
RenderDoc is a MIT licensed stand-alone multi-platform graphics debugger that allows easy frame by frame capture and detailed introspection of any applications using Vulkan, OpenGL, OpenGL ES, and others. Signed-off-by: Adrian Ratiu --- ...d-instead-of-cross-compiling-shim-bi.patch | 57 +++ ...eLists.txt-remove-flag-unsupported-b.patch | 48 .../renderdoc/renderdoc_1.4.bb| 29 ++ 3 files changed, 134 insertions(+) create mode 100644 meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch create mode 100644 meta-oe/recipes-graphics/renderdoc/renderdoc/0002-q-renderdoc-CMakeLists.txt-remove-flag-unsupported-b.patch create mode 100644 meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb diff --git a/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch b/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch new file mode 100644 index 0..e96dedfc3 --- /dev/null +++ b/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch @@ -0,0 +1,57 @@ +From 41a8c9b5ac13066770baee476ebf9828371f4dad Mon Sep 17 00:00:00 2001 +From: Adrian Ratiu +Date: Tue, 24 Sep 2019 16:07:18 +0300 +Subject: [PATCH] renderdoc: use xxd instead of cross-compiling shim binary + +Renderdoc's attempt to cross compile an xxd replacement by directly +calling a host cross-compiler breaks under OE's recipe specific +sysroots protection because this is not a native recipe, so we just +use xxd-native instead. + +Upstream-Status: Inappropriate [embedded-specific] + +--- + renderdoc/CMakeLists.txt | 23 +-- + 1 file changed, 1 insertion(+), 22 deletions(-) + +diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt +index 5cb7440a4..453a034ba 100644 +--- a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt +@@ -370,26 +370,6 @@ set(data + set(data_objects) + + if(UNIX) +-# If we're cross-compiling, include-bin will get built for the target and we +-# then can't execute it. Instead, we force calling c++ (which we can safely +-# assume is present) directly to build the binary +- +-if(CMAKE_CROSSCOMPILING) +-set(HOST_NATIVE_CPP_COMPILER c++ CACHE STRING "Command to run to compile a .cpp into an executable. Default is just c++") +- +-add_custom_command(OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin +-WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +-COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} +-COMMAND ${HOST_NATIVE_CPP_COMPILER} 3rdparty/include-bin/main.cpp -o ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin +-DEPENDS 3rdparty/include-bin/main.cpp) +-set(INCLUDE_BIN_EXE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin") +-set(INCLUDE_BIN_DEP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin") +-else() +-add_executable(include-bin 3rdparty/include-bin/main.cpp) +-set(INCLUDE_BIN_EXE $) +-set(INCLUDE_BIN_DEP include-bin) +-endif() +- + foreach(res ${data}) + set(in ${res}) + set(working_dir ${CMAKE_CURRENT_SOURCE_DIR}) +@@ -399,8 +379,7 @@ if(UNIX) + add_custom_command(OUTPUT ${out_src} + WORKING_DIRECTORY ${working_dir} + COMMAND ${CMAKE_COMMAND} -E make_directory ${out_src_dir} +-COMMAND ${INCLUDE_BIN_EXE} ${in} ${out_src} +-DEPENDS ${INCLUDE_BIN_DEP} ++COMMAND xxd -i ${in} ${out_src} + DEPENDS ${res}) + + list(APPEND data_objects ${out_src}) diff --git a/meta-oe/recipes-graphics/renderdoc/renderdoc/0002-q-renderdoc-CMakeLists.txt-remove-flag-unsupported-b.patch b/meta-oe/recipes-graphics/renderdoc/renderdoc/0002-q-renderdoc-CMakeLists.txt-remove-flag-unsupported-b.patch new file mode 100644 index 0..8cfac3b0e --- /dev/null +++ b/meta-oe/recipes-graphics/renderdoc/renderdoc/0002-q-renderdoc-CMakeLists.txt-remove-flag-unsupported-b.patch @@ -0,0 +1,48 @@ +From 40511a6f4dc6311c8cf7f2954d1202ede55881ff Mon Sep 17 00:00:00 2001 +From: Adrian Ratiu +Date: Wed, 25 Sep 2019 19:31:14 +0300 +Subject: [PATCH] (q)renderdoc/CMakeLists.txt: remove flag unsupported by GCC + +-Wno-unknown-warning is not supported by GCC, only by Clang so we +remove it because newer GCC versions like 9.2.0 will complain, older +versions would just ignore it. + +Upstream-Status: Pending [https://github.com/baldurk/renderdoc/pull/1530] + +Signed-off-by: Adrian Ratiu + +--- + qrenderdoc/CMakeLists.txt | 2 +- + renderdoc/CMakeLists.txt | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/qrenderdoc/CMakeLists.txt b/qrenderdoc/CMakeLists.txt +index 9fd65b2d3..d52dd274e 100644 +--- a/qrenderdoc/CMakeLists.txt b/qrenderdoc/CMakeLists.txt +@@ -149,7 +149,7 @@
[oe] [meta-xfce][PATCH 2/2] catfish: upgrade 1.4.9 -> 1.4.10
Signed-off-by: Andreas Müller --- .../catfish/{catfish_1.4.9.bb => catfish_1.4.10.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-xfce/recipes-apps/catfish/{catfish_1.4.9.bb => catfish_1.4.10.bb} (72%) diff --git a/meta-xfce/recipes-apps/catfish/catfish_1.4.9.bb b/meta-xfce/recipes-apps/catfish/catfish_1.4.10.bb similarity index 72% rename from meta-xfce/recipes-apps/catfish/catfish_1.4.9.bb rename to meta-xfce/recipes-apps/catfish/catfish_1.4.10.bb index eec525b88..602368b3a 100644 --- a/meta-xfce/recipes-apps/catfish/catfish_1.4.9.bb +++ b/meta-xfce/recipes-apps/catfish/catfish_1.4.10.bb @@ -9,8 +9,8 @@ DEPENDS += "python3-distutils-extra-native" B = "${S}" -SRC_URI[md5sum] = "829824fba33e86d03345bbc718e7b2d9" -SRC_URI[sha256sum] = "29a39b85804336e4819dceff203693a5904b7e11d7e024b49b5aab2649ed944e" +SRC_URI[md5sum] = "1b8e7bfd955364b7912fb0a248329b3a" +SRC_URI[sha256sum] = "2573a004105031f871c92fed22a0c4b15bb96f2dff6e36c4f2959f56b62e343d" FILES_${PN} += "${datadir}/metainfo" -- 2.21.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-xfce][PATCH 1/2] xfce-panel/systray: Draw icons/background properly when compositing is disabled
* this was the last long lasting xfce bug that annoyed me * while at it renumber patches Signed-off-by: Andreas Müller --- ...=> 0002-use-lxdm-to-replace-dm-tool.patch} | 0 ...-icons-without-compositing-Bug-14577.patch | 80 +++ .../xfce4-panel/xfce4-panel_4.14.0.bb | 3 +- 3 files changed, 82 insertions(+), 1 deletion(-) rename meta-xfce/recipes-xfce/xfce4-panel/files/{0001-use-lxdm-to-replace-dm-tool.patch => 0002-use-lxdm-to-replace-dm-tool.patch} (100%) create mode 100644 meta-xfce/recipes-xfce/xfce4-panel/files/0003-systray-Fix-icons-without-compositing-Bug-14577.patch diff --git a/meta-xfce/recipes-xfce/xfce4-panel/files/0001-use-lxdm-to-replace-dm-tool.patch b/meta-xfce/recipes-xfce/xfce4-panel/files/0002-use-lxdm-to-replace-dm-tool.patch similarity index 100% rename from meta-xfce/recipes-xfce/xfce4-panel/files/0001-use-lxdm-to-replace-dm-tool.patch rename to meta-xfce/recipes-xfce/xfce4-panel/files/0002-use-lxdm-to-replace-dm-tool.patch diff --git a/meta-xfce/recipes-xfce/xfce4-panel/files/0003-systray-Fix-icons-without-compositing-Bug-14577.patch b/meta-xfce/recipes-xfce/xfce4-panel/files/0003-systray-Fix-icons-without-compositing-Bug-14577.patch new file mode 100644 index 0..12cc3f0dc --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-panel/files/0003-systray-Fix-icons-without-compositing-Bug-14577.patch @@ -0,0 +1,80 @@ +From f6f70cce417fd2982c2ce6f01016ed01deb6a9ae Mon Sep 17 00:00:00 2001 +From: "Ivan A. Melnikov" +Date: Mon, 23 Sep 2019 16:18:10 +0400 +Subject: [PATCH] systray: Fix icons without compositing (Bug #14577) + +Wrapper window uses RGBA visual when it's available; +systray manager should try to do the same for +the transparent or parent-relative background to work. + +That means that the manager and icons will work with +RGBA visual even if the screen is not compositing; so +we should always force-redraw the icons. + +Refs: https://bugzilla.xfce.org/show_bug.cgi?id=14577 +Signed-off-by: Ivan A. Melnikov + +Upstream-Status: Accepted [1] + +[1] https://git.xfce.org/xfce/xfce4-panel/commit?id=820de57c44c381e47091d3a7e214852bf8fafb53 +--- + plugins/systray/systray-manager.c | 10 ++ + plugins/systray/systray.c | 10 -- + 2 files changed, 6 insertions(+), 14 deletions(-) + +diff --git a/plugins/systray/systray-manager.c b/plugins/systray/systray-manager.c +index 68836554..4915649c 100644 +--- a/plugins/systray/systray-manager.c b/plugins/systray/systray-manager.c +@@ -751,6 +751,7 @@ static void + systray_manager_set_visual (SystrayManager *manager) + { + GdkDisplay *display; ++ GdkVisual *visual; + Visual *xvisual; + Atom visual_atom; + gulong data[1]; +@@ -768,11 +769,12 @@ systray_manager_set_visual (SystrayManager *manager) + visual_atom = gdk_x11_get_xatom_by_name_for_display (display, + "_NET_SYSTEM_TRAY_VISUAL"); + +- if (gdk_screen_is_composited (gtk_widget_get_screen (manager->invisible)) +- && (gdk_screen_get_rgba_visual (screen) != NULL)) ++ visual = gdk_screen_get_rgba_visual (screen); ++ panel_debug (PANEL_DEBUG_SYSTRAY, "rgba visual is %p", visual); ++ if (visual != NULL) + { +- /* get the rgba visual */ +- xvisual = GDK_VISUAL_XVISUAL (gdk_screen_get_rgba_visual (screen)); ++ /* use the rgba visual */ ++ xvisual = GDK_VISUAL_XVISUAL (visual); + } + else + { +diff --git a/plugins/systray/systray.c b/plugins/systray/systray.c +index 3fb9520c..beae1973 100644 +--- a/plugins/systray/systray.c b/plugins/systray/systray.c +@@ -728,19 +728,9 @@ systray_plugin_box_draw (GtkWidget *box, + gpointer user_data) + { + SystrayPlugin *plugin = XFCE_SYSTRAY_PLUGIN (user_data); +- GdkScreen *screen; +- + panel_return_if_fail (XFCE_IS_SYSTRAY_PLUGIN (plugin)); + panel_return_if_fail (cr != NULL); + +- screen = gtk_widget_get_screen (GTK_WIDGET (plugin)); +- +- if (G_LIKELY (screen != NULL)) +-{ +- if (!gdk_screen_is_composited (screen)) +-return; +-} +- + /* separately draw all the composed tray icons after gtk +* handled the draw event */ + gtk_container_foreach (GTK_CONTAINER (box), +-- +2.21.0 + diff --git a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.14.0.bb b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.14.0.bb index 749c3fea4..faec9b2b7 100644 --- a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.14.0.bb +++ b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.14.0.bb @@ -12,7 +12,8 @@ SRC_URI[md5sum] = "940e8b430e28093a2e56e390055bcd51" SRC_URI[sha256sum] = "d5f8f3bd7e142139987e5e62cda26135a424baabb5e47aa0c23b4169d0a66ef4" SRC_URI += " \ file://0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \ -file://0001-use-lxdm-to-replace-dm-tool.patch \ +file://0002-use-lxdm-to-replace-dm-tool.patch \ +file://0003-systray-Fix-icons-without-compositing-Bug-14577.patch \ " python populate_packages_prepend() {