[bino] fix
by Leigh Scott
commit f687debc7ba74e152fe174aed222363666507fac
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Feb 18 12:02:58 2022 +0000
fix
bino.spec | 7 +++++++
1 file changed, 7 insertions(+)
---
diff --git a/bino.spec b/bino.spec
index 5e7033e..7312fba 100644
--- a/bino.spec
+++ b/bino.spec
@@ -15,7 +15,11 @@ Requires(preun): /sbin/install-info
Requires: hicolor-icon-theme
BuildRequires: automake
+%if 0%{?fedora} && 0%{?fedora} > 35
+BuildRequires: compat-ffmpeg4-devel
+%else
BuildRequires: ffmpeg-devel
+%endif
BuildRequires: gcc-c++
BuildRequires: glew-devel
BuildRequires: libass-devel
@@ -40,6 +44,9 @@ rm -rf pkg/macosx/*
touch pkg/macosx/Info.plist.in
%build
+%if 0%{?fedora} && 0%{?fedora} > 35
+export PKG_CONFIG_PATH="%{_libdir}/compat-ffmpeg4/pkgconfig"
+%endif
%configure --with-qt-version=5
%make_build V=1
2 years, 10 months
[xpra-codecs-freeworld/f34: 4/4] Merge branch 'master' into f34
by Sérgio M. Basto
commit 843b8f5fe415cc17bd05c98494b892f335e4838b
Merge: 1e84d7e 59d7dbd
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Fri Feb 18 00:28:18 2022 +0000
Merge branch 'master' into f34
.gitignore | 2 ++
sources | 2 +-
xpra-codecs-freeworld.spec | 11 ++++++++++-
3 files changed, 13 insertions(+), 2 deletions(-)
---
2 years, 10 months
[VirtualBox] Re-enable python on Fedora > 34
by Sérgio M. Basto
commit 7381756180ab3773fcd5e55f4dd5f04328afb14e
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Feb 17 23:45:02 2022 +0000
Re-enable python on Fedora > 34
VirtualBox.spec | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index ceb07a1..02caa32 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -35,15 +35,11 @@
# Since version 6.1.28, VBox should not have the python2 dependency
%bcond_with python2
-%if 0%{?fedora} > 34
-%bcond_with python3
-%else
%bcond_without python3
-%endif
Name: VirtualBox
Version: 6.1.32
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
License: GPLv2 or (GPLv2 and CDDL)
@@ -900,6 +896,9 @@ getent passwd vboxadd >/dev/null || \
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Thu Feb 17 2022 Sérgio Basto <sergio(a)serjux.com> - 6.1.32-4
+- Re-enable python on Fedora > 34
+
* Tue Feb 08 2022 Leigh Scott <leigh123linux(a)gmail.com> - 6.1.32-3
- Rebuild for libvpx
2 years, 10 months
[HandBrake] new upstream version (rfbz#6221)
by Dominik Mierzejewski
commit 4127daf6c4296ad9addb738962a25835c6228273
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Thu Feb 17 15:25:52 2022 +0100
new upstream version (rfbz#6221)
drop obsolete patch
keep building with libmfx
.gitignore | 2 ++
HandBrake-no-libvpl.patch | 84 +++++++++++++++++++++++++++++++++++++++++++++++
HandBrake-qsv.patch | 13 --------
HandBrake.spec | 18 ++++++----
sources | 4 +--
5 files changed, 99 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cbc2aef..cab2526 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,5 @@
/HandBrake-1.3.3-source.tar.bz2.sig
/HandBrake-1.4.2-source.tar.bz2
/HandBrake-1.4.2-source.tar.bz2.sig
+/HandBrake-1.5.1-source.tar.bz2
+/HandBrake-1.5.1-source.tar.bz2.sig
diff --git a/HandBrake-no-libvpl.patch b/HandBrake-no-libvpl.patch
new file mode 100644
index 0000000..bfe246b
--- /dev/null
+++ b/HandBrake-no-libvpl.patch
@@ -0,0 +1,84 @@
+diff -up HandBrake-1.5.1/libhb/enc_qsv.c.orig HandBrake-1.5.1/libhb/enc_qsv.c
+--- HandBrake-1.5.1/libhb/enc_qsv.c.orig 2022-01-10 20:11:37.000000000 +0100
++++ HandBrake-1.5.1/libhb/enc_qsv.c 2022-02-17 13:57:36.709960390 +0100
+@@ -41,7 +41,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE PO
+
+ #include "libavutil/hwcontext_qsv.h"
+ #include "libavutil/hwcontext.h"
+-#include "vpl/mfxvideo.h"
++#include "mfx/mfxvideo.h"
+
+ /*
+ * The frame info struct remembers information about each frame across calls to
+diff -up HandBrake-1.5.1/libhb/handbrake/ports.h.orig HandBrake-1.5.1/libhb/handbrake/ports.h
+--- HandBrake-1.5.1/libhb/handbrake/ports.h.orig 2022-01-10 20:11:37.000000000 +0100
++++ HandBrake-1.5.1/libhb/handbrake/ports.h 2022-02-17 13:59:03.276623855 +0100
+@@ -27,7 +27,7 @@
+ #include "handbrake/project.h"
+
+ #if HB_PROJECT_FEATURE_QSV
+-#include "vpl/mfxstructures.h"
++#include "mfx/mfxstructures.h"
+ #if defined(SYS_LINUX) || defined(SYS_FREEBSD)
+ #include <va/va_drm.h>
+ #endif
+diff -up HandBrake-1.5.1/libhb/handbrake/qsv_common.h.orig HandBrake-1.5.1/libhb/handbrake/qsv_common.h
+--- HandBrake-1.5.1/libhb/handbrake/qsv_common.h.orig 2022-01-10 20:11:37.000000000 +0100
++++ HandBrake-1.5.1/libhb/handbrake/qsv_common.h 2022-02-17 13:58:23.563319471 +0100
+@@ -23,7 +23,7 @@ void hb_qsv_force_workarounds(); // for
+ #ifdef __LIBHB__
+ // Private API
+
+-#include "vpl/mfxvideo.h"
++#include "mfx/mfxvideo.h"
+
+ #define HB_QSV_VERSION_ATLEAST(MAJOR, MINOR) \
+ (MFX_VERSION_MAJOR > (MAJOR) || \
+diff -up HandBrake-1.5.1/libhb/handbrake/qsv_libav.h.orig HandBrake-1.5.1/libhb/handbrake/qsv_libav.h
+--- HandBrake-1.5.1/libhb/handbrake/qsv_libav.h.orig 2022-01-10 20:11:37.000000000 +0100
++++ HandBrake-1.5.1/libhb/handbrake/qsv_libav.h 2022-02-17 13:57:58.188124993 +0100
+@@ -116,7 +116,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE PO
+
+ #include <stdint.h>
+ #include <string.h>
+-#include "vpl/mfxvideo.h"
++#include "mfx/mfxvideo.h"
+ #include "libavutil/mem.h"
+ #include "libavutil/time.h"
+ #include "libavcodec/avcodec.h"
+diff -up HandBrake-1.5.1/libhb/qsv_common.c.orig HandBrake-1.5.1/libhb/qsv_common.c
+--- HandBrake-1.5.1/libhb/qsv_common.c.orig 2022-01-10 20:11:37.000000000 +0100
++++ HandBrake-1.5.1/libhb/qsv_common.c 2022-02-17 13:57:20.460835853 +0100
+@@ -28,7 +28,7 @@
+ #include "libavfilter/buffersink.h"
+ #include "libavutil/hwcontext_qsv.h"
+ #include "libavutil/hwcontext.h"
+-#include "vpl/mfxadapter.h"
++#include "mfx/mfxadapter.h"
+
+ typedef struct hb_qsv_adapter_details
+ {
+diff -up HandBrake-1.5.1/gtk/configure.ac.orig HandBrake-1.5.1/gtk/configure.ac
+--- HandBrake-1.5.1/gtk/configure.ac.orig 2022-01-10 20:11:37.000000000 +0100
++++ HandBrake-1.5.1/gtk/configure.ac 2022-02-17 14:04:54.529315971 +0100
+@@ -224,7 +224,7 @@ if test "x$use_x265" = "xyes" ; then
+ fi
+
+ if test "x$use_qsv" = "xyes" ; then
+- HB_LIBS="$HB_LIBS -lvpl"
++ HB_LIBS="$HB_LIBS -lmfx"
+ fi
+
+ case $host in
+diff -up HandBrake-1.5.1/test/module.defs.orig HandBrake-1.5.1/test/module.defs
+--- HandBrake-1.5.1/test/module.defs.orig 2022-01-10 20:11:37.000000000 +0100
++++ HandBrake-1.5.1/test/module.defs 2022-02-17 14:13:07.946128348 +0100
+@@ -24,7 +24,7 @@ ifeq (,$(filter $(HOST.system),darwin cy
+ endif
+
+ ifeq (1,$(FEATURE.qsv))
+- TEST.GCC.l += vpl
++ TEST.GCC.l += mfx
+ ifneq (,$(filter $(HOST.system),linux freebsd))
+ TEST.GCC.l += va va-drm
+ endif
diff --git a/HandBrake.spec b/HandBrake.spec
index e62a644..630f1fe 100644
--- a/HandBrake.spec
+++ b/HandBrake.spec
@@ -17,8 +17,8 @@
%global desktop_id fr.handbrake.ghb
Name: HandBrake
-Version: 1.4.2
-Release: 2%{!?tag:.%{date}git%{shortcommit0}}%{?dist}
+Version: 1.5.1
+Release: 1%{!?tag:.%{date}git%{shortcommit0}}%{?dist}
Summary: An open-source multiplatform video transcoder
License: GPLv2+
URL: http://handbrake.fr/
@@ -43,8 +43,6 @@ Patch1: %{name}-no_clip_id.patch
Patch3: %{name}-nostrip.patch
# Don't link with libva unnecessarily
Patch4: %{name}-no-libva.patch
-# Fix QSV with unpatched system FFmpeg
-Patch5: %{name}-qsv.patch
# Fix build on non-x86 (without nasm)
Patch6: %{name}-no-nasm.patch
# rhel gettext is too old to support metainfo
@@ -53,6 +51,8 @@ Patch7: %{name}-no-metainfo.patch
# Patch from Gentoo
Patch8: %{name}-ffmpeg-5.0.patch
Patch9: %{name}-x265-link.patch
+# keep using MediaSDK
+Patch10: %{name}-no-libvpl.patch
BuildRequires: a52dec-devel >= 0.7.4
BuildRequires: cmake3
@@ -157,8 +157,7 @@ gpgv2 --keyring %{S:2} %{S:1} %{S:0}
%if 0%{!?_with_mfx}
%patch4 -p1
%else
-# Needs checking
-#patch5 -p1
+%patch10 -p1
%endif
%patch6 -p1
%if 0%{?rhel}
@@ -171,7 +170,7 @@ mkdir -p download
%{?_without_ffmpeg:cp -p %{SOURCE10} download}
# Use system libraries in place of bundled ones
-for module in a52dec %{?_with_fdk:fdk-aac} %{!?_without_ffmpeg:ffmpeg} libdav1d libdvdnav libdvdread libbluray %{?_with_mfx:libmfx} nvenc libvpx x265; do
+for module in a52dec %{?_with_fdk:fdk-aac} %{!?_without_ffmpeg:ffmpeg} libdav1d libdvdnav libdvdread libbluray %{?_with_mfx:libmfx libvpl} nvenc libvpx x265; do
sed -i -e "/MODULES += contrib\/$module/d" make/include/main.defs
done
@@ -268,6 +267,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_bindir}/HandBrakeCLI
%changelog
+* Thu Feb 17 2022 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> - 1.5.1-1
+- new upstream version (rfbz#6221)
+- drop obsolete patch
+- keep building with libmfx
+
* Tue Feb 08 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 1.4.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
diff --git a/sources b/sources
index 32b5ee1..26bc0fc 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (HandBrake-1.4.2-source.tar.bz2) = ba8ffe01cd813e9991716eabb2844e1ed414e3a2c547154b89588389e96846af9f2dd47f66d735101fdacd5be1928e34e4bab31e6a189779e77001ffdb0b427e
-SHA512 (HandBrake-1.4.2-source.tar.bz2.sig) = dd8ffeffdec80f38333d0d3b491c0fdb3a25b76d528ede5b882049f4e95941cbdbd2407ff0847684a8ce7b1d631021a1ffbca409f466f899d48b143829cbc122
+SHA512 (HandBrake-1.5.1-source.tar.bz2) = 63c5933f77d417a89512abd278a1d844f2b7a36ec9f8ab664c1a1348fd228ee389fc8e349b2df6cbf5d617b912d4634457ebea86490ff5ed4930f39a90dc7568
+SHA512 (HandBrake-1.5.1-source.tar.bz2.sig) = 8638f5a2a592213efaedcb76570bf960b6c01c05fc34b472685b4b8d7d067a96745c07e9fe1c01e7f20b193870d502cf2240096e49380b89606ad6c33f31c1b4
2 years, 10 months
[openshot/f36] fix
by Leigh Scott
Summary of changes:
ca97520... fix (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 10 months
[openshot] fix
by Leigh Scott
commit ca9752018fd3f31a89477a5a2154a75eebbbca75
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Feb 17 23:12:47 2022 +0000
fix
openshot.spec | 4 ++++
1 file changed, 4 insertions(+)
---
diff --git a/openshot.spec b/openshot.spec
index d2b65de..8d15b7c 100644
--- a/openshot.spec
+++ b/openshot.spec
@@ -48,7 +48,11 @@ Requires: python%{python3_pkgversion}-requests
Requires: python%{python3_pkgversion}-setuptools
Requires: python%{python3_pkgversion}-zmq
Requires: python%{python3_pkgversion}-libopenshot >= 0.2.7
+%if 0%{?fedora} && 0%{?fedora} > 35
+Requires: compat-ffmpeg4
+%else
Requires: ffmpeg-libs >= 3.4.7
+%endif
%if 0%{?fedora}
Recommends: openshot-lang
2 years, 10 months
[libopenshot/f36] fix
by Leigh Scott
Summary of changes:
eef873a... fix (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 10 months
