rpms/nvidia-kmod/devel 3.7_kernel.patch,1.1,NONE
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30134
Removed Files:
3.7_kernel.patch
Log Message:
remove dead patch
--- 3.7_kernel.patch DELETED ---
11 years, 10 months
rpms/mod_h264_streaming/F-18 mod_h264_streaming.spec,1.2,1.3
by Robert Scheck
Author: robert
Update of /cvs/nonfree/rpms/mod_h264_streaming/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9449
Modified Files:
mod_h264_streaming.spec
Log Message:
Updated spec file to match with Apache 2.4 policy
Index: mod_h264_streaming.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mod_h264_streaming/F-18/mod_h264_streaming.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_h264_streaming.spec 8 Feb 2012 23:44:39 -0000 1.2
+++ mod_h264_streaming.spec 17 Nov 2012 15:21:54 -0000 1.3
@@ -1,7 +1,14 @@
+%{!?_httpd_apxs: %{expand: %%global _httpd_apxs %%{_sbindir}/apxs}}
+%{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)}}
+# /etc/httpd/conf.d with httpd < 2.4 and defined as /etc/httpd/conf.modules.d with httpd >= 2.4
+%{!?_httpd_confdir: %{expand: %%global _httpd_confdir %%{_sysconfdir}/httpd/conf.d}}
+%{!?_httpd_modconfdir: %{expand: %%global _httpd_modconfdir %%{_sysconfdir}/httpd/conf.d}}
+%{!?_httpd_moddir: %{expand: %%global _httpd_moddir %%{_libdir}/httpd/modules}}
+
Summary: H264 streaming module for the Apache HTTP Server
Name: mod_h264_streaming
Version: 2.2.7
-Release: 2%{?dist}
+Release: 3%{?dist}
Group: System Environment/Daemons
License: CC-BY-NC-SA
URL: http://h264.code-shop.com/
@@ -9,7 +16,7 @@
Source1: h264_streaming.conf
Patch: mod_h264_streaming-2.2.7-httpd.patch
BuildRequires: httpd-devel >= 2.0.39
-Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing httpd-devel)
+Requires: httpd-mmn = %{_httpd_mmn}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
@@ -40,17 +47,33 @@
make DESTDIR=$RPM_BUILD_ROOT install
# Install Apache configuration file
-install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/h264_streaming.conf
+%if "%{_httpd_modconfdir}" == "%{_httpd_confdir}"
+# httpd <= 2.2.x
+install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_httpd_confdir}/h264_streaming.conf
+%else
+# httpd >= 2.4.x
+head -n 5 %{SOURCE1} > 10-h264_streaming.conf
+sed -e '4,5d' %{SOURCE1} > h264_streaming.conf
+touch -c -r %{SOURCE1} 10-h264_streaming.conf h264_streaming.conf
+install -D -p -m 644 10-h264_streaming.conf $RPM_BUILD_ROOT%{_httpd_modconfdir}/10-h264_streaming.conf
+install -D -p -m 644 h264_streaming.conf $RPM_BUILD_ROOT%{_httpd_confdir}/h264_streaming.conf
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%{_libdir}/httpd/modules/%{name}.so
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/h264_streaming.conf
+%{_httpd_moddir}/%{name}.so
+%config(noreplace) %{_httpd_confdir}/h264_streaming.conf
+%if "%{_httpd_modconfdir}" != "%{_httpd_confdir}"
+%config(noreplace) %{_httpd_modconfdir}/10-h264_streaming.conf
+%endif
%changelog
+* Sat Nov 17 2012 Robert Scheck <robert(a)fedoraproject.org> 2.2.7-3
+- Updated spec file to match with Apache 2.4 policy
+
* Thu Feb 09 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.2.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
11 years, 10 months
rpms/mod_h264_streaming/devel mod_h264_streaming.spec,1.2,1.3
by Robert Scheck
Author: robert
Update of /cvs/nonfree/rpms/mod_h264_streaming/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1269
Modified Files:
mod_h264_streaming.spec
Log Message:
Updated spec file to match with Apache 2.4 policy
Index: mod_h264_streaming.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mod_h264_streaming/devel/mod_h264_streaming.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_h264_streaming.spec 8 Feb 2012 23:44:39 -0000 1.2
+++ mod_h264_streaming.spec 17 Nov 2012 11:53:28 -0000 1.3
@@ -1,7 +1,14 @@
+%{!?_httpd_apxs: %{expand: %%global _httpd_apxs %%{_sbindir}/apxs}}
+%{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)}}
+# /etc/httpd/conf.d with httpd < 2.4 and defined as /etc/httpd/conf.modules.d with httpd >= 2.4
+%{!?_httpd_confdir: %{expand: %%global _httpd_confdir %%{_sysconfdir}/httpd/conf.d}}
+%{!?_httpd_modconfdir: %{expand: %%global _httpd_modconfdir %%{_sysconfdir}/httpd/conf.d}}
+%{!?_httpd_moddir: %{expand: %%global _httpd_moddir %%{_libdir}/httpd/modules}}
+
Summary: H264 streaming module for the Apache HTTP Server
Name: mod_h264_streaming
Version: 2.2.7
-Release: 2%{?dist}
+Release: 3%{?dist}
Group: System Environment/Daemons
License: CC-BY-NC-SA
URL: http://h264.code-shop.com/
@@ -9,7 +16,7 @@
Source1: h264_streaming.conf
Patch: mod_h264_streaming-2.2.7-httpd.patch
BuildRequires: httpd-devel >= 2.0.39
-Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing httpd-devel)
+Requires: httpd-mmn = %{_httpd_mmn}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
@@ -40,17 +47,33 @@
make DESTDIR=$RPM_BUILD_ROOT install
# Install Apache configuration file
-install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/h264_streaming.conf
+%if "%{_httpd_modconfdir}" == "%{_httpd_confdir}"
+# httpd <= 2.2.x
+install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_httpd_confdir}/h264_streaming.conf
+%else
+# httpd >= 2.4.x
+head -n 5 %{SOURCE1} > 10-h264_streaming.conf
+sed -e '4,5d' %{SOURCE1} > h264_streaming.conf
+touch -c -r %{SOURCE1} 10-h264_streaming.conf h264_streaming.conf
+install -D -p -m 644 10-h264_streaming.conf $RPM_BUILD_ROOT%{_httpd_modconfdir}/10-h264_streaming.conf
+install -D -p -m 644 h264_streaming.conf $RPM_BUILD_ROOT%{_httpd_confdir}/h264_streaming.conf
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%{_libdir}/httpd/modules/%{name}.so
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/h264_streaming.conf
+%{_httpd_moddir}/%{name}.so
+%config(noreplace) %{_httpd_confdir}/h264_streaming.conf
+%if "%{_httpd_modconfdir}" != "%{_httpd_confdir}"
+%config(noreplace) %{_httpd_modconfdir}/10-h264_streaming.conf
+%endif
%changelog
+* Sat Nov 17 2012 Robert Scheck <robert(a)fedoraproject.org> 2.2.7-3
+- Updated spec file to match with Apache 2.4 policy
+
* Thu Feb 09 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.2.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
11 years, 10 months
rpms/xorg-x11-drv-nvidia-173xx/devel sources, 1.9, 1.10 xorg-x11-drv-nvidia-173xx.spec, 1.23, 1.24
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18469
Modified Files:
sources xorg-x11-drv-nvidia-173xx.spec
Log Message:
update to 173.14.36
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 16 Jun 2012 09:14:49 -0000 1.9
+++ sources 16 Nov 2012 16:26:28 -0000 1.10
@@ -1,2 +1,2 @@
-0fa45e6fc23a2dc69faa8a66ae0e0cc5 NVIDIA-Linux-x86-173.14.35-pkg0.run
-6934b522d2cf313ae6e94e25763fe1a8 NVIDIA-Linux-x86_64-173.14.35-pkg0.run
+513677824e9684dd34ca17ad56a68500 NVIDIA-Linux-x86-173.14.36-pkg0.run
+c341612429c2885980103b40542cb2b2 NVIDIA-Linux-x86_64-173.14.36-pkg0.run
Index: xorg-x11-drv-nvidia-173xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/devel/xorg-x11-drv-nvidia-173xx.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xorg-x11-drv-nvidia-173xx.spec 8 Nov 2012 20:49:37 -0000 1.23
+++ xorg-x11-drv-nvidia-173xx.spec 16 Nov 2012 16:26:28 -0000 1.24
@@ -4,8 +4,8 @@
%global __strip /bin/true
Name: xorg-x11-drv-nvidia-173xx
-Version: 173.14.35
-Release: 2%{?dist}
+Version: 173.14.36
+Release: 1%{?dist}
Summary: NVIDIA's 173xx serie proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -327,6 +327,10 @@
%changelog
+* Fri Nov 16 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 173.14.36-1
+- Update to 173.14.36
+- Adds support for xserver ABI 13 (xorg-server 1.13)
+
* Thu Nov 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.35-2
- Fix posttrans error code
11 years, 10 months
rpms/nvidia-173xx-kmod/devel 3.7_kernel.patch,1.1,1.2
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-173xx-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv17408
Modified Files:
3.7_kernel.patch
Log Message:
fix patch
3.7_kernel.patch:
conftest.sh | 7 ++++++-
nv.c | 4 ++++
2 files changed, 10 insertions(+), 1 deletion(-)
Index: 3.7_kernel.patch
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-173xx-kmod/devel/3.7_kernel.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 3.7_kernel.patch 16 Nov 2012 15:46:07 -0000 1.1
+++ 3.7_kernel.patch 16 Nov 2012 16:10:33 -0000 1.2
@@ -30,3 +30,17 @@
fi
if [ -n "$BUILD_PARAMS" ]; then
CFLAGS="$CFLAGS -D$BUILD_PARAMS"
+--- a/usr/src/nv/nv.c
++++ b/usr/src/nv/nv.c
+@@ -2609,7 +2609,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;
11 years, 10 months
rpms/nvidia-173xx-kmod/devel 3.7_kernel.patch, NONE, 1.1 nvidia-173xx-kmod.spec, 1.46, 1.47 sources, 1.11, 1.12
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-173xx-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv16360
Modified Files:
nvidia-173xx-kmod.spec sources
Added Files:
3.7_kernel.patch
Log Message:
update to 173.14.36
3.7_kernel.patch:
conftest.sh | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
--- NEW FILE 3.7_kernel.patch ---
--- a/usr/src/nv/conftest.sh
+++ b/usr/src/nv/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"
fi
if [ "$XEN_PRESENT" != "0" ]; then
MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-xen $MACH_CFLAGS"
@@ -136,6 +137,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"
@@ -143,9 +145,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"
Index: nvidia-173xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-173xx-kmod/devel/nvidia-173xx-kmod.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- nvidia-173xx-kmod.spec 8 Nov 2012 22:26:07 -0000 1.46
+++ nvidia-173xx-kmod.spec 16 Nov 2012 15:46:07 -0000 1.47
@@ -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
-#define buildforkernels newest
+%define buildforkernels current
Name: nvidia-173xx-kmod
-Version: 173.14.35
+Version: 173.14.36
# Taken over by kmodtool
-Release: 2%{?dist}.7
+Release: 1%{?dist}
Summary: NVIDIA 173xx display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -23,7 +23,7 @@
# </switch me>
#http://www.nvnews.net/vbulletin/attachment.php?attachmentid=32570&d=1218222727
-Patch0: 3.6_kernel.patch
+Patch0: 3.7_kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -95,6 +95,11 @@
%changelog
+* Fri Nov 16 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 173.14.36-1
+- Update to 173.14.36
+- Adds support for xserver ABI 13 (xorg-server 1.13)
+- Try to patch for 3.7 kernel
+
* Thu Nov 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.35-2.7
- Rebuilt for updated kernel
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-173xx-kmod/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 16 Jun 2012 09:23:53 -0000 1.11
+++ sources 16 Nov 2012 15:46:07 -0000 1.12
@@ -1 +1 @@
-7f7637fdf254d906e2a677cbb8622428 nvidia-kmod-data-173.14.35.tar.bz2
+64bddf592e61efb23d6a65be0bd0e661 nvidia-kmod-data-173.14.36.tar.bz2
11 years, 10 months
rpms/nvidia-173xx-kmod/F-18 .cvsignore, 1.8, 1.9 nvidia-173xx-kmod.spec, 1.46, 1.47 sources, 1.11, 1.12
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-173xx-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15507
Modified Files:
.cvsignore nvidia-173xx-kmod.spec sources
Log Message:
update to 173.14.36
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-173xx-kmod/F-18/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 30 Apr 2011 23:10:13 -0000 1.8
+++ .cvsignore 16 Nov 2012 15:24:30 -0000 1.9
@@ -1 +1 @@
-nvidia-kmod-data-173.14.30.tar.bz2
+nvidia-kmod-data-173.14.36.tar.bz2
Index: nvidia-173xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-173xx-kmod/F-18/nvidia-173xx-kmod.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- nvidia-173xx-kmod.spec 8 Nov 2012 22:26:08 -0000 1.46
+++ nvidia-173xx-kmod.spec 16 Nov 2012 15:24:30 -0000 1.47
@@ -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
-#define buildforkernels newest
+%define buildforkernels current
Name: nvidia-173xx-kmod
-Version: 173.14.35
+Version: 173.14.36
# Taken over by kmodtool
-Release: 2%{?dist}.7
+Release: 1%{?dist}
Summary: NVIDIA 173xx display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -23,8 +23,6 @@
# </switch me>
#http://www.nvnews.net/vbulletin/attachment.php?attachmentid=32570&d=1218222727
-Patch0: 3.6_kernel.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i586 and i686
@@ -51,7 +49,7 @@
for arch in x86 x64
do
pushd nvidiapkg-${arch}
-%patch0 -p1
+echo "no patch to apply"
popd
done
@@ -95,6 +93,10 @@
%changelog
+* Fri Nov 16 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 173.14.36-1
+- Update to 173.14.36
+- Adds support for xserver ABI 13 (xorg-server 1.13)
+
* Thu Nov 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.35-2.7
- Rebuilt for updated kernel
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-173xx-kmod/F-18/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 16 Jun 2012 09:23:53 -0000 1.11
+++ sources 16 Nov 2012 15:24:31 -0000 1.12
@@ -1 +1 @@
-7f7637fdf254d906e2a677cbb8622428 nvidia-kmod-data-173.14.35.tar.bz2
+64bddf592e61efb23d6a65be0bd0e661 nvidia-kmod-data-173.14.36.tar.bz2
11 years, 10 months
rpms/xorg-x11-drv-nvidia-173xx/F-18 .cvsignore, 1.8, 1.9 sources, 1.9, 1.10 xorg-x11-drv-nvidia-173xx.spec, 1.23, 1.24
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15024
Modified Files:
.cvsignore sources xorg-x11-drv-nvidia-173xx.spec
Log Message:
update to 173.14.36
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-18/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 30 Apr 2011 23:06:47 -0000 1.8
+++ .cvsignore 16 Nov 2012 15:14:30 -0000 1.9
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86-173.14.30-pkg0.run
-NVIDIA-Linux-x86_64-173.14.30-pkg0.run
+NVIDIA-Linux-x86-173.14.36-pkg0.run
+NVIDIA-Linux-x86_64-173.14.36-pkg0.run
11 years, 10 months
rpms/nvidia-kmod/devel .cvsignore, 1.51, 1.52 nvidia-kmod.spec, 1.110, 1.111 sources, 1.52, 1.53
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13829
Modified Files:
.cvsignore nvidia-kmod.spec sources
Log Message:
update to 310.19
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore 16 Oct 2012 21:38:05 -0000 1.51
+++ .cvsignore 16 Nov 2012 14:40:26 -0000 1.52
@@ -1 +1 @@
-nvidia-kmod-data-310.14.tar.xz
+nvidia-kmod-data-310.19.tar.xz
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- nvidia-kmod.spec 16 Oct 2012 21:47:22 -0000 1.110
+++ nvidia-kmod.spec 16 Nov 2012 14:40:26 -0000 1.111
@@ -7,9 +7,9 @@
Name: nvidia-kmod
Epoch: 1
-Version: 310.14
+Version: 310.19
# Taken over by kmodtool
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -25,8 +25,6 @@
Source11: nvidia-kmodtool-excludekernel-filterfile
-Patch0: 3.7_kernel.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,7 +51,7 @@
for arch in x86 x64
do
pushd nvidiapkg-${arch}
-%patch0 -p2
+echo "no patch to apply"
popd
done
@@ -87,6 +85,9 @@
%changelog
+* Fri Nov 16 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1:310.19-1
+- rebuilt
+
* Tue Oct 16 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1:310.14-2
- add patch for 3.7rc kernel
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources 16 Oct 2012 21:38:05 -0000 1.52
+++ sources 16 Nov 2012 14:40:26 -0000 1.53
@@ -1 +1 @@
-b74f91cd243a547e06f1b295c96838ed nvidia-kmod-data-310.14.tar.xz
+d2ae476c0324e3e50ade527f582e9c0f nvidia-kmod-data-310.19.tar.xz
11 years, 10 months
rpms/xorg-x11-drv-nvidia/devel .cvsignore, 1.51, 1.52 00-nvidia.conf, 1.1, 1.2 sources, 1.52, 1.53 xorg-x11-drv-nvidia.spec, 1.91, 1.92
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11480
Modified Files:
.cvsignore 00-nvidia.conf sources xorg-x11-drv-nvidia.spec
Log Message:
update to 310.19
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore 16 Oct 2012 21:35:14 -0000 1.51
+++ .cvsignore 16 Nov 2012 13:38:29 -0000 1.52
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86-310.14.run
-NVIDIA-Linux-x86_64-310.14.run
+NVIDIA-Linux-x86_64-310.19.run
+NVIDIA-Linux-x86-310.19.run
Index: 00-nvidia.conf
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/00-nvidia.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 00-nvidia.conf 2 Nov 2010 12:02:45 -0000 1.1
+++ 00-nvidia.conf 16 Nov 2012 13:38:29 -0000 1.2
@@ -2,6 +2,6 @@
#Do not edit
Section "Files"
- ModulePath "@LIBDIR@/xorg/modules/extensions/nvidia"
+ ModulePath "@LIBDIR@/nvidia/xorg"
ModulePath "@LIBDIR@/xorg/modules"
EndSection
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources 16 Oct 2012 21:35:14 -0000 1.52
+++ sources 16 Nov 2012 13:38:29 -0000 1.53
@@ -1,2 +1,2 @@
-93b6fcf100a94e4e5fafc4ccd740a590 NVIDIA-Linux-x86-310.14.run
-347ffd1c88e57476d26dfd0e36584acc NVIDIA-Linux-x86_64-310.14.run
+0b498d3b2dfd123032cb93196e0f475c NVIDIA-Linux-x86_64-310.19.run
+2adbdd38540b3a8955714760e05f575d NVIDIA-Linux-x86-310.19.run
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- xorg-x11-drv-nvidia.spec 9 Nov 2012 09:53:37 -0000 1.91
+++ xorg-x11-drv-nvidia.spec 16 Nov 2012 13:38:29 -0000 1.92
@@ -7,7 +7,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
-Version: 304.64
+Version: 310.19
Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
@@ -79,13 +79,12 @@
%filter_from_provides /^libGLCore\.so/d;
%filter_from_provides /^libGL\.so/d;
%filter_from_provides /^libvdpau_nvidia\.so\.1/d;
-%filter_from_provides /^libXvMCNVIDIA_dynamic\.so\.1/d;
%filter_from_provides /^libglx\.so/d;
%filter_from_requires /^libnvidia/d;
%filter_from_requires /^libGLCore\.so/d;
%filter_from_requires /^libGL\.so/d;
+%filter_from_requires /^libnvcuvid/d;
%filter_from_requires /^libvdpau_nvidia\.so\.1/d;
-%filter_from_requires /^libXvMCNVIDIA_dynamic\.so\.1/d;
%filter_from_requires /^libglx\.so/d;
%filter_setup
}
@@ -205,7 +204,6 @@
install -p -m 0755 libglx.so.%{version} $RPM_BUILD_ROOT%{nvidiaxorgdir}
install -p -m 0755 nvidia_drv.so $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/
install -p -m 0755 libvdpau*.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau/
-install -p -m 0644 libXvMCNVIDIA.a $RPM_BUILD_ROOT%{nvidialibdir}/
# Install binaries
install -p -m 0755 nvidia-{bug-report.sh,smi,cuda-proxy-control,cuda-proxy-server} $RPM_BUILD_ROOT%{_bindir}
@@ -348,6 +346,7 @@
%config %{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
%{nvidialibdir}/*.so.*
%{nvidialibdir}/libcuda.so
+%{nvidialibdir}/libnvcuvid.so
%{nvidialibdir}/libnvidia-glcore.so
%{nvidialibdir}/tls/*.so*
%exclude %{_libdir}/vdpau/libvdpau.*
@@ -356,19 +355,20 @@
%files devel
%defattr(-,root,root,-)
-%exclude %{nvidialibdir}/libXvMCNVIDIA.a
%exclude %{nvidialibdir}/libcuda.so
%{_includedir}/nvidia/
%{nvidialibdir}/libOpenCL.so
%{nvidialibdir}/libnvidia-compiler.so
%{nvidialibdir}/libGL.so
-%{nvidialibdir}/libXvMCNVIDIA.so
-%{nvidialibdir}/libnvcuvid.so
%{nvidialibdir}/libnvidia-ml.so
%{nvidialibdir}/libnvidia-opencl.so
+%{nvidialibdir}/libnvidia-encode.so
%changelog
+* Fri Nov 16 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1:310.19-1
+- Update to 310.19
+
* Thu Nov 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:304.64-1
- Update to 304.64
- Move nvidia xorg libraries to _libdir/nvidia/xorg - rfbz#2264
11 years, 10 months