[obs-studio/f25] Updated to 18.0.2
by Momcilo Medic
commit d87d967d92ab16786fed91b1d2d89afffa1eeaa9
Author: Momcilo Medic <fedorauser(a)fedoraproject.org>
Date: Sat May 6 14:19:11 2017 +0200
Updated to 18.0.2
obs-studio.spec | 7 +++++--
sources | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/obs-studio.spec b/obs-studio.spec
index 1a3dfc3..0d39c74 100644
--- a/obs-studio.spec
+++ b/obs-studio.spec
@@ -1,5 +1,5 @@
Name: obs-studio
-Version: 18.0.1
+Version: 18.0.2
Release: 1%{?dist}
Summary: Open Broadcaster Software Studio
@@ -108,7 +108,7 @@ fi
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
%files
-%doc README
+%doc README.rst
%license UI/data/license/gplv2.txt
%license COPYING
%{_bindir}/obs
@@ -131,6 +131,9 @@ fi
%changelog
+* Sat May 6 2017 Momcilo Medic <fedorauser(a)fedoraproject.org> - 18.0.2-1
+- Updated to 18.0.2
+
* Wed Mar 8 2017 Momcilo Medic <fedorauser(a)fedoraproject.org> - 18.0.1-1
- Updated to 18.0.1
diff --git a/sources b/sources
index 666d5ab..d187ffc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5ba48b93cfc95955f4fcc7a391da84fe obs-studio-18.0.1.tar.gz
+e8c4e3063e0193197364eabb9b95aceb obs-studio-18.0.2.tar.gz
6 years, 12 months
[obs-studio] Updated to 18.0.2
by Momcilo Medic
commit 0ece83000dca420710a8c4c5ad0c1b269bfd00c0
Author: Momcilo Medic <fedorauser(a)fedoraproject.org>
Date: Sat May 6 14:08:18 2017 +0200
Updated to 18.0.2
obs-studio.spec | 9 ++++++---
sources | 2 +-
2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/obs-studio.spec b/obs-studio.spec
index abfe335..1cfce59 100644
--- a/obs-studio.spec
+++ b/obs-studio.spec
@@ -1,6 +1,6 @@
Name: obs-studio
-Version: 18.0.1
-Release: 3%{?dist}
+Version: 18.0.2
+Release: 1%{?dist}
Summary: Open Broadcaster Software Studio
License: GPLv2+
@@ -108,7 +108,7 @@ fi
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
%files
-%doc README
+%doc README.rst
%license UI/data/license/gplv2.txt
%license COPYING
%{_bindir}/obs
@@ -131,6 +131,9 @@ fi
%changelog
+* Sat May 6 2017 Momcilo Medic <fedorauser(a)fedoraproject.org> - 18.0.2-1
+- Updated to 18.0.2
+
* Sat Apr 29 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 18.0.1-3
- Rebuild for ffmpeg update
diff --git a/sources b/sources
index 666d5ab..d187ffc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5ba48b93cfc95955f4fcc7a391da84fe obs-studio-18.0.1.tar.gz
+e8c4e3063e0193197364eabb9b95aceb obs-studio-18.0.2.tar.gz
6 years, 12 months
[nvidia-kmod] Update to 375.66 release
by Leigh Scott
commit 9550db07576e82473a05f4d77153bf82735562af
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat May 6 00:21:51 2017 +0100
Update to 375.66 release
kernel_4.11.patch | 103 +-----------------------------------------------------
nvidia-kmod.spec | 7 ++--
2 files changed, 6 insertions(+), 104 deletions(-)
---
diff --git a/kernel_4.11.patch b/kernel_4.11.patch
index 09daf25..dd6e508 100644
--- a/kernel_4.11.patch
+++ b/kernel_4.11.patch
@@ -1,104 +1,3 @@
---- a/kernel/nvidia-drm/nvidia-drm-drv.c
-+++ b/kernel/nvidia-drm/nvidia-drm-drv.c
-@@ -48,6 +48,8 @@
- #include <drm/drm_auth.h>
- #endif
-
-+#include <linux/version.h>
-+
- static struct nvidia_drm_device *dev_list = NULL;
-
- #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
-@@ -398,7 +400,11 @@
- return 0;
- }
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
- static int nvidia_drm_unload(struct drm_device *dev)
-+#else
-+static void nvidia_drm_unload(struct drm_device *dev)
-+#endif
- {
- #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
- struct NvKmsKapiDevice *pDevice = NULL;
-@@ -412,7 +418,11 @@
-
- if (!nvidia_drm_modeset_enabled(dev))
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
- return 0;
-+#else
-+ return;
-+#endif
- }
-
- mutex_lock(&nv_dev->lock);
-@@ -445,7 +455,11 @@
-
- #endif /* NV_DRM_ATOMIC_MODESET_AVAILABLE */
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
- return 0;
-+#else
-+ return;
-+#endif
- }
-
- #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
-@@ -542,7 +556,9 @@
- void *data,
- struct drm_file *file_priv)
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)
- struct nvidia_drm_device *nv_dev = dev->dev_private;
-+#endif
- struct drm_nvidia_get_client_capability_params *params = data;
-
- switch (params->capability)
-
---- a/kernel/nvidia-drm/nvidia-drm-gem.c
-+++ b/kernel/nvidia-drm/nvidia-drm-gem.c
-@@ -31,6 +31,8 @@
-
- #include "nv-mm.h"
-
-+#include <linux/version.h>
-+
- static struct nvidia_drm_gem_object *nvidia_drm_gem_new
- (
- struct drm_file *file_priv,
-@@ -511,11 +513,19 @@
- * Note that nvidia_drm_vma_fault() can be called for different or same
- * ranges of the same drm_gem_object simultaneously.
- */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
- static int nvidia_drm_vma_fault(struct vm_area_struct *vma,
- struct vm_fault *vmf)
-+#else
-+static int nvidia_drm_vma_fault(struct vm_fault *vmf)
-+#endif
- {
- unsigned long address = nv_page_fault_va(vmf);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
- struct drm_gem_object *gem = vma->vm_private_data;
-+#else
-+ struct drm_gem_object *gem = vmf->vma->vm_private_data;
-+#endif
- struct nvidia_drm_gem_object *nv_gem =
- DRM_GEM_OBJECT_TO_NV_GEM_OBJECT(gem);
- unsigned long page_offset, pfn;
-@@ -526,7 +536,11 @@
-
- page_offset = vmf->pgoff - drm_vma_node_start(&gem->vma_node);
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
- ret = vm_insert_pfn(vma, address, pfn + page_offset);
-+#else
-+ ret = vm_insert_pfn(vmf->vma, address, pfn + page_offset);
-+#endif
-
- switch (ret) {
- case 0:
--- a/kernel/nvidia-drm/nvidia-drm-linux.c
+++ b/kernel/nvidia-drm/nvidia-drm-linux.c
@@ -20,6 +20,8 @@
@@ -110,7 +9,7 @@
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/err.h>
-@@ -185,7 +187,11 @@
+@@ -196,7 +198,11 @@
module_exit(nv_linux_drm_exit);
#if defined(MODULE_LICENSE)
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index 49ec009..fbdc943 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -7,8 +7,8 @@
%global debug_package %{nil}
Name: nvidia-kmod
-Epoch: 1
-Version: 381.09
+Epoch: 2
+Version: 375.66
# Taken over by kmodtool
Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
@@ -73,6 +73,9 @@ done
%changelog
+* Fri May 05 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2:375.66-1
+- Update to 375.66 release
+
* Fri Apr 07 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1:381.09-1
- Update to 381.09 beta
6 years, 12 months
[xorg-x11-drv-nvidia/f25: 38/38] fix merge
by Leigh Scott
commit a712b8b7c50da494f88cc03ccff47b984bff352f
Merge: be5f85f 2a6cb11
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat May 6 00:10:51 2017 +0100
fix merge
.gitignore | 9 +
60-nvidia-uvm.rules | 2 +
nvidia-uvm.conf | 11 +
nvidia-xorg.conf | 6 -
nvidia.conf | 8 +-
sources | 6 +-
xorg-x11-drv-nvidia.spec | 1769 +++++++++-------------------------------------
xorg.conf.nvidia | 9 +
8 files changed, 371 insertions(+), 1449 deletions(-)
---
6 years, 12 months
[xorg-x11-drv-nvidia/f25] (38 commits) ...fix merge
by Leigh Scott
Summary of changes:
b7a4d05... fix directory ownership (*)
33b00b1... Change buildroot macro (*)
e6640a8... reorder spec file (*)
0a0b96d... reorder spec file (*)
72120cf... RHEL 6 does not have the same read-only modprobe directory (*)
111f202... build requires libappstream-glib doesn't need a isa (*)
9380f1e... RHEL 6 desktop-file-utils commands are more limited (*)
cc30ec0... Remove prelink (*)
92cfbe9... Remove nvidia-modprobe and provide udev rules that actually (*)
878339e... Enable SLI and BaseMosaic (multimonitor on multiple cards) (*)
ecdea98... Do not install OutputClass configuration file on anything b (*)
787dd18... Remove remnants of no longer supported distributions (*)
63951fd... Make sure the license is installed in both normal driver an (*)
c363caa... Add also /dev/nvidia-uvm-tools to udev rules (*)
41adf15... Udpate changelog (*)
068012b... Remove OpenCL loader, RPM filters and ownership of loader c (*)
f1a2330... Use only newer ELF TLS implementation Supported since kerne (*)
2ba2455... Require source built libnvidia-egl-wayland library. - Libra (*)
6840e6a... Use gtk 2 nvidia-settings library only on RHEL 6 and Fedora (*)
e517d7d... Update to 378.13 release (*)
5745622... Link libGLX_indirect.so.0 to libGLX_mesa.so.0 (*)
d3cc2a6... Link libGLX_indirect.so.0 to libGLX_mesa.so.0 (*)
c15da85... Update to 381.09 beta (*)
3a0b780... Remove no longer existing conflicting packages (*)
7fc8c36... Simplify folder structure. (*)
faf0dd0... Fix RHEL 6 X and Grub configuration (*)
bda0c02... Do not create the /usr/lib64/xorg/modules/nvidia-%{version} (*)
44fc0bc... Update changelog (*)
25a738f... Also use split libglvnd packages for Fedora 24 and RHEL 6/ (*)
5a11313... Hardcode installation of the alternate-install-present file (*)
7596596... Rework (*)
b36f031... Add triggerin to update to the new cmdline with grubby (*)
eb60f4d... Update changelog (*)
3e9b6fd... Fixup symlink (*)
a8f6731... Bump nvidia egl_vendor file to 90 (*)
c608c6f... typo (*)
2a6cb11... Update to 375.66 release (*)
a712b8b... fix merge
(*) This commit already existed in another branch; no separate mail sent
6 years, 12 months
