Accepting request 283301 from X11:XOrg

- moved definition of Mesa-libd3d package above definition of
  libxatracker packages in order to fix version requires

- fixed Requires for libd3d-devel 

- enabled build of Direct3D 9 (Gallium3D Nine) state tracker (bnc#910109)
- removed obsolete patch u_be_assert_include.patch, addressed by
  upstream commit 2a13ff9 "gallium/util: add missing u_debug include"
  (bnc#910109)

- Set xvmc_support also on ppc

OBS-URL: https://build.opensuse.org/request/show/283301
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=231

Mesa.changes

@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Thu Jan 29 09:39:48 UTC 2015 - sndirsch@suse.com
+
+- moved definition of Mesa-libd3d package above definition of
+  libxatracker packages in order to fix version requires
+
+-------------------------------------------------------------------
+Wed Jan 28 16:30:06 UTC 2015 - sndirsch@suse.com
+
+- fixed Requires for libd3d-devel 
+
+-------------------------------------------------------------------
+Tue Jan 27 11:05:40 UTC 2015 - sndirsch@suse.com
+
+- enabled build of Direct3D 9 (Gallium3D Nine) state tracker (bnc#910109)
+- removed obsolete patch u_be_assert_include.patch, addressed by
+  upstream commit 2a13ff9 "gallium/util: add missing u_debug include"
+  (bnc#910109)
+
+-------------------------------------------------------------------
+Tue Jan 27 10:02:46 UTC 2015 - schwab@suse.de
+
+- Set xvmc_support also on ppc
+
 -------------------------------------------------------------------
 Sun Jan 25 12:13:06 UTC 2015 - mimi.vx@gmail.com
 

Mesa.spec

@@ -24,18 +24,18 @@
 %else
 %define gallium_loader 0
 %endif
-%ifarch %ix86 x86_64 %arm ppc64 ppc64le
-%define xvmc_support 1
-%else
-%define xvmc_support 0
-%endif
 %ifarch %ix86 x86_64 %arm ppc ppc64 ppc64le
+%define xvmc_support 1
 %define vdpau_nouveau 1
 %define vdpau_radeon 1
 %else
+%define xvmc_support 0
 %define vdpau_nouveau 0
 %define vdpau_radeon 0
 %endif
+%ifarch %ix86 x86_64
+%define with_nine 1
+%endif
 Name:           Mesa
 Version:        10.4.3
 Release:        0
@@ -54,7 +54,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
-Patch18:        u_be_assert_include.patch
 BuildRequires:  autoconf >= 2.60
 BuildRequires:  automake
 BuildRequires:  bison
@@ -402,6 +401,23 @@ This package is required to link wayland client applications to the EGL
 implementation of Mesa.
 %endif
 
+%if 0%{?with_nine}
+%package libd3d
+Summary:        Mesa Direct3D9 state tracker
+Group:          System/Libraries
+
+%description libd3d
+Mesa Direct3D9 state tracker
+
+%package libd3d-devel
+Summary:        Mesa Direct3D9 state tracker development package
+Group:          System/Libraries
+Requires:       %{name}-libd3d = %{version}
+
+%description libd3d-devel
+Mesa Direct3D9 state tracker development package
+%endif
+
 %package -n libxatracker2
 Version:        1.0.0
 Release:        0
@@ -480,6 +496,7 @@ Supplements:    xf86-video-ati
 %description -n libvdpau_radeonsi
 This package contains the VDPAU state tracker for radeonsi.
 
+
 %prep
 %setup -q -n %{name}-%{_version} -b4
 # remove some docs
@@ -491,7 +508,6 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 #%patch15 -p1
 #%patch13 -p1
 ###
-%patch18 -p1
 
 %build
 %if 0%{?suse_version} >= 1310
@@ -511,6 +527,7 @@ autoreconf -fvi
            --enable-texture-float \
            --enable-osmesa \
            --enable-dri3 \
+           %{?with_nine:--enable-nine} \
 %if %{glamor}
            --enable-gbm \
            --enable-glx-tls \
@@ -654,6 +671,11 @@ install -m 644 $RPM_SOURCE_DIR/README.updates \
 %postun -n libwayland-egl1 -p /sbin/ldconfig
 %endif
 
+%if 0%{?with_nine}
+%post libd3d -p /sbin/ldconfig
+%postun libd3d -p /sbin/ldconfig
+%endif
+
 %files
 %defattr(-,root,root)
 %doc docs/README* docs/COPYING
@@ -825,4 +847,16 @@ install -m 644 $RPM_SOURCE_DIR/README.updates \
 %defattr(-,root,root)
 %doc docs/*.html
 
+%if 0%{?with_nine}
+%files libd3d
+%dir %{_libdir}/d3d/
+%{_libdir}/d3d/*.so.*
+#%{_sysconfdir}/OpenCL/vendors/mesa.icd
+
+%files libd3d-devel
+%{_libdir}/pkgconfig/d3d.pc
+%{_includedir}/d3dadapter/
+%{_libdir}/d3d/*.so
+%endif
+
 %changelog

u_be_assert_include.patch

@@ -1,27 +0,0 @@
-From 83349c31a0e0997ea79bd2832cf9b80e7e22bbc0 Mon Sep 17 00:00:00 2001
-From: Dinar Valeev <dvaleev@suse.com>
-Date: Mon, 29 Sep 2014 11:48:01 +0000
-Subject: [PATCH] Fix missing include for BigEndian systems
-Patch-Mainline: "To be upstreamed"
-
-
-Signed-off-by: Dinar Valeev <dvaleev@suse.com>
----
- src/gallium/auxiliary/util/u_math.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/gallium/auxiliary/util/u_math.h b/src/gallium/auxiliary/util/u_math.h
-index 39bd40f..d4e3c12 100644
---- a/src/gallium/auxiliary/util/u_math.h
-+++ b/src/gallium/auxiliary/util/u_math.h
-@@ -51,6 +51,7 @@ extern "C" {
- #include <math.h>
- #include <float.h>
- #include <stdarg.h>
-+#include <assert.h>
- 
- #ifdef PIPE_OS_UNIX
- #include <strings.h> /* for ffs */
--- 
-1.7.12.4
-