Revisions for ⁨diff mesa.spec mesa-freeworld.spec⁩

View the changes made to this paste.

unlisted ⁨1⁩ ⁨file⁩ 2022-10-16 02:40:34 UTC

diff.txt

@@ -0,0 +1,586 @@

+0a1
+> %global srcname mesa
+3c4
+< %global with_vulkan_hw 1
+---
+> %global with_vulkan_hw 0
+7,9c8,10
+< %global with_nine 1
+< %global with_omx 1
+< %global with_opencl 1
+---
+> %global with_nine 0
+> %global with_omx 0
+> %global with_opencl 0
+11c12
+< %global base_vulkan ,amd
+---
+> #%%global base_vulkan ,amd
+15,19c16,20
+< %global with_crocus 1
+< %global with_i915   1
+< %global with_iris   1
+< %global with_xa     1
+< %global platform_vulkan ,intel
+---
+> %global with_crocus 0
+> %global with_i915   0
+> %global with_iris   0
+> %global with_xa     0
+> #%%global platform_vulkan ,intel
+24,34c25,35
+< %global with_etnaviv   1
+< %global with_lima      1
+< %global with_vc4       1
+< %global with_v3d       1
+< %endif
+< %global with_freedreno 1
+< %global with_kmsro     1
+< %global with_panfrost  1
+< %global with_tegra     1
+< %global with_xa        1
+< %global platform_vulkan ,broadcom,freedreno,panfrost
+---
+> %global with_etnaviv   0
+> %global with_lima      0
+> %global with_vc4       0
+> %global with_v3d       0
+> %endif
+> %global with_freedreno 0
+> %global with_kmsro     0
+> %global with_panfrost  0
+> %global with_tegra     0
+> %global with_xa        0
+> #%%global platform_vulkan ,broadcom,freedreno,panfrost
+52c53
+< %global vulkan_drivers swrast%{?base_vulkan}%{?platform_vulkan}
+---
+> #%%global vulkan_drivers swrast%%{?base_vulkan}%%{?platform_vulkan}
+54c55
+< Name:           mesa
+---
+> Name:           %{srcname}-freeworld
+58c59
+< Release:        %autorelease
+---
+> Release:        1%{?dist}
+62c63
+< Source0:        https://archive.mesa3d.org/mesa-%{ver}.tar.xz
+---
+> Source0:        https://archive.mesa3d.org/%{srcname}-%{ver}.tar.xz
+66a68,69
+> Source2:        org.mesa3d.vaapi.freeworld.metainfo.xml
+> Source3:        org.mesa3d.vdpau.freeworld.metainfo.xml
+133,136d135
+< %if 0%{?with_opencl}
+< BuildRequires:  clang-devel
+< BuildRequires:  pkgconfig(libclc)
+< %endif
+140,141c139,140
+< BuildRequires:  python3-devel
+< BuildRequires:  python3-mako
+---
+> BuildRequires:  pkgconfig(python3)
+> BuildRequires:  python3dist(mako)
+149,214c148,149
+< %{summary}.
+< 
+< %package filesystem
+< Summary:        Mesa driver filesystem
+< Provides:       mesa-dri-filesystem = %{?epoch:%{epoch}:}%{version}-%{release}
+< 
+< %description filesystem
+< %{summary}.
+< 
+< %package libGL
+< Summary:        Mesa libGL runtime libraries
+< Requires:       %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+< Requires:       libglvnd-glx%{?_isa} >= 1:1.3.2
+< Recommends:     %{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+< 
+< %description libGL
+< %{summary}.
+< 
+< %package libGL-devel
+< Summary:        Mesa libGL development package
+< Requires:       %{name}-libGL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+< Requires:       libglvnd-devel%{?_isa} >= 1:1.3.2
+< Provides:       libGL-devel
+< Provides:       libGL-devel%{?_isa}
+< Recommends:     gl-manpages
+< 
+< %description libGL-devel
+< %{summary}.
+< 
+< %package libEGL
+< Summary:        Mesa libEGL runtime libraries
+< Requires:       libglvnd-egl%{?_isa} >= 1:1.3.2
+< Recommends:     %{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+< 
+< %description libEGL
+< %{summary}.
+< 
+< %package libEGL-devel
+< Summary:        Mesa libEGL development package
+< Requires:       %{name}-libEGL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+< Requires:       libglvnd-devel%{?_isa} >= 1:1.3.2
+< Requires:       %{name}-khr-devel%{?_isa}
+< Provides:       libEGL-devel
+< Provides:       libEGL-devel%{?_isa}
+< 
+< %description libEGL-devel
+< %{summary}.
+< 
+< %package dri-drivers
+< Summary:        Mesa-based DRI drivers
+< Requires:       %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+< %if 0%{?with_va}
+< Recommends:     %{name}-va-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+< %endif
+< 
+< %description dri-drivers
+< %{summary}.
+< 
+< %if 0%{?with_omx}
+< %package omx-drivers
+< Summary:        Mesa-based OMX drivers
+< Requires:       %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+< 
+< %description omx-drivers
+< %{summary}.
+< %endif
+---
+> These drivers contains video acceleration codecs for decoding/encoding H.264 and H.265
+> algorithms and decoding only VC1 algorithm.
+217,220c152,156
+< %package        va-drivers
+< Summary:        Mesa-based VA-API video acceleration drivers
+< Requires:       %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+< Obsoletes:      %{name}-vaapi-drivers < 22.2.0-5
+---
+> %package        -n %{srcname}-va-drivers-freeworld
+> Summary:        Mesa-based VA-API drivers
+> Requires:       %{srcname}-filesystem%{?_isa} >= %{?epoch:%{epoch}:}%{version}
+> Provides:       %{srcname}-va-drivers = %{?epoch:%{epoch}:}%{version}-%{release}
+> Enhances:       %{srcname}%{?_isa}
+222,223c158,159
+< %description va-drivers
+< %{summary}.
+---
+> %description    -n %{srcname}-va-drivers-freeworld
+> %{description}
+227c163
+< %package        vdpau-drivers
+---
+> %package        -n %{srcname}-vdpau-drivers-freeworld
+229,273c165,167
+< Requires:       %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+< 
+< %description vdpau-drivers
+< %{summary}.
+< %endif
+< 
+< %package libOSMesa
+< Summary:        Mesa offscreen rendering libraries
+< Requires:       %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+< Provides:       libOSMesa
+< Provides:       libOSMesa%{?_isa}
+< 
+< %description libOSMesa
+< %{summary}.
+< 
+< %package libOSMesa-devel
+< Summary:        Mesa offscreen rendering development package
+< Requires:       %{name}-libOSMesa%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+< 
+< %description libOSMesa-devel
+< %{summary}.
+< 
+< %package libgbm
+< Summary:        Mesa gbm runtime library
+< Provides:       libgbm
+< Provides:       libgbm%{?_isa}
+< Recommends:     %{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+< 
+< %description libgbm
+< %{summary}.
+< 
+< %package libgbm-devel
+< Summary:        Mesa libgbm development package
+< Requires:       %{name}-libgbm%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+< Provides:       libgbm-devel
+< Provides:       libgbm-devel%{?_isa}
+< 
+< %description libgbm-devel
+< %{summary}.
+< 
+< %if 0%{?with_xa}
+< %package libxatracker
+< Summary:        Mesa XA state tracker
+< Provides:       libxatracker
+< Provides:       libxatracker%{?_isa}
+---
+> Requires:       %{srcname}-filesystem%{?_isa} >= %{?epoch:%{epoch}:}%{version}
+> Provides:       %{srcname}-vdpau-drivers = %{?epoch:%{epoch}:}%{version}-%{release}
+> Enhances:       %{srcname}%{?_isa}
+275,327c169,170
+< %description libxatracker
+< %{summary}.
+< 
+< %package libxatracker-devel
+< Summary:        Mesa XA state tracker development package
+< Requires:       %{name}-libxatracker%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+< Provides:       libxatracker-devel
+< Provides:       libxatracker-devel%{?_isa}
+< 
+< %description libxatracker-devel
+< %{summary}.
+< %endif
+< 
+< %package libglapi
+< Summary:        Mesa shared glapi
+< Provides:       libglapi
+< Provides:       libglapi%{?_isa}
+< 
+< %description libglapi
+< %{summary}.
+< 
+< %if 0%{?with_opencl}
+< %package libOpenCL
+< Summary:        Mesa OpenCL runtime library
+< Requires:       ocl-icd%{?_isa}
+< Requires:       libclc%{?_isa}
+< Requires:       %{name}-libgbm%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+< Requires:       opencl-filesystem
+< 
+< %description libOpenCL
+< %{summary}.
+< 
+< %package libOpenCL-devel
+< Summary:        Mesa OpenCL development package
+< Requires:       %{name}-libOpenCL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+< 
+< %description libOpenCL-devel
+< %{summary}.
+< %endif
+< 
+< %if 0%{?with_nine}
+< %package libd3d
+< Summary:        Mesa Direct3D9 state tracker
+< 
+< %description libd3d
+< %{summary}.
+< 
+< %package libd3d-devel
+< Summary:        Mesa Direct3D9 state tracker development package
+< Requires:       %{name}-libd3d%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+< 
+< %description libd3d-devel
+< %{summary}.
+---
+> %description 	-n %{srcname}-vdpau-drivers-freeworld
+> %{description}
+329,337d171
+< 
+< %package vulkan-drivers
+< Summary:        Mesa Vulkan drivers
+< Requires:       vulkan%{_isa}
+< Obsoletes:      mesa-vulkan-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+< 
+< %description vulkan-drivers
+< The drivers with support for the Vulkan API.
+< 
+339c173
+< %autosetup -n %{name}-%{ver} -p1
+---
+> %autosetup -n %{srcname}-%{ver} -p1
+351c185
+<   -Dosmesa=true \
+---
+>   -Dosmesa=false \
+359c193
+<   -Dgallium-omx=%{?with_omx:bellagio}%{!?with_omx:disabled} \
+---
+>   -Dgallium-omx=%{!?with_omx:bellagio}%{?with_omx:disabled} \
+361,363c195,198
+<   -Dgallium-xa=%{?with_xa:enabled}%{!?with_xa:disabled} \
+<   -Dgallium-nine=%{?with_nine:true}%{!?with_nine:false} \
+<   -Dgallium-opencl=%{?with_opencl:icd}%{!?with_opencl:disabled} \
+---
+>   -Dgallium-xa=%{!?with_xa:enabled}%{?with_xa:disabled} \
+>   -Dgallium-nine=%{!?with_nine:true}%{?with_nine:false} \
+>   -Dgallium-opencl=%{!?with_opencl:icd}%{?with_opencl:disabled} \
+>   -Dvideo-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec \
+368c203
+<   -Dgles2=enabled \
+---
+>   -Dgles2=disabled \
+370c205
+<   -Dgbm=enabled \
+---
+>   -Dgbm=disabled \
+372,373c207,208
+<   -Degl=enabled \
+<   -Dglvnd=true \
+---
+>   -Degl=disabled \
+>   -Dglvnd=false \
+385a221,225
+> # install Appdata files
+> mkdir -p %{buildroot}%{_metainfodir}
+> install -pm 0644 %{SOURCE2} %{buildroot}%{_metainfodir}
+> install -pm 0644 %{SOURCE3} %{buildroot}%{_metainfodir}
+> 
+405,576c245,261
+< %files filesystem
+< %doc docs/Mesa-MLAA-License-Clarification-Email.txt
+< %dir %{_libdir}/dri
+< %if 0%{?with_hardware}
+< %if 0%{?with_vdpau}
+< %dir %{_libdir}/vdpau
+< %endif
+< %endif
+< 
+< %files libGL
+< %{_libdir}/libGLX_mesa.so.0*
+< %{_libdir}/libGLX_system.so.0*
+< %files libGL-devel
+< %dir %{_includedir}/GL/internal
+< %{_includedir}/GL/internal/dri_interface.h
+< %{_libdir}/pkgconfig/dri.pc
+< %{_libdir}/libglapi.so
+< 
+< %files libEGL
+< %{_datadir}/glvnd/egl_vendor.d/50_mesa.json
+< %{_libdir}/libEGL_mesa.so.0*
+< %files libEGL-devel
+< %dir %{_includedir}/EGL
+< %{_includedir}/EGL/eglmesaext.h
+< %{_includedir}/EGL/eglextchromium.h
+< 
+< %files libglapi
+< %{_libdir}/libglapi.so.0
+< %{_libdir}/libglapi.so.0.*
+< 
+< %files libOSMesa
+< %{_libdir}/libOSMesa.so.8*
+< %files libOSMesa-devel
+< %dir %{_includedir}/GL
+< %{_includedir}/GL/osmesa.h
+< %{_libdir}/libOSMesa.so
+< %{_libdir}/pkgconfig/osmesa.pc
+< 
+< %files libgbm
+< %{_libdir}/libgbm.so.1
+< %{_libdir}/libgbm.so.1.*
+< %files libgbm-devel
+< %{_libdir}/libgbm.so
+< %{_includedir}/gbm.h
+< %{_libdir}/pkgconfig/gbm.pc
+< 
+< %if 0%{?with_xa}
+< %files libxatracker
+< %if 0%{?with_hardware}
+< %{_libdir}/libxatracker.so.2
+< %{_libdir}/libxatracker.so.2.*
+< %endif
+< 
+< %files libxatracker-devel
+< %if 0%{?with_hardware}
+< %{_libdir}/libxatracker.so
+< %{_includedir}/xa_tracker.h
+< %{_includedir}/xa_composite.h
+< %{_includedir}/xa_context.h
+< %{_libdir}/pkgconfig/xatracker.pc
+< %endif
+< %endif
+< 
+< %if 0%{?with_opencl}
+< %files libOpenCL
+< %{_libdir}/libMesaOpenCL.so.*
+< %{_sysconfdir}/OpenCL/vendors/mesa.icd
+< %files libOpenCL-devel
+< %{_libdir}/libMesaOpenCL.so
+< %endif
+< 
+< %if 0%{?with_nine}
+< %files libd3d
+< %dir %{_libdir}/d3d/
+< %{_libdir}/d3d/*.so.*
+< 
+< %files libd3d-devel
+< %{_libdir}/pkgconfig/d3d.pc
+< %{_includedir}/d3dadapter/
+< %{_libdir}/d3d/*.so
+< %endif
+< 
+< %files dri-drivers
+< %dir %{_datadir}/drirc.d
+< %{_datadir}/drirc.d/00-mesa-defaults.conf
+< %{_libdir}/dri/kms_swrast_dri.so
+< %{_libdir}/dri/swrast_dri.so
+< %{_libdir}/dri/virtio_gpu_dri.so
+< 
+< %if 0%{?with_hardware}
+< %if 0%{?with_r300}
+< %{_libdir}/dri/r300_dri.so
+< %endif
+< %if 0%{?with_radeonsi}
+< %if 0%{?with_r600}
+< %{_libdir}/dri/r600_dri.so
+< %endif
+< %{_libdir}/dri/radeonsi_dri.so
+< %endif
+< %ifarch %{ix86} x86_64
+< %{_libdir}/dri/crocus_dri.so
+< %{_libdir}/dri/i915_dri.so
+< %{_libdir}/dri/iris_dri.so
+< %endif
+< %ifarch aarch64
+< %{_libdir}/dri/ingenic-drm_dri.so
+< %{_libdir}/dri/imx-drm_dri.so
+< %{_libdir}/dri/imx-lcdif_dri.so
+< %{_libdir}/dri/kirin_dri.so
+< %{_libdir}/dri/komeda_dri.so
+< %{_libdir}/dri/mali-dp_dri.so
+< %{_libdir}/dri/mcde_dri.so
+< %{_libdir}/dri/mxsfb-drm_dri.so
+< %{_libdir}/dri/rcar-du_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
+< %endif
+< %if 0%{?with_etnaviv}
+< %{_libdir}/dri/etnaviv_dri.so
+< %endif
+< %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
+< %endif
+< %endif
+< %if 0%{?with_opencl}
+< %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/imx-dcss_dri.so
+< %{_libdir}/dri/mediatek_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
+< %if 0%{?with_vulkan_hw}
+< %{_libdir}/dri/zink_dri.so
+< %endif
+< 
+< %if 0%{?with_omx}
+< %files omx-drivers
+< %{_libdir}/bellagio/libomx_mesa.so
+< %endif
+---
+> # strip unneeded files from va-api and vdpau
+> rm -rf %{buildroot}%{_datadir}/{drirc.d,glvnd,vulkan}
+> rm -rf %{buildroot}%{_libdir}/{d3d,EGL,gallium-pipe,libGLX,pkgconfig}
+> rm -rf %{buildroot}%{_includedir}/{d3dadapter,EGL,GL,KHR}
+> rm -fr %{buildroot}%{_sysconfdir}/OpenGL
+> rm -fr %{buildroot}%{_libdir}/libGL.so*
+> rm -fr %{buildroot}%{_libdir}/libglapi.so*
+> rm -fr %{buildroot}%{_libdir}/libOSMesa.so*
+> rm -fr %{buildroot}%{_libdir}/pkgconfig/osmesa.pc
+> rm -fr %{buildroot}%{_libdir}/libgbm.so*
+> rm -fr %{buildroot}%{_includedir}/gbm.h
+> rm -fr %{buildroot}%{_libdir}/libxatracker.so*
+> rm -fr %{buildroot}%{_includedir}/xa_*.h
+> rm -fr %{buildroot}%{_libdir}/libMesaOpenCL.so*
+> rm -fr %{buildroot}%{_libdir}/dri/*_dri.so
+> rm -fr %{buildroot}%{_libdir}/libvulkan*.so
+> rm -fr %{buildroot}%{_libdir}/libVkLayer_MESA_device_select.so
+579c264,265
+< %files va-drivers
+---
+> %files -n %{srcname}-va-drivers-freeworld
+> %doc docs/Mesa-MLAA-License-Clarification-Email.txt
+586a273
+> %{_metainfodir}/org.mesa3d.vaapi.freeworld.metainfo.xml
+590c277,278
+< %files vdpau-drivers
+---
+> %files -n %{srcname}-vdpau-drivers-freeworld
+> %doc docs/Mesa-MLAA-License-Clarification-Email.txt
+601,623c289
+< %endif
+< 
+< %files vulkan-drivers
+< %{_libdir}/libvulkan_lvp.so
+< %{_datadir}/vulkan/icd.d/lvp_icd.*.json
+< %{_libdir}/libVkLayer_MESA_device_select.so
+< %{_datadir}/vulkan/implicit_layer.d/VkLayer_MESA_device_select.json
+< %if 0%{?with_vulkan_hw}
+< %{_libdir}/libvulkan_radeon.so
+< %{_datadir}/drirc.d/00-radv-defaults.conf
+< %{_datadir}/vulkan/icd.d/radeon_icd.*.json
+< %ifarch %{ix86} x86_64
+< %{_libdir}/libvulkan_intel.so
+< %{_datadir}/vulkan/icd.d/intel_icd.*.json
+< %endif
+< %ifarch aarch64
+< %{_libdir}/libvulkan_broadcom.so
+< %{_datadir}/vulkan/icd.d/broadcom_icd.*.json
+< %{_libdir}/libvulkan_freedreno.so
+< %{_datadir}/vulkan/icd.d/freedreno_icd.*.json
+< %{_libdir}/libvulkan_panfrost.so
+< %{_datadir}/vulkan/icd.d/panfrost_icd.*.json
+< %endif
+---
+> %{_metainfodir}/org.mesa3d.vdpau.freeworld.metainfo.xml
+627c293,313
+< %autochangelog
+---
+> * Thu Oct 13 2022 Luya Tshimbalanga <[email protected]> - 22.2.1-1
+> - Update to 22.2.1
+> - Add appdata files for each subpackage
+> 
+> * Wed Oct 5 2022 Luya Tshimbalanga <[email protected]> - 22.2.0-4
+> - Drop unneeded omx support
+> - Add missing license for each files
+> 
+> * Sun Oct 2 2022 Luya Tshimbalanga <[email protected]> - 22.2.0-3
+> - Rename vaapi to va
+> - Broaden description
+> - Add Enhancement line
+> - Clean up spec file
+> 
+> * Sat Oct 1 2022 Luya Tshimbalanga <[email protected]> - 22.2.0-2
+> - Drop unsupported autospec in rpmfusion infra
+> - Enable h264, h265 and vc1 codecs
+> - Re-enable vdpau and omx (OpenMax) support
+> 
+> * Sat Oct 1 2022 Luya Tshimbalanga <[email protected]> - 22.2.0-1
+> - Initial release