rpms/mame/F-16 .cvsignore, 1.66, 1.67 mame.spec, 1.74, 1.75 sources, 1.66, 1.67
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27978
Modified Files:
.cvsignore mame.spec sources
Log Message:
* Mon Nov 19 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147u3-1
- Updated to 0.147u3
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-16/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- .cvsignore 4 Nov 2012 09:54:08 -0000 1.66
+++ .cvsignore 19 Nov 2012 22:41:59 -0000 1.67
@@ -1,3 +1,4 @@
mame0147s.exe
0147u1_diff.zip
0147u2_diff.zip
+0147u3_diff.zip
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-16/mame.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- mame.spec 4 Nov 2012 09:54:08 -0000 1.74
+++ mame.spec 19 Nov 2012 22:41:59 -0000 1.75
@@ -5,7 +5,7 @@
%bcond_with debug
%global baseversion 147
-%global sourceupdate 2
+%global sourceupdate 3
# work around low memory on the RPM Fusion builder
%bcond_without lowmem
@@ -30,7 +30,7 @@
#Source updates
Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip
Source2: http://mamedev.org/updates/0%{baseversion}u2_diff.zip
-#Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip
+Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip
#Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip
#Source5: http://mamedev.org/updates/0%{baseversion}u5_diff.zip
#Source6: http://mamedev.org/updates/0%{baseversion}u6_diff.zip
@@ -361,6 +361,9 @@
%changelog
+* Mon Nov 19 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147u3-1
+- Updated to 0.147u3
+
* Tue Oct 30 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147u2-1
- Updated to 0.147u2
- Conditionalised the low memory workaround
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-16/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- sources 4 Nov 2012 09:54:08 -0000 1.66
+++ sources 19 Nov 2012 22:41:59 -0000 1.67
@@ -1,3 +1,4 @@
02b38e27f0840bbd0b637385f16f3747 mame0147s.exe
7f2dbea383138a6ae2bbaac3b32376d6 0147u1_diff.zip
c0306cbf583309d23549529f441e97f2 0147u2_diff.zip
+8851533ae3f692e436bc399b773c4fcb 0147u3_diff.zip
11 years, 12 months
rpms/mame/F-17 .cvsignore, 1.66, 1.67 mame.spec, 1.75, 1.76 sources, 1.66, 1.67
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27949
Modified Files:
.cvsignore mame.spec sources
Log Message:
* Mon Nov 19 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147u3-1
- Updated to 0.147u3
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-17/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- .cvsignore 4 Nov 2012 07:25:48 -0000 1.66
+++ .cvsignore 19 Nov 2012 22:41:56 -0000 1.67
@@ -1,3 +1,4 @@
mame0147s.exe
0147u1_diff.zip
0147u2_diff.zip
+0147u3_diff.zip
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-17/mame.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- mame.spec 4 Nov 2012 07:25:48 -0000 1.75
+++ mame.spec 19 Nov 2012 22:41:56 -0000 1.76
@@ -5,7 +5,7 @@
%bcond_with debug
%global baseversion 147
-%global sourceupdate 2
+%global sourceupdate 3
# work around low memory on the RPM Fusion builder
%bcond_without lowmem
@@ -30,7 +30,7 @@
#Source updates
Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip
Source2: http://mamedev.org/updates/0%{baseversion}u2_diff.zip
-#Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip
+Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip
#Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip
#Source5: http://mamedev.org/updates/0%{baseversion}u5_diff.zip
#Source6: http://mamedev.org/updates/0%{baseversion}u6_diff.zip
@@ -361,6 +361,9 @@
%changelog
+* Mon Nov 19 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147u3-1
+- Updated to 0.147u3
+
* Tue Oct 30 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147u2-1
- Updated to 0.147u2
- Conditionalised the low memory workaround
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-17/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- sources 4 Nov 2012 07:25:48 -0000 1.66
+++ sources 19 Nov 2012 22:41:56 -0000 1.67
@@ -1,3 +1,4 @@
02b38e27f0840bbd0b637385f16f3747 mame0147s.exe
7f2dbea383138a6ae2bbaac3b32376d6 0147u1_diff.zip
c0306cbf583309d23549529f441e97f2 0147u2_diff.zip
+8851533ae3f692e436bc399b773c4fcb 0147u3_diff.zip
11 years, 12 months
rpms/mame/F-18 .cvsignore, 1.65, 1.66 mame.spec, 1.75, 1.76 sources, 1.65, 1.66
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27920
Modified Files:
.cvsignore mame.spec sources
Log Message:
* Mon Nov 19 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147u3-1
- Updated to 0.147u3
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-18/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- .cvsignore 6 Nov 2012 20:08:26 -0000 1.65
+++ .cvsignore 19 Nov 2012 22:41:54 -0000 1.66
@@ -1,3 +1,4 @@
mame0147s.exe
0147u1_diff.zip
0147u2_diff.zip
+0147u3_diff.zip
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-18/mame.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- mame.spec 6 Nov 2012 20:08:27 -0000 1.75
+++ mame.spec 19 Nov 2012 22:41:54 -0000 1.76
@@ -5,7 +5,7 @@
%bcond_with debug
%global baseversion 147
-%global sourceupdate 2
+%global sourceupdate 3
# work around low memory on the RPM Fusion builder
%bcond_without lowmem
@@ -30,7 +30,7 @@
#Source updates
Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip
Source2: http://mamedev.org/updates/0%{baseversion}u2_diff.zip
-#Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip
+Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip
#Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip
#Source5: http://mamedev.org/updates/0%{baseversion}u5_diff.zip
#Source6: http://mamedev.org/updates/0%{baseversion}u6_diff.zip
@@ -361,6 +361,9 @@
%changelog
+* Mon Nov 19 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147u3-1
+- Updated to 0.147u3
+
* Tue Oct 30 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147u2-1
- Updated to 0.147u2
- Conditionalised the low memory workaround
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-18/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- sources 6 Nov 2012 20:08:27 -0000 1.65
+++ sources 19 Nov 2012 22:41:54 -0000 1.66
@@ -1,3 +1,4 @@
02b38e27f0840bbd0b637385f16f3747 mame0147s.exe
7f2dbea383138a6ae2bbaac3b32376d6 0147u1_diff.zip
c0306cbf583309d23549529f441e97f2 0147u2_diff.zip
+8851533ae3f692e436bc399b773c4fcb 0147u3_diff.zip
11 years, 12 months
rpms/mame/devel .cvsignore, 1.66, 1.67 mame.spec, 1.76, 1.77 sources, 1.66, 1.67
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27879
Modified Files:
.cvsignore mame.spec sources
Log Message:
* Mon Nov 19 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147u3-1
- Updated to 0.147u3
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- .cvsignore 30 Oct 2012 20:06:09 -0000 1.66
+++ .cvsignore 19 Nov 2012 22:41:52 -0000 1.67
@@ -1,3 +1,4 @@
mame0147s.exe
0147u1_diff.zip
0147u2_diff.zip
+0147u3_diff.zip
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/mame.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- mame.spec 30 Oct 2012 20:06:09 -0000 1.76
+++ mame.spec 19 Nov 2012 22:41:52 -0000 1.77
@@ -5,7 +5,7 @@
%bcond_with debug
%global baseversion 147
-%global sourceupdate 2
+%global sourceupdate 3
# work around low memory on the RPM Fusion builder
%bcond_without lowmem
@@ -30,7 +30,7 @@
#Source updates
Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip
Source2: http://mamedev.org/updates/0%{baseversion}u2_diff.zip
-#Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip
+Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip
#Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip
#Source5: http://mamedev.org/updates/0%{baseversion}u5_diff.zip
#Source6: http://mamedev.org/updates/0%{baseversion}u6_diff.zip
@@ -361,6 +361,9 @@
%changelog
+* Mon Nov 19 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147u3-1
+- Updated to 0.147u3
+
* Tue Oct 30 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147u2-1
- Updated to 0.147u2
- Conditionalised the low memory workaround
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- sources 30 Oct 2012 20:06:09 -0000 1.66
+++ sources 19 Nov 2012 22:41:52 -0000 1.67
@@ -1,3 +1,4 @@
02b38e27f0840bbd0b637385f16f3747 mame0147s.exe
7f2dbea383138a6ae2bbaac3b32376d6 0147u1_diff.zip
c0306cbf583309d23549529f441e97f2 0147u2_diff.zip
+8851533ae3f692e436bc399b773c4fcb 0147u3_diff.zip
11 years, 12 months
rpms/buildsys-build-rpmfusion/F-16 buildsys-build-rpmfusion-kerneldevpkgs-current, 1.74, 1.75 buildsys-build-rpmfusion.spec, 1.85, 1.86
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/buildsys-build-rpmfusion/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv29409/F-16
Modified Files:
buildsys-build-rpmfusion-kerneldevpkgs-current
buildsys-build-rpmfusion.spec
Log Message:
Update to latest
Index: buildsys-build-rpmfusion-kerneldevpkgs-current
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-16/buildsys-build-rpmfusion-kerneldevpkgs-current,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- buildsys-build-rpmfusion-kerneldevpkgs-current 8 Nov 2012 08:08:09 -0000 1.74
+++ buildsys-build-rpmfusion-kerneldevpkgs-current 19 Nov 2012 13:10:09 -0000 1.75
@@ -1,3 +1,3 @@
-3.6.6-1.fc16
-3.6.6-1.fc16smp
-3.6.6-1.fc16PAE
+3.6.7-1.fc16
+3.6.7-1.fc16smp
+3.6.7-1.fc16PAE
Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-16/buildsys-build-rpmfusion.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- buildsys-build-rpmfusion.spec 8 Nov 2012 08:08:09 -0000 1.85
+++ buildsys-build-rpmfusion.spec 19 Nov 2012 13:10:09 -0000 1.86
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
Version: 16
-Release: 57
+Release: 58
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -86,6 +86,9 @@
%changelog
+* Mon Nov 19 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 10:16-58
+- rebuild for kernel 3.6.7-1.fc16
+
* Thu Nov 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 10:16-57
- rebuild for kernel 3.6.6-1.fc16
12 years
rpms/buildsys-build-rpmfusion/F-17 buildsys-build-rpmfusion-kerneldevpkgs-current, 1.58, 1.59 buildsys-build-rpmfusion.spec, 1.72, 1.73
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/buildsys-build-rpmfusion/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv29171
Modified Files:
buildsys-build-rpmfusion-kerneldevpkgs-current
buildsys-build-rpmfusion.spec
Log Message:
* Mon Nov 19 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 10:17-28
- rebuild for kernel 3.6.7-1.fc17
Index: buildsys-build-rpmfusion-kerneldevpkgs-current
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-17/buildsys-build-rpmfusion-kerneldevpkgs-current,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- buildsys-build-rpmfusion-kerneldevpkgs-current 8 Nov 2012 08:05:46 -0000 1.58
+++ buildsys-build-rpmfusion-kerneldevpkgs-current 19 Nov 2012 13:07:59 -0000 1.59
@@ -1,3 +1,3 @@
-3.6.6-1.fc17
-3.6.6-1.fc17smp
-3.6.6-1.fc17PAE
+3.6.7-1.fc17
+3.6.7-1.fc17smp
+3.6.7-1.fc17PAE
Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-17/buildsys-build-rpmfusion.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- buildsys-build-rpmfusion.spec 8 Nov 2012 08:05:46 -0000 1.72
+++ buildsys-build-rpmfusion.spec 19 Nov 2012 13:07:59 -0000 1.73
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
Version: 17
-Release: 27
+Release: 28
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -86,6 +86,9 @@
%changelog
+* Mon Nov 19 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 10:17-28
+- rebuild for kernel 3.6.7-1.fc17
+
* Thu Nov 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 10:17-27
- rebuild for kernel 3.6.6-1.fc17
12 years
rpms/x264/devel .cvsignore,1.24,1.25 sources,1.24,1.25
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/x264/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv16785
Modified Files:
.cvsignore sources
Log Message:
* Mon Nov 19 2012 Sérgio Basto <sergio(a)serjux.com> - 0.128-1.20121118gitf6a8615
- Update to f6a8615ab0c922ac2cb5c82c9824f6f4742b1725.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/x264/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore 6 Oct 2012 00:04:51 -0000 1.24
+++ .cvsignore 19 Nov 2012 01:57:35 -0000 1.25
@@ -1 +1 @@
-x264-stable-20121006-68dfb7b.tar.bz2
+x264-stable-20121118-f6a8615.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/x264/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources 6 Oct 2012 00:04:51 -0000 1.24
+++ sources 19 Nov 2012 01:57:35 -0000 1.25
@@ -1 +1 @@
-bf71d1de57328c53e42af7d0429eeb0e x264-stable-20121006-68dfb7b.tar.bz2
+17211481fbf0873ad8ad7e44c08296a6 x264-stable-20121118-f6a8615.tar.bz2
12 years
rpms/x264/devel x264-nover.patch,1.6,1.7 x264.spec,1.48,1.49
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/x264/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv16585
Modified Files:
x264-nover.patch x264.spec
Log Message:
* Mon Nov 19 2012 Sérgio Basto <sergio(a)serjux.com> - 0.128-1.20121118gitf6a8615
- Update to f6a8615ab0c922ac2cb5c82c9824f6f4742b1725.
x264-nover.patch:
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: x264-nover.patch
===================================================================
RCS file: /cvs/free/rpms/x264/devel/x264-nover.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- x264-nover.patch 12 Mar 2012 00:59:40 -0000 1.6
+++ x264-nover.patch 19 Nov 2012 01:55:37 -0000 1.7
@@ -1,12 +1,11 @@
-diff -up x264-stable-20110811/configure.nover x264-stable-20110811/configure
---- x264-stable-20110811/configure.nover 2011-08-11 20:21:38.000000000 +0200
-+++ x264-stable-20110811/configure 2011-08-11 20:27:39.000000000 +0200
-@@ -1057,7 +1057,7 @@ fi
+--- ./configure.nover 2012-11-18 05:31:06.000000000 +0000
++++ ./configure 2012-11-19 01:44:23.790190057 +0000
+@@ -1147,7 +1147,7 @@ fi
echo "LDFLAGSCLI = $LDFLAGSCLI" >> config.mak
echo "CLI_LIBX264 = $CLI_LIBX264" >> config.mak
-${SRCPATH}/version.sh "${SRCPATH}" >> x264_config.h
+cat ${SRCPATH}/version.h >> ${SRCPATH}/x264_config.h
- pclibs="-L$libdir -lx264 $libpthread"
-
+ cat > x264.pc << EOF
+ prefix=$prefix
Index: x264.spec
===================================================================
RCS file: /cvs/free/rpms/x264/devel/x264.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- x264.spec 6 Oct 2012 00:04:51 -0000 1.48
+++ x264.spec 19 Nov 2012 01:55:37 -0000 1.49
@@ -1,5 +1,5 @@
-%global gitdate 20121006
-%global gitversion 68dfb7b
+%global gitdate 20121118
+%global gitversion f6a8615
%global snapshot %{gitdate}-%{gitversion}
%global gver .%{gitdate}git%{gitversion}
%global branch stable
@@ -22,8 +22,8 @@
Summary: H264/AVC video streams encoder
Name: x264
-Version: 0.125
-Release: 5%{?gver}%{?dist}
+Version: 0.128
+Release: 1%{?gver}%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://developers.videolan.org/x264.html
@@ -189,6 +189,9 @@
%{_libdir}/libx26410b.so
%changelog
+* Mon Nov 19 2012 Sérgio Basto <sergio(a)serjux.com> - 0.128-1.20121118gitf6a8615
+- Update to f6a8615ab0c922ac2cb5c82c9824f6f4742b1725.
+
* Sat Oct 06 2012 Sérgio Basto <sergio(a)serjux.com> - 0.125-4.20121006git68dfb7b
- Note: no source update.
- Just add git tag to package name, for faster check upstream.
12 years
rpms/nvidia-96xx-kmod/F-17 3.7_kernel.patch,NONE,1.1
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-96xx-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31182
Added Files:
3.7_kernel.patch
Log Message:
add patch for kernel-3.7 (not added to specfile)
3.7_kernel.patch:
conftest.sh | 7 ++++++-
nv.c | 4 ++++
2 files changed, 10 insertions(+), 1 deletion(-)
--- NEW FILE 3.7_kernel.patch ---
--- a/usr/src/nv/conftest.sh
+++ b/usr/src/nv/conftest.sh
@@ -128,6 +128,7 @@ build_cflags() {
if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
+ MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/arch/x86/include/uapi"
fi
if [ "$XEN_PRESENT" != "0" ]; then
MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-xen $MACH_CFLAGS"
@@ -137,6 +138,7 @@ build_cflags() {
if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
+ MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/arch/x86/include/uapi"
fi
if [ "$XEN_PRESENT" != "0" ]; then
MACH_CFLAGS="-I$HEADERS/asm/mach-xen $MACH_CFLAGS"
@@ -144,9 +146,12 @@ build_cflags() {
fi
CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
+ CFLAGS="$CFLAGS -I$HEADERS -I$HEADERS/uapi"
if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
- CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$OUTPUT/arch/x86/include/generated"
+ CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include"
+ CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated"
+ CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated/uapi"
fi
if [ -n "$BUILD_PARAMS" ]; then
CFLAGS="$CFLAGS -D$BUILD_PARAMS"
--- a/usr/src/nv/nv.c
+++ b/usr/src/nv/nv.c
@@ -2350,7 +2350,11 @@ int nv_kern_mmap(
/* prevent the swapper from swapping it out */
/* mark the memory i/o so the buffers aren't dumped on core dumps */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
+ vma->vm_flags |= (VM_IO | VM_LOCKED | (VM_DONTEXPAND | VM_DONTDUMP));
+#else
vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED);
+#endif
}
NV_VMA_FILE(vma) = file;
12 years
rpms/nvidia-kmod/F-18 3.7_kernel.patch,NONE,1.1
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30363
Added Files:
3.7_kernel.patch
Log Message:
add patch for kernel-3.7 (not added to specfile)
3.7_kernel.patch:
conftest.sh | 7 ++++++-
nv-mmap.c | 4 ++++
2 files changed, 10 insertions(+), 1 deletion(-)
--- NEW FILE 3.7_kernel.patch ---
--- a/kernel/conftest.sh
+++ b/kernel/conftest.sh
@@ -127,6 +127,7 @@ build_cflags() {
if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
+ MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/arch/x86/include/uapi"
elif [ "$ARCH" = "arm" ]; then
MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/arm/mach-tegra/include -D__LINUX_ARM_ARCH__=7"
fi
@@ -138,6 +139,7 @@ build_cflags() {
if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
+ MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/arch/x86/include/uapi"
elif [ "$ARCH" = "arm" ]; then
MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/arm/mach-tegra/include -D__LINUX_ARM_ARCH__=7"
fi
@@ -147,9 +149,12 @@ build_cflags() {
fi
CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
+ CFLAGS="$CFLAGS -I$HEADERS -I$HEADERS/uapi"
if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
- CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$OUTPUT/arch/x86/include/generated"
+ CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include"
+ CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated"
+ CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated/uapi"
elif [ "$ARCH" = "arm" ]; then
CFLAGS="$CFLAGS -I$SOURCES/arch/arm/include -I$OUTPUT/arch/arm/include/generated"
fi
--- a/kernel/nv-mmap.c
+++ b/kernel/nv-mmap.c
@@ -463,7 +463,11 @@ int nv_kern_mmap(
NV_PRINT_AT(NV_DBG_MEMINFO, at);
nv_vm_list_page_count(&at->page_table[i], pages);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
+ vma->vm_flags |= (VM_IO | VM_LOCKED | (VM_DONTEXPAND | VM_DONTDUMP));
+#else
vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED);
+#endif
#if defined(VM_DRIVER_PAGES)
vma->vm_flags |= VM_DRIVER_PAGES;
12 years