From 8a6c7f93d581a661e78467f32c76fb7ed2e73ef3 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 15 Mar 2018 12:51:25 -0400 Subject: [PATCH] Use Recommends: mesa-* not Requires. (Trivially) switch the build to python3 --- libglvnd-python3.patch | 54 ++++++++++++++++++++++++++++++++++++++++++ libglvnd.spec | 18 ++++++++------ 2 files changed, 65 insertions(+), 7 deletions(-) create mode 100644 libglvnd-python3.patch diff --git a/libglvnd-python3.patch b/libglvnd-python3.patch new file mode 100644 index 0000000..fe72800 --- /dev/null +++ b/libglvnd-python3.patch @@ -0,0 +1,54 @@ +diff -up libglvnd-1.0.0/src/generate/eglFunctionList.py.jx libglvnd-1.0.0/src/generate/eglFunctionList.py +--- libglvnd-1.0.0/src/generate/eglFunctionList.py.jx 2017-11-02 12:58:38.000000000 -0400 ++++ libglvnd-1.0.0/src/generate/eglFunctionList.py 2018-03-15 12:43:19.113294070 -0400 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + + """ + Contains a list of EGL functions to generate dispatch functions for. +diff -up libglvnd-1.0.0/src/generate/genCommon.py.jx libglvnd-1.0.0/src/generate/genCommon.py +--- libglvnd-1.0.0/src/generate/genCommon.py.jx 2017-11-02 12:58:38.000000000 -0400 ++++ libglvnd-1.0.0/src/generate/genCommon.py 2018-03-15 12:37:13.260268667 -0400 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + + # (C) Copyright 2015, NVIDIA CORPORATION. + # All Rights Reserved. +diff -up libglvnd-1.0.0/src/generate/gen_egl_dispatch.py.jx libglvnd-1.0.0/src/generate/gen_egl_dispatch.py +--- libglvnd-1.0.0/src/generate/gen_egl_dispatch.py.jx 2017-11-02 12:58:38.000000000 -0400 ++++ libglvnd-1.0.0/src/generate/gen_egl_dispatch.py 2018-03-15 12:43:00.057032312 -0400 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + + """ + Generates dispatch functions for EGL. +diff -up libglvnd-1.0.0/src/generate/gen_gldispatch_mapi.py.jx libglvnd-1.0.0/src/generate/gen_gldispatch_mapi.py +--- libglvnd-1.0.0/src/generate/gen_gldispatch_mapi.py.jx 2017-11-02 12:58:38.000000000 -0400 ++++ libglvnd-1.0.0/src/generate/gen_gldispatch_mapi.py 2018-03-15 12:37:13.283268982 -0400 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + + # Copyright (C) 2010 LunarG Inc. + # (C) Copyright 2015, NVIDIA CORPORATION. +diff -up libglvnd-1.0.0/src/generate/gen_libgl_glxstubs.py.jx libglvnd-1.0.0/src/generate/gen_libgl_glxstubs.py +--- libglvnd-1.0.0/src/generate/gen_libgl_glxstubs.py.jx 2017-11-02 12:58:38.000000000 -0400 ++++ libglvnd-1.0.0/src/generate/gen_libgl_glxstubs.py 2018-03-15 12:37:10.684233282 -0400 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + + # (C) Copyright 2015, NVIDIA CORPORATION. + # All Rights Reserved. +diff -up libglvnd-1.0.0/src/generate/gen_libOpenGL_exports.py.jx libglvnd-1.0.0/src/generate/gen_libOpenGL_exports.py +--- libglvnd-1.0.0/src/generate/gen_libOpenGL_exports.py.jx 2017-11-02 12:58:38.000000000 -0400 ++++ libglvnd-1.0.0/src/generate/gen_libOpenGL_exports.py 2018-03-15 12:37:13.308269324 -0400 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + + # (C) Copyright 2015, NVIDIA CORPORATION. + # All Rights Reserved. diff --git a/libglvnd.spec b/libglvnd.spec index 211d772..759329b 100644 --- a/libglvnd.spec +++ b/libglvnd.spec @@ -11,7 +11,7 @@ Name: libglvnd Version: 1.0.1 -Release: 0.2%{?commit0:.%{date}git%{shortcommit0}}%{?dist} +Release: 0.3%{?commit0:.%{date}git%{shortcommit0}}%{?dist} # Provide an upgrade path from the negativo17.org pkgs which have Epoch 1 Epoch: 1 Summary: The GL Vendor-Neutral Dispatch library @@ -21,11 +21,12 @@ URL: https://github.com/NVIDIA/libglvnd #Source0: %%{url}/archive/v%%{version}/%%{name}-%%{version}.tar.gz Source0: %{url}/archive/%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz Patch0: %{url}/pull/150.patch#/X_GLXCreateContextAtrribsARB_fix_API_break.patch +Patch1: libglvnd-python3.patch BuildRequires: libtool BuildRequires: gcc -BuildRequires: python2 -BuildRequires: python2-libxml2 +BuildRequires: python3 +BuildRequires: python3-libxml2 BuildRequires: pkgconfig(glproto) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xext) @@ -101,7 +102,7 @@ Summary: GLES support for libglvnd Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} %{!?_without_mesa_glvnd_default: # mesa is the default EGL implementation provider -Requires: mesa-libEGL%{?_isa} >= 13.0.4-1 +Recommends: mesa-libEGL%{?_isa} >= 13.0.4-1 Provides: libGLES Provides: libGLES%{?_isa} } @@ -115,7 +116,7 @@ Summary: EGL support for libglvnd Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} %{!?_without_mesa_glvnd_default: # mesa is the default EGL implementation provider -Requires: mesa-libEGL%{?_isa} >= 13.0.4-1 +Recommends: mesa-libEGL%{?_isa} >= 13.0.4-1 Provides: libEGL Provides: libEGL%{?_isa} } @@ -129,7 +130,7 @@ Summary: GLX support for libglvnd Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} %{!?_without_mesa_glvnd_default: # mesa is the default GL implementation provider -Requires: mesa-libGL%{?_isa} >= 13.0.4-1 +Recommends: mesa-libGL%{?_isa} >= 13.0.4-1 Provides: libGL Provides: libGL%{?_isa} } @@ -146,7 +147,6 @@ autoreconf268 -vif autoreconf -vif %endif - %build #Prefer asm and tls for x86* and ppc64* #armhfp and aarch64 fallback to asm and tsd @@ -244,6 +244,10 @@ xvfb-run -a make check V=1 || cat `find . -name test-suite.log` %changelog +* Thu Mar 15 2018 Adam Jackson - 1.0.1-0.3.20180226gitb029c24 +- Use Recommends: mesa-* not Requires. +- (Trivially) switch the build to python3 + * Thu Mar 15 2018 Iryna Shcherbina - 1:1.0.1-0.2.20180226gitb029c24 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)