[xorg-x11-drv-nvidia-340xx/el7: 30/30] Merge branch 'master' into el7
by Nicolas Chauvet
commit f4ea261c6c57292a3a4ed8ce2c717833aaab70c8
Merge: d41b129 4838e73
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon May 18 12:56:59 2020 +0200
Merge branch 'master' into el7
.gitignore | 21 ++++++++--
nvidia.conf | 2 +-
sources | 5 +--
xorg-x11-drv-nvidia-340xx.spec | 87 +++++++++++++++++++++++++++++++++---------
4 files changed, 89 insertions(+), 26 deletions(-)
---
4 years, 6 months
[xorg-x11-drv-nvidia-340xx/el8] clean-up comment abi-override
by Nicolas Chauvet
commit 4838e7379b68b5cfa32ab77d82b5af9a81ae6cef
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon May 18 12:51:12 2020 +0200
clean-up comment abi-override
xorg-x11-drv-nvidia-340xx.spec | 2 --
1 file changed, 2 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia-340xx.spec b/xorg-x11-drv-nvidia-340xx.spec
index 64857cf..3ce7d42 100644
--- a/xorg-x11-drv-nvidia-340xx.spec
+++ b/xorg-x11-drv-nvidia-340xx.spec
@@ -408,8 +408,6 @@ fi ||:
%ghost %{_sysconfdir}/X11/xorg.conf.d/nvidia.conf
%config %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
%config %{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf
-# Comment Xorg abi override
-#config %{_sysconfdir}/X11/xorg.conf.d/00-ignoreabi.conf
%config(noreplace) %{_prefix}/lib/modprobe.d/blacklist-nouveau.conf
%config(noreplace) %{_sysconfdir}/X11/nvidia-xorg.conf
%config %{_sysconfdir}/xdg/autostart/nvidia-settings.desktop
4 years, 6 months
[xorg-x11-drv-nvidia-340xx] fixup howto
by Nicolas Chauvet
commit 39b908c36fba80b8508ccff1af5ea45489fcd2bb
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon May 18 12:47:37 2020 +0200
fixup howto
xorg-x11-drv-nvidia-340xx.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/xorg-x11-drv-nvidia-340xx.spec b/xorg-x11-drv-nvidia-340xx.spec
index d6c723c..425fb8d 100644
--- a/xorg-x11-drv-nvidia-340xx.spec
+++ b/xorg-x11-drv-nvidia-340xx.spec
@@ -84,7 +84,7 @@ For the full product support list, please consult the release notes
http://download.nvidia.com/XFree86/Linux-x86/%{version}/README/index.html
Please use the following documentation:
-http://rpmfusion.org/Howto/nVidia
+http://rpmfusion.org/Howto/NVIDIA
%package devel
4 years, 6 months
[xorg-x11-drv-nvidia-340xx] Fixup 340xx
by Nicolas Chauvet
commit 82c9960732ae988c8534df2f94157ba05ec9df59
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon May 18 12:45:50 2020 +0200
Fixup 340xx
nvidia.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/nvidia.conf b/nvidia.conf
index 9c5e953..c5c7413 100644
--- a/nvidia.conf
+++ b/nvidia.conf
@@ -1,4 +1,4 @@
-#This file is provided by xorg-x11-drv-nvidia
+#This file is provided by xorg-x11-drv-nvidia-340xx
#Do not edit
Section "OutputClass"
4 years, 6 months
[kdenlive] Add requires frei0r-plugins Sort requires alphabetically
by Sérgio M. Basto
commit b4f5baa5df344824779975e5cfec629ecc14bf98
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon May 18 07:54:02 2020 +0100
Add requires frei0r-plugins
Sort requires alphabetically
kdenlive.spec | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/kdenlive.spec b/kdenlive.spec
index 9dfaef9..49224d8 100644
--- a/kdenlive.spec
+++ b/kdenlive.spec
@@ -2,7 +2,7 @@
Name: kdenlive
Summary: Non-linear video editor
Version: 20.04.1
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
URL: http://www.kdenlive.org
@@ -37,6 +37,7 @@ BuildRequires: cmake(KF5Bookmarks)
BuildRequires: cmake(KF5Config)
BuildRequires: cmake(KF5ConfigWidgets)
BuildRequires: cmake(KF5CoreAddons)
+BuildRequires: cmake(KF5Declarative)
BuildRequires: cmake(KF5DocTools)
BuildRequires: cmake(KF5DBusAddons)
BuildRequires: cmake(KF5GuiAddons)
@@ -62,16 +63,15 @@ BuildRequires: pkgconfig(mlt++) >= 6.6.0
BuildRequires: pkgconfig(Qt5Concurrent)
BuildRequires: pkgconfig(Qt5DBus)
+BuildRequires: cmake(Qt5Multimedia)
BuildRequires: pkgconfig(Qt5OpenGL)
-BuildRequires: pkgconfig(Qt5Script)
-BuildRequires: pkgconfig(Qt5Svg)
BuildRequires: pkgconfig(Qt5Qml)
BuildRequires: pkgconfig(Qt5Quick)
-BuildRequires: pkgconfig(Qt5Widgets)
-BuildRequires: pkgconfig(Qt5WebKitWidgets)
BuildRequires: pkgconfig(Qt5QuickControls2)
-BuildRequires: cmake(KF5Declarative)
-BuildRequires: cmake(Qt5Multimedia)
+BuildRequires: pkgconfig(Qt5Script)
+BuildRequires: pkgconfig(Qt5Svg)
+BuildRequires: pkgconfig(Qt5WebKitWidgets)
+BuildRequires: pkgconfig(Qt5Widgets)
## workaround for missing dependency in kf5-kio, can remove
## once kf5-kio-5.24.0-2 (or newer is available)
@@ -86,6 +86,7 @@ Requires: mlt-freeworld%{?_isa} >= %{mlt_version}
Requires: mlt%{?_isa} >= %{mlt_version}
%endif
Requires: qt5-qtquickcontrols2
+Requires: frei0r-plugins
%description
Kdenlive is an intuitive and powerful multi-track video editor, including most
@@ -169,6 +170,10 @@ fi
%changelog
+* Mon May 18 2020 Sérgio Basto <sergio(a)serjux.com> - 20.04.1-3
+- Add requires frei0r-plugins
+- Sort requires alphabetically
+
* Mon May 18 2020 Sérgio Basto <sergio(a)serjux.com> - 20.04.1-2
- Add -Wno-dev
4 years, 6 months
[kdenlive] Add -Wno-dev
by Sérgio M. Basto
commit 26e7c847c195dc594b795df64d44ba198c78624b
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon May 18 06:14:13 2020 +0100
Add -Wno-dev
kdenlive.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/kdenlive.spec b/kdenlive.spec
index 4a27138..9dfaef9 100644
--- a/kdenlive.spec
+++ b/kdenlive.spec
@@ -2,7 +2,7 @@
Name: kdenlive
Summary: Non-linear video editor
Version: 20.04.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
URL: http://www.kdenlive.org
@@ -102,7 +102,7 @@ pushd %{_target_platform}
mv ../rttr-0.9.6/ rttr/
%{cmake_kf5} .. \
- -DKDE_INSTALL_USE_QT_SYS_PATHS:BOOL=ON
+ -DKDE_INSTALL_USE_QT_SYS_PATHS:BOOL=ON -Wno-dev
popd
%make_build -C %{_target_platform}
@@ -169,6 +169,9 @@ fi
%changelog
+* Mon May 18 2020 Sérgio Basto <sergio(a)serjux.com> - 20.04.1-2
+- Add -Wno-dev
+
* Mon May 18 2020 Sérgio Basto <sergio(a)serjux.com> - 20.04.1-1
- Update kdenlive to 20.04.1
4 years, 6 months