Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -1,3 +1,4 @@
 /envytools-20150812.tar.bz2
 /envytools-20151030.tar.bz2
 /envytools-20200304.tar.bz2
+/envytools-20200810.tar.bz2

envytools-20200304-fcommon-fix.patch

@@ -1,47 +0,0 @@
-diff -up envytools-20200304/demmt/mmt_bin2dedma.c~ envytools-20200304/demmt/mmt_bin2dedma.c
---- envytools-20200304/demmt/mmt_bin2dedma.c~	2020-01-08 22:37:16.000000000 +0100
-+++ envytools-20200304/demmt/mmt_bin2dedma.c	2020-03-04 23:49:33.170318019 +0100
-@@ -37,6 +37,10 @@
- static const int interpret_args_as_text = 0;
- static const int dump_addr1_as_diff = 0;
- 
-+static struct mmt_txt_nvidia_state
-+{
-+} mmt_txt_nv_state;
-+
- void txt_memread(struct mmt_read *w, void *state)
- {
- 	unsigned char *data = &w->data[0];
-diff -up envytools-20200304/demmt/mmt_bin2dedma.h~ envytools-20200304/demmt/mmt_bin2dedma.h
---- envytools-20200304/demmt/mmt_bin2dedma.h~	2020-01-08 22:37:16.000000000 +0100
-+++ envytools-20200304/demmt/mmt_bin2dedma.h	2020-03-04 23:49:35.538339064 +0100
-@@ -19,10 +19,6 @@ void txt_msg(uint8_t *data, unsigned int
- void txt_write_syscall(struct mmt_write_syscall *o, void *state);
- void txt_dup(struct mmt_dup_syscall *o, void *state);
- 
--struct mmt_txt_nvidia_state
--{
--} mmt_txt_nv_state;
--
- extern const struct mmt_nvidia_decode_funcs txt_nvidia_funcs;
- extern const struct mmt_nvidia_decode_funcs txt_nvidia_funcs_empty;
- void dump_args(struct mmt_memory_dump *args, int argc);
-diff -up envytools-20200304/include/var.h~ envytools-20200304/include/var.h
---- envytools-20200304/include/var.h~	2020-01-08 22:37:16.000000000 +0100
-+++ envytools-20200304/include/var.h	2020-03-05 00:01:39.768175014 +0100
-@@ -93,13 +93,13 @@ struct vardata {
- 	int validated;
- };
- 
--enum {
-+enum vardata_symtype {
- 	VARDATA_ST_FEATURE,
- 	VARDATA_ST_VARIANT,
- 	VARDATA_ST_VARSET,
- 	VARDATA_ST_MODE,
- 	VARDATA_ST_MODESET,
--} vardata_symtype;
-+};
- 
- struct vardata *vardata_new(const char *name);
- void vardata_del(struct vardata *data);

envytools-add-missing-GETPARAM_PHYS-defines.patch

@@ -0,0 +1,14 @@
+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;

envytools.spec

@@ -1,16 +1,16 @@
-%global gitdate 20200304
+%global gitdate 20200810
 
 Name:           envytools
 Version:        0.0
-Release:        0.17.git%{gitdate}%{?dist}
+Release:        0.33.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-20200304-fcommon-fix.patch
-ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
+Patch1:         envytools-add-missing-GETPARAM_PHYS-defines.patch
+ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 riscv64
 BuildRequires:  gcc g++
 BuildRequires:  cmake flex bison
 BuildRequires:  libpciaccess-devel libX11-devel libXext-devel libseccomp-devel
@@ -40,12 +40,13 @@ hardware supported by the nouveau driver project.
 
 
 %build
-%cmake -DBUILD_SHARED_LIBS:BOOL=OFF .
-make %{?_smp_mflags}
+
+%cmake -DBUILD_SHARED_LIBS:BOOL=OFF
+%cmake_build
 
 
 %install
-%make_install
+%cmake_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
@@ -81,6 +82,56 @@ rm $RPM_BUILD_ROOT%{_docdir}/%{name}/hwdocs/*.py
 
 
 %changelog
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.0-0.33.git20200810
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.0-0.32.git20200810
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.0-0.31.git20200810
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Thu Feb 22 2024 Liu Yang <Yang.Liu.sn@gmail.com> - 0.0-0.30.git20200810
+- Add riscv64.
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.0-0.29.git20200810
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.0-0.28.git20200810
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.0-0.27.git20200810
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.0-0.26.git20200810
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.0-0.25.git20200810
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.0-0.24.git20200810
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.0-0.23.git20200810
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon May 10 2021 Jeff Law <jlaw@tachyum.com> - 0.0-0.22.git20200810
+- Re-enable LTO
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.0-0.21.git20200810
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Aug 10 2020 Hans de Goede <hdegoede@redhat.com> - 0.0-0.20.git20200810
+- Update to a recent git snapshot
+- Fix FTBFS (rhbz#1863484)
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.0-0.19.git20200304
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.0-0.18.git20200304
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Wed Mar  4 2020 Hans de Goede <hdegoede@redhat.com> - 0.0-0.17.git20200304
 - Update to a recent git snapshot
 - Fix FTBFS (rhbz#1799319)

sources

@@ -1 +1 @@
-SHA512 (envytools-20200304.tar.bz2) = 91f082b254e47b5837099e3055d622e1972fceeeb111b6d826d73c728af3e8e751a9f7313e138f6eb048c5fc36e74de9e8e256a1272b199d5000869560291f86
+SHA512 (envytools-20200810.tar.bz2) = 79849ec9d1b3af0c0fef736583417608036c8bfe57b33d17b12aec6ecfd47e6dc2eb9db60360b43174d0abca72d22b59e23f4cfcfd839f638d4de7efc11696fe