diff --git a/Mesa.changes b/Mesa.changes index df4161f..f6a9db1 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Oct 12 12:29:38 UTC 2017 - schwab@suse.de + +- svga is x86-only +- u_svga-Fix-build-on-ppc64le.patch: Remove + ------------------------------------------------------------------- Wed Oct 11 13:26:07 UTC 2017 - msrb@suse.com diff --git a/Mesa.spec b/Mesa.spec index fbad9a2..06cb2f1 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -84,7 +84,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_svga-Fix-build-on-ppc64le.patch BuildRequires: autoconf >= 2.60 BuildRequires: automake @@ -392,8 +391,8 @@ applications using the OpenGL|ES 3.x APIs. %package -n libOSMesa8 Summary: Mesa Off-screen rendering extension -# Wrongly named package shipped .so.8 Group: System/Libraries +# Wrongly named package shipped .so.8 Obsoletes: libOSMesa9 < %{version}-%{release} Provides: libOSMesa9 = %{version}-%{release} @@ -499,8 +498,8 @@ implementation of Mesa. %package libd3d Summary: Mesa Direct3D9 state tracker -# Manually provide d3d library (bnc#918294) Group: System/Libraries +# Manually provide d3d library (bnc#918294) %ifarch x86_64 s390x ppc64le aarch64 Provides: d3dadapter9.so.1()(64bit) %else @@ -659,7 +658,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 ... @@ -728,7 +726,7 @@ autoreconf -fvi %ifarch ppc64 ppc64le --enable-xa \ --with-dri-drivers=nouveau \ - --with-gallium-drivers=r300,r600,nouveau,swrast,svga \ + --with-gallium-drivers=r300,r600,nouveau,swrast \ %endif %ifarch ia64 ppc hppa s390 s390x --with-dri-drivers=swrast \ diff --git a/u_svga-Fix-build-on-ppc64le.patch b/u_svga-Fix-build-on-ppc64le.patch deleted file mode 100644 index 3872ce8..0000000 --- a/u_svga-Fix-build-on-ppc64le.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 96b59b70573b8fafc377b4ac04fe46a2474180da Mon Sep 17 00:00:00 2001 -From: Stefan Dirsch -Date: Thu, 7 Sep 2017 11:53:21 +0200 -Subject: [PATCH glx/glxglvnd] svga: Fix build on ppc64le. - -This let us compile the code on ppc64le, but it no-ops the log function. ---- - src/gallium/drivers/svga/svga_msg.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/gallium/drivers/svga/svga_msg.c b/src/gallium/drivers/svga/svga_msg.c -index e0346dee75..611abb70f4 100755 ---- a/src/gallium/drivers/svga/svga_msg.c -+++ b/src/gallium/drivers/svga/svga_msg.c -@@ -57,7 +57,7 @@ - #define HIGH_WORD(X) ((X & 0xFFFF0000) >> 16) - - --#if defined(PIPE_CC_GCC) && (PIPE_CC_GCC_VERSION > 502) -+#if defined(PIPE_CC_GCC) && (PIPE_CC_GCC_VERSION > 502) && !defined(USE_PPC64LE_ASM) - - /** - * Hypervisor-specific bi-directional communication channel. Should never --- -2.13.5 -