[shotcut] Update to 19.01.24
by Martin Gansser
commit 66f34e3bb6b258e835132f84f1e0e8ff7e3aa5a8
Author: Martin Gansser <mgansser(a)online.de>
Date: Fri Jan 25 09:42:15 2019 +0100
Update to 19.01.24
.gitignore | 1 +
shotcut.spec | 10 ++++++----
sources | 2 +-
3 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6cf1d66..c8c166f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
/shotcut-18.11.18.tar.gz
/shotcut-18.12.23.tar.gz
/shotcut-19.01.19.tar.gz
+/shotcut-19.01.24.tar.gz
diff --git a/shotcut.spec b/shotcut.spec
index 2c00057..80f0574 100644
--- a/shotcut.spec
+++ b/shotcut.spec
@@ -3,9 +3,8 @@
%define _vstring %(echo %{version} |tr -d ".")
Name: shotcut
-Version: 19.01.19
-#Release: 1%%{dist}
-Release: 0.1.beta1%{dist}
+Version: 19.01.24
+Release: 1%{dist}
Summary: A free, open source, cross-platform video editor
# The entire source code is GPLv3+ except mvcp/ which is LGPLv2+
License: GPLv3+ and LGPLv2+
@@ -184,7 +183,10 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/org.%{name}.S
%doc doc
%changelog
-* Mon Jan 21 2019 Martin Gansser <martinkg(a)fedoraproject.org> - 19.01.19-1
+* Fri Jan 25 2019 Martin Gansser <martinkg(a)fedoraproject.org> - 19.01.24-1
+- Update to 19.01.24
+
+* Mon Jan 21 2019 Martin Gansser <martinkg(a)fedoraproject.org> - 19.01.19-0.1.beta1
- Update to 19.01.19
* Wed Jan 02 2019 Martin Gansser <martinkg(a)fedoraproject.org> - 18.12.23-1
diff --git a/sources b/sources
index 6229e3a..b57caf1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f9639ef7c0a62b4d69d9a6347d485479 shotcut-19.01.19.tar.gz
+c9ca634e3ef9f610ff6bbbd23e6fc440 shotcut-19.01.24.tar.gz
5 years, 3 months
[clipgrab] Update to 3.8.0 Use %{qmake_qt5}
by Martin Gansser
commit 30675217fe98070bcf1b78a07d741ff0922175ce
Author: Martin Gansser <mgansser(a)online.de>
Date: Thu Jan 24 13:16:14 2019 +0100
Update to 3.8.0
Use %{qmake_qt5}
clipgrab.spec | 3 +++
1 file changed, 3 insertions(+)
---
diff --git a/clipgrab.spec b/clipgrab.spec
index 3c3a99c..237fc5f 100644
--- a/clipgrab.spec
+++ b/clipgrab.spec
@@ -7,6 +7,9 @@ Summary: A free video downloader and converter
URL: http://clipgrab.de/en
Source0: https://download.clipgrab.org/%{name}-%{version}.tar.gz
Source1: %{name}.desktop
+
+ExcludeArch: ppc64le ppc64
+
BuildRequires: ImageMagick
BuildRequires: desktop-file-utils
BuildRequires: pkgconfig(Qt5WebKit)
5 years, 3 months
[clipgrab] Update to 3.8.0 Use %{qmake_qt5}
by Martin Gansser
commit 9c898b6f45d9b49fb1bbf5cea7b7baa52f33bcc8
Author: Martin Gansser <mgansser(a)online.de>
Date: Thu Jan 24 12:29:58 2019 +0100
Update to 3.8.0
Use %{qmake_qt5}
clipgrab.spec | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
---
diff --git a/clipgrab.spec b/clipgrab.spec
index 4200dcb..3c3a99c 100644
--- a/clipgrab.spec
+++ b/clipgrab.spec
@@ -11,6 +11,7 @@ BuildRequires: ImageMagick
BuildRequires: desktop-file-utils
BuildRequires: pkgconfig(Qt5WebKit)
BuildRequires: pkgconfig(Qt5WebKitWidgets)
+BuildRequires: pkgconfig(Qt5WebEngineWidgets)
BuildRequires: pkgconfig(Qt5Xml)
Requires: hicolor-icon-theme
Requires: ffmpeg
@@ -22,8 +23,6 @@ and many other online video sites.
%prep
%setup -q
chmod 0644 *.cpp *.h icon.png COPYING README license.odt
-# Fix build with Qt 5.12: https://aur.archlinux.org/packages/clipgrab-qt5/
-sed -i 's|QtWebKit/QWebView|QtWebKitWidgets/QWebView|' mainwindow.ui
%build
%{qmake_qt5} clipgrab.pro QMAKE_CXXFLAGS="%{optflags}"
5 years, 3 months
[nvidia-390xx-kmod] Clean up build fix for 4.20 kernel (untested)
by Leigh Scott
commit c82d71d0584ff4e111bd2ce846a3653d31a2f513
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Thu Jan 24 11:12:33 2019 +0000
Clean up build fix for 4.20 kernel (untested)
4.20_kernel.patch | 6 +++---
nvidia-390xx-kmod.spec | 5 ++++-
2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/4.20_kernel.patch b/4.20_kernel.patch
index 546ea5a..a3d409b 100644
--- a/4.20_kernel.patch
+++ b/4.20_kernel.patch
@@ -12,7 +12,7 @@
struct nv_ipmi_softc
{
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0)
ipmi_user_t p_user; // ptr to ipmi_msghandler user structure
+#else
+ struct ipmi_user *p_user;
@@ -24,7 +24,7 @@
static inline int
nv_ipmi_set_my_address
(
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0)
ipmi_user_t user,
+#else
+ struct ipmi_user *user,
@@ -47,7 +47,7 @@
page_offset = vmf->pgoff - drm_vma_node_start(&gem->vma_node);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0)
ret = vm_insert_pfn(vma, address, pfn + page_offset);
+#else
+ ret = vmf_insert_pfn(vma, address, pfn + page_offset);
diff --git a/nvidia-390xx-kmod.spec b/nvidia-390xx-kmod.spec
index 74125f1..7682650 100644
--- a/nvidia-390xx-kmod.spec
+++ b/nvidia-390xx-kmod.spec
@@ -10,7 +10,7 @@ Name: nvidia-390xx-kmod
Epoch: 3
Version: 390.87
# Taken over by kmodtool
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: NVIDIA 390xx display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -75,6 +75,9 @@ done
%changelog
+* Thu Jan 24 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 3:390.87-5
+- Clean up build fix for 4.20 kernel (untested)
+
* Mon Dec 24 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:390.87-4
- Build fix for 4.20 kernel (untested)
5 years, 3 months