[chromium-freeworld] fix missing include
by Leigh Scott
commit 8831940f25d1f4b54d607fec936ddc853d2a0eac
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Apr 8 00:55:33 2022 +0100
fix missing include
gcc12.patch | 10 ++++++++++
1 file changed, 10 insertions(+)
---
diff --git a/gcc12.patch b/gcc12.patch
index 6e33fad..2d1a449 100644
--- a/gcc12.patch
+++ b/gcc12.patch
@@ -18,3 +18,13 @@
#if defined(__ELF__) // defined by gcc
#if defined(__OpenBSD__)
+--- a/net/base/address_list.h
++++ b/net/base/address_list.h
+@@ -10,6 +10,7 @@
+ #include <string>
+ #include <utility>
+ #include <vector>
++#include <tuple>
+
+ #include "base/compiler_specific.h"
+ #include "net/base/ip_endpoint.h"
2 years, 7 months
[chromium-freeworld] Use eu-strip
by Leigh Scott
commit ec7b90c2047ad398284d3bde28c31d9d94581c6e
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Apr 7 22:36:27 2022 +0100
Use eu-strip
chromium-freeworld.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index b0b0087..a377832 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -69,7 +69,7 @@ BuildRequires: lld
BuildRequires: llvm
# Basic tools and libraries needed for building
BuildRequires: ninja-build, nodejs, bison, gperf, hwdata
-BuildRequires: libatomic, flex, perl-Switch
+BuildRequires: libatomic, flex, perl-Switch, elfutils
BuildRequires: libcap-devel, cups-devel, alsa-lib-devel
BuildRequires: mesa-libGL-devel, mesa-libEGL-devel
# Pipewire need this.
@@ -296,7 +296,7 @@ mkdir -p third_party/node/linux/node-linux-x64/bin
ln -s %{_bindir}/node third_party/node/linux/node-linux-x64/bin/node
mkdir -p buildtools/third_party/eu-strip/bin
-ln -sf %{_bindir}/strip buildtools/third_party/eu-strip/bin/eu-strip
+ln -sf %{_bindir}/eu-strip buildtools/third_party/eu-strip/bin/eu-strip
rm -f -- third_party/depot_tools/ninja
ln -s %{_bindir}/ninja third_party/depot_tools/ninja
2 years, 7 months
[qtav] Use compat-ffmpeg4 in Fedora 36+ (rfbz#6271)
by sagitter
commit 4edc1089a75558a9beaed3b075088224f82b3df8
Author: Antonio Trande <sagitter(a)fedoraproject.org>
Date: Thu Apr 7 19:04:37 2022 +0200
Use compat-ffmpeg4 in Fedora 36+ (rfbz#6271)
qtav-fix-avutil_test.patch | 12 +++++++++++
qtav.spec | 50 +++++++++++++++++++++++++++++++++++++++-------
2 files changed, 55 insertions(+), 7 deletions(-)
---
diff --git a/qtav-fix-avutil_test.patch b/qtav-fix-avutil_test.patch
new file mode 100644
index 0000000..af3a85d
--- /dev/null
+++ b/qtav-fix-avutil_test.patch
@@ -0,0 +1,12 @@
+--- a/config.tests/paths.orig.pri 2019-07-11 02:58:59.000000000 +0200
++++ b/config.tests/paths.pri 2022-04-07 16:21:56.008598885 +0200
+@@ -1,7 +1,7 @@
+ TEMPLATE = lib # can not create exe for some platforms (winrt, ios). If check header only, staticlib is fine
+ # not static lib because sometimes we need to check link flags. if qt is static build, this chek may fail. we don't test link for static build because it's impossible to add all dependencies to link flags
+-INCLUDEPATH += $$[QT_INSTALL_HEADERS]
+-LIBS += -L$$[QT_INSTALL_LIBS]
++INCLUDEPATH += $$[QT_INSTALL_HEADERS] $$/usr/include/compat-ffmpeg4
++LIBS += -L$$[QT_INSTALL_LIBS] -L$$[QT_INSTALL_LIBS]/compat-ffmpeg4
+ CONFIG -= qt app_bundle lib_bundle
+ CONFIG += console
+ *msvc*: INCLUDEPATH *= $$PWD/../src/compat/msvc
diff --git a/qtav.spec b/qtav.spec
index 11589f1..88505b2 100644
--- a/qtav.spec
+++ b/qtav.spec
@@ -1,9 +1,17 @@
%global project QtAV
%global repo %{project}
+# QTAV's builds fail with FFMpeg-5*
+# https://bugzilla.rpmfusion.org/show_bug.cgi?id=6271
+%if 0%{?fedora} > 35
+%bcond_without oldffmpeg
+%else
+%bcond_with oldffmpeg
+%endif
+
Name: qtav
Version: 1.13.0
-Release: 14%{?dist}
+Release: 15%{?dist}
Summary: A media playback framework based on Qt and FFmpeg
License: LGPLv2+ and GPLv3+ and BSD
URL: http://www.qtav.org/
@@ -16,13 +24,21 @@ Patch1: %{name}-fix_Qt515_builds.patch
# Exclude avresample library (bug #5350)
Patch2: %{name}-avoid-avresample_dependency.patch
+# Fix avutil test during configuration
+# https://bugzilla.rpmfusion.org/show_bug.cgi?id=6271
+Patch3: %{name}-fix-avutil_test.patch
+
BuildRequires: desktop-file-utils
BuildRequires: qt5-qtbase-devel
BuildRequires: qt5-qtdeclarative-devel
BuildRequires: qt5-qtquickcontrols
BuildRequires: qt5-qtsvg-devel
BuildRequires: libass-devel
+%if %{with oldffmpeg}
+BuildRequires: compat-ffmpeg4-devel
+%else
BuildRequires: ffmpeg-devel
+%endif
BuildRequires: openal-soft-devel
BuildRequires: libXv-devel
BuildRequires: libva-devel
@@ -112,7 +128,14 @@ High performance. User & developer friendly.
This package contains the QtAV based players.
%prep
-%autosetup -p1 -n %repo-%{version}
+%autosetup -n %repo-%{version} -N
+
+%patch0 -p1 -b .backup
+%patch1 -p1 -b .backup
+%patch2 -p1 -b .backup
+%if %{with oldffmpeg}
+%patch3 -p1 -b .backup
+%endif
# E: script-without-shebang /usr/share/icons/hicolor/scalable/apps/QtAV.svg
# ignore them src/QtAV.svg: SVG Scalable Vector Graphics image
@@ -131,14 +154,24 @@ mkdir -p _tmpdoc/examples
cp -pr examples/* _tmpdoc/examples
%build
-export CPATH="`pkg-config --variable=includedir libswresample`"
mkdir -p build; pushd build
+%if %{with oldffmpeg}
+export CPATH=" -I%{_includedir}/compat-ffmpeg4"
%{_qt5_qmake} \
- QMAKE_CFLAGS="${RPM_OPT_FLAGS}" \
- QMAKE_CXXFLAGS="${RPM_OPT_FLAGS}" \
- QMAKE_LFLAGS="${RPM_LD_FLAGS}" \
- QMAKE_STRIP="" \
+ QMAKE_CFLAGS="${RPM_OPT_FLAGS} -I%{_includedir}/compat-ffmpeg4" \
+ QMAKE_CXXFLAGS="${RPM_OPT_FLAGS} -I%{_includedir}/compat-ffmpeg4" \
+ QMAKE_LFLAGS="${RPM_LD_FLAGS} -L%{_libdir}/compat-ffmpeg4 -lavformat -lavcodec -lavutil -lavdevice -lavfilter -lswscale -lswresample" \
+ QMAKE_STRIP="" \
CONFIG+="no_rpath recheck config_libass_link release" ..
+%else
+export CPATH="`pkg-config --variable=includedir libswresample`"
+%{_qt5_qmake} \
+ QMAKE_CFLAGS="${RPM_OPT_FLAGS}" \
+ QMAKE_CXXFLAGS="${RPM_OPT_FLAGS}" \
+ QMAKE_LFLAGS="${RPM_LD_FLAGS}" \
+ QMAKE_STRIP="" \
+ CONFIG+="no_rpath recheck config_libass_link release" ..
+%endif
%make_build
%install
@@ -206,6 +239,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/*/apps/QtAV.svg
%changelog
+* Thu Apr 07 2022 Antonio Trande <sagitter(a)fedoraproject.org> - 1.13.0-15
+- Use compat-ffmpeg4 in Fedora 36+ (rfbz#6271)
+
* Tue Apr 05 2022 Leigh Scott <leigh123linux(a)gmail.com> - 1.13.0-14
- Rebuild for new QT5
2 years, 7 months
[mlt-freeworld] Update mlt-freeworld to 7.6.0
by Sérgio M. Basto
commit 81697a0e35ddd1c99ae54ad1f9ea50bcba3c6dea
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Apr 7 12:58:48 2022 +0100
Update mlt-freeworld to 7.6.0
.gitignore | 1 +
mlt-freeworld.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d55de74..ecfd7a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
/mlt-6.24.0.tar.gz
/mlt-6.26.1.tar.gz
/mlt-7.4.0.tar.gz
+/mlt-7.6.0.tar.gz
diff --git a/mlt-freeworld.spec b/mlt-freeworld.spec
index e05bd72..4817ca9 100644
--- a/mlt-freeworld.spec
+++ b/mlt-freeworld.spec
@@ -10,7 +10,7 @@
%global realname mlt
Name: mlt-freeworld
-Version: 7.4.0
+Version: 7.6.0
Release: 1%{?dist}
Summary: Toolkit for broadcasters, video editors, media players, transcoders
@@ -111,6 +111,9 @@ find %{buildroot} -type d -empty -delete
%{_datadir}/mlt-7/avformat
%changelog
+* Thu Apr 07 2022 Sérgio Basto <sergio(a)serjux.com> - 7.6.0-1
+- Update mlt-freeworld to 7.6.0
+
* Sun Feb 13 2022 Sérgio Basto <sergio(a)serjux.com> - 7.4.0-1
- Update to 7.4.0
diff --git a/sources b/sources
index 6185e9f..0ca9da4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mlt-7.4.0.tar.gz) = e9a65e76ca0a2464fb923d19d6f21bd49f13d637b0a974eeeb1e123ab753914d742e373f9fdcfe07cdeb9f39ebd2f0dde75a7299c0b6cd4807ee48ec710b3fd4
+SHA512 (mlt-7.6.0.tar.gz) = 203ea7184e03246a8fcf7d284c7c7b26f57ab27867e97c43d9cf26c3906f6358f361d95593aa47abe79654106b934ffe997335304df967a40742ba060d2e4f38
2 years, 7 months
[mpd] Add requires ffmpeg-libs
by Leigh Scott
commit 9e881cbb238a6e5d4739bc53d0ea5a2f38ec8978
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Apr 7 12:58:53 2022 +0100
Add requires ffmpeg-libs
mpd.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/mpd.spec b/mpd.spec
index 31eb144..396b60b 100644
--- a/mpd.spec
+++ b/mpd.spec
@@ -103,6 +103,7 @@ Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
Requires: (mpd-firewalld = %{?epoch}:%{version}-%{release} if firewalld)
+Requires: ffmpeg-libs
%description
Music Player Daemon (MPD) is a flexible, powerful, server-side application for
2 years, 7 months
[qtox/f36] Update to 1.17.6
by Leigh Scott
Summary of changes:
473f9f2... Update to 1.17.6 (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 7 months
[qtox] Update to 1.17.6
by Leigh Scott
commit 473f9f2f13a0a90ee039ef3d7f002e84f84c2713
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Apr 7 12:04:00 2022 +0100
Update to 1.17.6
.gitignore | 1 +
qtox.spec | 33 +++++++++++++--------------------
sources | 2 +-
3 files changed, 15 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 27f7caa..71e202b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/qtox-af02542.tar.gz
/qtox-a44cce6.tar.gz
/qtox-c0e9a3b.tar.gz
+/qtox-1.17.6.tar.gz
diff --git a/qtox.spec b/qtox.spec
index e1592f6..5079d4d 100644
--- a/qtox.spec
+++ b/qtox.spec
@@ -1,15 +1,6 @@
-%global commit c0e9a3b79609681e5b9f6bbf8f9a36cb1993dc5f
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global snapshotdate 20191205
-# %%global prerelease 1
-# git describe
-%global qtox_version v1.17.3-316-g12fc33ee
-
-%undefine __cmake_in_source_build
-
Name: qtox
-Version: 1.17.3
-Release: 6%{?prerelease:.%{snapshotdate}git%{shortcommit}}%{?dist}
+Version: 1.17.6
+Release: 1%{?dist}
Summary: Feature-rich Tox client
# Main program: GPLv3+
@@ -18,13 +9,13 @@ Summary: Feature-rich Tox client
# Smileys/Classic: CC-BY-SA
License: GPLv3+ and BSD and CC-BY and CC-BY-SA
URL: https://github.com/qTox/qTox/
-Source0: %{url}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
+Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
# Remove project_group tag from appdata.xml
Patch0: qTox-c0e9a3b-remove_project_group.patch
BuildRequires: gcc-c++
-BuildRequires: cmake3
+BuildRequires: cmake
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
BuildRequires: pkgconfig(Qt5)
@@ -32,7 +23,7 @@ BuildRequires: pkgconfig(Qt5Svg)
BuildRequires: kf5-sonnet-devel
BuildRequires: qtsingleapplication-qt5-devel
BuildRequires: pkgconfig(toxcore) >= 0.2.10
-BuildRequires: pkgconfig(libavcodec)
+BuildRequires: ffmpeg-devel
BuildRequires: pkgconfig(openal)
BuildRequires: pkgconfig(libqrencode)
BuildRequires: pkgconfig(sqlcipher)
@@ -48,22 +39,21 @@ BuildRequires: pkgconfig(vpx)
BuildRequires: qt5-linguist
Requires: hicolor-icon-theme
Requires: toxcore >= 0.2.10
+Requires: ffmpeg-libs
%description
qTox is a powerful Tox client that follows the Tox design
guidelines while running on all major platforms.
%prep
-%autosetup -p1 -n qTox-%{commit}
+%autosetup -p1 -n qTox-%{version}
%build
-%cmake3 -DSVGZ_ICON=OFF \
- -DGIT_DESCRIBE=%{qtox_version} \
- -DGIT_VERSION=%{commit}
-%cmake3_build
+%cmake -DSVGZ_ICON=OFF \
+%cmake_build
%install
-%cmake3_install
+%cmake_install
%check
cd %{_vpath_builddir}
@@ -80,6 +70,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/io.github
%{_datadir}/icons/hicolor/*/apps/qtox.*
%changelog
+* Thu Apr 07 2022 Leigh Scott <leigh123linux(a)gmail.com> - 1.17.6-1
+- Update to 1.17.6
+
* Wed Feb 09 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 1.17.3-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
diff --git a/sources b/sources
index 21e46d3..e0981ae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtox-c0e9a3b.tar.gz) = a591558220cf45ac480d946380e4e68cebbb4271947846161889d31ddd2acdea0282e77270b92cb28883d812934fd427ced2dca4cdb76afc05e1a352fc7b9dc6
+SHA512 (qtox-1.17.6.tar.gz) = 92047769fa7c1b1be23a236072e6a8727fc956a8959c7a1f36a616d2217f558bd435cf28acdb73dc83e52cf46772c7aa4068c589bc095d327efac5495c4b3e39
2 years, 7 months
[shotcut] Update to 22.03.30
by Martin Gansser
commit 96204eade5477f0d68e2ffa91304e2bb6433faff
Author: Martin Gansser <mgansser(a)online.de>
Date: Thu Apr 7 10:50:42 2022 +0200
Update to 22.03.30
.gitignore | 1 +
shotcut.spec | 11 +++++++----
sources | 2 +-
3 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 277f182..2efda68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,4 @@
/shotcut-21.02.27.tar.gz
/shotcut-21.03.21.tar.gz
/shotcut-22.01.30.tar.gz
+/shotcut-22.03.30.tar.gz
diff --git a/shotcut.spec b/shotcut.spec
index 1f7bee9..2990981 100644
--- a/shotcut.spec
+++ b/shotcut.spec
@@ -3,7 +3,7 @@
%define _vstring %(echo %{version} |tr -d ".")
Name: shotcut
-Version: 22.01.30
+Version: 22.03.30
Release: 1%{dist}
#Release: 0.1.beta1%%{dist}
Summary: A free, open source, cross-platform video editor
@@ -38,8 +38,8 @@ BuildRequires: pkgconfig(Qt5WebSockets)
BuildRequires: pkgconfig(Qt5X11Extras)
BuildRequires: pkgconfig(Qt5Xml)
BuildRequires: qt5-linguist
-BuildRequires: pkgconfig(mlt++-7) >= 7.4.0
-BuildRequires: pkgconfig(mlt-framework-7) >= 7.4.0
+BuildRequires: pkgconfig(mlt++-7) >= 7.6.0
+BuildRequires: pkgconfig(mlt-framework-7) >= 7.6.0
BuildRequires: x264-devel
BuildRequires: webvfx-devel
@@ -50,7 +50,7 @@ Requires: qt5-qtmultimedia
Requires: gstreamer1-plugins-bad-free-extras
Requires: frei0r-plugins
Requires: ladspa
-Requires: mlt-freeworld >= 7.4.0
+Requires: mlt-freeworld >= 7.6.0
Requires: lame
Requires: ffmpeg
@@ -189,6 +189,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/org.%{name}.S
%doc doc
%changelog
+* Thu Mar 31 2022 Martin Gansser <martinkg(a)fedoraproject.org> - 22.03.30-1
+- Update to 22.03.30
+
* Wed Feb 09 2022 Martin Gansser <martinkg(a)fedoraproject.org> - 22.01.30-1
- Update to 22.01.30
diff --git a/sources b/sources
index d187df9..082614f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (shotcut-22.01.30.tar.gz) = 0fbacada0d9081ede2b71d950fa7b4307aaa38869bdeb653f2287dc3fc0b10cb007e47cd4c21fb0f3b12c87bd970dcdb972d8e6ccb5ac4eaa312dc6c621cf3d4
+SHA512 (shotcut-22.03.30.tar.gz) = 9069617f3f9d6ae20bb12371be4c37570bc5e2c2c7dacb8b2573eee4ceefe813e9fb9d5e457b390a0a1c1a135d00b79c4579c984ce0f4b6cdad0ef4e7ada1456
2 years, 7 months
