[vlc/el7] Add changelog
by Nicolas Chauvet
commit f7d0c2576dd1ed9fac56ddc838f43c5c55f87a7a
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Jan 24 12:05:46 2019 +0100
Add changelog
vlc.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/vlc.spec b/vlc.spec
index 46da920..b407aba 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -44,7 +44,7 @@ Summary: The cross-platform open-source multimedia framework, player and server
Epoch: 1
Name: vlc
Version: 3.0.6
-Release: 16%{?dist}
+Release: 17%{?dist}
License: GPLv2+
URL: https://www.videolan.org
Source0: %{vlc_url}/%{?!vlc_tag:%{version}/}vlc-%{version}%{?vlc_tag}.tar.xz
@@ -542,6 +542,9 @@ fi || :
%changelog
+* Thu Jan 24 2019 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3.0.6-17
+- Drop unmaintained phonon support on el7
+
* Thu Jan 17 2019 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3.0.6-16
- Update main/core packaging split
5 years, 2 months
[vlc/el7] Drop unmaintained phonon support on el7
by Nicolas Chauvet
commit 7afdde6cb72d3bc9b80c8495b07a2f0aeabe4b36
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Jan 24 12:05:12 2019 +0100
Drop unmaintained phonon support on el7
vlc.spec | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
---
diff --git a/vlc.spec b/vlc.spec
index 6927fd2..46da920 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -7,7 +7,6 @@
%global vlc_url https://download.videolan.org/pub/videolan/vlc/
%endif
%global _with_bootstrap 1
-%global _with_workaround_circle_deps 1
%if 0%{?!_without_freeworld:1}
%global _with_a52dec 1
%global _with_faad2 1
@@ -126,11 +125,6 @@ BuildRequires: libtar-devel
BuildRequires: libtheora-devel
BuildRequires: libtiger-devel
BuildRequires: libtiff-devel
-%if 0%{?fedora}
-BuildRequires: phonon-qt5-devel
-%else
-BuildRequires: phonon-devel
-%endif
BuildRequires: pkgconfig(libidn)
BuildRequires: pkgconfig(libjpeg)
BuildRequires: pkgconfig(libplacebo)
@@ -212,14 +206,14 @@ BuildRequires: raspberrypi-vc-static
BuildRequires: devtoolset-7-toolchain, devtoolset-7-libatomic-devel
%endif
-
-%{?_with_workaround_circle_deps:
-%if 0%{?fedora}
-BuildRequires: phonon-qt5-backend-gstreamer
+%if 0%{?fedora} || 0%{?rhel} >= 8
+BuildRequires: phonon-qt5-devel
+BuildRequires: phonon-qt5-backend-gstreamer
%else
-BuildRequires: phonon-backend-gstreamer
+# phonon is unmaintained on EL7
+Obsoletes: phonon-backend-vlc < 0.6.2-3
+Provides: phonon-backend-vlc = 0.6.2-3
%endif
-}
%{?_with_wayland:
# Fedora 25 Workstation default to wayland but not all
5 years, 2 months
[vlc] (2 commits) ...Add changelog
by Nicolas Chauvet
Summary of changes:
97a51e6... Drop unmaintained phonon support on el7 (*)
7965895... Add changelog (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 2 months
[vlc/f29] Add changelog
by Nicolas Chauvet
commit 796589571369b9e7ddaa6a281c4d8a42d6b1302a
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Jan 24 12:05:46 2019 +0100
Add changelog
vlc.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/vlc.spec b/vlc.spec
index 46da920..b407aba 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -44,7 +44,7 @@ Summary: The cross-platform open-source multimedia framework, player and server
Epoch: 1
Name: vlc
Version: 3.0.6
-Release: 16%{?dist}
+Release: 17%{?dist}
License: GPLv2+
URL: https://www.videolan.org
Source0: %{vlc_url}/%{?!vlc_tag:%{version}/}vlc-%{version}%{?vlc_tag}.tar.xz
@@ -542,6 +542,9 @@ fi || :
%changelog
+* Thu Jan 24 2019 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3.0.6-17
+- Drop unmaintained phonon support on el7
+
* Thu Jan 17 2019 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3.0.6-16
- Update main/core packaging split
5 years, 2 months
[vlc/f29] Drop unmaintained phonon support on el7
by Nicolas Chauvet
commit 97a51e6656bd7f8d98bc1b49e67f1f6f5eeeb4b5
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Jan 24 12:05:12 2019 +0100
Drop unmaintained phonon support on el7
vlc.spec | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
---
diff --git a/vlc.spec b/vlc.spec
index 6927fd2..46da920 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -7,7 +7,6 @@
%global vlc_url https://download.videolan.org/pub/videolan/vlc/
%endif
%global _with_bootstrap 1
-%global _with_workaround_circle_deps 1
%if 0%{?!_without_freeworld:1}
%global _with_a52dec 1
%global _with_faad2 1
@@ -126,11 +125,6 @@ BuildRequires: libtar-devel
BuildRequires: libtheora-devel
BuildRequires: libtiger-devel
BuildRequires: libtiff-devel
-%if 0%{?fedora}
-BuildRequires: phonon-qt5-devel
-%else
-BuildRequires: phonon-devel
-%endif
BuildRequires: pkgconfig(libidn)
BuildRequires: pkgconfig(libjpeg)
BuildRequires: pkgconfig(libplacebo)
@@ -212,14 +206,14 @@ BuildRequires: raspberrypi-vc-static
BuildRequires: devtoolset-7-toolchain, devtoolset-7-libatomic-devel
%endif
-
-%{?_with_workaround_circle_deps:
-%if 0%{?fedora}
-BuildRequires: phonon-qt5-backend-gstreamer
+%if 0%{?fedora} || 0%{?rhel} >= 8
+BuildRequires: phonon-qt5-devel
+BuildRequires: phonon-qt5-backend-gstreamer
%else
-BuildRequires: phonon-backend-gstreamer
+# phonon is unmaintained on EL7
+Obsoletes: phonon-backend-vlc < 0.6.2-3
+Provides: phonon-backend-vlc = 0.6.2-3
%endif
-}
%{?_with_wayland:
# Fedora 25 Workstation default to wayland but not all
5 years, 2 months
[clipgrab] Update to 3.8.0 Use %{qmake_qt5}
by Martin Gansser
commit 611d15cb45147c1070f9a393585bcf0f50c461e7
Author: Martin Gansser <mgansser(a)online.de>
Date: Thu Jan 24 11:31:27 2019 +0100
Update to 3.8.0
Use %{qmake_qt5}
.gitignore | 1 +
clipgrab.spec | 20 ++++++++++++++------
sources | 2 +-
3 files changed, 16 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5ee2ad9..48c0f26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ clipgrab-3.5.5.tar.gz
/clipgrab-3.7.0.tar.gz
/clipgrab-3.7.1.tar.gz
/clipgrab-3.7.2.tar.gz
+/clipgrab-3.8.0.tar.gz
diff --git a/clipgrab.spec b/clipgrab.spec
index cc141a9..4200dcb 100644
--- a/clipgrab.spec
+++ b/clipgrab.spec
@@ -1,5 +1,5 @@
Name: clipgrab
-Version: 3.7.2
+Version: 3.8.0
Release: 1%{?dist}
License: GPLv3 and Non-Commercial Use Only (Artwork and Trademark)
@@ -7,10 +7,12 @@ Summary: A free video downloader and converter
URL: http://clipgrab.de/en
Source0: https://download.clipgrab.org/%{name}-%{version}.tar.gz
Source1: %{name}.desktop
-
-BuildRequires: qt-devel
-BuildRequires: qt-webkit-devel
+BuildRequires: ImageMagick
BuildRequires: desktop-file-utils
+BuildRequires: pkgconfig(Qt5WebKit)
+BuildRequires: pkgconfig(Qt5WebKitWidgets)
+BuildRequires: pkgconfig(Qt5Xml)
+Requires: hicolor-icon-theme
Requires: ffmpeg
%description
@@ -20,10 +22,12 @@ 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_qt4} %{name}.pro
-%make_build
+%{qmake_qt5} clipgrab.pro QMAKE_CXXFLAGS="%{optflags}"
+%make_build
%install
install -Dm755 %{name} %{buildroot}%{_bindir}/%{name}
@@ -39,6 +43,10 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE1}
%{_datadir}/applications/clipgrab.desktop
%changelog
+* Thu Jan 24 2019 Martin Gansser <martinkg(a)fedoraproject.org> - 3.8.0-1
+- Update to 3.8.0
+- Use %%{qmake_qt5}
+
* Mon Nov 19 2018 Martin Gansser <martinkg(a)fedoraproject.org> - 3.7.1-2
- Update to 3.7.2
diff --git a/sources b/sources
index 674b0fe..ff82bc6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-703862f5c80838308a0778922114aa6c clipgrab-3.7.2.tar.gz
+6573acb32b30a5d160f296a1c06237cf clipgrab-3.8.0.tar.gz
5 years, 2 months
[ffmpeg] Update RHEL case
by Nicolas Chauvet
commit d30cc003a4a961fa8a7cad1a36d8f0540a793ebc
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Jan 24 11:02:13 2019 +0100
Update RHEL case
ffmpeg.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 6cc2c10..5d1dc9a 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -7,7 +7,7 @@
# Cuda and others are only available on some arches
%global cuda_arches x86_64
-%if 0%{?rhel}
+%if 0%{?rhel} && 0%{?rhel} < 8
%global _without_aom 1
%global _without_frei0r 1
%global _without_mfx 1
5 years, 2 months
[ffmpeg] Update changelog
by Nicolas Chauvet
commit 0772860bc34626fb6dfef8236f765ee42fe17fd9
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Jan 24 11:00:36 2019 +0100
Update changelog
ffmpeg.spec | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 032af88..6cc2c10 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -82,7 +82,7 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 4.1
-Release: 5%{?date}%{?date:git}%{?rel}%{?dist}
+Release: 6%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -420,6 +420,11 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Thu Jan 24 2019 Nicolas Chauvet <kwizart(a)gmail.com> - 4.1-6
+- Drop opencv by default
+ OpenCV 3.X has an overlinking issue - unsuitable for core libraries
+ Reported as https://github.com/opencv/opencv/issues/7001
+
* Fri Dec 21 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 4.1-5
- Add omx/omx_rpi
5 years, 2 months