[xorg-x11-drv-nvidia/f24: 2/2] Merge branch 'master' into f24
by Leigh Scott
commit 66298c0e4df0a3f7660abd0a5b7114334b2151bb
Merge: 27fa710 d0d08f1
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Aug 10 18:15:11 2016 +0100
Merge branch 'master' into f24
xorg-x11-drv-nvidia.spec | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
---
7 years, 10 months
[xorg-x11-drv-nvidia] Move setttings libs to libs sub-package rfbz#3998
by Leigh Scott
commit d0d08f1113f7c8e884beb01d73b94a26e6aa5d30
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Aug 10 18:13:17 2016 +0100
Move setttings libs to libs sub-package rfbz#3998
xorg-x11-drv-nvidia.spec | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 714cbb4..9ae0351 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 367.35
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -433,13 +433,6 @@ fi ||:
%{_nvidia_xorgdir}/*.so*
%{_libdir}/xorg/modules/drivers/nvidia_drv.so
%{_libdir}/xorg/modules/%{_nvidia_serie}-%{version}
-# It's time that nvidia-settings used gtk3
-%ifarch %{arm}
-%{_nvidia_libdir}/libnvidia-gtk2.so*
-%else
-%exclude %{_nvidia_libdir}/libnvidia-gtk2.so*
-%{_nvidia_libdir}/libnvidia-gtk3.so*
-%endif
#/no_multilib
%if 0%{?fedora} >= 21
%{_datadir}/X11/xorg.conf.d/nvidia.conf
@@ -466,6 +459,13 @@ fi ||:
%exclude %{_nvidia_libdir}/libnvidia-gtk*.so*
%exclude %{_nvidia_libdir}/libnvcuvid.so*
%exclude %{_nvidia_libdir}/libnvidia-encode.so*
+# It's time that nvidia-settings used gtk3
+%ifarch %{arm}
+%{_nvidia_libdir}/libnvidia-gtk2.so*
+%else
+%exclude %{_nvidia_libdir}/libnvidia-gtk2.so*
+%{_nvidia_libdir}/libnvidia-gtk3.so*
+%endif
%ifarch x86_64 i686
%if 0%{?fedora} > 18
%exclude %{_nvidia_libdir}/libOpenCL.so.*
@@ -535,6 +535,9 @@ fi ||:
%{_nvidia_libdir}/libOpenGL.so
%changelog
+* Wed Aug 10 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1:367.35-2
+- Move setttings libs to libs sub-package rfbz#3998
+
* Sun Jul 17 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1:367.35-1
- Update to 367.35
7 years, 10 months
[ffmpeg/f25] Updated to 3.1.2
by Julian Sikorski
Summary of changes:
3dd2617... Updated to 3.1.2 (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 10 months
[ffmpeg] Updated to 3.1.2
by Julian Sikorski
commit 3dd2617d060d77bc36a45b543a81b26665f1fa39
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Wed Aug 10 18:46:20 2016 +0200
Updated to 3.1.2
.gitignore | 1 +
ffmpeg.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2565935..ce82481 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
ffmpeg-2.8.7.tar.xz
/ffmpeg-3.1.1.tar.xz
+/ffmpeg-3.1.2.tar.xz
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 8da881d..c08a94f 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -12,7 +12,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg
-Version: 3.1.1
+Version: 3.1.2
Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
%if 0%{?_with_amr} || 0%{?_with_gmp}
License: GPLv3+
@@ -323,6 +323,9 @@ install -pm755 tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}
%changelog
+* Wed Aug 10 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 3.1.2-1
+- Updated to 3.1.2
+
* Wed Jul 27 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 3.1.1-1
- Updated to 3.1.1
- Dropped included patch
diff --git a/sources b/sources
index 0247300..5dc8ec8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4ba7033da5d9ac4d0391516c7e5d97e4 ffmpeg-3.1.1.tar.xz
+cf030109b066a336fc4f7d3a123abf66 ffmpeg-3.1.2.tar.xz
7 years, 10 months
[foo2zjs/f23] clean patch
by Leigh Scott
Summary of changes:
81fca62... clean patch (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 10 months
[foo2zjs/f24] clean patch
by Leigh Scott
Summary of changes:
81fca62... clean patch (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 10 months
[foo2zjs/f25] clean patch
by Leigh Scott
Summary of changes:
81fca62... clean patch (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 10 months