Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up the mesa spec file #2857

Merged
merged 3 commits into from
Jan 3, 2025
Merged

Clean up the mesa spec file #2857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e64d515
Clean up the mesa spec file
korewaChino Jan 3, 2025
18c9a6a
experiment: use matrices instead of multilib x86
korewaChino Jan 3, 2025
788e25f
Merge branch 'frawhide' into pr/mesa-cleanup
korewaChino Jan 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions anda/lib/mesa/anda.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ project pkg {
spec = "mesa.spec"
}
labels {

extra = 1
}
arches = ["x86_64", "i386", "aarch64"]
}
45 changes: 4 additions & 41 deletions anda/lib/mesa/mesa.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
%global _default_patch_fuzz 2

%global srcname mesa

%ifnarch s390x
Expand Down Expand Up @@ -75,14 +77,6 @@ Release: 3%?dist
License: MIT AND BSD-3-Clause AND SGI-B-2.0
URL: http://www.mesa3d.org

# define macro for providing srcname and ver
# %replace_pkg subpackage
%define replace_pkg() \
Provides: %{srcname}-%1 = %{?epoch:%{epoch}:}%{version}-%{release} \
Provides: %{srcname}-%1%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} \
Conflicts: %{srcname}-%1 < %{?epoch:%{epoch}:}%{version}-%{release} \
Conflicts: %{srcname}-%1%{?_isa} < %{?epoch:%{epoch}:}%{version}-%{release}



Source0: https://archive.mesa3d.org/%{srcname}-%{ver}.tar.xz
Expand Down Expand Up @@ -199,15 +193,14 @@ BuildRequires: pkgconfig(vulkan)
%{summary}.

%package filesystem
%replace_pkg filesystem
Summary: Mesa driver filesystem
Provides: mesa-dri-filesystem = %{?epoch:%{epoch}:}%{version}-%{release}
Obsoletes: mesa-omx-drivers < %{?epoch:%{epoch}:}%{version}-%{release}

%description filesystem
%{summary}.

%package libGL
%replace_pkg libGL
Summary: Mesa libGL runtime libraries
Requires: %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: libglvnd-glx%{?_isa} >= 1:1.3.2
Expand All @@ -217,7 +210,6 @@ Recommends: %{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{re
%{summary}.

%package libGL-devel
%replace_pkg libGL-devel
Summary: Mesa libGL development package
Requires: %{name}-libGL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: libglvnd-devel%{?_isa} >= 1:1.3.2
Expand All @@ -229,17 +221,16 @@ Recommends: gl-manpages
%{summary}.

%package libEGL
%replace_pkg libEGL
Summary: Mesa libEGL runtime libraries
Requires: libglvnd-egl%{?_isa} >= 1:1.3.2
Requires: %{name}-libgbm%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Recommends: %{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}

%description libEGL
%{summary}.

%package libEGL-devel
%replace_pkg libEGL-devel
Summary: Mesa libEGL development package
Requires: %{name}-libEGL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: libglvnd-devel%{?_isa} >= 1:1.3.2
Expand All @@ -251,7 +242,6 @@ Provides: libEGL-devel%{?_isa}
%{summary}.

%package dri-drivers
%replace_pkg dri-drivers
Summary: Mesa-based DRI drivers
Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Expand All @@ -262,20 +252,8 @@ Recommends: %{name}-va-drivers%{?_isa}
%description dri-drivers
%{summary}.

%if 0%{?with_omx}
%package omx-drivers
%replace_pkg omx-drivers
Summary: Mesa-based OMX drivers
Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}

%description omx-drivers
%{summary}.
%endif

%if 0%{?with_va}
%package va-drivers
%replace_pkg va-drivers
Provides: %{srcname}-va-drivers = %{?epoch:%{epoch}:}%{version}-%{release}
Summary: Mesa-based VA-API video acceleration drivers
Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Obsoletes: %{name}-vaapi-drivers < 22.2.0-5
Expand All @@ -286,7 +264,6 @@ Obsoletes: %{name}-vaapi-drivers < 22.2.0-5

%if 0%{?with_vdpau}
%package vdpau-drivers
%replace_pkg vdpau-drivers
Summary: Mesa-based VDPAU drivers
Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}

Expand All @@ -295,7 +272,6 @@ Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{rel
%endif

%package libOSMesa
%replace_pkg libOSMesa
Summary: Mesa offscreen rendering libraries
Requires: %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Provides: libOSMesa
Expand All @@ -305,15 +281,13 @@ Provides: libOSMesa%{?_isa}
%{summary}.

%package libOSMesa-devel
%replace_pkg libOSMesa-devel
Summary: Mesa offscreen rendering development package
Requires: %{name}-libOSMesa%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}

%description libOSMesa-devel
%{summary}.

%package libgbm
%replace_pkg libgbm
Summary: Mesa gbm runtime library
Provides: libgbm
Provides: libgbm%{?_isa}
Expand All @@ -327,7 +301,6 @@ Requires: (%{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{r
%{summary}.

%package libgbm-devel
%replace_pkg libgbm-devel
Summary: Mesa libgbm development package
Requires: %{name}-libgbm%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Provides: libgbm-devel
Expand All @@ -338,7 +311,6 @@ Provides: libgbm-devel%{?_isa}

%if 0%{?with_xa}
%package libxatracker
%replace_pkg libxatracker
Summary: Mesa XA state tracker
Provides: libxatracker
Provides: libxatracker%{?_isa}
Expand All @@ -347,7 +319,6 @@ Provides: libxatracker%{?_isa}
%{summary}.

%package libxatracker-devel
%replace_pkg libxatracker-devel
Summary: Mesa XA state tracker development package
Requires: %{name}-libxatracker%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Provides: libxatracker-devel
Expand All @@ -358,7 +329,6 @@ Provides: libxatracker-devel%{?_isa}
%endif

%package libglapi
%replace_pkg libglapi
Summary: Mesa shared glapi
Provides: libglapi
Provides: libglapi%{?_isa}
Expand All @@ -372,7 +342,6 @@ Requires: (%{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{r

%if 0%{?with_opencl}
%package libOpenCL
%replace_pkg libOpenCL
Summary: Mesa OpenCL runtime library
Requires: ocl-icd%{?_isa}
Requires: libclc%{?_isa}
Expand All @@ -383,7 +352,6 @@ Requires: opencl-filesystem
%{summary}.

%package libOpenCL-devel
%replace_pkg libOpenCL-devel
Summary: Mesa OpenCL development package
Requires: %{name}-libOpenCL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}

Expand All @@ -393,24 +361,20 @@ Requires: %{name}-libOpenCL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{rele

%if 0%{?with_teflon}
%package libTeflon
%replace_pkg libTeflon
Summary: Mesa TensorFlow Lite delegate


%description libTeflon
%{summary}.
%endif

%if 0%{?with_nine}
%package libd3d
%replace_pkg libd3d
Summary: Mesa Direct3D9 state tracker

%description libd3d
%{summary}.

%package libd3d-devel
%replace_pkg libd3d-devel
Summary: Mesa Direct3D9 state tracker development package
Requires: %{name}-libd3d%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}

Expand All @@ -419,7 +383,6 @@ Requires: %{name}-libd3d%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release
%endif

%package vulkan-drivers
%replace_pkg vulkan-drivers
Summary: Mesa Vulkan drivers
Requires: vulkan%{_isa}
Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Expand Down
Loading