Update to 0.2.999
This commit is contained in:
parent
91dd71dac5
commit
bf3d3a66ed
@ -1,14 +1,14 @@
|
||||
%undefine _hardened_build
|
||||
|
||||
%global commit0 f7fbc4bb8b75eafca2a109db812f437aba717d67
|
||||
%global commit0 14f6283166001d10074c75a2ce5a6de1aaff5446
|
||||
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
|
||||
|
||||
Name: libglvnd
|
||||
Version: 0.1.1
|
||||
Version: 0.2.999
|
||||
Release: 1%{?commit0:.git%{shortcommit0}}%{?dist}
|
||||
Summary: The GL Vendor-Neutral Dispatch library
|
||||
|
||||
License: MIT and BSD and LGPLv2+
|
||||
License: LGPLv2+
|
||||
URL: https://github.com/NVIDIA/libglvnd
|
||||
Source0: https://github.com/NVIDIA/%{name}/archive/%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz
|
||||
|
||||
@ -24,6 +24,10 @@ BuildRequires: pkgconfig(x11)
|
||||
BuildRequires: pkgconfig(xv)
|
||||
|
||||
# X11 tests:
|
||||
#Xvfb is unlikely to reproduce a full Xorg environnement
|
||||
#So some tests are failing
|
||||
#Also, at this time, upstream mesa is missing GLX_EXT_libglvnd
|
||||
#https://github.com/NVIDIA/libglvnd/issues/93
|
||||
BuildRequires: xorg-x11-server-Xvfb
|
||||
|
||||
# Introduced in f23
|
||||
@ -31,8 +35,8 @@ Provides: xorg-x11-glvnd = 0.1.0
|
||||
Obsoletes: xorg-x11-glvnd < 0.1.0
|
||||
|
||||
%{!?_with_mesa_glvnd_default:
|
||||
%global __provides_exclude ^(libGL\\.so.*|libGLESv2\\.so.*)$
|
||||
%global __requires_exclude ^(libGL\\.so.*|libGLESv2\\.so.*)$
|
||||
%global __provides_exclude ^(libGL\\.so.*|libEGL\\.so.*|libGLESv2\\.so.*)$
|
||||
%global __requires_exclude ^(libGL\\.so.*|libEGL\\.so.*|libGLESv2\\.so.*)$
|
||||
}
|
||||
|
||||
|
||||
@ -46,7 +50,7 @@ future this library may support EGL and OpenGL ES as well.
|
||||
|
||||
%package devel
|
||||
Summary: Development files for %{name}
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Requires: %{name}%{?_isa} = :%{version}-%{release}
|
||||
|
||||
%description devel
|
||||
The %{name}-devel package contains libraries and header files for
|
||||
@ -74,7 +78,7 @@ find %{buildroot} -name '*.la' -delete
|
||||
%{!?_with_mesa_glvnd_default:
|
||||
# Avoid conflict with mesa-libGL until mesa has gained libglvnd support
|
||||
mkdir -p %{buildroot}%{_libdir}/%{name}
|
||||
for l in libGL libGLESv2 ; do
|
||||
for l in libEGL libGL libGLESv2 ; do
|
||||
mv %{buildroot}%{_libdir}/${l}.so* \
|
||||
%{buildroot}%{_libdir}/%{name}
|
||||
done
|
||||
@ -83,6 +87,10 @@ done
|
||||
# Fedora does not provide libGLESv1_CM
|
||||
rm -rf %{buildroot}%{_libdir}/libGLESv1_CM*
|
||||
|
||||
# Create directory layout
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/glvnd/egl_vendor.d
|
||||
mkdir -p %{buildroot}%{_datadir}/glvnd/egl_vendor.d
|
||||
|
||||
|
||||
%check
|
||||
export DO_X11_TESTS=1
|
||||
@ -105,6 +113,10 @@ xvfb-run -a make check V=1 || :
|
||||
%dir %{_libdir}/%{name}
|
||||
%{_libdir}/%{name}/lib*GL*.so.*
|
||||
}
|
||||
%dir %{_sysconfdir}/glvnd
|
||||
%dir %{_sysconfdir}/glvnd/egl_vendor.d
|
||||
%dir %{_datadir}/glvnd
|
||||
%dir %{_datadir}/glvnd/egl_vendor.d
|
||||
|
||||
%files devel
|
||||
%dir %{_includedir}/glvnd
|
||||
@ -117,6 +129,14 @@ xvfb-run -a make check V=1 || :
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Sep 15 2016 Nicolas Chauvet <kwizart@gmail.com> - 0.2.999-1.git14f6283
|
||||
- Update to 2.999 version
|
||||
- Add EGL
|
||||
|
||||
* Fri Sep 02 2016 Nicolas Chauvet <kwizart@gmail.com> - 0.1.1-2.gitf7fbc4b
|
||||
- Update license
|
||||
- Fix Obsoletes/Provides to avoid self obsolete
|
||||
|
||||
* Tue Aug 30 2016 Nicolas Chauvet <kwizart@gmail.com> - 0.1.1-1.gitf7fbc4b
|
||||
- Update to 1.1.gitf7fbc4b
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user