rpms/bsnes/F-9 .cvsignore, 1.9, 1.10 bsnes-0.037a-strip.patch, 1.4, 1.5 bsnes-system-zlib.patch, 1.3, 1.4 bsnes.spec, 1.10, 1.11 sources, 1.9, 1.10
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/bsnes/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31065
Modified Files:
.cvsignore bsnes-0.037a-strip.patch bsnes-system-zlib.patch
bsnes.spec sources
Log Message:
* Sun Jun 07 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.047-1
- Updated to 0.047
- Updated the strip patch
- Dropped the line endings fix and updated the patches accordingly
- Dropped the no longer required profiler fix
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/bsnes/F-9/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 11 May 2009 08:42:06 -0000 1.9
+++ .cvsignore 7 Jun 2009 17:53:14 -0000 1.10
@@ -1 +1 @@
-bsnes_v046.tar.bz2
+bsnes_v047.tar.bz2
bsnes-0.037a-strip.patch:
Index: bsnes-0.037a-strip.patch
===================================================================
RCS file: /cvs/nonfree/rpms/bsnes/F-9/bsnes-0.037a-strip.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bsnes-0.037a-strip.patch 11 May 2009 08:42:06 -0000 1.4
+++ bsnes-0.037a-strip.patch 7 Jun 2009 17:53:14 -0000 1.5
@@ -1,11 +1,11 @@
---- src/Makefile.strip 2009-05-10 02:59:55.000000000 +0200
-+++ src/Makefile 2009-05-10 19:10:41.000000000 +0200
-@@ -8,7 +8,7 @@
- c := $(compiler)
- cpp := $(subst cc,++,$(compiler))
- flags := -O3 -fomit-frame-pointer -Ilib
--link := -s
-+link :=
+--- src/Makefile.strip 2009-06-07 03:56:29.000000000 +0200
++++ src/Makefile 2009-06-07 19:38:45.000000000 +0200
+@@ -23,7 +23,7 @@
+ ################
- # profile-guided instrumentation:
- # flags += -fprofile-generate
+ ifeq ($(platform),x)
+- link += -s
++# link += -s
+
+ ruby := video.glx video.xv video.sdl video.qtimage
+ ruby += audio.alsa audio.openal audio.oss audio.pulseaudio audio.ao
bsnes-system-zlib.patch:
Index: bsnes-system-zlib.patch
===================================================================
RCS file: /cvs/nonfree/rpms/bsnes/F-9/bsnes-system-zlib.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bsnes-system-zlib.patch 11 May 2009 08:42:06 -0000 1.3
+++ bsnes-system-zlib.patch 7 Jun 2009 17:53:14 -0000 1.4
@@ -11,16 +11,16 @@
--- src/lib/libreader/gzreader.hpp.system-zlib 2009-05-02 18:18:10.000000000 +0200
+++ src/lib/libreader/gzreader.hpp 2009-05-10 19:21:27.000000000 +0200
@@ -1,4 +1,4 @@
--#include <zlib/zlib.h>
-+#include <zlib.h>
-
- class GZReader : public Reader {
- private:
+-#include <zlib/zlib.h>
++#include <zlib.h>
+
+ class GZReader : public Reader {
+ private:
--- src/lib/libreader/zipreader.hpp.system-zlib 2009-05-02 18:18:02.000000000 +0200
+++ src/lib/libreader/zipreader.hpp 2009-05-10 19:22:37.000000000 +0200
@@ -1,4 +1,4 @@
--#include <zlib/unzip.h>
-+#include <minizip/unzip.h>
-
- #define ZIP_MAX_FILE_NAME PATH_MAX
-
+-#include <zlib/unzip.h>
++#include <minizip/unzip.h>
+
+ #define ZIP_MAX_FILE_NAME PATH_MAX
+
Index: bsnes.spec
===================================================================
RCS file: /cvs/nonfree/rpms/bsnes/F-9/bsnes.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- bsnes.spec 11 May 2009 15:55:41 -0000 1.10
+++ bsnes.spec 7 Jun 2009 17:53:14 -0000 1.11
@@ -1,4 +1,4 @@
-%define vernumber 046
+%define vernumber 047
Name: bsnes
Version: 0.%{vernumber}
@@ -43,12 +43,9 @@
%patch0 -p0 -b .strip
%patch1 -p0 -b .system-zlib
-#fix permissions and line endings
+#fix permissions
find src -type f \( -name \*.cpp -or -name \*.hpp -or -name \*.h -or -name \*.c \) -exec chmod 644 {} \;
chmod 644 src/data/*.html
-find src -type f \( -name \*.cpp -or -name \*.hpp -or -name \*.h -or -name \*.c \) -exec sed -i 's/\r//' {} \;
-
-
#use system optflags
sed -i "s#flags := -O3#flags := $RPM_OPT_FLAGS#" src/Makefile
@@ -56,8 +53,6 @@
#install fedora-specific readme
install -pm 644 %{SOURCE2} README.Fedora
-#disable profiling, it breaks i386 build
-sed -i "s/flags += -fprofile-use/# flags += -fprofile-use/" src/Makefile
%build
pushd src
@@ -87,6 +82,12 @@
%changelog
+* Sun Jun 07 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.047-1
+- Updated to 0.047
+- Updated the strip patch
+- Dropped the line endings fix and updated the patches accordingly
+- Dropped the no longer required profiler fix
+
* Sun May 10 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.046-1
- Updated to 0.046
- Dropped libXtst-devel BuildRequires
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/bsnes/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 11 May 2009 08:42:06 -0000 1.9
+++ sources 7 Jun 2009 17:53:14 -0000 1.10
@@ -1 +1 @@
-3091093b9ded18e9c9a974079a2d127b bsnes_v046.tar.bz2
+c660eada88b0bfbd1f0fe72d4f57526f bsnes_v047.tar.bz2
14 years, 10 months
rpms/bsnes/F-10 .cvsignore, 1.9, 1.10 bsnes-0.037a-strip.patch, 1.4, 1.5 bsnes-system-zlib.patch, 1.3, 1.4 bsnes.spec, 1.10, 1.11 sources, 1.9, 1.10
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/bsnes/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30569
Modified Files:
.cvsignore bsnes-0.037a-strip.patch bsnes-system-zlib.patch
bsnes.spec sources
Log Message:
* Sun Jun 07 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.047-1
- Updated to 0.047
- Updated the strip patch
- Dropped the line endings fix and updated the patches accordingly
- Dropped the no longer required profiler fix
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/bsnes/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 11 May 2009 08:41:55 -0000 1.9
+++ .cvsignore 7 Jun 2009 17:49:26 -0000 1.10
@@ -1 +1 @@
-bsnes_v046.tar.bz2
+bsnes_v047.tar.bz2
bsnes-0.037a-strip.patch:
Index: bsnes-0.037a-strip.patch
===================================================================
RCS file: /cvs/nonfree/rpms/bsnes/F-10/bsnes-0.037a-strip.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bsnes-0.037a-strip.patch 11 May 2009 08:41:55 -0000 1.4
+++ bsnes-0.037a-strip.patch 7 Jun 2009 17:49:26 -0000 1.5
@@ -1,11 +1,11 @@
---- src/Makefile.strip 2009-05-10 02:59:55.000000000 +0200
-+++ src/Makefile 2009-05-10 19:10:41.000000000 +0200
-@@ -8,7 +8,7 @@
- c := $(compiler)
- cpp := $(subst cc,++,$(compiler))
- flags := -O3 -fomit-frame-pointer -Ilib
--link := -s
-+link :=
+--- src/Makefile.strip 2009-06-07 03:56:29.000000000 +0200
++++ src/Makefile 2009-06-07 19:38:45.000000000 +0200
+@@ -23,7 +23,7 @@
+ ################
- # profile-guided instrumentation:
- # flags += -fprofile-generate
+ ifeq ($(platform),x)
+- link += -s
++# link += -s
+
+ ruby := video.glx video.xv video.sdl video.qtimage
+ ruby += audio.alsa audio.openal audio.oss audio.pulseaudio audio.ao
bsnes-system-zlib.patch:
Index: bsnes-system-zlib.patch
===================================================================
RCS file: /cvs/nonfree/rpms/bsnes/F-10/bsnes-system-zlib.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bsnes-system-zlib.patch 11 May 2009 08:41:55 -0000 1.3
+++ bsnes-system-zlib.patch 7 Jun 2009 17:49:26 -0000 1.4
@@ -11,16 +11,16 @@
--- src/lib/libreader/gzreader.hpp.system-zlib 2009-05-02 18:18:10.000000000 +0200
+++ src/lib/libreader/gzreader.hpp 2009-05-10 19:21:27.000000000 +0200
@@ -1,4 +1,4 @@
--#include <zlib/zlib.h>
-+#include <zlib.h>
-
- class GZReader : public Reader {
- private:
+-#include <zlib/zlib.h>
++#include <zlib.h>
+
+ class GZReader : public Reader {
+ private:
--- src/lib/libreader/zipreader.hpp.system-zlib 2009-05-02 18:18:02.000000000 +0200
+++ src/lib/libreader/zipreader.hpp 2009-05-10 19:22:37.000000000 +0200
@@ -1,4 +1,4 @@
--#include <zlib/unzip.h>
-+#include <minizip/unzip.h>
-
- #define ZIP_MAX_FILE_NAME PATH_MAX
-
+-#include <zlib/unzip.h>
++#include <minizip/unzip.h>
+
+ #define ZIP_MAX_FILE_NAME PATH_MAX
+
Index: bsnes.spec
===================================================================
RCS file: /cvs/nonfree/rpms/bsnes/F-10/bsnes.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- bsnes.spec 11 May 2009 15:40:31 -0000 1.10
+++ bsnes.spec 7 Jun 2009 17:49:26 -0000 1.11
@@ -1,4 +1,4 @@
-%define vernumber 046
+%define vernumber 047
Name: bsnes
Version: 0.%{vernumber}
@@ -43,12 +43,9 @@
%patch0 -p0 -b .strip
%patch1 -p0 -b .system-zlib
-#fix permissions and line endings
+#fix permissions
find src -type f \( -name \*.cpp -or -name \*.hpp -or -name \*.h -or -name \*.c \) -exec chmod 644 {} \;
chmod 644 src/data/*.html
-find src -type f \( -name \*.cpp -or -name \*.hpp -or -name \*.h -or -name \*.c \) -exec sed -i 's/\r//' {} \;
-
-
#use system optflags
sed -i "s#flags := -O3#flags := $RPM_OPT_FLAGS#" src/Makefile
@@ -56,8 +53,6 @@
#install fedora-specific readme
install -pm 644 %{SOURCE2} README.Fedora
-#disable profiling, it breaks i386 build
-sed -i "s/flags += -fprofile-use/# flags += -fprofile-use/" src/Makefile
%build
pushd src
@@ -87,6 +82,12 @@
%changelog
+* Sun Jun 07 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.047-1
+- Updated to 0.047
+- Updated the strip patch
+- Dropped the line endings fix and updated the patches accordingly
+- Dropped the no longer required profiler fix
+
* Sun May 10 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.046-1
- Updated to 0.046
- Dropped libXtst-devel BuildRequires
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/bsnes/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 11 May 2009 08:41:55 -0000 1.9
+++ sources 7 Jun 2009 17:49:26 -0000 1.10
@@ -1 +1 @@
-3091093b9ded18e9c9a974079a2d127b bsnes_v046.tar.bz2
+c660eada88b0bfbd1f0fe72d4f57526f bsnes_v047.tar.bz2
14 years, 10 months
rpms/bsnes/devel .cvsignore, 1.9, 1.10 bsnes-0.037a-strip.patch, 1.4, 1.5 bsnes-system-zlib.patch, 1.3, 1.4 bsnes.spec, 1.12, 1.13 sources, 1.9, 1.10
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/bsnes/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30456
Modified Files:
.cvsignore bsnes-0.037a-strip.patch bsnes-system-zlib.patch
bsnes.spec sources
Log Message:
* Sun Jun 07 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.047-1
- Updated to 0.047
- Updated the strip patch
- Dropped the line endings fix and updated the patches accordingly
- Dropped the no longer required profiler fix
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/bsnes/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 11 May 2009 08:41:42 -0000 1.9
+++ .cvsignore 7 Jun 2009 17:49:18 -0000 1.10
@@ -1 +1 @@
-bsnes_v046.tar.bz2
+bsnes_v047.tar.bz2
bsnes-0.037a-strip.patch:
Index: bsnes-0.037a-strip.patch
===================================================================
RCS file: /cvs/nonfree/rpms/bsnes/devel/bsnes-0.037a-strip.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bsnes-0.037a-strip.patch 11 May 2009 08:41:42 -0000 1.4
+++ bsnes-0.037a-strip.patch 7 Jun 2009 17:49:18 -0000 1.5
@@ -1,11 +1,11 @@
---- src/Makefile.strip 2009-05-10 02:59:55.000000000 +0200
-+++ src/Makefile 2009-05-10 19:10:41.000000000 +0200
-@@ -8,7 +8,7 @@
- c := $(compiler)
- cpp := $(subst cc,++,$(compiler))
- flags := -O3 -fomit-frame-pointer -Ilib
--link := -s
-+link :=
+--- src/Makefile.strip 2009-06-07 03:56:29.000000000 +0200
++++ src/Makefile 2009-06-07 19:38:45.000000000 +0200
+@@ -23,7 +23,7 @@
+ ################
- # profile-guided instrumentation:
- # flags += -fprofile-generate
+ ifeq ($(platform),x)
+- link += -s
++# link += -s
+
+ ruby := video.glx video.xv video.sdl video.qtimage
+ ruby += audio.alsa audio.openal audio.oss audio.pulseaudio audio.ao
bsnes-system-zlib.patch:
Index: bsnes-system-zlib.patch
===================================================================
RCS file: /cvs/nonfree/rpms/bsnes/devel/bsnes-system-zlib.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bsnes-system-zlib.patch 11 May 2009 08:41:42 -0000 1.3
+++ bsnes-system-zlib.patch 7 Jun 2009 17:49:18 -0000 1.4
@@ -11,16 +11,16 @@
--- src/lib/libreader/gzreader.hpp.system-zlib 2009-05-02 18:18:10.000000000 +0200
+++ src/lib/libreader/gzreader.hpp 2009-05-10 19:21:27.000000000 +0200
@@ -1,4 +1,4 @@
--#include <zlib/zlib.h>
-+#include <zlib.h>
-
- class GZReader : public Reader {
- private:
+-#include <zlib/zlib.h>
++#include <zlib.h>
+
+ class GZReader : public Reader {
+ private:
--- src/lib/libreader/zipreader.hpp.system-zlib 2009-05-02 18:18:02.000000000 +0200
+++ src/lib/libreader/zipreader.hpp 2009-05-10 19:22:37.000000000 +0200
@@ -1,4 +1,4 @@
--#include <zlib/unzip.h>
-+#include <minizip/unzip.h>
-
- #define ZIP_MAX_FILE_NAME PATH_MAX
-
+-#include <zlib/unzip.h>
++#include <minizip/unzip.h>
+
+ #define ZIP_MAX_FILE_NAME PATH_MAX
+
Index: bsnes.spec
===================================================================
RCS file: /cvs/nonfree/rpms/bsnes/devel/bsnes.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- bsnes.spec 11 May 2009 15:40:25 -0000 1.12
+++ bsnes.spec 7 Jun 2009 17:49:18 -0000 1.13
@@ -1,4 +1,4 @@
-%define vernumber 046
+%define vernumber 047
Name: bsnes
Version: 0.%{vernumber}
@@ -43,12 +43,9 @@
%patch0 -p0 -b .strip
%patch1 -p0 -b .system-zlib
-#fix permissions and line endings
+#fix permissions
find src -type f \( -name \*.cpp -or -name \*.hpp -or -name \*.h -or -name \*.c \) -exec chmod 644 {} \;
chmod 644 src/data/*.html
-find src -type f \( -name \*.cpp -or -name \*.hpp -or -name \*.h -or -name \*.c \) -exec sed -i 's/\r//' {} \;
-
-
#use system optflags
sed -i "s#flags := -O3#flags := $RPM_OPT_FLAGS#" src/Makefile
@@ -56,8 +53,6 @@
#install fedora-specific readme
install -pm 644 %{SOURCE2} README.Fedora
-#disable profiling, it breaks i386 build
-sed -i "s/flags += -fprofile-use/# flags += -fprofile-use/" src/Makefile
%build
pushd src
@@ -87,6 +82,12 @@
%changelog
+* Sun Jun 07 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.047-1
+- Updated to 0.047
+- Updated the strip patch
+- Dropped the line endings fix and updated the patches accordingly
+- Dropped the no longer required profiler fix
+
* Sun May 10 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.046-1
- Updated to 0.046
- Dropped libXtst-devel BuildRequires
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/bsnes/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 11 May 2009 08:41:42 -0000 1.9
+++ sources 7 Jun 2009 17:49:18 -0000 1.10
@@ -1 +1 @@
-3091093b9ded18e9c9a974079a2d127b bsnes_v046.tar.bz2
+c660eada88b0bfbd1f0fe72d4f57526f bsnes_v047.tar.bz2
14 years, 10 months
rpms/xorg-x11-drv-nvidia-96xx/devel blacklist-nouveau.conf, NONE, 1.1 xorg-x11-drv-nvidia-96xx.spec, 1.8, 1.9
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv14867
Modified Files:
xorg-x11-drv-nvidia-96xx.spec
Added Files:
blacklist-nouveau.conf
Log Message:
Fix blacklist nouveau so driver work on new install
--- NEW FILE blacklist-nouveau.conf ---
# RPM Fusion blacklist for nouveau driver - you need to run as root:
# mkinitrd -f /boot/initrd-$(uname -r).img $(uname -r)
# if nouveau is loaded despite this file.
blacklist nouveau
Index: xorg-x11-drv-nvidia-96xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/devel/xorg-x11-drv-nvidia-96xx.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-nvidia-96xx.spec 3 Apr 2009 19:57:08 -0000 1.8
+++ xorg-x11-drv-nvidia-96xx.spec 7 Jun 2009 14:38:55 -0000 1.9
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia-96xx
Version: 96.43.11
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: NVIDIA's 96xx series proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -18,6 +18,7 @@
Source1: ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x8...
Source4: nvidia-settings.desktop
Source5: nvidia-96xx-init
+Source6: blacklist-nouveau.conf
Source10: nvidia-96xx-config-display
Source11: nvidia-96xx-README.Fedora
# So we don't pull other nvidia variants
@@ -195,6 +196,10 @@
# Install initscript
install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_initrddir}/nvidia-96xx
+#Blacklist nouveau by F-11
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/
+install -pm 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/
+
# ld.so.conf.d file
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
echo "%{nvidialibdir}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-96xx-%{_lib}.conf
@@ -261,6 +266,9 @@
%changelog
+* Sun Jun 7 2009 kwizart < kwizart at gmail.com > - 96.43.11-4
+- blacklist nouveau by default.
+
* Fri Apr 3 2009 kwizart < kwizart at gmail.com > - 96.43.11-3
- Fix x86 Arch for fedora >= 11
14 years, 10 months
rpms/xorg-x11-drv-nvidia-173xx/devel blacklist-nouveau.conf, NONE, 1.1 xorg-x11-drv-nvidia-173xx.spec, 1.7, 1.8
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv14191
Modified Files:
xorg-x11-drv-nvidia-173xx.spec
Added Files:
blacklist-nouveau.conf
Log Message:
Backlist nouveau by F-11
--- NEW FILE blacklist-nouveau.conf ---
# RPM Fusion blacklist for nouveau driver - you need to run as root:
# mkinitrd -f /boot/initrd-$(uname -r).img $(uname -r)
# if nouveau is loaded despite this file.
blacklist nouveau
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-nvidia-173xx.spec 3 Apr 2009 19:55:37 -0000 1.7
+++ xorg-x11-drv-nvidia-173xx.spec 7 Jun 2009 14:31:34 -0000 1.8
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia-173xx
Version: 173.14.18
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: NVIDIA's 173xx serie proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -18,6 +18,7 @@
Source1: ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x8...
Source4: nvidia-settings.desktop
Source5: nvidia-173xx-init
+Source6: blacklist-nouveau.conf
Source10: nvidia-173xx-config-display
Source11: nvidia-173xx-README.Fedora
# So we don't pull other nvidia variants
@@ -208,6 +209,10 @@
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
echo "%{nvidialibdir}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
+#Blacklist nouveau by F-11
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/
+install -pm 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/
+
# 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 '{}' \;
@@ -275,6 +280,9 @@
%changelog
+* Sun Jun 7 2009 kwizart < kwizart at gmail.com > - 173.14.18-4
+- blacklist nouveau by default.
+
* Fri Apr 3 2009 kwizart < kwizart at gmail.com > - 173.14.18-3
- Fix x86 Arch for fedora >= 11
14 years, 10 months
rpms/blcr-kmod/devel put_fs_struct.patch00, NONE, 1.1 blcr-kmod.spec, 1.14, 1.15
by Neal Becker
Author: nbecker
Update of /cvs/free/rpms/blcr-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8573
Modified Files:
blcr-kmod.spec
Added Files:
put_fs_struct.patch00
Log Message:
Add patch for 2.6.29.x
--- NEW FILE put_fs_struct.patch00 ---
This file is a patch against BLCR-0.8.1 to resolve the following error,
reported by Neal Becker, that is seen with the 2.6.29.x kernels used in fc11:
CC [M]
/builddir/build/BUILD/blcr-0.8.1/_kmod_build_2.6.29.3-140.fc11.i686.PAE/cr_module/kbuild/cr_dest_file.o
/builddir/build/BUILD/blcr-0.8.1/_kmod_build_2.6.29.3-140.fc11.i686.PAE/cr_module/kbuild/cr_dest_file.c:
In function 'cr_loc_free':
/builddir/build/BUILD/blcr-0.8.1/_kmod_build_2.6.29.3-140.fc11.i686.PAE/cr_module/kbuild/cr_dest_file.c:189:
error: implicit declaration of function 'put_fs_struct'
It is my intention that if a 0.8.2 release of BLCR is made, this fix will
be included. However, it is possible that this may not appear in an
official BLCR release until 0.9.0 in the Fall.
- Paul H. Hargrove
Signed-off-by: Paul H. Hargrove <PHHargrove(a)lbl.gov>
Index: acinclude.m4
===================================================================
RCS file: /var/local/cvs/lbnl_cr/acinclude.m4,v
retrieving revision 1.177.14.1
diff -u -r1.177.14.1 acinclude.m4
--- acinclude.m4 14 Feb 2009 01:48:55 -0000 1.177.14.1
+++ acinclude.m4 5 Jun 2009 23:49:40 -0000
@@ -1116,7 +1116,7 @@
# If not found, leave CR_K${TYPE}_${symbol} undefined
# If found to be exported, "#define CR_K${TYPE}_${symbol} 0"
# If found not to be exported, "#define CR_K${TYPE}_${symbol} 0x<value>"
-# On return, cr_addr is set (or undefined) the same way.
+# On return, cr_addr is set (or empty) the same way.
AC_DEFUN([CR_FIND_KSYM],[
AC_REQUIRE([CR_LINUX_SYMTAB])
AC_MSG_CHECKING([[kernel symbol table for $1]])
@@ -1135,6 +1135,7 @@
],[int x = sizeof(&$1);],[cr_cvname="Y$cr_cvname"],[cr_cvname="N$cr_cvname"])
fi
])
+ cr_addr=''
if test -z "$cr_cvname"; then
cr_result='not found'
else
Index: configure.ac
===================================================================
RCS file: /var/local/cvs/lbnl_cr/configure.ac,v
retrieving revision 1.410.2.6
diff -u -r1.410.2.6 configure.ac
--- configure.ac 25 Mar 2009 21:44:17 -0000 1.410.2.6
+++ configure.ac 5 Jun 2009 23:49:40 -0000
@@ -1472,9 +1472,17 @@
CR_FIND_KSYM([sys_prctl],[CODE],
[extern asmlinkage long sys_prctl(int option, unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5);])
+CR_FIND_KSYM([copy_fs_struct],[CODE])
+CR_FIND_KSYM([put_fs_struct],[CODE])
+if test -z "$cr_addr"; then
+ CR_FIND_KSYM([free_fs_struct],[CODE])
+ if test -z "$cr_addr"; then
+ AC_MSG_ERROR([failed to find either symbol put_fs_struct or free_fs_struct])
+ fi
+fi
+
# For blcr
CR_FIND_KSYM([set_fs_pwd],[CODE])
-CR_FIND_KSYM([put_fs_struct],[CODE])
# For vmadump4
CR_FIND_KSYM([sys_mremap],[CODE],
[extern asmlinkage unsigned long sys_mremap(unsigned long addr, unsigned long old_len, unsigned long new_len, unsigned long flags, unsigned long new_addr);])
Index: cr_module/cr_dest_file.c
===================================================================
RCS file: /var/local/cvs/lbnl_cr/cr_module/cr_dest_file.c,v
retrieving revision 1.27
diff -u -r1.27 cr_dest_file.c
--- cr_module/cr_dest_file.c 23 Nov 2008 20:29:14 -0000 1.27
+++ cr_module/cr_dest_file.c 5 Jun 2009 23:49:40 -0000
@@ -186,7 +186,7 @@
// For directory:
if (loc->fs) {
- put_fs_struct(loc->fs);
+ cr_free_fs_struct(loc->fs);
}
}
Index: cr_module/cr_kcompat.h
===================================================================
RCS file: /var/local/cvs/lbnl_cr/cr_module/cr_kcompat.h,v
retrieving revision 1.247.8.1
diff -u -r1.247.8.1 cr_kcompat.h
--- cr_module/cr_kcompat.h 7 Feb 2009 00:15:57 -0000 1.247.8.1
+++ cr_module/cr_kcompat.h 5 Jun 2009 23:49:40 -0000
@@ -556,4 +556,15 @@
#define cr_task_cred(_t) (_t)
#endif
+#if defined(CR_KCODE_put_fs_struct)
+ static __inline__ void cr_free_fs_struct(struct fs_struct *fs) {
+ CRI_ASSERT(atomic_read(&fs->count) == 1);
+ put_fs_struct(fs);
+ }
+#elif defined(CR_KCODE_free_fs_struct)
+ #define cr_free_fs_struct free_fs_struct
+#else
+ #error "no cr_free_fs_struct() definition"
+#endif
+
#endif /* _CR_KCOMPAT_H */
Index: blcr-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/blcr-kmod/devel/blcr-kmod.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- blcr-kmod.spec 28 May 2009 05:30:55 -0000 1.14
+++ blcr-kmod.spec 7 Jun 2009 13:29:01 -0000 1.15
@@ -7,7 +7,7 @@
Name: blcr-kmod
Version: 0.8.1
-Release: 1%{?dist}.7
+Release: 2%{?dist}.7
Summary: Kernel module (kmod) for Berkeley Lab Checkpoint/Restart for Linux
%define distname blcr-%{version}
@@ -16,10 +16,8 @@
License: GPLv2+
URL: http://www.blcr.org/
Source0: http://ftg.lbl.gov/CheckpointRestart/downloads/%{distname}.tar.gz
-# Patch0 is to remove -fno-stack-protector (provided by upstream)
-# Patch0 requires running autoreconf
-#Patch0: blcr-stackcheck.patch
-#Patch1: linux_2.6.29-rc3.patch00
+# Patch to build on 2.6.29.x
+Patch0: put_fs_struct.patch00
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#Generic i386 is NOT supported
@@ -48,11 +46,11 @@
%setup -q -c -T -a 0 -n %{distname}
# apply patches and do other stuff here
-#pushd %{distname}
-#%patch1 -p0
+pushd %{distname}
+%patch0 -p0
# patch changed configure.ac
#autoreconf --force --install
-#popd
+popd
for kernel_version in %{?kernel_versions} ; do
cp -a %{distname} _kmod_build_${kernel_version%%___*}
14 years, 10 months
rpms/xorg-x11-drv-nvidia/devel blacklist-nouveau.conf, NONE, 1.1 xorg-x11-drv-nvidia.spec, 1.23, 1.24
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23617
Modified Files:
xorg-x11-drv-nvidia.spec
Added Files:
blacklist-nouveau.conf
Log Message:
Blacklist nouveau by default otherwise the driver will not work
--- NEW FILE blacklist-nouveau.conf ---
# RPM Fusion blacklist for nouveau driver - you need to run as root:
# mkinitrd -f /boot/initrd-$(uname -r).img $(uname -r)
# if nouveau is loaded despite this file.
blacklist nouveau
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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xorg-x11-drv-nvidia.spec 5 Jun 2009 20:05:23 -0000 1.23
+++ xorg-x11-drv-nvidia.spec 7 Jun 2009 09:23:23 -0000 1.24
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia
Version: 185.18.14
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -18,6 +18,7 @@
Source1: ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x8...
Source4: nvidia-settings.desktop
Source5: nvidia-init
+Source6: blacklist-nouveau.conf
Source10: nvidia-config-display
Source11: nvidia-README.Fedora
# So we don't pull other nvidia variants
@@ -229,6 +230,10 @@
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
echo "%{nvidialibdir}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
+#Blacklist nouveau by F-11
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/
+install -pm 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/
+
# 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 '{}' \;
@@ -264,6 +269,7 @@
%files
%defattr(-,root,root,-)
%doc nvidiapkg/usr/share/doc/*
+%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-nouveau.conf
%{_initrddir}/nvidia
%{_bindir}/*
%{_sbindir}/*
@@ -304,6 +310,9 @@
%changelog
+* Sun Jun 7 2009 kwizart < kwizart at gmail.com > - 185.18.14-2
+- blacklist nouveau by default.
+
* Fri Jun 5 2009 kwizart < kwizart at gmail.com > - 185.18.14-1
- Update to 185.18.14 (final)
14 years, 10 months
rpms/vlc/devel .cvsignore, 1.15, 1.16 sources, 1.15, 1.16 vlc.spec, 1.37, 1.38 vlc-1.0-bugfix-20090602.patch, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22231
Modified Files:
.cvsignore sources vlc.spec
Removed Files:
vlc-1.0-bugfix-20090602.patch
Log Message:
Update to -rc3
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 2 Jun 2009 19:26:22 -0000 1.15
+++ .cvsignore 7 Jun 2009 09:14:31 -0000 1.16
@@ -1,3 +1,3 @@
-vlc-1.0.0-rc2.tar.bz2
-shine.c
+vlc-1.0.0-rc3.tar.bz2
enc_base.h
+shine.c
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 2 Jun 2009 19:26:22 -0000 1.15
+++ sources 7 Jun 2009 09:14:31 -0000 1.16
@@ -1,3 +1,3 @@
-c0fe6fff896c165abb5bf949616a1eee vlc-1.0.0-rc2.tar.bz2
-c64e9e104b1eeba838a6c87435c6533c shine.c
+a55dbd94856b922c29743b2980b0c672 vlc-1.0.0-rc3.tar.bz2
a897e4f24fb3fb993db7daf5a5f4d551 enc_base.h
+c64e9e104b1eeba838a6c87435c6533c shine.c
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- vlc.spec 5 Jun 2009 15:53:06 -0000 1.37
+++ vlc.spec 7 Jun 2009 09:14:31 -0000 1.38
@@ -4,7 +4,7 @@
%define with_internal_live555 0
%define live555_date 2008.07.25
%define vlc_git 0
-%define vlc_rc -rc2
+%define vlc_rc -rc3
%define with_mozilla 1
%define with_dc1394 0
%define with_directfb 1
@@ -13,7 +13,7 @@
Summary: Multi-platform MPEG, DVD, and DivX player
Name: vlc
Version: 1.0.0
-Release: 0.10rc2%{?dist}
+Release: 0.11rc3%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
@@ -30,9 +30,8 @@
Patch3: 300_all_pic.patch
Patch4: 310_all_mmx_pic.patch
Patch5: vlc-1.0.0-pre1-xulrunner-191_support.patch
-Patch6: vlc-1.0-bugfix-20090602.patch
+Patch6: 0005-Improve-compatibility-with-PA-when-the-vlc-alsa-outp.patch
Patch7: vlc-revert-b8f23ea716693d8d07dd8bd0cb4c9ba8ed05f568.patch
-Patch9: 0001-QT4-menus-remove-previous-signal-slot-connection-s.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -259,9 +258,8 @@
%if 0%{?fedora} >= 11
%patch5 -p1 -b .xul191
%endif
-%patch6 -p1 -b .bugfix
+%patch6 -p1 -b .alsa_pa
%patch7 -p1 -b .revert
-%patch9 -p1 -b .disconnect
rm modules/access/videodev2.h
ln -sf %{_includedir}/videodev2.h modules/access/
@@ -568,6 +566,9 @@
%changelog
+* Sun Jun 7 2009 kwizart < kwizart at gmail.com > - 1.0.0-0.11rc3
+- Update to 1.0.0-rc3
+
* Fri Jun 5 2009 kwizart < kwizart at gmail.com > - 1.0.0-0.10rc2
- Move some module to avoid dependency
- Remove previous signal-slot connection(s) if any - vlc trac #2818
--- vlc-1.0-bugfix-20090602.patch DELETED ---
14 years, 10 months
rpms/qtractor/F-9 .cvsignore, 1.3, 1.4 qtractor.spec, 1.2, 1.3 sources, 1.3, 1.4
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/qtractor/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3383
Modified Files:
.cvsignore qtractor.spec sources
Log Message:
* Fri Jun 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.4.2-1
- updated to 0.4.2.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/qtractor/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 27 May 2009 06:45:27 -0000 1.3
+++ .cvsignore 5 Jun 2009 21:01:00 -0000 1.4
@@ -1,2 +1,2 @@
-qtractor-0.4.1.tar.gz
+qtractor-0.4.2.tar.gz
qtractor-0.3.0-user-manual.odt
Index: qtractor.spec
===================================================================
RCS file: /cvs/free/rpms/qtractor/F-9/qtractor.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qtractor.spec 27 May 2009 07:42:42 -0000 1.2
+++ qtractor.spec 5 Jun 2009 21:01:00 -0000 1.3
@@ -10,8 +10,8 @@
Summary: Audio/MIDI multi-track sequencer
Name: qtractor
-Version: 0.4.1
-Release: 4%{?dist}
+Version: 0.4.2
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://qtractor.sourceforge.net/
@@ -104,6 +104,9 @@
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%changelog
+* Fri Jun 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.4.2-1
+- updated to 0.4.2.
+
* Wed May 27 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.4.1-4
- Explicitly disable SSE optimizations on non-"%%{ix86} ia64 x86_64" architectures
Index: sources
===================================================================
RCS file: /cvs/free/rpms/qtractor/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 27 May 2009 06:45:27 -0000 1.3
+++ sources 5 Jun 2009 21:01:00 -0000 1.4
@@ -1,2 +1,2 @@
-c0703676b70a8b780824bbb20cdc857d qtractor-0.4.1.tar.gz
+7e4f34f01bb96bf36763afd9ad0a0adc qtractor-0.4.2.tar.gz
295b3728414df215a9ed5eff81bf27c8 qtractor-0.3.0-user-manual.odt
14 years, 10 months
rpms/qtractor/F-10 .cvsignore, 1.3, 1.4 qtractor.spec, 1.2, 1.3 sources, 1.3, 1.4
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/qtractor/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3018
Modified Files:
.cvsignore qtractor.spec sources
Log Message:
* Fri Jun 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.4.2-1
- updated to 0.4.2.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/qtractor/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 27 May 2009 06:40:11 -0000 1.3
+++ .cvsignore 5 Jun 2009 21:00:00 -0000 1.4
@@ -1,2 +1,2 @@
-qtractor-0.4.1.tar.gz
+qtractor-0.4.2.tar.gz
qtractor-0.3.0-user-manual.odt
Index: qtractor.spec
===================================================================
RCS file: /cvs/free/rpms/qtractor/F-10/qtractor.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qtractor.spec 27 May 2009 07:40:52 -0000 1.2
+++ qtractor.spec 5 Jun 2009 21:00:00 -0000 1.3
@@ -10,8 +10,8 @@
Summary: Audio/MIDI multi-track sequencer
Name: qtractor
-Version: 0.4.1
-Release: 4%{?dist}
+Version: 0.4.2
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://qtractor.sourceforge.net/
@@ -104,6 +104,9 @@
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%changelog
+* Fri Jun 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.4.2-1
+- updated to 0.4.2.
+
* Wed May 27 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.4.1-4
- Explicitly disable SSE optimizations on non-"%%{ix86} ia64 x86_64" architectures
Index: sources
===================================================================
RCS file: /cvs/free/rpms/qtractor/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 27 May 2009 06:40:11 -0000 1.3
+++ sources 5 Jun 2009 21:00:00 -0000 1.4
@@ -1,2 +1,2 @@
-c0703676b70a8b780824bbb20cdc857d qtractor-0.4.1.tar.gz
+7e4f34f01bb96bf36763afd9ad0a0adc qtractor-0.4.2.tar.gz
295b3728414df215a9ed5eff81bf27c8 qtractor-0.3.0-user-manual.odt
14 years, 10 months