diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-graphics/mesa/files/0001-anv_icd.py-improve-reproducible-builds.patch | 27 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/files/0001-link-mesautil-with-pthreads.patch | 54 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa-gl_17.3.5.bb (renamed from meta/recipes-graphics/mesa/mesa-gl_17.3.4.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa_17.3.5.bb (renamed from meta/recipes-graphics/mesa/mesa_17.3.4.bb) | 6 |
4 files changed, 2 insertions, 85 deletions
diff --git a/meta/recipes-graphics/mesa/files/0001-anv_icd.py-improve-reproducible-builds.patch b/meta/recipes-graphics/mesa/files/0001-anv_icd.py-improve-reproducible-builds.patch deleted file mode 100644 index da7a81f253..0000000000 --- a/meta/recipes-graphics/mesa/files/0001-anv_icd.py-improve-reproducible-builds.patch +++ /dev/null @@ -1,27 +0,0 @@ -From b474abdd91158a52821c34865277d7de38880529 Mon Sep 17 00:00:00 2001 -From: "Maxin B. John" <maxin.john@intel.com> -Date: Wed, 17 Jan 2018 15:53:29 +0200 -Subject: [PATCH] anv_icd.py: improve reproducible builds - -Sort the output to ensure reproducibility - -Upstream-Status: Pending - -Signed-off-by: Maxin B. John <maxin.john@intel.com> ---- - src/intel/vulkan/anv_icd.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/intel/vulkan/anv_icd.py b/src/intel/vulkan/anv_icd.py -index 4ed01fa..31bb068 100644 ---- a/src/intel/vulkan/anv_icd.py -+++ b/src/intel/vulkan/anv_icd.py -@@ -44,4 +44,4 @@ if __name__ == '__main__': - } - - with open(args.out, 'w') as f: -- json.dump(json_data, f, indent = 4) -+ json.dump(json_data, f, indent = 4, sort_keys=True) --- -2.4.0 - diff --git a/meta/recipes-graphics/mesa/files/0001-link-mesautil-with-pthreads.patch b/meta/recipes-graphics/mesa/files/0001-link-mesautil-with-pthreads.patch deleted file mode 100644 index 38ddf49af6..0000000000 --- a/meta/recipes-graphics/mesa/files/0001-link-mesautil-with-pthreads.patch +++ /dev/null @@ -1,54 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Randy MacLeod <randy.macleod@windriver.com> - -From 23ce168048698eeea3df6bb8c9de5be3ca4784cd Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko <ignatenko@redhat.com> -Date: Mon, 1 Jan 2018 22:49:00 +0100 -Subject: [PATCH] link mesautil with pthreads - -../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function `u_thread_setname': -/builddir/build/BUILD/mesa-17.3.1/src/util/../../src/util/u_thread.h:66: undefined reference to `pthread_setname_np' -../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function `thrd_join': -/builddir/build/BUILD/mesa-17.3.1/src/util/../../include/c11/threads_posix.h:336: undefined reference to `pthread_join' -../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function `u_thread_create': -/builddir/build/BUILD/mesa-17.3.1/src/util/../../src/util/u_thread.h:48: undefined reference to `pthread_sigmask' -../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function `thrd_create': -/builddir/build/BUILD/mesa-17.3.1/src/util/../../include/c11/threads_posix.h:296: undefined reference to `pthread_create' -../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function `u_thread_create': -/builddir/build/BUILD/mesa-17.3.1/src/util/../../src/util/u_thread.h:50: undefined reference to `pthread_sigmask' -/builddir/build/BUILD/mesa-17.3.1/src/util/../../src/util/u_thread.h:50: undefined reference to `pthread_sigmask' -../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function `call_once': -/builddir/build/BUILD/mesa-17.3.1/src/util/../../include/c11/threads_posix.h:96: undefined reference to `pthread_once' -../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function `u_thread_get_time_nano': -/builddir/build/BUILD/mesa-17.3.1/src/util/../../src/util/u_thread.h:84: undefined reference to `pthread_getcpuclockid' -collect2: error: ld returned 1 exit status - -Reviewed-by: Adam Jackson <ajax@redhat.com> -Signed-off-by: Igor Gnatenko <ignatenko@redhat.com> ---- - src/util/Makefile.am | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/util/Makefile.am b/src/util/Makefile.am -index a5241ad27b..633907b9fd 100644 ---- a/src/util/Makefile.am -+++ b/src/util/Makefile.am -@@ -31,6 +31,7 @@ noinst_LTLIBRARIES = \ - libxmlconfig.la - - AM_CPPFLAGS = \ -+ $(PTHREAD_CFLAGS) \ - -I$(top_srcdir)/include - - libmesautil_la_CPPFLAGS = \ -@@ -50,6 +51,7 @@ libmesautil_la_SOURCES = \ - $(MESA_UTIL_GENERATED_FILES) - - libmesautil_la_LIBADD = \ -+ $(PTHREAD_LIBS) \ - $(CLOCK_LIB) \ - $(ZLIB_LIBS) \ - $(LIBATOMIC_LIBS) --- -2.14.3 - diff --git a/meta/recipes-graphics/mesa/mesa-gl_17.3.4.bb b/meta/recipes-graphics/mesa/mesa-gl_17.3.5.bb index 73267eb4f0..73267eb4f0 100644 --- a/meta/recipes-graphics/mesa/mesa-gl_17.3.4.bb +++ b/meta/recipes-graphics/mesa/mesa-gl_17.3.5.bb diff --git a/meta/recipes-graphics/mesa/mesa_17.3.4.bb b/meta/recipes-graphics/mesa/mesa_17.3.5.bb index 623046e116..3ce7135f28 100644 --- a/meta/recipes-graphics/mesa/mesa_17.3.4.bb +++ b/meta/recipes-graphics/mesa/mesa_17.3.5.bb @@ -9,12 +9,10 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://llvm-config-version.patch \ file://0001-winsys-svga-drm-Include-sys-types.h.patch \ file://0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch \ - file://0001-anv_icd.py-improve-reproducible-builds.patch \ - file://0001-link-mesautil-with-pthreads.patch \ " -SRC_URI[md5sum] = "139b5f608b371c0d4395596162f88791" -SRC_URI[sha256sum] = "41bac5de0ef6adc1f41a1ec0f80c19e361298ce02fa81b5f9ba4fdca33a9379b" +SRC_URI[md5sum] = "bf73288c33cf12abe62045c25e2196b4" +SRC_URI[sha256sum] = "eb9228fc8aaa71e0205c1481c5b157752ebaec9b646b030d27478e25a6d7936a" #because we cannot rely on the fact that all apps will use pkgconfig, #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER |