rpms/openafs-kmod/F-18 openafs-kmod.spec,1.33,1.34
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/openafs-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv21743
Modified Files:
openafs-kmod.spec
Log Message:
* Thu Jan 17 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.2-0.pre2.4
- Rebuilt for updated kernel
Index: openafs-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-18/openafs-kmod.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- openafs-kmod.spec 13 Jan 2013 23:07:27 -0000 1.33
+++ openafs-kmod.spec 17 Jan 2013 09:16:01 -0000 1.34
@@ -23,7 +23,7 @@
Name: %{kmod_name}-kmod
Version: 1.6.2
-Release: 0.%{pre}%{?dist}.3
+Release: 0.%{pre}%{?dist}.4
Summary: Kernel module(s)
Group: System Environment/Kernel
@@ -98,6 +98,9 @@
%changelog
+* Thu Jan 17 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.2-0.pre2.4
+- Rebuilt for updated kernel
+
* Mon Jan 14 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.2-0.pre2.3
- Rebuilt for updated kernel
11 years, 10 months
rpms/ndiswrapper-kmod/F-18 ndiswrapper-kmod.spec,1.63,1.64
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/ndiswrapper-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv21614
Modified Files:
ndiswrapper-kmod.spec
Log Message:
* Thu Jan 17 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.58-0.2rc1.3
- Rebuilt for updated kernel
Index: ndiswrapper-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/ndiswrapper-kmod/F-18/ndiswrapper-kmod.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- ndiswrapper-kmod.spec 13 Jan 2013 23:07:16 -0000 1.63
+++ ndiswrapper-kmod.spec 17 Jan 2013 09:15:52 -0000 1.64
@@ -10,7 +10,7 @@
Summary: Ndiswrapper kernel module
Name: ndiswrapper-kmod
Version: 1.58
-Release: 0.2%{?pre}%{?dist}.2
+Release: 0.2%{?pre}%{?dist}.3
License: GPLv2
Group: System Environment/Kernel
URL: http://ndiswrapper.sourceforge.net
@@ -77,6 +77,9 @@
%changelog
+* Thu Jan 17 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.58-0.2rc1.3
+- Rebuilt for updated kernel
+
* Mon Jan 14 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.58-0.2rc1.2
- Rebuilt for updated kernel
11 years, 10 months
rpms/buildsys-build-rpmfusion/F-17 buildsys-build-rpmfusion-kerneldevpkgs-current, 1.68, 1.69 buildsys-build-rpmfusion.spec, 1.82, 1.83
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/buildsys-build-rpmfusion/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20843
Modified Files:
buildsys-build-rpmfusion-kerneldevpkgs-current
buildsys-build-rpmfusion.spec
Log Message:
* Thu Jan 17 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 10:17-38
- rebuild for kernel 3.6.11-8.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.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- buildsys-build-rpmfusion-kerneldevpkgs-current 8 Jan 2013 23:43:24 -0000 1.68
+++ buildsys-build-rpmfusion-kerneldevpkgs-current 17 Jan 2013 08:44:59 -0000 1.69
@@ -1,3 +1,3 @@
-3.6.11-5.fc17
-3.6.11-5.fc17smp
-3.6.11-5.fc17PAE
+3.6.11-8.fc17
+3.6.11-8.fc17smp
+3.6.11-8.fc17PAE
Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-17/buildsys-build-rpmfusion.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- buildsys-build-rpmfusion.spec 8 Jan 2013 23:43:24 -0000 1.82
+++ buildsys-build-rpmfusion.spec 17 Jan 2013 08:44:59 -0000 1.83
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
Version: 17
-Release: 37
+Release: 38
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -86,6 +86,9 @@
%changelog
+* Thu Jan 17 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 10:17-38
+- rebuild for kernel 3.6.11-8.fc17
+
* Tue Jan 08 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 10:17-37
- rebuild for kernel 3.6.11-5.fc17
11 years, 10 months
rpms/buildsys-build-rpmfusion/F-18 buildsys-build-rpmfusion-kerneldevpkgs-current, 1.32, 1.33 buildsys-build-rpmfusion.spec, 1.47, 1.48
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/buildsys-build-rpmfusion/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20699
Modified Files:
buildsys-build-rpmfusion-kerneldevpkgs-current
buildsys-build-rpmfusion.spec
Log Message:
* Thu Jan 17 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 10:18-4
- rebuild for kernel 3.7.2-204.fc18
Index: buildsys-build-rpmfusion-kerneldevpkgs-current
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-18/buildsys-build-rpmfusion-kerneldevpkgs-current,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- buildsys-build-rpmfusion-kerneldevpkgs-current 13 Jan 2013 23:01:00 -0000 1.32
+++ buildsys-build-rpmfusion-kerneldevpkgs-current 17 Jan 2013 08:43:46 -0000 1.33
@@ -1,3 +1,3 @@
-3.7.2-201.fc18
-3.7.2-201.fc18smp
-3.7.2-201.fc18PAE
+3.7.2-204.fc18
+3.7.2-204.fc18smp
+3.7.2-204.fc18PAE
Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-18/buildsys-build-rpmfusion.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- buildsys-build-rpmfusion.spec 13 Jan 2013 23:01:00 -0000 1.47
+++ buildsys-build-rpmfusion.spec 17 Jan 2013 08:43:46 -0000 1.48
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
Version: 18
-Release: 3
+Release: 4
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -86,6 +86,9 @@
%changelog
+* Thu Jan 17 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 10:18-4
+- rebuild for kernel 3.7.2-204.fc18
+
* Sun Jan 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 10:18-3
- rebuild for kernel 3.7.2-201.fc18
11 years, 10 months
rpms/nvidia-xconfig/devel .cvsignore, 1.22, 1.23 nvidia-xconfig.spec, 1.22, 1.23 sources, 1.22, 1.23
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-xconfig/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv16992
Modified Files:
.cvsignore nvidia-xconfig.spec sources
Log Message:
* Wed Jan 16 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1.0-26
- Update to 313.18
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-xconfig/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore 16 Oct 2012 22:24:35 -0000 1.22
+++ .cvsignore 16 Jan 2013 14:40:16 -0000 1.23
@@ -1 +1 @@
-nvidia-xconfig-310.14.tar.bz2
+nvidia-xconfig-313.18.tar.bz2
Index: nvidia-xconfig.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-xconfig/devel/nvidia-xconfig.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- nvidia-xconfig.spec 16 Oct 2012 21:51:18 -0000 1.22
+++ nvidia-xconfig.spec 16 Jan 2013 14:40:16 -0000 1.23
@@ -1,8 +1,8 @@
-%global nversion 310.14
+%global nversion 313.18
Name: nvidia-xconfig
Version: 1.0
-Release: 25%{?dist}
+Release: 26%{?dist}
Summary: NVIDIA X configuration file editor
Group: Applications/System
@@ -66,6 +66,9 @@
%{_mandir}/man1/nvidia-xconfig.1.*
%changelog
+* Wed Jan 16 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1.0-26
+- Update to 313.18
+
* Tue Oct 16 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1.0-25
- Update to 310.14
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-xconfig/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources 16 Oct 2012 22:24:35 -0000 1.22
+++ sources 16 Jan 2013 14:40:16 -0000 1.23
@@ -1 +1 @@
-ef0776f5065b77e46c80a2350f4fcc0f nvidia-xconfig-310.14.tar.bz2
+593fb5e069549c28181d7ad4ca22fcef nvidia-xconfig-313.18.tar.bz2
11 years, 10 months
rpms/nvidia-settings/devel .cvsignore, 1.24, 1.25 nvidia-settings.spec, 1.27, 1.28 sources, 1.24, 1.25
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-settings/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv16532
Modified Files:
.cvsignore nvidia-settings.spec sources
Log Message:
* Wed Jan 16 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1.0-29
- Update to 313.18
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore 1 Dec 2012 12:11:21 -0000 1.24
+++ .cvsignore 16 Jan 2013 14:25:31 -0000 1.25
@@ -1 +1 @@
-nvidia-settings-310.19.tar.bz2
+nvidia-settings-313.18.tar.bz2
Index: nvidia-settings.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/devel/nvidia-settings.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- nvidia-settings.spec 1 Dec 2012 12:11:21 -0000 1.27
+++ nvidia-settings.spec 16 Jan 2013 14:25:31 -0000 1.28
@@ -1,7 +1,7 @@
# We use the driver version as a snapshot internal number
# The real version of the package remains 1.0
# This will prevent missunderstanding and versioning changes on the nvidia driver
-%global nversion 310.19
+%global nversion 313.18
#Possible replacement/complement:
#http://willem.engen.nl/projects/disper/
@@ -9,7 +9,7 @@
Name: nvidia-settings
Version: 1.0
-Release: 28%{?dist}
+Release: 29%{?dist}
Summary: Configure the NVIDIA graphics driver
Group: Applications/System
@@ -100,6 +100,9 @@
%changelog
+* Wed Jan 16 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1.0-29
+- Update to 313.18
+
* Sat Dec 01 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1.0-28
- Update to 310.19
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources 1 Dec 2012 12:11:21 -0000 1.24
+++ sources 16 Jan 2013 14:25:31 -0000 1.25
@@ -1 +1 @@
-30e2775ac719af9443b12549d0cd8852 nvidia-settings-310.19.tar.bz2
+8d2cf904aa612e7027d56669a68f5cb6 nvidia-settings-313.18.tar.bz2
11 years, 10 months
rpms/xorg-x11-drv-nvidia/devel .cvsignore, 1.52, 1.53 sources, 1.53, 1.54 xorg-x11-drv-nvidia.spec, 1.93, 1.94
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv16232
Modified Files:
.cvsignore sources xorg-x11-drv-nvidia.spec
Log Message:
* Wed Jan 16 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:313.18-1
- Update to 313.18
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore 16 Nov 2012 13:38:29 -0000 1.52
+++ .cvsignore 16 Jan 2013 14:18:35 -0000 1.53
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86_64-310.19.run
-NVIDIA-Linux-x86-310.19.run
+NVIDIA-Linux-x86-313.18.run
+NVIDIA-Linux-x86_64-313.18.run
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources 16 Nov 2012 13:38:29 -0000 1.53
+++ sources 16 Jan 2013 14:18:35 -0000 1.54
@@ -1,2 +1,2 @@
-0b498d3b2dfd123032cb93196e0f475c NVIDIA-Linux-x86_64-310.19.run
-2adbdd38540b3a8955714760e05f575d NVIDIA-Linux-x86-310.19.run
+780c37c28a6e06e9571cafe348b7da64 NVIDIA-Linux-x86-313.18.run
+102140afa822a9f5c486e424b45fcb03 NVIDIA-Linux-x86_64-313.18.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.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- xorg-x11-drv-nvidia.spec 10 Jan 2013 15:37:10 -0000 1.93
+++ xorg-x11-drv-nvidia.spec 16 Jan 2013 14:18:35 -0000 1.94
@@ -7,8 +7,8 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
-Version: 310.19
-Release: 2%{?dist}
+Version: 313.18
+Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -83,7 +83,6 @@
%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 /^libglx\.so/d;
%filter_setup
@@ -347,7 +346,6 @@
%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.*
@@ -361,12 +359,16 @@
%{nvidialibdir}/libOpenCL.so
%{nvidialibdir}/libnvidia-compiler.so
%{nvidialibdir}/libGL.so
+%{nvidialibdir}/libnvcuvid.so
%{nvidialibdir}/libnvidia-ml.so
%{nvidialibdir}/libnvidia-opencl.so
%{nvidialibdir}/libnvidia-encode.so
%changelog
+* Wed Jan 16 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:313.18-1
+- Update to 313.18
+
* Thu Jan 10 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:310.19-2
- Fix preun scriptlet
11 years, 10 months
rpms/nvidia-kmod/devel 3.8_kernel.patch, NONE, 1.1 .cvsignore, 1.52, 1.53 nvidia-kmod.spec, 1.111, 1.112 sources, 1.53, 1.54
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15344
Modified Files:
.cvsignore nvidia-kmod.spec sources
Added Files:
3.8_kernel.patch
Log Message:
* Wed Jan 16 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:313.18-1
- Update to 313.18 (adds xorg-server 1.14 ABI support)
- patch for 3.8rc kernel
3.8_kernel.patch:
conftest.sh | 1 +
1 file changed, 1 insertion(+)
--- NEW FILE 3.8_kernel.patch ---
Index: kernel/conftest.sh
===================================================================
--- a/kernel/conftest.sh
+++ b/kernel/conftest.sh
@@ -160,6 +160,7 @@ build_cflags() {
if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include"
+ CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include/uapi"
CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated"
CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated/uapi"
elif [ "$ARCH" = "arm" ]; then
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore 16 Nov 2012 14:40:26 -0000 1.52
+++ .cvsignore 16 Jan 2013 13:57:24 -0000 1.53
@@ -1 +1 @@
-nvidia-kmod-data-310.19.tar.xz
+nvidia-kmod-data-313.18.tar.xz
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- nvidia-kmod.spec 16 Nov 2012 14:40:26 -0000 1.111
+++ nvidia-kmod.spec 16 Jan 2013 13:57:24 -0000 1.112
@@ -7,7 +7,7 @@
Name: nvidia-kmod
Epoch: 1
-Version: 310.19
+Version: 313.18
# Taken over by kmodtool
Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
@@ -24,7 +24,7 @@
# </switch me>
Source11: nvidia-kmodtool-excludekernel-filterfile
-
+Patch0: 3.8_kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -51,7 +51,7 @@
for arch in x86 x64
do
pushd nvidiapkg-${arch}
-echo "no patch to apply"
+%patch0 -p1
popd
done
@@ -85,6 +85,10 @@
%changelog
+* Wed Jan 16 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:313.18-1
+- Update to 313.18 (adds xorg-server 1.14 ABI support)
+- patch for 3.8rc kernel
+
* Fri Nov 16 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1:310.19-1
- rebuilt
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources 16 Nov 2012 14:40:26 -0000 1.53
+++ sources 16 Jan 2013 13:57:24 -0000 1.54
@@ -1 +1 @@
-d2ae476c0324e3e50ade527f582e9c0f nvidia-kmod-data-310.19.tar.xz
+cca1ef79cfbcd05a2249431ea403b772 nvidia-kmod-data-313.18.tar.xz
11 years, 10 months
rpms/ffmpegthumbs/devel .cvsignore, 1.4, 1.5 ffmpegthumbs.spec, 1.4, 1.5 sources, 1.4, 1.5
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/ffmpegthumbs/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11806
Modified Files:
.cvsignore ffmpegthumbs.spec sources
Log Message:
* Wed Jan 16 2013 Rex Dieter <rdieter(a)fedoraproject.org> 4.9.97-1
- 4.9.97
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpegthumbs/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 8 Nov 2012 13:34:07 -0000 1.4
+++ .cvsignore 16 Jan 2013 13:39:46 -0000 1.5
@@ -1 +1 @@
-ffmpegthumbs-4.9.3.tar.xz
+ffmpegthumbs-4.9.97.tar.xz
Index: ffmpegthumbs.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpegthumbs/devel/ffmpegthumbs.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ffmpegthumbs.spec 24 Nov 2012 15:01:00 -0000 1.4
+++ ffmpegthumbs.spec 16 Jan 2013 13:39:46 -0000 1.5
@@ -1,7 +1,7 @@
Name: ffmpegthumbs
-Version: 4.9.3
-Release: 2%{?dist}
+Version: 4.9.97
+Release: 1%{?dist}
Summary: KDE ffmpegthumbnailer service
License: GPLv2+
@@ -59,6 +59,9 @@
%changelog
+* Wed Jan 16 2013 Rex Dieter <rdieter(a)fedoraproject.org> 4.9.97-1
+- 4.9.97
+
* Sat Nov 24 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 4.9.3-2
- Rebuilt for FFmpeg 1.0
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpegthumbs/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 8 Nov 2012 13:34:07 -0000 1.4
+++ sources 16 Jan 2013 13:39:46 -0000 1.5
@@ -1 +1 @@
-9c63e794efd404b97a5dff1ce42a3436 ffmpegthumbs-4.9.3.tar.xz
+61a0e25fee62ef820fe729a372a214d1 ffmpegthumbs-4.9.97.tar.xz
11 years, 10 months
rpms/VirtualBox/F-18 VirtualBox-4.2.0-VBoxGuestLib.patch, 1.1, 1.2 VirtualBox-4.2.0-libcxx.patch, 1.2, 1.3 VirtualBox.spec, 1.26, 1.27 VirtualBox-4.2.0-xorg17.patch, 1.5, NONE
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13000
Modified Files:
VirtualBox-4.2.0-VBoxGuestLib.patch
VirtualBox-4.2.0-libcxx.patch VirtualBox.spec
Removed Files:
VirtualBox-4.2.0-xorg17.patch
Log Message:
* Tue Jan 15 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.6-2
- Re enable_docs after add some BuildRequires of new texlive.
- VBoxGuestLib is not need for new X11-xorg, so no compile instead patch source to
build with system sources.
- Delete source bundles before patching sources and adjustments on the corresponding patches.
- VirtualBox-4.2.0-libcxx.patch minor imporvements.
VirtualBox-4.2.0-VBoxGuestLib.patch:
Makefile.kmk | 2 ++
1 file changed, 2 insertions(+)
Index: VirtualBox-4.2.0-VBoxGuestLib.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-18/VirtualBox-4.2.0-VBoxGuestLib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox-4.2.0-VBoxGuestLib.patch 23 Sep 2012 14:33:25 -0000 1.1
+++ VirtualBox-4.2.0-VBoxGuestLib.patch 16 Jan 2013 02:15:40 -0000 1.2
@@ -1,125 +1,16 @@
-VBoxGuestR3LibRuntimeXF86.cpp:
-Inspired from http://opensource.apple.com/source/X11server/X11server-85/kdrive/xorg-ser...
-xalloc.c and verrorf.c
-Author: Sérgio Basto <sergio(a)serjux.com>
-
---- ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk.xorg17 2012-08-03 13:28:42.000000000 +0100
-+++ ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2012-09-09 01:05:45.271905105 +0100
-@@ -187,11 +187,9 @@ VBoxGuestR3LibXFree86_SOURCES = \
- VBoxGuestR3LibVideo.cpp \
- VBoxGuestR3LibRuntimeXF86.cpp
- VBoxGuestR3LibXFree86_INCS = \
-- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/common/ \
-- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/os-support \
-- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/include \
-- $(VBOX_PATH_X11_XFREE_4_3)/include \
-- $(VBOX_PATH_X11_XFREE_4_3)/exports/include/X11
-+ /usr/share/xorg-x11-server-source/hw/xfree86/common/ \
-+ /usr/share/xorg-x11-server-source/hw/xfree86/os-support \
-+ /usr/share/xorg-x11-server-source/include
+--- ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk.orig 2012-12-27 16:42:00.199621337 +0000
++++ ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2012-12-27 16:43:06.605220980 +0000
+@@ -39,11 +39,13 @@ LIBRARIES += \
+ VBoxGuestR3Lib \
+ VBoxGuestR3LibShared
+ ifndef VBOX_ONLY_TESTSUITE
++ifndef VBOX_USE_SYSTEM_XORG_HEADERS
+ if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
+ LIBRARIES += \
+ VBoxGuestR3LibXFree86
+ endif
+ endif
++endif
+ LIBRARIES.win.amd64 += VBoxGuestR3Lib-x86 VBoxGuestR3LibShared-x86
- VBoxGuestR3LibRuntimeXF86.cpp_CXXFLAGS = -Wno-shadow
-
---- ./src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibRuntimeXF86.cpp.xorg17 2011-01-14 20:15:34.000000000 +0000
-+++ ./src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibRuntimeXF86.cpp 2012-09-09 01:04:03.198818717 +0100
-@@ -34,20 +34,55 @@
- #include <iprt/log.h>
- #include <iprt/mem.h>
- #include <iprt/string.h>
-+#include <string.h>
-+#include <fcntl.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <math.h>
-+#include <ctype.h>
- extern "C" {
- # define XFree86LOADER
--# include <xf86_ansic.h>
- # include <errno.h>
- # undef size_t
- }
-
-+/** Provide an VErrorF function when used stand-alone. */
-+void VErrorF(const char *format, va_list args)
-+{
-+ vfprintf(stderr, format, args); /* RATS: We assume the format string
-+ * is trusted, since it is always
-+ * from a log message in our code. */
-+}
-+
-+/* When using this file as part of a stand-alone (i.e., non-X-Server
-+ * program, then the ultimate output routines have to be defined. */
-+
-+/** Provide an ErrorF function when used stand-alone. */
-+void ErrorF(const char *format, ...)
-+{
-+ va_list args;
-+
-+ va_start(args, format);
-+ vfprintf(stderr, format, args); /* RATS: We assume the format string
-+ * is trusted, since it is always
-+ * from a log message in our code. */
-+ va_end(args);
-+}
-+
-+void *xalloc(unsigned long n)
-+{
-+ if (!n)
-+ n = 1;
-+ return malloc(n);
-+}
-+
- /* This is risky as it restricts call to the ANSI format type specifiers. */
- RTDECL(size_t) RTStrPrintf(char *pszBuffer, size_t cchBuffer, const char *pszFormat, ...)
- {
- va_list args;
- int cbRet;
- va_start(args, pszFormat);
-- cbRet = xf86vsnprintf(pszBuffer, cchBuffer, pszFormat, args);
-+ cbRet = vsnprintf(pszBuffer, cchBuffer, pszFormat, args);
- va_end(args);
- return cbRet >= 0 ? cbRet : 0;
- }
-@@ -55,8 +90,8 @@ RTDECL(size_t) RTStrPrintf(char *pszBuff
- RTDECL(int) RTStrToUInt32Ex(const char *pszValue, char **ppszNext, unsigned uBase, uint32_t *pu32)
- {
- char *pszNext = NULL;
-- xf86errno = 0;
-- unsigned long ul = xf86strtoul(pszValue, &pszNext, uBase);
-+ errno = 0;
-+ unsigned long ul = strtoul(pszValue, &pszNext, uBase);
- if (ppszNext)
- *ppszNext = pszNext;
- if (RT_UNLIKELY(pszValue == pszNext))
-@@ -65,11 +100,11 @@ RTDECL(int) RTStrToUInt32Ex(const char *
- ul = UINT32_MAX;
- if (pu32)
- *pu32 = (uint32_t) ul;
-- if (RT_UNLIKELY(xf86errno == EINVAL))
-+ if (RT_UNLIKELY(errno == EINVAL))
- return VERR_INVALID_PARAMETER;
-- if (RT_UNLIKELY(xf86errno == ERANGE))
-+ if (RT_UNLIKELY(errno == ERANGE))
- return VWRN_NUMBER_TOO_BIG;
-- if (RT_UNLIKELY(xf86errno))
-+ if (RT_UNLIKELY(errno))
- /* RTErrConvertFromErrno() is not available */
- return VERR_UNRESOLVED_ERROR;
- if (RT_UNLIKELY(*pszValue == '-'))
-@@ -77,7 +112,7 @@ RTDECL(int) RTStrToUInt32Ex(const char *
- if (RT_UNLIKELY(*pszNext))
- {
- while (*pszNext)
-- if (!xf86isspace(*pszNext))
-+ if (!isspace(*pszNext))
- return VWRN_TRAILING_CHARS;
- return VWRN_TRAILING_SPACES;
- }
-@@ -135,6 +170,6 @@ RTDECL(void *) RTMemTmpAllocTag(size_t
-
- RTDECL(void) RTMemTmpFree(void *pv)
- {
-- xfree(pv);
-+ free(pv);
- }
VirtualBox-4.2.0-libcxx.patch:
./src/VBox/Runtime/Makefile.kmk | 2 +-
./src/libs/kStuff/Makefile.kmk | 2 +-
Config.kmk | 4 ++--
b/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk | 2 +-
b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk | 4 +---
b/src/VBox/HostDrivers/Support/Makefile.kmk | 2 +-
b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk | 12 ++++++------
b/src/VBox/HostDrivers/win/Makefile.kmk | 2 +-
b/src/VBox/Installer/win/InstallHelper/Makefile.kmk | 2 +-
b/src/VBox/Installer/win/Resources/Makefile.kmk | 2 +-
configure | 2 +-
src/VBox/Frontends/VirtualBox/Makefile.kmk | 2 +-
src/VBox/Installer/win/Stub/Makefile.kmk | 2 +-
src/VBox/Storage/testcase/Makefile.kmk | 2 +-
src/libs/liblzf-3.4/Makefile.kmk | 2 +-
15 files changed, 21 insertions(+), 23 deletions(-)
Index: VirtualBox-4.2.0-libcxx.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-18/VirtualBox-4.2.0-libcxx.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- VirtualBox-4.2.0-libcxx.patch 23 Sep 2012 14:33:25 -0000 1.2
+++ VirtualBox-4.2.0-libcxx.patch 16 Jan 2013 02:15:40 -0000 1.3
@@ -4,13 +4,25 @@
distribution. Doesn't work with trunk glibc heading towards 2.11 anyways.
Static linking is not really supported anyways.
-Was From dd383911ef6a9a43c17b18d48b17cd82d6c8feb9 Mon Sep 17 00:00:00 2001
+Was From dd383911ef6a9a43c17b18d48b17cd82d6c8feb9
+Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak(a)v3.sk>
Date: Fri, 18 Jun 2010 10:58:14 +0200
-diff --git a/Config.kmk b/Config.kmk
-index 0ea34d8..2ec388c 100644
+
+Redo for VirtualBox-4.2.x
+Sérgio Basto <sergio(a)serjux.com>
+
--- a/Config.kmk
+++ b/Config.kmk
+@@ -2588,7 +2588,7 @@ else
+ VBOX_SUFF_OBJ = $(SUFF_OBJ)
+ endif
+ VBOXW32GUEST_SUFF_LIB = .lib
+-VBOXLNX32GUEST_SUFF_LIB = .a
++VBOXLNX32GUEST_SUFF_LIB = .so
+
+ #
+ # SDKs for external libraries.
@@ -3163,7 +3163,7 @@ TEMPLATE_VBOXR3EXE_LIBS = pthread m rt dl
TEMPLATE_VBOXR3EXE_LIBS = \
$(L4_LIBDIR)/libvboxserver.s.so \
@@ -20,8 +32,6 @@
$(L4_LIBDIR)/libdl.s.so \
$(L4_LIBDIR)/libuc.0.s.so
else ifeq ($(KBUILD_TARGET),os2)
-diff --git a/configure b/configure
-index 987cf1b..75d556c 100755
--- a/configure
+++ b/configure
@@ -2582,7 +2582,7 @@ fi
@@ -57,8 +67,6 @@
ifdef VBOX_X11_SEAMLESS_GUEST
VBoxClient_DEFS += SEAMLESS_GUEST DYNAMIC_RESIZE
VBoxClient_SOURCES += \
-diff --git a/src/VBox/Frontends/VirtualBox/Makefile.kmk b/src/VBox/Frontends/VirtualBox/Makefile.kmk
-index ed0163b..2ee8418 100644
--- a/src/VBox/Frontends/VirtualBox/Makefile.kmk
+++ b/src/VBox/Frontends/VirtualBox/Makefile.kmk
@@ -957,7 +957,7 @@ endif # darwin
@@ -81,7 +89,6 @@
SUPR3Static_EXTENDS = SUPR3
#
-diff --git a/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk
--- a/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk.libcxx 2012-08-29 15:13:46.000000000 +0100
+++ b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk 2012-09-02 02:49:31.198721147 +0100
@@ -143,7 +143,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNet
@@ -171,8 +178,6 @@
VBoxRes_DEPS = $(VBOX_SVN_REV_KMK)
VBoxRes_SOURCES = \
dummy.cpp \
-diff --git a/src/VBox/Installer/win/Stub/Makefile.kmk b/src/VBox/Installer/win/Stub/Makefile.kmk
-index a8f89eb..6cf55cc 100644
--- a/src/VBox/Installer/win/Stub/Makefile.kmk
+++ b/src/VBox/Installer/win/Stub/Makefile.kmk
@@ -22,7 +22,7 @@ include $(KBUILD_PATH)/subheader.kmk
@@ -184,8 +189,6 @@
TEMPLATE_VBOXSTUB_POST_CMDS = $(NO_SUCH_VARIABLE)
PROGRAMS.x86 += VBoxStub
-diff --git a/src/VBox/Storage/testcase/Makefile.kmk b/src/VBox/Storage/testcase/Makefile.kmk
-index f935b05..40f6bf2 100644
--- a/src/VBox/Storage/testcase/Makefile.kmk
+++ b/src/VBox/Storage/testcase/Makefile.kmk
@@ -68,7 +68,7 @@ ifdef VBOX_WITH_TESTCASES
@@ -197,8 +200,6 @@
vbox-img_DEFS += IN_VBOXDDU IN_VBOXDDU_STATIC VBOX_HDD_NO_DYNAMIC_BACKENDS IN_RT_R3
vbox-img_SOURCES = \
vbox-img.cpp \
-diff --git a/src/libs/liblzf-3.4/Makefile.kmk b/src/libs/liblzf-3.4/Makefile.kmk
-index 44088fa..0afe89a 100644
--- a/src/libs/liblzf-3.4/Makefile.kmk
+++ b/src/libs/liblzf-3.4/Makefile.kmk
@@ -33,7 +33,7 @@ VBox-liblzf_SOURCES = \
@@ -210,18 +211,25 @@
VBox-liblzf-static_BLD_TYPE = $(VBox-liblzf_BLD_TYPE)
VBox-liblzf-static_DEFS = $(VBox-liblzf_DEFS)
VBox-liblzf-static_DEFS.x86 = $(VBox-liblzf_DEFS.x86)
-diff --git a/src/libs/zlib-1.2.1/Makefile.kmk b/src/libs/zlib-1.2.1/Makefile.kmk
-index fde8b7c..405d354 100644
---- a/src/libs/zlib-1.2.6/Makefile.kmk
-+++ b/src/libs/zlib-1.2.6/Makefile.kmk
-@@ -39,7 +39,7 @@ VBox-zlib_SOURCES = \
- inftrees.c \
- inffast.c
-
--VBox-zlib-static_TEMPLATE = VBOXR3STATIC
-+VBox-zlib-static_TEMPLATE = VBOXR3EXE
- VBox-zlib-static_DEFS = $(VBox-zlib_DEFS)
- VBox-zlib-static_SOURCES = $(VBox-zlib_SOURCES)
+--- ./src/VBox/Runtime/Makefile.kmk.orig 2012-12-27 18:33:44.262413863 +0000
++++ ./src/VBox/Runtime/Makefile.kmk 2012-12-27 18:34:26.856820592 +0000
+@@ -211,7 +211,7 @@ endif
+ #
+ # RuntimeR3 - Static Runtime for Ring-3 executables.
+ #
+-RuntimeR3_TEMPLATE = VBoxR3Static
++RuntimeR3_TEMPLATE = VBOXR3EXE
+ RuntimeR3_SDKS = VBOX_LIBXML2 VBOX_OPENSSL VBOX_BOOST ## @todo why is BOOST and XML2 here? r3/xml.cpp is not in this lib...
+ RuntimeR3_SDKS.win = $(VBOX_WINPSDK) $(VBOX_WINDDK)
+ RuntimeR3_DEFS = IN_RT_R3 IN_SUP_R3 LDR_WITH_NATIVE LDR_WITH_ELF32 LDR_WITH_PE RT_WITH_VBOX RT_NO_GIP
+--- ./src/libs/kStuff/Makefile.kmk.orig 2012-12-27 18:36:01.629728244 +0000
++++ ./src/libs/kStuff/Makefile.kmk 2012-12-27 18:36:11.876827415 +0000
+@@ -75,7 +75,7 @@ VBox-kStuff_SOURCES = \
+ # The library for static linking.
+ #
+ LIBRARIES += VBox-kStuffStatic
+-VBox-kStuffStatic_TEMPLATE = VBoxR3Static
++VBox-kStuffStatic_TEMPLATE = VBOXR3EXE
+ VBox-kStuffStatic_EXTENDS = VBox-kStuff
+
---
-1.7.1
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-18/VirtualBox.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- VirtualBox.spec 26 Dec 2012 06:02:33 -0000 1.26
+++ VirtualBox.spec 16 Jan 2013 02:15:40 -0000 1.27
@@ -19,15 +19,15 @@
#global enable_webservice 0
#endif
-%if 0%{?fedora} < 18
+#if 0%{?fedora} < 18
%global enable_docs 1
-%else
-%global enable_docs 0
-%endif
+#else
+#global enable_docs 0
+#endif
Name: VirtualBox
Version: 4.2.6
-Release: 1%{?prerel:.%{prerel}}%{?dist}
+Release: 2%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -76,6 +76,14 @@
BuildRequires: mkisofs
BuildRequires: java-devel >= 1.6
BuildRequires: /usr/bin/pdflatex
+%if 0%{?fedora} >= 18
+BuildRequires: doxygen-latex
+BuildRequires: texlive-collection-fontsrecommended
+BuildRequires: texlive-ec
+BuildRequires: texlive-ucs
+BuildRequires: texlive-tabulary
+BuildRequires: texlive-fancybox
+%endif
BuildRequires: boost-devel
#BuildRequires: liblzf-devel
BuildRequires: libxml2-devel
@@ -195,6 +203,20 @@
%setup -qn %{name}-%{version}%{prereltag}
find -name '*.py[co]' -delete
+# Remove prebuilt binary tools
+%if 0%{?fedora} < 16
+rm -rf kBuild
+%endif
+rm -rf tools
+# Remove bundle X11 sources and some lib sources, before patching.
+rm -rf src/VBox/Additions/x11/x11include
+rm -rf src/VBox/Additions/x11/x11stubs
+rm -rf src/libs/boost-1.37.0/
+#rm -rf src/libs/liblzf-3.4/
+rm -rf src/libs/libxml2-2.6.31/
+rm -rf src/libs/libpng-1.2.8/
+rm -rf src/libs/zlib-1.2.6/
+
%patch1 -p1 -b .noupdates
%patch2 -p1 -b .strings
%patch3 -p1 -b .libcxx
@@ -212,24 +234,8 @@
%if 0%{?fedora} < 17
%patch25 -p1 -b .xorg111
%endif
-
%patch26 -p1 -b .nobundles
-# Remove prebuilt binary tools
-%if 0%{?fedora} < 16
-rm -rf kBuild
-%endif
-rm -rf tools
-
-# Remove some bundle X11 sources.
-rm -rf src/VBox/Additions/x11/x11include
-rm -rf src/VBox/Additions/x11/x11stubs
-rm -rf src/libs/boost-1.37.0/
-#rm -rf src/libs/liblzf-3.4/
-rm -rf src/libs/libxml2-2.6.31/
-rm -rf src/libs/libpng-1.2.8/
-rm -rf src/libs/zlib-1.2.6/
-
# CRLF->LF
sed -i 's/\r//' COPYING
@@ -608,6 +614,13 @@
%changelog
+* Tue Jan 15 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.6-2
+- Re enable_docs after add some BuildRequires of new texlive.
+- VBoxGuestLib is not need for new X11-xorg, so no compile instead patch source to
+ build with system sources.
+- Delete source bundles before patching sources and adjustments on the corresponding patches.
+- VirtualBox-4.2.0-libcxx.patch minor imporvements.
+
* Mon Dec 24 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.6-1
- New upstream release.
- Fix some changelog dates.
--- VirtualBox-4.2.0-xorg17.patch DELETED ---
11 years, 10 months