From 6b6a7b8e898b097d61cbcf52686f8f8bbd742a649f3dbe6a49247c189caf4db5 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 27 Jan 2015 10:52:01 +0000 Subject: [PATCH 1/4] Accepting request 282940 from home:Andreas_Schwab:Factory - Set xvmc_support also on ppc OBS-URL: https://build.opensuse.org/request/show/282940 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=419 --- Mesa.changes | 5 +++++ Mesa.spec | 7 ++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Mesa.changes b/Mesa.changes index 5a0f44f..8184cf4 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/Mesa.spec b/Mesa.spec index 545e641..0161852 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -24,15 +24,12 @@ %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 From 7282903c6548a28e9065c6b79df91a0e76717d52cab3618f28b0b45e7ac4d5f3 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 27 Jan 2015 11:52:02 +0000 Subject: [PATCH 2/4] - 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) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=420 --- Mesa.changes | 8 ++++++++ Mesa.spec | 40 +++++++++++++++++++++++++++++++++++++-- u_be_assert_include.patch | 27 -------------------------- 3 files changed, 46 insertions(+), 29 deletions(-) delete mode 100644 u_be_assert_include.patch diff --git a/Mesa.changes b/Mesa.changes index 8184cf4..6cc8900 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +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 diff --git a/Mesa.spec b/Mesa.spec index 0161852..298d47b 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -33,6 +33,9 @@ %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 @@ -51,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 @@ -477,6 +479,23 @@ Supplements: xf86-video-ati %description -n libvdpau_radeonsi This package contains the VDPAU state tracker for radeonsi. +%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: mesa-d3d%{?_isa} = %{version}-%{release} + +%description libd3d-devel +Mesa Direct3D9 state tracker development package +%endif + %prep %setup -q -n %{name}-%{_version} -b4 # remove some docs @@ -488,7 +507,6 @@ rm -rf docs/README.{VMS,WIN32,OS2} #%patch15 -p1 #%patch13 -p1 ### -%patch18 -p1 %build %if 0%{?suse_version} >= 1310 @@ -508,6 +526,7 @@ autoreconf -fvi --enable-texture-float \ --enable-osmesa \ --enable-dri3 \ + %{?with_nine:--enable-nine} \ %if %{glamor} --enable-gbm \ --enable-glx-tls \ @@ -651,6 +670,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 @@ -822,4 +846,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 diff --git a/u_be_assert_include.patch b/u_be_assert_include.patch deleted file mode 100644 index e5dbb8b..0000000 --- a/u_be_assert_include.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 83349c31a0e0997ea79bd2832cf9b80e7e22bbc0 Mon Sep 17 00:00:00 2001 -From: Dinar Valeev -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 ---- - 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 - #include - #include -+#include - - #ifdef PIPE_OS_UNIX - #include /* for ffs */ --- -1.7.12.4 - From 9281e59892b174e7235a268f232d0c7eb17ea5f81df55a0986bd5ee81b03b992 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 28 Jan 2015 16:30:29 +0000 Subject: [PATCH 3/4] - fixed Requires for libd3d-devel OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=421 --- Mesa.changes | 5 +++++ Mesa.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Mesa.changes b/Mesa.changes index 6cc8900..5474d26 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/Mesa.spec b/Mesa.spec index 298d47b..b5c5275 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -490,7 +490,7 @@ Mesa Direct3D9 state tracker %package libd3d-devel Summary: Mesa Direct3D9 state tracker development package Group: System/Libraries -Requires: mesa-d3d%{?_isa} = %{version}-%{release} +Requires: %{name}-libd3d = %{version}-%{release} %description libd3d-devel Mesa Direct3D9 state tracker development package From 5fdc2d3d454bf6c9bd648dd982d6b9818709a225bd7ebc072c7949b24d6d9440 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 29 Jan 2015 09:49:12 +0000 Subject: [PATCH 4/4] - moved definition of Mesa-libd3d package above definition of libxatracker packages in order to fix version requires OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=422 --- Mesa.changes | 6 ++++++ Mesa.spec | 33 +++++++++++++++++---------------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/Mesa.changes b/Mesa.changes index 5474d26..2355cff 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/Mesa.spec b/Mesa.spec index b5c5275..dfee39b 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -401,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 @@ -479,22 +496,6 @@ Supplements: xf86-video-ati %description -n libvdpau_radeonsi This package contains the VDPAU state tracker for radeonsi. -%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}-%{release} - -%description libd3d-devel -Mesa Direct3D9 state tracker development package -%endif %prep %setup -q -n %{name}-%{_version} -b4