diff --git a/.gitignore b/.gitignore index d737371..6ba1f7e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,2 @@ /envytools-20150812.tar.bz2 /envytools-20151030.tar.bz2 -/envytools-20200304.tar.bz2 -/envytools-20200810.tar.bz2 diff --git a/envytools-add-missing-GETPARAM_PHYS-defines.patch b/envytools-add-missing-GETPARAM_PHYS-defines.patch deleted file mode 100644 index a08fdac..0000000 --- a/envytools-add-missing-GETPARAM_PHYS-defines.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up envytools-20200304/demmt/drm.c~ envytools-20200304/demmt/drm.c ---- envytools-20200304/demmt/drm.c~ 2020-01-08 22:37:16.000000000 +0100 -+++ envytools-20200304/demmt/drm.c 2020-08-10 10:40:58.746583531 +0200 -@@ -267,6 +267,10 @@ static char *nouveau_param_names[] = { - #define DRM_NOUVEAU_IOCTL_GEM_CPU_FINI DRM_IOW( DRM_COMMAND_BASE + DRM_NOUVEAU_GEM_CPU_FINI, struct drm_nouveau_gem_cpu_fini) - #define DRM_NOUVEAU_IOCTL_GEM_INFO DRM_IOWR(DRM_COMMAND_BASE + DRM_NOUVEAU_GEM_INFO, struct drm_nouveau_gem_info) - -+#define NOUVEAU_GETPARAM_FB_PHYSICAL 6 -+#define NOUVEAU_GETPARAM_AGP_PHYSICAL 7 -+#define NOUVEAU_GETPARAM_PCI_PHYSICAL 10 -+ - struct drm_version64 - { - int version_major; diff --git a/envytools.spec b/envytools.spec index 667ac3a..8324fcd 100644 --- a/envytools.spec +++ b/envytools.spec @@ -1,17 +1,16 @@ -%global gitdate 20200810 +%global gitdate 20151030 Name: envytools Version: 0.0 -Release: 0.33.git%{gitdate}%{?dist} +Release: 0.15.git%{gitdate}%{?dist} Summary: Tools for people envious of nvidia's blob driver License: MIT URL: https://github.com/envytools/envytools # Generated by make-git-snapshot.sh Source0: envytools-%{gitdate}.tar.bz2 Source1: make-git-snapshot.sh -Patch1: envytools-add-missing-GETPARAM_PHYS-defines.patch -ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 riscv64 -BuildRequires: gcc g++ +ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 +BuildRequires: gcc BuildRequires: cmake flex bison BuildRequires: libpciaccess-devel libX11-devel libXext-devel libseccomp-devel BuildRequires: libxml2-devel libvdpau-devel libdrm-devel python3-devel @@ -36,17 +35,16 @@ hardware supported by the nouveau driver project. %prep -%autosetup -p1 -n %{name}-%{gitdate} +%setup -q -n %{name}-%{gitdate} %build - -%cmake -DBUILD_SHARED_LIBS:BOOL=OFF -%cmake_build +%cmake -DBUILD_SHARED_LIBS:BOOL=OFF . +make %{?_smp_mflags} %install -%cmake_install +%make_install cp -p COPYING $RPM_BUILD_ROOT%{_docdir}/%{name} # Remove the tools for rules-ng-ng XML register db manipulation rm $RPM_BUILD_ROOT%{_bindir}/headergen @@ -70,7 +68,6 @@ rm $RPM_BUILD_ROOT%{_docdir}/%{name}/hwdocs/*.py %{_bindir}/evotiming %{_bindir}/mmt_* %{_bindir}/nv01* -%{_bindir}/nv03post %{_bindir}/nva* %{_bindir}/nvbios %{_bindir}/vdpow @@ -82,63 +79,6 @@ rm $RPM_BUILD_ROOT%{_docdir}/%{name}/hwdocs/*.py %changelog -* Wed Jul 23 2025 Fedora Release Engineering - 0.0-0.33.git20200810 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jan 16 2025 Fedora Release Engineering - 0.0-0.32.git20200810 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Jul 17 2024 Fedora Release Engineering - 0.0-0.31.git20200810 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Feb 22 2024 Liu Yang - 0.0-0.30.git20200810 -- Add riscv64. - -* Wed Jan 24 2024 Fedora Release Engineering - 0.0-0.29.git20200810 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 0.0-0.28.git20200810 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jul 19 2023 Fedora Release Engineering - 0.0-0.27.git20200810 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 0.0-0.26.git20200810 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 0.0-0.25.git20200810 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 0.0-0.24.git20200810 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 0.0-0.23.git20200810 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon May 10 2021 Jeff Law - 0.0-0.22.git20200810 -- Re-enable LTO - -* Tue Jan 26 2021 Fedora Release Engineering - 0.0-0.21.git20200810 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Aug 10 2020 Hans de Goede - 0.0-0.20.git20200810 -- Update to a recent git snapshot -- Fix FTBFS (rhbz#1863484) - -* Sat Aug 01 2020 Fedora Release Engineering - 0.0-0.19.git20200304 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 0.0-0.18.git20200304 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Mar 4 2020 Hans de Goede - 0.0-0.17.git20200304 -- Update to a recent git snapshot -- Fix FTBFS (rhbz#1799319) - -* Tue Jan 28 2020 Fedora Release Engineering - 0.0-0.16.git20151030 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - * Wed Jul 24 2019 Fedora Release Engineering - 0.0-0.15.git20151030 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 2ac38d3..4ea17a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (envytools-20200810.tar.bz2) = 79849ec9d1b3af0c0fef736583417608036c8bfe57b33d17b12aec6ecfd47e6dc2eb9db60360b43174d0abca72d22b59e23f4cfcfd839f638d4de7efc11696fe +c7e44f1824da88594b613a6ebd849dde envytools-20151030.tar.bz2