* [PATCH v5 0/3] Queued changes since rocko
@ 2017-10-18 11:17 Otavio Salvador
2017-10-18 11:17 ` [PATCH v5 1/3] mesa: Upgrade to 17.2.2 release Otavio Salvador
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Otavio Salvador @ 2017-10-18 11:17 UTC (permalink / raw)
To: OpenEmbedded Core Mailing List; +Cc: Otavio Salvador
Those are the patches we have queued here for master. We took the
patch version 5 so we keep the change history on the patches, about
its previous versions.
Changes in v5:
- rebase on top of master
- rebase on top of master
- new patch
Changes in v4:
- update to 17.2.2
Changes in v3:
- fix build for wayland
Changes in v2:
- update to 17.2.1
- amend commit log
Otavio Salvador (3):
mesa: Upgrade to 17.2.2 release
cmake: Upgrade to 3.9.3 release
libdrm: upgrade to 2.4.84
...cmake-native_3.8.2.bb => cmake-native_3.9.3.bb} | 0
meta/recipes-devtools/cmake/cmake.inc | 12 ++++--
.../cmake/{cmake_3.8.2.bb => cmake_3.9.3.bb} | 0
.../drm/{libdrm_2.4.83.bb => libdrm_2.4.84.bb} | 4 +-
...1-ac-fix-build-after-LLVM-5.0-SVN-r300718.patch | 40 ------------------
...allivm-Fix-build-against-LLVM-SVN-r302589.patch | 49 ----------------------
.../mesa/{mesa-gl_17.1.7.bb => mesa-gl_17.2.2.bb} | 0
meta/recipes-graphics/mesa/mesa.inc | 2 +-
.../mesa/{mesa_17.1.7.bb => mesa_17.2.2.bb} | 7 ++--
9 files changed, 14 insertions(+), 100 deletions(-)
rename meta/recipes-devtools/cmake/{cmake-native_3.8.2.bb => cmake-native_3.9.3.bb} (100%)
rename meta/recipes-devtools/cmake/{cmake_3.8.2.bb => cmake_3.9.3.bb} (100%)
rename meta/recipes-graphics/drm/{libdrm_2.4.83.bb => libdrm_2.4.84.bb} (93%)
delete mode 100644 meta/recipes-graphics/mesa/files/0001-ac-fix-build-after-LLVM-5.0-SVN-r300718.patch
delete mode 100644 meta/recipes-graphics/mesa/files/0002-gallivm-Fix-build-against-LLVM-SVN-r302589.patch
rename meta/recipes-graphics/mesa/{mesa-gl_17.1.7.bb => mesa-gl_17.2.2.bb} (100%)
rename meta/recipes-graphics/mesa/{mesa_17.1.7.bb => mesa_17.2.2.bb} (78%)
--
2.14.2
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v5 1/3] mesa: Upgrade to 17.2.2 release
2017-10-18 11:17 [PATCH v5 0/3] Queued changes since rocko Otavio Salvador
@ 2017-10-18 11:17 ` Otavio Salvador
2017-10-18 11:17 ` [PATCH v5 2/3] cmake: Upgrade to 3.9.3 release Otavio Salvador
2017-10-18 11:17 ` [PATCH v5 3/3] libdrm: upgrade to 2.4.84 Otavio Salvador
2 siblings, 0 replies; 4+ messages in thread
From: Otavio Salvador @ 2017-10-18 11:17 UTC (permalink / raw)
To: OpenEmbedded Core Mailing List; +Cc: Otavio Salvador
Upgrade to a new stable release and drop patches applied on upstream.
For a full release notes, please see:
https://mesa3d.org/relnotes/17.2.0.html
https://mesa3d.org/relnotes/17.2.1.html
https://mesa3d.org/relnotes/17.2.2.html
Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
This patch has been tested using OE-Core current Wayland as well as v2
of Fabien patches:
weston: Bump version to 3.0.0
wayland-protocols: Fix installation patch issue
wayland : Bump to version 1.14.0
The distro used for test had: opengl, wayland, x11 and vulkan enabled.
Changes in v5:
- rebase on top of master
Changes in v4:
- update to 17.2.2
Changes in v3:
- fix build for wayland
Changes in v2:
- update to 17.2.1
...1-ac-fix-build-after-LLVM-5.0-SVN-r300718.patch | 40 ------------------
...allivm-Fix-build-against-LLVM-SVN-r302589.patch | 49 ----------------------
.../mesa/{mesa-gl_17.1.7.bb => mesa-gl_17.2.2.bb} | 0
meta/recipes-graphics/mesa/mesa.inc | 2 +-
.../mesa/{mesa_17.1.7.bb => mesa_17.2.2.bb} | 7 ++--
5 files changed, 4 insertions(+), 94 deletions(-)
delete mode 100644 meta/recipes-graphics/mesa/files/0001-ac-fix-build-after-LLVM-5.0-SVN-r300718.patch
delete mode 100644 meta/recipes-graphics/mesa/files/0002-gallivm-Fix-build-against-LLVM-SVN-r302589.patch
rename meta/recipes-graphics/mesa/{mesa-gl_17.1.7.bb => mesa-gl_17.2.2.bb} (100%)
rename meta/recipes-graphics/mesa/{mesa_17.1.7.bb => mesa_17.2.2.bb} (78%)
diff --git a/meta/recipes-graphics/mesa/files/0001-ac-fix-build-after-LLVM-5.0-SVN-r300718.patch b/meta/recipes-graphics/mesa/files/0001-ac-fix-build-after-LLVM-5.0-SVN-r300718.patch
deleted file mode 100644
index b27a3bc8e4..0000000000
--- a/meta/recipes-graphics/mesa/files/0001-ac-fix-build-after-LLVM-5.0-SVN-r300718.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 9861437e58fdd0de01193a102608d34e5952953f Mon Sep 17 00:00:00 2001
-From: Christoph Haag <haagch+mesadev@frickel.club>
-Date: Thu, 20 Apr 2017 10:34:18 +0200
-Subject: [PATCH 1/2] ac: fix build after LLVM 5.0 SVN r300718
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-v2: previously getWithDereferenceableBytes() exists, but addAttr() doesn't take that type
-
-Signed-off-by: Christoph Haag <haagch+mesadev@frickel.club>
-Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
-Tested-and-reviewed-by: Mike Lothian <mike@fireburn.co.uk>
----
-Upstream-Status: Backport
-
- src/amd/common/ac_llvm_helper.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/amd/common/ac_llvm_helper.cpp b/src/amd/common/ac_llvm_helper.cpp
-index d9ea4b1..11fa809 100644
---- a/src/amd/common/ac_llvm_helper.cpp
-+++ b/src/amd/common/ac_llvm_helper.cpp
-@@ -44,9 +44,13 @@ typedef AttributeSet AttributeList;
- void ac_add_attr_dereferenceable(LLVMValueRef val, uint64_t bytes)
- {
- llvm::Argument *A = llvm::unwrap<llvm::Argument>(val);
-+#if HAVE_LLVM < 0x0500
- llvm::AttrBuilder B;
- B.addDereferenceableAttr(bytes);
- A->addAttr(llvm::AttributeList::get(A->getContext(), A->getArgNo() + 1, B));
-+#else
-+ A->addAttr(llvm::Attribute::getWithDereferenceableBytes(A->getContext(), bytes));
-+#endif
- }
-
- bool ac_is_sgpr_param(LLVMValueRef arg)
---
-2.13.3
-
diff --git a/meta/recipes-graphics/mesa/files/0002-gallivm-Fix-build-against-LLVM-SVN-r302589.patch b/meta/recipes-graphics/mesa/files/0002-gallivm-Fix-build-against-LLVM-SVN-r302589.patch
deleted file mode 100644
index ac8caec74d..0000000000
--- a/meta/recipes-graphics/mesa/files/0002-gallivm-Fix-build-against-LLVM-SVN-r302589.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From a02a0dfda2712d30ad62b8f0421ec7b8244ba2cb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com>
-Date: Wed, 10 May 2017 17:26:07 +0900
-Subject: [PATCH 2/2] gallivm: Fix build against LLVM SVN >= r302589
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-deregisterEHFrames doesn't take any parameters anymore.
-
-Reviewed-by: Vedran Miletić <vedran@miletic.net>
-Reviewed-by: Marek Olšák <marek.olsak@amd.com>
----
-Upstream-Status: Backport
-
- src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-index 2a388cb..0e4a531 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-@@ -342,14 +342,20 @@ class DelegatingJITMemoryManager : public BaseMemoryManager {
- virtual void registerEHFrames(uint8_t *Addr, uint64_t LoadAddr, size_t Size) {
- mgr()->registerEHFrames(Addr, LoadAddr, Size);
- }
-- virtual void deregisterEHFrames(uint8_t *Addr, uint64_t LoadAddr, size_t Size) {
-- mgr()->deregisterEHFrames(Addr, LoadAddr, Size);
-- }
- #else
- virtual void registerEHFrames(llvm::StringRef SectionData) {
- mgr()->registerEHFrames(SectionData);
- }
- #endif
-+#if HAVE_LLVM >= 0x0500
-+ virtual void deregisterEHFrames() {
-+ mgr()->deregisterEHFrames();
-+ }
-+#elif HAVE_LLVM >= 0x0304
-+ virtual void deregisterEHFrames(uint8_t *Addr, uint64_t LoadAddr, size_t Size) {
-+ mgr()->deregisterEHFrames(Addr, LoadAddr, Size);
-+ }
-+#endif
- virtual void *getPointerToNamedFunction(const std::string &Name,
- bool AbortOnFailure=true) {
- return mgr()->getPointerToNamedFunction(Name, AbortOnFailure);
---
-2.13.3
-
diff --git a/meta/recipes-graphics/mesa/mesa-gl_17.1.7.bb b/meta/recipes-graphics/mesa/mesa-gl_17.2.2.bb
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-gl_17.1.7.bb
rename to meta/recipes-graphics/mesa/mesa-gl_17.2.2.bb
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 4f31ed255c..cab8e4bfe7 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -45,7 +45,7 @@ X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage li
# "x11" requires "opengl"
PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}"
PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc"
-PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm"
+PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm wayland-protocols"
DRIDRIVERS = "swrast"
DRIDRIVERS_append_x86 = ",radeon,r200,nouveau,i965,i915"
diff --git a/meta/recipes-graphics/mesa/mesa_17.1.7.bb b/meta/recipes-graphics/mesa/mesa_17.2.2.bb
similarity index 78%
rename from meta/recipes-graphics/mesa/mesa_17.1.7.bb
rename to meta/recipes-graphics/mesa/mesa_17.2.2.bb
index 39cfce992f..14f5f5fd6d 100644
--- a/meta/recipes-graphics/mesa/mesa_17.1.7.bb
+++ b/meta/recipes-graphics/mesa/mesa_17.2.2.bb
@@ -7,14 +7,13 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
file://0002-hardware-gloat.patch \
file://vulkan-mkdir.patch \
file://llvm-config-version.patch \
- file://0001-ac-fix-build-after-LLVM-5.0-SVN-r300718.patch \
- file://0002-gallivm-Fix-build-against-LLVM-SVN-r302589.patch \
file://0001-winsys-svga-drm-Include-sys-types.h.patch \
file://0001-configure.ac-Always-check-for-expat.patch \
file://0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch \
"
-SRC_URI[md5sum] = "e40bb428a263bd28cbf6478dae45b207"
-SRC_URI[sha256sum] = "69f472a874b1122404fa0bd13e2d6bf87eb3b9ad9c21d2f39872a96d83d9e5f5"
+
+SRC_URI[md5sum] = "1a157b5baefb5adf9f4fbb8a6632d74c"
+SRC_URI[sha256sum] = "cf522244d6a5a1ecde3fc00e7c96935253fe22f808f064cab98be6f3faa65782"
#because we cannot rely on the fact that all apps will use pkgconfig,
#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
--
2.14.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v5 2/3] cmake: Upgrade to 3.9.3 release
2017-10-18 11:17 [PATCH v5 0/3] Queued changes since rocko Otavio Salvador
2017-10-18 11:17 ` [PATCH v5 1/3] mesa: Upgrade to 17.2.2 release Otavio Salvador
@ 2017-10-18 11:17 ` Otavio Salvador
2017-10-18 11:17 ` [PATCH v5 3/3] libdrm: upgrade to 2.4.84 Otavio Salvador
2 siblings, 0 replies; 4+ messages in thread
From: Otavio Salvador @ 2017-10-18 11:17 UTC (permalink / raw)
To: OpenEmbedded Core Mailing List; +Cc: Otavio Salvador
This upgrades CMake from 3.8.2 to 3.9.3 release. The Copyright.txt
file checksum change was due the addition of a new contributor on the
contributors list.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
Changes in v5:
- rebase on top of master
Changes in v4: None
Changes in v3: None
Changes in v2:
- amend commit log
.../cmake/{cmake-native_3.8.2.bb => cmake-native_3.9.3.bb} | 0
meta/recipes-devtools/cmake/cmake.inc | 12 ++++++++----
.../cmake/{cmake_3.8.2.bb => cmake_3.9.3.bb} | 0
3 files changed, 8 insertions(+), 4 deletions(-)
rename meta/recipes-devtools/cmake/{cmake-native_3.8.2.bb => cmake-native_3.9.3.bb} (100%)
rename meta/recipes-devtools/cmake/{cmake_3.8.2.bb => cmake_3.9.3.bb} (100%)
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.8.2.bb b/meta/recipes-devtools/cmake/cmake-native_3.9.3.bb
similarity index 100%
rename from meta/recipes-devtools/cmake/cmake-native_3.8.2.bb
rename to meta/recipes-devtools/cmake/cmake-native_3.9.3.bb
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index 6aeb25fdd5..092ac74610 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.cmake.org/"
BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php"
SECTION = "console/utils"
LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://Copyright.txt;md5=8d8c7bc32f8797d23f5cf605d9339d2d \
+LIC_FILES_CHKSUM = "file://Copyright.txt;md5=24600643e5d1d2b8f7478ae5c9074949 \
file://Source/cmake.h;beginline=1;endline=3;md5=4494dee184212fc89c469c3acd555a14"
CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
@@ -17,8 +17,8 @@ SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
file://0001-FindCUDA-Use-find_program-if-find_host_program-is-no.patch \
"
-SRC_URI[md5sum] = "b5dff61f6a7f1305271ab3f6ae261419"
-SRC_URI[sha256sum] = "da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d"
+SRC_URI[md5sum] = "cb0f19828461904c72ed6a1e55459d03"
+SRC_URI[sha256sum] = "8eaf75e1e932159aae98ab5e7491499545554be62a08cbcbc7c75c84b999f28a"
UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
@@ -42,5 +42,9 @@ do_configure_prepend() {
sed -i 's/^find_package(Qt5Widgets QUIET)/#find_package(Qt5Widgets QUIET)/g' ${S}/Source/QtDialog/CMakeLists.txt
sed -i 's/^ find_package(Qt5Widgets REQUIRED)/# find_package(Qt5Widgets REQUIRED)/g' ${S}/Tests/QtAutoUicInterface/CMakeLists.txt
sed -i 's/^ find_package(Qt5Widgets REQUIRED)/# find_package(Qt5Widgets REQUIRED)/g' ${S}/Tests/QtAutogen/CMakeLists.txt
- sed -i 's/^ find_package(Qt5Core REQUIRED)/# find_package(Qt5Core REQUIRED)/g' ${S}/Tests/QtAutogen/autorcc_depends/CMakeLists.txt
+ sed -i 's/^find_package(Qt5Core REQUIRED)/#find_package(Qt5Core REQUIRED)/g' ${S}/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake
+ sed -i 's/^ find_package(Qt5Core REQUIRED)/# find_package(Qt5Core REQUIRED)/g' ${S}/Tests/QtAutogen/mocRerun/CMakeLists.txt
+ sed -i 's/^ find_package(Qt5Core REQUIRED)/# find_package(Qt5Core REQUIRED)/g' ${S}/Tests/QtAutogen/rccDepends/CMakeLists.txt
+ sed -i 's/^ find_package(Qt5Core REQUIRED)/# find_package(Qt5Core REQUIRED)/g' ${S}/Tests/QtAutogen/mocDepends/CMakeLists.txt
+ sed -i 's/^find_package(Qt5Widgets REQUIRED)/#find_package(Qt5Widgets REQUIRED)/g' ${S}/Tests/QtAutogen/mocPlugin/CMakeLists.txt
}
diff --git a/meta/recipes-devtools/cmake/cmake_3.8.2.bb b/meta/recipes-devtools/cmake/cmake_3.9.3.bb
similarity index 100%
rename from meta/recipes-devtools/cmake/cmake_3.8.2.bb
rename to meta/recipes-devtools/cmake/cmake_3.9.3.bb
--
2.14.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v5 3/3] libdrm: upgrade to 2.4.84
2017-10-18 11:17 [PATCH v5 0/3] Queued changes since rocko Otavio Salvador
2017-10-18 11:17 ` [PATCH v5 1/3] mesa: Upgrade to 17.2.2 release Otavio Salvador
2017-10-18 11:17 ` [PATCH v5 2/3] cmake: Upgrade to 3.9.3 release Otavio Salvador
@ 2017-10-18 11:17 ` Otavio Salvador
2 siblings, 0 replies; 4+ messages in thread
From: Otavio Salvador @ 2017-10-18 11:17 UTC (permalink / raw)
To: OpenEmbedded Core Mailing List; +Cc: Otavio Salvador
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
Changes in v5:
- new patch
Changes in v4: None
Changes in v3: None
Changes in v2: None
meta/recipes-graphics/drm/{libdrm_2.4.83.bb => libdrm_2.4.84.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/drm/{libdrm_2.4.83.bb => libdrm_2.4.84.bb} (93%)
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.83.bb b/meta/recipes-graphics/drm/libdrm_2.4.84.bb
similarity index 93%
rename from meta/recipes-graphics/drm/libdrm_2.4.83.bb
rename to meta/recipes-graphics/drm/libdrm_2.4.84.bb
index a5cb75c266..95f72adae5 100644
--- a/meta/recipes-graphics/drm/libdrm_2.4.83.bb
+++ b/meta/recipes-graphics/drm/libdrm_2.4.84.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] = "23800953ed7564988872e1e8c61fde31"
-SRC_URI[sha256sum] = "03a52669da60ead62548a35bc430aafb6c2d8dd21ec9dba3a90f96eff5fe36d6"
+SRC_URI[md5sum] = "35b9544bc2ad864acd1abaa1a2b99092"
+SRC_URI[sha256sum] = "7ae9c24d91139ac9a2cdee06fe46dbe1c401a1eda1c0bd2a6d1ecf72f479e0aa"
inherit autotools pkgconfig manpages
--
2.14.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-10-18 11:17 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-18 11:17 [PATCH v5 0/3] Queued changes since rocko Otavio Salvador
2017-10-18 11:17 ` [PATCH v5 1/3] mesa: Upgrade to 17.2.2 release Otavio Salvador
2017-10-18 11:17 ` [PATCH v5 2/3] cmake: Upgrade to 3.9.3 release Otavio Salvador
2017-10-18 11:17 ` [PATCH v5 3/3] libdrm: upgrade to 2.4.84 Otavio Salvador
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.