From 0d984f08baf7df41e90a3f98f24b21a46db5bf17 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 20 May 2016 16:15:27 +0200 Subject: [PATCH] Update to sources --- ...g-server-and-glproto-since-glvnd-eol.patch | 25 ------------------- libglvnd.spec | 11 ++++---- sources | 2 +- 3 files changed, 7 insertions(+), 31 deletions(-) delete mode 100644 0001-clean-up-xorg-server-and-glproto-since-glvnd-eol.patch diff --git a/0001-clean-up-xorg-server-and-glproto-since-glvnd-eol.patch b/0001-clean-up-xorg-server-and-glproto-since-glvnd-eol.patch deleted file mode 100644 index 7bb2771..0000000 --- a/0001-clean-up-xorg-server-and-glproto-since-glvnd-eol.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 50e5a23f7d872006a7432ad26e40005c4d235d03 Mon Sep 17 00:00:00 2001 -From: Nicolas Chauvet -Date: Fri, 13 May 2016 17:00:26 +0200 -Subject: [PATCH] clean-up xorg-server and glproto since glvnd eol - ---- - configure.ac | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 27da191..630c2b7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -100,8 +100,6 @@ AX_PTHREAD() - - PKG_CHECK_MODULES([X11], [x11]) - PKG_CHECK_MODULES([XEXT], [xext]) --PKG_CHECK_MODULES([XORG], [xorg-server >= 1.11.0]) --PKG_CHECK_MODULES([GLPROTO], [glproto]) - - dnl Checks for typedefs, structures, and compiler characteristics. - AC_C_TYPEOF --- -2.4.11 - diff --git a/libglvnd.spec b/libglvnd.spec index 557f90f..425c3b2 100644 --- a/libglvnd.spec +++ b/libglvnd.spec @@ -1,17 +1,16 @@ %undefine _hardened_build -%global commit0 509de0dbc8b6be93dd9dc2e1b1b7b9268d4ddbdf +%global commit0 a82982d93a75c48bac7a894639b26e5f05ff8364 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: libglvnd Version: 0.1.0 -Release: 2%{?commit0:.git%{shortcommit0}}%{?dist} +Release: 3%{?commit0:.git%{shortcommit0}}%{?dist} Summary: The GL Vendor-Neutral Dispatch library License: MIT and BSD and LGPLv2+ URL: https://github.com/NVIDIA/libglvnd Source0: https://github.com/NVIDIA/%{name}/archive/%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz -Patch0: 0001-clean-up-xorg-server-and-glproto-since-glvnd-eol.patch #This library only target few architectures use case ExclusiveArch: x86_64 i686 armv7hl @@ -54,7 +53,6 @@ developing applications that use %{name}. %prep %setup -q -n %{name}-%{?commit0}%{?!commit0:%{version}} -%patch0 -p1 autoreconf -vif @@ -70,7 +68,7 @@ make %{?_smp_mflags} V=1 find %{buildroot} -name '*.la' -exec rm -f {} ';' %{!?_with_mesa_glvnd_default: -# Avoid conflict with mesa-libGL for now +# Avoid conflict with mesa-libGL until mesa has gained libglvnd support mkdir -p %{buildroot}%{_libdir}/%{name} for l in libGL libGLESv2 ; do mv %{buildroot}%{_libdir}/${l}.so* \ @@ -110,6 +108,9 @@ xvfb-run -a make check V=1 || : %changelog +* Fri May 20 2016 Nicolas Chauvet - 0.1.0-3.gita82982d +- Update to current snapshot + * Fri May 13 2016 Nicolas Chauvet - 0.1.0-2.git509de0d - Update to current snapshot - Remove unused dt-auxiliary diff --git a/sources b/sources index 01ab31d..be1595d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6e964cbb23dfe6b74695e3d2d4a7b165 libglvnd-509de0d.tar.gz +80e13034ce86b5a7578bcd27e06f9c64 libglvnd-509de0d.tar.gz