[vdr-softhddevice] Rebuilt for new VDR API version 2.7.3
by Martin Gansser
commit 7ad640bbe97532ae44244f75cce40d91027239b2
Author: Martin Gansser <mgansser(a)netcom-mail.de>
Date: Mon Oct 21 16:52:55 2024 +0200
Rebuilt for new VDR API version 2.7.3
.gitignore | 1 +
sources | 2 +-
vdr-softhddevice.spec | 22 +++++++++++++++++-----
3 files changed, 19 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3f56aed..4193e09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,3 +51,4 @@
/vdr-softhddevice-2.3.5.tar.gz
/vdr-softhddevice-2.3.6.tar.gz
/vdr-softhddevice-2.3.7.tar.gz
+/vdr-softhddevice-2.3.8.tar.gz
diff --git a/sources b/sources
index d0b3e29..98bc9d3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vdr-softhddevice-2.3.7.tar.gz) = c2cd77d98b180420c09918a53b3391b063faa40fa889a8c879776383d99fa8f7c33dc0a353a4d6ec323c531d02e26885e16f0e99ef312f31fa4307c5e671c3cf
+SHA512 (vdr-softhddevice-2.3.8.tar.gz) = 4619742e8f82de28ee1c8c1c9ddfc03012117f660cfdb85c906bc2783f4770d81e48569d035a4d5f42963827adfb28b6a009cb45fc36de29a03c1d6d843f469f
diff --git a/vdr-softhddevice.spec b/vdr-softhddevice.spec
index d02f741..3c254fa 100644
--- a/vdr-softhddevice.spec
+++ b/vdr-softhddevice.spec
@@ -1,15 +1,18 @@
-# version we want build against
+# version we want to build against
%global vdr_version 2.6.3
-%if 0%{?fedora} >= 40
+# Set vdr_version based on Fedora version
+%if 0%{?fedora} >= 42
+%global vdr_version 2.7.2
+%elif 0%{?fedora} >= 40
%global vdr_version 2.6.9
%endif
Name: vdr-softhddevice
-Version: 2.3.7
-Release: 1%{?dist}
+Version: 2.3.8
+Release: 2%{?dist}
Summary: A software and GPU emulated HD output device plugin for VDR
-License: AGPLv3
+License: AGPL-3.0-only
URL: https://github.com/ua0lnj/vdr-plugin-softhddevice
Source0: %url/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
# Configuration files for plugin parameters. These are Fedora specific and not in upstream.
@@ -86,6 +89,15 @@ install -Dpm 644 %{SOURCE1} \
%license AGPL-3.0.txt
%changelog
+* Mon Oct 21 2024 Martin Gansser <martinkg(a)fedoraproject.org> - 2.3.8-2
+- Rebuilt for new VDR API version 2.7.3
+
+* Wed Sep 25 2024 Martin Gansser <martinkg(a)fedoraproject.org> - 2.3.8-1
+- Update to 2.3.8
+
+* Sat Jul 27 2024 Martin Gansser <martinkg(a)fedoraproject.org> - 2.3.7-1
+- Update to 2.3.7
+
* Sat Jul 27 2024 Martin Gansser <martinkg(a)fedoraproject.org> - 2.3.7-1
- Update to 2.3.7
1 month
[vdr-mp3] Rebuilt for new VDR API version 2.7.3
by Martin Gansser
commit 0495f654a2e351c8c38f5404556534ef10814164
Author: Martin Gansser <mgansser(a)netcom-mail.de>
Date: Mon Oct 21 16:48:34 2024 +0200
Rebuilt for new VDR API version 2.7.3
Rebuilt for new VDR API version 2.7.3
...Removal-of-deprecated-interface-functions.patch | 30 ++++++++++++++++++++++
vdr-mp3.spec | 19 +++++++++++---
2 files changed, 45 insertions(+), 4 deletions(-)
---
diff --git a/0002-mp3-Removal-of-deprecated-interface-functions.patch b/0002-mp3-Removal-of-deprecated-interface-functions.patch
new file mode 100644
index 0000000..484117d
--- /dev/null
+++ b/0002-mp3-Removal-of-deprecated-interface-functions.patch
@@ -0,0 +1,30 @@
+--- vdr-plugin-mp3-0.10.4/mp3.c.orig 2024-09-30 17:31:13.649226101 +0200
++++ vdr-plugin-mp3-0.10.4/mp3.c 2024-09-30 17:34:25.297648813 +0200
+@@ -281,7 +281,12 @@
+ bool cMP3Control::SetPlayList(cPlayList *plist)
+ {
+ bool res;
+- cControl *control=cControl::Control();
++#if APIVERSNUM >= 20402
++ cMutexLock mtx;
++ cControl *control=cControl::Control(mtx);
++#else
++ cControl *control=cControl::Control();
++#endif
+ // is there a running MP3 player?
+ if(control && typeid(*control)==typeid(cMP3Control)) {
+ // add songs to running playlist
+@@ -1694,7 +1699,12 @@
+ else { ReplyCode=501; return "Missing filename"; }
+ }
+ else if(!strcasecmp(Command,"CURR")) {
+- cControl *control=cControl::Control();
++#if APIVERSNUM >= 20402
++ cMutexLock mtx;
++ cControl *control=cControl::Control(mtx);
++#else
++ cControl *control=cControl::Control();
++#endif
+ if(control && typeid(*control)==typeid(cMP3Control)) {
+ cMP3PlayInfo mode;
+ if(mgr->Info(-1,&mode)) return mode.Filename;
diff --git a/vdr-mp3.spec b/vdr-mp3.spec
index 0f17b28..eb84cd8 100644
--- a/vdr-mp3.spec
+++ b/vdr-mp3.spec
@@ -3,17 +3,20 @@
# - patch to allow playing audio files (currently insists to find video)
# - audio CD support?
-# version we want build against
+# version we want to build against
%global vdr_version 2.6.3
-%if 0%{?fedora} >= 40
+# Set vdr_version based on Fedora version
+%if 0%{?fedora} >= 42
+%global vdr_version 2.7.2
+%elif 0%{?fedora} >= 40
%global vdr_version 2.6.9
%endif
Name: vdr-mp3
Version: 0.10.4
-Release: 14%{?dist}
+Release: 16%{?dist}
Summary: Sound playback plugin for VDR
-License: GPLv2+
+License: GPL-2.0-or-later
URL: https://github.com/vdr-projects/vdr-plugin-mp3/
Source0: https://github.com/vdr-projects/vdr-plugin-mp3/archive/refs/tags/%{versio...
Source1: http://batleth.sapienti-sat.org/projects/VDR/versions/mplayer.sh-0.8.7.ta...
@@ -24,6 +27,7 @@ Source5: %{name}-mplayer-minimal.sh
Source6: %{name}-mp3sources.conf
Patch0: %{name}-%{version}-Makefile.patch
Patch1: %{name}-fix-overloaded-ambiguous.patch
+Patch2: 0002-mp3-Removal-of-deprecated-interface-functions.patch
BuildRequires: gcc-c++
BuildRequires: gettext
@@ -59,6 +63,7 @@ primary output device.
%setup -q -n vdr-plugin-mp3-%{version} -a 1
%patch 0 -p1
%patch 1 -p1
+%patch 2 -p1
%{__perl} -pi -e \
's|CFGFIL=.*|CFGFIL="%{vdr_configdir}/plugins/mplayer.sh.conf"|' \
mplayer.sh
@@ -169,6 +174,12 @@ fi
%ghost %{vdr_vardir}/global.mplayer.resume
%changelog
+* Mon Oct 21 2024 Martin Gansser <martinkg(a)fedoraproject.org> - 0.10.4-16
+- Rebuilt for new VDR API version 2.7.3
+
+* Mon Sep 30 2024 Martin Gansser <martinkg(a)fedoraproject.org> - 0.10.4-15
+- Add 0002-mp3-Removal-of-deprecated-interface-functions.patch for vdr-2.7.x
+
* Fri Jul 26 2024 Martin Gansser <martinkg(a)fedoraproject.org> - 0.10.4-14
- Rebuilt for new VDR API version 2.6.9
1 month
[vdr-burn] Rebuilt for new VDR API version 2.7.3
by Martin Gansser
commit 275f105ea9108dd0774fd5a49e7ed6677c965fe0
Author: Martin Gansser <mgansser(a)netcom-mail.de>
Date: Mon Oct 21 16:41:39 2024 +0200
Rebuilt for new VDR API version 2.7.3
vdr-burn.spec | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/vdr-burn.spec b/vdr-burn.spec
index 5a5a2ec..8eb82b9 100644
--- a/vdr-burn.spec
+++ b/vdr-burn.spec
@@ -1,20 +1,23 @@
%global gver 0.1.3
%global pname burn
%global __provides_exclude_from ^%{vdr_libdir}/.*\\.so.*$
-# version we want build against
+# version we want to build against
%global vdr_version 2.6.3
-%if 0%{?fedora} >= 40
+# Set vdr_version based on Fedora version
+%if 0%{?fedora} >= 42
+%global vdr_version 2.7.2
+%elif 0%{?fedora} >= 40
%global vdr_version 2.6.9
%endif
Name: vdr-%{pname}
Version: 0.3.0
-Release: 36%{?dist}
+Release: 37%{?dist}
Summary: DVD writing plugin for VDR
-# genindex is GPLv2+, rest GPL+
-License: GPL+ and GPLv2+
+# genindex is GPL-2.0-or-later, rest GPL-1.0-or-later
+License: GPL-1.0-or-later AND GPL-2.0-or-later
URL: https://projects.vdr-developer.org/projects/plg-burn
Source0: https://projects.vdr-developer.org/attachments/download/2028/%{name}-%{ve...
Source1: %{name}.conf
@@ -110,6 +113,9 @@ install -Dpm 644 %{SOURCE1} \
%changelog
+* Mon Oct 21 2024 Martin Gansser <martinkg(a)fedoraproject.org> - 0.3.0-37
+- Rebuilt for new VDR API version 2.7.3
+
* Wed Jul 24 2024 Martin Gansser <martinkg(a)fedoraproject.org> - 0.3.0-36
- Rebuilt for new VDR API version 2.6.9
1 month
[mate-applet-streamer] Fix FTBFS with gcc14 -Werror=incompatible-pointer-types
by Mamoru Tasaka
commit 55dc93dd5928f078e0daf2ef48a926088349e210
Author: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
Date: Mon Oct 21 21:02:49 2024 +0900
Fix FTBFS with gcc14 -Werror=incompatible-pointer-types
mate-applet-streamer-0.4.1-type-cast.patch | 105 +++++++++++++++++++++++++++++
mate-applet-streamer.spec | 9 ++-
2 files changed, 112 insertions(+), 2 deletions(-)
---
diff --git a/mate-applet-streamer-0.4.1-type-cast.patch b/mate-applet-streamer-0.4.1-type-cast.patch
new file mode 100644
index 0000000..e9cb6ff
--- /dev/null
+++ b/mate-applet-streamer-0.4.1-type-cast.patch
@@ -0,0 +1,105 @@
+diff -urp '--exclude=*~' mate-applet-streamer-0.4.1.orig/src/menu.c mate-applet-streamer-0.4.1/src/menu.c
+--- mate-applet-streamer-0.4.1.orig/src/menu.c 2020-03-15 06:42:21.000000000 +0900
++++ mate-applet-streamer-0.4.1/src/menu.c 2024-10-21 15:16:32.944464569 +0900
+@@ -37,7 +37,7 @@ void menu_cb_about (GtkAction *action, s
+
+ gtk_about_dialog_set_copyright (GTK_ABOUT_DIALOG(about), "Copyleft 2013-2017. See License for details.");
+
+- gchar *authors[2];
++ const gchar *authors[2];
+ authors[0] = "Assen Totin <assen.totin(a)gmail.com>";
+ authors[1] = NULL;
+ gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG(about), &authors[0]);
+@@ -79,15 +79,15 @@ void menu_cb_all (GtkAction *action, str
+ GtkWidget *butt_favourites_play = gtk_button_new_from_stock(GTK_STOCK_MEDIA_PLAY);
+ #elif HAVE_GTK3
+ GtkWidget *butt_favourites_add = gtk_button_new_from_icon_name("list-add", 16);
+- gtk_button_set_label (butt_favourites_add, _("Add"));
++ gtk_button_set_label (GTK_BUTTON(butt_favourites_add), _("Add"));
+ GtkWidget *butt_favourites_del = gtk_button_new_from_icon_name("list-remove", 16);
+- gtk_button_set_label (butt_favourites_del, _("Remove"));
++ gtk_button_set_label (GTK_BUTTON(butt_favourites_del), _("Remove"));
+ GtkWidget *butt_favourites_up = gtk_button_new_from_icon_name("go-previous", 16);
+- gtk_button_set_label (butt_favourites_up, _("Previous"));
++ gtk_button_set_label (GTK_BUTTON(butt_favourites_up), _("Previous"));
+ GtkWidget *butt_favourites_down = gtk_button_new_from_icon_name("go-next", 16);
+- gtk_button_set_label (butt_favourites_down, _("Next"));
++ gtk_button_set_label (GTK_BUTTON(butt_favourites_down), _("Next"));
+ GtkWidget *butt_favourites_play = gtk_button_new_from_icon_name("media-playback-start", 16);
+- gtk_button_set_label (butt_favourites_play, _("Play"));
++ gtk_button_set_label (GTK_BUTTON(butt_favourites_play), _("Play"));
+ #endif
+ gtk_widget_set_name(butt_favourites_play, "play_favourites");
+
+@@ -136,11 +136,11 @@ void menu_cb_all (GtkAction *action, str
+ GtkWidget *butt_icecast_play = gtk_button_new_from_stock(GTK_STOCK_MEDIA_PLAY);
+ #elif HAVE_GTK3
+ GtkWidget *butt_icecast_refresh = gtk_button_new_from_icon_name("view-refresh", 16);
+- gtk_button_set_label (butt_icecast_refresh, _("Refresh"));
++ gtk_button_set_label (GTK_BUTTON(butt_icecast_refresh), _("Refresh"));
+ GtkWidget *butt_icecast_copy = gtk_button_new_from_icon_name("edit-copy", 16);
+- gtk_button_set_label (butt_icecast_copy, _("Copy"));
++ gtk_button_set_label (GTK_BUTTON(butt_icecast_copy), _("Copy"));
+ GtkWidget *butt_icecast_play = gtk_button_new_from_icon_name("media-playback-start", 16);
+- gtk_button_set_label (butt_icecast_play, _("Play"));
++ gtk_button_set_label (GTK_BUTTON(butt_icecast_play), _("Play"));
+ #endif
+ gtk_widget_set_name(butt_icecast_copy, "copy_icecast");
+ gtk_widget_set_name(butt_icecast_play, "play_icecast");
+@@ -188,7 +188,7 @@ void menu_cb_all (GtkAction *action, str
+ GTK_WIDGET_SET_FLAGS(applet->butt_search_icecast, GTK_CAN_DEFAULT);
+ #elif HAVE_GTK3
+ applet->butt_search_icecast = gtk_button_new_from_icon_name("system-search", 16);
+- gtk_button_set_label (applet->butt_search_icecast, _("Search"));
++ gtk_button_set_label (GTK_BUTTON(applet->butt_search_icecast), _("Search"));
+ gtk_widget_set_can_default (applet->butt_search_icecast, TRUE);
+ #endif
+ gtk_widget_set_name(applet->butt_search_icecast, "search_icecast");
+@@ -233,11 +233,11 @@ void menu_cb_all (GtkAction *action, str
+ GtkWidget *butt_rbrowser_play = gtk_button_new_from_stock(GTK_STOCK_MEDIA_PLAY);
+ #elif HAVE_GTK3
+ GtkWidget *butt_rbrowser_refresh = gtk_button_new_from_icon_name("view-refresh", 16);
+- gtk_button_set_label (butt_rbrowser_refresh, _("Refresh"));
++ gtk_button_set_label (GTK_BUTTON(butt_rbrowser_refresh), _("Refresh"));
+ GtkWidget *butt_rbrowser_copy = gtk_button_new_from_icon_name("edit-copy", 16);
+- gtk_button_set_label (butt_rbrowser_copy, _("Copy"));
++ gtk_button_set_label (GTK_BUTTON(butt_rbrowser_copy), _("Copy"));
+ GtkWidget *butt_rbrowser_play = gtk_button_new_from_icon_name("media-playback-start", 16);
+- gtk_button_set_label (butt_rbrowser_play, _("Play"));
++ gtk_button_set_label (GTK_BUTTON(butt_rbrowser_play), _("Play"));
+ #endif
+ gtk_widget_set_name(butt_rbrowser_copy, "copy_rbrowser");
+ gtk_widget_set_name(butt_rbrowser_play, "play_rbrowser");
+@@ -285,7 +285,7 @@ void menu_cb_all (GtkAction *action, str
+ GTK_WIDGET_SET_FLAGS(applet->butt_search_rbrowser, GTK_CAN_DEFAULT);
+ #elif HAVE_GTK3
+ applet->butt_search_rbrowser = gtk_button_new_from_icon_name("system-search", 16);
+- gtk_button_set_label (applet->butt_search_rbrowser, _("Search"));
++ gtk_button_set_label (GTK_BUTTON(applet->butt_search_rbrowser), _("Search"));
+ gtk_widget_set_can_default (applet->butt_search_rbrowser, TRUE);
+ #endif
+ gtk_widget_set_name(applet->butt_search_rbrowser, "search_rbrowser");
+@@ -330,11 +330,11 @@ void menu_cb_all (GtkAction *action, str
+ GtkWidget *butt_custom_play = gtk_button_new_from_stock(GTK_STOCK_MEDIA_PLAY);
+ #elif HAVE_GTK3
+ GtkWidget *butt_custom_load = gtk_button_new_from_icon_name("document-open", 16);
+- gtk_button_set_label (butt_custom_load, _("Load"));
++ gtk_button_set_label (GTK_BUTTON(butt_custom_load), _("Load"));
+ GtkWidget *butt_custom_copy = gtk_button_new_from_icon_name("edit-copy", 16);
+- gtk_button_set_label (butt_custom_copy, _("Copy"));
++ gtk_button_set_label (GTK_BUTTON(butt_custom_copy), _("Copy"));
+ GtkWidget *butt_custom_play = gtk_button_new_from_icon_name("media-playback-start", 16);
+- gtk_button_set_label (butt_custom_play, _("Play"));
++ gtk_button_set_label (GTK_BUTTON(butt_custom_play), _("Play"));
+ #endif
+ gtk_widget_set_name(butt_custom_copy, "copy_custom");
+ gtk_widget_set_name(butt_custom_play, "play_custom");
+@@ -382,7 +382,7 @@ void menu_cb_all (GtkAction *action, str
+ GTK_WIDGET_SET_FLAGS(applet->butt_search_custom, GTK_CAN_DEFAULT);
+ #elif HAVE_GTK3
+ applet->butt_search_custom = gtk_button_new_from_icon_name("system-search", 16);
+- gtk_button_set_label (applet->butt_search_custom, _("Search"));
++ gtk_button_set_label (GTK_BUTTON(applet->butt_search_custom), _("Search"));
+ gtk_widget_set_can_default (applet->butt_search_custom, TRUE);
+ #endif
+ gtk_widget_set_name(applet->butt_search_custom, "search_custom");
diff --git a/mate-applet-streamer.spec b/mate-applet-streamer.spec
index 58994f7..5bc4211 100644
--- a/mate-applet-streamer.spec
+++ b/mate-applet-streamer.spec
@@ -1,10 +1,12 @@
Name: mate-applet-streamer
Version: 0.4.1
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: MATE online radio streamer applet
License: GPLv2+
URL: http://www.zavedil.com/online-radio-applet
Source: http://www.zavedil.com/wp-content/uploads/2017/07/%{name}-%{version}.tar.gz
+# Fix FTBFS with gcc14 -Werror=incompatible-pointer-types
+Patch0: mate-applet-streamer-0.4.1-type-cast.patch
BuildRequires: gcc
BuildRequires: libnotify-devel
@@ -27,7 +29,7 @@ from your system tray or panel with a single click.
Icecast directory listing in included.
%prep
-%autosetup
+%autosetup -p1
NOCONFIGURE=1 ./autogen.sh
@@ -63,6 +65,9 @@ rm -rf %{buildroot}%{_datadir}/glib-2.0/schemas/gschemas.compiled
%changelog
+* Mon Oct 21 2024 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 0.4.1-10
+- Fix FTBFS with gcc14 -Werror=incompatible-pointer-types
+
* Fri Aug 02 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 0.4.1-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
1 month
[audacious-plugins-freeworld] Update audacious-plugins-freeworld to 4.4.1
by Sérgio M. Basto
commit 8ccb39194307a5e31bd6ede280a84404ad1d4771
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Oct 20 23:07:30 2024 +0100
Update audacious-plugins-freeworld to 4.4.1
.gitignore | 1 +
audacious-plugins-freeworld.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ee8a5ee..88068dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ audacious-plugins-3.7.2.tar.bz2
/audacious-plugins-4.3-beta1.tar.bz2
/audacious-plugins-4.3.1.tar.bz2
/audacious-plugins-4.4.tar.bz2
+/audacious-plugins-4.4.1.tar.bz2
diff --git a/audacious-plugins-freeworld.spec b/audacious-plugins-freeworld.spec
index dd462d5..c98b6c2 100644
--- a/audacious-plugins-freeworld.spec
+++ b/audacious-plugins-freeworld.spec
@@ -8,8 +8,8 @@
Name: audacious-plugins-freeworld
-Version: 4.4
-Release: 2%{?dist}
+Version: 4.4.1
+Release: 1%{?dist}
Summary: Additional plugins for the Audacious media player
License: GPLv3
URL: https://audacious-media-player.org/
@@ -158,6 +158,9 @@ rm -rf %{buildroot}%{_datadir}/locale/
%changelog
+* Sun Oct 20 2024 Sérgio Basto <sergio(a)serjux.com> - 4.4.1-1
+- Update audacious-plugins-freeworld to 4.4.1
+
* Thu Aug 01 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 4.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
diff --git a/sources b/sources
index a192d0f..732b3ac 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (audacious-plugins-4.4.tar.bz2) = 67c1b5880ad1c53e4407536677a06f7fbe9e9701f98106bf33e7f9dafcbb93200b670de8120442d197315f6c1f30b05936e358724c0b22baded4b3a258ea2563
+SHA512 (audacious-plugins-4.4.1.tar.bz2) = 0c97b4c1ba635b53f416680de57b6b5921b8f0afcefa713129475c006585d53581e8f693f89e705284383ce2f3f6c3e01def8bce9ba1371a18bee7e007884389
1 month
[nvidia-kmod] Patch for 6.12rc kernel
by Leigh Scott
commit 170b640c0ea1bab8edd6a282aed4da4ac9f5d3e3
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Oct 19 23:18:09 2024 +0100
Patch for 6.12rc kernel
kernel-612-buildfix.patch | 86 +++++++++++++++++++++++++++++++++++++++++++++++
nvidia-kmod.spec | 12 +++++--
2 files changed, 95 insertions(+), 3 deletions(-)
---
diff --git a/kernel-612-buildfix.patch b/kernel-612-buildfix.patch
new file mode 100644
index 0000000..c9d0add
--- /dev/null
+++ b/kernel-612-buildfix.patch
@@ -0,0 +1,86 @@
+From 94ad29389cd5129401adea6925f987f4529abb1c Mon Sep 17 00:00:00 2001
+From: Peter Jung <admin(a)ptr1337.dev>
+Date: Thu, 26 Sep 2024 14:53:31 +0200
+Subject: [PATCH 5/5] 6.12: drm_outpull_pill changed check
+
+---
+ kernel/conftest.sh | 23 ++++++++++++++++++++
+ kernel/nvidia-drm/nvidia-drm-drv.c | 4 ++++
+ kernel/nvidia-drm/nvidia-drm-sources.mk | 1 +
+ 3 files changed, 28 insertions(+)
+
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index 4a239e63..4d6fff64 100755
+--- a/kernel/conftest.sh
++++ b/kernel/conftest.sh
+@@ -6631,6 +6631,29 @@ compile_test() {
+ compile_check_conftest "$CODE" "NV_DRM_FBDEV_TTM_SETUP_PRESENT" "" "functions"
+ ;;
+
++ drm_output_poll_changed)
++ #
++ # Determine whether drm_mode_config_funcs.output_poll_changed
++ # callback is present
++ #
++ # Removed by commit 446d0f4849b1 ("drm: Remove struct
++ # drm_mode_config_funcs.output_poll_changed") in v6.12. Hotplug
++ # event support is handled through the fbdev emulation interface
++ # going forward.
++ #
++ CODE="
++ #if defined(NV_DRM_DRM_MODE_CONFIG_H_PRESENT)
++ #include <drm/drm_mode_config.h>
++ #else
++ #include <drm/drm_crtc.h>
++ #endif
++ int conftest_drm_output_poll_changed_available(void) {
++ return offsetof(struct drm_mode_config_funcs, output_poll_changed);
++ }"
++
++ compile_check_conftest "$CODE" "NV_DRM_OUTPUT_POLL_CHANGED_PRESENT" "" "types"
++ ;;
++
+ drm_aperture_remove_conflicting_pci_framebuffers)
+ #
+ # Determine whether drm_aperture_remove_conflicting_pci_framebuffers is present.
+diff --git a/kernel/nvidia-drm/nvidia-drm-drv.c b/kernel/nvidia-drm/nvidia-drm-drv.c
+index 50028c26..034dda66 100644
+--- a/kernel/nvidia-drm/nvidia-drm-drv.c
++++ b/kernel/nvidia-drm/nvidia-drm-drv.c
+@@ -126,6 +126,7 @@ static const char* nv_get_input_colorspace_name(
+
+ #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
+
++#if defined(NV_DRM_OUTPUT_POLL_CHANGED_PRESENT)
+ static void nv_drm_output_poll_changed(struct drm_device *dev)
+ {
+ struct drm_connector *connector = NULL;
+@@ -169,6 +170,7 @@ static void nv_drm_output_poll_changed(struct drm_device *dev)
+ nv_drm_connector_list_iter_end(&conn_iter);
+ #endif
+ }
++#endif /* NV_DRM_OUTPUT_POLL_CHANGED_PRESENT */
+
+ static struct drm_framebuffer *nv_drm_framebuffer_create(
+ struct drm_device *dev,
+@@ -206,7 +208,9 @@ static const struct drm_mode_config_funcs nv_mode_config_funcs = {
+ .atomic_check = nv_drm_atomic_check,
+ .atomic_commit = nv_drm_atomic_commit,
+
++ #if defined(NV_DRM_OUTPUT_POLL_CHANGED_PRESENT)
+ .output_poll_changed = nv_drm_output_poll_changed,
++ #endif
+ };
+
+ static void nv_drm_event_callback(const struct NvKmsKapiEvent *event)
+diff --git a/kernel/nvidia-drm/nvidia-drm-sources.mk b/kernel/nvidia-drm/nvidia-drm-sources.mk
+index 247096b7..f5964a57 100644
+--- a/kernel/nvidia-drm/nvidia-drm-sources.mk
++++ b/kernel/nvidia-drm/nvidia-drm-sources.mk
+@@ -131,3 +131,4 @@ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_aperture_remove_conflicting_pci_framebuffe
+ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_mode_create_dp_colorspace_property_has_supported_colorspaces_arg
+ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_syncobj_features_present
+ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_unlocked_ioctl_flag_present
++NV_CONFTEST_TYPE_COMPILE_TESTS += drm_output_poll_changed
+--
+2.46.2
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index c6bfd83..8331093 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -12,7 +12,7 @@ Name: nvidia-kmod
Epoch: 3
Version: 560.35.03
# Taken over by kmodtool
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA display driver kernel module
License: Redistributable, no modification permitted
URL: https://www.nvidia.com/
@@ -20,6 +20,7 @@ URL: https://www.nvidia.com/
Source11: nvidia-kmodtool-excludekernel-filterfile
Patch0: make_modeset_default.patch
Patch1: kernel-611-framebuffer.patch
+Patch2: kernel-612-buildfix.patch
ExclusiveArch: x86_64 aarch64
@@ -52,8 +53,10 @@ echo "Using original nvidia defaults"
%else
echo "Set nvidia to fbdev=1 modeset=1"
%patch -P0 -p1
-%patch -P1 -p1 -d kernel/
%endif
+%patch -P1 -p1 -d kernel/
+%patch -P2 -p1
+
for kernel_version in %{?kernel_versions} ; do
cp -a kernel _kmod_build_${kernel_version%%___*}
done
@@ -87,6 +90,9 @@ done
%changelog
+* Thu Oct 03 2024 Leigh Scott <leigh123linux(a)gmail.com> - 3:560.35.03-2
+- Patch for 6.12rc kernel
+
* Wed Aug 21 2024 Leigh Scott <leigh123linux(a)gmail.com> - 3:560.35.03-1
- Update to 560.35.03 Release
@@ -130,7 +136,7 @@ done
- Update to 550.54.14 release
* Thu Feb 01 2024 Leigh Scott <leigh123linux(a)gmail.com> - 3:550.40.07-2
-- fix build with gcc-14 ad kernel-6.7.3
+- fix build with gcc-14 and kernel-6.7.3
* Wed Jan 24 2024 Leigh Scott <leigh123linux(a)gmail.com> - 3:550.40.07-1
- Update to 550.40.07 beta
1 month