From fa0b41e9b4674cffde455ffda5920d687284a7e0 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 19 Jun 2015 11:18:26 +0300 Subject: [PATCH 01/25] drop nir linker patch (already applied) Signed-off-by: Igor Gnatenko --- mesa-10.6-nir-linker.patch | 506 ------------------------------------- mesa.spec | 5 - 2 files changed, 511 deletions(-) delete mode 100644 mesa-10.6-nir-linker.patch diff --git a/mesa-10.6-nir-linker.patch b/mesa-10.6-nir-linker.patch deleted file mode 100644 index 5713c0a..0000000 --- a/mesa-10.6-nir-linker.patch +++ /dev/null @@ -1,506 +0,0 @@ -From patchwork Wed Apr 15 14:08:02 2015 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [Mesa-dev, - 1/9] freedreno: use CXX linker rather than explicit link against - libstdc++ -From: Emil Velikov -X-Patchwork-Id: 47212 -Message-Id: <1429106890-32645-1-git-send-email-emil.l.velikov@gmail.com> -To: mesa-dev@lists.freedesktop.org -Cc: emil.l.velikov@gmail.com, Rob Clark -Date: Wed, 15 Apr 2015 15:08:02 +0100 - -Cc: Rob Clark -Signed-off-by: Emil Velikov - ---- -src/gallium/drivers/freedreno/Makefile.am | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/gallium/drivers/freedreno/Makefile.am b/src/gallium/drivers/freedreno/Makefile.am -index 4b2629f..e798e44 100644 ---- a/src/gallium/drivers/freedreno/Makefile.am -+++ b/src/gallium/drivers/freedreno/Makefile.am -@@ -21,6 +21,8 @@ libfreedreno_la_SOURCES = \ - - noinst_PROGRAMS = ir3_compiler - -+# XXX: Required due to the C++ sources in libnir/libglsl_util -+nodist_EXTRA_ir3_compiler_SOURCES = dummy.cpp - ir3_compiler_SOURCES = \ - ir3/ir3_cmdline.c - -@@ -29,7 +31,6 @@ ir3_compiler_LDADD = \ - ../../auxiliary/libgallium.la \ - $(top_builddir)/src/glsl/libnir.la \ - $(top_builddir)/src/libglsl_util.la \ -- -lstdc++ \ - $(top_builddir)/src/util/libmesautil.la \ - $(GALLIUM_COMMON_LIB_DEPS) \ - $(FREEDRENO_LIBS) - -From patchwork Wed Apr 15 14:08:03 2015 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [Mesa-dev, - 2/9] gallium: use $(top_builddir) when referencing other .la's -From: Emil Velikov -X-Patchwork-Id: 47213 -Message-Id: <1429106890-32645-2-git-send-email-emil.l.velikov@gmail.com> -To: mesa-dev@lists.freedesktop.org -Cc: emil.l.velikov@gmail.com -Date: Wed, 15 Apr 2015 15:08:03 +0100 - -Just like every other place in gallium. - -Signed-off-by: Emil Velikov - ---- -src/gallium/drivers/freedreno/Makefile.am | 2 +- - src/gallium/drivers/nouveau/Makefile.am | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/gallium/drivers/freedreno/Makefile.am b/src/gallium/drivers/freedreno/Makefile.am -index e798e44..cbf62c6 100644 ---- a/src/gallium/drivers/freedreno/Makefile.am -+++ b/src/gallium/drivers/freedreno/Makefile.am -@@ -28,7 +28,7 @@ ir3_compiler_SOURCES = \ - - ir3_compiler_LDADD = \ - libfreedreno.la \ -- ../../auxiliary/libgallium.la \ -+ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/glsl/libnir.la \ - $(top_builddir)/src/libglsl_util.la \ - $(top_builddir)/src/util/libmesautil.la \ -diff --git a/src/gallium/drivers/nouveau/Makefile.am b/src/gallium/drivers/nouveau/Makefile.am -index 0aefc03..d05f0a1 100644 ---- a/src/gallium/drivers/nouveau/Makefile.am -+++ b/src/gallium/drivers/nouveau/Makefile.am -@@ -48,7 +48,7 @@ nouveau_compiler_SOURCES = \ - - nouveau_compiler_LDADD = \ - libnouveau.la \ -- ../../auxiliary/libgallium.la \ -+ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(GALLIUM_COMMON_LIB_DEPS) - - -From patchwork Wed Apr 15 14:08:04 2015 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [Mesa-dev,3/9] pipe-loader: add libnir and libglsl_util to the link -From: Emil Velikov -X-Patchwork-Id: 47214 -Message-Id: <1429106890-32645-3-git-send-email-emil.l.velikov@gmail.com> -To: mesa-dev@lists.freedesktop.org -Cc: emil.l.velikov@gmail.com, Rob Clark -Date: Wed, 15 Apr 2015 15:08:04 +0100 - -Otherwise we'll error out due to unresolved nir symbols. Note that we -still fail to link due to unresolved _mesa_error_no_memory(). - -Based on commit 101142c4010(xa: support for drivers which use NIR) - -Cc: Rob Clark -Signed-off-by: Emil Velikov - ---- -src/gallium/targets/pipe-loader/Makefile.am | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am -index 967cdb7..e4048b5 100644 ---- a/src/gallium/targets/pipe-loader/Makefile.am -+++ b/src/gallium/targets/pipe-loader/Makefile.am -@@ -52,6 +52,8 @@ endif - - PIPE_LIBS += \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ -+ $(top_builddir)/src/glsl/libnir.la \ -+ $(top_builddir)/src/libglsl_util.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(top_builddir)/src/gallium/drivers/rbug/librbug.la \ - $(top_builddir)/src/gallium/drivers/trace/libtrace.la \ - -From patchwork Wed Apr 15 14:08:05 2015 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 8bit -Subject: [Mesa-dev,4/9] prog; - add weak _mesa_error_no_memory() symbol and add it to libglsl_util -From: Emil Velikov -X-Patchwork-Id: 47216 -Message-Id: <1429106890-32645-4-git-send-email-emil.l.velikov@gmail.com> -To: mesa-dev@lists.freedesktop.org -Cc: emil.l.velikov@gmail.com, Rob Clark -Date: Wed, 15 Apr 2015 15:08:05 +0100 - -Rather than forcing everyone to provide their own definition of the symbol -provide a common weak one, which anyone can override if needed. - -This resolved the build of the standalone pipe-drivers, as it provides a -default symbol which was missing previously. - -Cc: Rob Clark -Signed-off-by: Emil Velikov - ---- -src/Makefile.am | 3 ++- - src/glsl/SConscript | 2 ++ - src/mesa/Android.libmesa_glsl_utils.mk | 6 ++++-- - src/mesa/program/weak_errors.c | 30 ++++++++++++++++++++++++++++++ - 4 files changed, 38 insertions(+), 3 deletions(-) - create mode 100644 src/mesa/program/weak_errors.c - -diff --git a/src/Makefile.am b/src/Makefile.am -index 18cb4ce..461da27 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -72,4 +72,5 @@ noinst_LTLIBRARIES = libglsl_util.la - libglsl_util_la_SOURCES = \ - mesa/main/imports.c \ - mesa/program/prog_hash_table.c \ -- mesa/program/symbol_table.c -+ mesa/program/symbol_table.c \ -+ mesa/program/weak_errors.c -diff --git a/src/glsl/SConscript b/src/glsl/SConscript -index 284b375..d18a8a7 100644 ---- a/src/glsl/SConscript -+++ b/src/glsl/SConscript -@@ -71,6 +71,7 @@ env.Command('imports.c', '#src/mesa/main/imports.c', Copy('$TARGET', '$SOURCE')) - env.Prepend(CPPPATH = ['#src/mesa/program']) - env.Command('prog_hash_table.c', '#src/mesa/program/prog_hash_table.c', Copy('$TARGET', '$SOURCE')) - env.Command('symbol_table.c', '#src/mesa/program/symbol_table.c', Copy('$TARGET', '$SOURCE')) -+env.Command('weak_errors.c', '#src/mesa/program/weak_errors.c', Copy('$TARGET', '$SOURCE')) - - compiler_objs = env.StaticObject(source_lists['GLSL_COMPILER_CXX_FILES']) - -@@ -78,6 +79,7 @@ mesa_objs = env.StaticObject([ - 'imports.c', - 'prog_hash_table.c', - 'symbol_table.c', -+ 'weak_errors.c', - ]) - - compiler_objs += mesa_objs -diff --git a/src/mesa/Android.libmesa_glsl_utils.mk b/src/mesa/Android.libmesa_glsl_utils.mk -index a9f6ff5..08786e3 100644 ---- a/src/mesa/Android.libmesa_glsl_utils.mk -+++ b/src/mesa/Android.libmesa_glsl_utils.mk -@@ -43,7 +43,8 @@ LOCAL_C_INCLUDES := \ - LOCAL_SRC_FILES := \ - main/imports.c \ - program/prog_hash_table.c \ -- program/symbol_table.c -+ program/symbol_table.c \ -+ program/weak_errors.c - - include $(MESA_COMMON_MK) - include $(BUILD_STATIC_LIBRARY) -@@ -66,7 +67,8 @@ LOCAL_C_INCLUDES := \ - LOCAL_SRC_FILES := \ - main/imports.c \ - program/prog_hash_table.c \ -- program/symbol_table.c -+ program/symbol_table.c \ -+ program/weak_errors.c - - include $(MESA_COMMON_MK) - include $(BUILD_HOST_STATIC_LIBRARY) -diff --git a/src/mesa/program/weak_errors.c b/src/mesa/program/weak_errors.c -new file mode 100644 -index 0000000..85c35dc ---- /dev/null -+++ b/src/mesa/program/weak_errors.c -@@ -0,0 +1,30 @@ -+/* -+ * Copyright © 2014 Intel Corporation -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a -+ * copy of this software and associated documentation files (the "Software"), -+ * to deal in the Software without restriction, including without limitation -+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, -+ * and/or sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice (including the next -+ * paragraph) shall be included in all copies or substantial portions of the -+ * Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -+ * DEALINGS IN THE SOFTWARE. -+ */ -+#include -+#include "main/errors.h" -+ -+__attribute__((weak)) void -+_mesa_error_no_memory(const char *caller) -+{ -+ fprintf(stderr, "Mesa error: out of memory in %s", caller); -+} - -From patchwork Wed Apr 15 14:08:06 2015 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 8bit -Subject: [Mesa-dev,5/9] glsl: use the weak _mesa_error_no_memory() symbol -From: Emil Velikov -X-Patchwork-Id: 47215 -Message-Id: <1429106890-32645-5-git-send-email-emil.l.velikov@gmail.com> -To: mesa-dev@lists.freedesktop.org -Cc: emil.l.velikov@gmail.com -Date: Wed, 15 Apr 2015 15:08:06 +0100 - -Signed-off-by: Emil Velikov - ---- -src/glsl/Makefile.am | 13 ++++--------- - src/glsl/SConscript | 2 +- - src/glsl/main.cpp | 6 ------ - src/glsl/tests/common.c | 30 ------------------------------ - 4 files changed, 5 insertions(+), 46 deletions(-) - delete mode 100644 src/glsl/tests/common.c - -diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am -index 23c6fe8..cd37e64 100644 ---- a/src/glsl/Makefile.am -+++ b/src/glsl/Makefile.am -@@ -89,8 +89,7 @@ tests_general_ir_test_SOURCES = \ - tests/builtin_variable_test.cpp \ - tests/invalidate_locations_test.cpp \ - tests/general_ir_test.cpp \ -- tests/varyings_test.cpp \ -- tests/common.c -+ tests/varyings_test.cpp - tests_general_ir_test_CFLAGS = \ - $(PTHREAD_CFLAGS) - tests_general_ir_test_LDADD = \ -@@ -103,8 +102,7 @@ tests_uniform_initializer_test_SOURCES = \ - tests/copy_constant_to_storage_tests.cpp \ - tests/set_uniform_initializer_tests.cpp \ - tests/uniform_initializer_utils.cpp \ -- tests/uniform_initializer_utils.h \ -- tests/common.c -+ tests/uniform_initializer_utils.h - tests_uniform_initializer_test_CFLAGS = \ - $(PTHREAD_CFLAGS) - tests_uniform_initializer_test_LDADD = \ -@@ -114,8 +112,7 @@ tests_uniform_initializer_test_LDADD = \ - $(PTHREAD_LIBS) - - tests_sampler_types_test_SOURCES = \ -- tests/sampler_types_test.cpp \ -- tests/common.c -+ tests/sampler_types_test.cpp - tests_sampler_types_test_CFLAGS = \ - $(PTHREAD_CFLAGS) - tests_sampler_types_test_LDADD = \ -@@ -133,8 +130,7 @@ libglcpp_la_SOURCES = \ - $(LIBGLCPP_FILES) - - glcpp_glcpp_SOURCES = \ -- glcpp/glcpp.c \ -- tests/common.c -+ glcpp/glcpp.c - glcpp_glcpp_LDADD = \ - libglcpp.la \ - $(top_builddir)/src/libglsl_util.la \ -@@ -164,7 +160,6 @@ glsl_compiler_LDADD = \ - - glsl_test_SOURCES = \ - standalone_scaffolding.cpp \ -- tests/common.c \ - test.cpp \ - test_optpass.cpp \ - test_optpass.h -diff --git a/src/glsl/SConscript b/src/glsl/SConscript -index d18a8a7..455f5e8 100644 ---- a/src/glsl/SConscript -+++ b/src/glsl/SConscript -@@ -117,6 +117,6 @@ env.Alias('glsl_compiler', glsl_compiler) - - glcpp = env.Program( - target = 'glcpp/glcpp', -- source = ['glcpp/glcpp.c', 'tests/common.c'] + mesa_objs, -+ source = ['glcpp/glcpp.c'] + mesa_objs, - ) - env.Alias('glcpp', glcpp) -diff --git a/src/glsl/main.cpp b/src/glsl/main.cpp -index ccac839..fc54ddd 100644 ---- a/src/glsl/main.cpp -+++ b/src/glsl/main.cpp -@@ -41,12 +41,6 @@ - - static int glsl_version = 330; - --extern "C" void --_mesa_error_no_memory(const char *caller) --{ -- fprintf(stderr, "Mesa error: out of memory in %s", caller); --} -- - static void - initialize_context(struct gl_context *ctx, gl_api api) - { -diff --git a/src/glsl/tests/common.c b/src/glsl/tests/common.c -deleted file mode 100644 -index d69f54d..0000000 ---- a/src/glsl/tests/common.c -+++ /dev/null -@@ -1,30 +0,0 @@ --/* -- * Copyright © 2014 Intel Corporation -- * -- * Permission is hereby granted, free of charge, to any person obtaining a -- * copy of this software and associated documentation files (the "Software"), -- * to deal in the Software without restriction, including without limitation -- * the rights to use, copy, modify, merge, publish, distribute, sublicense, -- * and/or sell copies of the Software, and to permit persons to whom the -- * Software is furnished to do so, subject to the following conditions: -- * -- * The above copyright notice and this permission notice (including the next -- * paragraph) shall be included in all copies or substantial portions of the -- * Software. -- * -- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -- * DEALINGS IN THE SOFTWARE. -- */ --#include --#include "main/errors.h" -- --void --_mesa_error_no_memory(const char *caller) --{ -- fprintf(stderr, "Mesa error: out of memory in %s", caller); --} - -From patchwork Wed Apr 15 14:08:07 2015 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [Mesa-dev, - 6/9] freedreno/ir3: use the weak _mesa_error_no_memory() symbol -From: Emil Velikov -X-Patchwork-Id: 47218 -Message-Id: <1429106890-32645-6-git-send-email-emil.l.velikov@gmail.com> -To: mesa-dev@lists.freedesktop.org -Cc: emil.l.velikov@gmail.com, Rob Clark -Date: Wed, 15 Apr 2015 15:08:07 +0100 - -We no longer need to (although we can) provide this symbol ourselves. - -Cc: Rob Clark -Signed-off-by: Emil Velikov - ---- -src/gallium/drivers/freedreno/ir3/ir3_cmdline.c | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/src/gallium/drivers/freedreno/ir3/ir3_cmdline.c b/src/gallium/drivers/freedreno/ir3/ir3_cmdline.c -index d0517aa..0b16cc1 100644 ---- a/src/gallium/drivers/freedreno/ir3/ir3_cmdline.c -+++ b/src/gallium/drivers/freedreno/ir3/ir3_cmdline.c -@@ -360,11 +360,3 @@ int main(int argc, char **argv) - } - dump_info(&v, info); - } -- --void _mesa_error_no_memory(const char *caller); -- --void --_mesa_error_no_memory(const char *caller) --{ -- fprintf(stderr, "Mesa error: out of memory in %s", caller); --} - -From patchwork Wed Apr 15 14:08:08 2015 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [Mesa-dev,7/9] st/xa: use the weak _mesa_error_no_memory() symbol -From: Emil Velikov -X-Patchwork-Id: 47217 -Message-Id: <1429106890-32645-7-git-send-email-emil.l.velikov@gmail.com> -To: mesa-dev@lists.freedesktop.org -Cc: emil.l.velikov@gmail.com, Rob Clark -Date: Wed, 15 Apr 2015 15:08:08 +0100 - -Thus we can remove the workaround that we previously had. - -Cc: Rob Clark -Signed-off-by: Emil Velikov - ---- -src/gallium/state_trackers/xa/xa_tracker.c | 12 ------------ - 1 file changed, 12 deletions(-) - -diff --git a/src/gallium/state_trackers/xa/xa_tracker.c b/src/gallium/state_trackers/xa/xa_tracker.c -index 8901998..f69ac8e 100644 ---- a/src/gallium/state_trackers/xa/xa_tracker.c -+++ b/src/gallium/state_trackers/xa/xa_tracker.c -@@ -535,15 +535,3 @@ xa_surface_format(const struct xa_surface *srf) - { - return srf->fdesc.xa_format; - } -- --/* -- * _mesa_error_no_memory() is expected by NIR to be provided by the -- * user. Normally this is in mesa st, but other state trackers -- * must provide their own. -- */ --void _mesa_error_no_memory(const char *caller); --void --_mesa_error_no_memory(const char *caller) --{ -- debug_printf("Mesa error: out of memory in %s", caller); --} - -From patchwork Wed Apr 15 14:08:09 2015 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [Mesa-dev,8/9] targets/nine: link against libnir/libglsl_util -From: Emil Velikov -X-Patchwork-Id: 47219 -Message-Id: <1429106890-32645-8-git-send-email-emil.l.velikov@gmail.com> -To: mesa-dev@lists.freedesktop.org -Cc: emil.l.velikov@gmail.com -Date: Wed, 15 Apr 2015 15:08:09 +0100 - -Similar to commit 127f8767e0a and 101142c4010. - -Signed-off-by: Emil Velikov - ---- -src/gallium/targets/d3dadapter9/Makefile.am | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/gallium/targets/d3dadapter9/Makefile.am b/src/gallium/targets/d3dadapter9/Makefile.am -index 1dc55f5..591978f 100644 ---- a/src/gallium/targets/d3dadapter9/Makefile.am -+++ b/src/gallium/targets/d3dadapter9/Makefile.am -@@ -74,6 +74,8 @@ endif # HAVE_LD_VERSION_SCRIPT - d3dadapter9_la_LIBADD = \ - $(top_builddir)/src/gallium/auxiliary/libgalliumvl_stub.la \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ -+ $(top_builddir)/src/glsl/libnir.la \ -+ $(top_builddir)/src/libglsl_util.la \ - $(top_builddir)/src/gallium/state_trackers/nine/libninetracker.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(top_builddir)/src/gallium/winsys/sw/wrapper/libwsw.la \ diff --git a/mesa.spec b/mesa.spec index e56e277..8161d5d 100644 --- a/mesa.spec +++ b/mesa.spec @@ -77,9 +77,6 @@ Patch15: mesa-9.2-hardware-float.patch Patch20: mesa-10.2-evergreen-big-endian.patch Patch30: mesa-10.3-bigendian-assert.patch -# https://bugs.freedesktop.org/show_bug.cgi?id=90466 -Patch60: mesa-10.6-nir-linker.patch - # https://bugs.freedesktop.org/show_bug.cgi?id=73512 Patch99: 0001-opencl-use-versioned-.so-in-mesa.icd.patch @@ -369,8 +366,6 @@ grep -q ^/ src/gallium/auxiliary/vl/vl_decoder.c && exit 1 %patch20 -p1 -b .egbe %patch30 -p1 -b .beassert -%patch60 -p1 -b .nir - %if 0%{?with_opencl} %patch99 -p1 -b .icd %endif From 73b10fe0ac6d2741f6f210ef0dd354db1c32cb64 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 22 Jun 2015 11:23:19 +0300 Subject: [PATCH 02/25] 8787141 Signed-off-by: Igor Gnatenko --- .gitignore | 1 + mesa.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3fc9a21..75d91cb 100644 --- a/.gitignore +++ b/.gitignore @@ -109,3 +109,4 @@ mesa-20100720.tar.bz2 /mesa-c1485f4.tar.xz /mesa-51e3453.tar.xz /mesa-5a55f68.tar.xz +/mesa-8787141.tar.xz diff --git a/mesa.spec b/mesa.spec index 8161d5d..72ed2e3 100644 --- a/mesa.spec +++ b/mesa.spec @@ -49,13 +49,13 @@ %define _default_patch_fuzz 2 #% define gitdate 20150218 -%define githash 5a55f68 +%define githash 8787141 %define git %{?githash:%{githash}}%{!?githash:%{gitdate}} Summary: Mesa graphics libraries Name: mesa -Version: 10.6.0 -Release: 0.devel.7.%{git}%{?dist}.1 +Version: 10.7.0 +Release: 0.devel.1.%{git}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -714,6 +714,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Jun 22 2015 Igor Gnatenko - 10.7.0-0.devel.1.8787141 +- 8787141 + * Wed Jun 17 2015 Fedora Release Engineering - 10.6.0-0.devel.7.5a55f68.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index f7f5d42..6eae941 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5fa6fdf74185ee5a72893bd744de8342 mesa-5a55f68.tar.xz +7e1ac8bf8474c50e94faf31a67a8f5fc mesa-8787141.tar.xz From ddaee0208512d58a69ea4f33a5f9476366c79617 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 7 Jul 2015 12:30:31 +0300 Subject: [PATCH 03/25] make-release_tarball: fix url Signed-off-by: Igor Gnatenko --- make-release-tarball.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make-release-tarball.sh b/make-release-tarball.sh index 93d65f2..35809c4 100644 --- a/make-release-tarball.sh +++ b/make-release-tarball.sh @@ -2,4 +2,4 @@ # # usage: make-release-tarball.sh [version] -curl -O ftp://ftp.freedesktop.org/pub/mesa/$1/MesaLib-$1.tar.bz2 +curl -O ftp://ftp.freedesktop.org/pub/mesa/$1/mesa-$1.tar.xz From 2218366edd5f0192b5c4d11dfb361eccbcde4749 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 7 Jul 2015 12:41:16 +0300 Subject: [PATCH 04/25] Drop unecessary make for s390 Signed-off-by: Igor Gnatenko --- mesa.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mesa.spec b/mesa.spec index 72ed2e3..21c273a 100644 --- a/mesa.spec +++ b/mesa.spec @@ -55,7 +55,7 @@ Summary: Mesa graphics libraries Name: mesa Version: 10.7.0 -Release: 0.devel.1.%{git}%{?dist} +Release: 0.devel.2.%{git}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -426,9 +426,6 @@ export CXXFLAGS="$RPM_OPT_FLAGS %{?with_opencl:-frtti -fexceptions} %{!?with_ope %endif %{?dri_drivers} -# this seems to be neccessary for s390 -make -C src/mesa/drivers/dri/common/xmlpool/ - make %{?_smp_mflags} MKDEP=/bin/true %install @@ -714,6 +711,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Jul 07 2015 Igor Gnatenko - 10.7.0-0.devel.2.8787141 +- Drop unecessary make for s390 + * Mon Jun 22 2015 Igor Gnatenko - 10.7.0-0.devel.1.8787141 - 8787141 From 248914a5b658f97036c642ba1791b5ee0214c6de Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 7 Jul 2015 12:54:05 +0300 Subject: [PATCH 05/25] drop unused patches Signed-off-by: Igor Gnatenko --- mesa-10.0-nv50-fix-build.patch | 12 --- mesa-8.0-llvmpipe-shmget.patch | 156 --------------------------------- mesa-8.0.1-fix-16bpp.patch | 13 --- mesa.spec | 15 ---- 4 files changed, 196 deletions(-) delete mode 100644 mesa-10.0-nv50-fix-build.patch delete mode 100644 mesa-8.0-llvmpipe-shmget.patch delete mode 100644 mesa-8.0.1-fix-16bpp.patch diff --git a/mesa-10.0-nv50-fix-build.patch b/mesa-10.0-nv50-fix-build.patch deleted file mode 100644 index 51d3160..0000000 --- a/mesa-10.0-nv50-fix-build.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr mesa-20131201.orig/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp mesa-20131201/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp ---- mesa-20131201.orig/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp 2013-12-01 11:29:21.000000000 +0400 -+++ mesa-20131201/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp 2013-12-01 16:05:06.488417551 +0400 -@@ -739,7 +739,7 @@ - if (!i) - i = new_Instruction(pol.context(), op, dType); - #ifndef NDEBUG // non-conformant assert, so this is required -- assert(typeid(*i) == typeid(*this)); -+ //assert(typeid(*i) == typeid(*this)); - #endif - - pol.set(this, i); diff --git a/mesa-8.0-llvmpipe-shmget.patch b/mesa-8.0-llvmpipe-shmget.patch deleted file mode 100644 index 347ad16..0000000 --- a/mesa-8.0-llvmpipe-shmget.patch +++ /dev/null @@ -1,156 +0,0 @@ -diff -up mesa-20120424/src/gallium/state_trackers/dri/sw/drisw.c.jx mesa-20120424/src/gallium/state_trackers/dri/sw/drisw.c ---- mesa-20120424/src/gallium/state_trackers/dri/sw/drisw.c.jx 2012-04-24 07:37:03.000000000 -0400 -+++ mesa-20120424/src/gallium/state_trackers/dri/sw/drisw.c 2012-05-16 13:30:36.596312047 -0400 -@@ -252,8 +252,6 @@ drisw_update_tex_buffer(struct dri_drawa - struct pipe_transfer *transfer; - char *map; - int x, y, w, h; -- int ximage_stride, line; -- int cpp = util_format_get_blocksize(res->format); - - get_drawable_info(dPriv, &x, &y, &w, &h); - -@@ -266,14 +264,6 @@ drisw_update_tex_buffer(struct dri_drawa - /* Copy the Drawable content to the mapped texture buffer */ - get_image(dPriv, x, y, w, h, map); - -- /* The pipe transfer has a pitch rounded up to the nearest 64 pixels. */ -- ximage_stride = w * cpp; -- for (line = h-1; line; --line) { -- memmove(&map[line * transfer->stride], -- &map[line * ximage_stride], -- ximage_stride); -- } -- - pipe_transfer_unmap(pipe, transfer); - pipe_transfer_destroy(pipe, transfer); - } -diff -up mesa-20120424/src/glx/drisw_glx.c.jx mesa-20120424/src/glx/drisw_glx.c ---- mesa-20120424/src/glx/drisw_glx.c.jx 2012-04-24 07:37:03.000000000 -0400 -+++ mesa-20120424/src/glx/drisw_glx.c 2012-05-16 13:29:25.087965268 -0400 -@@ -24,6 +24,9 @@ - #if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL) - - #include -+#include -+#include -+#include - #include "glxclient.h" - #include - #include "dri_common.h" -@@ -206,6 +209,96 @@ swrastPutImage(__DRIdrawable * draw, int - ximage->data = NULL; - } - -+static int shm_error; -+ -+static int -+shm_handler(Display *d, XErrorEvent *e) -+{ -+ shm_error = 1; -+ return 0; -+} -+ -+static int -+align(int value, int alignment) -+{ -+ return (value + alignment - 1) & ~(alignment - 1); -+} -+ -+/* -+ * Slight fast path. Short of changing how texture memory is allocated, we -+ * have two options for getting the pixels out. GetImage is clamped by the -+ * server's write buffer size, so you end up doing lots of relatively small -+ * requests (128k each or so), with two memcpys: down into the kernel, and -+ * then back up. ShmGetImage is one big blit into the shm segment (which -+ * could be GPU DMA, in principle) and then another one here. -+ */ -+static Bool -+swrastShmGetImage(__DRIdrawable *read, char *data, struct drisw_drawable *prp) -+{ -+ __GLXDRIdrawable *pread = &(prp->base); -+ Display *dpy = pread->psc->dpy; -+ XImage *ximage = prp->ximage; -+ unsigned long image_size = ximage->height * ximage->bytes_per_line; -+ Bool ret = 0; -+ XShmSegmentInfo seg = { 0, -1, (void *)-1, 0 }; -+ int (*old_handler)(Display *, XErrorEvent *); -+ -+ if (!XShmQueryExtension(dpy)) -+ goto out; -+ -+ /* image setup */ -+ seg.shmid = shmget(IPC_PRIVATE, image_size, IPC_CREAT | 0777); -+ if (seg.shmid < 0) -+ goto out; -+ -+ seg.shmaddr = shmat(seg.shmid, NULL, 0); -+ if (seg.shmaddr == (void *)-1) -+ goto out; -+ -+ XSync(dpy, 0); -+ old_handler = XSetErrorHandler(shm_handler); -+ XShmAttach(dpy, &seg); -+ XSync(dpy, 0); -+ XSetErrorHandler(old_handler); -+ if (shm_error) -+ goto out; -+ -+ ximage->data = seg.shmaddr; -+ ximage->obdata = &seg; -+ if (!XShmGetImage(dpy, pread->xDrawable, ximage, 0, 0, -1)) -+ goto out; -+ -+ /* -+ * ShmGetImage doesn't actually pay attention to ->bytes_per_line. -+ * We have to compensate for this somewhere since llvmpipe's natural -+ * tile width is 64. Do it here so we don't have to undo it with a -+ * bunch of memmove in the driver. -+ */ -+ do { -+ int i; -+ char *src = ximage->data; -+ int dst_width = align(ximage->width * ximage->bits_per_pixel / 8, 256); -+ -+ for (i = 0; i < ximage->height; i++) { -+ memcpy(data, src, ximage->bytes_per_line); -+ data += dst_width; -+ src += ximage->bytes_per_line; -+ } -+ } while (0); -+ ret = 1; -+ -+out: -+ ximage->obdata = NULL; -+ ximage->data = NULL; -+ shm_error = 0; -+ XShmDetach(dpy, &seg); -+ if (seg.shmaddr != (void *)-1) -+ shmdt(seg.shmaddr); -+ if (seg.shmid > -1) -+ shmctl(seg.shmid, IPC_RMID, NULL); -+ return ret; -+} -+ - static void - swrastGetImage(__DRIdrawable * read, - int x, int y, int w, int h, -@@ -220,11 +313,17 @@ swrastGetImage(__DRIdrawable * read, - readable = pread->xDrawable; - - ximage = prp->ximage; -- ximage->data = data; - ximage->width = w; - ximage->height = h; - ximage->bytes_per_line = bytes_per_line(w * ximage->bits_per_pixel, 32); - -+ /* XXX check dimensions, if any caller ever sub-images */ -+ if (swrastShmGetImage(read, data, prp)) -+ return; -+ -+ /* shm failed, fall back to protocol */ -+ ximage->data = data; -+ - XGetSubImage(dpy, readable, x, y, w, h, ~0L, ZPixmap, ximage, 0, 0); - - ximage->data = NULL; diff --git a/mesa-8.0.1-fix-16bpp.patch b/mesa-8.0.1-fix-16bpp.patch deleted file mode 100644 index 0b8e68a..0000000 --- a/mesa-8.0.1-fix-16bpp.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up Mesa-8.0.1/src/mesa/state_tracker/st_manager.c.jx Mesa-8.0.1/src/mesa/state_tracker/st_manager.c ---- Mesa-8.0.1/src/mesa/state_tracker/st_manager.c.jx 2012-02-14 18:44:00.000000000 -0500 -+++ Mesa-8.0.1/src/mesa/state_tracker/st_manager.c 2012-04-02 12:02:14.613964417 -0400 -@@ -528,6 +528,9 @@ st_context_teximage(struct st_context_if - if (util_format_get_component_bits(internal_format, - UTIL_FORMAT_COLORSPACE_RGB, 3) > 0) - internalFormat = GL_RGBA; -+ else if (util_format_get_component_bits(internal_format, -+ UTIL_FORMAT_COLORSPACE_RGB, 0) == 5) -+ internalFormat = GL_RGB5; - else - internalFormat = GL_RGB; - diff --git a/mesa.spec b/mesa.spec index 21c273a..a2b4f86 100644 --- a/mesa.spec +++ b/mesa.spec @@ -70,9 +70,6 @@ Source3: vl_mpeg12_decoder.c # Fedora opts to ignore the optional part of clause 2 and treat that code as 2 clause BSD. Source4: Mesa-MLAA-License-Clarification-Email.txt -Patch1: mesa-10.0-nv50-fix-build.patch -Patch9: mesa-8.0-llvmpipe-shmget.patch -Patch12: mesa-8.0.1-fix-16bpp.patch Patch15: mesa-9.2-hardware-float.patch Patch20: mesa-10.2-evergreen-big-endian.patch Patch30: mesa-10.3-bigendian-assert.patch @@ -349,18 +346,6 @@ Mesa Direct3D9 state tracker development package #setup -q -n Mesa-%{version}%{?snapshot} %setup -q -n mesa-%{git} grep -q ^/ src/gallium/auxiliary/vl/vl_decoder.c && exit 1 -%patch1 -p1 -b .nv50rtti - -# this fastpath is: -# - broken with swrast classic -# - broken on 24bpp -# - not a huge win anyway -# - ABI-broken wrt upstream -# - eventually obsoleted by vgem -# -# dear ajax: fix this one way or the other -#patch9 -p1 -b .shmget -#patch12 -p1 -b .16bpp %patch15 -p1 -b .hwfloat %patch20 -p1 -b .egbe From 9739a7407bb616c5cea5bfea17c80e126623672b Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 14 Jul 2015 11:55:26 +0300 Subject: [PATCH 06/25] ea633db Signed-off-by: Igor Gnatenko --- .gitignore | 1 + mesa.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 75d91cb..1ae9548 100644 --- a/.gitignore +++ b/.gitignore @@ -110,3 +110,4 @@ mesa-20100720.tar.bz2 /mesa-51e3453.tar.xz /mesa-5a55f68.tar.xz /mesa-8787141.tar.xz +/mesa-ea633db.tar.xz diff --git a/mesa.spec b/mesa.spec index a2b4f86..2173524 100644 --- a/mesa.spec +++ b/mesa.spec @@ -49,13 +49,13 @@ %define _default_patch_fuzz 2 #% define gitdate 20150218 -%define githash 8787141 +%define githash ea633db %define git %{?githash:%{githash}}%{!?githash:%{gitdate}} Summary: Mesa graphics libraries Name: mesa Version: 10.7.0 -Release: 0.devel.2.%{git}%{?dist} +Release: 0.devel.3.%{git}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -696,6 +696,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Jul 14 2015 Igor Gnatenko - 10.7.0-0.devel.3.ea633db +- ea633db + * Tue Jul 07 2015 Igor Gnatenko - 10.7.0-0.devel.2.8787141 - Drop unecessary make for s390 diff --git a/sources b/sources index 6eae941..836fbc0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7e1ac8bf8474c50e94faf31a67a8f5fc mesa-8787141.tar.xz +fdd15ae602da10f0cf6f692b0f8e7d0b mesa-ea633db.tar.xz From 3e520d73d93d41744149380df412799128ad0650 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 15 Jul 2015 00:01:32 +0100 Subject: [PATCH 07/25] Use %%license, minor spec cleanups --- .gitignore | 112 +---------------------------------------------------- mesa.spec | 54 +++++++++++--------------- 2 files changed, 24 insertions(+), 142 deletions(-) diff --git a/.gitignore b/.gitignore index 1ae9548..c558d92 100644 --- a/.gitignore +++ b/.gitignore @@ -1,113 +1,5 @@ *.jx *.src.rpm .build* -mesa-20100208.tar.bz2 -gl-manpages-1.0.1.tar.bz2 -xdriinfo-1.0.3.tar.bz2 -mesa-demos-20100529.tar.bz2 -mesa-20100529.tar.bz2 -mesa-20100612.tar.bz2 -mesa-20100709.tar.bz2 -mesa-20100720.tar.bz2 -/mesa-20100824.tar.bz2 -/mesa-20101020.tar.bz2 -/mesa-20101108.tar.bz2 -/mesa-20101118.tar.bz2 -/mesa-20101129.tar.bz2 -/mesa-20101214.tar.xz -/mesa-20101216.tar.xz -/mesa-20110107.tar.xz -/mesa-20110315.tar.xz -/mesa-20110327.tar.xz -/MesaLib-7.10.1.tar.bz2 -/mesa-20110327.tar.xz -/mesa-20110330.tar.xz -/mesa-20110401.tar.xz -/mesa-20110412.tar.xz -/mesa-20110620.tar.xz -/mesa-20110730.tar.xz -/MesaLib-7.11.tar.bz2 -/mesa-20111103.tar.xz -/mesa-20111114.tar.xz -/mesa-20111129.tar.xz -/mesa-20111214.tar.xz -/mesa-20120105.tar.xz -/mesa-20120126.tar.xz -/MesaLib-8.0.tar.bz2 -/MesaLib-8.0.1.tar.bz2 -/MesaLib-8.0.2.tar.bz2 -/mesa-20120424.tar.xz -/mesa-20120603.tar.xz -/mesa-20120716.tar.xz -/mesa-20120717.tar.xz -/mesa-20120816.tar.xz -/mesa-20120827.tar.xz -/mesa-20120924.tar.xz -/glu-9.0.0.tar.bz2 -/MesaLib-9.0.tar.bz2 -/MesaLib-9.0.1.tar.bz2 -/mesa-20130213.tar.xz -/MesaLib-9.1.tar.bz2 -/MesaLib-9.1.1.tar.bz2 -/mesa-20130508.tar.xz -/mesa-20130514.tar.xz -/mesa-20130528.tar.xz -/mesa-20130610.tar.xz -/mesa-20130723.tar.xz -/mesa-20130902.tar.xz -/mesa-20130919.tar.xz -/mesa-20131113.tar.xz -/mesa-20131114.tar.xz -/mesa-20131128.tar.xz -/mesa-20131206.tar.xz -/mesa-20131220.tar.xz -/mesa-20140206.tar.xz -/mesa-20140208.tar.xz -/mesa-20140222.tar.xz -/mesa-20140225.tar.xz -/mesa-20140301.tar.xz -/mesa-20140305.tar.xz -/mesa-20140419.tar.xz -/mesa-20140430.tar.xz -/mesa-20140505.tar.xz -/mesa-20140510.tar.xz -/mesa-20140517.tar.xz -/mesa-20140524.tar.xz -/mesa-20140531.tar.xz -/mesa-20140608.tar.xz -/mesa-20140625.tar.xz -/mesa-20140711.tar.xz -/mesa-f381c27c548aa28b003c8e188f5d627ab4105f76.tar.xz -/mesa-c40d7d6d948912a4d51cbf8f0854cf2ebe916636.tar.xz -/mesa-e7f2f2dea5acdbd1a12ed88914e64a38a97432f0.tar.xz -/mesa-c2867f5b3626157379ef0d4d5bcaf5180ca0ec1f.tar.xz -/mesa-80771e47b6c1e47ab55f17311e1d4e227a9eb3d8.tar.xz -/mesa-1f184bc.tar.xz -/mesa-c3f17bb.tar.xz -/mesa-1a17098.tar.xz -/mesa-f3b709c.tar.xz -/mesa-9460cd3.tar.xz -/mesa-3d9c1a9.tar.xz -/mesa-29c7cf2.tar.xz -/mesa-0d7f4c8.tar.xz -/mesa-cb5a372.tar.xz -/mesa-0c7f895.tar.xz -/mesa-6c18279.tar.xz -/mesa-64dcb2b.tar.xz -/mesa-3ba57ba.tar.xz -/mesa-609c3e5.tar.xz -/mesa-be0311c.tar.xz -/mesa-a6f6d61.tar.xz -/mesa-c633528.tar.xz -/mesa-b77eaaf.tar.xz -/mesa-290553b.tar.xz -/mesa-c3260f8.tar.xz -/mesa-6171131.tar.xz -/mesa-20150218.tar.xz -/mesa-f80af89.tar.xz -/mesa-3282e57.tar.xz -/mesa-c1485f4.tar.xz -/mesa-51e3453.tar.xz -/mesa-5a55f68.tar.xz -/mesa-8787141.tar.xz -/mesa-ea633db.tar.xz +/mesa-*.tar.bz2 +/mesa-*.tar.xz diff --git a/mesa.spec b/mesa.spec index 2173524..6147b9c 100644 --- a/mesa.spec +++ b/mesa.spec @@ -1,3 +1,5 @@ +%{!?_licensedir:%global license %%doc} + %if 0%{?rhel} %define with_private_llvm 1 %define with_wayland 0 @@ -8,7 +10,6 @@ # S390 doesn't have video cards, but we need swrast for xserver's GLX # llvm (and thus llvmpipe) doesn't actually work on ppc32 -# llvm support for ppc64le is supposed to come in llvm-3.5 %ifnarch s390 ppc %define with_llvm 1 %endif @@ -21,13 +22,13 @@ %ifarch s390 s390x ppc %define with_hardware 0 %define base_drivers swrast -%endif -%ifnarch s390 s390x ppc +%else %define with_hardware 1 %define with_vdpau 1 %define with_vaapi 1 %define with_nine 1 %define base_drivers swrast,nouveau,radeon,r200 +%endif %ifarch %{ix86} x86_64 %define platform_drivers ,i915,i965 %define with_ilo 1 @@ -42,7 +43,6 @@ %define with_xa 1 %define with_omx 1 %endif -%endif %define dri_drivers --with-dri-drivers=%{?base_drivers}%{?platform_drivers} @@ -55,7 +55,7 @@ Summary: Mesa graphics libraries Name: mesa Version: 10.7.0 -Release: 0.devel.3.%{git}%{?dist} +Release: 0.devel.4.%{git}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -434,7 +434,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/vdpau/*.so rm -f $RPM_BUILD_ROOT%{_includedir}/GL/w*.h # remove .la files -find $RPM_BUILD_ROOT -name \*.la | xargs rm -f +find $RPM_BUILD_ROOT -name '*.la' -delete # this keeps breaking, check it early. note that the exit from eu-ftr is odd. pushd $RPM_BUILD_ROOT%{_libdir} @@ -478,26 +478,23 @@ rm -rf $RPM_BUILD_ROOT %endif %files libGL -%defattr(-,root,root,-) -%doc docs/COPYING +%license docs/COPYING %{_libdir}/libGL.so.1 %{_libdir}/libGL.so.1.* %files libEGL -%defattr(-,root,root,-) -%doc docs/COPYING +%license docs/COPYING %{_libdir}/libEGL.so.1 %{_libdir}/libEGL.so.1.* %files libGLES -%defattr(-,root,root,-) -%doc docs/COPYING +%license docs/COPYING %{_libdir}/libGLESv2.so.2 %{_libdir}/libGLESv2.so.2.* %files filesystem -%defattr(-,root,root,-) -%doc docs/COPYING docs/Mesa-MLAA-License-Clarification-Email.txt +%license docs/COPYING +%doc docs/Mesa-MLAA-License-Clarification-Email.txt %dir %{_libdir}/dri %if %{with_hardware} %if 0%{?with_vdpau} @@ -506,11 +503,11 @@ rm -rf $RPM_BUILD_ROOT %endif %files libglapi +%license docs/COPYING %{_libdir}/libglapi.so.0 %{_libdir}/libglapi.so.0.* %files dri-drivers -%defattr(-,root,root,-) %if %{with_hardware} %config(noreplace) %{_sysconfdir}/drirc %if !0%{?rhel} @@ -559,12 +556,10 @@ rm -rf $RPM_BUILD_ROOT %if %{with_hardware} %if 0%{?with_omx} %files omx-drivers -%defattr(-,root,root,-) %{_libdir}/bellagio/libomx_mesa.so %endif %if 0%{?with_vdpau} %files vdpau-drivers -%defattr(-,root,root,-) %{_libdir}/vdpau/libvdpau_nouveau.so.1* %{_libdir}/vdpau/libvdpau_r300.so.1* %if 0%{?with_llvm} @@ -577,7 +572,6 @@ rm -rf $RPM_BUILD_ROOT %endif %files libGL-devel -%defattr(-,root,root,-) %{_includedir}/GL/gl.h %{_includedir}/GL/gl_mangle.h %{_includedir}/GL/glext.h @@ -593,7 +587,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/gl.pc %files libEGL-devel -%defattr(-,root,root,-) %dir %{_includedir}/EGL %{_includedir}/EGL/eglext.h %{_includedir}/EGL/egl.h @@ -606,7 +599,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libEGL.so %files libGLES-devel -%defattr(-,root,root,-) %dir %{_includedir}/GLES2 %{_includedir}/GLES2/gl2platform.h %{_includedir}/GLES2/gl2.h @@ -619,53 +611,45 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libGLESv2.so %files libOSMesa -%defattr(-,root,root,-) -%doc docs/COPYING +%license docs/COPYING %{_libdir}/libOSMesa.so.8* %files libOSMesa-devel -%defattr(-,root,root,-) %dir %{_includedir}/GL %{_includedir}/GL/osmesa.h %{_libdir}/libOSMesa.so %{_libdir}/pkgconfig/osmesa.pc %files libgbm -%defattr(-,root,root,-) -%doc docs/COPYING +%license docs/COPYING %{_libdir}/libgbm.so.1 %{_libdir}/libgbm.so.1.* %files libgbm-devel -%defattr(-,root,root,-) %{_libdir}/libgbm.so %{_includedir}/gbm.h %{_libdir}/pkgconfig/gbm.pc %if 0%{?with_wayland} %files libwayland-egl -%defattr(-,root,root,-) -%doc docs/COPYING +%license docs/COPYING %{_libdir}/libwayland-egl.so.1 %{_libdir}/libwayland-egl.so.1.* %files libwayland-egl-devel -%defattr(-,root,root,-) %{_libdir}/libwayland-egl.so %{_libdir}/pkgconfig/wayland-egl.pc %endif %if 0%{?with_xa} %files libxatracker -%defattr(-,root,root,-) -%doc docs/COPYING +%license docs/COPYING %if %{with_hardware} %{_libdir}/libxatracker.so.2 %{_libdir}/libxatracker.so.2.* %endif %files libxatracker-devel -%defattr(-,root,root,-) %if %{with_hardware} %{_libdir}/libxatracker.so %{_includedir}/xa_tracker.h @@ -677,6 +661,7 @@ rm -rf $RPM_BUILD_ROOT %if 0%{?with_opencl} %files libOpenCL +%license docs/COPYING %{_libdir}/libMesaOpenCL.so.* %{_sysconfdir}/OpenCL/vendors/mesa.icd @@ -686,6 +671,7 @@ rm -rf $RPM_BUILD_ROOT %if 0%{?with_nine} %files libd3d +%license docs/COPYING %dir %{_libdir}/d3d/ %{_libdir}/d3d/*.so.* @@ -696,6 +682,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Jul 14 2015 Peter Robinson 10.7.0-0.devel.4.ea633db +- Use %%license +- Minor spec cleanups + * Tue Jul 14 2015 Igor Gnatenko - 10.7.0-0.devel.3.ea633db - ea633db From 66ed79bcd6caad2869044367ffc38f5d4dc039cd Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sat, 1 Aug 2015 18:29:35 +0300 Subject: [PATCH 08/25] Update to 11.0.0 Signed-off-by: Igor Gnatenko --- mesa.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/mesa.spec b/mesa.spec index 6147b9c..514e665 100644 --- a/mesa.spec +++ b/mesa.spec @@ -49,13 +49,13 @@ %define _default_patch_fuzz 2 #% define gitdate 20150218 -%define githash ea633db +%define githash 6f2d889 %define git %{?githash:%{githash}}%{!?githash:%{gitdate}} Summary: Mesa graphics libraries Name: mesa -Version: 10.7.0 -Release: 0.devel.4.%{git}%{?dist} +Version: 11.0.0 +Release: 0.devel.1.%{git}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -682,6 +682,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Sat Aug 01 2015 Igor Gnatenko - 11.0.0-0.devel.1.6f2d889 +- Update to 11.0.0 + * Tue Jul 14 2015 Peter Robinson 10.7.0-0.devel.4.ea633db - Use %%license - Minor spec cleanups diff --git a/sources b/sources index 836fbc0..63d246d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fdd15ae602da10f0cf6f692b0f8e7d0b mesa-ea633db.tar.xz +9a94a6a8f29ee6158413312771d42357 mesa-6f2d889.tar.xz From 97a957ad22bd51dfdd3b1ec0c93cdd822d9ded1e Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 9 Aug 2015 18:01:20 +0300 Subject: [PATCH 09/25] today's snapshot; add surfaceless EGL platform Signed-off-by: Igor Gnatenko --- mesa.spec | 10 +++++++--- sources | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/mesa.spec b/mesa.spec index 514e665..a827887 100644 --- a/mesa.spec +++ b/mesa.spec @@ -49,13 +49,13 @@ %define _default_patch_fuzz 2 #% define gitdate 20150218 -%define githash 6f2d889 +%define githash 21ccdbd %define git %{?githash:%{githash}}%{!?githash:%{gitdate}} Summary: Mesa graphics libraries Name: mesa Version: 11.0.0 -Release: 0.devel.1.%{git}%{?dist} +Release: 0.devel.2.%{git}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -389,7 +389,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS %{?with_opencl:-frtti -fexceptions} %{!?with_ope --disable-xvmc \ %{?with_vdpau:--enable-vdpau} \ %{?with_vaapi:--enable-va} \ - --with-egl-platforms=x11,drm%{?with_wayland:,wayland} \ + --with-egl-platforms=x11,drm,surfaceless%{?with_wayland:,wayland} \ --enable-shared-glapi \ --enable-gbm \ %{?with_omx:--enable-omx} \ @@ -682,6 +682,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Sun Aug 09 2015 Igor Gnatenko - 11.0.0-0.devel.2.21ccdbd +- 21ccdbd +- add surfaceless EGL platform (RHBZ #1251747) + * Sat Aug 01 2015 Igor Gnatenko - 11.0.0-0.devel.1.6f2d889 - Update to 11.0.0 diff --git a/sources b/sources index 63d246d..144e67d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9a94a6a8f29ee6158413312771d42357 mesa-6f2d889.tar.xz +a8bd72c65daf9cc9b889cfaf11e9bdf2 mesa-21ccdbd.tar.xz From 215d161634e10beca3de6d416eaa048713abdba7 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 9 Aug 2015 18:16:28 +0300 Subject: [PATCH 10/25] drop merged opencl patch Signed-off-by: Igor Gnatenko --- ...opencl-use-versioned-.so-in-mesa.icd.patch | 71 ------------------- mesa.spec | 7 -- 2 files changed, 78 deletions(-) delete mode 100644 0001-opencl-use-versioned-.so-in-mesa.icd.patch diff --git a/0001-opencl-use-versioned-.so-in-mesa.icd.patch b/0001-opencl-use-versioned-.so-in-mesa.icd.patch deleted file mode 100644 index 564ee2a..0000000 --- a/0001-opencl-use-versioned-.so-in-mesa.icd.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 69b30e8f48b24a28c7d27ba59b02776da10cc5a6 Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Sun, 12 Jan 2014 02:09:16 +0400 -Subject: [PATCH] opencl: use versioned .so in mesa.icd - -We must have versioned library in mesa.icd, because ICD loader would -fail if the mesa-devel package wasn't installed. - -Reported-by: Fabian Deutsch -Reference: https://bugs.freedesktop.org/show_bug.cgi?id=73512 -Signed-off-by: Igor Gnatenko ---- - configure.ac | 3 +++ - src/gallium/targets/opencl/Makefile.am | 2 +- - src/gallium/targets/opencl/mesa.icd | 1 - - src/gallium/targets/opencl/mesa.icd.in | 1 + - 4 files changed, 5 insertions(+), 2 deletions(-) - delete mode 100644 src/gallium/targets/opencl/mesa.icd - create mode 100644 src/gallium/targets/opencl/mesa.icd.in - -diff --git a/configure.ac b/configure.ac -index 4646212..89a4f48 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -25,6 +25,8 @@ m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) - dnl Set internal versions - OSMESA_VERSION=8 - AC_SUBST([OSMESA_VERSION]) -+OPENCL_VERSION=1 -+AC_SUBST([OPENCL_VERSION]) - - dnl Versions for external dependencies - LIBDRM_REQUIRED=2.4.38 -@@ -2215,6 +2217,7 @@ AC_CONFIG_FILES([Makefile - src/gallium/targets/libgl-xlib/Makefile - src/gallium/targets/omx/Makefile - src/gallium/targets/opencl/Makefile -+ src/gallium/targets/opencl/mesa.icd - src/gallium/targets/osmesa/Makefile - src/gallium/targets/osmesa/osmesa.pc - src/gallium/targets/pipe-loader/Makefile -diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am -index ca047f0..82e29a6 100644 ---- a/src/gallium/targets/opencl/Makefile.am -+++ b/src/gallium/targets/opencl/Makefile.am -@@ -7,7 +7,7 @@ lib_LTLIBRARIES = lib@OPENCL_LIBNAME@.la - lib@OPENCL_LIBNAME@_la_LDFLAGS = \ - $(LLVM_LDFLAGS) \ - -no-undefined \ -- -version-number 1:0 \ -+ -version-number @OPENCL_VERSION@:0 \ - $(GC_SECTIONS) \ - $(LD_NO_UNDEFINED) - -diff --git a/src/gallium/targets/opencl/mesa.icd b/src/gallium/targets/opencl/mesa.icd -deleted file mode 100644 -index 6a6a870..0000000 ---- a/src/gallium/targets/opencl/mesa.icd -+++ /dev/null -@@ -1 +0,0 @@ --libMesaOpenCL.so -diff --git a/src/gallium/targets/opencl/mesa.icd.in b/src/gallium/targets/opencl/mesa.icd.in -new file mode 100644 -index 0000000..1b77b4e ---- /dev/null -+++ b/src/gallium/targets/opencl/mesa.icd.in -@@ -0,0 +1 @@ -+lib@OPENCL_LIBNAME@.so.@OPENCL_VERSION@ --- -2.0.0 - diff --git a/mesa.spec b/mesa.spec index a827887..40677db 100644 --- a/mesa.spec +++ b/mesa.spec @@ -74,9 +74,6 @@ Patch15: mesa-9.2-hardware-float.patch Patch20: mesa-10.2-evergreen-big-endian.patch Patch30: mesa-10.3-bigendian-assert.patch -# https://bugs.freedesktop.org/show_bug.cgi?id=73512 -Patch99: 0001-opencl-use-versioned-.so-in-mesa.icd.patch - # To have sha info in glxinfo BuildRequires: git @@ -351,10 +348,6 @@ grep -q ^/ src/gallium/auxiliary/vl/vl_decoder.c && exit 1 %patch20 -p1 -b .egbe %patch30 -p1 -b .beassert -%if 0%{?with_opencl} -%patch99 -p1 -b .icd -%endif - %if 0%{with_private_llvm} sed -i 's/llvm-config/mesa-private-llvm-config-%{__isa_bits}/g' configure.ac sed -i 's/`$LLVM_CONFIG --version`/&-mesa/' configure.ac From 16b45a97d3554107e78a74ec13c0b4267d0825e4 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 24 Aug 2015 18:29:09 +0300 Subject: [PATCH 11/25] use 11.0 branch Signed-off-by: Igor Gnatenko --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index df96da0..6d76134 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ SANITIZE ?= 1 ifeq ($(strip $(COMMIT)),) COMMIT = `date +%Y%m%d` - BRANCH = 10.6 + BRANCH = 11.0 else BRANCH = master endif From 626dafa0fc9a0170591d4503ddd069cf5109ced9 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 24 Aug 2015 18:42:00 +0300 Subject: [PATCH 12/25] 11.0.0-rc1 Signed-off-by: Igor Gnatenko --- mesa.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/mesa.spec b/mesa.spec index 40677db..b7fc0e9 100644 --- a/mesa.spec +++ b/mesa.spec @@ -48,14 +48,14 @@ %define _default_patch_fuzz 2 -#% define gitdate 20150218 -%define githash 21ccdbd +%define gitdate 20150824 +#% define githash 21ccdbd %define git %{?githash:%{githash}}%{!?githash:%{gitdate}} Summary: Mesa graphics libraries Name: mesa Version: 11.0.0 -Release: 0.devel.2.%{git}%{?dist} +Release: 0.rc1.1.%{git}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -675,6 +675,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Aug 24 2015 Igor Gnatenko - 11.0.0-0.rc1.1.20150824 +- 11.0.0-rc1 + * Sun Aug 09 2015 Igor Gnatenko - 11.0.0-0.devel.2.21ccdbd - 21ccdbd - add surfaceless EGL platform (RHBZ #1251747) diff --git a/sources b/sources index 144e67d..a4acc16 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a8bd72c65daf9cc9b889cfaf11e9bdf2 mesa-21ccdbd.tar.xz +b64dab0a726e9ec4e7294d3721fffb02 mesa-20150824.tar.xz From 45c5df409924d816a02a0aa473f479a844160e4e Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 24 Aug 2015 18:50:10 +0300 Subject: [PATCH 13/25] use git-core in BR instead of git Signed-off-by: Igor Gnatenko --- mesa.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesa.spec b/mesa.spec index b7fc0e9..1a69e97 100644 --- a/mesa.spec +++ b/mesa.spec @@ -75,7 +75,7 @@ Patch20: mesa-10.2-evergreen-big-endian.patch Patch30: mesa-10.3-bigendian-assert.patch # To have sha info in glxinfo -BuildRequires: git +BuildRequires: git-core BuildRequires: pkgconfig autoconf automake libtool %if %{with_hardware} From 4c06ba3951e592e5283dd8a335e0569cda0704fb Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 2 Sep 2015 01:49:11 +0300 Subject: [PATCH 14/25] 11.0.0-rc2 Signed-off-by: Igor Gnatenko --- mesa.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mesa.spec b/mesa.spec index 1a69e97..f5e0a18 100644 --- a/mesa.spec +++ b/mesa.spec @@ -48,14 +48,14 @@ %define _default_patch_fuzz 2 -%define gitdate 20150824 +%define gitdate 20150902 #% define githash 21ccdbd %define git %{?githash:%{githash}}%{!?githash:%{gitdate}} Summary: Mesa graphics libraries Name: mesa Version: 11.0.0 -Release: 0.rc1.1.%{git}%{?dist} +Release: 0.rc2.1.%{git}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -675,6 +675,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Sep 02 2015 Igor Gnatenko - 11.0.0-0.rc2.1.20150902 +- 11.0.0-rc2 + * Mon Aug 24 2015 Igor Gnatenko - 11.0.0-0.rc1.1.20150824 - 11.0.0-rc1 diff --git a/sources b/sources index a4acc16..59ff9c1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b64dab0a726e9ec4e7294d3721fffb02 mesa-20150824.tar.xz +d5142794593d948e333c832734fa9c03 mesa-20150902.tar.xz From bc39dedda6c051828619f85a9907c51b12c0d106 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 10 Sep 2015 12:04:29 -0500 Subject: [PATCH 15/25] Add brw_meta_fast_clear crash workaround patch (#1259443, fdo#86281) --- ...Remove_early_release_of_DRI2_miptree.patch | 30 +++++++++++++++++++ mesa.spec | 11 ++++++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 i965_Remove_early_release_of_DRI2_miptree.patch diff --git a/i965_Remove_early_release_of_DRI2_miptree.patch b/i965_Remove_early_release_of_DRI2_miptree.patch new file mode 100644 index 0000000..038d73b --- /dev/null +++ b/i965_Remove_early_release_of_DRI2_miptree.patch @@ -0,0 +1,30 @@ +From e2a696a4cd93c2dbe445243de48ed478fbdb8009 Mon Sep 17 00:00:00 2001 +From: Chris Wilson +Date: Fri, 10 Jul 2015 10:41:35 +0100 +Subject: i965: Remove early release of DRI2 miptree + +intel_update_winsys_renderbuffer_miptree() will release the existing +miptree when wrapping a new DRI2 buffer, so we can remove the early +release and so prevent a NULL mt dereference should importing the new +DRI2 name fail for any reason. (Reusing the old DRI2 name will result +in the rendering going astray, to a stale buffer, and not shown on the +screen, but it allows us to issue a warning and not crash much later in +innocent code.) + +Signed-off-by: Chris Wilson + +diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c +index e8d1396..72f3897 100644 +--- a/src/mesa/drivers/dri/i965/brw_context.c ++++ b/src/mesa/drivers/dri/i965/brw_context.c +@@ -1388,7 +1388,6 @@ intel_process_dri2_buffer(struct brw_context *brw, + buffer->cpp, buffer->pitch); + } + +- intel_miptree_release(&rb->mt); + bo = drm_intel_bo_gem_create_from_name(brw->bufmgr, buffer_name, + buffer->name); + if (!bo) { +-- +cgit v0.10.2 + diff --git a/mesa.spec b/mesa.spec index f5e0a18..2a495f5 100644 --- a/mesa.spec +++ b/mesa.spec @@ -55,7 +55,7 @@ Summary: Mesa graphics libraries Name: mesa Version: 11.0.0 -Release: 0.rc2.1.%{git}%{?dist} +Release: 0.rc2.2.%{git}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -70,6 +70,11 @@ Source3: vl_mpeg12_decoder.c # Fedora opts to ignore the optional part of clause 2 and treat that code as 2 clause BSD. Source4: Mesa-MLAA-License-Clarification-Email.txt +# upstream workaround for recent intel crasher regression +# https://bugzilla.redhat.com/show_bug.cgi?id=1259443 +# http://bugs.freedesktop.org/show_bug.cgi?id=86281 +Patch1: i965_Remove_early_release_of_DRI2_miptree.patch + Patch15: mesa-9.2-hardware-float.patch Patch20: mesa-10.2-evergreen-big-endian.patch Patch30: mesa-10.3-bigendian-assert.patch @@ -344,6 +349,7 @@ Mesa Direct3D9 state tracker development package %setup -q -n mesa-%{git} grep -q ^/ src/gallium/auxiliary/vl/vl_decoder.c && exit 1 +%patch1 -p1 -b .i965_Remove_early_release_of_DRI2_miptree %patch15 -p1 -b .hwfloat %patch20 -p1 -b .egbe %patch30 -p1 -b .beassert @@ -675,6 +681,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Thu Sep 10 2015 Rex Dieter 11.0.0-0.rc2.2.20150902 +- - Add brw_meta_fast_clear crash workaround patch (#1259443, fdo#86281) + * Wed Sep 02 2015 Igor Gnatenko - 11.0.0-0.rc2.1.20150902 - 11.0.0-rc2 From d42f5d2fde1e33a058121a1ba6cff78a6fd182f8 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 10 Sep 2015 12:05:21 -0500 Subject: [PATCH 16/25] changelog typo --- mesa.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesa.spec b/mesa.spec index 2a495f5..825f88b 100644 --- a/mesa.spec +++ b/mesa.spec @@ -682,7 +682,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Thu Sep 10 2015 Rex Dieter 11.0.0-0.rc2.2.20150902 -- - Add brw_meta_fast_clear crash workaround patch (#1259443, fdo#86281) +- Add brw_meta_fast_clear crash workaround patch (#1259443, fdo#86281) * Wed Sep 02 2015 Igor Gnatenko - 11.0.0-0.rc2.1.20150902 - 11.0.0-rc2 From bb560ea6aa2911d7720aabd4d14bcca93379fe69 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 13 Sep 2015 11:34:40 +0200 Subject: [PATCH 17/25] 11.0.0 Signed-off-by: Igor Gnatenko --- mesa.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mesa.spec b/mesa.spec index 825f88b..e9f242e 100644 --- a/mesa.spec +++ b/mesa.spec @@ -48,14 +48,14 @@ %define _default_patch_fuzz 2 -%define gitdate 20150902 +%define gitdate 20150913 #% define githash 21ccdbd %define git %{?githash:%{githash}}%{!?githash:%{gitdate}} Summary: Mesa graphics libraries Name: mesa Version: 11.0.0 -Release: 0.rc2.2.%{git}%{?dist} +Release: 1.%{git}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -681,6 +681,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Sun Sep 13 2015 Igor Gnatenko - 11.0.0-1.20150913 +- 11.0.0 + * Thu Sep 10 2015 Rex Dieter 11.0.0-0.rc2.2.20150902 - Add brw_meta_fast_clear crash workaround patch (#1259443, fdo#86281) diff --git a/sources b/sources index 59ff9c1..0b93bdc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d5142794593d948e333c832734fa9c03 mesa-20150902.tar.xz +04d957334adb77856758793fec9ccbd1 mesa-20150913.tar.xz From 568a3d3e8e59cb0f0dc2fed542e2f299df66189f Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Mon, 21 Sep 2015 16:39:41 +1000 Subject: [PATCH 18/25] rebuild 11.0.0 against llvm 3.7 --- mesa.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mesa.spec b/mesa.spec index e9f242e..ecadcdc 100644 --- a/mesa.spec +++ b/mesa.spec @@ -55,7 +55,7 @@ Summary: Mesa graphics libraries Name: mesa Version: 11.0.0 -Release: 1.%{git}%{?dist} +Release: 2.%{git}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -681,6 +681,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Sep 21 2015 Dave Airlie 11.0.0-2.20150913 +- rebuild 11.0.0 against llvm 3.7 + * Sun Sep 13 2015 Igor Gnatenko - 11.0.0-1.20150913 - 11.0.0 From 5f03ecaef57453199ef4f5bc0e9db7a840107d60 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sat, 26 Sep 2015 09:33:55 +0200 Subject: [PATCH 19/25] Add fix for "Broken X on hybrid graphics due to missing GL_OES_EGL_image OpenGL extension" (RHBZ #1265997) Signed-off-by: Igor Gnatenko --- ...ensions-restrict-GL_OES_EGL_image-to-GLES.patch | 14 ++++++++++++++ mesa.spec | 9 ++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 Mesa-dev-Revert-mesa-extensions-restrict-GL_OES_EGL_image-to-GLES.patch diff --git a/Mesa-dev-Revert-mesa-extensions-restrict-GL_OES_EGL_image-to-GLES.patch b/Mesa-dev-Revert-mesa-extensions-restrict-GL_OES_EGL_image-to-GLES.patch new file mode 100644 index 0000000..a0998e5 --- /dev/null +++ b/Mesa-dev-Revert-mesa-extensions-restrict-GL_OES_EGL_image-to-GLES.patch @@ -0,0 +1,14 @@ +diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c +index 767c50e..b2c88c3 100644 +--- a/src/mesa/main/extensions.c ++++ b/src/mesa/main/extensions.c +@@ -307,7 +307,8 @@ static const struct extension extension_table[] = { + { "GL_OES_depth_texture_cube_map", o(OES_depth_texture_cube_map), ES2, 2012 }, + { "GL_OES_draw_texture", o(OES_draw_texture), ES1, 2004 }, + { "GL_OES_EGL_sync", o(dummy_true), ES1 | ES2, 2010 }, +- { "GL_OES_EGL_image", o(OES_EGL_image), ES1 | ES2, 2006 }, ++ /* FIXME: Mesa expects GL_OES_EGL_image to be available in OpenGL contexts. */ ++ { "GL_OES_EGL_image", o(OES_EGL_image), GL | ES1 | ES2, 2006 }, + { "GL_OES_EGL_image_external", o(OES_EGL_image_external), ES1 | ES2, 2010 }, + { "GL_OES_element_index_uint", o(dummy_true), ES1 | ES2, 2005 }, + { "GL_OES_fbo_render_mipmap", o(dummy_true), ES1 | ES2, 2005 }, diff --git a/mesa.spec b/mesa.spec index ecadcdc..5058eb8 100644 --- a/mesa.spec +++ b/mesa.spec @@ -55,7 +55,7 @@ Summary: Mesa graphics libraries Name: mesa Version: 11.0.0 -Release: 2.%{git}%{?dist} +Release: 3.%{git}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -79,6 +79,8 @@ Patch15: mesa-9.2-hardware-float.patch Patch20: mesa-10.2-evergreen-big-endian.patch Patch30: mesa-10.3-bigendian-assert.patch +Patch99: Mesa-dev-Revert-mesa-extensions-restrict-GL_OES_EGL_image-to-GLES.patch + # To have sha info in glxinfo BuildRequires: git-core @@ -354,6 +356,8 @@ grep -q ^/ src/gallium/auxiliary/vl/vl_decoder.c && exit 1 %patch20 -p1 -b .egbe %patch30 -p1 -b .beassert +%patch99 -p1 + %if 0%{with_private_llvm} sed -i 's/llvm-config/mesa-private-llvm-config-%{__isa_bits}/g' configure.ac sed -i 's/`$LLVM_CONFIG --version`/&-mesa/' configure.ac @@ -681,6 +685,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Sat Sep 26 2015 Igor Gnatenko - 11.0.0-3.20150913 +- Add fix for "Broken X on hybrid graphics due to missing GL_OES_EGL_image OpenGL extension" (RHBZ #1265997) + * Mon Sep 21 2015 Dave Airlie 11.0.0-2.20150913 - rebuild 11.0.0 against llvm 3.7 From 457b9d76bd257a795bf4e2f1351fd3d8d8d49828 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sat, 26 Sep 2015 09:49:53 +0200 Subject: [PATCH 20/25] Revert "Add fix for "Broken X on hybrid graphics due to missing GL_OES_EGL_image OpenGL extension" (RHBZ #1265997)" This reverts commit 5f03ecaef57453199ef4f5bc0e9db7a840107d60. --- ...ensions-restrict-GL_OES_EGL_image-to-GLES.patch | 14 -------------- mesa.spec | 9 +-------- 2 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 Mesa-dev-Revert-mesa-extensions-restrict-GL_OES_EGL_image-to-GLES.patch diff --git a/Mesa-dev-Revert-mesa-extensions-restrict-GL_OES_EGL_image-to-GLES.patch b/Mesa-dev-Revert-mesa-extensions-restrict-GL_OES_EGL_image-to-GLES.patch deleted file mode 100644 index a0998e5..0000000 --- a/Mesa-dev-Revert-mesa-extensions-restrict-GL_OES_EGL_image-to-GLES.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c -index 767c50e..b2c88c3 100644 ---- a/src/mesa/main/extensions.c -+++ b/src/mesa/main/extensions.c -@@ -307,7 +307,8 @@ static const struct extension extension_table[] = { - { "GL_OES_depth_texture_cube_map", o(OES_depth_texture_cube_map), ES2, 2012 }, - { "GL_OES_draw_texture", o(OES_draw_texture), ES1, 2004 }, - { "GL_OES_EGL_sync", o(dummy_true), ES1 | ES2, 2010 }, -- { "GL_OES_EGL_image", o(OES_EGL_image), ES1 | ES2, 2006 }, -+ /* FIXME: Mesa expects GL_OES_EGL_image to be available in OpenGL contexts. */ -+ { "GL_OES_EGL_image", o(OES_EGL_image), GL | ES1 | ES2, 2006 }, - { "GL_OES_EGL_image_external", o(OES_EGL_image_external), ES1 | ES2, 2010 }, - { "GL_OES_element_index_uint", o(dummy_true), ES1 | ES2, 2005 }, - { "GL_OES_fbo_render_mipmap", o(dummy_true), ES1 | ES2, 2005 }, diff --git a/mesa.spec b/mesa.spec index 5058eb8..ecadcdc 100644 --- a/mesa.spec +++ b/mesa.spec @@ -55,7 +55,7 @@ Summary: Mesa graphics libraries Name: mesa Version: 11.0.0 -Release: 3.%{git}%{?dist} +Release: 2.%{git}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -79,8 +79,6 @@ Patch15: mesa-9.2-hardware-float.patch Patch20: mesa-10.2-evergreen-big-endian.patch Patch30: mesa-10.3-bigendian-assert.patch -Patch99: Mesa-dev-Revert-mesa-extensions-restrict-GL_OES_EGL_image-to-GLES.patch - # To have sha info in glxinfo BuildRequires: git-core @@ -356,8 +354,6 @@ grep -q ^/ src/gallium/auxiliary/vl/vl_decoder.c && exit 1 %patch20 -p1 -b .egbe %patch30 -p1 -b .beassert -%patch99 -p1 - %if 0%{with_private_llvm} sed -i 's/llvm-config/mesa-private-llvm-config-%{__isa_bits}/g' configure.ac sed -i 's/`$LLVM_CONFIG --version`/&-mesa/' configure.ac @@ -685,9 +681,6 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog -* Sat Sep 26 2015 Igor Gnatenko - 11.0.0-3.20150913 -- Add fix for "Broken X on hybrid graphics due to missing GL_OES_EGL_image OpenGL extension" (RHBZ #1265997) - * Mon Sep 21 2015 Dave Airlie 11.0.0-2.20150913 - rebuild 11.0.0 against llvm 3.7 From 8586e3ee2ff4eca076e0d4c6cec8e7d53eaded67 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Fri, 2 Oct 2015 13:24:56 +1000 Subject: [PATCH 21/25] 11.0.2 --- mesa.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/mesa.spec b/mesa.spec index ecadcdc..6f87d01 100644 --- a/mesa.spec +++ b/mesa.spec @@ -48,14 +48,14 @@ %define _default_patch_fuzz 2 -%define gitdate 20150913 +%define gitdate 20151002 #% define githash 21ccdbd %define git %{?githash:%{githash}}%{!?githash:%{gitdate}} Summary: Mesa graphics libraries Name: mesa -Version: 11.0.0 -Release: 2.%{git}%{?dist} +Version: 11.0.2 +Release: 1.%{git}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -681,6 +681,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Fri Oct 02 2015 Dave Airlie 11.0.2-1.20151002 +- 11.0.2 + * Mon Sep 21 2015 Dave Airlie 11.0.0-2.20150913 - rebuild 11.0.0 against llvm 3.7 diff --git a/sources b/sources index 0b93bdc..1629a7c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -04d957334adb77856758793fec9ccbd1 mesa-20150913.tar.xz +b5cb404232578c46b56393ee4f16ba56 mesa-20151002.tar.xz From 7b49653ed36b659b9af593e296a87aa3b9a81b26 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Mon, 12 Oct 2015 09:41:51 +1000 Subject: [PATCH 22/25] 11.0.3 --- mesa.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mesa.spec b/mesa.spec index 6f87d01..37911bd 100644 --- a/mesa.spec +++ b/mesa.spec @@ -48,13 +48,13 @@ %define _default_patch_fuzz 2 -%define gitdate 20151002 +%define gitdate 20151012 #% define githash 21ccdbd %define git %{?githash:%{githash}}%{!?githash:%{gitdate}} Summary: Mesa graphics libraries Name: mesa -Version: 11.0.2 +Version: 11.0.3 Release: 1.%{git}%{?dist} License: MIT Group: System Environment/Libraries @@ -681,6 +681,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Oct 12 2015 Dave Airlie 11.0.3-1.20151012 +- 11.0.3 + * Fri Oct 02 2015 Dave Airlie 11.0.2-1.20151002 - 11.0.2 diff --git a/sources b/sources index 1629a7c..2b30f96 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b5cb404232578c46b56393ee4f16ba56 mesa-20151002.tar.xz +b9076635891a424266af6f18b20b9180 mesa-20151012.tar.xz From eec1a987ce4e49d0b0f553a19f10b4a1c34d0a7a Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 5 Nov 2015 19:46:27 +0100 Subject: [PATCH 23/25] 11.0.4 Signed-off-by: Igor Gnatenko --- mesa.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mesa.spec b/mesa.spec index 37911bd..6584dbb 100644 --- a/mesa.spec +++ b/mesa.spec @@ -48,13 +48,13 @@ %define _default_patch_fuzz 2 -%define gitdate 20151012 +%define gitdate 20151105 #% define githash 21ccdbd %define git %{?githash:%{githash}}%{!?githash:%{gitdate}} Summary: Mesa graphics libraries Name: mesa -Version: 11.0.3 +Version: 11.0.4 Release: 1.%{git}%{?dist} License: MIT Group: System Environment/Libraries @@ -681,6 +681,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Thu Nov 05 2015 Igor Gnatenko - 11.0.4-1.20151105 +- 11.0.4 + * Mon Oct 12 2015 Dave Airlie 11.0.3-1.20151012 - 11.0.3 diff --git a/sources b/sources index 2b30f96..0bb5832 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b9076635891a424266af6f18b20b9180 mesa-20151012.tar.xz +2f5594c43bc28ce0a9f12dddb7d34899 mesa-20151105.tar.xz From 3dc323881671a96e25c53ca243396e5f1f4ad5d4 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 5 Nov 2015 19:53:11 +0100 Subject: [PATCH 24/25] remove applied patch Signed-off-by: Igor Gnatenko --- ...Remove_early_release_of_DRI2_miptree.patch | 30 ------------------- mesa.spec | 6 ---- 2 files changed, 36 deletions(-) delete mode 100644 i965_Remove_early_release_of_DRI2_miptree.patch diff --git a/i965_Remove_early_release_of_DRI2_miptree.patch b/i965_Remove_early_release_of_DRI2_miptree.patch deleted file mode 100644 index 038d73b..0000000 --- a/i965_Remove_early_release_of_DRI2_miptree.patch +++ /dev/null @@ -1,30 +0,0 @@ -From e2a696a4cd93c2dbe445243de48ed478fbdb8009 Mon Sep 17 00:00:00 2001 -From: Chris Wilson -Date: Fri, 10 Jul 2015 10:41:35 +0100 -Subject: i965: Remove early release of DRI2 miptree - -intel_update_winsys_renderbuffer_miptree() will release the existing -miptree when wrapping a new DRI2 buffer, so we can remove the early -release and so prevent a NULL mt dereference should importing the new -DRI2 name fail for any reason. (Reusing the old DRI2 name will result -in the rendering going astray, to a stale buffer, and not shown on the -screen, but it allows us to issue a warning and not crash much later in -innocent code.) - -Signed-off-by: Chris Wilson - -diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c -index e8d1396..72f3897 100644 ---- a/src/mesa/drivers/dri/i965/brw_context.c -+++ b/src/mesa/drivers/dri/i965/brw_context.c -@@ -1388,7 +1388,6 @@ intel_process_dri2_buffer(struct brw_context *brw, - buffer->cpp, buffer->pitch); - } - -- intel_miptree_release(&rb->mt); - bo = drm_intel_bo_gem_create_from_name(brw->bufmgr, buffer_name, - buffer->name); - if (!bo) { --- -cgit v0.10.2 - diff --git a/mesa.spec b/mesa.spec index 6584dbb..daba2f8 100644 --- a/mesa.spec +++ b/mesa.spec @@ -70,11 +70,6 @@ Source3: vl_mpeg12_decoder.c # Fedora opts to ignore the optional part of clause 2 and treat that code as 2 clause BSD. Source4: Mesa-MLAA-License-Clarification-Email.txt -# upstream workaround for recent intel crasher regression -# https://bugzilla.redhat.com/show_bug.cgi?id=1259443 -# http://bugs.freedesktop.org/show_bug.cgi?id=86281 -Patch1: i965_Remove_early_release_of_DRI2_miptree.patch - Patch15: mesa-9.2-hardware-float.patch Patch20: mesa-10.2-evergreen-big-endian.patch Patch30: mesa-10.3-bigendian-assert.patch @@ -349,7 +344,6 @@ Mesa Direct3D9 state tracker development package %setup -q -n mesa-%{git} grep -q ^/ src/gallium/auxiliary/vl/vl_decoder.c && exit 1 -%patch1 -p1 -b .i965_Remove_early_release_of_DRI2_miptree %patch15 -p1 -b .hwfloat %patch20 -p1 -b .egbe %patch30 -p1 -b .beassert From bcf6f059d3dcf22e4b20ab7379fba0b2b29cf4d7 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 22 Nov 2015 05:51:03 +0100 Subject: [PATCH 25/25] 11.0.6 Signed-off-by: Igor Gnatenko --- mesa.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mesa.spec b/mesa.spec index daba2f8..ace1083 100644 --- a/mesa.spec +++ b/mesa.spec @@ -48,13 +48,13 @@ %define _default_patch_fuzz 2 -%define gitdate 20151105 +%define gitdate 20151122 #% define githash 21ccdbd %define git %{?githash:%{githash}}%{!?githash:%{gitdate}} Summary: Mesa graphics libraries Name: mesa -Version: 11.0.4 +Version: 11.0.6 Release: 1.%{git}%{?dist} License: MIT Group: System Environment/Libraries @@ -675,6 +675,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Sun Nov 22 2015 Igor Gnatenko - 11.0.6-1.20151122 +- 11.0.6 + * Thu Nov 05 2015 Igor Gnatenko - 11.0.4-1.20151105 - 11.0.4 diff --git a/sources b/sources index 0bb5832..ccbbbb1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2f5594c43bc28ce0a9f12dddb7d34899 mesa-20151105.tar.xz +3253105dd4d3b06fc6996b04f2c3ac10 mesa-20151122.tar.xz