Compare commits
20 Commits
1c741b9561
...
b13b769fca
Author | SHA1 | Date | |
---|---|---|---|
|
b13b769fca | ||
|
7e16421963 | ||
|
ee9fab44b6 | ||
|
9d940ed69e | ||
|
2457fa3358 | ||
|
cc063efb30 | ||
|
2b73204e9d | ||
|
9f1ef7b836 | ||
|
776f0ebed6 | ||
|
25b4e647d4 | ||
|
92972ffe7d | ||
|
37e222b99d | ||
|
a3c47870c3 | ||
|
952eceed16 | ||
|
069b694dff | ||
|
09551adef2 | ||
|
b3b089e268 | ||
|
20136eda59 | ||
|
7c4548d416 | ||
|
856ded30ba |
@ -1,50 +0,0 @@
|
|||||||
From 00bcd599310dc7fce4fe336ffd85902429051a0c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
|
|
||||||
Date: Sun, 20 Mar 2016 13:27:04 +0100
|
|
||||||
Subject: [PATCH 2/4] hardware gloat
|
|
||||||
|
|
||||||
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
|
|
||||||
---
|
|
||||||
src/gallium/drivers/llvmpipe/lp_screen.c | 7 +++++++
|
|
||||||
src/gallium/drivers/softpipe/sp_screen.c | 7 +++++++
|
|
||||||
2 files changed, 14 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c
|
|
||||||
index 4f61de8..3b0ec77 100644
|
|
||||||
--- a/src/gallium/drivers/llvmpipe/lp_screen.c
|
|
||||||
+++ b/src/gallium/drivers/llvmpipe/lp_screen.c
|
|
||||||
@@ -411,6 +411,13 @@ llvmpipe_is_format_supported( struct pipe_screen *_screen,
|
|
||||||
if (!format_desc)
|
|
||||||
return FALSE;
|
|
||||||
|
|
||||||
+ if ((bind & PIPE_BIND_RENDER_TARGET) &&
|
|
||||||
+ format != PIPE_FORMAT_R9G9B9E5_FLOAT &&
|
|
||||||
+ format != PIPE_FORMAT_R11G11B10_FLOAT &&
|
|
||||||
+ util_format_is_float(format)) {
|
|
||||||
+ return FALSE;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
assert(target == PIPE_BUFFER ||
|
|
||||||
target == PIPE_TEXTURE_1D ||
|
|
||||||
target == PIPE_TEXTURE_1D_ARRAY ||
|
|
||||||
diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c
|
|
||||||
index 031602b..c279120 100644
|
|
||||||
--- a/src/gallium/drivers/softpipe/sp_screen.c
|
|
||||||
+++ b/src/gallium/drivers/softpipe/sp_screen.c
|
|
||||||
@@ -358,6 +358,13 @@ softpipe_is_format_supported( struct pipe_screen *screen,
|
|
||||||
if (!format_desc)
|
|
||||||
return FALSE;
|
|
||||||
|
|
||||||
+ if ((bind & PIPE_BIND_RENDER_TARGET) &&
|
|
||||||
+ format != PIPE_FORMAT_R9G9B9E5_FLOAT &&
|
|
||||||
+ format != PIPE_FORMAT_R11G11B10_FLOAT &&
|
|
||||||
+ util_format_is_float(format)) {
|
|
||||||
+ return FALSE;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
if (sample_count > 1)
|
|
||||||
return FALSE;
|
|
||||||
|
|
||||||
--
|
|
||||||
2.7.4
|
|
||||||
|
|
2
Makefile
2
Makefile
@ -1,4 +1,4 @@
|
|||||||
VERSION ?= 18.1.1
|
VERSION ?= 18.2.0-rc2
|
||||||
SANITIZE ?= 1
|
SANITIZE ?= 1
|
||||||
|
|
||||||
DIRNAME = mesa-${VERSION}
|
DIRNAME = mesa-${VERSION}
|
||||||
|
201
mesa.spec
201
mesa.spec
@ -18,12 +18,17 @@
|
|||||||
%define platform_drivers ,i915,i965
|
%define platform_drivers ,i915,i965
|
||||||
%define with_vmware 1
|
%define with_vmware 1
|
||||||
%define with_xa 1
|
%define with_xa 1
|
||||||
%define with_vulkan 1
|
%define vulkan_drivers --with-vulkan-drivers=intel,radeon
|
||||||
|
%else
|
||||||
|
%ifnarch %{arm}
|
||||||
|
%define vulkan_drivers --with-vulkan-drivers=radeon
|
||||||
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%ifarch %{arm} aarch64
|
%ifarch %{arm} aarch64
|
||||||
%define with_etnaviv 1
|
%define with_etnaviv 1
|
||||||
%define with_freedreno 1
|
%define with_freedreno 1
|
||||||
|
%define with_tegra 1
|
||||||
%define with_vc4 1
|
%define with_vc4 1
|
||||||
%define with_xa 1
|
%define with_xa 1
|
||||||
%endif
|
%endif
|
||||||
@ -32,31 +37,20 @@
|
|||||||
%define with_radeonsi 1
|
%define with_radeonsi 1
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if 0%{?fedora} < 28
|
|
||||||
%define with_wayland_egl 1
|
|
||||||
%else
|
|
||||||
%define with_wayland_egl 0
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%define dri_drivers --with-dri-drivers=%{?base_drivers}%{?platform_drivers}
|
%define dri_drivers --with-dri-drivers=%{?base_drivers}%{?platform_drivers}
|
||||||
|
|
||||||
%if 0%{?with_vulkan}
|
%global sanitize 0
|
||||||
%define vulkan_drivers --with-vulkan-drivers=intel,radeon
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%global sanitize 1
|
|
||||||
|
|
||||||
#global rctag rc4
|
|
||||||
|
|
||||||
Name: mesa
|
Name: mesa
|
||||||
Summary: Mesa graphics libraries
|
Summary: Mesa graphics libraries
|
||||||
Version: 18.1.1
|
%global ver 18.2.0-rc2
|
||||||
Release: 2%{?rctag:.%{rctag}}%{?dist}
|
Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
|
||||||
|
Release: 1%{?dist}
|
||||||
License: MIT
|
License: MIT
|
||||||
URL: http://www.mesa3d.org
|
URL: http://www.mesa3d.org
|
||||||
#Source0: https://mesa.freedesktop.org/archive/%{name}-%{version}%{?rctag:-%{rctag}}.tar.xz
|
|
||||||
Source0: %{name}-%{version}%{?rctag:-%{rctag}}.tar.xz
|
#Source0: https://mesa.freedesktop.org/archive/%{name}-%{ver}.tar.xz
|
||||||
|
Source0: %{name}-%{ver}.tar.xz
|
||||||
Source1: vl_decoder.c
|
Source1: vl_decoder.c
|
||||||
Source2: vl_mpeg12_decoder.c
|
Source2: vl_mpeg12_decoder.c
|
||||||
Source3: Makefile
|
Source3: Makefile
|
||||||
@ -66,16 +60,13 @@ Source3: Makefile
|
|||||||
Source4: Mesa-MLAA-License-Clarification-Email.txt
|
Source4: Mesa-MLAA-License-Clarification-Email.txt
|
||||||
|
|
||||||
Patch1: 0001-llvm-SONAME-without-version.patch
|
Patch1: 0001-llvm-SONAME-without-version.patch
|
||||||
Patch2: 0002-hardware-gloat.patch
|
|
||||||
Patch3: 0003-evergreen-big-endian.patch
|
Patch3: 0003-evergreen-big-endian.patch
|
||||||
Patch4: 0004-bigendian-assert.patch
|
Patch4: 0004-bigendian-assert.patch
|
||||||
|
|
||||||
|
|
||||||
# Disable rgb10 configs by default:
|
# Disable rgb10 configs by default:
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1560481
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1560481
|
||||||
Patch7: 0001-gallium-Disable-rgb10-configs-by-default.patch
|
Patch7: 0001-gallium-Disable-rgb10-configs-by-default.patch
|
||||||
|
|
||||||
|
|
||||||
# glvnd support patches
|
# glvnd support patches
|
||||||
# non-upstreamed ones
|
# non-upstreamed ones
|
||||||
Patch10: glvnd-fix-gl-dot-pc.patch
|
Patch10: glvnd-fix-gl-dot-pc.patch
|
||||||
@ -95,6 +86,7 @@ BuildRequires: expat-devel
|
|||||||
BuildRequires: xorg-x11-proto-devel
|
BuildRequires: xorg-x11-proto-devel
|
||||||
BuildRequires: makedepend
|
BuildRequires: makedepend
|
||||||
BuildRequires: libselinux-devel
|
BuildRequires: libselinux-devel
|
||||||
|
BuildRequires: pkgconfig(xrandr)
|
||||||
BuildRequires: libXext-devel
|
BuildRequires: libXext-devel
|
||||||
BuildRequires: libXfixes-devel
|
BuildRequires: libXfixes-devel
|
||||||
BuildRequires: libXdamage-devel
|
BuildRequires: libXdamage-devel
|
||||||
@ -130,7 +122,7 @@ BuildRequires: libomxil-bellagio-devel
|
|||||||
%if 0%{?with_opencl}
|
%if 0%{?with_opencl}
|
||||||
BuildRequires: libclc-devel opencl-filesystem
|
BuildRequires: libclc-devel opencl-filesystem
|
||||||
%endif
|
%endif
|
||||||
%if 0%{?with_vulkan}
|
%if 0%{?with_hardware}
|
||||||
BuildRequires: vulkan-devel
|
BuildRequires: vulkan-devel
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: python3-mako
|
BuildRequires: python3-mako
|
||||||
@ -145,23 +137,23 @@ BuildRequires: pkgconfig(libglvnd) >= 0.2.0
|
|||||||
|
|
||||||
%package filesystem
|
%package filesystem
|
||||||
Summary: Mesa driver filesystem
|
Summary: Mesa driver filesystem
|
||||||
Provides: mesa-dri-filesystem = %{?epoch:%{epoch}}%{version}-%{release}
|
Provides: mesa-dri-filesystem = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
Obsoletes: mesa-dri-filesystem < %{?epoch:%{epoch}}%{version}-%{release}
|
Obsoletes: mesa-dri-filesystem < %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
|
|
||||||
%description filesystem
|
%description filesystem
|
||||||
%{summary}.
|
%{summary}.
|
||||||
|
|
||||||
%package libGL
|
%package libGL
|
||||||
Summary: Mesa libGL runtime libraries
|
Summary: Mesa libGL runtime libraries
|
||||||
Requires: %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}}%{version}-%{release}
|
Requires: %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
Requires: libglvnd-glx%{?_isa}
|
Requires: libglvnd-glx%{?_isa} >= 1:1.0.1-0.9
|
||||||
|
|
||||||
%description libGL
|
%description libGL
|
||||||
%{summary}.
|
%{summary}.
|
||||||
|
|
||||||
%package libGL-devel
|
%package libGL-devel
|
||||||
Summary: Mesa libGL development package
|
Summary: Mesa libGL development package
|
||||||
Requires: %{name}-libGL%{?_isa} = %{?epoch:%{epoch}}%{version}-%{release}
|
Requires: %{name}-libGL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
Requires: libglvnd-devel%{?_isa}
|
Requires: libglvnd-devel%{?_isa}
|
||||||
Provides: libGL-devel
|
Provides: libGL-devel
|
||||||
Provides: libGL-devel%{?_isa}
|
Provides: libGL-devel%{?_isa}
|
||||||
@ -178,7 +170,7 @@ Requires: libglvnd-egl%{?_isa}
|
|||||||
|
|
||||||
%package libEGL-devel
|
%package libEGL-devel
|
||||||
Summary: Mesa libEGL development package
|
Summary: Mesa libEGL development package
|
||||||
Requires: %{name}-libEGL%{?_isa} = %{?epoch:%{epoch}}%{version}-%{release}
|
Requires: %{name}-libEGL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
Requires: libglvnd-devel%{?_isa}
|
Requires: libglvnd-devel%{?_isa}
|
||||||
Provides: libEGL-devel
|
Provides: libEGL-devel
|
||||||
Provides: libEGL-devel%{?_isa}
|
Provides: libEGL-devel%{?_isa}
|
||||||
@ -188,7 +180,7 @@ Provides: libEGL-devel%{?_isa}
|
|||||||
|
|
||||||
%package libGLES
|
%package libGLES
|
||||||
Summary: Mesa libGLES runtime libraries
|
Summary: Mesa libGLES runtime libraries
|
||||||
Requires: %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}}%{version}-%{release}
|
Requires: %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
Requires: libglvnd-gles%{?_isa}
|
Requires: libglvnd-gles%{?_isa}
|
||||||
|
|
||||||
%description libGLES
|
%description libGLES
|
||||||
@ -196,7 +188,7 @@ Requires: libglvnd-gles%{?_isa}
|
|||||||
|
|
||||||
%package libGLES-devel
|
%package libGLES-devel
|
||||||
Summary: Mesa libGLES development package
|
Summary: Mesa libGLES development package
|
||||||
Requires: %{name}-libGLES%{?_isa} = %{?epoch:%{epoch}}%{version}-%{release}
|
Requires: %{name}-libGLES%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
Requires: libglvnd-devel%{?_isa}
|
Requires: libglvnd-devel%{?_isa}
|
||||||
Provides: libGLES-devel
|
Provides: libGLES-devel
|
||||||
Provides: libGLES-devel%{?_isa}
|
Provides: libGLES-devel%{?_isa}
|
||||||
@ -206,7 +198,7 @@ Provides: libGLES-devel%{?_isa}
|
|||||||
|
|
||||||
%package dri-drivers
|
%package dri-drivers
|
||||||
Summary: Mesa-based DRI drivers
|
Summary: Mesa-based DRI drivers
|
||||||
Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}}%{version}-%{release}
|
Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
|
|
||||||
%description dri-drivers
|
%description dri-drivers
|
||||||
%{summary}.
|
%{summary}.
|
||||||
@ -214,7 +206,7 @@ Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}}%{version}-%{rele
|
|||||||
%if 0%{?with_omx}
|
%if 0%{?with_omx}
|
||||||
%package omx-drivers
|
%package omx-drivers
|
||||||
Summary: Mesa-based OMX drivers
|
Summary: Mesa-based OMX drivers
|
||||||
Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}}%{version}-%{release}
|
Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
|
|
||||||
%description omx-drivers
|
%description omx-drivers
|
||||||
%{summary}.
|
%{summary}.
|
||||||
@ -223,7 +215,7 @@ Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}}%{version}-%{rele
|
|||||||
%if 0%{?with_vdpau}
|
%if 0%{?with_vdpau}
|
||||||
%package vdpau-drivers
|
%package vdpau-drivers
|
||||||
Summary: Mesa-based VDPAU drivers
|
Summary: Mesa-based VDPAU drivers
|
||||||
Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}}%{version}-%{release}
|
Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
|
|
||||||
%description vdpau-drivers
|
%description vdpau-drivers
|
||||||
%{summary}.
|
%{summary}.
|
||||||
@ -231,7 +223,7 @@ Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}}%{version}-%{rele
|
|||||||
|
|
||||||
%package libOSMesa
|
%package libOSMesa
|
||||||
Summary: Mesa offscreen rendering libraries
|
Summary: Mesa offscreen rendering libraries
|
||||||
Requires: %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}}%{version}-%{release}
|
Requires: %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
Provides: libOSMesa
|
Provides: libOSMesa
|
||||||
Provides: libOSMesa%{?_isa}
|
Provides: libOSMesa%{?_isa}
|
||||||
|
|
||||||
@ -240,7 +232,7 @@ Provides: libOSMesa%{?_isa}
|
|||||||
|
|
||||||
%package libOSMesa-devel
|
%package libOSMesa-devel
|
||||||
Summary: Mesa offscreen rendering development package
|
Summary: Mesa offscreen rendering development package
|
||||||
Requires: %{name}-libOSMesa%{?_isa} = %{?epoch:%{epoch}}%{version}-%{release}
|
Requires: %{name}-libOSMesa%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
|
|
||||||
%description libOSMesa-devel
|
%description libOSMesa-devel
|
||||||
%{summary}.
|
%{summary}.
|
||||||
@ -255,32 +247,13 @@ Provides: libgbm%{?_isa}
|
|||||||
|
|
||||||
%package libgbm-devel
|
%package libgbm-devel
|
||||||
Summary: Mesa libgbm development package
|
Summary: Mesa libgbm development package
|
||||||
Requires: %{name}-libgbm%{?_isa} = %{?epoch:%{epoch}}%{version}-%{release}
|
Requires: %{name}-libgbm%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
Provides: libgbm-devel
|
Provides: libgbm-devel
|
||||||
Provides: libgbm-devel%{?_isa}
|
Provides: libgbm-devel%{?_isa}
|
||||||
|
|
||||||
%description libgbm-devel
|
%description libgbm-devel
|
||||||
%{summary}.
|
%{summary}.
|
||||||
|
|
||||||
%if %{?with_wayland_egl}
|
|
||||||
%package libwayland-egl
|
|
||||||
Summary: Mesa libwayland-egl runtime library
|
|
||||||
Provides: libwayland-egl
|
|
||||||
Provides: libwayland-egl%{?_isa}
|
|
||||||
|
|
||||||
%description libwayland-egl
|
|
||||||
%{summary}.
|
|
||||||
|
|
||||||
%package libwayland-egl-devel
|
|
||||||
Summary: Mesa libwayland-egl development package
|
|
||||||
Requires: %{name}-libwayland-egl%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
|
||||||
Provides: libwayland-egl-devel
|
|
||||||
Provides: libwayland-egl-devel%{?_isa}
|
|
||||||
|
|
||||||
%description libwayland-egl-devel
|
|
||||||
%{summary}.
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if 0%{?with_xa}
|
%if 0%{?with_xa}
|
||||||
%package libxatracker
|
%package libxatracker
|
||||||
Summary: Mesa XA state tracker
|
Summary: Mesa XA state tracker
|
||||||
@ -313,7 +286,7 @@ Provides: libglapi%{?_isa}
|
|||||||
Summary: Mesa OpenCL runtime library
|
Summary: Mesa OpenCL runtime library
|
||||||
Requires: ocl-icd%{?_isa}
|
Requires: ocl-icd%{?_isa}
|
||||||
Requires: libclc%{?_isa}
|
Requires: libclc%{?_isa}
|
||||||
Requires: %{name}-libgbm%{?_isa} = %{?epoch:%{epoch}}%{version}-%{release}
|
Requires: %{name}-libgbm%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
Requires: opencl-filesystem
|
Requires: opencl-filesystem
|
||||||
|
|
||||||
%description libOpenCL
|
%description libOpenCL
|
||||||
@ -321,7 +294,7 @@ Requires: opencl-filesystem
|
|||||||
|
|
||||||
%package libOpenCL-devel
|
%package libOpenCL-devel
|
||||||
Summary: Mesa OpenCL development package
|
Summary: Mesa OpenCL development package
|
||||||
Requires: %{name}-libOpenCL%{?_isa} = %{?epoch:%{epoch}}%{version}-%{release}
|
Requires: %{name}-libOpenCL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
|
|
||||||
%description libOpenCL-devel
|
%description libOpenCL-devel
|
||||||
%{summary}.
|
%{summary}.
|
||||||
@ -336,13 +309,12 @@ Summary: Mesa Direct3D9 state tracker
|
|||||||
|
|
||||||
%package libd3d-devel
|
%package libd3d-devel
|
||||||
Summary: Mesa Direct3D9 state tracker development package
|
Summary: Mesa Direct3D9 state tracker development package
|
||||||
Requires: %{name}-libd3d%{?_isa} = %{?epoch:%{epoch}}%{version}-%{release}
|
Requires: %{name}-libd3d%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
|
|
||||||
%description libd3d-devel
|
%description libd3d-devel
|
||||||
%{summary}.
|
%{summary}.
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if 0%{?with_vulkan}
|
|
||||||
%package vulkan-drivers
|
%package vulkan-drivers
|
||||||
Summary: Mesa Vulkan drivers
|
Summary: Mesa Vulkan drivers
|
||||||
Requires: vulkan%{_isa}
|
Requires: vulkan%{_isa}
|
||||||
@ -352,18 +324,18 @@ The drivers with support for the Vulkan API.
|
|||||||
|
|
||||||
%package vulkan-devel
|
%package vulkan-devel
|
||||||
Summary: Mesa Vulkan development files
|
Summary: Mesa Vulkan development files
|
||||||
Requires: %{name}-vulkan-drivers%{?_isa} = %{?epoch:%{epoch}}%{version}-%{release}
|
Requires: %{name}-vulkan-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
Requires: vulkan-devel
|
Requires: vulkan-devel
|
||||||
|
|
||||||
%description vulkan-devel
|
%description vulkan-devel
|
||||||
Headers for development with the Vulkan API.
|
Headers for development with the Vulkan API.
|
||||||
%endif
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n %{name}-%{version}%{?rctag:-%{rctag}} -p1
|
%autosetup -n %{name}-%{ver} -p1
|
||||||
%if 0%{sanitize}
|
%if 0%{sanitize}
|
||||||
cp -f %{SOURCE1} src/gallium/auxiliary/vl/vl_decoder.c
|
cp -f %{SOURCE1} src/gallium/auxiliary/vl/vl_decoder.c
|
||||||
cp -f %{SOURCE2} src/gallium/auxiliary/vl/vl_mpeg12_decoder.c
|
cp -f %{SOURCE2} src/gallium/auxiliary/vl/vl_mpeg12_decoder.c
|
||||||
|
exit 0
|
||||||
%else
|
%else
|
||||||
cmp %{SOURCE1} src/gallium/auxiliary/vl/vl_decoder.c
|
cmp %{SOURCE1} src/gallium/auxiliary/vl/vl_decoder.c
|
||||||
cmp %{SOURCE2} src/gallium/auxiliary/vl/vl_mpeg12_decoder.c
|
cmp %{SOURCE2} src/gallium/auxiliary/vl/vl_mpeg12_decoder.c
|
||||||
@ -372,6 +344,10 @@ Headers for development with the Vulkan API.
|
|||||||
cp %{SOURCE4} docs/
|
cp %{SOURCE4} docs/
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
%if !0%{sanitize}
|
||||||
|
cmp %{SOURCE1} src/gallium/auxiliary/vl/vl_decoder.c
|
||||||
|
cmp %{SOURCE2} src/gallium/auxiliary/vl/vl_mpeg12_decoder.c
|
||||||
|
%endif
|
||||||
autoreconf -vfi
|
autoreconf -vfi
|
||||||
|
|
||||||
%ifarch %{ix86}
|
%ifarch %{ix86}
|
||||||
@ -398,7 +374,7 @@ autoreconf -vfi
|
|||||||
%{?with_opencl:--enable-opencl --enable-opencl-icd} %{!?with_opencl:--disable-opencl} \
|
%{?with_opencl:--enable-opencl --enable-opencl-icd} %{!?with_opencl:--disable-opencl} \
|
||||||
--enable-glx-tls \
|
--enable-glx-tls \
|
||||||
--enable-texture-float=yes \
|
--enable-texture-float=yes \
|
||||||
%if 0%{?with_vulkan}
|
%if 0%{?with_hardware}
|
||||||
%{?vulkan_drivers} \
|
%{?vulkan_drivers} \
|
||||||
%endif
|
%endif
|
||||||
--enable-llvm \
|
--enable-llvm \
|
||||||
@ -407,7 +383,7 @@ autoreconf -vfi
|
|||||||
%if %{with_hardware}
|
%if %{with_hardware}
|
||||||
%{?with_xa:--enable-xa} \
|
%{?with_xa:--enable-xa} \
|
||||||
%{?with_nine:--enable-nine} \
|
%{?with_nine:--enable-nine} \
|
||||||
--with-gallium-drivers=%{?with_vmware:svga,}%{?with_radeonsi:radeonsi,r600,}swrast,%{?with_freedreno:freedreno,}%{?with_etnaviv:etnaviv,imx,}%{?with_vc4:vc4,}virgl,r300,nouveau \
|
--with-gallium-drivers=%{?with_vmware:svga,}%{?with_radeonsi:radeonsi,r600,}swrast,%{?with_freedreno:freedreno,}%{?with_etnaviv:etnaviv,imx,}%{?with_tegra:tegra,}%{?with_vc4:vc4,}virgl,r300,nouveau \
|
||||||
%else
|
%else
|
||||||
--with-gallium-drivers=swrast,virgl \
|
--with-gallium-drivers=swrast,virgl \
|
||||||
%endif
|
%endif
|
||||||
@ -430,20 +406,15 @@ rm -f %{buildroot}%{_libdir}/libEGL_mesa.so
|
|||||||
# XXX can we just not build this
|
# XXX can we just not build this
|
||||||
rm -f %{buildroot}%{_libdir}/libGLES*
|
rm -f %{buildroot}%{_libdir}/libGLES*
|
||||||
|
|
||||||
# remove libwayland-egl on F28+ where it's built as part of wayland source package
|
|
||||||
%if !%{?with_wayland_egl}
|
|
||||||
rm -f %{buildroot}%{_libdir}/libwayland-egl.so*
|
|
||||||
rm -f %{buildroot}%{_libdir}/pkgconfig/wayland-egl.pc
|
|
||||||
%endif
|
|
||||||
|
|
||||||
# glvnd needs a default provider for indirect rendering where it cannot
|
# glvnd needs a default provider for indirect rendering where it cannot
|
||||||
# determine the vendor
|
# determine the vendor
|
||||||
ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_indirect.so.0
|
ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_system.so.0
|
||||||
|
|
||||||
# strip out useless headers
|
# strip out useless headers
|
||||||
rm -f %{buildroot}%{_includedir}/GL/w*.h
|
rm -f %{buildroot}%{_includedir}/GL/w*.h
|
||||||
|
|
||||||
# these are shipped already in vulkan-devel
|
# these are shipped already in vulkan-devel
|
||||||
|
mkdir -p %{buildroot}/%{_includedir}/vulkan/
|
||||||
rm -f %{buildroot}/%{_includedir}/vulkan/vk_platform.h
|
rm -f %{buildroot}/%{_includedir}/vulkan/vk_platform.h
|
||||||
rm -f %{buildroot}/%{_includedir}/vulkan/vulkan.h
|
rm -f %{buildroot}/%{_includedir}/vulkan/vulkan.h
|
||||||
|
|
||||||
@ -468,7 +439,7 @@ popd
|
|||||||
|
|
||||||
%files libGL
|
%files libGL
|
||||||
%{_libdir}/libGLX_mesa.so.0*
|
%{_libdir}/libGLX_mesa.so.0*
|
||||||
%{_libdir}/libGLX_indirect.so.0*
|
%{_libdir}/libGLX_system.so.0*
|
||||||
%files libGL-devel
|
%files libGL-devel
|
||||||
%{_includedir}/GL/gl.h
|
%{_includedir}/GL/gl.h
|
||||||
%{_includedir}/GL/gl_mangle.h
|
%{_includedir}/GL/gl_mangle.h
|
||||||
@ -512,14 +483,12 @@ popd
|
|||||||
%{_includedir}/GLES3/gl32.h
|
%{_includedir}/GLES3/gl32.h
|
||||||
%{_libdir}/pkgconfig/glesv2.pc
|
%{_libdir}/pkgconfig/glesv2.pc
|
||||||
|
|
||||||
%post libglapi -p /sbin/ldconfig
|
%ldconfig_scriptlets libglapi
|
||||||
%postun libglapi -p /sbin/ldconfig
|
|
||||||
%files libglapi
|
%files libglapi
|
||||||
%{_libdir}/libglapi.so.0
|
%{_libdir}/libglapi.so.0
|
||||||
%{_libdir}/libglapi.so.0.*
|
%{_libdir}/libglapi.so.0.*
|
||||||
|
|
||||||
%post libOSMesa -p /sbin/ldconfig
|
%ldconfig_scriptlets libOSMesa
|
||||||
%postun libOSMesa -p /sbin/ldconfig
|
|
||||||
%files libOSMesa
|
%files libOSMesa
|
||||||
%{_libdir}/libOSMesa.so.8*
|
%{_libdir}/libOSMesa.so.8*
|
||||||
%files libOSMesa-devel
|
%files libOSMesa-devel
|
||||||
@ -528,8 +497,7 @@ popd
|
|||||||
%{_libdir}/libOSMesa.so
|
%{_libdir}/libOSMesa.so
|
||||||
%{_libdir}/pkgconfig/osmesa.pc
|
%{_libdir}/pkgconfig/osmesa.pc
|
||||||
|
|
||||||
%post libgbm -p /sbin/ldconfig
|
%ldconfig_scriptlets libgbm
|
||||||
%postun libgbm -p /sbin/ldconfig
|
|
||||||
%files libgbm
|
%files libgbm
|
||||||
%{_libdir}/libgbm.so.1
|
%{_libdir}/libgbm.so.1
|
||||||
%{_libdir}/libgbm.so.1.*
|
%{_libdir}/libgbm.so.1.*
|
||||||
@ -538,20 +506,8 @@ popd
|
|||||||
%{_includedir}/gbm.h
|
%{_includedir}/gbm.h
|
||||||
%{_libdir}/pkgconfig/gbm.pc
|
%{_libdir}/pkgconfig/gbm.pc
|
||||||
|
|
||||||
%if %{?with_wayland_egl}
|
|
||||||
%post libwayland-egl -p /sbin/ldconfig
|
|
||||||
%postun libwayland-egl -p /sbin/ldconfig
|
|
||||||
%files libwayland-egl
|
|
||||||
%{_libdir}/libwayland-egl.so.1
|
|
||||||
%{_libdir}/libwayland-egl.so.1.*
|
|
||||||
%files libwayland-egl-devel
|
|
||||||
%{_libdir}/libwayland-egl.so
|
|
||||||
%{_libdir}/pkgconfig/wayland-egl.pc
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if 0%{?with_xa}
|
%if 0%{?with_xa}
|
||||||
%post libxatracker -p /sbin/ldconfig
|
%ldconfig_scriptlets libxatracker
|
||||||
%postun libxatracker -p /sbin/ldconfig
|
|
||||||
%files libxatracker
|
%files libxatracker
|
||||||
%if %{with_hardware}
|
%if %{with_hardware}
|
||||||
%{_libdir}/libxatracker.so.2
|
%{_libdir}/libxatracker.so.2
|
||||||
@ -569,8 +525,7 @@ popd
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if 0%{?with_opencl}
|
%if 0%{?with_opencl}
|
||||||
%post libOpenCL -p /sbin/ldconfig
|
%ldconfig_scriptlets libOpenCL
|
||||||
%postun libOpenCL -p /sbin/ldconfig
|
|
||||||
%files libOpenCL
|
%files libOpenCL
|
||||||
%{_libdir}/libMesaOpenCL.so.*
|
%{_libdir}/libMesaOpenCL.so.*
|
||||||
%{_sysconfdir}/OpenCL/vendors/mesa.icd
|
%{_sysconfdir}/OpenCL/vendors/mesa.icd
|
||||||
@ -615,6 +570,9 @@ popd
|
|||||||
%{_libdir}/dri/etnaviv_dri.so
|
%{_libdir}/dri/etnaviv_dri.so
|
||||||
%{_libdir}/dri/imx-drm_dri.so
|
%{_libdir}/dri/imx-drm_dri.so
|
||||||
%endif
|
%endif
|
||||||
|
%if 0%{?with_tegra}
|
||||||
|
%{_libdir}/dri/tegra_dri.so
|
||||||
|
%endif
|
||||||
%{_libdir}/dri/nouveau_dri.so
|
%{_libdir}/dri/nouveau_dri.so
|
||||||
%if 0%{?with_vmware}
|
%if 0%{?with_vmware}
|
||||||
%{_libdir}/dri/vmwgfx_dri.so
|
%{_libdir}/dri/vmwgfx_dri.so
|
||||||
@ -646,26 +604,65 @@ popd
|
|||||||
%{_libdir}/vdpau/libvdpau_r600.so.1*
|
%{_libdir}/vdpau/libvdpau_r600.so.1*
|
||||||
%{_libdir}/vdpau/libvdpau_radeonsi.so.1*
|
%{_libdir}/vdpau/libvdpau_radeonsi.so.1*
|
||||||
%endif
|
%endif
|
||||||
|
%if 0%{?with_tegra}
|
||||||
|
%{_libdir}/vdpau/libvdpau_tegra.so.1*
|
||||||
|
%endif
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if 0%{?with_vulkan}
|
|
||||||
%files vulkan-drivers
|
%files vulkan-drivers
|
||||||
|
%if 0%{?with_hardware}
|
||||||
|
%ifarch %{ix86} x86_64
|
||||||
%{_libdir}/libvulkan_intel.so
|
%{_libdir}/libvulkan_intel.so
|
||||||
|
%{_datadir}/vulkan/icd.d/intel_icd.*.json
|
||||||
|
%endif
|
||||||
|
%ifnarch %{arm}
|
||||||
%{_libdir}/libvulkan_radeon.so
|
%{_libdir}/libvulkan_radeon.so
|
||||||
%ifarch x86_64
|
%{_datadir}/vulkan/icd.d/radeon_icd.*.json
|
||||||
%{_datadir}/vulkan/icd.d/intel_icd.x86_64.json
|
%endif
|
||||||
%{_datadir}/vulkan/icd.d/radeon_icd.x86_64.json
|
|
||||||
%else
|
|
||||||
%{_datadir}/vulkan/icd.d/intel_icd.i686.json
|
|
||||||
%{_datadir}/vulkan/icd.d/radeon_icd.i686.json
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%files vulkan-devel
|
%files vulkan-devel
|
||||||
%{_includedir}/vulkan/
|
%{_includedir}/vulkan/
|
||||||
%endif
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Aug 11 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 18.2.0~rc2-1
|
||||||
|
- Update to 18.2.0~rc2
|
||||||
|
|
||||||
|
* Mon Jul 30 2018 Peter Robinson <pbrobinson@fedoraproject.org> 18.1.5-1
|
||||||
|
- Mesa 18.1.5
|
||||||
|
|
||||||
|
* Tue Jul 24 2018 Dave Airlie <airlied@redhat.com> - 18.1.4-2
|
||||||
|
- fix fallback path for glvnd
|
||||||
|
|
||||||
|
* Tue Jul 17 2018 Peter Robinson <pbrobinson@fedoraproject.org> 18.1.4-1
|
||||||
|
- Mesa 18.1.4
|
||||||
|
|
||||||
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 18.1.3-2.1
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jul 06 2018 Adam Jackson <ajax@redhat.com> - 18.1.3-2
|
||||||
|
- Drop texture float patch
|
||||||
|
|
||||||
|
* Sun Jul 1 2018 Peter Robinson <pbrobinson@fedoraproject.org> 18.1.3-1
|
||||||
|
- Mesa 18.1.3
|
||||||
|
|
||||||
|
* Fri Jun 29 2018 Adam Jackson <ajax@redhat.com> - 18.1.2-3
|
||||||
|
- Use ldconfig scriptlet macros
|
||||||
|
|
||||||
|
* Mon Jun 18 2018 Adam Jackson <ajax@redhat.com> - 18.1.2-2
|
||||||
|
- Build mesa-vulkan-drivers everywhere
|
||||||
|
- Build actual vulkan drivers on all but s390x
|
||||||
|
|
||||||
|
* Sat Jun 16 2018 Peter Robinson <pbrobinson@fedoraproject.org> 18.1.2-1
|
||||||
|
- Mesa 18.1.2
|
||||||
|
|
||||||
|
* Fri Jun 15 2018 Adam Jackson <ajax@redhat.com> - 18.1.1-4
|
||||||
|
- Build tegra too
|
||||||
|
|
||||||
|
* Thu Jun 14 2018 Adam Jackson <ajax@redhat.com> - 18.1.1-3
|
||||||
|
- Change the name of the fallback GLX library
|
||||||
|
|
||||||
* Tue Jun 05 2018 Adam Jackson <ajax@redhat.com> - 18.1.1-2
|
* Tue Jun 05 2018 Adam Jackson <ajax@redhat.com> - 18.1.1-2
|
||||||
- Stop mentioning ppc and s390, we don't build for them anymore
|
- Stop mentioning ppc and s390, we don't build for them anymore
|
||||||
- Remove with_llvm, now always true
|
- Remove with_llvm, now always true
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (mesa-18.1.1.tar.xz) = 49c0de225ad262e459f6333bff50822ca7c2efc1c7400e6e01b6071b2a83460055383b47f69447c9cb1d6c75a8f3638cb4eb2ad0be6862b68aedb25972647da4
|
SHA512 (mesa-18.2.0-rc2.tar.xz) = 4210cb26c94ae4a070b3effa895ead78c65d28094fe100f930cde02324f22075482620a59152694f69a98ce3b4dd984b6af6f60638a9e51c0df7b7c967d1f0eb
|
||||||
|
Loading…
Reference in New Issue
Block a user