rpm/Mesa
SHA256
1
0
Fork 0
forked from pool/Mesa
Code Pull Requests Activity

Accepting request 667672 from home:tobijk:branches:home:tobijk:X11:XOrg

Browse Source 
- Update the version of the mesa core package to 18.3.2

- Build Mesa with meson instead of automake
  + Build classic swrast with Mesa, as its a dependency for osmesa - delete it
    while installing
  + Build egl with Mesa-drivers as it demands one windowing-system - 
    delete it while installing

- Update the version of the mesa core package to 18.3.2

- Build Mesa with meson instead of automake
  + Build classic swrast with Mesa, as its a dependency for osmesa - delete it
    while installing
  + Build egl with Mesa-drivers as it demands one windowing-system - 
    delete it while installing

OBS-URL: https://build.opensuse.org/request/show/667672
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=804
This commit is contained in:
Stefan Dirsch 2019-01-30 16:33:21 +00:00 committed by Git OBS Bridge
parent 07e9041249
commit 84742d9edb
4 changed files with 166 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Mesa-drivers.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Mon Jan 21 18:42:08 UTC 2019 - Tobias Klausmann <tobias.johannes.klausmann@mni.thm.de>
- Update the version of the mesa core package to 18.3.2
-------------------------------------------------------------------
Mon Jan 21 18:29:27 UTC 2019 - Tobias Klausmann <tobias.johannes.klausmann@mni.thm.de>
- Build Mesa with meson instead of automake
+ Build classic swrast with Mesa, as its a dependency for osmesa - delete it
while installing
+ Build egl with Mesa-drivers as it demands one windowing-system -
delete it while installing
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jan 18 18:32:13 UTC 2019 - sndirsch@suse.com Fri Jan 18 18:32:13 UTC 2019 - sndirsch@suse.com

