pool/Mesa
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Update to version 12.0.0-rc2

Browse Source 
* Bug fixes and performance improvements
- supersedes patches:
  u_st-va-hardlink-driver-instances-to-gallium_drv_video.patch,
  U_anv-add-the-X-related-and-Wayland-CFLAGS-to-VULKAN.patch
- removed option for build in verbose log mode

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=526
This commit is contained in:
Stefan Dirsch 2016-06-16 10:36:16 +00:00 committed by Git OBS Bridge
parent b34f1e86d6
commit cab497d309
8 changed files with 15 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Mesa.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Jun 15 14:39:32 UTC 2016 - sndirsch@suse.com
- Update to version 12.0.0-rc2
* Bug fixes and performance improvements
- supersedes patches:
u_st-va-hardlink-driver-instances-to-gallium_drv_video.patch,
U_anv-add-the-X-related-and-Wayland-CFLAGS-to-VULKAN.patch
- removed option for build in verbose log mode
-------------------------------------------------------------------
Sun Jun 12 09:22:10 UTC 2016 - sndirsch@suse.com

10
Mesa.spec
View File

@ -18,7 +18,7 @@
%define glamor 1
%define _name_archive mesa
%define _version 12.0.0-rc2
%define _version 12.0.0-rc3
%define with_opencl 0
%define with_vulkan 0
%ifarch %ix86 x86_64 %arm ppc ppc64 ppc64le s390x
@ -66,14 +66,10 @@ 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
# to be upstreamed
Patch17: u_st-va-hardlink-driver-instances-to-gallium_drv_video.patch
# never to be upstreamed
Patch18: n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch
# never to be upstreamed
Patch21: n_Define-GLAPIVAR-separate-from-GLAPI.patch
# Build fix for intel vulkan (to be upstreamed)
Patch30: U_anv-add-the-X-related-and-Wayland-CFLAGS-to-VULKAN.patch
BuildRequires: autoconf >= 2.60
BuildRequires: automake
@ -582,10 +578,8 @@ rm -rf docs/README.{VMS,WIN32,OS2}
#%patch11 -p1
#%patch15 -p1
#%patch13 -p1
%patch17 -p1
%patch18 -p1
%patch21 -p1
%patch30 -p1
%build
%if 0%{?suse_version} >= 1310
@ -658,7 +652,7 @@ autoreconf -fvi
--with-gallium-drivers=swrast,svga \
%endif
CFLAGS="%{optflags} -DNDEBUG"
make %{?_smp_mflags} V=1
make %{?_smp_mflags}
%install
make DESTDIR=%{buildroot} install %{?_smp_mflags}

37
U_anv-add-the-X-related-and-Wayland-CFLAGS-to-VULKAN.patch
View File

@ -1,37 +0,0 @@
From patchwork Fri Jun 3 23:22:40 2016
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [Mesa-dev] anv: add the X related and Wayland CFLAGS to
VULKAN_ENTRYPOINT_CPPFLAGS
From: Emil Velikov <emil.l.velikov@gmail.com>
X-Patchwork-Id: 91607
Message-Id: <1464996160-23417-1-git-send-email-emil.l.velikov@gmail.com>
To: mesa-dev@lists.freedesktop.org
Cc: emil.l.velikov@gmail.com, Emil Velikov <emil.velikov@collabora.com>
Date: Sat, 4 Jun 2016 00:22:40 +0100
From: Emil Velikov <emil.velikov@collabora.com>
Otherwise we might fail to find the headers in some scenarios.
Cc: Tobias Klausmann <tobias.johannes.klausmann@mni.thm.de>
Reported-by: Tobias Klausmann <tobias.johannes.klausmann@mni.thm.de>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
---
src/intel/vulkan/Makefile.am | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am
index 37c2986..3294fa4 100644
--- a/src/intel/vulkan/Makefile.am
+++ b/src/intel/vulkan/Makefile.am
@@ -125,6 +125,8 @@ nodist_EXTRA_libvulkan_intel_la_SOURCES = dummy.cpp
libvulkan_intel_la_SOURCES = $(VULKAN_GEM_FILES)
VULKAN_ENTRYPOINT_CPPFLAGS = \
+ $(XCB_DRI3_CFLAGS) \
+ $(WAYLAND_CFLAGS) \
-DVK_USE_PLATFORM_XCB_KHR \
-DVK_USE_PLATFORM_WAYLAND_KHR

3
mesa-12.0.0-rc2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4fea2e873e8baf92cefa58695d4e719bcddb279c601077f0e7fafaed1259fbc0
size 8550332

BIN
mesa-12.0.0-rc2.tar.xz.sig
View File

Binary file not shown.

3
mesa-12.0.0-rc3.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:29b3526e3e76cec4f84f3e2b17bfd0c3ab224ce305891471a47b02e81b4af6f5
size 8564208

BIN
mesa-12.0.0-rc3.tar.xz.sig Normal file
View File

Binary file not shown.

38
u_st-va-hardlink-driver-instances-to-gallium_drv_video.patch
View File

@ -1,38 +0,0 @@
From 8974248c4147e57552dc21c6d16e4d1817d34fad Mon Sep 17 00:00:00 2001
From: Jimmy Berry <jimmy@boombatower.com>
Date: Sat, 19 Dec 2015 22:49:10 -0600
Subject: [Mesa-dev] [PATCH] st/va: hardlink driver instances to gallium_drv_video.so
Removes the need to set LIBVA_DRIVER_NAME=gallium for supported targets and is
consistent with vdpau and general gallium drivers.
Signed-off-by: Jimmy Berry <jimmy@boombatower.com>
---
src/gallium/targets/va/Makefile.am | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/src/gallium/targets/va/Makefile.am b/src/gallium/targets/va/Makefile.am
index 733e7ac..2cab898 100644
--- a/src/gallium/targets/va/Makefile.am
+++ b/src/gallium/targets/va/Makefile.am
@@ -64,3 +64,17 @@ if HAVE_MESA_LLVM
gallium_drv_video_la_LIBADD += $(LLVM_LIBS)
gallium_drv_video_la_LDFLAGS += $(LLVM_LDFLAGS)
endif
+
+# hardlink each megadriver instance, but don't actually have
+# gallium_drv_video.so in the set of final installed files.
+install-data-hook:
+ for i in $(TARGET_DRIVERS); do \
+ ln -f $(DESTDIR)$(vadir)/gallium_drv_video.so \
+ $(DESTDIR)$(vadir)/$${i}_drv_video.so; \
+ done; \
+ $(RM) $(DESTDIR)$(vadir)/gallium_drv_video.*
+
+uninstall-hook:
+ for i in $(TARGET_DRIVERS); do \
+ $(RM) $(DESTDIR)$(vadir)/$${i}_drv_video.so; \
+ done;
--
2.6.3