From 4c4eb43a35fa8cd8db27e8c1e58efd9a308ab7722638982f5accebe1f41c84a6 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 14 Sep 2015 07:39:44 +0000 Subject: [PATCH] Accepting request 330614 from home:mimi_vx:branches:X11:XOrg - Update to version 11.0.0 * Mesa 11.0 brings core Mesa support for OpenGL 4.2, RadeonSI and Nouveau NVC0 OpenGL 4.1 support (the other hardware drivers remain at OpenGL 3.3), AMDGPU kernel driver support along with initial R9 Fury/Fiji support, EGL 1.5 support, ongoing OpenGL ES 3.1 work, OpenCL compute image support, HEVC video decode support for RadeonSI via VDPAU, OpenGL ES 3.0 for Freedreno, and many fixes. + drop U_mesa-llvm37-rename-r600-to-amdgpu.patch and U_mesa-llvm37.patch - Update to version 10.6.7 + add gpg verification of source package * fdo#90751 Revert "i965: Momentarily pretend to support ARB_texture_stencil8 for blits." * mesa/teximage: use correct extension for accept stencil texture. OBS-URL: https://build.opensuse.org/request/show/330614 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=470 --- Mesa.changes | 20 ++++++ Mesa.keyring | 52 ++++++++++++++++ Mesa.spec | 19 +++--- U_mesa-llvm37-rename-r600-to-amdgpu.patch | 71 ---------------------- U_mesa-llvm37.patch | 45 -------------- mesa-10.6.6.tar.xz | 3 - mesa-11.0.0.tar.xz | 3 + mesa-11.0.0.tar.xz.sig | Bin 0 -> 543 bytes 8 files changed, 82 insertions(+), 131 deletions(-) create mode 100644 Mesa.keyring delete mode 100644 U_mesa-llvm37-rename-r600-to-amdgpu.patch delete mode 100644 U_mesa-llvm37.patch delete mode 100644 mesa-10.6.6.tar.xz create mode 100644 mesa-11.0.0.tar.xz create mode 100644 mesa-11.0.0.tar.xz.sig diff --git a/Mesa.changes b/Mesa.changes index 873cf36..4d02324 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Sat Sep 12 15:36:35 UTC 2015 - mimi.vx@gmail.com + +- Update to version 11.0.0 +* Mesa 11.0 brings core Mesa support for OpenGL 4.2, RadeonSI and Nouveau NVC0 + OpenGL 4.1 support (the other hardware drivers remain at OpenGL 3.3), AMDGPU + kernel driver support along with initial R9 Fury/Fiji support, EGL 1.5 support, + ongoing OpenGL ES 3.1 work, OpenCL compute image support, HEVC video decode + support for RadeonSI via VDPAU, OpenGL ES 3.0 for Freedreno, and many fixes. ++ drop U_mesa-llvm37-rename-r600-to-amdgpu.patch and U_mesa-llvm37.patch + +------------------------------------------------------------------- +Fri Sep 11 18:00:38 UTC 2015 - mimi.vx@gmail.com + +- Update to version 10.6.7 ++ add gpg verification of source package +* fdo#90751 Revert "i965: Momentarily pretend to support + ARB_texture_stencil8 for blits." +* mesa/teximage: use correct extension for accept stencil texture. + ------------------------------------------------------------------- Mon Sep 7 08:33:46 UTC 2015 - zaitor@opensuse.org diff --git a/Mesa.keyring b/Mesa.keyring new file mode 100644 index 0000000..2086361 --- /dev/null +++ b/Mesa.keyring @@ -0,0 +1,52 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2 + +mQINBFQDrA8BEACyGXUc6vSmNkwZdTTzX1vHRgIDWoppot56E5oOO+gM6ukyMDY7 +60FxKvmh704I8NqTfg3Rcs18fSOXeRj1gDG84MsU7QM3g6IQyxCA+IV7d2r/DPZE +z7HxEIKFxGJw24swsQJy/iiZf/b8flqiJbx3Ye1LF7T5iw/gKDsN6eqzAtLKqw9I +/4TBVE766nwmKNQZiw2jAFCs3lwfmNIm7ZaQNBpHTRabMTLMJiFFynLsa1eVsf9D +R3eVXW4c2oHKZbxDvSWR2yz6XcQ9ldii89sUNeclnjSFNOt761P4zBNwcEX2GuQs +JO/haw5FyrMJJexAbdUTtshZ7XvhDv/UCHtyqQBUw/vwYe8Rx79Hq/fOOUdMjWOW +cDCzyYTmGdbEJYRHrENcsOhoti3IkOjgzw0UDyCHyjapFV1ZJT/Kz7rkMmsdNtoi +1BVTLIdOvQmeXQtN2caZSN20wZWHdZnrz1/JOfOxpEsf2R78zavIfobReQdFoYMC +jv4b49WB/Gytd5vneqk9yi9DEhCYw5uGxQgjIKC4AZPVtD//GY+iYiPe5dPwrhU1 +FyD3b9SgYxFE/uZlgbzBIV4akK11vC5Q+Co5PYzhnPPgd7cYLjr/ceMfGPkeWLCY +OxZbXg92BZKKJnFHYx7FJ04WKS8SjzIn/qEzvy7SmPGxSCX6zdwn0fKZYQARAQAB +tCdFbWlsIFZlbGlrb3YgPGVtaWwubC52ZWxpa292QGdtYWlsLmNvbT6JAjkEEwEC +ACMFAlQDrA8CGwMHCwkIBwMCAQYVCAIJCgsEFgIDAQIeAQIXgAAKCRDtrjewLOtJ +DV/AEACd/RKvSzL0L4/9HYvFskjNR40NPFyQHyMaPg9eeblhfbnH7mWYXJ2MPGTR +bgvQCr0zZ3R7u8E8Rxulwifbm20x0WhYOKkDuSROjroRqvDhxfuLtXtBKqfVGw6T +0rMEOOWdqGhql4yuVpqGbgHa5ZfFvQi2EtT40QDdD052adzWeT96aFQB6Gf3CRMf +a4y7hawbUV10XL3BUljUcyh+SJv9lPclW09WNE+tuCmdIqoP927BSjXwh2GR6dM0 +z0aDf3wOxRc9S8q34jS+xN8hsXmYFAqkn0YkVIQ0M0PaQ89ltcyonbG6rZ+1rNgx +tiLEpfOZpzr7LowVsw9R6ky/pvhBHfVIM4aT17hbi2XfnMihmt/T1SZqb36+aYFt +j8Bc/o9I5crPXwOP4in3heY2ZmDWeGkPSRNix0VLQHL0HzOxjMAEm+y5ROLDo7Z/ +sGOebYxMYPIK5mJzrKhk737FEI57cvUSRXzbjmV3CIOIJbaNULWFXkCHRhdyk8mh +sVzKkl7IDiWPBj1RC5r0EXmrjUzK8QfzrTWiOa6z9WIkZ4sSs0bz14Q4pZR2qi8L +KLVjCNf/FusqCTgbZU06x1S/75XJwcsFENWkWYPEaxxzQiCs1rVzG8SnrOjcyc5F +T0rEAQLWU7eq9U6nd4BXMkokiuzlOKWqsDyXibR3wkhI80kAJ7kCDQRUA6wPARAA +s3BLiblcIb800EHz2X01BZ2w3VAxLVHIOlMyRNO3KFkK1Whw1l5PM0z1PxqBXhcb +gEwPX4gEwFgBHoHoNDguwzUeP/NKqDUUVe/KEHnvWcgvAwSunOh0doZ/2+TB+oms +DrsYVfMc/r6jXRy0eHoAPQfKnY8XPSwZ9HQI1lyNhMoIFEvA0mYFdM/B7YEQz9fK +/6GiDa5d2E5E7OE9bWy+PPz0MRq3IAddXLyJh+CM4n3vK0HljJOD8N3zc/i7DqM9 +j5Lqi6lHwXdoYLNtwRmoE+F+niQuV+8RXMaRIG4pxhOLA9tYxh2P8zxEJPkh8YAy +g4nLYZr80Pt1j8acxLZkNKPpuX9P9JmKtW1WerZuWyC0SrkozB0gEMzZpHPsNy52 +Hxem7d4m1tY51cx299VSa+fM5qS2bISoO5ddPHXm3gPhUt0qsWFk6mb+/MnTsyrI +RREbmozhzq1pOXoXQXRzck+JrmifrHIGWqHXYu+VdDK8YfVUPVALgLADnM6da66w +7qNolFuKN21O0KBjij09jWksLh3dsSJEKYrWkOKZIr2kHTQrjQwMelh66YPQArl1 +nk3A0qYAYwOB1vWvQIWn7NAoRfIaR6vCa4mT4YVBtdCkJ7fLzyqeezaXaUMRp0gA +t2WLj2ekRMfzGI3yZso2eu1JvEUHmh49FBY+IqEPlWsAEQEAAYkCHwQYAQIACQUC +VAOsDwIbDAAKCRDtrjewLOtJDbFTD/0e1rCRuRQEJXbirUAW/LxN3KuVhOyVONFc ++iu6ua46wFtbYmiVXjIKZneCUkXYf6y38rQWa4w/iz3xtYqtGX9jSMSiR6OQRfyW +lr/DdQXPCw1PAgx7gdSYg0TebzoHmOIDOUjquM5xnFgd32DbejaOzMiDGyzUOYvh +yP+3j/nbUwI1hFkucVck1EyupF0aXPc2JJpCasZGTdRKL029ot177jSNbZ53Kbjj +H+wWS4yT1EzutcVrRkErG+rvJozpNtKccNnjxygRYT6yKppUvc/8f1AnGdY0azr5 +d9jFU9SL+Vsm+jaS/pSWI7mwy6RL2kRHe0CVF33st2+8CX6ayXcAv5ur72Q/unRa +qaXv5zjsMj7E8KgvUw3IEU/iQ/3WR27uf+AV1CrjRX3A2SossHiJD0/2zZvkjnwM +pvHmH43V8LssfiwhKHmJu8SpHrDUHjrtI0eNKTyDT+7s0OFUbnQBlKgmpTO93m1e +nK3ef8wcqkToST6DfCs3ePLsLRs1Y8Tryblds1c3OjSPyGWPbroUdW9ZlBkvA3lH +RY3LXCO5wlyIEPHn1L42VQc7Bq2yRTm1PKxMQsLpFV/9KXzZiwP12xmh0LXIw3wG +kLK/gqBFGHh/TO5DEl6X/TP380DYdazZpa31S+Ixwt+RkP9ZkvOWGMIG7Nf+G+r+ +Omj3BC4KcQ== +=XQbm +-----END PGP PUBLIC KEY BLOCK----- diff --git a/Mesa.spec b/Mesa.spec index de5944f..380d8df 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -18,7 +18,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 10.6.6 +%define _version 11.0.0 %ifarch %ix86 x86_64 %arm ppc ppc64 ppc64le s390x %define gallium_loader 1 %else @@ -37,7 +37,7 @@ %define with_nine 1 %endif Name: Mesa -Version: 10.6.6 +Version: 11.0.0 Release: 0 Summary: System for rendering interactive 3-D graphics License: MIT @@ -56,10 +56,6 @@ Patch11: u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch Patch13: u_mesa-8.0.1-fix-16bpp.patch # Patch from Fedora, use shmget when available, under llvmpipe Patch15: u_mesa-8.0-llvmpipe-shmget.patch -# Upstream commit to fix build with llvm 3.7 -Patch16: U_mesa-llvm37.patch -# Upstream commit to fix build with llvm 3.7 -Patch17: U_mesa-llvm37-rename-r600-to-amdgpu.patch BuildRequires: autoconf >= 2.60 BuildRequires: automake BuildRequires: bison @@ -76,8 +72,9 @@ BuildRequires: pkgconfig(dri2proto) BuildRequires: pkgconfig(dri3proto) BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(glproto) -BuildRequires: pkgconfig(libdrm) >= 2.4.38 -BuildRequires: pkgconfig(libdrm_nouveau) >= 2.4.41 +BuildRequires: pkgconfig(libdrm) >= 2.4.60 +BuildRequires: pkgconfig(libdrm_amdgpu) >= 2.4.63 +BuildRequires: pkgconfig(libdrm_nouveau) >= 2.4.62 BuildRequires: pkgconfig(libdrm_radeon) >= 2.4.56 BuildRequires: pkgconfig(libkms) >= 1.0.0 BuildRequires: pkgconfig(libudev) > 151 @@ -109,11 +106,11 @@ Obsoletes: Mesa-nouveau3d < %{version} Obsoletes: xorg-x11-Mesa < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %ifarch %arm -BuildRequires: pkgconfig(libdrm_freedreno) >= 2.4.57 +BuildRequires: pkgconfig(libdrm_freedreno) >= 2.4.64 %endif %ifarch x86_64 %ix86 BuildRequires: libelf-devel -BuildRequires: pkgconfig(libdrm_intel) >= 2.4.60 +BuildRequires: pkgconfig(libdrm_intel) >= 2.4.61 %endif %if 0%{?suse_version} >= 1310 BuildRequires: pkgconfig(wayland-client) @@ -519,8 +516,6 @@ rm -rf docs/README.{VMS,WIN32,OS2} # required for building against wayland of openSUSE 13.1 %patch0 -p1 %endif -%patch16 -p1 -%patch17 -p1 ### disabled, but not dropped yet; these still need investigation in ### order to figure out whether the issue is still reproducable and ### hence a fix is required diff --git a/U_mesa-llvm37-rename-r600-to-amdgpu.patch b/U_mesa-llvm37-rename-r600-to-amdgpu.patch deleted file mode 100644 index 2d6ea13..0000000 --- a/U_mesa-llvm37-rename-r600-to-amdgpu.patch +++ /dev/null @@ -1,71 +0,0 @@ -From patchwork Fri Jun 12 00:36:45 2015 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 8bit -Subject: [Mesa-dev] radeon/llvm: Handle LLVM backend rename from R600 to AMDGPU -From: Tom Stellard -X-Patchwork-Id: 51706 -Message-Id: <1434069405-11033-1-git-send-email-thomas.stellard@amd.com> -To: -Cc: Tom Stellard -Date: Fri, 12 Jun 2015 00:36:45 +0000 - ---- - configure.ac | 13 ++++++++----- - src/gallium/drivers/radeon/radeon_llvm_emit.c | 8 ++++++++ - 2 files changed, 16 insertions(+), 5 deletions(-) -Reviewed-by: Marek Olšák - - -diff --git a/configure.ac b/configure.ac -index d32aa24..eda8d23 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2048,16 +2048,19 @@ require_egl_drm() { - } - - radeon_llvm_check() { -+ if test ${LLVM_VERSION_INT} -lt 307; then -+ amdgpu_llvm_target_name='r600' -+ else -+ amdgpu_llvm_target_name='amdgpu' -+ fi - if test "x$enable_gallium_llvm" != "xyes"; then - AC_MSG_ERROR([--enable-gallium-llvm is required when building $1]) - fi - llvm_check_version_for "3" "4" "2" $1 -- if test true && $LLVM_CONFIG --targets-built | grep -qvw 'R600' ; then -- AC_MSG_ERROR([LLVM R600 Target not enabled. You can enable it when building the LLVM -- sources with the --enable-experimental-targets=R600 -- configure flag]) -+ if test true && $LLVM_CONFIG --targets-built | grep -iqvw $amdgpu_llvm_target_name ; then -+ AC_MSG_ERROR([LLVM $amdgpu_llvm_target_name not enabled in your LLVM build.]) - fi -- LLVM_COMPONENTS="${LLVM_COMPONENTS} r600 bitreader ipo" -+ LLVM_COMPONENTS="${LLVM_COMPONENTS} $amdgpu_llvm_target_name bitreader ipo" - NEED_RADEON_LLVM=yes - if test "x$have_libelf" != xyes; then - AC_MSG_ERROR([$1 requires libelf when using llvm]) -diff --git a/src/gallium/drivers/radeon/radeon_llvm_emit.c b/src/gallium/drivers/radeon/radeon_llvm_emit.c -index 624077c..25580b6 100644 ---- a/src/gallium/drivers/radeon/radeon_llvm_emit.c -+++ b/src/gallium/drivers/radeon/radeon_llvm_emit.c -@@ -86,10 +86,18 @@ static void init_r600_target() - { - static unsigned initialized = 0; - if (!initialized) { -+#if HAVE_LLVM < 0x0307 - LLVMInitializeR600TargetInfo(); - LLVMInitializeR600Target(); - LLVMInitializeR600TargetMC(); - LLVMInitializeR600AsmPrinter(); -+#else -+ LLVMInitializeAMDGPUTargetInfo(); -+ LLVMInitializeAMDGPUTarget(); -+ LLVMInitializeAMDGPUTargetMC(); -+ LLVMInitializeAMDGPUAsmPrinter(); -+ -+#endif - initialized = 1; - } - } diff --git a/U_mesa-llvm37.patch b/U_mesa-llvm37.patch deleted file mode 100644 index a6473de..0000000 --- a/U_mesa-llvm37.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 147ffd48166d851341cadd12de98895f32ec25a2 Mon Sep 17 00:00:00 2001 -From: Vinson Lee -Date: Tue, 26 May 2015 22:18:28 -0700 -Subject: gallivm: Do not use NoFramePointerElim with LLVM 3.7. - -TargetOptions::NoFramePointerElim was removed in llvm-3.7.0svn r238244 -"Remove NoFramePointerElim and NoFramePointerElimOverride from -TargetOptions and remove ExecutionEngine's dependence on CodeGen. NFC." - -Signed-off-by: Vinson Lee -Reviewed-by: Tom Stellard - -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp -index be3e834..76c302f 100644 ---- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp -+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp -@@ -277,8 +277,10 @@ disassemble(const void* func, llvm::raw_ostream & Out) - options.StackAlignmentOverride = 4; - #endif - #if defined(DEBUG) || defined(PROFILE) -+#if HAVE_LLVM < 0x0307 - options.NoFramePointerElim = true; - #endif -+#endif - OwningPtr TM(T->createTargetMachine(Triple, sys::getHostCPUName(), "", options)); - - /* -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -index 5e8a634..ffed9e6 100644 ---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -@@ -439,8 +439,10 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT, - #if HAVE_LLVM < 0x0304 - options.NoFramePointerElimNonLeaf = true; - #endif -+#if HAVE_LLVM < 0x0307 - options.NoFramePointerElim = true; - #endif -+#endif - - builder.setEngineKind(EngineKind::JIT) - .setErrorStr(&Error) --- -cgit v0.10.2 - diff --git a/mesa-10.6.6.tar.xz b/mesa-10.6.6.tar.xz deleted file mode 100644 index f064ed5..0000000 --- a/mesa-10.6.6.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:570f2154b7340ff5db61ff103bc6e85165b8958798b78a50fa2df488e98e5778 -size 7040744 diff --git a/mesa-11.0.0.tar.xz b/mesa-11.0.0.tar.xz new file mode 100644 index 0000000..6cac9e1 --- /dev/null +++ b/mesa-11.0.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e095a3eb2eca9dfde7efca8946527c8ae20a0cc938a8c78debc7f158ad44af32 +size 7257112 diff --git a/mesa-11.0.0.tar.xz.sig b/mesa-11.0.0.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..e707e670bdd306aef3c5cbae9a696da97de0645307d0558e12a315b276d8be44 GIT binary patch literal 543 zcmV+)0^t3L0vrSY0SEvF1p-y{8<+qJ2@vhBH?S=0Nezm@5CDLoBsEr8^taZ_Ck_je z$SyHmGv1G$-fZG*&CMl*m8=cB`Qx~z60C-1_Q6qGe}l3N1RRjYyn=f+Lzw zrTY~bbbXE{VU*S5<0&n?4iIZHa$N;@g*uER!Z~Z$TV=`Zp&nBXt$^F5aWO*SFbH{vyFSelPRAc<~a!4i6(-hTL5ADWkAz$Y?iO6<}F>vXj*3u zSsA23m44rI+)ZPmYfnM;uIS4L*c_|ogl7GRX9p7wsQz*@2qil|+Z*%^56dCw-{Q~vF8-DV&7 z-Kia0V