126
Mesa-drivers.spec
View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
@ -137,15 +137,15 @@ Patch31: archlinux_0001-Fix-linkage-against-shared-glapi.patch
Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch
Patch57: u_wayland_egl-Ensure-EGL-surface.patch Patch57: u_wayland_egl-Ensure-EGL-surface.patch
Patch60: n_Disable-Xshm-for-now-since-it-results-in-render-erro.patch Patch60: n_Disable-Xshm-for-now-since-it-results-in-render-erro.patch
BuildRequires: autoconf >= 2.60 BuildRequires: bison
BuildRequires: automake
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: flex
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: imake BuildRequires: imake
BuildRequires: libtool BuildRequires: libtool
BuildRequires: meson
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: python3-base BuildRequires: python3-base
%if 0%{?suse_version} > 1320 %if 0%{?suse_version} > 1320
@ -763,83 +763,83 @@ egl_platforms=x11,drm,surfaceless,wayland
%else %else
egl_platforms=x11,drm,surfaceless egl_platforms=x11,drm,surfaceless
%endif %endif
autoreconf -fvi
export PYTHON2=%{_bindir}/python3 %meson \
%configure \ --auto-features=disabled \
%if %{drivers} %if %{drivers}
--disable-gles1 \ -Dgles1=false \
--disable-gles2 \ -Dgles2=false \
--disable-egl \ -Degl=true \
--disable-glx \ -Dglx=disabled \
--disable-osmesa \ -Dosmesa=none \
%else %else
%if 0%{?libglvnd} %if 0%{?libglvnd}
--enable-libglvnd \ -Dglvnd=true \
%endif %endif
--enable-gles1 \ -Dgles1=true \
--enable-gles2 \ -Dgles2=true \
--enable-egl \ -Degl=true \
--enable-osmesa \ -Dosmesa=classic \
-Dglx=auto \
-Dllvm=false \
-Dvulkan-drivers= \
%endif %endif
--with-platforms=$egl_platforms \ -Dplatforms=$egl_platforms \
--enable-dri \ -Ddri3=true \
--enable-texture-float \ -Dshared-glapi=true \
--enable-dri3 \
--enable-shared-glapi \
%if 0%{?with_nine} %if 0%{?with_nine}
--enable-nine \ -Dgallium-nine=true \
%endif %endif
%if %{glamor} %if %{glamor}
--enable-gbm \ -Dgbm=true \
--enable-glx-tls \
%endif %endif
%if 0%{with_opencl} %if 0%{with_opencl}
--enable-opencl \ -Dgallium-opencl=icd \
--enable-opencl-icd \
%endif %endif
--with-dri-searchpath=%{_libdir}/dri \ -Ddri-search-path=%{_libdir}/dri \
%if 0%{with_llvm} %if 0%{with_llvm}
--enable-llvm \ -Dllvm=true \
--enable-llvm-shared-libs \ -Dshared-llvm=true \
%endif %endif
%if %{drivers} %if %{drivers}
--enable-vdpau \ -Dgallium-vdpau=true \
%endif -Dgallium-xvmc=true \
--enable-va \ -Dgallium-va=true \
--enable-xvmc \
%if 0%{with_vulkan} %if 0%{with_vulkan}
--with-vulkan-drivers=intel,radeon \ -Dvulkan-drivers=intel,amd \
%endif
%endif %endif
%if %{drivers} %if %{drivers}
%ifarch %{ix86} x86_64 %ifarch %{ix86} x86_64
--enable-xa \ -Dgallium-xa=true \
--with-dri-drivers=i915,i965,nouveau,r200,radeon \ -Ddri-drivers=i915,i965,nouveau,r100,r200 \
--with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast,svga,virgl \ -Dgallium-drivers=r300,r600,radeonsi,nouveau,swrast,svga,virgl \
%endif %endif
%ifarch %{arm} aarch64 %ifarch %{arm} aarch64
--enable-xa \ -Dgallium-xa=true \
--with-dri-drivers=nouveau \ -Ddri-drivers=nouveau \
--with-gallium-drivers=r300,r600,nouveau,swrast,virgl,freedreno,vc4,etnaviv,imx \ -Dgallium-drivers=r300,r600,nouveau,swrast,virgl,freedreno,vc4,etnaviv,imx \
%endif %endif
%ifarch ppc64 ppc64le %ifarch ppc64 ppc64le
--enable-xa \ -Dgallium-xa=true \
--with-dri-drivers=nouveau \ -Ddri-drivers=nouveau \
--with-gallium-drivers=r300,r600,nouveau,swrast \ -Dgallium-drivers=r300,r600,nouveau,swrast \
%endif %endif
%ifarch ia64 ppc hppa s390 s390x riscv64 %ifarch ia64 ppc hppa s390 s390x riscv64
--with-dri-drivers=swrast \ -Ddri-drivers=swrast \
--with-gallium-drivers=swrast \ -Dgallium-drivers=swrast \
%endif %endif
%else %else
--with-dri-drivers= \ -Ddri-drivers=swrast \
--with-gallium-drivers= \ -Dgallium-drivers= \
%endif %endif
CFLAGS="%{optflags} -DNDEBUG" -Db_ndebug=true \
make %{?_smp_mflags} V=1 -Dc_args="%{optflags}"
%meson_build
%install %install
%make_install %meson_install
find %{buildroot} -type f -name "*.la" -delete -print find %{buildroot} -type f -name "*.la" -delete -print
# libwayland-egl is provided by wayland itself # libwayland-egl is provided by wayland itself
@ -853,6 +853,15 @@ rm -f %{buildroot}/%{_libdir}/pkgconfig/wayland-egl.pc
# in Mesa # in Mesa
rm -rf %{buildroot}/%{_datadir}/drirc.d rm -rf %{buildroot}/%{_datadir}/drirc.d
rm -f %{buildroot}/%{_libdir}/libEGL.so*
# in Mesa-libEGL-devel
rm %{buildroot}/%{_includedir}/EGL/egl.h
rm %{buildroot}/%{_includedir}/EGL/eglext.h
rm %{buildroot}/%{_includedir}/EGL/eglextchromium.h
rm %{buildroot}/%{_includedir}/EGL/eglmesaext.h
rm %{buildroot}/%{_includedir}/EGL/eglplatform.h
rm %{buildroot}/%{_libdir}/pkgconfig/egl.pc
# in Mesa-libGL-devel # in Mesa-libGL-devel
rm -rf %{buildroot}/%{_includedir}/GL rm -rf %{buildroot}/%{_includedir}/GL
@ -875,6 +884,9 @@ rm %{buildroot}/%{_libdir}/pkgconfig/gbm.pc
rm -rf %{buildroot}/%{_includedir}/KHR rm -rf %{buildroot}/%{_includedir}/KHR
%else %else
rm -rf %{buildroot}/%{_libdir}/dri/swrast_dri.so
%if 0%{?libglvnd} == 0 %if 0%{?libglvnd} == 0
# Make a symlink to libGL.so.1.2 for compatibility (bnc#809359, bnc#831306) # Make a symlink to libGL.so.1.2 for compatibility (bnc#809359, bnc#831306)
test -f %{buildroot}%{_libdir}/libGL.so.1.2 || \ test -f %{buildroot}%{_libdir}/libGL.so.1.2 || \
@ -1049,15 +1061,15 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%if %{xvmc_support} %if %{xvmc_support}
%files -n libXvMC_nouveau %files -n libXvMC_nouveau
%{_libdir}/libXvMCnouveau.so %{_libdir}/libXvMCnouveau.so
%{_libdir}/libXvMCnouveau.so.1 #%{_libdir}/libXvMCnouveau.so.1
%{_libdir}/libXvMCnouveau.so.1.0 #%{_libdir}/libXvMCnouveau.so.1.0
%{_libdir}/libXvMCnouveau.so.1.0.0 #%{_libdir}/libXvMCnouveau.so.1.0.0
%files -n libXvMC_r600 %files -n libXvMC_r600
%{_libdir}/libXvMCr600.so %{_libdir}/libXvMCr600.so
%{_libdir}/libXvMCr600.so.1 #%{_libdir}/libXvMCr600.so.1
%{_libdir}/libXvMCr600.so.1.0 #%{_libdir}/libXvMCr600.so.1.0
%{_libdir}/libXvMCr600.so.1.0.0 #%{_libdir}/libXvMCr600.so.1.0.0
%endif %endif
%if %{vdpau_nouveau} %if %{vdpau_nouveau}

