rpms/qmc2/F-20 qmc2-ini.patch,1.14,1.15
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/qmc2/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15647
Modified Files:
qmc2-ini.patch
Log Message:
Commit forgotten patch update
qmc2-ini.patch:
qmc2.ini.template | 41 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
Index: qmc2-ini.patch
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/F-20/qmc2-ini.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- qmc2-ini.patch 26 Apr 2014 18:18:17 -0000 1.14
+++ qmc2-ini.patch 31 Mar 2015 17:34:38 -0000 1.15
@@ -62,7 +62,7 @@
FilesAndDirectories\SystemNotesFolder=DATADIR/qmc2/gmn/
FilesAndDirectories\SystemNotesTemplate=DATADIR/qmc2/gmn/template.html
+FilesAndDirectories\ExecutableFile=/usr/bin/mess
-+FilesAndDirectories\GameInfoDB=DATADIR/mess/sysinfo.dat
++FilesAndDirectories\GameInfoDB=DATADIR/mame/history.dat
+FilesAndDirectories\EmuInfoDB=DATADIR/mess/messinfo.dat
+FilesAndDirectories\SoftwareInfoDB=DATADIR/mame/history.dat
9 years, 9 months
rpms/mame-data-extras/F-20 .cvsignore, 1.7, 1.8 mame-data-extras.spec, 1.7, 1.8 sources, 1.7, 1.8
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame-data-extras/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15501
Modified Files:
.cvsignore mame-data-extras.spec sources
Log Message:
* Tue Mar 31 2015 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.160-1
- Updated everything except cheat.zip to 0.160
- Dropped sysinfo.dat
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame-data-extras/F-20/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 23 Feb 2015 17:38:52 -0000 1.7
+++ .cvsignore 31 Mar 2015 17:32:33 -0000 1.8
@@ -1,9 +1,8 @@
catveren.zip
cheat0156.zip
ctrlr.rar
-history158.7z
-Mameinfo0158.zip
+history160.7z
+Mameinfo0160.zip
messinfo.zip
-nplayers0158.zip
+nplayers0160.zip
robby.zip
-sysinfo.zip
Index: mame-data-extras.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame-data-extras/F-20/mame-data-extras.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mame-data-extras.spec 26 Feb 2015 06:48:38 -0000 1.7
+++ mame-data-extras.spec 31 Mar 2015 17:32:33 -0000 1.8
@@ -1,4 +1,4 @@
-%global vernumber 158
+%global vernumber 160
Name: mame-data-extras
Version: 0.%{vernumber}
@@ -10,13 +10,11 @@
Source1: http://www.arcade-history.com/dats/history%{vernumber}.7z
Source2: http://www.mameworld.info/mameinfo/download/Mameinfo0%{vernumber}.zip
Source3: http://www.kutek.net/mame_roms_pinball/mame32_config_files/ctrlr.rar
-# 0.158
+# 0.160
Source4: http://www.progettoemma.net/public/cat/catveren.zip
Source5: http://nplayers.arcadebelgium.be/files/nplayers0%{vernumber}.zip
Source6: http://cheat.retrogames.com/download/cheat0156.zip
-# 0.148
-Source7: http://www.progettoemma.net/mess/zips/sysinfo.zip
-# 0.158
+# 0.160
Source8: http://www.progettosnaps.net/messinfo/messinfo.zip
Source10: http://mamedev.org/roms/robby/robby.zip
@@ -63,7 +61,6 @@
unzip -qa %{SOURCE5} -d .
mv docs nplayers
unzip -qa %{SOURCE6}
-unzip -qa %{SOURCE7} -d .
unzip -qa %{SOURCE8} -d .
7za x pS_messinfo.dat.7z
unzip -qa %{SOURCE10} readme.txt
@@ -101,7 +98,7 @@
$RPM_BUILD_ROOT%{_datadir}/mame
install -d $RPM_BUILD_ROOT%{_datadir}/mess
install -pm 644 pS_messinfo.dat/"messinfo.dat Unicode, UTF-8 version (for QMC2)"/messinfo.dat \
- sysinfo.dat $RPM_BUILD_ROOT%{_datadir}/mess
+ $RPM_BUILD_ROOT%{_datadir}/mess
# The following might be ugly, but it is way simpler than creating a -common
# subpackage and symlinks
install -d $RPM_BUILD_ROOT%{_datadir}/mame/ctrlr
@@ -124,7 +121,6 @@
%files -n mess-data-extras
%doc pS_messinfo.dat/messinfo
%{_datadir}/mess/messinfo.dat
-%{_datadir}/mess/sysinfo.dat
%{_datadir}/mess/ctrlr/*
%files robby
@@ -133,6 +129,10 @@
%changelog
+* Tue Mar 31 2015 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.160-1
+- Updated everything except cheat.zip to 0.160
+- Dropped sysinfo.dat
+
* Mon Feb 23 2015 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.158-1
- Updated everything except sysinfo.dat and cheat.zip to 0.158
- Dropped version.ini as it is no longer provided in the messinfo.dat package
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame-data-extras/F-20/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 23 Feb 2015 17:38:52 -0000 1.7
+++ sources 31 Mar 2015 17:32:33 -0000 1.8
@@ -1,9 +1,8 @@
-1d67bd22fdd8005ad8d3394d978dfb18 catveren.zip
+28991aba016881d999793d92c384279e catveren.zip
36390c5328b1d63ac14aede964fa5ce2 cheat0156.zip
d907085f2f69b74198796378e3ed0cb3 ctrlr.rar
-5c4575629c07d39073008f7689fcd6f9 history158.7z
-bdb16526d03d2d00d60b77b4e7827876 Mameinfo0158.zip
-95defc03fc532372342d0d71deb555fa messinfo.zip
-e47962eebf659a18766d1c57a37511cf nplayers0158.zip
+ef2036d313a9cd8533916b2b1f936119 history160.7z
+b67b3761b2f6067f004ea540f92ee664 Mameinfo0160.zip
+e121031ae285d86dcaaeb86e9026083b messinfo.zip
+e6a498afd0d60bad61bb8f7f75b877df nplayers0160.zip
e1acc79344dd33466081c0d7fa56011a robby.zip
-170a9a793ed01af870bf81dfe278cc77 sysinfo.zip
9 years, 9 months
rpms/mame-data-extras/devel .cvsignore, 1.7, 1.8 mame-data-extras.spec, 1.7, 1.8 sources, 1.7, 1.8
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame-data-extras/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15272
Modified Files:
.cvsignore mame-data-extras.spec sources
Log Message:
* Tue Mar 31 2015 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.160-1
- Updated everything except cheat.zip to 0.160
- Dropped sysinfo.dat
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame-data-extras/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 23 Feb 2015 17:38:45 -0000 1.7
+++ .cvsignore 31 Mar 2015 17:31:45 -0000 1.8
@@ -1,9 +1,8 @@
catveren.zip
cheat0156.zip
ctrlr.rar
-history158.7z
-Mameinfo0158.zip
+history160.7z
+Mameinfo0160.zip
messinfo.zip
-nplayers0158.zip
+nplayers0160.zip
robby.zip
-sysinfo.zip
Index: mame-data-extras.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame-data-extras/devel/mame-data-extras.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mame-data-extras.spec 26 Feb 2015 06:47:40 -0000 1.7
+++ mame-data-extras.spec 31 Mar 2015 17:31:45 -0000 1.8
@@ -1,4 +1,4 @@
-%global vernumber 158
+%global vernumber 160
Name: mame-data-extras
Version: 0.%{vernumber}
@@ -10,13 +10,11 @@
Source1: http://www.arcade-history.com/dats/history%{vernumber}.7z
Source2: http://www.mameworld.info/mameinfo/download/Mameinfo0%{vernumber}.zip
Source3: http://www.kutek.net/mame_roms_pinball/mame32_config_files/ctrlr.rar
-# 0.158
+# 0.160
Source4: http://www.progettoemma.net/public/cat/catveren.zip
Source5: http://nplayers.arcadebelgium.be/files/nplayers0%{vernumber}.zip
Source6: http://cheat.retrogames.com/download/cheat0156.zip
-# 0.148
-Source7: http://www.progettoemma.net/mess/zips/sysinfo.zip
-# 0.158
+# 0.160
Source8: http://www.progettosnaps.net/messinfo/messinfo.zip
Source10: http://mamedev.org/roms/robby/robby.zip
@@ -63,7 +61,6 @@
unzip -qa %{SOURCE5} -d .
mv docs nplayers
unzip -qa %{SOURCE6}
-unzip -qa %{SOURCE7} -d .
unzip -qa %{SOURCE8} -d .
7za x pS_messinfo.dat.7z
unzip -qa %{SOURCE10} readme.txt
@@ -101,7 +98,7 @@
$RPM_BUILD_ROOT%{_datadir}/mame
install -d $RPM_BUILD_ROOT%{_datadir}/mess
install -pm 644 pS_messinfo.dat/"messinfo.dat Unicode, UTF-8 version (for QMC2)"/messinfo.dat \
- sysinfo.dat $RPM_BUILD_ROOT%{_datadir}/mess
+ $RPM_BUILD_ROOT%{_datadir}/mess
# The following might be ugly, but it is way simpler than creating a -common
# subpackage and symlinks
install -d $RPM_BUILD_ROOT%{_datadir}/mame/ctrlr
@@ -124,7 +121,6 @@
%files -n mess-data-extras
%doc pS_messinfo.dat/messinfo
%{_datadir}/mess/messinfo.dat
-%{_datadir}/mess/sysinfo.dat
%{_datadir}/mess/ctrlr/*
%files robby
@@ -133,6 +129,10 @@
%changelog
+* Tue Mar 31 2015 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.160-1
+- Updated everything except cheat.zip to 0.160
+- Dropped sysinfo.dat
+
* Mon Feb 23 2015 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.158-1
- Updated everything except sysinfo.dat and cheat.zip to 0.158
- Dropped version.ini as it is no longer provided in the messinfo.dat package
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame-data-extras/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 23 Feb 2015 17:38:45 -0000 1.7
+++ sources 31 Mar 2015 17:31:46 -0000 1.8
@@ -1,9 +1,8 @@
-1d67bd22fdd8005ad8d3394d978dfb18 catveren.zip
+28991aba016881d999793d92c384279e catveren.zip
36390c5328b1d63ac14aede964fa5ce2 cheat0156.zip
d907085f2f69b74198796378e3ed0cb3 ctrlr.rar
-5c4575629c07d39073008f7689fcd6f9 history158.7z
-bdb16526d03d2d00d60b77b4e7827876 Mameinfo0158.zip
-95defc03fc532372342d0d71deb555fa messinfo.zip
-e47962eebf659a18766d1c57a37511cf nplayers0158.zip
+ef2036d313a9cd8533916b2b1f936119 history160.7z
+b67b3761b2f6067f004ea540f92ee664 Mameinfo0160.zip
+e121031ae285d86dcaaeb86e9026083b messinfo.zip
+e6a498afd0d60bad61bb8f7f75b877df nplayers0160.zip
e1acc79344dd33466081c0d7fa56011a robby.zip
-170a9a793ed01af870bf81dfe278cc77 sysinfo.zip
9 years, 9 months
rpms/qmc2/F-20 .cvsignore, 1.36, 1.37 qmc2.spec, 1.50, 1.51 sources, 1.36, 1.37
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/qmc2/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15097
Modified Files:
.cvsignore qmc2.spec sources
Log Message:
* Tue Mar 31 2015 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.50-1
- Updated to 0.50
- Switched to use history.dat instead of sysinfo.dat by default
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/F-20/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore 26 Feb 2015 16:36:28 -0000 1.36
+++ .cvsignore 31 Mar 2015 17:25:39 -0000 1.37
@@ -1 +1 @@
-qmc2-0.49.tar.bz2
+qmc2-0.50.tar.bz2
Index: qmc2.spec
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/F-20/qmc2.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- qmc2.spec 26 Feb 2015 16:36:28 -0000 1.50
+++ qmc2.spec 31 Mar 2015 17:25:39 -0000 1.51
@@ -1,5 +1,5 @@
Name: qmc2
-Version: 0.49
+Version: 0.50
Release: 1%{?dist}
Summary: M.A.M.E./M.E.S.S./U.M.E. Catalog / Launcher II, common files
@@ -137,6 +137,10 @@
%changelog
+* Tue Mar 31 2015 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.50-1
+- Updated to 0.50
+- Switched to use history.dat instead of sysinfo.dat by default
+
* Thu Feb 26 2015 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.49-1
- Updated to 0.49
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/F-20/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources 26 Feb 2015 16:36:28 -0000 1.36
+++ sources 31 Mar 2015 17:25:39 -0000 1.37
@@ -1 +1 @@
-bd09904fe0bfa8b58bdbfd12d1d46442 qmc2-0.49.tar.bz2
+742085b3cbab5801b0331f488f8eff1c qmc2-0.50.tar.bz2
9 years, 9 months
rpms/qmc2/devel .cvsignore, 1.36, 1.37 qmc2-ini.patch, 1.14, 1.15 qmc2.spec, 1.50, 1.51 sources, 1.36, 1.37
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/qmc2/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14989
Modified Files:
.cvsignore qmc2-ini.patch qmc2.spec sources
Log Message:
* Tue Mar 31 2015 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.50-1
- Updated to 0.50
- Switched to use history.dat instead of sysinfo.dat by default
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore 26 Feb 2015 16:36:23 -0000 1.36
+++ .cvsignore 31 Mar 2015 17:25:33 -0000 1.37
@@ -1 +1 @@
-qmc2-0.49.tar.bz2
+qmc2-0.50.tar.bz2
qmc2-ini.patch:
qmc2.ini.template | 41 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
Index: qmc2-ini.patch
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/devel/qmc2-ini.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- qmc2-ini.patch 26 Apr 2014 18:18:11 -0000 1.14
+++ qmc2-ini.patch 31 Mar 2015 17:25:33 -0000 1.15
@@ -62,7 +62,7 @@
FilesAndDirectories\SystemNotesFolder=DATADIR/qmc2/gmn/
FilesAndDirectories\SystemNotesTemplate=DATADIR/qmc2/gmn/template.html
+FilesAndDirectories\ExecutableFile=/usr/bin/mess
-+FilesAndDirectories\GameInfoDB=DATADIR/mess/sysinfo.dat
++FilesAndDirectories\GameInfoDB=DATADIR/mame/history.dat
+FilesAndDirectories\EmuInfoDB=DATADIR/mess/messinfo.dat
+FilesAndDirectories\SoftwareInfoDB=DATADIR/mame/history.dat
Index: qmc2.spec
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/devel/qmc2.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- qmc2.spec 26 Feb 2015 16:36:23 -0000 1.50
+++ qmc2.spec 31 Mar 2015 17:25:33 -0000 1.51
@@ -1,5 +1,5 @@
Name: qmc2
-Version: 0.49
+Version: 0.50
Release: 1%{?dist}
Summary: M.A.M.E./M.E.S.S./U.M.E. Catalog / Launcher II, common files
@@ -137,6 +137,10 @@
%changelog
+* Tue Mar 31 2015 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.50-1
+- Updated to 0.50
+- Switched to use history.dat instead of sysinfo.dat by default
+
* Thu Feb 26 2015 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.49-1
- Updated to 0.49
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources 26 Feb 2015 16:36:23 -0000 1.36
+++ sources 31 Mar 2015 17:25:33 -0000 1.37
@@ -1 +1 @@
-bd09904fe0bfa8b58bdbfd12d1d46442 qmc2-0.49.tar.bz2
+742085b3cbab5801b0331f488f8eff1c qmc2-0.50.tar.bz2
9 years, 9 months
rpms/nvidia-304xx-kmod/F-20 3.19_kernel.patch, NONE, 1.1 nvidia-304xx-kmod.spec, 1.73, 1.74
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-304xx-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12961
Modified Files:
nvidia-304xx-kmod.spec
Added Files:
3.19_kernel.patch
Log Message:
* Tue Mar 31 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 304.123-2
- Patch for 3.19 kernel
3.19_kernel.patch:
nv.c | 8 ++++++++
1 file changed, 8 insertions(+)
--- NEW FILE 3.19_kernel.patch ---
--- a/kernel/nv.c 2014-12-02 03:58:34.000000000 +0000
+++ b/kernel/nv.c 2015-03-21 10:28:08.062379864 +0000
@@ -2014,7 +2014,11 @@ long nv_kern_unlocked_ioctl(
unsigned long i_arg
)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)
+ return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
+#else
return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
+#endif
}
long nv_kern_compat_ioctl(
@@ -2023,7 +2027,11 @@ long nv_kern_compat_ioctl(
unsigned long i_arg
)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)
+ return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
+#else
return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
+#endif
}
/*
Index: nvidia-304xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-304xx-kmod/F-20/nvidia-304xx-kmod.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- nvidia-304xx-kmod.spec 30 Mar 2015 07:56:22 -0000 1.73
+++ nvidia-304xx-kmod.spec 31 Mar 2015 14:41:36 -0000 1.74
@@ -3,12 +3,12 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%global buildforkernels newest
+%global buildforkernels current
Name: nvidia-304xx-kmod
Version: 304.123
# Taken over by kmodtool
-Release: 1%{?dist}.30
+Release: 2%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -17,6 +17,7 @@
#ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg0.run
#ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg0.run
Source0: nvidia-kmod-data-%{version}.tar.xz
+Patch0: 3.19_kernel.patch
Source11: nvidia-304xx-kmodtool-excludekernel-filterfile
@@ -45,7 +46,7 @@
for arch in x86 x64
do
pushd nvidiapkg-${arch}
- echo 'no patch'
+%patch0 -p1
popd
done
@@ -79,6 +80,9 @@
%changelog
+* Tue Mar 31 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 304.123-2
+- Patch for 3.19 kernel
+
* Mon Mar 30 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 304.123-1.30
- Rebuilt for kernel
9 years, 9 months
rpms/nvidia-173xx-kmod/F-20 nvidia_3.19_kernel.patch, NONE, 1.1 nvidia-173xx-kmod.spec, 1.118, 1.119
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-173xx-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12675
Modified Files:
nvidia-173xx-kmod.spec
Added Files:
nvidia_3.19_kernel.patch
Log Message:
* Tue Mar 31 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 173.14.39-5
- patch for 3.19 kernel
nvidia_3.19_kernel.patch:
nv.c | 8 ++++++++
1 file changed, 8 insertions(+)
--- NEW FILE nvidia_3.19_kernel.patch ---
--- a/usr/src/nv/nv.c 2013-11-27 22:47:09.000000000 +0000
+++ b/usr/src/nv/nv.c 2015-03-31 15:22:33.326267641 +0100
@@ -2746,7 +2746,11 @@ long nv_kern_unlocked_ioctl(
unsigned long i_arg
)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)
+ return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
+#else
return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
+#endif
}
long nv_kern_compat_ioctl(
@@ -2755,7 +2759,11 @@ long nv_kern_compat_ioctl(
unsigned long i_arg
)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)
+ return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
+#else
return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
+#endif
}
/*
Index: nvidia-173xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-173xx-kmod/F-20/nvidia-173xx-kmod.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- nvidia-173xx-kmod.spec 30 Mar 2015 07:56:15 -0000 1.118
+++ nvidia-173xx-kmod.spec 31 Mar 2015 14:28:40 -0000 1.119
@@ -3,12 +3,12 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%global buildforkernels newest
+%global buildforkernels current
Name: nvidia-173xx-kmod
Version: 173.14.39
# Taken over by kmodtool
-Release: 4%{?dist}.12
+Release: 5%{?dist}
Summary: NVIDIA 173xx display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -19,6 +19,7 @@
Source0: nvidia-kmod-data-%{version}.tar.bz2
Patch0: nvidia_3.17_kernel.patch
+Patch1: nvidia_3.19_kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -47,6 +48,7 @@
do
pushd nvidiapkg-${arch}
%patch0 -p1
+%patch1 -p1
popd
done
@@ -90,6 +92,9 @@
%changelog
+* Tue Mar 31 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 173.14.39-5
+- patch for 3.19 kernel
+
* Mon Mar 30 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.39-4.12
- Rebuilt for kernel
9 years, 9 months
rpms/nvidia-kmod/F-20 3.19_kernel.patch, NONE, 1.1 nvidia-kmod.spec, 1.219, 1.220
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12420
Modified Files:
nvidia-kmod.spec
Added Files:
3.19_kernel.patch
Log Message:
* Tue Mar 31 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 1:331.113-2
- Patch for 3.19 kernel
3.19_kernel.patch:
nv-frontend.c | 8 ++++++++
nv.c | 4 ++++
2 files changed, 12 insertions(+)
--- NEW FILE 3.19_kernel.patch ---
--- a/kernel/nv-frontend.c 2014-12-02 04:00:01.000000000 +0000
+++ b/kernel/nv-frontend.c 2015-03-31 15:08:42.084974240 +0100
@@ -341,7 +341,11 @@ long nvidia_frontend_unlocked_ioctl(
unsigned long i_arg
)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)
+ return nvidia_frontend_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
+#else
return nvidia_frontend_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
+#endif
}
long nvidia_frontend_compat_ioctl(
@@ -350,7 +354,11 @@ long nvidia_frontend_compat_ioctl(
unsigned long i_arg
)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)
+ return nvidia_frontend_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
+#else
return nvidia_frontend_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
+#endif
}
int nvidia_frontend_mmap(
--- a/kernel/nv.c 2014-12-02 04:00:00.000000000 +0000
+++ b/kernel/nv.c 2015-03-31 15:11:52.889859631 +0100
@@ -2024,7 +2024,11 @@ nvidia_unlocked_ioctl(
unsigned long i_arg
)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)
+ return nvidia_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
+#else
return nvidia_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
+#endif
}
/*
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-20/nvidia-kmod.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- nvidia-kmod.spec 30 Mar 2015 07:56:36 -0000 1.219
+++ nvidia-kmod.spec 31 Mar 2015 14:16:18 -0000 1.220
@@ -3,13 +3,13 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%global buildforkernels newest
+%global buildforkernels current
Name: nvidia-kmod
Epoch: 1
Version: 331.113
# Taken over by kmodtool
-Release: 1%{?dist}.8
+Release: 2%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -26,6 +26,7 @@
Source0: nvidia-kmod-data-%{version}.tar.xz
Patch0: nv-linux-arm.patch
Patch1: 3.18_kernel.patch
+Patch2: 3.19_kernel.patch
Source11: nvidia-kmodtool-excludekernel-filterfile
@@ -56,6 +57,7 @@
pushd nvidiapkg-${arch}
%patch0 -p1
%patch1 -p1
+%patch2 -p1
popd
done
@@ -99,6 +101,9 @@
%changelog
+* Tue Mar 31 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 1:331.113-2
+- Patch for 3.19 kernel
+
* Mon Mar 30 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:331.113-1.8
- Rebuilt for kernel
9 years, 9 months
rpms/VirtualBox-kmod/F-20 VirtualBox-kmod.spec,1.95,1.96
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11485
Modified Files:
VirtualBox-kmod.spec
Log Message:
* Tue Mar 31 2015 Sérgio Basto <sergio(a)serjux.com> - 4.3.26-1
- Update to 4.3.26 and build akmods.
Index: VirtualBox-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-kmod/F-20/VirtualBox-kmod.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- VirtualBox-kmod.spec 30 Mar 2015 07:56:00 -0000 1.95
+++ VirtualBox-kmod.spec 31 Mar 2015 12:24:14 -0000 1.96
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%global buildforkernels newest
+#global buildforkernels newest
# In prerelease builds (such as betas), this package has the same
# major version number, while the kernel module abi is not guarranteed
@@ -19,8 +19,8 @@
%bcond_with hardening
Name: VirtualBox-kmod
-Version: 4.3.20
-Release: 1%{?prerel:.%{prerel}}%{?dist}.12
+Version: 4.3.26
+Release: 1%{?prerel:.%{prerel}}%{?dist}
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -98,6 +98,9 @@
%changelog
+* Tue Mar 31 2015 Sérgio Basto <sergio(a)serjux.com> - 4.3.26-1
+- Update to 4.3.26 and build akmods.
+
* Mon Mar 30 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3.20-1.12
- Rebuilt for kernel
9 years, 9 months
rpms/VirtualBox/F-20 .cvsignore, 1.58, 1.59 VirtualBox-4.1.18-strings.patch, 1.2, 1.3 VirtualBox.spec, 1.66, 1.67 sources, 1.58, 1.59
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10395
Modified Files:
.cvsignore VirtualBox-4.1.18-strings.patch VirtualBox.spec
sources
Log Message:
* Tue Mar 24 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 4.3.26-1
- New upstream release .
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-20/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- .cvsignore 23 Nov 2014 03:33:44 -0000 1.58
+++ .cvsignore 31 Mar 2015 10:58:41 -0000 1.59
@@ -1 +1 @@
-VirtualBox-4.3.20.tar.bz2
+VirtualBox-4.3.26.tar.bz2
VirtualBox-4.1.18-strings.patch:
Frontends/VirtualBox/src/main.cpp | 25 ++++++++++++++-----------
Installer/linux/VBox.sh | 13 ++++++++-----
VMM/VMMR3/VM.cpp | 8 ++++----
3 files changed, 26 insertions(+), 20 deletions(-)
Index: VirtualBox-4.1.18-strings.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-20/VirtualBox-4.1.18-strings.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- VirtualBox-4.1.18-strings.patch 29 Jun 2013 04:58:46 -0000 1.2
+++ VirtualBox-4.1.18-strings.patch 31 Mar 2015 10:58:41 -0000 1.3
@@ -21,7 +21,7 @@
diff -Nurp VirtualBox-4.1.18/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.18.new2/src/VBox/Frontends/VirtualBox/src/main.cpp
--- VirtualBox-4.1.18/src/VBox/Frontends/VirtualBox/src/main.cpp 2012-06-20 14:16:20.000000000 +0100
+++ VirtualBox-4.1.18.new2/src/VBox/Frontends/VirtualBox/src/main.cpp 2012-07-09 04:57:00.690645723 +0100
-@@ -72,13 +72,13 @@ QString g_QStrHintLinuxNoMemory = QAppli
+@@ -72,13 +72,16 @@ QString g_QStrHintLinuxNoMemory = QAppli
);
QString g_QStrHintLinuxNoDriver = QApplication::tr(
@@ -32,12 +32,15 @@
- "as root. If it is available in your distribution, you should install the "
- "DKMS package first. This package keeps track of Linux kernel changes and "
- "recompiles the vboxdrv kernel module if necessary."
-+ "The VirtualBox Linux kernel driver (vboxdrv) is probably not "
-+ "loaded.<br/><br/>"
-+ "If you installed or VirtualBox package recently you need to restart "
-+ "the computer for the driver to load.<br/><br/>"
-+ "Alternatively, you may attempt to load the driver by issuing the "
-+ "following command with system administrator (root) privileges:<br/><br/>"
++ "The VirtualBox Linux kernel driver (vboxdrv) is probably not loaded."
++ "You may not have kernel driver installed for kernel that is runnig, if so you may do as root:"
++ " <font color=blue>'yum install kmod-VirtualBox-$(uname -r) kmod-VirtualBox'</font><br/><br/>"
++ "On *not* stable versions of Fedora you need use akmods (because we don't have pre-built kmods) "
++ "or for custom kernels, you may do instead as root:"
++ " <font color=blue>'yum install akmod-VirtualBox kernel-devel-$(uname -r)'</font>"
++ " <font color=blue>'akmods'</font><br/><br/>"
++ "If you installed VirtualBox packages and don't want reboot the system, you may need load the "
++ "kernel driver, doing as root:"
+ " <font color=blue>'systemctl restart systemd-modules-load.service'</font><br/><br/>"
);
@@ -47,7 +50,7 @@
"VirtualBox. The installation of VirtualBox was apparently not "
"successful. Executing<br/><br/>"
- " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
-+ " <font color=blue>'systemctl restart systemd-modules-load.service '</font> as root<br/><br/>"
++ " <font color=blue>'systemctl restart systemd-modules-load.service'</font> as root<br/><br/>"
"may correct this. Make sure that you do not mix the "
- "OSE version and the PUEL version of VirtualBox."
+ "RPM Fusion version and the Oracle version of VirtualBox."
@@ -105,7 +108,7 @@
"was either not loaded or /dev/vboxdrv is not set up properly. "
- "Re-setup the kernel module by executing "
- "'/etc/init.d/vboxdrv setup' as root");
-+ "Reboot the computer or load the kernel module by executing "
++ "Load the kernel module by executing "
+ "'systemctl restart systemd-modules-load.service' as root");
#else
pszError = N_("VirtualBox kernel driver not loaded");
@@ -116,8 +119,8 @@
"was either not loaded or /dev/vboxdrv was not created for some "
- "reason. Re-setup the kernel module by executing "
- "'/etc/init.d/vboxdrv setup' as root");
-+ "reason. Load the kernel module by executing "
-+ "'systemctl restart systemd-modules-load.service' as root");
++ "reason. Install the kernel module by executing "
++ "'yum install kmod-VirtualBox-$(uname -r) kmod-VirtualBox' as root");
#else
pszError = N_("VirtualBox kernel driver not installed");
#endif
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-20/VirtualBox.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- VirtualBox.spec 26 Dec 2014 05:26:38 -0000 1.66
+++ VirtualBox.spec 31 Mar 2015 10:58:41 -0000 1.67
@@ -26,8 +26,8 @@
#endif
Name: VirtualBox
-Version: 4.3.20
-Release: 3%{?prerel:.%{prerel}}%{?dist}
+Version: 4.3.26
+Release: 1%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -619,6 +619,9 @@
%changelog
+* Tue Mar 24 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 4.3.26-1
+- New upstream release .
+
* Fri Dec 26 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.20-3
- Improved strings.patch asking to install kmods VirtualBox and also intructions for devel versions.
- Improved description of VirtualBox-guest, alerting to not install on Host, one conclusion on rfbz #3425 .
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-20/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources 23 Nov 2014 03:33:44 -0000 1.58
+++ sources 31 Mar 2015 10:58:41 -0000 1.59
@@ -1 +1 @@
-cf3f25644aa0fae1029e8b362bd4375e VirtualBox-4.3.20.tar.bz2
+df8fa3b1820773556b33ae0405553120 VirtualBox-4.3.26.tar.bz2
9 years, 9 months