rpms/nvidia-kmod/devel nvidia-kmod.spec,1.178,1.179
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28541
Modified Files:
nvidia-kmod.spec
Log Message:
* Fri Jan 16 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 1:346.35-1
- Update to 346.35
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- nvidia-kmod.spec 17 Jan 2015 01:03:41 -0000 1.178
+++ nvidia-kmod.spec 17 Jan 2015 07:29:04 -0000 1.179
@@ -60,16 +60,16 @@
%{?_nv_build_module_instances:NV_BUILD_MODULE_INSTANCES=%{?_nv_build_module_instances}} \
module
popd
-%ifarch x86_64
%{!?_nv_build_module_instances:
+%ifarch x86_64
pushd _kmod_build_${kernel_version%%___*}/uvm
make %{?_smp_mflags} \
KERNEL_UNAME="${kernel_version%%___*}" SYSSRC="${kernel_version##*___}" \
IGNORE_CC_MISMATCH=1 IGNORE_XEN_PRESENCE=1 IGNORE_PREEMPT_RT_PRESENCE=1 \
module
popd
-}
%endif
+}
done
9 years, 3 months
rpms/gmameui/devel gmameui-0.2.12-autopoint.patch, NONE, 1.1 gmameui-0.2.12-glib2.patch, NONE, 1.1 gmameui-0.2.12-libarchive.patch, NONE, 1.1 gmameui-0.2.13-g_key_file_save_to_file2.patch, NONE, 1.1 gmameui.spec, 1.11, 1.12 gmameui-0.2.12-fix.patch, 1.1, NONE gmameui-fix3.patch, 1.1, NONE gmameui-fix4.patch, 1.1, NONE
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/nonfree/rpms/gmameui/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26910
Modified Files:
gmameui.spec
Added Files:
gmameui-0.2.12-autopoint.patch gmameui-0.2.12-glib2.patch
gmameui-0.2.12-libarchive.patch
gmameui-0.2.13-g_key_file_save_to_file2.patch
Removed Files:
gmameui-0.2.12-fix.patch gmameui-fix3.patch gmameui-fix4.patch
Log Message:
* Sat Jan 17 2015 Sérgio Basto <sergio(a)serjux.com> - 0.2.13-0.6.20120704cvs
- work in progress , renaming patches, clean spec
gmameui-0.2.12-autopoint.patch:
setup-gettext | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
--- NEW FILE gmameui-0.2.12-autopoint.patch ---
diff --git a/setup-gettext b/setup-gettext
index 833813b..cb14577 100755
--- a/setup-gettext
+++ b/setup-gettext
@@ -35,14 +35,12 @@ parse_gettext_version() {
find_gettext() {
GETTEXT_TOOL=
-# Use autopoint only if cvs is installed.
- (cvs --version) < /dev/null > /dev/null 2>&1 && {
- GETTEXT_TOOL=autopoint
+# Use autopoint by default.
+ GETTEXT_TOOL=autopoint
- (autopoint --version) < /dev/null > /dev/null 2>&1 || {
- GETTEXT_TOOL=
- }
- }
+ (autopoint --version) < /dev/null > /dev/null 2>&1 || {
+ GETTEXT_TOOL=
+ }
if test x$GETTEXT_TOOL = x; then
GETTEXT_TOOL=gettextize
gmameui-0.2.12-glib2.patch:
gmameui.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
--- NEW FILE gmameui-0.2.12-glib2.patch ---
diff -up gmameui-0.2.12/src/gmameui.c.fix gmameui-0.2.12/src/gmameui.c
--- gmameui-0.2.12/src/gmameui.c.fix 2009-09-05 13:14:33.000000000 +0200
+++ gmameui-0.2.12/src/gmameui.c 2012-05-13 23:23:40.298904121 +0200
@@ -31,9 +31,7 @@
#include <locale.h>
#include <unistd.h>
#include <signal.h>
-#include <glib/gprintf.h>
-#include <glib/gutils.h>
-#include <glib/gstdio.h> /* For g_mkdir */
+#include <glib.h>
#include <gtk/gtkmain.h>
#include <gtk/gtkfilesel.h>
gmameui-0.2.12-libarchive.patch:
gmameui-zip-utils.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE gmameui-0.2.12-libarchive.patch ---
* Fix FTBFS with libarchive12
* Build-depend on libarchive-dev (>= 3.0.0)
--- src/gmameui-zip-utils.c.orig 2012-07-02 05:51:55.114101799 +0100
+++ src/gmameui-zip-utils.c 2012-07-02 05:53:00.638847033 +0100
@@ -96,7 +96,7 @@ read_pixbuf_from_zip_file (gchar *zipfil
buffer_data = (gchar *) g_malloc0 (filesize);
/* Read the zipped pixbuf into memory */
- archive_read_data_into_buffer (zipfile, buffer_data, filesize);
+ archive_read_data (zipfile, buffer_data, filesize);
pixbuf = load_pixbuf_data (buffer_data, filesize);
@@ -266,7 +266,7 @@ GList *get_zip_contents_OLD (gchar *zipf
buffer_data = (guchar *) g_malloc0 (filesize);
/* Read the zipped ROM into memory */
- i = archive_read_data_into_buffer (zipfile, buffer_data, filesize);
+ i = archive_read_data (zipfile, buffer_data, filesize);
if ((i == ARCHIVE_FATAL) || (i == ARCHIVE_WARN)) {
GMAMEUI_DEBUG ("Error/warning from zip file %s - %s", filename, archive_error_string (zipfile));
gmameui-0.2.13-g_key_file_save_to_file2.patch:
gui_prefs.c | 10 +++++-----
io.c | 2 +-
io.h | 2 +-
mame_options.c | 8 ++++----
mame_options_legacy.c | 8 ++++----
5 files changed, 15 insertions(+), 15 deletions(-)
--- NEW FILE gmameui-0.2.13-g_key_file_save_to_file2.patch ---
diff -Nurp gmameui.orig/src/gui_prefs.c gmameui/src/gui_prefs.c
--- gmameui.orig/src/gui_prefs.c 2010-09-15 10:59:38.000000000 +0100
+++ gmameui/src/gui_prefs.c 2014-10-13 01:06:07.290499938 +0100
@@ -763,7 +763,7 @@ static void mame_gui_prefs_save_int (Mam
/* Set the value and save the file */
g_key_file_set_integer (pr->priv->prefs_ini_file, "Preferences", key, value);
- g_key_file_save_to_file (pr->priv->prefs_ini_file, pr->priv->filename);
+ g_key_file_save_to_file2 (pr->priv->prefs_ini_file, pr->priv->filename);
g_free (key);
@@ -805,7 +805,7 @@ static void mame_gui_prefs_save_int_arr
/* Set the value and save the file */
g_key_file_set_integer_list (pr->priv->prefs_ini_file, "Preferences", key, value, NUMBER_COLUMN);
- g_key_file_save_to_file (pr->priv->prefs_ini_file, pr->priv->filename);
+ g_key_file_save_to_file2 (pr->priv->prefs_ini_file, pr->priv->filename);
g_free (key);
@@ -832,7 +832,7 @@ static void mame_gui_prefs_save_bool (Ma
/* Set the value and save the file */
g_key_file_set_boolean (pr->priv->prefs_ini_file, "Preferences", key, value);
- g_key_file_save_to_file (pr->priv->prefs_ini_file, pr->priv->filename);
+ g_key_file_save_to_file2 (pr->priv->prefs_ini_file, pr->priv->filename);
g_free (key);
@@ -859,7 +859,7 @@ static void mame_gui_prefs_save_string (
/* Set the value and save the file */
g_key_file_set_string (pr->priv->prefs_ini_file, "Preferences", key, value);
- g_key_file_save_to_file (pr->priv->prefs_ini_file, pr->priv->filename);
+ g_key_file_save_to_file2 (pr->priv->prefs_ini_file, pr->priv->filename);
g_free (key);
@@ -915,7 +915,7 @@ mame_gui_prefs_save_string_arr (MameGuiP
/* Set the value and save the file */
g_key_file_set_string_list (pr->priv->prefs_ini_file, "Preferences", key, value, n_va);
}
- g_key_file_save_to_file (pr->priv->prefs_ini_file, pr->priv->filename);
+ g_key_file_save_to_file2 (pr->priv->prefs_ini_file, pr->priv->filename);
GMAMEUI_DEBUG ("Saving string array %s... done", key);
diff -Nurp gmameui.orig/src/io.c gmameui/src/io.c
--- gmameui.orig/src/io.c 2010-09-12 10:25:44.000000000 +0100
+++ gmameui/src/io.c 2014-10-13 01:05:36.265136265 +0100
@@ -124,7 +124,7 @@ my_dtostr (char * buf, gdouble d)
/* Custom function to save the keyfile to disk. If the file does not exist,
it will be created */
-gboolean g_key_file_save_to_file(GKeyFile *kf, const gchar *file)
+gboolean g_key_file_save_to_file2(GKeyFile *kf, const gchar *file)
{
GError *error = NULL;
gsize length, nr;
diff -Nurp gmameui.orig/src/io.h gmameui/src/io.h
--- gmameui.orig/src/io.h 2009-10-26 06:20:07.000000000 +0000
+++ gmameui/src/io.h 2014-10-13 01:05:18.090923231 +0100
@@ -62,7 +62,7 @@ const gchar *
my_dtostr(char* buf, gdouble d);
gboolean
-g_key_file_save_to_file(GKeyFile *kf, const gchar *file);
+g_key_file_save_to_file2(GKeyFile *kf, const gchar *file);
gboolean
load_games_ini(void);
diff -Nurp gmameui.orig/src/mame_options.c gmameui/src/mame_options.c
--- gmameui.orig/src/mame_options.c 2009-09-22 11:39:28.000000000 +0100
+++ gmameui/src/mame_options.c 2014-10-13 01:06:40.174885397 +0100
@@ -492,7 +492,7 @@ mame_options_save_string (MameOptions *o
g_key_file_set_string (opts->priv->options_file, opt->category, opt->key, value);
// g_strfreev (stv);
- g_key_file_save_to_file (opts->priv->options_file, opts->priv->filename);
+ g_key_file_save_to_file2 (opts->priv->options_file, opts->priv->filename);
}
static void
@@ -519,7 +519,7 @@ mame_options_save_double (MameOptions *o
g_key_file_set_double (opts->priv->options_file, opt->category, opt->key, value);
// g_strfreev (stv);
- g_key_file_save_to_file (opts->priv->options_file, opts->priv->filename);
+ g_key_file_save_to_file2 (opts->priv->options_file, opts->priv->filename);
}
static void
@@ -546,7 +546,7 @@ mame_options_save_int (MameOptions *opts
g_key_file_set_integer (opts->priv->options_file, opt->category, opt->key, value);
// g_strfreev (stv);
- g_key_file_save_to_file (opts->priv->options_file, opts->priv->filename);
+ g_key_file_save_to_file2 (opts->priv->options_file, opts->priv->filename);
}
static void
@@ -573,7 +573,7 @@ mame_options_save_bool (MameOptions *opt
g_key_file_set_boolean (opts->priv->options_file, opt->category, opt->key, value);
// g_strfreev (stv);
- g_key_file_save_to_file (opts->priv->options_file, opts->priv->filename);
+ g_key_file_save_to_file2 (opts->priv->options_file, opts->priv->filename);
}
/* Gets the value from the keyfile for the specified key, which should be of the
diff -Nurp gmameui.orig/src/mame_options_legacy.c gmameui/src/mame_options_legacy.c
--- gmameui.orig/src/mame_options_legacy.c 2009-08-11 12:09:03.000000000 +0100
+++ gmameui/src/mame_options_legacy.c 2014-10-13 01:07:11.113248044 +0100
@@ -491,7 +491,7 @@ mame_options_legacy_save_string (MameOpt
g_key_file_set_string (opts->priv->options_file, opt->category, opt->key, value);
// g_strfreev (stv);
- g_key_file_save_to_file (opts->priv->options_file, opts->priv->filename);
+ g_key_file_save_to_file2 (opts->priv->options_file, opts->priv->filename);
}
static void
@@ -518,7 +518,7 @@ mame_options_legacy_save_double (MameOpt
g_key_file_set_double (opts->priv->options_file, opt->category, opt->key, value);
// g_strfreev (stv);
- g_key_file_save_to_file (opts->priv->options_file, opts->priv->filename);
+ g_key_file_save_to_file2 (opts->priv->options_file, opts->priv->filename);
}
static void
@@ -545,7 +545,7 @@ mame_options_legacy_save_int (MameOption
g_key_file_set_integer (opts->priv->options_file, opt->category, opt->key, value);
// g_strfreev (stv);
- g_key_file_save_to_file (opts->priv->options_file, opts->priv->filename);
+ g_key_file_save_to_file2 (opts->priv->options_file, opts->priv->filename);
}
static void
@@ -572,7 +572,7 @@ mame_options_legacy_save_bool (MameOptio
g_key_file_set_boolean (opts->priv->options_file, opt->category, opt->key, value);
// g_strfreev (stv);
- g_key_file_save_to_file (opts->priv->options_file, opts->priv->filename);
+ g_key_file_save_to_file2 (opts->priv->options_file, opts->priv->filename);
}
/* Gets the value from the keyfile for the specified key, which should be of the
Index: gmameui.spec
===================================================================
RCS file: /cvs/nonfree/rpms/gmameui/devel/gmameui.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gmameui.spec 31 Aug 2014 20:40:09 -0000 1.11
+++ gmameui.spec 17 Jan 2015 05:29:05 -0000 1.12
@@ -1,7 +1,7 @@
Summary: Frontend for MAME
Name: gmameui
Version: 0.2.13
-Release: 0.5.20120704cvs%{?dist}
+Release: 0.6.20120704cvs%{?dist}
License: GPLv3+
Group: Applications/Emulators
URL: http://gmameui.sourceforge.net/
@@ -9,13 +9,14 @@
Source0: gmameui-gmameui20120704cvs.tar.gz
#from gnome-icon-theme-gperfection2-2.3-1.noarch.rpm
Source1: missingicons.tbz
-Patch0: gmameui-0.2.12-fix.patch
-Patch2: gmameui-fix3.patch
-Patch3: gmameui-fix4.patch
-#BuildRequires: gtk2-devel
-BuildRequires: libgnome-devel
+Patch0: gmameui-0.2.12-glib2.patch
+Patch2: gmameui-0.2.12-libarchive.patch
+Patch3: gmameui-0.2.12-autopoint.patch
+Patch4: gmameui-0.2.13-g_key_file_save_to_file2.patch
+BuildRequires: gtk2-devel
+#BuildRequires: libgnome-devel
BuildRequires: expat-devel
-BuildRequires: libglade2-devel
+#BuildRequires: libglade2-devel
BuildRequires: gettext, bison
BuildRequires: intltool, perl(XML::Parser)
BuildRequires: libarchive-devel
@@ -37,38 +38,33 @@
%prep
%setup -q -n gmameui
%setup -a1 -qn gmameui
-%patch0 -p1 -b .fix
-%patch2 -p0 -b .fix3
-%patch3 -p0 -b .fix4
+%patch0 -p1 -b .glib2
+%patch2 -p0 -b .libarchive
+%patch3 -p1 -b .autopoint
+%patch4 -p1 -b .g_key_file_save_to_file2
%build
./autogen.sh
-%configure
+%configure --enable-debug
%{__make} %{?_smp_mflags}
%install
-%{__rm} -rf %{buildroot} _docs
%{__make} install DESTDIR=%{buildroot}
%find_lang %{name}
-# Put the docs back into place
-%{__mkdir} _docs
+# clean empty files
%{__rm} -f %{buildroot}%{_docdir}/%{name}*/{README,TODO}
-%{__mv} %{buildroot}%{_docdir}/%{name}*/* _docs/
# Install missing icons
-#%{__cp} emblem-distinguished.png emblem-sound.png stock_unknown.png stock_filter-navigator.png \
-#stock_toggle-preview.png stock_list_enum-off.png %{buildroot}%{_datadir}/gmameui/
-
%{__cp} gmameui-view-list.png gmameui-view-filters.png gmameui-view-screenshot.png \
gmameui-emblem-unknown.png gmameui-emblem-played.png gmameui-emblem-sound.png \
%{buildroot}%{_datadir}/gmameui/
%files -f %{name}.lang
%defattr(-,root,root,-)
-%doc _docs/*
+%doc %{_docdir}
%{_bindir}/gmameui
%{_datadir}/applications/gmameui.desktop
%{_datadir}/pixmaps/gmameui.png
@@ -79,6 +75,9 @@
%changelog
+* Sat Jan 17 2015 Sérgio Basto <sergio(a)serjux.com> - 0.2.13-0.6.20120704cvs
+- work in progress , renaming patches, clean spec
+
* Sun Aug 31 2014 Sérgio Basto <sergio(a)serjux.com> - 0.2.13-0.5.20120704cvs
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
--- gmameui-0.2.12-fix.patch DELETED ---
--- gmameui-fix3.patch DELETED ---
--- gmameui-fix4.patch DELETED ---
9 years, 3 months
rpms/nvidia-kmod/devel nvidia-kmod.spec,1.177,1.178
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7074
Modified Files:
nvidia-kmod.spec
Log Message:
* Fri Jan 16 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 1:346.35-1
- Update to 346.35
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- nvidia-kmod.spec 17 Jan 2015 00:55:04 -0000 1.177
+++ nvidia-kmod.spec 17 Jan 2015 01:03:41 -0000 1.178
@@ -68,8 +68,8 @@
IGNORE_CC_MISMATCH=1 IGNORE_XEN_PRESENCE=1 IGNORE_PREEMPT_RT_PRESENCE=1 \
module
popd
-%endif
}
+%endif
done
9 years, 3 months
rpms/nvidia-kmod/devel nvidia-kmod.spec,1.176,1.177
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6789
Modified Files:
nvidia-kmod.spec
Log Message:
* Fri Jan 16 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 1:346.35-1
- Update to 346.35
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- nvidia-kmod.spec 17 Jan 2015 00:27:32 -0000 1.176
+++ nvidia-kmod.spec 17 Jan 2015 00:55:04 -0000 1.177
@@ -60,6 +60,7 @@
%{?_nv_build_module_instances:NV_BUILD_MODULE_INSTANCES=%{?_nv_build_module_instances}} \
module
popd
+%ifarch x86_64
%{!?_nv_build_module_instances:
pushd _kmod_build_${kernel_version%%___*}/uvm
make %{?_smp_mflags} \
@@ -67,6 +68,7 @@
IGNORE_CC_MISMATCH=1 IGNORE_XEN_PRESENCE=1 IGNORE_PREEMPT_RT_PRESENCE=1 \
module
popd
+%endif
}
done
9 years, 3 months
rpms/nvidia-kmod/devel nv-linux-arm.patch, 1.4, 1.5 nvidia-kmod.spec, 1.175, 1.176
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6275
Modified Files:
nv-linux-arm.patch nvidia-kmod.spec
Log Message:
* Fri Jan 16 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 1:346.35-1
- Update to 346.35
nv-linux-arm.patch:
nv-linux.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Index: nv-linux-arm.patch
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nv-linux-arm.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nv-linux-arm.patch 7 Aug 2014 09:16:38 -0000 1.4
+++ nv-linux-arm.patch 17 Jan 2015 00:27:32 -0000 1.5
@@ -1,7 +1,7 @@
diff -up nvidiapkg-armv7hl/kernel/nv-linux.h.arm nvidiapkg-armv7hl/kernel/nv-linux.h
---- nvidiapkg-armv7hl/kernel/nv-linux.h.arm 2014-08-01 03:14:20.000000000 +0200
-+++ nvidiapkg-armv7hl/kernel/nv-linux.h 2014-08-07 11:06:30.925997327 +0200
-@@ -230,7 +230,8 @@ RM_STATUS nvos_forward_error_to_cray(str
+--- nvidiapkg-armv7hl/kernel/nv-linux.h.arm 2015-01-11 04:30:46.000000000 +0000
++++ nvidiapkg-armv7hl/kernel/nv-linux.h 2015-01-16 23:20:16.785229307 +0000
+@@ -240,7 +240,8 @@ NV_STATUS nvos_forward_error_to_cray(str
* NVIDIA graphics driver has no way of knowing and is unlikely
* to work correctly.
*/
@@ -10,4 +10,4 @@
+ !defined(NVCPU_ARM)
#include <asm/maddr.h>
#include <xen/interface/memory.h>
- #define NV_XEN_SUPPORT_OLD_STYLE_KERNEL
+ #define NV_XEN_SUPPORT_FULLY_VIRTUALIZED_KERNEL
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- nvidia-kmod.spec 15 Jan 2015 21:47:41 -0000 1.175
+++ nvidia-kmod.spec 17 Jan 2015 00:27:32 -0000 1.176
@@ -3,13 +3,13 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%global buildforkernels newest
+%global buildforkernels current
Name: nvidia-kmod
Epoch: 1
-Version: 343.36
+Version: 346.35
# Taken over by kmodtool
-Release: 1%{?dist}.3
+Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -86,6 +86,9 @@
%changelog
+* Fri Jan 16 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 1:346.35-1
+- Update to 346.35
+
* Thu Jan 15 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:343.36-1.3
- Rebuilt for kernel
9 years, 3 months
rpms/xorg-x11-drv-nvidia/devel .cvsignore, 1.72, 1.73 sources, 1.76, 1.77 xorg-x11-drv-nvidia.spec, 1.167, 1.168
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6128
Modified Files:
.cvsignore sources xorg-x11-drv-nvidia.spec
Log Message:
* Fri Jan 16 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 1:346.35-1
- Update to 346.35
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/.cvsignore,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- .cvsignore 16 Dec 2014 15:52:32 -0000 1.72
+++ .cvsignore 17 Jan 2015 00:26:36 -0000 1.73
@@ -1,3 +1,3 @@
-NVIDIA-Linux-armv7l-gnueabihf-343.36.run
-NVIDIA-Linux-x86-343.36.run
-NVIDIA-Linux-x86_64-343.36.run
+NVIDIA-Linux-armv7l-gnueabihf-346.35.run
+NVIDIA-Linux-x86-346.35.run
+NVIDIA-Linux-x86_64-346.35.run
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- sources 16 Dec 2014 15:52:32 -0000 1.76
+++ sources 17 Jan 2015 00:26:37 -0000 1.77
@@ -1,3 +1,3 @@
-eb7b19982aa435544c29b0f163236a9d NVIDIA-Linux-armv7l-gnueabihf-343.36.run
-eae5d5407df0b371929a76f96aec4020 NVIDIA-Linux-x86-343.36.run
-ff6a3dff5f334b2af0a1c29c7ac311e9 NVIDIA-Linux-x86_64-343.36.run
+fff0937cd11b22b86e37fbdcfef8556f NVIDIA-Linux-armv7l-gnueabihf-346.35.run
+d2b8f7f90ef5037f03f94519f9809511 NVIDIA-Linux-x86-346.35.run
+f225dd17a6b325ba6aa98c6035c62d78 NVIDIA-Linux-x86_64-346.35.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.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- xorg-x11-drv-nvidia.spec 16 Jan 2015 17:04:22 -0000 1.167
+++ xorg-x11-drv-nvidia.spec 17 Jan 2015 00:26:37 -0000 1.168
@@ -7,8 +7,8 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
-Version: 343.36
-Release: 2%{?dist}
+Version: 346.35
+Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -412,6 +412,9 @@
%{_nvidia_xorgdir}/*.so*
%{_libdir}/xorg/modules/drivers/nvidia_drv.so
%{_libdir}/xorg/modules/%{_nvidia_serie}-%{version}
+# It's time that nvidia-settings used gtk3
+%exclude %{_nvidia_libdir}/libnvidia-gtk2.so
+%{_nvidia_libdir}/libnvidia-gtk3.so
#/no_multilib
%if 0%{?fedora} >= 21
%{_datadir}/X11/xorg.conf.d/nvidia.conf
@@ -502,6 +505,9 @@
%{_nvidia_libdir}/libnvidia-fbc.so
%changelog
+* Fri Jan 16 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 1:346.35-1
+- Update to 346.35
+
* Sun Jan 11 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:343.36-2
- Move libnvidia-ml back into -cuda along with nvidia-debugdump
9 years, 3 months
rpms/nvidia-340xx-kmod/F-20 nvidia-340xx-kmod.spec,1.2,1.3
by Przemysław Palacz
Author: przemal
Update of /cvs/nonfree/rpms/nvidia-340xx-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv986
Modified Files:
nvidia-340xx-kmod.spec
Log Message:
* Fri Jan 16 2015 Przemysław Palacz <pprzemal(a)gmail.com> - 1:340.65-3.1
- Rebuilt for kernel
Index: nvidia-340xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-340xx-kmod/F-20/nvidia-340xx-kmod.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nvidia-340xx-kmod.spec 16 Jan 2015 19:01:12 -0000 1.2
+++ nvidia-340xx-kmod.spec 16 Jan 2015 19:35:44 -0000 1.3
@@ -3,13 +3,13 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%global buildforkernels akmod
+%global buildforkernels newest
Name: nvidia-340xx-kmod
Epoch: 1
Version: 340.65
# Taken over by kmodtool
-Release: 3%{?dist}
+Release: 3%{?dist}.1
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -91,6 +91,9 @@
%changelog
+* Fri Jan 16 2015 Przemysław Palacz <pprzemal(a)gmail.com> - 1:340.65-3.1
+- Rebuilt for kernel
+
* Thu Jan 15 2015 Przemysław Palacz <pprzemal(a)gmail.com> - 1:340.65-3
- Replace main nvidia driver in F20 with this legacy version
- Remove deprecated BuildRoot tag
9 years, 3 months
rpms/nvidia-340xx-kmod/F-20 nvidia-340xx-kmod.spec,1.1,1.2
by Przemysław Palacz
Author: przemal
Update of /cvs/nonfree/rpms/nvidia-340xx-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv32593
Modified Files:
nvidia-340xx-kmod.spec
Log Message:
* Thu Jan 15 2015 Przemysław Palacz <pprzemal(a)gmail.com> - 1:340.65-3
- Replace main nvidia driver in F20 with this legacy version
- Remove deprecated BuildRoot tag
Index: nvidia-340xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-340xx-kmod/F-20/nvidia-340xx-kmod.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nvidia-340xx-kmod.spec 12 Jan 2015 00:54:10 -0000 1.1
+++ nvidia-340xx-kmod.spec 16 Jan 2015 19:01:12 -0000 1.2
@@ -9,7 +9,7 @@
Epoch: 1
Version: 340.65
# Taken over by kmodtool
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -20,8 +20,6 @@
Patch1: 3.18_kernel.patch
Patch2: 3.19_kernel.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
# needed for plague to make sure it builds for i586 and i686
ExclusiveArch: i686 x86_64 armv7hl
@@ -31,7 +29,7 @@
%{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }
# kmodtool does its magic here
-%{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) }
+%{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} %(if [ 0%{?fedora} == 020 ]; then echo --obsolete-name nvidia --obsolete-version %{?epoch}:%{version}-%{release}; fi) 2>/dev/null) }
%description
The nvidia %{version} display driver kernel module for kernel %{kversion}.
@@ -41,7 +39,11 @@
# error out if there was something wrong with kmodtool
%{?kmodtool_check}
# print kmodtool output for debugging purposes:
-kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
+kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} \
+%if 0%{?fedora} == 20
+ --obsolete-name nvidia --obsolete-version %{?epoch}:%{version}-%{release} \
+%endif
+2>/dev/null
%setup -T -c
tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}-%{_target_cpu}.tar.xz
# patch loop
@@ -89,6 +91,10 @@
%changelog
+* Thu Jan 15 2015 Przemysław Palacz <pprzemal(a)gmail.com> - 1:340.65-3
+- Replace main nvidia driver in F20 with this legacy version
+- Remove deprecated BuildRoot tag
+
* Sat Jan 10 2015 Przemysław Palacz <pprzemal(a)gmail.com> - 1:340.65-2
- Bring back part of the old patch for kernel 3.18
- Patch for kernel 3.19 (no longer marks the kernel as tainted, GPL only interfaces)
9 years, 3 months
rpms/xorg-x11-drv-nvidia-340xx/F-20 xorg-x11-drv-nvidia-340xx.spec, 1.1, 1.2
by Przemysław Palacz
Author: przemal
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-340xx/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv32499
Modified Files:
xorg-x11-drv-nvidia-340xx.spec
Log Message:
* Thu Jan 15 2015 Przemysław Palacz <pprzemal(a)gmail.com> - 1:340.65-4
- Replace main nvidia driver in F20 with this legacy version
Index: xorg-x11-drv-nvidia-340xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-340xx/F-20/xorg-x11-drv-nvidia-340xx.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-drv-nvidia-340xx.spec 12 Jan 2015 01:12:41 -0000 1.1
+++ xorg-x11-drv-nvidia-340xx.spec 16 Jan 2015 18:59:20 -0000 1.2
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia-340xx
Epoch: 1
Version: 340.65
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: NVIDIA's 340xx series proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -44,6 +44,12 @@
Requires: %{_nvidia_serie}-kmod >= %{?epoch}:%{version}
Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release}
+%if 0%{?fedora} == 20
+Obsoletes: xorg-x11-drv-nvidia < %{?epoch}:%{version}-%{release}
+Provides: xorg-x11-drv-nvidia = %{?epoch}:%{version}-%{release}
+Obsoletes: nvidia-kmod < %{?epoch}:%{version}-%{release}
+Provides: nvidia-kmod-common = %{?epoch}:%{version}
+%endif
Obsoletes: %{_nvidia_serie}-kmod < %{?epoch}:%{version}
Provides: %{_nvidia_serie}-kmod-common = %{?epoch}:%{version}
Conflicts: xorg-x11-drv-nvidia-beta
@@ -52,7 +58,9 @@
Conflicts: xorg-x11-drv-nvidia-96xx
Conflicts: xorg-x11-drv-nvidia-173xx
Conflicts: xorg-x11-drv-nvidia-304xx
+%if 0%{?fedora} != 20
Conflicts: xorg-x11-drv-nvidia
+%endif
Conflicts: xorg-x11-drv-fglrx
Conflicts: xorg-x11-drv-catalyst
@@ -91,6 +99,10 @@
Group: Development/Libraries
Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release}
Requires: %{name}-cuda%{_isa} = %{?epoch}:%{version}-%{release}
+%if 0%{?fedora} == 20
+Obsoletes: xorg-x11-drv-nvidia-devel < %{?epoch}:%{version}-%{release}
+Provides: xorg-x11-drv-nvidia-devel = %{?epoch}:%{version}-%{release}
+%endif
%description devel
This package provides the development files of the %{name} package,
@@ -123,6 +135,10 @@
Summary: Libraries for %{name}
Group: User Interface/X Hardware Support
Requires: %{name} = %{?epoch}:%{version}-%{release}
+%if 0%{?fedora} == 20
+Obsoletes: xorg-x11-drv-nvidia-libs < %{?epoch}:%{version}-%{release}
+Provides: xorg-x11-drv-nvidia-libs = %{?epoch}:%{version}-%{release}
+%endif
Requires: libvdpau%{_isa} >= 0.5
%description libs
@@ -509,6 +525,9 @@
%changelog
+* Thu Jan 15 2015 Przemysław Palacz <pprzemal(a)gmail.com> - 1:340.65-4
+- Replace main nvidia driver in F20 with this legacy version
+
* Sun Jan 11 2015 Przemysław Palacz <pprzemal(a)gmail.com> - 1:340.65-3
- Switch libnvidia-ml and nvidia-debugdump to the cuda subpackage again
9 years, 3 months
rpms/xorg-x11-drv-nvidia/devel xorg-x11-drv-nvidia.spec,1.166,1.167
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30725
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
Fixup nvidia.icd perm
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.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- xorg-x11-drv-nvidia.spec 11 Jan 2015 11:56:33 -0000 1.166
+++ xorg-x11-drv-nvidia.spec 16 Jan 2015 17:04:22 -0000 1.167
@@ -179,7 +179,7 @@
%ifarch x86_64 i686
# OpenCL config
install -m 0755 -d $RPM_BUILD_ROOT%{_sysconfdir}/OpenCL/vendors/
-install -p -m 0755 nvidia.icd $RPM_BUILD_ROOT%{_sysconfdir}/OpenCL/vendors/
+install -p -m 0644 nvidia.icd $RPM_BUILD_ROOT%{_sysconfdir}/OpenCL/vendors/
install -p -m 0755 libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/
ln -s libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/libOpenCL.so.1
ln -s libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/libOpenCL.so
9 years, 3 months