From d25fd5b8484e830cd8c90e281c6f14d484433d38588a47b1a9c9f8298073737c Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sun, 10 Dec 2017 12:52:00 +0000 Subject: [PATCH] Accepting request 555293 from home:mimi_vx:branches:X11:XOrg - update to 17.3.0 - drop U_configure.ac-rework-llvm-libs-handling-for-3.9.patch * new major release comitng with changes in RADV, intel ANV, S3TC support, RadeonSI driver with RX Vega. On-disk shader cache OBS-URL: https://build.opensuse.org/request/show/555293 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=668 --- Mesa.changes | 8 ++ Mesa.spec | 14 ++- ...ac-rework-llvm-libs-handling-for-3.9.patch | 107 ------------------ mesa-17.2.6.tar.xz | 3 - mesa-17.2.6.tar.xz.sig | Bin 566 -> 0 bytes mesa-17.3.0.tar.xz | 3 + mesa-17.3.0.tar.xz.sig | Bin 0 -> 566 bytes 7 files changed, 21 insertions(+), 114 deletions(-) delete mode 100644 U_configure.ac-rework-llvm-libs-handling-for-3.9.patch delete mode 100644 mesa-17.2.6.tar.xz delete mode 100644 mesa-17.2.6.tar.xz.sig create mode 100644 mesa-17.3.0.tar.xz create mode 100644 mesa-17.3.0.tar.xz.sig diff --git a/Mesa.changes b/Mesa.changes index 3ead8c0..6103162 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Dec 8 16:47:00 UTC 2017 - mimi.vx@gmail.com + +- update to 17.3.0 +- drop U_configure.ac-rework-llvm-libs-handling-for-3.9.patch + * new major release comitng with changes in RADV, intel ANV, + S3TC support, RadeonSI driver with RX Vega. On-disk shader cache + ------------------------------------------------------------------- Wed Dec 6 12:37:01 UTC 2017 - msrb@suse.com diff --git a/Mesa.spec b/Mesa.spec index 4624243..c8f3b8e 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -39,7 +39,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 17.2.6 +%define _version 17.3.0 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -102,7 +102,7 @@ %endif Name: Mesa -Version: 17.2.6 +Version: 17.3.0 Release: 0 Summary: System for rendering interactive 3-D graphics License: MIT @@ -133,7 +133,6 @@ Patch21: n_Define-GLAPIVAR-separate-from-GLAPI.patch Patch31: archlinux_0001-Fix-linkage-against-shared-glapi.patch Patch32: archlinux_glvnd-fix-gl-dot-pc.patch Patch42: u_r600-Add-support-for-B5G5R5A1.patch -Patch43: U_configure.ac-rework-llvm-libs-handling-for-3.9.patch BuildRequires: autoconf >= 2.60 BuildRequires: automake @@ -187,6 +186,10 @@ Provides: Mesa-nouveau3d = %{version} Provides: xorg-x11-Mesa = %{version} Obsoletes: Mesa-nouveau3d < %{version} Obsoletes: xorg-x11-Mesa < %{version} +Provides: s2tc = %{version} +Obsoletes: s2tc < %{version} +Provides: libtxc_dxtn = %{version} +Obsoletes: libtxc_dxtn < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %ifarch %arm BuildRequires: pkgconfig(libdrm_freedreno) >= 2.4.74 @@ -264,6 +267,10 @@ Obsoletes: Mesa-devel-static < %{version} Obsoletes: xorg-x11-Mesa-devel < %{version} Provides: Mesa-libIndirectGL-devel = %{version} Obsoletes: Mesa-libIndirectGL-devel < %{version} +Provides: s2tc-devel = %{version} +Obsoletes: s2tc-devel < %{version} +Provides: libtxc_dxtn-devel = %{version} +Obsoletes: libtxc_dxtn-devel < %{version} %if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) Requires: libwayland-egl%{?mini}-devel %endif @@ -816,7 +823,6 @@ rm -rf docs/README.{VMS,WIN32,OS2} %endif %patch42 -p1 -%patch43 -p1 # Remove requires to libglvnd/libglvnd-devel from baselibs.conf when # disabling libglvnd build; ugly ... diff --git a/U_configure.ac-rework-llvm-libs-handling-for-3.9.patch b/U_configure.ac-rework-llvm-libs-handling-for-3.9.patch deleted file mode 100644 index c1a26b2..0000000 --- a/U_configure.ac-rework-llvm-libs-handling-for-3.9.patch +++ /dev/null @@ -1,107 +0,0 @@ -Git-commit: 13a53c4f5cdd664fd155c9e78fb46a4387af006c -Patch-Mainline: Upstream -Author: Emil Velikov -Subject: configure.ac: rework llvm libs handling for 3.9+ -Signed-off-by: Michal Srb - -Earlier versions need different quirks, but as of LLVM 3.9 llvm-config -provides --link-shared/link-static toggles. - -The output of which seems to be reliable - looking at LLVM 3.9, 4.0 and -5.0. - -Note that there are earlier code will be used for pre LLVM 3.9 and is -unchanged. - -This effectively fixes LLVM static linking, while providing a clearer -and more robust solution for future versions. - -Mildly interesting side notes: - - - build-mode (introduced with 3.8) was buggy with 3.8 -It shows "static" when build with -DLLVM_LINK_LLVM_DYLIB=ON, yet it was -consistent with --libs. The latter shows the static libraries. - - - libnames and libfiles are broken with LVM 3.9 -The library prefix and extension is printed twice liblibLLVM-3.9.so.so - -v2: Invoke llvm-config twice, instead of using sed, to combine the two -lines into one (Tobias) - -Cc: mesa-stable@lists.freedesktop.org -Cc: Dieter Nützel -Cc: Michel Dänzer -Signed-off-by: Emil Velikov -Reviewed-by: Tobias Droste ---- - configure.ac | 30 ++++++++++++++++++++---------- - 1 file changed, 20 insertions(+), 10 deletions(-) - -Index: mesa-17.2.2/configure.ac -=================================================================== ---- mesa-17.2.2.orig/configure.ac -+++ mesa-17.2.2/configure.ac -@@ -2684,44 +2684,28 @@ if test "x$enable_llvm" = xyes; then - if ! $LLVM_CONFIG --libs ${LLVM_COMPONENTS} >/dev/null; then - AC_MSG_ERROR([Calling ${LLVM_CONFIG} failed]) - fi -- LLVM_LIBS="`$LLVM_CONFIG --libs ${LLVM_COMPONENTS}`" -- -- dnl llvm-config may not give the right answer when llvm is a built as a -- dnl single shared library, so we must work the library name out for -- dnl ourselves. -- dnl (See https://llvm.org/bugs/show_bug.cgi?id=6823) -- if test "x$enable_llvm_shared_libs" = xyes; then -- dnl We can't use $LLVM_VERSION because it has 'svn' stripped out, -- LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version` -- AS_IF([test -f "$LLVM_LIBDIR/lib$LLVM_SO_NAME.$IMP_LIB_EXT"], [llvm_have_one_so=yes]) -- -- if test "x$llvm_have_one_so" = xyes; then -- dnl LLVM was built using auto*, so there is only one shared object. -- LLVM_LIBS="-l$LLVM_SO_NAME" -+ if test $LLVM_VERSION_MAJOR -ge 4 -o $LLVM_VERSION_MAJOR -eq 3 -a $LLVM_VERSION_MINOR -ge 9; then -+ if test "x$enable_llvm_shared_libs" = xyes; then -+ LLVM_LIBS="`$LLVM_CONFIG --link-shared --libs ${LLVM_COMPONENTS}`" - else -- dnl If LLVM was built with CMake, there will be one shared object per -- dnl component. -- AS_IF([test ! -f "$LLVM_LIBDIR/libLLVMTarget.$IMP_LIB_EXT"], -- [AC_MSG_ERROR([Could not find llvm shared libraries: -- Please make sure you have built llvm with the --enable-shared option -- and that your llvm libraries are installed in $LLVM_LIBDIR -- If you have installed your llvm libraries to a different directory you -- can use the --with-llvm-prefix= configure flag to specify this directory. -- NOTE: Mesa is attempting to use llvm shared libraries by default. -- If you do not want to build with llvm shared libraries and instead want to -- use llvm static libraries then add --disable-llvm-shared-libs to your configure -- invocation and rebuild.])]) -- -- dnl We don't need to update LLVM_LIBS in this case because the LLVM -- dnl install uses a shared object for each component and we have -- dnl already added all of these objects to LLVM_LIBS. -+ dnl Invoking llvm-config with both -libs and --system-libs produces the -+ dnl two separate lines - each for the set of libraries. -+ dnl Call the program twice, effectively folding them into a single line. -+ LLVM_LIBS="`$LLVM_CONFIG --link-static --libs ${LLVM_COMPONENTS}`" -+ dnl We need to link to llvm system libs when using static libs -+ LLVM_LIBS="$LLVM_LIBS `$LLVM_CONFIG --link-static --system-libs`" - fi - else -- AC_MSG_WARN([Building mesa with statically linked LLVM may cause compilation issues]) -- dnl We need to link to llvm system libs when using static libs -- dnl However, only llvm 3.5+ provides --system-libs -- if test $LLVM_VERSION_MAJOR -ge 4 -o $LLVM_VERSION_MAJOR -eq 3 -a $LLVM_VERSION_MINOR -ge 5; then -- LLVM_LIBS="$LLVM_LIBS `$LLVM_CONFIG --system-libs`" -+ LLVM_LIBS="`$LLVM_CONFIG --libs ${LLVM_COMPONENTS}`" -+ if test "x$enable_llvm_shared_libs" = xyes; then -+ detect_old_buggy_llvm -+ else -+ AC_MSG_WARN([Building mesa with statically linked LLVM may cause compilation issues]) -+ dnl We need to link to llvm system libs when using static libs -+ dnl However, only llvm 3.5+ provides --system-libs -+ if test $LLVM_VERSION_MAJOR -ge 4 -o $LLVM_VERSION_MAJOR -eq 3 -a $LLVM_VERSION_MINOR -ge 5; then -+ LLVM_LIBS="$LLVM_LIBS `$LLVM_CONFIG --system-libs`" -+ fi - fi - fi - fi diff --git a/mesa-17.2.6.tar.xz b/mesa-17.2.6.tar.xz deleted file mode 100644 index 6f80bed..0000000 --- a/mesa-17.2.6.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6ad85224620330be26ab68c8fc78381b12b38b610ade2db8716b38faaa8f30de -size 10387604 diff --git a/mesa-17.2.6.tar.xz.sig b/mesa-17.2.6.tar.xz.sig deleted file mode 100644 index 92ff08b07b54c2eb9c2ab5e82592d55417f6d68fa47b018268024b8b3cc3edfc..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SW*e79j+bZ3(sH$%I~G2Ve2oVa1lGAT(A50$LgV)c^_!5ZPhH zmZu;zRzEur{v&!+Qqab|+*!{@1kn!>$}E~a78ia-PF!lm2wMbg9&!}Ug3nb%c@H`f zrN99w5aI#vV~$a#jBP)CP((vC1ZE$eKu9j%bSp$P6;U;?F8 zHpef}gijqfo|Pg`w(@N2-=@>d-;{pt&}e2Y?9vJ^*pS!}PsHqjJdc)QW3H#yj_-v_ zKWEncCa?3r!^zvzRzp2;_{tpv!ie5f-66w13AODTuArDMBzp6vy5jk)#6esSYM!qK zKB;Jiy|K=ofWfG;Zpv9(I}J5-+_O>(KV&AHkeSFG8z&O})f@5~rrxgW6ZA5i9nZ@q zpT)gUY^fl~Hx+pxT;tBjm_E{ydPRe$&W;~zeJg~TZkP|=TYpV)AJk3#aK~NN5TvtL zzO8xdK?#LTFV5Uw(t*=mTX?I3fTCNs>i}7nTgUqS>3ybDWaz4Hvow(xbP=UnLl1zqbbTe1VZ|DCp6Hxr3HWoI0|U$SvPQ?&Xe&_ zur>$VZlsQPhr|gdS(D$K_fA)i7cdlnBir-;aJ2QBfSMg Ez`4o~UH||9 diff --git a/mesa-17.3.0.tar.xz b/mesa-17.3.0.tar.xz new file mode 100644 index 0000000..1e0a2cc --- /dev/null +++ b/mesa-17.3.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29a0a3a6c39990d491a1a58ed5c692e596b3bfc6c01d0b45e0b787116c50c6d9 +size 10667896 diff --git a/mesa-17.3.0.tar.xz.sig b/mesa-17.3.0.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..b3cf10bf9a32b91ae2bba58b7f22aaec460b027dd8846e441ea66ef0adbf640b GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j+O1GaDue&B6-Ik?vCt~anO>q!j-0$M7V#sCTl5bdrv zuq^9I4FSau{yKY1B9O=t@bSS8)rh+St}*3T6n(3rCie9KEh!OC`IBXx*Jw5xsvfU- zYglG(F?3q|(Px1<(#?wqj&CzgA=$?X16Jsy_QP26E>*XsX&Sv^LDDBj5z?@ znb%e=LdK_rirF*Vt#e}dKy7;n){g@5;Tn6plZajZO)vHNmhJx=&F7v7}pN^ypEu@c4=obEMKzsadq?zc7VIUq>Pql?|tYY~LzU$a* z=|Gd`+a-YH1i&L;!}1h<6jJZ#2R= z=w*ImMNGA0f5D=YtfX3*zBz$Qn}6(p15e1IC(R#|rEkDZcF-xMQ*?vWU$T2og2wtf zZ4qqalwpNfk})(-VTF_}m4Wvx1lSO(^KOGTR z-%xi+G@Gi9cc3y1TAIw8+aSFK9i53fxSN&o?|aZ8vx6853!8r-2BI%8ngnkfitnf! z$%AnHh6gfXXOLE8bWJEu8V-TPg#V5CHz_xDzOZSh_1n+nH7XMjRPRyA&IkkNlb78h EFYeI>@c;k- literal 0 HcmV?d00001