rpms/nvidia-kmod/devel .cvsignore, 1.19, 1.20 nvidia-kmod.spec, 1.62, 1.63 sources, 1.19, 1.20
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22876/devel
Modified Files:
.cvsignore nvidia-kmod.spec sources
Log Message:
Update to 195.36.31
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore 24 Apr 2010 09:31:20 -0000 1.19
+++ .cvsignore 21 Jun 2010 10:31:35 -0000 1.20
@@ -1 +1 @@
-nvidia-kmod-data-195.36.24.tar.bz2
+nvidia-kmod-data-195.36.31.tar.bz2
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- nvidia-kmod.spec 13 Jun 2010 21:51:21 -0000 1.62
+++ nvidia-kmod.spec 21 Jun 2010 10:31:35 -0000 1.63
@@ -7,9 +7,9 @@
Name: nvidia-kmod
Epoch: 1
-Version: 195.36.24
+Version: 195.36.31
# 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,7 +25,10 @@
Source11: nvidia-kmodtool-excludekernel-filterfile
+#http://www.nvnews.net/vbulletin/showthread.php?t=151791
Patch0: NVIDIA_kernel-195.36.24-6120611.diff.txt
+#http://bugs.gentoo.org/show_bug.cgi?id=301318
+#Patch1: nvidia-190.53-2.6.33.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i586 and i686
@@ -52,7 +55,8 @@
do
pushd nvidiapkg-${arch}
pushd usr/src/nv
-%patch0 -p3
+%patch0 -p3 -b .iommu
+#%patch1 -p3 -b .acpi
popd
popd
done
@@ -97,6 +101,11 @@
%changelog
+* Thu Jun 17 2010 Nicolas Chaubvet <kwizart(a)gmail.com> - 1:195.36.31-1
+- Update to 195.36.31
+- Fix acpi_walk_namespace call with kernel 2.6.33 and later.
+ http://bugs.gentoo.org/show_bug.cgi?id=301318
+
* Sun Jun 13 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:195.36.24-2
- Backport IOMMU - http://www.nvnews.net/vbulletin/showthread.php?t=151791
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources 24 Apr 2010 09:31:20 -0000 1.19
+++ sources 21 Jun 2010 10:31:35 -0000 1.20
@@ -1 +1 @@
-f6743503f98dd95f44ddb9b6f87117a5 nvidia-kmod-data-195.36.24.tar.bz2
+013fe3ae0e449b22398a290aa13621dd nvidia-kmod-data-195.36.31.tar.bz2
13 years, 10 months
rpms/xorg-x11-drv-nvidia/F-11 .cvsignore, 1.18, 1.19 blacklist-nouveau.conf, 1.1, 1.2 nvidia-config-display, 1.1, 1.2 sources, 1.19, 1.20 xorg-x11-drv-nvidia.spec, 1.35, 1.36
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22695/F-11
Modified Files:
.cvsignore blacklist-nouveau.conf nvidia-config-display
sources xorg-x11-drv-nvidia.spec
Log Message:
Update to 195.36.31
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-11/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore 30 Dec 2009 13:13:53 -0000 1.18
+++ .cvsignore 21 Jun 2010 10:29:31 -0000 1.19
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86_64-190.53-pkg0.run
-NVIDIA-Linux-x86-190.53-pkg0.run
+NVIDIA-Linux-x86-195.36.31-pkg0.run
+NVIDIA-Linux-x86_64-195.36.31-pkg0.run
Index: blacklist-nouveau.conf
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-11/blacklist-nouveau.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- blacklist-nouveau.conf 1 Jul 2009 16:59:27 -0000 1.1
+++ blacklist-nouveau.conf 21 Jun 2010 10:29:31 -0000 1.2
@@ -1,4 +1,4 @@
# RPM Fusion blacklist for nouveau driver - you need to run as root:
-# mkinitrd -f /boot/initrd-$(uname -r).img $(uname -r)
+# dracut -f /boot/initramfs-$(uname -r).img $(uname -r)
# if nouveau is loaded despite this file.
blacklist nouveau
Index: nvidia-config-display
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-11/nvidia-config-display,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nvidia-config-display 5 Oct 2008 11:47:05 -0000 1.1
+++ nvidia-config-display 21 Jun 2010 10:29:31 -0000 1.2
@@ -76,8 +76,8 @@
break
else:
self.addModule(module)
- # Problems with Compiz without these.
- self.addOption(self.majorVendor,"AddARGBGLXVisuals", "True")
+ # Problems with Compiz without these. - not needed since 195.xxx
+ #self.addOption(self.majorVendor,"AddARGBGLXVisuals", "True")
#self.addOption(self.majorVendor,"DisableGLXRootClipping", "True")
Utils.writeXorgConf(self.xconfig, self.xconfigpath)
# We have to read saved status file to restore the Xorg configuration.
@@ -94,9 +94,9 @@
prevDriver = self.config.getOldDriver()
if prevDriver == self.majorVendor:
print _('Will not allow reverting from driver \'%s\' to \'%s\'.') % (self.vendor, self.vendor)
- print _('Using the \'nv\' driver instead.')
- prevDriver = "nv"
- self.config.setOldDriver("nv")
+ print _('Using the \'nouveau\' driver instead.')
+ prevDriver = "nouveau"
+ self.config.setOldDriver("nouveau")
self.removeOption(self.majorVendor,"AddARGBGLXVisuals")
self.removeOption(self.majorVendor,"DisableGLXRootClipping")
self.toggleDriver(self.majorVendor, prevDriver)
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-11/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources 30 Dec 2009 13:13:53 -0000 1.19
+++ sources 21 Jun 2010 10:29:31 -0000 1.20
@@ -1,2 +1,2 @@
-3d3e956366f9df0e4c64d2e0299d1029 NVIDIA-Linux-x86_64-190.53-pkg0.run
-2e80419f6f9ac16beecd839874d0c5ab NVIDIA-Linux-x86-190.53-pkg0.run
+c30af5d776e3c71c6dd8e06c30e4bf1f NVIDIA-Linux-x86-195.36.31-pkg0.run
+91cd7502cb6ca3a5c0e79e33ae79881f NVIDIA-Linux-x86_64-195.36.31-pkg0.run
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-11/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- xorg-x11-drv-nvidia.spec 30 Dec 2009 13:13:53 -0000 1.35
+++ xorg-x11-drv-nvidia.spec 21 Jun 2010 10:29:31 -0000 1.36
@@ -7,7 +7,8 @@
%endif
Name: xorg-x11-drv-nvidia
-Version: 190.53
+Epoch: 1
+Version: 195.36.31
Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
@@ -47,7 +48,7 @@
Requires: which
Requires: livna-config-display >= 0.0.21
%if 0%{?fedora} > 10 || 0%{?rhel} > 5
-Requires: %{name}-libs%{_isa} = %{version}-%{release}
+Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release}
%else
Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
%endif
@@ -59,7 +60,7 @@
Requires(preun): chkconfig
-Provides: nvidia-kmod-common = %{version}
+Provides: nvidia-kmod-common = %{?epoch}:%{version}
Conflicts: xorg-x11-drv-nvidia-beta
Conflicts: xorg-x11-drv-nvidia-legacy
Conflicts: xorg-x11-drv-nvidia-71xx
@@ -67,7 +68,7 @@
Conflicts: xorg-x11-drv-nvidia-173xx
Conflicts: xorg-x11-drv-fglrx
Conflicts: xorg-x11-drv-catalyst
-Obsoletes: nvidia-kmod < %{version}
+Obsoletes: nvidia-kmod < %{?epoch}:%{version}
#Introduced in F10 for freshrpms compatibility
Obsoletes: nvidia-x11-drv < %{version}-%{release}
@@ -89,7 +90,7 @@
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
-Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
+Requires: %{name}-libs-%{_target_cpu} = %{?epoch}:%{version}-%{release}
#Introduced in F10 when 173xx has forked to legacy serie
Obsoletes: xorg-x11-drv-nvidia-newest-devel < %{version}-100
Provides: xorg-x11-drv-nvidia-newest-devel = %{version}-101
@@ -101,12 +102,12 @@
%package libs
Summary: Libraries for %{name}
Group: User Interface/X Hardware Support
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{?epoch}:%{version}-%{release}
Requires: libvdpau%{_isa} >= 0.3
-Provides: %{name}-libs-%{_target_cpu} = %{version}-%{release}
+Provides: %{name}-libs-%{_target_cpu} = %{?epoch}:%{version}-%{release}
%ifarch %{ix86}
-Provides: %{name}-libs-32bit = %{version}-%{release}
-Obsoletes: %{name}-libs-32bit <= %{version}-%{release}
+Provides: %{name}-libs-32bit = %{?epoch}:%{version}-%{release}
+Obsoletes: %{name}-libs-32bit <= %{?epoch}:%{version}-%{release}
Obsoletes: nvidia-x11-drv-32bit < %{version}-%{release}
Provides: nvidia-x11-drv-32bit = %{version}-%{release}
%endif
@@ -155,6 +156,9 @@
if [[ ! "/${file##./usr/lib/vdpau}" = "/${file}" ]]
then
install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/%{_libdir}/vdpau/${file##./usr/lib/vdpau}
+ elif [[ ! "/${file##./etc/OpenCL/vendors}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/%{_sysconfdir}/OpenCL/vendors/${file##./etc/OpenCL/vendors/}
elif [[ ! "/${file##./usr/lib/}" = "/${file}" ]]
then
install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/%{nvidialibdir}/${file##./usr/lib/}
@@ -227,6 +231,12 @@
# This is 180.xx adds - vdpau libs and headers
ln -s libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau/libvdpau_nvidia.so.1
+# This is 195.xx adds - OpenCL support
+ln -s libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{nvidialibdir}/libOpenCL.so.1
+ln -s libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{nvidialibdir}/libOpenCL.so
+ln -s libnvidia-compiler.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libnvidia-compiler.so.1
+ln -s libnvidia-compiler.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libnvidia-compiler.so
+
# X configuration script
install -D -p -m 0755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/nvidia-config-display
@@ -244,8 +254,8 @@
# Change perms on static libs. Can't fathom how to do it nicely above.
find $RPM_BUILD_ROOT/%{nvidialibdir} -type f -name "*.a" -exec chmod 0644 '{}' \;
-# Remove execstack needs on F-12 and laters
-%if 0%{?fedora} >= 12 || 0%{?rhel} > 5
+# Remove execstack needs on F-12 and laters - disabled
+%if 0
find $RPM_BUILD_ROOT%{nvidialibdir} -name '*.so.*' -type f -exec execstack -c {} ';'
execstack -c $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libglx.so.%{version}
execstack -c $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so
@@ -262,8 +272,6 @@
%post
-# Removes old legacy layout, fixed SELinux copy errors
-if [ ! $(ls /etc/udev/devices/nvidia* 2>/dev/null | wc -l) -eq 0 ];then rm -f /etc/udev/devices/nvidia*;fi ||:
if [ "$1" -eq "1" ]; then
# Enable nvidia driver when installing
%{_sbindir}/nvidia-config-display enable &>/dev/null ||:
@@ -271,6 +279,16 @@
/sbin/chkconfig --add nvidia ||:
/etc/init.d/nvidia start &>/dev/null ||:
fi
+if [ -x /sbin/grubby ] ; then
+ GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel`
+ /sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='nomodeset rdblacklist=nouveau' &>/dev/null
+fi
+if [ -x /usr/sbin/setsebool ] ; then
+ SELINUXEXECSTACK=`grep 0 /selinux/booleans/allow_execstack | wc -l`
+ if [ ${SELINUXEXECSTACK} -eq "1" ] ; then
+ /usr/sbin/setsebool -P allow_execstack on &>/dev/null
+ fi
+fi ||:
%post libs -p /sbin/ldconfig
@@ -287,6 +305,9 @@
%files
%defattr(-,root,root,-)
%doc nvidiapkg/usr/share/doc/*
+%dir %{_sysconfdir}/OpenCL
+%dir %{_sysconfdir}/OpenCL/vendors
+%config %{_sysconfdir}/OpenCL/vendors/nvidia.icd
%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-nouveau.conf
%{_initrddir}/nvidia
%exclude %{_bindir}/nvidia-settings
@@ -321,19 +342,47 @@
%files devel
%defattr(-,root,root,-)
%dir %{_includedir}/nvidia
+%dir %{_includedir}/nvidia/CL
%dir %{_includedir}/nvidia/GL
%dir %{_includedir}/nvidia/cuda
%exclude %dir %{_includedir}/nvidia/vdpau
+%{_includedir}/nvidia/CL/*.h
%{_includedir}/nvidia/GL/*.h
%{_includedir}/nvidia/cuda/*.h
%exclude %{_includedir}/nvidia/vdpau/*.h
%exclude %{nvidialibdir}/libXvMCNVIDIA.a
%exclude %{nvidialibdir}/libcuda.so
+%{nvidialibdir}/libOpenCL.so
+%{nvidialibdir}/libnvidia-compiler.so
%{nvidialibdir}/libGL.so
%{nvidialibdir}/libXvMCNVIDIA.so
%changelog
+* Wed Jun 16 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:195.36.31-1
+- Update to 195.36.31
+- Add post section to change boot option with grubby
+- Add post section Enabled Selinux allow_execstack boolean.
+- Fallback to nouveau instead of nv
+- AddARGBGLXVisuals is enabled by default since 195xx serie.
+
+* Sat Apr 24 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1:195.36.24-1
+- Update to 195.36.24
+
+* Sat Mar 27 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1:195.36.15-1
+- Update to 195.36.15
+- Use macro for Epoch
+
+* Sun Mar 14 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1:190.53-4
+- Fix multilibs requirements
+
+* Fri Mar 12 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1:190.53-2
+- Bump Epoch - Fan problem in recent release
+ http://www.nvnews.net/vbulletin/announcement.php?f=14
+
+* Sat Feb 27 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 195.36.08-1
+- Update to 195.36.08
+
* Wed Dec 30 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 190.53-1
- Update to 190.53
- Switch to new libvdpau location in %%{_libdir}/vdpau
13 years, 10 months
rpms/xorg-x11-drv-nvidia/F-12 .cvsignore, 1.20, 1.21 nvidia-config-display, 1.3, 1.4 sources, 1.20, 1.21 xorg-x11-drv-nvidia.spec, 1.43, 1.44
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22527/F-12
Modified Files:
.cvsignore nvidia-config-display sources
xorg-x11-drv-nvidia.spec
Log Message:
Update to 195.36.31
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-12/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore 28 Apr 2010 19:51:50 -0000 1.20
+++ .cvsignore 21 Jun 2010 10:28:48 -0000 1.21
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86-195.36.24-pkg0.run
-NVIDIA-Linux-x86_64-195.36.24-pkg0.run
+NVIDIA-Linux-x86-195.36.31-pkg0.run
+NVIDIA-Linux-x86_64-195.36.31-pkg0.run
Index: nvidia-config-display
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-12/nvidia-config-display,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nvidia-config-display 31 Oct 2009 12:07:18 -0000 1.3
+++ nvidia-config-display 21 Jun 2010 10:28:48 -0000 1.4
@@ -76,8 +76,8 @@
break
else:
self.addModule(module)
- # Problems with Compiz without these.
- self.addOption(self.majorVendor,"AddARGBGLXVisuals", "True")
+ # Problems with Compiz without these. - not needed since 195.xxx
+ #self.addOption(self.majorVendor,"AddARGBGLXVisuals", "True")
#self.addOption(self.majorVendor,"DisableGLXRootClipping", "True")
Utils.writeXorgConf(self.xconfig, self.xconfigpath)
# We have to read saved status file to restore the Xorg configuration.
@@ -94,9 +94,9 @@
prevDriver = self.config.getOldDriver()
if prevDriver == self.majorVendor:
print _('Will not allow reverting from driver \'%s\' to \'%s\'.') % (self.vendor, self.vendor)
- print _('Using the \'nv\' driver instead.')
- prevDriver = "nv"
- self.config.setOldDriver("nv")
+ print _('Using the \'nouveau\' driver instead.')
+ prevDriver = "nouveau"
+ self.config.setOldDriver("nouveau")
self.removeOption(self.majorVendor,"AddARGBGLXVisuals")
self.removeOption(self.majorVendor,"DisableGLXRootClipping")
self.toggleDriver(self.majorVendor, prevDriver)
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-12/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources 28 Apr 2010 19:51:50 -0000 1.20
+++ sources 21 Jun 2010 10:28:48 -0000 1.21
@@ -1,2 +1,2 @@
-97d3e5f69707092aa643fb901bb94003 NVIDIA-Linux-x86-195.36.24-pkg0.run
-9d58114ed8c89cd66fbaccad0c997ee8 NVIDIA-Linux-x86_64-195.36.24-pkg0.run
+c30af5d776e3c71c6dd8e06c30e4bf1f NVIDIA-Linux-x86-195.36.31-pkg0.run
+91cd7502cb6ca3a5c0e79e33ae79881f NVIDIA-Linux-x86_64-195.36.31-pkg0.run
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-12/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- xorg-x11-drv-nvidia.spec 28 Apr 2010 19:51:50 -0000 1.43
+++ xorg-x11-drv-nvidia.spec 21 Jun 2010 10:28:48 -0000 1.44
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
-Version: 195.36.24
+Version: 195.36.31
Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
@@ -254,8 +254,8 @@
# Change perms on static libs. Can't fathom how to do it nicely above.
find $RPM_BUILD_ROOT/%{nvidialibdir} -type f -name "*.a" -exec chmod 0644 '{}' \;
-# Remove execstack needs on F-12 and laters
-%if 0%{?fedora} >= 12 || 0%{?rhel} > 5
+# Remove execstack needs on F-12 and laters - disabled
+%if 0
find $RPM_BUILD_ROOT%{nvidialibdir} -name '*.so.*' -type f -exec execstack -c {} ';'
execstack -c $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libglx.so.%{version}
execstack -c $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so
@@ -272,8 +272,6 @@
%post
-# Removes old legacy layout, fixed SELinux copy errors
-if [ ! $(ls /etc/udev/devices/nvidia* 2>/dev/null | wc -l) -eq 0 ];then rm -f /etc/udev/devices/nvidia*;fi ||:
if [ "$1" -eq "1" ]; then
# Enable nvidia driver when installing
%{_sbindir}/nvidia-config-display enable &>/dev/null ||:
@@ -281,6 +279,16 @@
/sbin/chkconfig --add nvidia ||:
/etc/init.d/nvidia start &>/dev/null ||:
fi
+if [ -x /sbin/grubby ] ; then
+ GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel`
+ /sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='nomodeset rdblacklist=nouveau' &>/dev/null
+fi
+if [ -x /usr/sbin/setsebool ] ; then
+ SELINUXEXECSTACK=`grep 0 /selinux/booleans/allow_execstack | wc -l`
+ if [ ${SELINUXEXECSTACK} -eq "1" ] ; then
+ /usr/sbin/setsebool -P allow_execstack on &>/dev/null
+ fi
+fi ||:
%post libs -p /sbin/ldconfig
@@ -351,6 +359,13 @@
%changelog
+* Wed Jun 16 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:195.36.31-1
+- Update to 195.36.31
+- Add post section to change boot option with grubby
+- Add post section Enabled Selinux allow_execstack boolean.
+- Fallback to nouveau instead of nv
+- AddARGBGLXVisuals is enabled by default since 195xx serie.
+
* Sat Apr 24 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1:195.36.24-1
- Update to 195.36.24
13 years, 10 months
rpms/xorg-x11-drv-nvidia/F-13 .cvsignore, 1.19, 1.20 nvidia-config-display, 1.3, 1.4 sources, 1.19, 1.20 xorg-x11-drv-nvidia.spec, 1.38, 1.39
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22359/F-13
Modified Files:
.cvsignore nvidia-config-display sources
xorg-x11-drv-nvidia.spec
Log Message:
Update to 192.36.31
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-13/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore 24 Apr 2010 09:22:54 -0000 1.19
+++ .cvsignore 21 Jun 2010 10:28:10 -0000 1.20
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86-195.36.24-pkg0.run
-NVIDIA-Linux-x86_64-195.36.24-pkg0.run
+NVIDIA-Linux-x86-195.36.31-pkg0.run
+NVIDIA-Linux-x86_64-195.36.31-pkg0.run
Index: nvidia-config-display
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-13/nvidia-config-display,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nvidia-config-display 31 Oct 2009 12:07:18 -0000 1.3
+++ nvidia-config-display 21 Jun 2010 10:28:10 -0000 1.4
@@ -76,8 +76,8 @@
break
else:
self.addModule(module)
- # Problems with Compiz without these.
- self.addOption(self.majorVendor,"AddARGBGLXVisuals", "True")
+ # Problems with Compiz without these. - not needed since 195.xxx
+ #self.addOption(self.majorVendor,"AddARGBGLXVisuals", "True")
#self.addOption(self.majorVendor,"DisableGLXRootClipping", "True")
Utils.writeXorgConf(self.xconfig, self.xconfigpath)
# We have to read saved status file to restore the Xorg configuration.
@@ -94,9 +94,9 @@
prevDriver = self.config.getOldDriver()
if prevDriver == self.majorVendor:
print _('Will not allow reverting from driver \'%s\' to \'%s\'.') % (self.vendor, self.vendor)
- print _('Using the \'nv\' driver instead.')
- prevDriver = "nv"
- self.config.setOldDriver("nv")
+ print _('Using the \'nouveau\' driver instead.')
+ prevDriver = "nouveau"
+ self.config.setOldDriver("nouveau")
self.removeOption(self.majorVendor,"AddARGBGLXVisuals")
self.removeOption(self.majorVendor,"DisableGLXRootClipping")
self.toggleDriver(self.majorVendor, prevDriver)
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-13/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources 24 Apr 2010 09:22:54 -0000 1.19
+++ sources 21 Jun 2010 10:28:10 -0000 1.20
@@ -1,2 +1,2 @@
-97d3e5f69707092aa643fb901bb94003 NVIDIA-Linux-x86-195.36.24-pkg0.run
-9d58114ed8c89cd66fbaccad0c997ee8 NVIDIA-Linux-x86_64-195.36.24-pkg0.run
+c30af5d776e3c71c6dd8e06c30e4bf1f NVIDIA-Linux-x86-195.36.31-pkg0.run
+91cd7502cb6ca3a5c0e79e33ae79881f NVIDIA-Linux-x86_64-195.36.31-pkg0.run
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-13/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- xorg-x11-drv-nvidia.spec 24 Apr 2010 09:22:54 -0000 1.38
+++ xorg-x11-drv-nvidia.spec 21 Jun 2010 10:28:10 -0000 1.39
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
-Version: 195.36.24
+Version: 195.36.31
Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
@@ -254,8 +254,8 @@
# Change perms on static libs. Can't fathom how to do it nicely above.
find $RPM_BUILD_ROOT/%{nvidialibdir} -type f -name "*.a" -exec chmod 0644 '{}' \;
-# Remove execstack needs on F-12 and laters
-%if 0%{?fedora} >= 12 || 0%{?rhel} > 5
+# Remove execstack needs on F-12 and laters - disabled
+%if 0
find $RPM_BUILD_ROOT%{nvidialibdir} -name '*.so.*' -type f -exec execstack -c {} ';'
execstack -c $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libglx.so.%{version}
execstack -c $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so
@@ -272,8 +272,6 @@
%post
-# Removes old legacy layout, fixed SELinux copy errors
-if [ ! $(ls /etc/udev/devices/nvidia* 2>/dev/null | wc -l) -eq 0 ];then rm -f /etc/udev/devices/nvidia*;fi ||:
if [ "$1" -eq "1" ]; then
# Enable nvidia driver when installing
%{_sbindir}/nvidia-config-display enable &>/dev/null ||:
@@ -281,6 +279,16 @@
/sbin/chkconfig --add nvidia ||:
/etc/init.d/nvidia start &>/dev/null ||:
fi
+if [ -x /sbin/grubby ] ; then
+ GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel`
+ /sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='nomodeset rdblacklist=nouveau' &>/dev/null
+fi
+if [ -x /usr/sbin/setsebool ] ; then
+ SELINUXEXECSTACK=`grep 0 /selinux/booleans/allow_execstack | wc -l`
+ if [ ${SELINUXEXECSTACK} -eq "1" ] ; then
+ /usr/sbin/setsebool -P allow_execstack on &>/dev/null
+ fi
+fi ||:
%post libs -p /sbin/ldconfig
@@ -351,6 +359,13 @@
%changelog
+* Wed Jun 16 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:195.36.31-1
+- Update to 195.36.31
+- Add post section to change boot option with grubby
+- Add post section Enabled Selinux allow_execstack boolean.
+- Fallback to nouveau instead of nv
+- AddARGBGLXVisuals is enabled by default since 195xx serie.
+
* Sat Apr 24 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1:195.36.24-1
- Update to 195.36.24
13 years, 10 months
rpms/xorg-x11-drv-nvidia/devel .cvsignore, 1.19, 1.20 nvidia-config-display, 1.3, 1.4 sources, 1.19, 1.20 xorg-x11-drv-nvidia.spec, 1.38, 1.39
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22180/devel
Modified Files:
.cvsignore nvidia-config-display sources
xorg-x11-drv-nvidia.spec
Log Message:
Update to 195.36.31
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore 24 Apr 2010 09:22:53 -0000 1.19
+++ .cvsignore 21 Jun 2010 10:27:22 -0000 1.20
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86-195.36.24-pkg0.run
-NVIDIA-Linux-x86_64-195.36.24-pkg0.run
+NVIDIA-Linux-x86-195.36.31-pkg0.run
+NVIDIA-Linux-x86_64-195.36.31-pkg0.run
Index: nvidia-config-display
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/nvidia-config-display,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nvidia-config-display 31 Oct 2009 12:07:18 -0000 1.3
+++ nvidia-config-display 21 Jun 2010 10:27:22 -0000 1.4
@@ -76,8 +76,8 @@
break
else:
self.addModule(module)
- # Problems with Compiz without these.
- self.addOption(self.majorVendor,"AddARGBGLXVisuals", "True")
+ # Problems with Compiz without these. - not needed since 195.xxx
+ #self.addOption(self.majorVendor,"AddARGBGLXVisuals", "True")
#self.addOption(self.majorVendor,"DisableGLXRootClipping", "True")
Utils.writeXorgConf(self.xconfig, self.xconfigpath)
# We have to read saved status file to restore the Xorg configuration.
@@ -94,9 +94,9 @@
prevDriver = self.config.getOldDriver()
if prevDriver == self.majorVendor:
print _('Will not allow reverting from driver \'%s\' to \'%s\'.') % (self.vendor, self.vendor)
- print _('Using the \'nv\' driver instead.')
- prevDriver = "nv"
- self.config.setOldDriver("nv")
+ print _('Using the \'nouveau\' driver instead.')
+ prevDriver = "nouveau"
+ self.config.setOldDriver("nouveau")
self.removeOption(self.majorVendor,"AddARGBGLXVisuals")
self.removeOption(self.majorVendor,"DisableGLXRootClipping")
self.toggleDriver(self.majorVendor, prevDriver)
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources 24 Apr 2010 09:22:53 -0000 1.19
+++ sources 21 Jun 2010 10:27:22 -0000 1.20
@@ -1,2 +1,2 @@
-97d3e5f69707092aa643fb901bb94003 NVIDIA-Linux-x86-195.36.24-pkg0.run
-9d58114ed8c89cd66fbaccad0c997ee8 NVIDIA-Linux-x86_64-195.36.24-pkg0.run
+c30af5d776e3c71c6dd8e06c30e4bf1f NVIDIA-Linux-x86-195.36.31-pkg0.run
+91cd7502cb6ca3a5c0e79e33ae79881f NVIDIA-Linux-x86_64-195.36.31-pkg0.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.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- xorg-x11-drv-nvidia.spec 24 Apr 2010 09:22:53 -0000 1.38
+++ xorg-x11-drv-nvidia.spec 21 Jun 2010 10:27:22 -0000 1.39
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
-Version: 195.36.24
+Version: 195.36.31
Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
@@ -254,8 +254,8 @@
# Change perms on static libs. Can't fathom how to do it nicely above.
find $RPM_BUILD_ROOT/%{nvidialibdir} -type f -name "*.a" -exec chmod 0644 '{}' \;
-# Remove execstack needs on F-12 and laters
-%if 0%{?fedora} >= 12 || 0%{?rhel} > 5
+# Remove execstack needs on F-12 and laters - disabled
+%if 0
find $RPM_BUILD_ROOT%{nvidialibdir} -name '*.so.*' -type f -exec execstack -c {} ';'
execstack -c $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libglx.so.%{version}
execstack -c $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so
@@ -272,8 +272,6 @@
%post
-# Removes old legacy layout, fixed SELinux copy errors
-if [ ! $(ls /etc/udev/devices/nvidia* 2>/dev/null | wc -l) -eq 0 ];then rm -f /etc/udev/devices/nvidia*;fi ||:
if [ "$1" -eq "1" ]; then
# Enable nvidia driver when installing
%{_sbindir}/nvidia-config-display enable &>/dev/null ||:
@@ -281,6 +279,16 @@
/sbin/chkconfig --add nvidia ||:
/etc/init.d/nvidia start &>/dev/null ||:
fi
+if [ -x /sbin/grubby ] ; then
+ GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel`
+ /sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='nomodeset rdblacklist=nouveau' &>/dev/null
+fi
+if [ -x /usr/sbin/setsebool ] ; then
+ SELINUXEXECSTACK=`grep 0 /selinux/booleans/allow_execstack | wc -l`
+ if [ ${SELINUXEXECSTACK} -eq "1" ] ; then
+ /usr/sbin/setsebool -P allow_execstack on &>/dev/null
+ fi
+fi ||:
%post libs -p /sbin/ldconfig
@@ -351,6 +359,13 @@
%changelog
+* Wed Jun 16 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:195.36.31-1
+- Update to 195.36.31
+- Add post section to change boot option with grubby
+- Add post section Enabled Selinux allow_execstack boolean.
+- Fallback to nouveau instead of nv
+- AddARGBGLXVisuals is enabled by default since 195xx serie.
+
* Sat Apr 24 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1:195.36.24-1
- Update to 195.36.24
13 years, 10 months
rpms/mythtv/F-11 mythtv.spec,1.47,1.48
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv32153
Modified Files:
mythtv.spec
Log Message:
oops, bump build number
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-11/mythtv.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- mythtv.spec 20 Jun 2010 02:15:04 -0000 1.47
+++ mythtv.spec 20 Jun 2010 02:15:34 -0000 1.48
@@ -81,7 +81,7 @@
%if "%{branch}" == "trunk"
Release: 0.1.svn.%{_svnrev}%{?dist}
%else
-Release: 4%{?dist}
+Release: 5%{?dist}
%endif
# The primary license is GPLv2+, but bits are borrowed from a number of
13 years, 10 months
rpms/mythtv/F-11 mythtv.spec,1.46,1.47
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv32113
Modified Files:
mythtv.spec
Log Message:
* Sat Jun 19 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-5
- One more try at a 32-bit x86 F11 i586 build w/both mmx and no cmov
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-11/mythtv.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- mythtv.spec 18 Jun 2010 12:00:50 -0000 1.46
+++ mythtv.spec 20 Jun 2010 02:15:04 -0000 1.47
@@ -966,8 +966,11 @@
--extra-cflags="%{optflags} -fomit-frame-pointer" \
--extra-cxxflags="%{optflags} -fomit-frame-pointer" \
%endif
-%ifarch %{ix86}
- --cpu=%{_target_cpu} --tune=%{_target_cpu} --enable-mmx \
+%ifarch i586
+ --cpu=pentium-mmx --tune=i586 --enable-mmx \
+%endif
+%ifarch i686
+ --cpu=i686 --tune=i686 --enable-mmx \
%endif
%if %{with_proc_opt}
--enable-proc-opt \
@@ -1479,6 +1482,9 @@
################################################################################
%changelog
+* Sat Jun 19 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-5
+- One more try at a 32-bit x86 F11 i586 build w/both mmx and no cmov
+
* Wed Jun 16 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-4
- Update to release-0-23-fixes branch, svn revision 25124
- Add anti-vuvuzela-filter patch from mythtv ticket #8568, because
13 years, 10 months
rpms/ffmpeg/devel ffmpeg.spec,1.29,1.30
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/ffmpeg/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27809
Modified Files:
ffmpeg.spec
Log Message:
Bump x264 BuildRequires (current FFmpeg needs x264 ABI >= 98).
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ffmpeg.spec 19 Jun 2010 21:48:09 -0000 1.29
+++ ffmpeg.spec 19 Jun 2010 22:22:12 -0000 1.30
@@ -35,7 +35,7 @@
BuildRequires: SDL-devel
BuildRequires: speex-devel
BuildRequires: texi2html
-BuildRequires: x264-devel >= 0.0.0-0.27
+BuildRequires: x264-devel >= 0.0.0-0.28
BuildRequires: xvidcore-devel
BuildRequires: zlib-devel
%ifarch %{ix86} x86_64
13 years, 10 months
rpms/x264/devel .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 x264-nover.patch, 1.2, 1.3 x264-shared.patch, 1.1, 1.2 x264.spec, 1.19, 1.20
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/x264/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27708
Modified Files:
.cvsignore sources x264-nover.patch x264-shared.patch
x264.spec
Log Message:
* Sun Jun 20 2010 Dominik Mierzejewski <rpm(a)greysector.net> 0.0.0-0.28.20100620git20cbe10
- 20100620 snapshot (ABI bump)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/x264/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 29 Apr 2010 18:46:25 -0000 1.12
+++ .cvsignore 19 Jun 2010 22:17:30 -0000 1.13
@@ -1 +1 @@
-x264-20100429.tar.bz2
+x264-20100620.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/x264/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 29 Apr 2010 18:46:25 -0000 1.12
+++ sources 19 Jun 2010 22:17:30 -0000 1.13
@@ -1 +1 @@
-13601402b1e247e65d886f77903c14f7 x264-20100429.tar.bz2
+eef8675f3f7e3d318fc1a5fbfd8c154a x264-20100620.tar.bz2
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- x264-nover.patch 29 Apr 2010 22:30:05 -0000 1.2
+++ x264-nover.patch 19 Jun 2010 22:17:30 -0000 1.3
@@ -1,21 +1,12 @@
-diff -up x264-20100209/configure.nover x264-20100209/configure
---- x264-20100209/configure.nover 2010-02-09 21:33:25.000000000 +0100
-+++ x264-20100209/configure 2010-02-09 22:20:35.000000000 +0100
-@@ -103,7 +103,7 @@ die() {
- exit 1
- }
-
--rm -f config.h config.mak config.log x264.pc conftest*
-+rm -f config.mak config.log x264.pc conftest*
-
- prefix='/usr/local'
- exec_prefix='${prefix}'
-@@ -667,8 +667,6 @@ if [ "$shared" = "yes" ]; then
+diff -up x264-20100620/configure.nover x264-20100620/configure
+--- x264-20100620/configure.nover 2010-06-20 00:07:41.000000000 +0200
++++ x264-20100620/configure 2010-06-20 00:11:53.000000000 +0200
+@@ -689,7 +689,7 @@ if [ "$shared" = "yes" ]; then
echo 'default: $(SONAME)' >> config.mak
fi
--./version.sh
--
+-./version.sh >> config.h
++cat version.h >> config.h
+
pclibs="-L$libdir -lx264 $libpthread"
- cat > x264.pc << EOF
x264-shared.patch:
Makefile | 5 ++++-
configure | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
Index: x264-shared.patch
===================================================================
RCS file: /cvs/free/rpms/x264/devel/x264-shared.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- x264-shared.patch 16 Jan 2010 14:55:48 -0000 1.1
+++ x264-shared.patch 19 Jun 2010 22:17:30 -0000 1.2
@@ -1,7 +1,7 @@
-diff -up x264-20100116/configure.shared x264-20100116/configure
---- x264-20100116/configure.shared 2010-01-16 13:48:11.000000000 +0100
-+++ x264-20100116/configure 2010-01-16 13:53:15.000000000 +0100
-@@ -559,7 +559,7 @@ if [ "$shared" = "yes" ]; then
+diff -up x264-20100620/configure.shared x264-20100620/configure
+--- x264-20100620/configure.shared 2010-06-20 00:13:02.000000000 +0200
++++ x264-20100620/configure 2010-06-20 00:13:31.000000000 +0200
+@@ -686,7 +686,7 @@ if [ "$shared" = "yes" ]; then
echo "SONAME=libx264.so.$API" >> config.mak
echo 'SOFLAGS=-Wl,-soname,$(SONAME)' >> config.mak
fi
@@ -9,11 +9,11 @@
+ echo 'default: libx264.a $(SONAME)' >> config.mak
fi
- pclibs="-L$libdir -lx264 $libpthread"
-diff -up x264-20100116/Makefile.shared x264-20100116/Makefile
---- x264-20100116/Makefile.shared 2010-01-16 13:45:48.000000000 +0100
-+++ x264-20100116/Makefile 2010-01-16 13:52:55.000000000 +0100
-@@ -105,6 +105,9 @@ ifneq ($(SONAME),)
+ cat version.h >> config.h
+diff -up x264-20100620/Makefile.shared x264-20100620/Makefile
+--- x264-20100620/Makefile.shared 2010-06-20 00:12:43.000000000 +0200
++++ x264-20100620/Makefile 2010-06-20 00:13:02.000000000 +0200
+@@ -109,6 +109,9 @@ ifneq ($(SONAME),)
ifeq ($(SYS),MINGW)
SRCSO += x264dll.c
endif
@@ -23,7 +23,7 @@
endif
OBJS = $(SRCS:%.c=%.o)
-@@ -123,7 +126,7 @@ libx264.a: .depend $(OBJS) $(OBJASM)
+@@ -127,7 +130,7 @@ libx264.a: .depend $(OBJS) $(OBJASM)
$(SONAME): .depend $(OBJS) $(OBJASM) $(OBJSO)
$(CC) -shared -o $@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS)
Index: x264.spec
===================================================================
RCS file: /cvs/free/rpms/x264/devel/x264.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- x264.spec 29 Apr 2010 18:46:55 -0000 1.19
+++ x264.spec 19 Jun 2010 22:17:30 -0000 1.20
@@ -1,10 +1,10 @@
-%global snapshot 20100429
-%global git d9db8b3
+%global snapshot 20100620
+%global git 20cbe10
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.0.0
-Release: 0.27.%{snapshot}git%{git}%{?dist}
+Release: 0.28.%{snapshot}git%{git}%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://developers.videolan.org/x264.html
@@ -141,6 +141,9 @@
%endif
%changelog
+* Sun Jun 20 2010 Dominik Mierzejewski <rpm(a)greysector.net> 0.0.0-0.28.20100620git20cbe10
+- 20100620 snapshot (ABI bump)
+
* Thu Apr 29 2010 Dominik Mierzejewski <rpm(a)greysector.net> 0.0.0-0.27.20100429gitd9db8b3
- 20100429 snapshot
- s/%%{ix86}/i686 (rfbz #1075)
13 years, 10 months
rpms/ffmpeg/devel .cvsignore, 1.15, 1.16 ffmpeg.spec, 1.28, 1.29 sources, 1.15, 1.16
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/ffmpeg/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25213
Modified Files:
.cvsignore ffmpeg.spec sources
Log Message:
* Sat Jun 19 2010 Dominik Mierzejewski <rpm at greysector.net> - 0.6-1.20100619svn
- 20100619 snapshot
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 29 Apr 2010 20:07:26 -0000 1.15
+++ .cvsignore 19 Jun 2010 21:48:09 -0000 1.16
@@ -1 +1 @@
-ffmpeg-20100429.tar.bz2
+ffmpeg-20100619.tar.bz2
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ffmpeg.spec 29 Apr 2010 20:07:26 -0000 1.28
+++ ffmpeg.spec 19 Jun 2010 21:48:09 -0000 1.29
@@ -1,12 +1,12 @@
# TODO: add make test to %%check section
-%global svn 20100429
+%global svn 20100619
%global faad2min 1:2.6.1
Summary: Digital VCR and streaming server
Name: ffmpeg
Version: 0.6
-Release: 0.3.%{svn}svn%{?dist}
+Release: 1.%{svn}svn%{?dist}
%if 0%{?_with_opencore_amr:1}
License: GPLv3+
%else
@@ -14,7 +14,7 @@
%endif
Group: Applications/Multimedia
URL: http://ffmpeg.org/
-Source0: http://rpms.kwizart.net/fedora/SOURCES/%{name}-%{svn}.tar.bz2
+Source0: %{name}-%{svn}.tar.bz2
Source1: ffmpeg-snapshot.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -23,7 +23,6 @@
%{?_with_faac:BuildRequires: faac-devel}
BuildRequires: faad2-devel >= %{faad2min}
BuildRequires: gsm-devel
-BuildRequires: imlib2-devel
BuildRequires: lame-devel
BuildRequires: libdc1394-devel
BuildRequires: libtheora-devel
@@ -227,6 +226,9 @@
%changelog
+* Sat Jun 19 2010 Dominik Mierzejewski <rpm at greysector.net> - 0.6-1.20100619svn
+- 20100619 snapshot
+
* Thu Apr 29 2010 Dominik Mierzejewski <rpm at greysector.net> - 0.6-0.3.20100429svn
- 20100429 snapshot
- dropped unnecessary imlib2-devel BR
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 29 Apr 2010 20:07:26 -0000 1.15
+++ sources 19 Jun 2010 21:48:09 -0000 1.16
@@ -1 +1 @@
-bf4c5f7a0135acf8cd0613e0b22b65cf ffmpeg-20100429.tar.bz2
+28d7db9dab13dbe68976967e42e19ed8 ffmpeg-20100619.tar.bz2
13 years, 10 months