14
Mesa.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Mon Jan 21 18:42:08 UTC 2019 - Tobias Klausmann <tobias.johannes.klausmann@mni.thm.de>
- Update the version of the mesa core package to 18.3.2
-------------------------------------------------------------------
Mon Jan 21 18:29:27 UTC 2019 - Tobias Klausmann <tobias.johannes.klausmann@mni.thm.de>
- Build Mesa with meson instead of automake
+ Build classic swrast with Mesa, as its a dependency for osmesa - delete it
while installing
+ Build egl with Mesa-drivers as it demands one windowing-system -
delete it while installing
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jan 18 18:32:13 UTC 2019 - sndirsch@suse.com Fri Jan 18 18:32:13 UTC 2019 - sndirsch@suse.com

126
Mesa.spec
View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
@ -136,15 +136,15 @@ Patch31: archlinux_0001-Fix-linkage-against-shared-glapi.patch
Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch
Patch57: u_wayland_egl-Ensure-EGL-surface.patch Patch57: u_wayland_egl-Ensure-EGL-surface.patch
Patch60: n_Disable-Xshm-for-now-since-it-results-in-render-erro.patch Patch60: n_Disable-Xshm-for-now-since-it-results-in-render-erro.patch
BuildRequires: autoconf >= 2.60 BuildRequires: bison
BuildRequires: automake
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: flex
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: imake BuildRequires: imake
BuildRequires: libtool BuildRequires: libtool
BuildRequires: meson
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: python3-base BuildRequires: python3-base
%if 0%{?suse_version} > 1320 %if 0%{?suse_version} > 1320
@ -762,83 +762,83 @@ egl_platforms=x11,drm,surfaceless,wayland
%else %else
egl_platforms=x11,drm,surfaceless egl_platforms=x11,drm,surfaceless
%endif %endif
autoreconf -fvi
export PYTHON2=%{_bindir}/python3 %meson \
%configure \ --auto-features=disabled \
%if %{drivers} %if %{drivers}
--disable-gles1 \ -Dgles1=false \
--disable-gles2 \ -Dgles2=false \
--disable-egl \ -Degl=true \
--disable-glx \ -Dglx=disabled \
--disable-osmesa \ -Dosmesa=none \
%else %else
%if 0%{?libglvnd} %if 0%{?libglvnd}
--enable-libglvnd \ -Dglvnd=true \
%endif %endif
--enable-gles1 \ -Dgles1=true \
--enable-gles2 \ -Dgles2=true \
--enable-egl \ -Degl=true \
--enable-osmesa \ -Dosmesa=classic \
-Dglx=auto \
-Dllvm=false \
-Dvulkan-drivers= \
%endif %endif
--with-platforms=$egl_platforms \ -Dplatforms=$egl_platforms \
--enable-dri \ -Ddri3=true \
--enable-texture-float \ -Dshared-glapi=true \
--enable-dri3 \
--enable-shared-glapi \
%if 0%{?with_nine} %if 0%{?with_nine}
--enable-nine \ -Dgallium-nine=true \
%endif %endif
%if %{glamor} %if %{glamor}
--enable-gbm \ -Dgbm=true \
--enable-glx-tls \
%endif %endif
%if 0%{with_opencl} %if 0%{with_opencl}
--enable-opencl \ -Dgallium-opencl=icd \
--enable-opencl-icd \
%endif %endif
--with-dri-searchpath=%{_libdir}/dri \ -Ddri-search-path=%{_libdir}/dri \
%if 0%{with_llvm} %if 0%{with_llvm}
--enable-llvm \ -Dllvm=true \
--enable-llvm-shared-libs \ -Dshared-llvm=true \
%endif %endif
%if %{drivers} %if %{drivers}
--enable-vdpau \ -Dgallium-vdpau=true \
%endif -Dgallium-xvmc=true \
--enable-va \ -Dgallium-va=true \
--enable-xvmc \
%if 0%{with_vulkan} %if 0%{with_vulkan}
--with-vulkan-drivers=intel,radeon \ -Dvulkan-drivers=intel,amd \
%endif
%endif %endif
%if %{drivers} %if %{drivers}
%ifarch %{ix86} x86_64 %ifarch %{ix86} x86_64
--enable-xa \ -Dgallium-xa=true \
--with-dri-drivers=i915,i965,nouveau,r200,radeon \ -Ddri-drivers=i915,i965,nouveau,r100,r200 \
--with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast,svga,virgl \ -Dgallium-drivers=r300,r600,radeonsi,nouveau,swrast,svga,virgl \
%endif %endif
%ifarch %{arm} aarch64 %ifarch %{arm} aarch64
--enable-xa \ -Dgallium-xa=true \
--with-dri-drivers=nouveau \ -Ddri-drivers=nouveau \
--with-gallium-drivers=r300,r600,nouveau,swrast,virgl,freedreno,vc4,etnaviv,imx \ -Dgallium-drivers=r300,r600,nouveau,swrast,virgl,freedreno,vc4,etnaviv,imx \
%endif %endif
%ifarch ppc64 ppc64le %ifarch ppc64 ppc64le
--enable-xa \ -Dgallium-xa=true \
--with-dri-drivers=nouveau \ -Ddri-drivers=nouveau \
--with-gallium-drivers=r300,r600,nouveau,swrast \ -Dgallium-drivers=r300,r600,nouveau,swrast \
%endif %endif
%ifarch ia64 ppc hppa s390 s390x riscv64 %ifarch ia64 ppc hppa s390 s390x riscv64
--with-dri-drivers=swrast \ -Ddri-drivers=swrast \
--with-gallium-drivers=swrast \ -Dgallium-drivers=swrast \
%endif %endif
%else %else
--with-dri-drivers= \ -Ddri-drivers=swrast \
--with-gallium-drivers= \ -Dgallium-drivers= \
%endif %endif
CFLAGS="%{optflags} -DNDEBUG" -Db_ndebug=true \
make %{?_smp_mflags} V=1 -Dc_args="%{optflags}"
%meson_build
%install %install
%make_install %meson_install
find %{buildroot} -type f -name "*.la" -delete -print find %{buildroot} -type f -name "*.la" -delete -print
# libwayland-egl is provided by wayland itself # libwayland-egl is provided by wayland itself
@ -852,6 +852,15 @@ rm -f %{buildroot}/%{_libdir}/pkgconfig/wayland-egl.pc
# in Mesa # in Mesa
rm -rf %{buildroot}/%{_datadir}/drirc.d rm -rf %{buildroot}/%{_datadir}/drirc.d
rm -f %{buildroot}/%{_libdir}/libEGL.so*
# in Mesa-libEGL-devel
rm %{buildroot}/%{_includedir}/EGL/egl.h
rm %{buildroot}/%{_includedir}/EGL/eglext.h
rm %{buildroot}/%{_includedir}/EGL/eglextchromium.h
rm %{buildroot}/%{_includedir}/EGL/eglmesaext.h
rm %{buildroot}/%{_includedir}/EGL/eglplatform.h
rm %{buildroot}/%{_libdir}/pkgconfig/egl.pc
# in Mesa-libGL-devel # in Mesa-libGL-devel
rm -rf %{buildroot}/%{_includedir}/GL rm -rf %{buildroot}/%{_includedir}/GL
@ -874,6 +883,9 @@ rm %{buildroot}/%{_libdir}/pkgconfig/gbm.pc
rm -rf %{buildroot}/%{_includedir}/KHR rm -rf %{buildroot}/%{_includedir}/KHR
%else %else
rm -rf %{buildroot}/%{_libdir}/dri/swrast_dri.so
%if 0%{?libglvnd} == 0 %if 0%{?libglvnd} == 0
# Make a symlink to libGL.so.1.2 for compatibility (bnc#809359, bnc#831306) # Make a symlink to libGL.so.1.2 for compatibility (bnc#809359, bnc#831306)
test -f %{buildroot}%{_libdir}/libGL.so.1.2 || \ test -f %{buildroot}%{_libdir}/libGL.so.1.2 || \
@ -1048,15 +1060,15 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%if %{xvmc_support} %if %{xvmc_support}
%files -n libXvMC_nouveau %files -n libXvMC_nouveau
%{_libdir}/libXvMCnouveau.so %{_libdir}/libXvMCnouveau.so
%{_libdir}/libXvMCnouveau.so.1 #%{_libdir}/libXvMCnouveau.so.1
%{_libdir}/libXvMCnouveau.so.1.0 #%{_libdir}/libXvMCnouveau.so.1.0
%{_libdir}/libXvMCnouveau.so.1.0.0 #%{_libdir}/libXvMCnouveau.so.1.0.0
%files -n libXvMC_r600 %files -n libXvMC_r600
%{_libdir}/libXvMCr600.so %{_libdir}/libXvMCr600.so
%{_libdir}/libXvMCr600.so.1 #%{_libdir}/libXvMCr600.so.1
%{_libdir}/libXvMCr600.so.1.0 #%{_libdir}/libXvMCr600.so.1.0
%{_libdir}/libXvMCr600.so.1.0.0 #%{_libdir}/libXvMCr600.so.1.0.0
%endif %endif
%if %{vdpau_nouveau} %if %{vdpau_nouveau}