Merge remote-tracking branch 'up/master' into master-riscv64
Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
This commit is contained in:
commit
9fdce2151a
3
.gitignore
vendored
3
.gitignore
vendored
@ -3,3 +3,6 @@
|
||||
.build*
|
||||
/mesa-*.tar.bz2
|
||||
/mesa-*.tar.xz
|
||||
x86_64/
|
||||
results_mesa/
|
||||
mesa-*/
|
||||
|
@ -1,26 +0,0 @@
|
||||
From c2b4d93a5e4796ca53361c61d7e31edc24241932 Mon Sep 17 00:00:00 2001
|
||||
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
|
||||
Date: Sun, 20 Mar 2016 13:26:25 +0100
|
||||
Subject: [PATCH 1/4] llvm SONAME without version
|
||||
|
||||
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 5f75c60..d77f907 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2645,7 +2645,7 @@
|
||||
dnl ourselves.
|
||||
dnl (See https://llvm.org/bugs/show_bug.cgi?id=6823)
|
||||
dnl We can't use $LLVM_VERSION because it has 'svn' stripped out,
|
||||
- LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version`
|
||||
+ LLVM_SO_NAME=LLVM
|
||||
AS_IF([test -f "$LLVM_LIBDIR/lib$LLVM_SO_NAME.$IMP_LIB_EXT"], [llvm_have_one_so=yes])
|
||||
|
||||
if test "x$llvm_have_one_so" = xyes; then
|
||||
--
|
||||
2.7.4
|
||||
|
@ -1,27 +0,0 @@
|
||||
From 6ccae713acc457d7df6ab15e124a7d77c5093213 Mon Sep 17 00:00:00 2001
|
||||
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
|
||||
Date: Sun, 20 Mar 2016 13:28:07 +0100
|
||||
Subject: [PATCH 4/4] bigendian assert
|
||||
|
||||
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
|
||||
---
|
||||
src/gallium/auxiliary/util/u_math.h | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/src/gallium/auxiliary/util/u_math.h b/src/gallium/auxiliary/util/u_math.h
|
||||
index ecb1d63..90ada14 100644
|
||||
--- a/src/gallium/auxiliary/util/u_math.h
|
||||
+++ b/src/gallium/auxiliary/util/u_math.h
|
||||
@@ -59,6 +59,9 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
+#ifdef PIPE_ARCH_BIG_ENDIAN
|
||||
+#include <assert.h>
|
||||
+#endif
|
||||
|
||||
#ifndef M_SQRT2
|
||||
#define M_SQRT2 1.41421356237309504880
|
||||
--
|
||||
2.7.4
|
||||
|
23
Makefile
23
Makefile
@ -1,23 +0,0 @@
|
||||
VERSION ?= 18.2.0-rc2
|
||||
SANITIZE ?= 1
|
||||
|
||||
DIRNAME = mesa-${VERSION}
|
||||
|
||||
all: archive
|
||||
|
||||
clean:
|
||||
rm -rf $(DIRNAME)/
|
||||
rm -f mesa-${VERSION}.tar.xz
|
||||
|
||||
clone: clean
|
||||
curl -O https://mesa.freedesktop.org/archive/mesa-${VERSION}.tar.xz
|
||||
tar xf mesa-${VERSION}.tar.xz
|
||||
|
||||
sanitize: clone vl_mpeg12_decoder.c vl_decoder.c
|
||||
ifdef SANITIZE
|
||||
cat < vl_mpeg12_decoder.c > $(DIRNAME)/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c
|
||||
cat < vl_decoder.c > $(DIRNAME)/src/gallium/auxiliary/vl/vl_decoder.c
|
||||
endif
|
||||
|
||||
archive: clone sanitize
|
||||
tar caf ${DIRNAME}.tar.xz ${DIRNAME}
|
11
egl.pc
Normal file
11
egl.pc
Normal file
@ -0,0 +1,11 @@
|
||||
prefix=/usr
|
||||
libdir=${prefix}/lib64
|
||||
includedir=${prefix}/include
|
||||
|
||||
Name: egl
|
||||
Description: Mesa EGL Library
|
||||
Version: 19.2.0
|
||||
Requires.private: x11, xext, xdamage >= 1.1, xfixes, x11-xcb, xcb, xcb-glx >= 1.8.1, xcb-dri2 >= 1.8, xxf86vm, libdrm >= 2.4.75
|
||||
Libs: -L${libdir} -lEGL
|
||||
Libs.private: -lpthread -pthread -lm -ldl
|
||||
Cflags: -I${includedir}
|
10
glesv2.pc
Normal file
10
glesv2.pc
Normal file
@ -0,0 +1,10 @@
|
||||
prefix=/usr
|
||||
libdir=${prefix}/lib64
|
||||
includedir=${prefix}/include
|
||||
|
||||
Name: glesv2
|
||||
Description: Mesa OpenGL ES 2.0 library
|
||||
Version: 19.1.0
|
||||
Libs: -L${libdir} -lGLESv2
|
||||
Libs.private: -lpthread -pthread -lm -ldl
|
||||
Cflags: -I${includedir}
|
@ -1,12 +0,0 @@
|
||||
diff -up mesa-12.0.3/src/mesa/gl.pc.in.jx mesa-12.0.3/src/mesa/gl.pc.in
|
||||
--- mesa-12.0.3/src/mesa/gl.pc.in.jx 2016-01-18 02:39:26.000000000 -0500
|
||||
+++ mesa-12.0.3/src/mesa/gl.pc.in 2016-10-25 13:06:44.013159358 -0400
|
||||
@@ -7,7 +7,7 @@ Name: gl
|
||||
Description: Mesa OpenGL library
|
||||
Requires.private: @GL_PC_REQ_PRIV@
|
||||
Version: @PACKAGE_VERSION@
|
||||
-Libs: -L${libdir} -l@GL_LIB@
|
||||
+Libs: -L${libdir} -lGL
|
||||
Libs.private: @GL_PC_LIB_PRIV@
|
||||
Cflags: -I${includedir} @GL_PC_CFLAGS@
|
||||
glx_tls: @GLX_TLS@
|
527
mesa.spec
527
mesa.spec
@ -1,136 +1,148 @@
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1546714
|
||||
%undefine _annotated_build
|
||||
|
||||
%ifarch s390x
|
||||
%define with_hardware 0
|
||||
%define base_drivers swrast
|
||||
%else
|
||||
%define with_hardware 1
|
||||
%define with_vdpau 1
|
||||
%define with_vaapi 1
|
||||
%define with_nine 1
|
||||
%define with_omx 1
|
||||
%ifnarch riscv64
|
||||
%define with_opencl 1
|
||||
%endif
|
||||
%define base_drivers swrast,nouveau,radeon,r200
|
||||
%ifnarch s390x
|
||||
%global with_hardware 1
|
||||
%global with_vdpau 1
|
||||
%global with_vaapi 1
|
||||
%global with_nine 1
|
||||
%global with_omx 1
|
||||
%global with_opencl 1
|
||||
%global base_drivers nouveau,r100,r200
|
||||
%endif
|
||||
|
||||
%ifarch %{ix86} x86_64
|
||||
%define platform_drivers ,i915,i965
|
||||
%define with_vmware 1
|
||||
%define with_xa 1
|
||||
%define vulkan_drivers --with-vulkan-drivers=intel,radeon
|
||||
%global platform_drivers ,i915,i965
|
||||
%global with_vmware 1
|
||||
%global with_xa 1
|
||||
%global vulkan_drivers intel,amd
|
||||
%else
|
||||
%define vulkan_drivers --with-vulkan-drivers=radeon
|
||||
%ifnarch s390x
|
||||
%global vulkan_drivers amd
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%ifarch %{arm} aarch64
|
||||
%define with_etnaviv 1
|
||||
%define with_freedreno 1
|
||||
%define with_tegra 1
|
||||
%define with_vc4 1
|
||||
%define with_xa 1
|
||||
%global with_etnaviv 1
|
||||
%global with_freedreno 1
|
||||
%global with_kmsro 1
|
||||
%global with_lima 1
|
||||
%global with_panfrost 1
|
||||
%global with_tegra 1
|
||||
%global with_vc4 1
|
||||
%global with_v3d 1
|
||||
%global with_xa 1
|
||||
%endif
|
||||
|
||||
%ifnarch %{arm} s390x
|
||||
%define with_radeonsi 1
|
||||
%global with_radeonsi 1
|
||||
%endif
|
||||
|
||||
%define dri_drivers --with-dri-drivers=%{?base_drivers}%{?platform_drivers}
|
||||
%ifnarch %{x86}
|
||||
%global with_asm 1
|
||||
%endif
|
||||
|
||||
%global sanitize 0
|
||||
%ifarch %{valgrind_arches}
|
||||
%bcond_without valgrind
|
||||
%else
|
||||
%bcond_with valgrind
|
||||
%endif
|
||||
|
||||
%global dri_drivers %{?base_drivers}%{?platform_drivers}
|
||||
|
||||
Name: mesa
|
||||
Summary: Mesa graphics libraries
|
||||
%global ver 18.2.0-rc2
|
||||
%global ver 19.2.0-rc1
|
||||
Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
|
||||
Release: 1.0.riscv64%{?dist}
|
||||
Release: 2%{?dist}
|
||||
License: MIT
|
||||
URL: http://www.mesa3d.org
|
||||
|
||||
#Source0: https://mesa.freedesktop.org/archive/%{name}-%{ver}.tar.xz
|
||||
Source0: %{name}-%{ver}.tar.xz
|
||||
Source1: vl_decoder.c
|
||||
Source2: vl_mpeg12_decoder.c
|
||||
Source3: Makefile
|
||||
Source0: https://mesa.freedesktop.org/archive/%{name}-%{ver}.tar.xz
|
||||
# src/gallium/auxiliary/postprocess/pp_mlaa* have an ... interestingly worded license.
|
||||
# Source4 contains email correspondence clarifying the license terms.
|
||||
# Source1 contains email correspondence clarifying the license terms.
|
||||
# Fedora opts to ignore the optional part of clause 2 and treat that code as 2 clause BSD.
|
||||
Source4: Mesa-MLAA-License-Clarification-Email.txt
|
||||
Source1: Mesa-MLAA-License-Clarification-Email.txt
|
||||
Source2: glesv2.pc
|
||||
Source3: egl.pc
|
||||
|
||||
Patch1: 0001-llvm-SONAME-without-version.patch
|
||||
Patch3: 0003-evergreen-big-endian.patch
|
||||
Patch4: 0004-bigendian-assert.patch
|
||||
|
||||
# Disable rgb10 configs by default:
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1560481
|
||||
Patch7: 0001-gallium-Disable-rgb10-configs-by-default.patch
|
||||
|
||||
# glvnd support patches
|
||||
# non-upstreamed ones
|
||||
Patch10: glvnd-fix-gl-dot-pc.patch
|
||||
|
||||
BuildRequires: meson >= 0.45
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: automake
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: libtool
|
||||
BuildRequires: gettext
|
||||
|
||||
%if %{with_hardware}
|
||||
%if 0%{?with_hardware}
|
||||
BuildRequires: kernel-headers
|
||||
%endif
|
||||
BuildRequires: libdrm-devel >= 2.4.42
|
||||
BuildRequires: libXxf86vm-devel
|
||||
BuildRequires: expat-devel
|
||||
BuildRequires: xorg-x11-proto-devel
|
||||
BuildRequires: makedepend
|
||||
BuildRequires: libselinux-devel
|
||||
BuildRequires: pkgconfig(xrandr)
|
||||
BuildRequires: libXext-devel
|
||||
BuildRequires: libXfixes-devel
|
||||
BuildRequires: libXdamage-devel
|
||||
BuildRequires: libXi-devel
|
||||
BuildRequires: libXmu-devel
|
||||
BuildRequires: libxshmfence-devel
|
||||
BuildRequires: elfutils
|
||||
BuildRequires: python3
|
||||
BuildRequires: python2
|
||||
BuildRequires: gettext
|
||||
BuildRequires: llvm-devel >= 3.4-7
|
||||
%if 0%{?with_opencl}
|
||||
BuildRequires: clang-devel >= 3.0
|
||||
%ifarch %{ix86} x86_64
|
||||
BuildRequires: pkgconfig(libdrm_intel) >= 2.4.75
|
||||
%endif
|
||||
BuildRequires: elfutils-libelf-devel
|
||||
BuildRequires: python3-libxml2
|
||||
BuildRequires: python2-libxml2
|
||||
BuildRequires: libudev-devel
|
||||
BuildRequires: bison flex
|
||||
BuildRequires: pkgconfig(wayland-client)
|
||||
BuildRequires: pkgconfig(wayland-server)
|
||||
BuildRequires: pkgconfig(wayland-protocols)
|
||||
%if 0%{?with_radeonsi}
|
||||
BuildRequires: pkgconfig(libdrm_amdgpu) >= 2.4.97
|
||||
%endif
|
||||
BuildRequires: pkgconfig(libdrm_radeon) >= 2.4.71
|
||||
BuildRequires: pkgconfig(libdrm_nouveau) >= 2.4.66
|
||||
%if 0%{?with_etnaviv}
|
||||
BuildRequires: pkgconfig(libdrm_etnaviv) >= 2.4.89
|
||||
%endif
|
||||
%if 0%{?with_vc4}
|
||||
BuildRequires: pkgconfig(libdrm) >= 2.4.89
|
||||
%endif
|
||||
BuildRequires: pkgconfig(expat)
|
||||
BuildRequires: pkgconfig(zlib) >= 1.2.3
|
||||
BuildRequires: pkgconfig(libselinux)
|
||||
BuildRequires: pkgconfig(wayland-scanner)
|
||||
BuildRequires: pkgconfig(wayland-protocols) >= 1.8
|
||||
BuildRequires: pkgconfig(wayland-client) >= 1.11
|
||||
BuildRequires: pkgconfig(wayland-server) >= 1.11
|
||||
BuildRequires: pkgconfig(wayland-egl-backend) >= 3
|
||||
BuildRequires: pkgconfig(x11)
|
||||
BuildRequires: pkgconfig(xext)
|
||||
BuildRequires: pkgconfig(xdamage) >= 1.1
|
||||
BuildRequires: pkgconfig(xfixes)
|
||||
BuildRequires: pkgconfig(xcb-glx) >= 1.8.1
|
||||
BuildRequires: pkgconfig(xxf86vm)
|
||||
BuildRequires: pkgconfig(xcb)
|
||||
BuildRequires: pkgconfig(x11-xcb)
|
||||
BuildRequires: pkgconfig(xcb-dri2) >= 1.8
|
||||
BuildRequires: pkgconfig(xcb-dri3)
|
||||
BuildRequires: pkgconfig(xcb-present)
|
||||
BuildRequires: pkgconfig(xcb-sync)
|
||||
BuildRequires: pkgconfig(xshmfence) >= 1.1
|
||||
BuildRequires: pkgconfig(dri2proto) >= 2.8
|
||||
BuildRequires: pkgconfig(glproto) >= 1.4.14
|
||||
BuildRequires: pkgconfig(xcb-xfixes)
|
||||
BuildRequires: pkgconfig(xcb-randr)
|
||||
BuildRequires: pkgconfig(xrandr) >= 1.3
|
||||
BuildRequires: bison
|
||||
BuildRequires: flex
|
||||
%if 0%{?with_vdpau}
|
||||
BuildRequires: libvdpau-devel
|
||||
BuildRequires: pkgconfig(vdpau) >= 1.1
|
||||
%endif
|
||||
%if 0%{?with_vaapi}
|
||||
BuildRequires: libva-devel >= 0.39.0
|
||||
BuildRequires: pkgconfig(libva) >= 0.38.0
|
||||
%endif
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
%if 0%{?with_omx}
|
||||
BuildRequires: libomxil-bellagio-devel
|
||||
BuildRequires: pkgconfig(libomxil-bellagio)
|
||||
%endif
|
||||
BuildRequires: pkgconfig(libelf)
|
||||
BuildRequires: pkgconfig(libglvnd) >= 0.2.0
|
||||
BuildRequires: llvm-devel >= 7.0.0
|
||||
%if 0%{?with_opencl}
|
||||
BuildRequires: libclc-devel opencl-filesystem
|
||||
BuildRequires: clang-devel
|
||||
BuildRequires: pkgconfig(libclc)
|
||||
%endif
|
||||
%if %{with valgrind}
|
||||
BuildRequires: pkgconfig(valgrind)
|
||||
%endif
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-mako
|
||||
%if 0%{?with_hardware}
|
||||
BuildRequires: vulkan-devel
|
||||
BuildRequires: vulkan-devel
|
||||
%endif
|
||||
BuildRequires: python3-mako
|
||||
BuildRequires: python2-mako
|
||||
%ifarch %{valgrind_arches}
|
||||
BuildRequires: pkgconfig(valgrind)
|
||||
%endif
|
||||
BuildRequires: pkgconfig(libglvnd) >= 0.2.0
|
||||
|
||||
%description
|
||||
%{summary}.
|
||||
@ -143,6 +155,12 @@ Obsoletes: mesa-dri-filesystem < %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
%description filesystem
|
||||
%{summary}.
|
||||
|
||||
%package khr-devel
|
||||
Summary: Mesa Khronos development headers
|
||||
|
||||
%description khr-devel
|
||||
%{summary}.
|
||||
|
||||
%package libGL
|
||||
Summary: Mesa libGL runtime libraries
|
||||
Requires: %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
@ -155,6 +173,7 @@ Requires: libglvnd-glx%{?_isa} >= 1:1.0.1-0.9
|
||||
Summary: Mesa libGL development package
|
||||
Requires: %{name}-libGL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Requires: libglvnd-devel%{?_isa}
|
||||
Requires: %{name}-khr-devel%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Provides: libGL-devel
|
||||
Provides: libGL-devel%{?_isa}
|
||||
|
||||
@ -172,6 +191,7 @@ Requires: libglvnd-egl%{?_isa}
|
||||
Summary: Mesa libEGL development package
|
||||
Requires: %{name}-libEGL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Requires: libglvnd-devel%{?_isa}
|
||||
Requires: %{name}-khr-devel%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Provides: libEGL-devel
|
||||
Provides: libEGL-devel%{?_isa}
|
||||
|
||||
@ -190,6 +210,7 @@ Requires: libglvnd-gles%{?_isa}
|
||||
Summary: Mesa libGLES development package
|
||||
Requires: %{name}-libGLES%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Requires: libglvnd-devel%{?_isa}
|
||||
Requires: %{name}-khr-devel%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Provides: libGLES-devel
|
||||
Provides: libGLES-devel%{?_isa}
|
||||
|
||||
@ -332,95 +353,66 @@ Headers for development with the Vulkan API.
|
||||
|
||||
%prep
|
||||
%autosetup -n %{name}-%{ver} -p1
|
||||
%if 0%{sanitize}
|
||||
cp -f %{SOURCE1} src/gallium/auxiliary/vl/vl_decoder.c
|
||||
cp -f %{SOURCE2} src/gallium/auxiliary/vl/vl_mpeg12_decoder.c
|
||||
exit 0
|
||||
%else
|
||||
cmp %{SOURCE1} src/gallium/auxiliary/vl/vl_decoder.c
|
||||
cmp %{SOURCE2} src/gallium/auxiliary/vl/vl_mpeg12_decoder.c
|
||||
%endif
|
||||
|
||||
cp %{SOURCE4} docs/
|
||||
cp %{SOURCE1} docs/
|
||||
cp %{SOURCE2} .
|
||||
cp %{SOURCE3} .
|
||||
|
||||
%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
|
||||
|
||||
%ifarch %{ix86}
|
||||
# i do not have words for how much the assembly dispatch code infuriates me
|
||||
%global asm_flags --disable-asm
|
||||
%endif
|
||||
|
||||
%configure \
|
||||
%{?asm_flags} \
|
||||
--enable-libglvnd \
|
||||
--enable-selinux \
|
||||
--enable-gallium-osmesa \
|
||||
--with-dri-driverdir=%{_libdir}/dri \
|
||||
--enable-egl \
|
||||
--disable-gles1 \
|
||||
--enable-gles2 \
|
||||
--disable-xvmc \
|
||||
%{?with_vdpau:--enable-vdpau} \
|
||||
%{?with_vaapi:--enable-va} \
|
||||
--with-platforms=x11,drm,surfaceless,wayland \
|
||||
--enable-shared-glapi \
|
||||
--enable-gbm \
|
||||
%{?with_omx:--enable-omx-bellagio} \
|
||||
%{?with_opencl:--enable-opencl --enable-opencl-icd} %{!?with_opencl:--disable-opencl} \
|
||||
--enable-glx-tls \
|
||||
--enable-texture-float=yes \
|
||||
%meson -Dcpp_std=gnu++11 \
|
||||
-Dplatforms=x11,wayland,drm,surfaceless \
|
||||
-Ddri3=true \
|
||||
-Ddri-drivers=%{?dri_drivers} \
|
||||
%if 0%{?with_hardware}
|
||||
%{?vulkan_drivers} \
|
||||
%endif
|
||||
--enable-llvm \
|
||||
--enable-llvm-shared-libs \
|
||||
--enable-dri \
|
||||
%if %{with_hardware}
|
||||
%{?with_xa:--enable-xa} \
|
||||
%{?with_nine:--enable-nine} \
|
||||
--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 \
|
||||
-Dgallium-drivers=swrast,virgl,r300,nouveau%{?with_vmware:,svga}%{?with_radeonsi:,radeonsi,r600}%{?with_freedreno:,freedreno}%{?with_etnaviv:,etnaviv}%{?with_tegra:,tegra}%{?with_vc4:,vc4}%{?with_v3d:,v3d}%{?with_kmsro:,kmsro}%{?with_lima:,lima}%{?with_panfrost:,panfrost} \
|
||||
%else
|
||||
--with-gallium-drivers=swrast,virgl \
|
||||
-Dgallium-drivers=swrast,virgl \
|
||||
%endif
|
||||
%{?dri_drivers}
|
||||
|
||||
%make_build MKDEP=/bin/true V=1
|
||||
-Dgallium-vdpau=%{?with_vdpau:true}%{!?with_vdpau:false} \
|
||||
-Dgallium-xvmc=false \
|
||||
-Dgallium-omx=%{?with_omx:bellagio}%{!?with_omx:disabled} \
|
||||
-Dgallium-va=%{?with_vaapi:true}%{!?with_vaapi:false} \
|
||||
-Dgallium-xa=%{?with_xa:true}%{!?with_xa:false} \
|
||||
-Dgallium-nine=%{?with_nine:true}%{!?with_nine:false} \
|
||||
-Dgallium-opencl=%{?with_opencl:icd}%{!?with_opencl:disabled} \
|
||||
-Dvulkan-drivers=%{?vulkan_drivers} \
|
||||
-Dshared-glapi=true \
|
||||
-Dgles1=false \
|
||||
-Dgles2=true \
|
||||
-Dopengl=true \
|
||||
-Dgbm=true \
|
||||
-Dglx=dri \
|
||||
-Degl=true \
|
||||
-Dglvnd=true \
|
||||
-Dasm=%{?with_asm:true}%{!?with_asm:false} \
|
||||
-Dllvm=true \
|
||||
-Dshared-llvm=true \
|
||||
-Dvalgrind=%{?with_valgrind:true}%{!?with_valgrind:false} \
|
||||
-Dbuild-tests=false \
|
||||
-Dselinux=true \
|
||||
-Dosmesa=gallium \
|
||||
%{nil}
|
||||
%meson_build
|
||||
|
||||
%install
|
||||
%make_install
|
||||
%meson_install
|
||||
|
||||
%if !%{with_hardware}
|
||||
rm -f %{buildroot}%{_sysconfdir}/drirc
|
||||
%endif
|
||||
install glesv2.pc %{buildroot}%{_libdir}/pkgconfig/
|
||||
|
||||
install egl.pc %{buildroot}%{_libdir}/pkgconfig/
|
||||
|
||||
# libvdpau opens the versioned name, don't bother including the unversioned
|
||||
rm -f %{buildroot}%{_libdir}/vdpau/*.so
|
||||
rm -vf %{buildroot}%{_libdir}/vdpau/*.so
|
||||
# likewise glvnd
|
||||
rm -f %{buildroot}%{_libdir}/libGLX_mesa.so
|
||||
rm -f %{buildroot}%{_libdir}/libEGL_mesa.so
|
||||
rm -vf %{buildroot}%{_libdir}/libGLX_mesa.so
|
||||
rm -vf %{buildroot}%{_libdir}/libEGL_mesa.so
|
||||
# XXX can we just not build this
|
||||
rm -f %{buildroot}%{_libdir}/libGLES*
|
||||
rm -vf %{buildroot}%{_libdir}/libGLES*
|
||||
|
||||
# glvnd needs a default provider for indirect rendering where it cannot
|
||||
# determine the vendor
|
||||
ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_system.so.0
|
||||
|
||||
# strip out useless headers
|
||||
rm -f %{buildroot}%{_includedir}/GL/w*.h
|
||||
|
||||
# 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/vulkan.h
|
||||
|
||||
# remove .la files
|
||||
find %{buildroot} -name '*.la' -delete
|
||||
|
||||
# this keeps breaking, check it early. note that the exit from eu-ftr is odd.
|
||||
pushd %{buildroot}%{_libdir}
|
||||
for i in libOSMesa*.so libGL.so ; do
|
||||
@ -431,12 +423,16 @@ popd
|
||||
%files filesystem
|
||||
%doc docs/Mesa-MLAA-License-Clarification-Email.txt
|
||||
%dir %{_libdir}/dri
|
||||
%if %{with_hardware}
|
||||
%if 0%{?with_hardware}
|
||||
%if 0%{?with_vdpau}
|
||||
%dir %{_libdir}/vdpau
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%files khr-devel
|
||||
%dir %{_includedir}/KHR
|
||||
%{_includedir}/KHR/khrplatform.h
|
||||
|
||||
%files libGL
|
||||
%{_libdir}/libGLX_mesa.so.0*
|
||||
%{_libdir}/libGLX_system.so.0*
|
||||
@ -464,8 +460,6 @@ popd
|
||||
%{_includedir}/EGL/eglmesaext.h
|
||||
%{_includedir}/EGL/eglplatform.h
|
||||
%{_includedir}/EGL/eglextchromium.h
|
||||
%dir %{_includedir}/KHR
|
||||
%{_includedir}/KHR/khrplatform.h
|
||||
%{_libdir}/pkgconfig/egl.pc
|
||||
|
||||
%files libGLES
|
||||
@ -509,13 +503,13 @@ popd
|
||||
%if 0%{?with_xa}
|
||||
%ldconfig_scriptlets libxatracker
|
||||
%files libxatracker
|
||||
%if %{with_hardware}
|
||||
%if 0%{?with_hardware}
|
||||
%{_libdir}/libxatracker.so.2
|
||||
%{_libdir}/libxatracker.so.2.*
|
||||
%endif
|
||||
|
||||
%files libxatracker-devel
|
||||
%if %{with_hardware}
|
||||
%if 0%{?with_hardware}
|
||||
%{_libdir}/libxatracker.so
|
||||
%{_includedir}/xa_tracker.h
|
||||
%{_includedir}/xa_composite.h
|
||||
@ -545,8 +539,9 @@ popd
|
||||
%endif
|
||||
|
||||
%files dri-drivers
|
||||
%if %{with_hardware}
|
||||
%config(noreplace) %{_sysconfdir}/drirc
|
||||
%dir %{_datadir}/drirc.d
|
||||
%{_datadir}/drirc.d/00-mesa-defaults.conf
|
||||
%if 0%{?with_hardware}
|
||||
%{_libdir}/dri/radeon_dri.so
|
||||
%{_libdir}/dri/r200_dri.so
|
||||
%{_libdir}/dri/nouveau_vieux_dri.so
|
||||
@ -559,9 +554,16 @@ popd
|
||||
%{_libdir}/dri/i915_dri.so
|
||||
%{_libdir}/dri/i965_dri.so
|
||||
%endif
|
||||
%ifarch %{arm} aarch64
|
||||
%{_libdir}/dri/mxsfb-drm_dri.so
|
||||
%{_libdir}/dri/stm_dri.so
|
||||
%endif
|
||||
%if 0%{?with_vc4}
|
||||
%{_libdir}/dri/vc4_dri.so
|
||||
%endif
|
||||
%if 0%{?with_v3d}
|
||||
%{_libdir}/dri/v3d_dri.so
|
||||
%endif
|
||||
%if 0%{?with_freedreno}
|
||||
%{_libdir}/dri/kgsl_dri.so
|
||||
%{_libdir}/dri/msm_dri.so
|
||||
@ -573,6 +575,12 @@ popd
|
||||
%if 0%{?with_tegra}
|
||||
%{_libdir}/dri/tegra_dri.so
|
||||
%endif
|
||||
%if 0%{?with_lima}
|
||||
%{_libdir}/dri/lima_dri.so
|
||||
%endif
|
||||
%if 0%{?with_panfrost}
|
||||
%{_libdir}/dri/panfrost_dri.so
|
||||
%endif
|
||||
%{_libdir}/dri/nouveau_dri.so
|
||||
%if 0%{?with_vmware}
|
||||
%{_libdir}/dri/vmwgfx_dri.so
|
||||
@ -584,16 +592,29 @@ popd
|
||||
%endif
|
||||
%endif
|
||||
%if 0%{?with_hardware}
|
||||
%ifnarch riscv64
|
||||
%dir %{_libdir}/gallium-pipe
|
||||
%{_libdir}/gallium-pipe/*.so
|
||||
%endif
|
||||
%if 0%{?with_kmsro}
|
||||
%{_libdir}/dri/armada-drm_dri.so
|
||||
%{_libdir}/dri/exynos_dri.so
|
||||
%{_libdir}/dri/hx8357d_dri.so
|
||||
%{_libdir}/dri/ili9225_dri.so
|
||||
%{_libdir}/dri/ili9341_dri.so
|
||||
%{_libdir}/dri/meson_dri.so
|
||||
%{_libdir}/dri/mi0283qt_dri.so
|
||||
%{_libdir}/dri/pl111_dri.so
|
||||
%{_libdir}/dri/repaper_dri.so
|
||||
%{_libdir}/dri/rockchip_dri.so
|
||||
%{_libdir}/dri/st7586_dri.so
|
||||
%{_libdir}/dri/st7735r_dri.so
|
||||
%{_libdir}/dri/sun4i-drm_dri.so
|
||||
%endif
|
||||
%{_libdir}/dri/kms_swrast_dri.so
|
||||
%{_libdir}/dri/swrast_dri.so
|
||||
%{_libdir}/dri/virtio_gpu_dri.so
|
||||
|
||||
%if %{with_hardware}
|
||||
%if 0%{?with_hardware}
|
||||
%if 0%{?with_omx}
|
||||
%files omx-drivers
|
||||
%{_libdir}/bellagio/libomx_mesa.so
|
||||
@ -606,9 +627,6 @@ popd
|
||||
%{_libdir}/vdpau/libvdpau_r600.so.1*
|
||||
%{_libdir}/vdpau/libvdpau_radeonsi.so.1*
|
||||
%endif
|
||||
%if 0%{?with_tegra}
|
||||
%{_libdir}/vdpau/libvdpau_tegra.so.1*
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
|
||||
@ -623,11 +641,172 @@ popd
|
||||
%endif
|
||||
|
||||
%files vulkan-devel
|
||||
%{_includedir}/vulkan/
|
||||
%if 0%{?with_hardware}
|
||||
%ifarch %{ix86} x86_64
|
||||
%{_includedir}/vulkan/vulkan_intel.h
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Sat Aug 21 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 18.2.0~rc2-1.0.riscv64
|
||||
- Add support for RISC-V (riscv64)
|
||||
* Thu Aug 22 2019 Peter Robinson <pbrobinson@fedoraproject.org> 19.2.0~rc1-2
|
||||
- Bring back egl.pc for now
|
||||
|
||||
* Wed Aug 21 2019 Peter Robinson <pbrobinson@fedoraproject.org> 19.2.0~rc1-1
|
||||
- Update to 19.2.0~rc1
|
||||
|
||||
* Thu Aug 08 2019 Pete Walter <pwalter@fedoraproject.org> - 19.1.4-1
|
||||
- Update to 19.1.4
|
||||
|
||||
* Wed Jul 24 2019 Pete Walter <pwalter@fedoraproject.org> - 19.1.3-1
|
||||
- Update to 19.1.3
|
||||
|
||||
* Tue Jul 09 2019 Pete Walter <pwalter@fedoraproject.org> - 19.1.2-1
|
||||
- Update to 19.1.2
|
||||
|
||||
* Wed Jun 26 2019 Pete Walter <pwalter@fedoraproject.org> - 19.1.1-1
|
||||
- Update to 19.1.1
|
||||
|
||||
* Mon Jun 24 2019 Peter Robinson <pbrobinson@fedoraproject.org> 19.1.0-2
|
||||
- Enable v3d driver
|
||||
|
||||
* Wed Jun 12 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 19.1.0-1
|
||||
- Update to 19.1.0
|
||||
|
||||
* Fri Jun 07 2019 Pete Walter <pwalter@fedoraproject.org> - 19.1.0~rc5-1
|
||||
- Update to 19.1.0~rc5
|
||||
|
||||
* Thu May 30 2019 Pete Walter <pwalter@fedoraproject.org> - 19.1.0~rc4-1
|
||||
- Update to 19.1.0~rc4
|
||||
|
||||
* Wed May 22 2019 Dave Airlie <airlied@redhat.com> - 19.1.0~rc3-1
|
||||
- Update to 19.1.0-rc3
|
||||
|
||||
* Wed May 15 2019 Dave Airlie <airlied@redhat.com> - 19.1.0~rc2-1
|
||||
- Update to 19.1.0-rc2
|
||||
|
||||
* Wed May 15 2019 Dave Airlie <airlied@redhat.com> - 19.1.0~rc1-4
|
||||
- Bring back glesv2.pc for now
|
||||
|
||||
* Fri May 10 2019 Peter Robinson <pbrobinson@fedoraproject.org> 19.1.0~rc1-3
|
||||
- Enable panfrost
|
||||
|
||||
* Thu May 09 2019 Adam Jackson <ajax@redhat.com> -19.1.0~rc1-2
|
||||
- Enable lima
|
||||
|
||||
* Wed May 08 2019 Dave Airlie <airlied@redhat.com> - 19.1.0~rc1-1
|
||||
- Update to 19.1.0-rc1
|
||||
|
||||
* Thu Apr 25 2019 Pete Walter <pwalter@fedoraproject.org> - 19.0.3-1
|
||||
- Update to 19.0.3
|
||||
|
||||
* Tue Apr 16 2019 Adam Williamson <awilliam@redhat.com> - 19.0.2-3
|
||||
- Rebuild with Meson fix for #1699099
|
||||
|
||||
* Thu Apr 11 2019 Adam Jackson <ajax@redhat.com> - 19.0.2-2
|
||||
- Drop the mpeg1/2 sanitize hack
|
||||
- Switch to upstream tarball since we no longer need to do the above
|
||||
|
||||
* Thu Apr 11 08:48:37 CEST 2019 Igor Gnatenko <ignatenkobrain@fedoraprojec.org> - 19.0.2-1
|
||||
- Update to 19.0.2
|
||||
|
||||
* Thu Apr 04 2019 Adam Jackson <ajax@redhat.com> 19.0.1-2
|
||||
- Nuke rpath from installed DRI drivers
|
||||
|
||||
* Wed Mar 27 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 19.0.1-1
|
||||
- Update to 19.0.1
|
||||
|
||||
* Mon Mar 25 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 19.0.0-2
|
||||
- Rebuild with -Db_ndebug=true
|
||||
|
||||
* Wed Mar 13 2019 Peter Robinson <pbrobinson@fedoraproject.org> 19.0.0-1
|
||||
- Update to 19.0.0
|
||||
|
||||
* Thu Mar 07 2019 Pete Walter <pwalter@fedoraproject.org> - 19.0.0~rc7-1
|
||||
- Update to 19.0.0~rc7
|
||||
|
||||
* Wed Feb 27 2019 Pete Walter <pwalter@fedoraproject.org> - 19.0.0~rc6-1
|
||||
- Update to 19.0.0~rc6
|
||||
|
||||
* Wed Feb 20 2019 Peter Robinson <pbrobinson@fedoraproject.org> 19.0.0~rc5-1
|
||||
- Update to 19.0.0~rc5
|
||||
|
||||
* Thu Feb 14 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 19.0.0~rc4-1
|
||||
- Update to 19.0.0~rc4
|
||||
|
||||
* Tue Feb 12 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 19.0.0~rc2-3
|
||||
- Fix radv vulkan
|
||||
|
||||
* Fri Feb 08 2019 Pete Walter <pwalter@fedoraproject.org> - 19.0.0~rc2-2
|
||||
- Add back accidentally lost patch to disable rgb10 configs by default (#1650929)
|
||||
|
||||
* Tue Feb 5 2019 Peter Robinson <pbrobinson@fedoraproject.org> 19.0.0~rc2-1
|
||||
- Update to 19.0.0~rc2
|
||||
|
||||
* Thu Jan 31 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 19.0.0~rc1-1
|
||||
- Update to 19.0.0~rc1
|
||||
|
||||
* Thu Jan 17 2019 Adam Jackson <ajax@redhat.com> - 18.3.2-1
|
||||
- Update to 18.3.2
|
||||
|
||||
* Wed Dec 19 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 18.3.1-3
|
||||
- Enable annotated build
|
||||
|
||||
* Wed Dec 19 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 18.3.1-2
|
||||
- Switch to meson buildsystem
|
||||
|
||||
* Tue Dec 18 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 18.3.1-1
|
||||
- Update to 18.3.1
|
||||
|
||||
* Fri Dec 07 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 18.3.0-1
|
||||
- Update to 18.3.0
|
||||
|
||||
* Tue Dec 04 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 18.3.0~rc5-2
|
||||
- Backport patch to fix totem
|
||||
|
||||
* Tue Dec 4 2018 Peter Robinson <pbrobinson@fedoraproject.org> 18.3.0~rc5-1
|
||||
- Update to 18.3.0~rc5
|
||||
|
||||
* Tue Nov 27 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 18.3.0~rc4-1
|
||||
- Update to 18.3.0~rc4
|
||||
|
||||
* Thu Nov 15 2018 Adam Jackson <ajax@redhat.com> 18.3.0~rc2-2
|
||||
- Add mesa-khr-devel subpackage to hold <KHR/khrplatform.h>, and make
|
||||
mesa-lib{GL,GLES,EGL}-devel Require it.
|
||||
|
||||
* Wed Nov 14 2018 Adam Jackson <ajax@redhat.com> 18.3.0~rc2-1
|
||||
- Update to 18.3.0 RC2
|
||||
- Re-enable 10bpc fbconfigs, clutter apps seem to work now
|
||||
- Drop now-unnecessary big-endian compilation fix
|
||||
|
||||
* Tue Nov 06 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 18.2.4-3
|
||||
- Remove workaround
|
||||
|
||||
* Tue Nov 06 2018 Dave Airlie <airlied@redhat.com> - 18.2.4-2
|
||||
- workaround bug with gcc 8.2.1-4
|
||||
|
||||
* Thu Nov 01 2018 Adam Jackson <ajax@redhat.com> 18.2.4-1
|
||||
- Update to 18.2.4
|
||||
|
||||
* Wed Oct 31 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 18.2.3-1
|
||||
- Update to 18.2.3
|
||||
|
||||
* Fri Oct 5 2018 Peter Robinson <pbrobinson@fedoraproject.org> 18.2.2-1
|
||||
- Update to 18.2.2
|
||||
|
||||
* Fri Sep 21 2018 Peter Robinson <pbrobinson@fedoraproject.org> 18.2.1-1
|
||||
- Update to 18.2.1
|
||||
|
||||
* Wed Sep 19 2018 Adam Williamson <awilliam@redhat.com> - 18.2.0-2
|
||||
- Fix "HW cursor for format" error message flood with swrast (FDO #104926)
|
||||
|
||||
* Sat Sep 8 2018 Peter Robinson <pbrobinson@fedoraproject.org> 18.2.0-1
|
||||
- Update to 18.2.0
|
||||
|
||||
* Sun Sep 2 2018 Hans de Goede <hdegoede@redhat.com> - 18.2.0~rc5-1
|
||||
- Update to 18.2.0~rc5
|
||||
|
||||
* Mon Aug 20 2018 Peter Robinson <pbrobinson@fedoraproject.org> 18.2.0~rc3-1
|
||||
- Update to 18.2.0~rc3
|
||||
|
||||
* Sat Aug 11 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 18.2.0~rc2-1
|
||||
- Update to 18.2.0~rc2
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (mesa-18.2.0-rc2.tar.xz) = 4210cb26c94ae4a070b3effa895ead78c65d28094fe100f930cde02324f22075482620a59152694f69a98ce3b4dd984b6af6f60638a9e51c0df7b7c967d1f0eb
|
||||
SHA512 (mesa-19.2.0-rc1.tar.xz) = babafb6ec668834e041a62e966452fe315e4f5afef8e1f7d35e038993c73b32ea6ad9929399edae4686f44cd11704fd9a8801821befc1d1767bc0662d4c39fac
|
||||
|
20
vl_decoder.c
20
vl_decoder.c
@ -1,20 +0,0 @@
|
||||
#include "vl_decoder.h"
|
||||
bool
|
||||
vl_profile_supported(struct pipe_screen *screen, enum pipe_video_profile profile,
|
||||
enum pipe_video_entrypoint entrypoint)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
int
|
||||
vl_level_supported(struct pipe_screen *screen, enum pipe_video_profile profile)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
struct pipe_video_codec *
|
||||
vl_create_decoder(struct pipe_context *pipe,
|
||||
const struct pipe_video_codec *templat)
|
||||
{
|
||||
return NULL;
|
||||
}
|
@ -1,7 +0,0 @@
|
||||
#include "vl_mpeg12_decoder.h"
|
||||
struct pipe_video_codec *
|
||||
vl_create_mpeg12_decoder(struct pipe_context *context,
|
||||
const struct pipe_video_codec *templat)
|
||||
{
|
||||
return NULL;
|
||||
}
|
Loading…
Reference in New Issue
Block a user