[shotcut] Update to 22.01.30
by Martin Gansser
commit 170bf5e45413d7ac4ac2ca53537e174814df45e6
Author: Martin Gansser <mgansser(a)online.de>
Date: Sun Feb 13 12:16:29 2022 +0100
Update to 22.01.30
shotcut.spec | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/shotcut.spec b/shotcut.spec
index 40d6e1e..1f7bee9 100644
--- a/shotcut.spec
+++ b/shotcut.spec
@@ -38,8 +38,8 @@ BuildRequires: pkgconfig(Qt5WebSockets)
BuildRequires: pkgconfig(Qt5X11Extras)
BuildRequires: pkgconfig(Qt5Xml)
BuildRequires: qt5-linguist
-BuildRequires: pkgconfig(mlt++-7) >= 7.0.0
-BuildRequires: pkgconfig(mlt-framework-7) >= 7.0.0
+BuildRequires: pkgconfig(mlt++-7) >= 7.4.0
+BuildRequires: pkgconfig(mlt-framework-7) >= 7.4.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.0.0
+Requires: mlt-freeworld >= 7.4.0
Requires: lame
Requires: ffmpeg
2 years, 11 months
[ffmpeg] Epoch the fedora ffmpeg-free packages
by Leigh Scott
commit 15e852674da008afd34e8e23d9e0ef9927bea727
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Feb 13 08:21:36 2022 +0000
Epoch the fedora ffmpeg-free packages
ffmpeg.spec | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index a17b7d4..18ef841 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -132,6 +132,8 @@ Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
Patch0: fix-vmaf-model-path.patch
Patch1: ffmpeg-support-chromium.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+# Fedora dev's decided to conflict with our package
+Provides: %{name}-free%{?_isa} = 100:%{version}-%{release}
%{?_with_cuda:BuildRequires: cuda-minimal-build-%{_cuda_version_rpm} cuda-drivers-devel}
%{?_with_cuda:%{?!_with_cuda_nvcc:BuildRequires: clang}}
%{?_with_libnpp:BuildRequires: pkgconfig(nppc-%{_cuda_version})}
@@ -239,6 +241,13 @@ and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash.
%package libs
Summary: Libraries for %{name}
%{?_with_vmaf:Recommends: vmaf-models}
+Provides: libavcodec-free%{?_isa} = 100:%{version}-%{release}
+Provides: libavfilter-free%{?_isa} = 100:%{version}-%{release}
+Provides: libavformat-free%{?_isa} = 100:%{version}-%{release}
+Provides: libavutil-free%{?_isa} = 100:%{version}-%{release}
+Provides: libpostproc-free%{?_isa} = 100:%{version}-%{release}
+Provides: libswresample-free%{?_isa} = 100:%{version}-%{release}
+Provides: libswscale-free%{?_isa} = 100:%{version}-%{release}
%description libs
FFmpeg is a complete and free Internet live audio and video
@@ -249,7 +258,8 @@ This package contains the libraries for %{name}
%package -n libavdevice%{?flavor}
Summary: Special devices muxing/demuxing library
-Requires: %{name}-libs%{_isa} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Provides: libavdevice-free%{?_isa} = 100:%{version}-%{release}
%description -n libavdevice%{?flavor}
Libavdevice is a complementary library to libavf "libavformat". It provides
@@ -258,8 +268,8 @@ devices, audio capture and playback etc.
%package devel
Summary: Development package for %{name}
-Requires: %{name}-libs%{_isa} = %{version}-%{release}
-Requires: libavdevice%{?flavor}%{_isa} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: libavdevice%{?flavor}%{?_isa} = %{version}-%{release}
Requires: pkgconfig
%description devel
2 years, 11 months
[mlt-freeworld/f36] Update to 7.4.0
by Sérgio M. Basto
Summary of changes:
69f21c7... Update to 7.4.0 (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 11 months
[mlt-freeworld] Update to 7.4.0
by Sérgio M. Basto
commit 69f21c7d58cecb30fe25e299697d91165ff4f979
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Feb 13 02:07:54 2022 +0000
Update to 7.4.0
.gitignore | 1 +
mlt-freeworld.spec | 55 ++++++++++++++++++++++++------------------------------
sources | 2 +-
3 files changed, 26 insertions(+), 32 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 96d1a23..d55de74 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
/mlt-6.22.1.tar.gz
/mlt-6.24.0.tar.gz
/mlt-6.26.1.tar.gz
+/mlt-7.4.0.tar.gz
diff --git a/mlt-freeworld.spec b/mlt-freeworld.spec
index dd6bf9b..e05bd72 100644
--- a/mlt-freeworld.spec
+++ b/mlt-freeworld.spec
@@ -1,3 +1,6 @@
+# needs nonfree/ndi-sdk
+%bcond_with ndi
+
#globals for https://github.com/mltframework/mlt/commit/ea973eb65c8ca79a859028a9e00836...
%global gitdate 20171213
%global commit ea973eb65c8ca79a859028a9e008360836ca4941
@@ -7,8 +10,8 @@
%global realname mlt
Name: mlt-freeworld
-Version: 6.26.1
-Release: 4%{?dist}
+Version: 7.4.0
+Release: 1%{?dist}
Summary: Toolkit for broadcasters, video editors, media players, transcoders
# mlt/src/win32/fnmatch.{c,h} are BSD-licensed.
@@ -18,17 +21,18 @@ URL: http://www.mltframework.org/
Source0: https://github.com/mltframework/mlt/archive/v%{version}/%{realname}-%{ver...
#Patch0: https://github.com/mltframework/mlt/compare/v6.4.1...%%{commit}.diff
+BuildRequires: gcc-c++
+BuildRequires: cmake
+BuildRequires: sed
BuildRequires: frei0r-devel
BuildRequires: opencv-devel
BuildRequires: qt5-qtbase-devel
BuildRequires: qt5-qtsvg-devel
BuildRequires: qt5-qt3d-devel
BuildRequires: SDL-devel
-%if ! (0%{?rhel} >= 8)
-BuildRequires: SDL_image-devel
-%endif
BuildRequires: SDL2-devel
%if ! (0%{?rhel} >= 8)
+BuildRequires: SDL_image-devel
BuildRequires: SDL2_image-devel
%endif
BuildRequires: gtk2-devel
@@ -58,8 +62,8 @@ BuildRequires: xine-lib-devel
Requires: mlt = %{version}
%description
-MLT was packaged in Fedora proper without ffmpeg support , this package give us
-the freeworld part of the package, is just for F25+ and epel7 .
+MLT is in Fedora proper without ffmpeg support, this package give us
+the ffmpeg support.
MLT is an open source multimedia framework, designed and developed for
television broadcasting.
@@ -77,50 +81,39 @@ chmod 644 src/modules/qt/kdenlivetitle_wrapper.cpp
chmod 644 src/modules/kdenlive/filter_freeze.c
chmod -x demo/demo
-# Don't overoptimize (breaks debugging)
-sed -i -e '/fomit-frame-pointer/d' configure
-sed -i -e '/ffast-math/d' configure
-
-sed -i -e 's|qmake|qmake-qt5|' src/modules/qt/configure
-
# mlt/src/win32/fnmatch.{c,h} are BSD-licensed.
# be sure that aren't used
rm -r src/win32/
-
%build
-#export STRIP=/bin/true
-%configure \
- --enable-gpl \
- --enable-gpl3 \
- --enable-motion-est \
- --enable-vorbis \
-%ifnarch %{ix86} x86_64
- --disable-mmx \
- --disable-sse \
-%endif
- --rename-melt=%{name}-melt
-
-%make_build
+%cmake -DCMAKE_SKIP_RPATH:BOOL=ON \
+ -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON \
+ %{?with_ndi: -DMOD_NDI:BOOL=ON -DNDI_SDK_INCLUDE_PATH=%{_includedir}/ndi-sdk -DNDI_SDK_LIBRARY_PATH=%{_libdir} -DNDI_INCLUDE_DIR=%{_includedir}/ndi-sdk -DNDI_LIBRARY_DIR=%{_libdir}}
+%cmake_build
%install
-%make_install
+%cmake_install
+
# Debug before remove, list all files to check with main mlt package
# find %{buildroot} | grep -vP "mlt/avformat|libmltavformat.so"
# remove all execept avformat (ffmpeg part)
#find %{buildroot} -type f | grep -vP "mlt/avformat|libmltavformat.so" | xargs rm
-find %{buildroot} -type f -print0 | grep -vPz "mlt/avformat|libmltavformat.so" | xargs -0 rm
+find %{buildroot} -type f -print0 | grep -vPz "mlt-7/avformat|libmltavformat.so|libmltxine.so" | xargs -0 rm
find %{buildroot} -type l -delete
find %{buildroot} -type d -empty -delete
%ldconfig_scriptlets
%files
-%{_libdir}/mlt/
-%{_datadir}/mlt/
+%{_libdir}/mlt-7/libmltavformat.so
+%{_libdir}/mlt-7/libmltxine.so
+%{_datadir}/mlt-7/avformat
%changelog
+* Sun Feb 13 2022 Sérgio Basto <sergio(a)serjux.com> - 7.4.0-1
+- Update to 7.4.0
+
* Wed Feb 09 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 6.26.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
diff --git a/sources b/sources
index b287ed4..6185e9f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mlt-6.26.1.tar.gz) = 6a3ef572cddee48c3089b19b2920de84936aa913a3f35b6f06e4bece2dc7a5a168daecfbaa8111c799b5316f967c37b09d485c000a4eba69af4f7ee3dc8db9e4
+SHA512 (mlt-7.4.0.tar.gz) = e9a65e76ca0a2464fb923d19d6f21bd49f13d637b0a974eeeb1e123ab753914d742e373f9fdcfe07cdeb9f39ebd2f0dde75a7299c0b6cd4807ee48ec710b3fd4
2 years, 11 months
[chromium-freeworld] fix
by Leigh Scott
commit 10ad0df0e740171bd5c9c3df00070945b4cad19d
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Feb 12 08:03:40 2022 +0000
fix
chromium-freeworld.spec | 1 +
gcc12.patch | 10 ++++++++++
2 files changed, 11 insertions(+)
---
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index 88e6ebd..43eae22 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -178,6 +178,7 @@ Patch402: chromium-enable-widevine.patch
Patch403: chromium-manpage.patch
Patch404: chromium-md5-based-build-id.patch
Patch405: chromium-names.patch
+Patch406: gcc12.patch
Patch1406: chromium-rpm-fusion-brand.patch
%description
diff --git a/gcc12.patch b/gcc12.patch
new file mode 100644
index 0000000..8ae6664
--- /dev/null
+++ b/gcc12.patch
@@ -0,0 +1,10 @@
+--- a/base/third_party/symbolize/symbolize.cc
++++ b/base/third_party/symbolize/symbolize.cc
+@@ -57,6 +57,7 @@
+ #if defined(HAVE_SYMBOLIZE)
+
+ #include <string.h>
++#include <utility>
+
+ #include <algorithm>
+ #include <limits>
2 years, 11 months
[xorg-x11-drv-nvidia-470xx] Rebuild with target f36-nonfree-multilibs
by Sérgio M. Basto
commit d17814dcd84b87e2020b9852c86dae3d0727a6a8
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sat Feb 12 02:40:46 2022 +0000
Rebuild with target f36-nonfree-multilibs
xorg-x11-drv-nvidia-470xx.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/xorg-x11-drv-nvidia-470xx.spec b/xorg-x11-drv-nvidia-470xx.spec
index 371ad59..7dcc460 100644
--- a/xorg-x11-drv-nvidia-470xx.spec
+++ b/xorg-x11-drv-nvidia-470xx.spec
@@ -25,7 +25,7 @@
Name: xorg-x11-drv-%{_nvidia_serie}
Epoch: 3
Version: 470.103.01
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA's 470xx series proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
@@ -555,6 +555,9 @@ fi ||:
%endif
%changelog
+* Sat Feb 12 2022 Sérgio Basto <sergio(a)serjux.com> - 3:470.103.01-3
+- Rebuild with target f36-nonfree-multilibs
+
* Thu Feb 10 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 3:470.103.01-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
2 years, 11 months