rpms/mjpegtools/devel mjpegtools.spec,1.12,1.13
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/mjpegtools/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4672
Modified Files:
mjpegtools.spec
Log Message:
* Mon Sep 30 2013 Sérgio Basto <sergio(a)serjux.com> - 2.0.0-8
- Rebuilt for x264/FFmpeg
Index: mjpegtools.spec
===================================================================
RCS file: /cvs/free/rpms/mjpegtools/devel/mjpegtools.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mjpegtools.spec 25 May 2013 13:39:15 -0000 1.12
+++ mjpegtools.spec 30 Sep 2013 02:34:30 -0000 1.13
@@ -1,6 +1,6 @@
Name: mjpegtools
Version: 2.0.0
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Tools to manipulate MPEG data
Group: Applications/Multimedia
License: GPLv2
@@ -183,6 +183,9 @@
%changelog
+* Mon Sep 30 2013 Sérgio Basto <sergio(a)serjux.com> - 2.0.0-8
+- Rebuilt for x264/FFmpeg
+
* Sat May 25 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.0-7
- Rebuilt for x264/FFmpeg
10 years, 10 months
rpms/x264/devel x264-gpac.patch,NONE,1.1 x264.spec,1.59,1.60
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/x264/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3324
Modified Files:
x264.spec
Added Files:
x264-gpac.patch
Log Message:
* Mon Sep 30 2013 Sérgio Basto <sergio(a)serjux.com> - 0.133-3.20130709git585324f
- Fix gpac detection.
x264-gpac.patch:
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE x264-gpac.patch ---
--- generic10/configure 2013-09-30 01:59:40.537691428 +0100
+++ generic/configure 2013-09-30 02:24:21.637654522 +0100
@@ -917,7 +917,7 @@ fi
if [ "$gpac" = "auto" ] ; then
gpac="no"
- cc_check "" -lz && GPAC_LIBS="-lgpac_static -lz" || GPAC_LIBS="-lgpac_static"
+ cc_check "" -lz && GPAC_LIBS="-lgpac_static -lz -lssl -lcrypto -lpng -ljpeg" || GPAC_LIBS="-lgpac_static"
if [ "$SYS" = "WINDOWS" ] ; then
GPAC_LIBS="$GPAC_LIBS -lwinmm"
fi
Index: x264.spec
===================================================================
RCS file: /cvs/free/rpms/x264/devel/x264.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- x264.spec 15 Aug 2013 10:19:41 -0000 1.59
+++ x264.spec 30 Sep 2013 02:04:57 -0000 1.60
@@ -24,7 +24,7 @@
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.%{api}
-Release: 2%{?gver}%{?dist}
+Release: 3%{?gver}%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://developers.videolan.org/x264.html
@@ -34,8 +34,9 @@
# don't remove config.h and don't re-run version.sh
Patch0: x264-nover.patch
+Patch10: x264-gpac.patch
-%{!?_without_gpac:BuildRequires: gpac-devel-static zlib-devel}
+%{!?_without_gpac:BuildRequires: gpac-devel-static zlib-devel openssl-devel libpng-devel libjpeg-devel}
%{!?_without_libavformat:BuildRequires: ffmpeg-devel}
%{?_with_ffmpegsource:BuildRequires: ffmpegsource-devel}
%{?_with_visualize:BuildRequires: libX11-devel}
@@ -90,6 +91,7 @@
%setup -q -c -n %{name}-0.%{api}-%{snapshot}
pushd %{name}-0.%{api}-%{snapshot}
%patch0 -p1 -b .nover
+%patch10 -p1 -b .gpac
popd
variants="generic generic10"
@@ -189,6 +191,9 @@
%{_libdir}/libx26410b.so
%changelog
+* Mon Sep 30 2013 Sérgio Basto <sergio(a)serjux.com> - 0.133-3.20130709git585324f
+- Fix gpac detection.
+
* Thu Aug 15 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.133-2.20130709git585324f
- Rebuilt for FFmpeg 2.0.x
10 years, 10 months
rpms/nvidia-kmod/F-19 3.11_kernel.patch, 1.1, 1.2 nvidia-kmod.spec, 1.137, 1.138 sources, 1.58, 1.59
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11399
Modified Files:
3.11_kernel.patch nvidia-kmod.spec sources
Log Message:
* Sun Sep 29 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:325.15-1
- Update to 325.15
3.11_kernel.patch:
nv-linux.h | 4 ++++
1 file changed, 4 insertions(+)
Index: 3.11_kernel.patch
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-19/3.11_kernel.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 3.11_kernel.patch 17 Sep 2013 14:09:26 -0000 1.1
+++ 3.11_kernel.patch 29 Sep 2013 23:32:56 -0000 1.2
@@ -1,609 +1,6 @@
-diff -ur a/kernel/nv-i2c.c b/kernel/nv-i2c.c
---- a/kernel/nv-i2c.c 2013-07-19 15:37:04.977306079 +0200
-+++ b/kernel/nv-i2c.c 2013-07-19 14:16:08.755700586 +0200
-@@ -311,8 +311,6 @@
- BOOL NV_API_CALL nv_i2c_del_adapter(nv_state_t *nv, void *data)
- {
- struct i2c_adapter *pI2cAdapter = (struct i2c_adapter *)data;
-- int osstatus = 0;
-- BOOL wasReleased = FALSE;
-
- #if defined(KERNEL_2_4)
- if (!NV_WEAK_SYMBOL_PRESENT(i2c_add_adapter))
-@@ -324,15 +322,10 @@
- if (!pI2cAdapter) return FALSE;
-
- // attempt release with the OS
-- osstatus = i2c_del_adapter(pI2cAdapter);
-+ i2c_del_adapter(pI2cAdapter);
-+ os_free_mem(pI2cAdapter);
-
-- if (!osstatus)
-- {
-- os_free_mem(pI2cAdapter);
-- wasReleased = TRUE;
-- }
--
-- return wasReleased;
-+ return TRUE;
- }
-
- #else // (defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE))
-diff -ur a/kernel/nv-procfs.c b/kernel/nv-procfs.c
---- a/kernel/nv-procfs.c 2013-07-19 15:37:04.977306079 +0200
-+++ b/kernel/nv-procfs.c 2013-07-19 15:23:15.013490851 +0200
-@@ -60,60 +60,41 @@
- __entry; \
- })
-
--#define NV_CREATE_PROC_FILE(name,parent,__read_proc, \
-- __write_proc,__fops,__data) \
-- ({ \
-- struct proc_dir_entry *__entry; \
-- int __mode = (S_IFREG | S_IRUGO); \
-- if ((NvUPtr)(__write_proc) != 0) \
-- __mode |= S_IWUSR; \
-- __entry = NV_CREATE_PROC_ENTRY(name, __mode, parent); \
-- if (__entry != NULL) \
-- { \
-- if ((NvUPtr)(__read_proc) != 0) \
-- __entry->read_proc = (__read_proc); \
-- if ((NvUPtr)(__write_proc) != 0) \
-- { \
-- __entry->write_proc = (__write_proc); \
-- __entry->proc_fops = (__fops); \
-- } \
-- __entry->data = (__data); \
-- } \
-- __entry; \
-- })
-+#define NV_PROC_RW (S_IFREG|S_IRUGO|S_IWUSR)
-+#define NV_PROC_RO (S_IFREG|S_IRUGO)
-
- #define NV_CREATE_PROC_DIR(name,parent) \
- ({ \
- struct proc_dir_entry *__entry; \
- int __mode = (S_IFDIR | S_IRUGO | S_IXUGO); \
-- __entry = NV_CREATE_PROC_ENTRY(name, __mode, parent); \
-+ __entry = proc_mkdir_mode(name, __mode, parent); \
- __entry; \
- })
-
-+#if LINUX_VERSION_CODE <= KERNEL_VERSION(3,9,255)
-+static inline void *PDE_DATA(const struct inode *inode) {
-+ return PDE(inode)->data;
-+}
-+#endif
-+
- #define NV_PROC_WRITE_BUFFER_SIZE (64 * RM_PAGE_SIZE)
-
- static int
--nv_procfs_read_gpu_info(
-- char *page,
-- char **start,
-- off_t off,
-- int count,
-- int *eof,
-- void *data
-+nv_procfs_show_gpu_info(
-+ struct seq_file *m,
-+ void *v
- )
- {
-- nv_state_t *nv = data;
-+ nv_state_t *nv = m->private;
- nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv);
- struct pci_dev *dev = nvl->dev;
- char *type, *fmt, tmpstr[NV_DEVICE_NAME_LENGTH];
-- int len = 0, status;
-+ int status;
- NvU8 *uuid;
- NvU32 vbios_rev1, vbios_rev2, vbios_rev3, vbios_rev4, vbios_rev5;
- NvU32 fpga_rev1, fpga_rev2, fpga_rev3;
- nv_stack_t *sp = NULL;
-
-- *eof = 1;
--
- NV_KMEM_CACHE_ALLOC_STACK(sp);
- if (sp == NULL)
- {
-@@ -134,31 +115,31 @@
- if (rm_get_device_name(sp, nv, dev->device, dev->subsystem_vendor,
- dev->subsystem_device, NV_DEVICE_NAME_LENGTH,
- tmpstr) != RM_OK)
-- {
-+ {
- strcpy (tmpstr, "Unknown");
- }
- }
-
-- len += sprintf(page+len, "Model: \t\t %s\n", tmpstr);
-- len += sprintf(page+len, "IRQ: \t\t %d\n", nv->interrupt_line);
-+ seq_printf(m, "Model: \t\t %s\n", tmpstr);
-+ seq_printf(m, "IRQ: \t\t %d\n", nv->interrupt_line);
-
- if (NV_IS_GVI_DEVICE(nv))
- {
- status = rm_gvi_get_firmware_version(sp, nv, &fpga_rev1, &fpga_rev2,
- &fpga_rev3);
- if (status != RM_OK)
-- len += sprintf(page+len, "Firmware: \t ????.??.??\n");
-+ seq_printf(m, "Firmware: \t ????.??.??\n");
- else
- {
- fmt = "Firmware: \t %x.%x.%x\n";
-- len += sprintf(page+len, fmt, fpga_rev1, fpga_rev2, fpga_rev3);
-+ seq_printf(m, fmt, fpga_rev1, fpga_rev2, fpga_rev3);
- }
- }
- else
- {
- if (rm_get_gpu_uuid(sp, nv, &uuid, NULL) == RM_OK)
- {
-- len += sprintf(page+len, "GPU UUID: \t %s\n", (char *)uuid);
-+ seq_printf(m, "GPU UUID: \t %s\n", (char *)uuid);
- os_free_mem(uuid);
- }
-
-@@ -166,12 +147,12 @@
- &vbios_rev3, &vbios_rev4,
- &vbios_rev5) != RM_OK)
- {
-- len += sprintf(page+len, "Video BIOS: \t ??.??.??.??.??\n");
-+ seq_printf(m, "Video BIOS: \t ??.??.??.??.??\n");
- }
- else
- {
- fmt = "Video BIOS: \t %02x.%02x.%02x.%02x.%02x\n";
-- len += sprintf(page+len, fmt, vbios_rev1, vbios_rev2, vbios_rev3,
-+ seq_printf(m, fmt, vbios_rev1, vbios_rev2, vbios_rev3,
- vbios_rev4, vbios_rev5);
- }
- }
-@@ -180,12 +161,12 @@
- type = "PCIe";
- else
- type = "PCI";
-- len += sprintf(page+len, "Bus Type: \t %s\n", type);
-+ seq_printf(m, "Bus Type: \t %s\n", type);
-
-- len += sprintf(page+len, "DMA Size: \t %d bits\n",
-+ seq_printf(m, "DMA Size: \t %d bits\n",
- nv_count_bits(dev->dma_mask));
-- len += sprintf(page+len, "DMA Mask: \t 0x%llx\n", dev->dma_mask);
-- len += sprintf(page+len, "Bus Location: \t %04x:%02x.%02x.%x\n",
-+ seq_printf(m, "DMA Mask: \t 0x%llx\n", dev->dma_mask);
-+ seq_printf(m, "Bus Location: \t %04x:%02x.%02x.%x\n",
- nv->domain, nv->bus, nv->slot, PCI_FUNC(dev->devfn));
- #if defined(DEBUG)
- do
-@@ -193,7 +174,7 @@
- int j;
- for (j = 0; j < NV_GPU_NUM_BARS; j++)
- {
-- len += sprintf(page+len, "BAR%u: \t\t 0x%llx (%lluMB)\n",
-+ seq_printf(m, "BAR%u: \t\t 0x%llx (%lluMB)\n",
- j, nv->bars[j].address, (nv->bars[j].size >> 20));
- }
- } while (0);
-@@ -201,26 +182,120 @@
-
- NV_KMEM_CACHE_FREE_STACK(sp);
-
-- return len;
-+ return 0;
- }
-
- static int
--nv_procfs_read_version(
-- char *page,
-- char **start,
-- off_t off,
-- int count,
-- int *eof,
-- void *data
-+nv_procfs_open_gpu_info(
-+ struct inode *inode,
-+ struct file *file
-+)
-+{
-+ return single_open(file, nv_procfs_show_gpu_info, PDE_DATA(inode));
-+}
-+
-+static const struct file_operations nv_procfs_gpu_info_fops = {
-+ .owner = THIS_MODULE,
-+ .open = nv_procfs_open_gpu_info,
-+ .read = seq_read,
-+ .llseek = seq_lseek,
-+ .release = single_release,
-+};
-+
-+static int
-+nv_procfs_show_version(
-+ struct seq_file *m,
-+ void *v
-+)
-+{
-+ seq_printf(m, "NVRM version: %s\n", pNVRM_ID);
-+ seq_printf(m, "GCC version: %s\n", NV_COMPILER);
-+
-+ return 0;
-+}
-+
-+static int
-+nv_procfs_open_version(
-+ struct inode *inode,
-+ struct file *file
-+)
-+{
-+ return single_open(file, nv_procfs_show_version, NULL);
-+}
-+
-+static const struct file_operations nv_procfs_version_fops = {
-+ .owner = THIS_MODULE,
-+ .open = nv_procfs_open_version,
-+ .read = seq_read,
-+ .llseek = seq_lseek,
-+ .release = single_release,
-+};
-+
-+static int
-+nv_procfs_show_registry(
-+ struct seq_file *m,
-+ void *v
-+)
-+{
-+ nv_state_t *nv = m->private;
-+ nv_linux_state_t *nvl = NULL;
-+ char *registry_keys;
-+
-+ if (nv != NULL)
-+ nvl = NV_GET_NVL_FROM_NV_STATE(nv);
-+ registry_keys = ((nvl != NULL) ?
-+ nvl->registry_keys : nv_registry_keys);
-+
-+ seq_printf(m, "Binary: \"%s\"\n", registry_keys);
-+
-+ return 0;
-+}
-+
-+static ssize_t
-+nv_procfs_write_registry(
-+ struct file *file,
-+ const char __user *buffer,
-+ size_t count,
-+ loff_t *pos
- )
- {
-- int len = 0;
-- *eof = 1;
-+ int status = 0;
-+ nv_file_private_t *nvfp = NV_GET_FILE_PRIVATE(file);
-+ char *proc_buffer;
-+ unsigned long bytes_left;
-+
-+ down(&nvfp->fops_sp_lock[NV_FOPS_STACK_INDEX_PROCFS]);
-+
-+ bytes_left = (NV_PROC_WRITE_BUFFER_SIZE - nvfp->off - 1);
-+
-+ if (count == 0)
-+ {
-+ status = -EINVAL;
-+ goto done;
-+ }
-+ else if ((bytes_left == 0) || (count > bytes_left))
-+ {
-+ status = -ENOSPC;
-+ goto done;
-+ }
-+
-+ proc_buffer = &((char *)nvfp->data)[nvfp->off];
-+
-+ if (copy_from_user(proc_buffer, buffer, count))
-+ {
-+ nv_printf(NV_DBG_ERRORS, "NVRM: failed to copy in proc data!\n");
-+ status = -EFAULT;
-+ }
-+ else
-+ {
-+ nvfp->proc_data = PDE_DATA(file->f_inode);
-+ nvfp->off += count;
-+ }
-
-- len += sprintf(page+len, "NVRM version: %s\n", pNVRM_ID);
-- len += sprintf(page+len, "GCC version: %s\n", NV_COMPILER);
-+done:
-+ up(&nvfp->fops_sp_lock[NV_FOPS_STACK_INDEX_PROCFS]);
-
-- return len;
-+ return ((status < 0) ? status : count);
- }
-
- static int
-@@ -233,7 +308,7 @@
- nv_stack_t *sp = NULL;
-
- if (0 == (file->f_mode & FMODE_WRITE))
-- return 0;
-+ return single_open(file, nv_procfs_show_registry, PDE_DATA(inode));
-
- nvfp = nv_alloc_file_private();
- if (nvfp == NULL)
-@@ -282,6 +357,9 @@
- RM_STATUS rm_status;
- int rc = 0;
-
-+ if (0 == (file->f_mode & FMODE_WRITE))
-+ return single_release(inode, file);
-+
- nvfp = NV_GET_FILE_PRIVATE(file);
- if (nvfp == NULL)
- return 0;
-@@ -346,122 +424,81 @@
- return rc;
- }
-
--static struct file_operations nv_procfs_registry_fops = {
-+static const struct file_operations nv_procfs_registry_fops = {
- .open = nv_procfs_open_registry,
-+ .read = seq_read,
-+ .llseek = seq_lseek,
-+ .write = nv_procfs_write_registry,
- .release = nv_procfs_close_registry,
- };
-
- static int
--nv_procfs_read_params(
-- char *page,
-- char **start,
-- off_t off,
-- int count,
-- int *eof,
-- void *data
-+nv_procfs_show_params(
-+ struct seq_file *m,
-+ void *v
- )
- {
- unsigned int i;
-- int len = 0;
- nv_parm_t *entry;
-
-- *eof = 1;
-
- for (i = 0; (entry = &nv_parms[i])->name != NULL; i++)
-- len += sprintf(page+len, "%s: %u\n", entry->name, *entry->data);
-+ seq_printf(m, "%s: %u\n", entry->name, *entry->data);
-
-- len += sprintf(page+len, "RegistryDwords: \"%s\"\n",
-+ seq_printf(m, "RegistryDwords: \"%s\"\n",
- (NVreg_RegistryDwords != NULL) ? NVreg_RegistryDwords : "");
-- len += sprintf(page+len, "RmMsg: \"%s\"\n",
-+ seq_printf(m, "RmMsg: \"%s\"\n",
- (NVreg_RmMsg != NULL) ? NVreg_RmMsg : "");
-
-- return len;
-+ return 0;
- }
-
- static int
--nv_procfs_read_registry(
-- char *page,
-- char **start,
-- off_t off,
-- int count,
-- int *eof,
-- void *data
--)
-+nv_procfs_open_params(
-+ struct inode *inode,
-+ struct file *file
-+)
- {
-- nv_state_t *nv = data;
-- nv_linux_state_t *nvl = NULL;
-- char *registry_keys;
-+ return single_open(file, nv_procfs_show_params, NULL);
-+}
-
-- if (nv != NULL)
-- nvl = NV_GET_NVL_FROM_NV_STATE(nv);
-- registry_keys = ((nvl != NULL) ?
-- nvl->registry_keys : nv_registry_keys);
-+static const struct file_operations nv_procfs_params_fops = {
-+ .owner = THIS_MODULE,
-+ .open = nv_procfs_open_params,
-+ .read = seq_read,
-+ .llseek = seq_lseek,
-+ .release = single_release,
-+};
-
-- *eof = 1;
-- return sprintf(page, "Binary: \"%s\"\n", registry_keys);
--}
-
- static int
--nv_procfs_write_registry(
-- struct file *file,
-- const char *buffer,
-- unsigned long count,
-- void *data
-+nv_procfs_show_text_file(
-+ struct seq_file *m,
-+ void *v
- )
- {
-- int status = 0;
-- nv_file_private_t *nvfp = NV_GET_FILE_PRIVATE(file);
-- char *proc_buffer;
-- unsigned long bytes_left;
--
-- down(&nvfp->fops_sp_lock[NV_FOPS_STACK_INDEX_PROCFS]);
--
-- bytes_left = (NV_PROC_WRITE_BUFFER_SIZE - nvfp->off - 1);
-+ seq_printf(m, "%s", (char *)m->private);
-
-- if (count == 0)
-- {
-- status = -EINVAL;
-- goto done;
-- }
-- else if ((bytes_left == 0) || (count > bytes_left))
-- {
-- status = -ENOSPC;
-- goto done;
-- }
--
-- proc_buffer = &((char *)nvfp->data)[nvfp->off];
--
-- if (copy_from_user(proc_buffer, buffer, count))
-- {
-- nv_printf(NV_DBG_ERRORS, "NVRM: failed to copy in proc data!\n");
-- status = -EFAULT;
-- }
-- else
-- {
-- nvfp->proc_data = data;
-- nvfp->off += count;
-- }
--
--done:
-- up(&nvfp->fops_sp_lock[NV_FOPS_STACK_INDEX_PROCFS]);
--
-- return ((status < 0) ? status : (int)count);
-+ return 0;
- }
-
- static int
--nv_procfs_read_text_file(
-- char *page,
-- char **start,
-- off_t off,
-- int count,
-- int *eof,
-- void *data
-+nv_procfs_open_text_file(
-+ struct inode *inode,
-+ struct file *file
- )
- {
-- *eof = 1;
-- return sprintf(page, "%s", (char *)data);
-+ return single_open(file, nv_procfs_show_text_file, PDE_DATA(inode));
- }
-
-+static const struct file_operations nv_procfs_text_fops = {
-+ .owner = THIS_MODULE,
-+ .open = nv_procfs_open_text_file,
-+ .read = seq_read,
-+ .llseek = seq_lseek,
-+ .release = single_release,
-+};
-+
- static void
- nv_procfs_add_text_file(
- struct proc_dir_entry *parent,
-@@ -469,22 +506,7 @@
- const char *text
- )
- {
-- NV_CREATE_PROC_FILE(filename, parent,
-- nv_procfs_read_text_file, NULL, NULL, (void *)text);
--}
--
--static void nv_procfs_unregister_all(struct proc_dir_entry *entry)
--{
-- while (entry)
-- {
-- struct proc_dir_entry *next = entry->next;
-- if (entry->subdir)
-- nv_procfs_unregister_all(entry->subdir);
-- remove_proc_entry(entry->name, entry->parent);
-- if (entry == proc_nvidia)
-- break;
-- entry = next;
-- }
-+ proc_create_data(filename, NV_PROC_RO, parent, &nv_procfs_text_fops, (void *)text);
- }
- #endif
-
-@@ -513,26 +535,11 @@
- if (!proc_nvidia)
- goto failed;
-
-- entry = NV_CREATE_PROC_FILE("params", proc_nvidia,
-- nv_procfs_read_params, NULL, NULL, NULL);
-+ entry = proc_create("params", NV_PROC_RO, proc_nvidia, &nv_procfs_params_fops);
- if (!entry)
- goto failed;
-
-- /*
-- * entry->proc_fops originally points to a constant
-- * structure, so to add more methods for the
-- * binary registry write path, we need to replace the
-- * said entry->proc_fops with a new fops structure.
-- * However, in preparation for this, we need to preserve
-- * the procfs read() and write() operations.
-- */
-- nv_procfs_registry_fops.read = entry->proc_fops->read;
-- nv_procfs_registry_fops.write = entry->proc_fops->write;
--
-- entry = NV_CREATE_PROC_FILE("registry", proc_nvidia,
-- nv_procfs_read_registry,
-- nv_procfs_write_registry,
-- &nv_procfs_registry_fops, NULL);
-+ entry = proc_create("registry", NV_PROC_RW, proc_nvidia, &nv_procfs_registry_fops);
- if (!entry)
- goto failed;
-
-@@ -553,8 +560,7 @@
-
- nv_procfs_add_text_file(proc_nvidia_patches, "README", __README_patches);
-
-- entry = NV_CREATE_PROC_FILE("version", proc_nvidia,
-- nv_procfs_read_version, NULL, NULL, NULL);
-+ entry = proc_create("version", NV_PROC_RO, proc_nvidia, &nv_procfs_version_fops);
- if (!entry)
- goto failed;
-
-@@ -571,15 +577,11 @@
- if (!proc_nvidia_gpu)
- goto failed;
-
-- entry = NV_CREATE_PROC_FILE("information", proc_nvidia_gpu,
-- nv_procfs_read_gpu_info, NULL, NULL, nv);
-+ entry = proc_create_data("information", NV_PROC_RO, proc_nvidia_gpu, &nv_procfs_gpu_info_fops, nv);
- if (!entry)
- goto failed;
-
-- entry = NV_CREATE_PROC_FILE("registry", proc_nvidia_gpu,
-- nv_procfs_read_registry,
-- nv_procfs_write_registry,
-- &nv_procfs_registry_fops, nv);
-+ entry = proc_create_data("registry", NV_PROC_RW, proc_nvidia_gpu, &nv_procfs_registry_fops, nv);
- if (!entry)
- goto failed;
- }
-@@ -587,7 +589,7 @@
- return 0;
- #if defined(CONFIG_PROC_FS)
- failed:
-- nv_procfs_unregister_all(proc_nvidia);
-+ remove_proc_subtree("driver/nvidia", NULL);
- return -1;
- #endif
- }
-@@ -595,6 +597,6 @@
- void nv_unregister_procfs(void)
- {
- #if defined(CONFIG_PROC_FS)
-- nv_procfs_unregister_all(proc_nvidia);
-+ remove_proc_subtree("driver/nvidia", NULL);
- #endif
- }
--- a/kernel/nv-linux.h
+++ b/kernel/nv-linux.h
-@@ -1038,7 +1038,11 @@ static inline int nv_execute_on_all_cpus
+@@ -957,7 +957,11 @@ static inline int nv_execute_on_all_cpus
#endif
#if !defined(NV_VMWARE)
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-19/nvidia-kmod.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- nvidia-kmod.spec 29 Sep 2013 08:46:13 -0000 1.137
+++ nvidia-kmod.spec 29 Sep 2013 23:32:56 -0000 1.138
@@ -7,9 +7,9 @@
Name: nvidia-kmod
Epoch: 1
-Version: 319.32
+Version: 325.15
# Taken over by kmodtool
-Release: 3%{?dist}.1
+Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -78,6 +78,9 @@
%changelog
+* Sun Sep 29 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:325.15-1
+- Update to 325.15
+
* Sun Sep 29 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.32-3.1
- Rebuilt for kernel
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-19/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources 13 Jul 2013 15:28:17 -0000 1.58
+++ sources 29 Sep 2013 23:32:56 -0000 1.59
@@ -1 +1 @@
-823f54bebd8c9c6184935ae9c8b18cf3 nvidia-kmod-data-319.32.tar.xz
+c075f748ce929098c317704151ef7fc8 nvidia-kmod-data-325.15.tar.xz
10 years, 10 months
rpms/xorg-x11-drv-nvidia/F-19 nvidia-snapshot.sh,1.2,1.3
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10990
Modified Files:
nvidia-snapshot.sh
Log Message:
add arm to nvidia-snapshot.sh
Index: nvidia-snapshot.sh
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-19/nvidia-snapshot.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nvidia-snapshot.sh 4 Oct 2011 10:07:21 -0000 1.2
+++ nvidia-snapshot.sh 29 Sep 2013 23:27:44 -0000 1.3
@@ -21,5 +21,10 @@
sh NVIDIA-Linux-${arch}-${version}.run --extract-only --target nvidiapkg-${arch}
done
+if [ ! -e NVIDIA-Linux-armv7l-gnueabihf-${version}.run ] ; then
+ wget -N ftp://download.nvidia.com/XFree86/Linux-32bit-ARM/${version}/NVIDIA-Linux...
+ fi
+sh NVIDIA-Linux-armv7l-gnueabihf-${version}.run --extract-only --target nvidiapkg-armv7hl
+
tar -cjf nvidia-kmod-data-${version}.tar.bz2 nvidiapkg-*/LICENSE nvidiapkg-*/kernel
10 years, 10 months
rpms/xorg-x11-drv-nvidia/devel nvidia-snapshot.sh, 1.2, 1.3 xorg-x11-drv-nvidia.spec, 1.117, 1.118
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10821
Modified Files:
nvidia-snapshot.sh xorg-x11-drv-nvidia.spec
Log Message:
add arm to nvidia-snapshot.sh
Index: nvidia-snapshot.sh
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/nvidia-snapshot.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nvidia-snapshot.sh 4 Oct 2011 10:07:21 -0000 1.2
+++ nvidia-snapshot.sh 29 Sep 2013 23:25:10 -0000 1.3
@@ -21,5 +21,10 @@
sh NVIDIA-Linux-${arch}-${version}.run --extract-only --target nvidiapkg-${arch}
done
+if [ ! -e NVIDIA-Linux-armv7l-gnueabihf-${version}.run ] ; then
+ wget -N ftp://download.nvidia.com/XFree86/Linux-32bit-ARM/${version}/NVIDIA-Linux...
+ fi
+sh NVIDIA-Linux-armv7l-gnueabihf-${version}.run --extract-only --target nvidiapkg-armv7hl
+
tar -cjf nvidia-kmod-data-${version}.tar.bz2 nvidiapkg-*/LICENSE nvidiapkg-*/kernel
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.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- xorg-x11-drv-nvidia.spec 20 Aug 2013 17:42:25 -0000 1.117
+++ xorg-x11-drv-nvidia.spec 29 Sep 2013 23:25:10 -0000 1.118
@@ -422,7 +422,7 @@
%{_nvidia_libdir}/libnvidia-vgxcfg.so
%changelog
-* Tue Aug 06 2013 leigh <leigh123linux(a)googlemail.com> - 1:325.15-1
+* Tue Aug 06 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:325.15-1
- Update to 325.15 release
* Sun Jul 21 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:325.08-5
10 years, 10 months
rpms/xorg-x11-drv-nvidia/F-19 sources, 1.58, 1.59 xorg-x11-drv-nvidia.spec, 1.110, 1.111
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9530
Modified Files:
sources xorg-x11-drv-nvidia.spec
Log Message:
* Tue Aug 06 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:325.15-1
- Update to 325.15 release
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-19/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources 13 Jul 2013 15:21:44 -0000 1.58
+++ sources 29 Sep 2013 23:00:02 -0000 1.59
@@ -1,3 +1,3 @@
-1cbf302ed5b5a9988e1c575f8f01336a NVIDIA-Linux-armv7l-gnueabihf-319.32.run
-978339ff37c3207f3a39d3952721dcdb NVIDIA-Linux-x86-319.32.run
-608767a3e1bee8a030f31cdc9251182e NVIDIA-Linux-x86_64-319.32.run
+686e8d2293a8349c1b18bff1024c12a4 NVIDIA-Linux-armv7l-gnueabihf-325.15.run
+528fc538584de6446384b9cec3099d6c NVIDIA-Linux-x86-325.15.run
+323c3ef74f607aef63d602c7f297ce86 NVIDIA-Linux-x86_64-325.15.run
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-19/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- xorg-x11-drv-nvidia.spec 21 Jul 2013 14:56:02 -0000 1.110
+++ xorg-x11-drv-nvidia.spec 29 Sep 2013 23:00:02 -0000 1.111
@@ -7,8 +7,8 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
-Version: 319.32
-Release: 7%{?dist}
+Version: 325.15
+Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -22,10 +22,12 @@
Source6: blacklist-nouveau.conf
BuildRequires: desktop-file-utils
+%if 0%{?rhel} > 6 || 0%{?fedora} >= 15
Buildrequires: systemd
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
+%endif
ExclusiveArch: i686 x86_64 armv7hl
@@ -110,11 +112,16 @@
%prep
%setup -q -c -T
+#Only extract the needed arch
+%ifarch %{ix86}
sh %{SOURCE0} --extract-only --target nvidiapkg-i686
+%endif
+%ifarch x86_64
sh %{SOURCE1} --extract-only --target nvidiapkg-x86_64
+%endif
+%ifarch armv7hl
sh %{SOURCE4} --extract-only --target nvidiapkg-armv7hl
-tar -cJf nvidia-kmod-data-%{version}.tar.xz nvidiapkg-*/LICENSE nvidiapkg-*/kernel
-
+%endif
ln -s nvidiapkg-%{_target_cpu} nvidiapkg
%build
@@ -226,16 +233,24 @@
#Install the initscript
tar jxf nvidia-persistenced-init.tar.bz2
+%if 0%{?rhel} > 6 || 0%{?fedora} >= 15
mkdir -p $RPM_BUILD_ROOT%{_unitdir}
install -pm 0644 nvidia-persistenced-init/systemd/nvidia-persistenced.service.template \
$RPM_BUILD_ROOT%{_unitdir}/nvidia-persistenced.service
#Change the daemon running owner
sed -i -e "s/__USER__/root/" $RPM_BUILD_ROOT%{_unitdir}/nvidia-persistenced.service
+%endif
#Create the default nvidia config directory
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/nvidia
+%pre
+if [ "$1" -eq "1" ]; then
+ if [ -x %{_bindir}/nvidia-uninstall ]; then
+ %{_bindir}/nvidia-uninstall -s && rm -f %{_bindir}/nvidia-uninstall &>/dev/null || :
+ fi
+fi
%post
if [ "$1" -eq "1" ]; then
@@ -259,7 +274,9 @@
&>/dev/null
done
fi
+%if 0%{?rhel} > 6 || 0%{?fedora} >= 15
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+%endif
fi || :
%triggerpostun -- xorg-x11-drv-nvidia < 1:%{version}-5
@@ -311,20 +328,24 @@
done
fi
+%if 0%{?rhel} > 6 || 0%{?fedora} >= 15
/bin/systemctl --no-reload disable nvidia-persistenced.service > /dev/null 2>&1 || :
/bin/systemctl stop nvidia-persistenced.service > /dev/null 2>&1 || :
+%endif
#Backup and disable previously used xorg.conf
[ -f %{_sysconfdir}/X11/xorg.conf ] && \
mv %{_sysconfdir}/X11/xorg.conf %{_sysconfdir}/X11/xorg.conf.%{name}_uninstalled &>/dev/null
fi ||:
+%if 0%{?rhel} > 6 || 0%{?fedora} >= 15
%postun
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
if [ $1 -ge 1 ] ; then
# Package upgrade, not uninstall
/bin/systemctl try-restart nvidia-persistenced.service >/dev/null 2>&1 || :
fi
+%endif
%postun libs -p /sbin/ldconfig
@@ -344,7 +365,9 @@
%config %{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
%config(noreplace) %{_prefix}/lib/modprobe.d/blacklist-nouveau.conf
%config(noreplace) %{_sysconfdir}/X11/nvidia-xorg.conf
+%if 0%{?rhel} > 6 || 0%{?fedora} >= 15
%{_unitdir}/nvidia-persistenced.service
+%endif
%{_bindir}/nvidia-bug-report.sh
%{_bindir}/nvidia-debugdump
%{_bindir}/nvidia-smi
@@ -393,12 +416,16 @@
%endif
%{_nvidia_libdir}/libGL.so
%{_nvidia_libdir}/libnvidia-glcore.so
+%{_nvidia_libdir}/libnvidia-ifr.so
%{_nvidia_libdir}/libnvcuvid.so
%{_nvidia_libdir}/libnvidia-ml.so
%{_nvidia_libdir}/libnvidia-opencl.so
-
+%{_nvidia_libdir}/libnvidia-vgxcfg.so
%changelog
+* Tue Aug 06 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:325.15-1
+- Update to 325.15 release
+
* Sun Jul 21 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.32-7
- Disable Obsoletes/Provides of nvidia tools until rhbz#985944
10 years, 10 months
rpms/VirtualBox-kmod/F-19 VirtualBox-kmod.spec,1.34,1.35
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7292
Modified Files:
VirtualBox-kmod.spec
Log Message:
* Sun Sep 29 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.18-2
- Build with patch Additions/linux: fix shared folders for Linux 3.11
Index: VirtualBox-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-kmod/F-19/VirtualBox-kmod.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- VirtualBox-kmod.spec 29 Sep 2013 08:45:29 -0000 1.34
+++ VirtualBox-kmod.spec 29 Sep 2013 22:06:01 -0000 1.35
@@ -3,7 +3,7 @@
# "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 current
+#global buildforkernels current
# In prerelease builds (such as betas), this package has the same
# major version number, while the kernel module abi is not guarranteed
@@ -12,7 +12,7 @@
#global prerel RC4
%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
-%global vboxrel 1
+%global vboxrel 2
%global vboxreltag %{?vboxrel:-%{vboxrel}}
# Allow only root to access vboxdrv regardless of the file mode
# use only for debugging!
@@ -20,7 +20,7 @@
Name: VirtualBox-kmod
Version: 4.2.18
-Release: 1%{?prerel:.%{prerel}}%{?dist}.1
+Release: 2%{?prerel:.%{prerel}}%{?dist}
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -98,6 +98,9 @@
%changelog
+* Sun Sep 29 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.18-2
+- Build with patch Additions/linux: fix shared folders for Linux 3.11
+
* Sun Sep 29 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 4.2.18-1.1
- Rebuilt for kernel
10 years, 10 months
rpms/nvidia-173xx-kmod/F-19 nvidia-173xx-kmod.spec, 1.66, 1.67 sources, 1.13, 1.14 fix-build-with-linux-3.11.patch, 1.1, NONE
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-173xx-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7087
Modified Files:
nvidia-173xx-kmod.spec sources
Removed Files:
fix-build-with-linux-3.11.patch
Log Message:
* Sun Sep 29 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 173.14.38-1
- Update to 173.14.38
Index: nvidia-173xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-173xx-kmod/F-19/nvidia-173xx-kmod.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- nvidia-173xx-kmod.spec 29 Sep 2013 08:45:55 -0000 1.66
+++ nvidia-173xx-kmod.spec 29 Sep 2013 22:04:41 -0000 1.67
@@ -6,9 +6,9 @@
%global buildforkernels current
Name: nvidia-173xx-kmod
-Version: 173.14.37
+Version: 173.14.38
# Taken over by kmodtool
-Release: 3%{?dist}.1
+Release: 1%{?dist}
Summary: NVIDIA 173xx display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -18,7 +18,6 @@
# http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linu...
Source0: nvidia-kmod-data-%{version}.tar.bz2
-Patch0: fix-build-with-linux-3.11.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -46,7 +45,7 @@
for arch in x86 x64
do
pushd nvidiapkg-${arch}
-%patch0 -p1
+echo "no patch to apply"
popd
done
@@ -90,6 +89,9 @@
%changelog
+* Sun Sep 29 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 173.14.38-1
+- Update to 173.14.38
+
* Sun Sep 29 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.37-3.1
- Rebuilt for kernel
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-173xx-kmod/F-19/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 5 Apr 2013 08:31:10 -0000 1.13
+++ sources 29 Sep 2013 22:04:41 -0000 1.14
@@ -1 +1 @@
-c9e980c56693ed3ab751c2a28030abae nvidia-kmod-data-173.14.37.tar.bz2
+d66940f94369cb2b87066c50865e41b5 nvidia-kmod-data-173.14.38.tar.bz2
--- fix-build-with-linux-3.11.patch DELETED ---
10 years, 10 months
rpms/xorg-x11-drv-nvidia-173xx/F-19 sources, 1.11, 1.12 xorg-x11-drv-nvidia-173xx.spec, 1.29, 1.30
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6511
Modified Files:
sources xorg-x11-drv-nvidia-173xx.spec
Log Message:
* Wed Sep 25 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 173.14.38-1
- Update to 173.14.38
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-19/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 5 Apr 2013 08:13:58 -0000 1.11
+++ sources 29 Sep 2013 21:58:08 -0000 1.12
@@ -1,2 +1,2 @@
-ca80332b4e27d21108ceab9314420b9b NVIDIA-Linux-x86-173.14.37-pkg0.run
-761fec0664e715df35cdb64cd4b087f4 NVIDIA-Linux-x86_64-173.14.37-pkg0.run
+382275cc02477291e110ba97569fec9f NVIDIA-Linux-x86-173.14.38-pkg0.run
+bcd613a3d9be3db32593ebada3066151 NVIDIA-Linux-x86_64-173.14.38-pkg0.run
Index: xorg-x11-drv-nvidia-173xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-19/xorg-x11-drv-nvidia-173xx.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- xorg-x11-drv-nvidia-173xx.spec 21 Jul 2013 12:04:09 -0000 1.29
+++ xorg-x11-drv-nvidia-173xx.spec 29 Sep 2013 21:58:08 -0000 1.30
@@ -4,8 +4,8 @@
%global __strip /bin/true
Name: xorg-x11-drv-nvidia-173xx
-Version: 173.14.37
-Release: 5%{?dist}
+Version: 173.14.38
+Release: 1%{?dist}
Summary: NVIDIA's 173xx serie proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -60,6 +60,7 @@
Conflicts: xorg-x11-drv-nvidia-71xx
Conflicts: xorg-x11-drv-nvidia-96xx
Conflicts: xorg-x11-drv-nvidia-beta
+Conflicts: xorg-x11-drv-nvidia-304xx
Conflicts: xorg-x11-drv-nvidia
Conflicts: xorg-x11-drv-fglrx
Obsoletes: nvidia-173xx-kmod < %{version}
@@ -340,6 +341,9 @@
%changelog
+* Wed Sep 25 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 173.14.38-1
+- Update to 173.14.38
+
* Sun Jul 21 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.37-5
- Avoid Obsoletes until rhbz#985944
- Restore destop file
10 years, 10 months
rpms/nvidia-304xx-kmod/F-19 nvidia_304.108_linux_3.11.patch, NONE, 1.1 nvidia-304xx-kmod.spec, 1.18, 1.19 sources, 1.2, 1.3 nvidia_304.88_linux_3.11.patch, 1.1, NONE
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-304xx-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5771
Modified Files:
nvidia-304xx-kmod.spec sources
Added Files:
nvidia_304.108_linux_3.11.patch
Removed Files:
nvidia_304.88_linux_3.11.patch
Log Message:
* Sun Sep 29 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 304.108-1
- Update to 304.108
- redo kernel patch
nvidia_304.108_linux_3.11.patch:
nv-linux.h | 4 ++++
1 file changed, 4 insertions(+)
--- NEW FILE nvidia_304.108_linux_3.11.patch ---
--- a/kernel/nv-linux.h
+++ b/kernel/nv-linux.h
@@ -1028,7 +1028,11 @@ static inline int nv_execute_on_all_cpus
#endif
#if !defined(NV_VMWARE)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
+#define NV_NUM_PHYSPAGES get_num_physpages()
+#else
#define NV_NUM_PHYSPAGES num_physpages
+#endif
#define NV_GET_CURRENT_PROCESS() current->tgid
#define NV_IN_ATOMIC() in_atomic()
#define NV_LOCAL_BH_DISABLE() local_bh_disable()
Index: nvidia-304xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-304xx-kmod/F-19/nvidia-304xx-kmod.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- nvidia-304xx-kmod.spec 29 Sep 2013 08:46:03 -0000 1.18
+++ nvidia-304xx-kmod.spec 29 Sep 2013 21:47:08 -0000 1.19
@@ -6,9 +6,9 @@
%global buildforkernels current
Name: nvidia-304xx-kmod
-Version: 304.88
+Version: 304.108
# Taken over by kmodtool
-Release: 3%{?dist}.1
+Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -20,7 +20,7 @@
Source11: nvidia-304xx-kmodtool-excludekernel-filterfile
-Patch0: nvidia_304.88_linux_3.11.patch
+Patch0: nvidia_304.108_linux_3.11.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -81,6 +81,10 @@
%changelog
+* Sun Sep 29 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 304.108-1
+- Update to 304.108
+- redo kernel patch
+
* Sun Sep 29 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 304.88-3.1
- Rebuilt for kernel
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-304xx-kmod/F-19/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 19 May 2013 12:45:23 -0000 1.2
+++ sources 29 Sep 2013 21:47:08 -0000 1.3
@@ -1 +1 @@
-67d66499b3be7fa51952b2404c45df5b nvidia-kmod-data-304.88.tar.xz
+1093eb830f48faeda73a26ccee00e994 nvidia-kmod-data-304.108.tar.xz
--- nvidia_304.88_linux_3.11.patch DELETED ---
10 years, 10 months