[pipewire-codec-aptx] Update to 1.0.6
by Leigh Scott
commit d061be6d5c88bc32d2392ea8229cb06c10e73c74
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri May 17 18:18:26 2024 +0100
Update to 1.0.6
pipewire-codec-aptx.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/pipewire-codec-aptx.spec b/pipewire-codec-aptx.spec
index 591bcf8..78f43e2 100644
--- a/pipewire-codec-aptx.spec
+++ b/pipewire-codec-aptx.spec
@@ -2,7 +2,7 @@
Name: pipewire-codec-aptx
Summary: PipeWire Bluetooth aptX codec plugin
-Version: 1.0.5
+Version: 1.0.6
Release: 1%{?dist}
License: MIT
URL: https://pipewire.org/
@@ -40,6 +40,9 @@ install -pm 0755 %{_vpath_builddir}/spa/plugins/bluez5/libspa-codec-bluez5-aptx.
%{_libdir}/spa-%{spaversion}/bluez5/libspa-codec-bluez5-aptx.so
%changelog
+* Fri May 17 2024 Leigh Scott <leigh123linux(a)gmail.com> - 1.0.6-1
+- Update to 1.0.6
+
* Mon Apr 15 2024 Leigh Scott <leigh123linux(a)gmail.com> - 1.0.5-1
- Update to 1.0.5
diff --git a/sources b/sources
index b6f8a4d..2e0de73 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pipewire-1.0.5.tar.gz) = ed561154b2b5182c94142e03b1147a90a98e788cb5f455a5202ee8c79c1f41e19c2235b3e06ca7af68f2c76320f7c2f8c71db147c9f15f82bef50fccb8ef985f
+SHA512 (pipewire-1.0.6.tar.gz) = 70bec82280a99ddc014d70d825bbbbd69112b5a855f6cb19196eb2f4c52cff7f8f1a6b005a484a3a913a88ead9897745850627177f937c703f8f7272edc00ae6
4 months
[mesa-freeworld] avoid "warning: Macro expanded in comment on line 30: %{ix86}"
by Thorsten Leemhuis
commit 3ce010d1f1ebc10ea268bfaff7190ec4003d70b9
Author: Thorsten Leemhuis <linux(a)leemhuis.info>
Date: Fri May 17 18:34:09 2024 +0200
avoid "warning: Macro expanded in comment on line 30: %{ix86}"
Signed-off-by: Thorsten Leemhuis <linux(a)leemhuis.info>
mesa-freeworld.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/mesa-freeworld.spec b/mesa-freeworld.spec
index 65a4523..f07c0ed 100644
--- a/mesa-freeworld.spec
+++ b/mesa-freeworld.spec
@@ -19,7 +19,7 @@ algorithms and decoding only VC1 algorithm.
#%%global base_vulkan ,amd
%endif
-#%%ifnarch %{ix86}
+#%%ifnarch %%{ix86}
%if !0%{?rhel}
%global with_teflon 0
%endif
4 months
[mesa-freeworld] fix date in changelog
by Thorsten Leemhuis
commit 4c96967a7ed6abb545537b2c3c3b0ad94b94c49c
Author: Thorsten Leemhuis <linux(a)leemhuis.info>
Date: Fri May 17 18:33:32 2024 +0200
fix date in changelog
Signed-off-by: Thorsten Leemhuis <linux(a)leemhuis.info>
mesa-freeworld.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/mesa-freeworld.spec b/mesa-freeworld.spec
index f089f2a..65a4523 100644
--- a/mesa-freeworld.spec
+++ b/mesa-freeworld.spec
@@ -341,7 +341,7 @@ rm -fr %{buildroot}%{_libdir}/libVkLayer_MESA_device_select.so
%endif
%changelog
-* Fri May 16 2024 Thorsten Leemhuis <fedora(a)leemhuis.info> - 24.1.0~rc4-2
+* Fri May 17 2024 Thorsten Leemhuis <fedora(a)leemhuis.info> - 24.1.0~rc4-2
- disable teflon on ix86, too
* Thu May 16 2024 Thorsten Leemhuis <fedora(a)leemhuis.info> - 24.1.0~rc4-1
4 months
[mesa-freeworld] disable teflon on ix86, too
by Thorsten Leemhuis
commit ff4ea14d6ccf26821608a0386555a9782c8b57d0
Author: Thorsten Leemhuis <linux(a)leemhuis.info>
Date: Fri May 17 18:33:04 2024 +0200
disable teflon on ix86, too
Signed-off-by: Thorsten Leemhuis <linux(a)leemhuis.info>
mesa-freeworld.spec | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/mesa-freeworld.spec b/mesa-freeworld.spec
index 56ad7ee..f089f2a 100644
--- a/mesa-freeworld.spec
+++ b/mesa-freeworld.spec
@@ -19,11 +19,11 @@ algorithms and decoding only VC1 algorithm.
#%%global base_vulkan ,amd
%endif
-%ifnarch %{ix86}
+#%%ifnarch %{ix86}
%if !0%{?rhel}
%global with_teflon 0
%endif
-%endif
+#%%endif
%ifarch %{ix86} x86_64
%global with_crocus 0
@@ -71,7 +71,7 @@ Name: %{srcname}-freeworld
Summary: Mesa graphics libraries
%global ver 24.1.0-rc4
Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
-Release: 1%{?dist}
+Release: 2%{?dist}
License: MIT AND BSD-3-Clause AND SGI-B-2.0
URL: http://www.mesa3d.org
@@ -341,6 +341,9 @@ rm -fr %{buildroot}%{_libdir}/libVkLayer_MESA_device_select.so
%endif
%changelog
+* Fri May 16 2024 Thorsten Leemhuis <fedora(a)leemhuis.info> - 24.1.0~rc4-2
+- disable teflon on ix86, too
+
* Thu May 16 2024 Thorsten Leemhuis <fedora(a)leemhuis.info> - 24.1.0~rc4-1
- Update to 24.1.0-rc4
- Sync a few more bits with mesa.spec from fedora
4 months
[avidemux] Update to git snapshot
by Leigh Scott
commit 575a267da5d000c01c120b69abccf5a004c9a9a8
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri May 17 06:47:49 2024 +0100
Update to git snapshot
.gitignore | 2 +
466d7c7198e5ea02092ab37b76c832473ac540f3.patch | 38 ------
5b637ae04773b417c9e6b47ba015abf458a9c151.patch | 163 -------------------------
avidemux.spec | 94 +++++++-------
ffmpeg_buildfix.patch | 80 ------------
sources | 3 +-
6 files changed, 45 insertions(+), 335 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0e1b3b7..9a5b7a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,5 @@ avidemux_2.6.10.tar.gz
/avidemux_2.7.8.tar.gz
/avidemux_2.8.0.tar.gz
/avidemux_2.8.1.tar.gz
+/avidemux-601e92dabd4c1d2dcde639557d12cc1043e96669.tar.gz
+/avidemux_i18n-1ac2cab673c89e18c3819cca3f8749da85550d6c.tar.gz
diff --git a/avidemux.spec b/avidemux.spec
index 0e56856..28f1549 100644
--- a/avidemux.spec
+++ b/avidemux.spec
@@ -1,3 +1,11 @@
+%global commit 601e92dabd4c1d2dcde639557d12cc1043e96669
+%global commitdate 20240430
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+
+%global commit0 1ac2cab673c89e18c3819cca3f8749da85550d6c
+%global commitdate0 20240316
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+
%global _pkgbuilddir %{_builddir}/%{name}_%{version}
# Turn off the brp-python-bytecompile script as in this case the scripts are
@@ -5,29 +13,25 @@
%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
# Use old cmake macro
%global __cmake_in_source_build 1
-# Disable LTO, internal ffmpeg probably needs to be built with --enable-lto
-%global _lto_cflags %{nil}
Name: avidemux
-Version: 2.8.1
-Release: 4%{?dist}
+Version: 2.8.2
+Release: 1%{?commitdate:^git%{commitdate}.%{shortcommit}}%{?dist}
Summary: Graphical video editing and transcoding tool
License: GPLv2+
URL: http://www.avidemux.org
-Source0: http://downloads.sourceforge.net/%{name}/%{name}_%{version}.tar.gz
+Source0: https://github.com/mean00/avidemux2/archive/%{commit}/%{name}-%{commit}.t...
+#Source0: http://downloads.sourceforge.net/%%{name}/%%{name}_%%{version}.tar.gz
+Source1: https://github.com/mean00/avidemux2_i18n/archive/%{commit0}/%{name}_i18n-...
Patch0: avidemux-disable_mp4v2.patch
-Patch1: ffmpeg_buildfix.patch
-Patch2: 5b637ae04773b417c9e6b47ba015abf458a9c151.patch
-Patch3: https://github.com/mean00/avidemux2/commit/466d7c7198e5ea02092ab37b76c832...
# Don't try to build on arm, aarch64 or ppc
-ExclusiveArch: i686 x86_64
+ExclusiveArch: x86_64
# Utilities
BuildRequires: cmake gcc-c++ yasm
-%{?el7:BuildRequires: epel-rpm-macros}
BuildRequires: gettext intltool
BuildRequires: libxslt
BuildRequires: desktop-file-utils
@@ -71,9 +75,7 @@ BuildRequires: twolame-devel
BuildRequires: opus-devel
# Video Codecs
-%if 0%{?fedora} || 0%{?rhel} > 7
BuildRequires: libvpx-devel
-%endif
BuildRequires: xvidcore-devel >= 1.0.2
BuildRequires: x264-devel
BuildRequires: x265-devel
@@ -107,8 +109,8 @@ This package contains the runtime libraries for %{name}.
%package qt
Summary: Qt interface for %{name}
-BuildRequires: qt5-qtbase-devel
-BuildRequires: qt5-linguist
+BuildRequires: qt6-qtbase-devel
+BuildRequires: qt6-linguist
BuildRequires: libxslt
Provides: %{name}-gui = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
@@ -130,7 +132,8 @@ This package contains translation files for %{name}.
%prep
-%autosetup -p1 -n %{name}_%{version}
+%autosetup -p1 %{?commitdate:-n %{name}2-%{commit}}
+tar -xf %{SOURCE1} -C avidemux/qt4/i18n --strip 1
# Remove sources of bundled libraries.
rm -rf avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52 \
@@ -166,12 +169,12 @@ pushd build_avidemux_cli
make install DESTDIR=%{_pkgbuilddir}/fakeRoot
popd
-# Build QT5 gui
-mkdir build_avidemux_qt4
-pushd build_avidemux_qt4
+# Build QT6 gui
+mkdir build_avidemux_qt6
+pushd build_avidemux_qt6
%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DFAKEROOT=%{_pkgbuilddir}/fakeRoot \
- -DENABLE_QT5=TRUE \
+ -DENABLE_QT6=TRUE \
../avidemux/qt4
%cmake_build
@@ -184,7 +187,7 @@ pushd build_plugins_common
%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DFAKEROOT=%{_pkgbuilddir}/fakeRoot \
-DAVIDEMUX_SOURCE_DIR=%{_builddir}/%{name}_%{version} \
- -DENABLE_QT5=TRUE \
+ -DENABLE_QT6=TRUE \
-DPLUGIN_UI=COMMON \
-DUSE_EXTERNAL_LIBASS=TRUE \
-DUSE_EXTERNAL_LIBMAD=TRUE \
@@ -199,7 +202,7 @@ pushd build_plugins_cli
%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DFAKEROOT=%{_pkgbuilddir}/fakeRoot \
-DAVIDEMUX_SOURCE_DIR=%{_builddir}/%{name}_%{version} \
- -DENABLE_QT5=TRUE \
+ -DENABLE_QT6=TRUE \
-DPLUGIN_UI=CLI \
-DUSE_EXTERNAL_LIBASS=TRUE \
-DUSE_EXTERNAL_LIBMAD=TRUE \
@@ -208,14 +211,14 @@ pushd build_plugins_cli
%cmake_build
popd
-# Build avidemux_plugins_qt5
-mkdir build_plugins_qt5
-pushd build_plugins_qt5
+# Build avidemux_plugins_qt6
+mkdir build_plugins_qt6
+pushd build_plugins_qt6
%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DFAKEROOT=%{_pkgbuilddir}/fakeRoot \
-DAVIDEMUX_SOURCE_DIR=%{_builddir}/%{name}_%{version} \
- -DENABLE_QT5=TRUE \
-DPLUGIN_UI=QT4 \
+ -DENABLE_QT6=TRUE \
-DUSE_EXTERNAL_LIBASS=TRUE \
-DUSE_EXTERNAL_LIBMAD=TRUE \
-DUSE_EXTERNAL_LIBA52=TRUE \
@@ -226,10 +229,10 @@ popd
%install
%make_install -C build_avidemux_core
%make_install -C build_avidemux_cli
-%make_install -C build_avidemux_qt4
+%make_install -C build_avidemux_qt6
%make_install -C build_plugins_common
%make_install -C build_plugins_cli
-%make_install -C build_plugins_qt5
+%make_install -C build_plugins_qt6
# Remove useless devel files
rm -rf %{buildroot}%{_includedir}/%{name}
@@ -252,25 +255,6 @@ appstream-util validate-relax --nonet \
%ldconfig_scriptlets cli
-%if 0%{?el7}
-%post
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-/usr/bin/update-desktop-database &> /dev/null || :
-
-%postun
-if [ $1 -eq 0 ] ; then
- /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
- /bin/touch --no-create %{_datadir}/icons/%{name} &>/dev/null
- /usr/bin/gtk-update-icon-cache %{_datadir}/icons/%{name} &>/dev/null || :
-fi
-/usr/bin/update-desktop-database &> /dev/null || :
-
-%posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/%{name} &>/dev/null || :
-%endif
-
%files
%doc AUTHORS README
@@ -294,25 +278,29 @@ fi
%{_libdir}/libADM_render6_cli.so
%files qt
-%{_bindir}/avidemux3_qt5
-%{_bindir}/avidemux3_jobs_qt5
-%{_bindir}/vsProxy_gui_qt5
+%{_bindir}/avidemux3_qt6
+%{_bindir}/avidemux3_jobs_qt6
+%{_bindir}/vsProxy_gui_qt6
%{_libdir}/libADM_openGLQT*.so
%{_libdir}/libADM_UIQT*.so
-%{_libdir}/libADM_render6_QT5.so
+%{_libdir}/libADM_render6_QT6.so
%{_datadir}/applications/org.avidemux.Avidemux.desktop
%{_datadir}/metainfo/org.avidemux.Avidemux.appdata.xml
%{_datadir}/icons/hicolor/*/apps/org.avidemux.Avidemux.png
# QT plugins
-%{_libdir}/ADM_plugins6/videoEncoders/qt5/
-%{_libdir}/ADM_plugins6/videoFilters/qt5/
+%{_libdir}/ADM_plugins6/videoEncoders/qt6/
+%{_libdir}/ADM_plugins6/videoFilters/qt6/
%{_libdir}/ADM_plugins6/shaderDemo/
%files i18n
-%{_datadir}/avidemux6/qt5/i18n/
+%{_datadir}/avidemux6/qt6/i18n/
%changelog
+* Tue May 14 2024 Leigh Scott <leigh123linux(a)gmail.com> - 2.8.2-1^git20240430.601e92d
+- Update to git snapshot
+- Switch to Qt6
+
* Sat Apr 06 2024 Leigh Scott <leigh123linux(a)gmail.com> - 2.8.1-4
- Rebuild for new x265 version
diff --git a/sources b/sources
index 93df09e..c699641 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (avidemux_2.8.1.tar.gz) = c8df5c0d7f20fd9003560dee7cc0964ba810fc2786cefd525c09fd9f740339dd92a42989938ca48c16aca778ed5bd93a56572b0c6397fe04e47225cc109e7d75
+SHA512 (avidemux-601e92dabd4c1d2dcde639557d12cc1043e96669.tar.gz) = e4e0b6ab040e5c618f0447308b963823045ee2f679c87f7494769f101749fc82367e99dd833594818fa02e1261adaf8ae28dbc8777b17071bf26a68693288347
+SHA512 (avidemux_i18n-1ac2cab673c89e18c3819cca3f8749da85550d6c.tar.gz) = b7880234294baa771b637bb46bfc2886f2fad21042b34d1d618802ee93b5ca645291258bc8d0c50a9b7c56c4e5d3b8ce1bb13d68509dda16db9e124b7204511a
4 months
[mesa-freeworld] Update to 24.1.0-rc4
by Thorsten Leemhuis
commit 59917e8443e23b47a24ca020c66dcfd1f5af120a
Author: Thorsten Leemhuis <linux(a)leemhuis.info>
Date: Thu May 16 11:18:51 2024 +0200
Update to 24.1.0-rc4
Sync a few more bits with mesa.spec from fedora
Signed-off-by: Thorsten Leemhuis <linux(a)leemhuis.info>
.gitignore | 1 +
mesa-freeworld.spec | 20 ++++++++++++++++++--
sources | 2 +-
3 files changed, 20 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5566da1..63e3548 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@
/mesa-24.0.6.tar.xz
/mesa-24.1.0-rc2.tar.xz
/mesa-24.1.0-rc3.tar.xz
+/mesa-24.1.0-rc4.tar.xz
diff --git a/mesa-freeworld.spec b/mesa-freeworld.spec
index 4a59c7f..56ad7ee 100644
--- a/mesa-freeworld.spec
+++ b/mesa-freeworld.spec
@@ -19,6 +19,12 @@ algorithms and decoding only VC1 algorithm.
#%%global base_vulkan ,amd
%endif
+%ifnarch %{ix86}
+%if !0%{?rhel}
+%global with_teflon 0
+%endif
+%endif
+
%ifarch %{ix86} x86_64
%global with_crocus 0
%global with_i915 0
@@ -63,7 +69,7 @@ algorithms and decoding only VC1 algorithm.
Name: %{srcname}-freeworld
Summary: Mesa graphics libraries
-%global ver 24.1.0-rc3
+%global ver 24.1.0-rc4
Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
Release: 1%{?dist}
License: MIT AND BSD-3-Clause AND SGI-B-2.0
@@ -135,13 +141,18 @@ BuildRequires: pkgconfig(libomxil-bellagio)
BuildRequires: pkgconfig(libelf)
BuildRequires: pkgconfig(libglvnd) >= 1.3.2
BuildRequires: llvm-devel >= 7.0.0
-%ifarch %{ix86}
+%ifarch %{ix86} x86_64
BuildRequires: clang-devel
BuildRequires: bindgen
BuildRequires: pkgconfig(libclc)
BuildRequires: pkgconfig(SPIRV-Tools)
BuildRequires: pkgconfig(LLVMSPIRVLib)
%endif
+%if 0%{?with_teflon}
+BuildRequires: flatbuffers-devel
+BuildRequires: flatbuffers-compiler
+BuildRequires: xtensor-devel
+%endif
%if 0%{?with_opencl} || 0%{?with_nvk}
BuildRequires: rust-packaging
%endif
@@ -217,6 +228,7 @@ export RUSTFLAGS="%build_rustflags"
-Dgallium-va=%{?with_va:enabled}%{!?with_va:disabled} \
-Dgallium-xa=%{!?with_xa:enabled}%{?with_xa:disabled} \
-Dgallium-nine=%{!?with_nine:true}%{?with_nine:false} \
+ -Dteflon=%{!?with_teflon:true}%{?with_teflon:false} \
-Dgallium-opencl=%{!?with_opencl:icd}%{?with_opencl:disabled} \
%if 0%{?with_opencl}
-Dgallium-rusticl=true \
@@ -329,6 +341,10 @@ rm -fr %{buildroot}%{_libdir}/libVkLayer_MESA_device_select.so
%endif
%changelog
+* Thu May 16 2024 Thorsten Leemhuis <fedora(a)leemhuis.info> - 24.1.0~rc4-1
+- Update to 24.1.0-rc4
+- Sync a few more bits with mesa.spec from fedora
+
* Thu May 9 2024 Thorsten Leemhuis <fedora(a)leemhuis.info> - 24.1.0~rc3-1
- Update to 24.1.0-rc3
- Sync with_intel_vk_rt bits with mesa.spec from fedora
diff --git a/sources b/sources
index d18ff33..026055d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mesa-24.1.0-rc3.tar.xz) = d75641a023ba489b5117b369a2d9007bcf6079f31375c9aa70afd968f8acc3695468e9cf2ef1989ed28459cf245fccd60507a0e8b0931401b77a4b2b21f0fe03
+SHA512 (mesa-24.1.0-rc4.tar.xz) = 8c31ea253543b1f8d1329eef9e20243ca7d6eb8c9645960bc53314de85ea8e3255d72816faa94935ba92e4802351c9a29e221d7e72048681de0a490bf4c52119
4 months
[HandBrake] Update to version 1.7.3.
by Dominik Mierzejewski
commit ad2a0377ae315c09d41d08adaab3da4c2560b910
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Thu May 16 00:37:08 2024 +0200
Update to version 1.7.3.
Drop obsolete patches
Fix build with system FFmpeg/x265
Drop unused dependencies
Fix libxml2 cflags parsing
HandBrake-fix-cflags-parsing.patch | 18 +++++++
HandBrake-modern-c.patch | 38 --------------
HandBrake-no-contribs.patch | 65 +++++++++++++++++++++++
HandBrake-no-fdk_aac.patch | 55 +++++++++++++++-----
HandBrake-no-libtool-nasm.patch | 17 ++++++
HandBrake-no-nasm.patch | 12 -----
HandBrake-nostrip.patch | 10 ----
HandBrake-remove-ambient-viewing-support.patch | 72 ++++++++++++++++++++++++++
HandBrake.spec | 50 ++++++++----------
sources | 4 +-
10 files changed, 240 insertions(+), 101 deletions(-)
---
diff --git a/HandBrake-fix-cflags-parsing.patch b/HandBrake-fix-cflags-parsing.patch
new file mode 100644
index 0000000..7a3acb3
--- /dev/null
+++ b/HandBrake-fix-cflags-parsing.patch
@@ -0,0 +1,18 @@
+diff -up HandBrake-1.7.3/libhb/module.defs.orig HandBrake-1.7.3/libhb/module.defs
+--- HandBrake-1.7.3/libhb/module.defs.orig 2024-05-15 23:50:54.273783155 +0200
++++ HandBrake-1.7.3/libhb/module.defs 2024-05-16 00:07:33.709692520 +0200
+@@ -71,8 +71,12 @@ else
+ LIBHB.libxml2 := $(shell $(PKGCONFIG.exe) --silence-errors --cflags libxml-2.0)
+ endif
+ ifneq (,$(LIBHB.libxml2))
+- LIBHB.libxml2 := $(patsubst -I%,%,$(LIBHB.libxml2))
+- LIBHB.GCC.I += $(LIBHB.libxml2)
++ LIBHB.libxml2.I := $(filter -I%,$(LIBHB.libxml2))
++ LIBHB.libxml2.I := $(patsubst -I%,%,$(LIBHB.libxml2.I))
++ LIBHB.GCC.I += $(LIBHB.libxml2.I)
++ LIBHB.libxml2.D := $(filter -D%,$(LIBHB.libxml2))
++ LIBHB.libxml2.D := $(patsubst -D%,%,$(LIBHB.libxml2.D))
++ LIBHB.GCC.D += $(LIBHB.libxml2.D)
+ else
+ LIBHB.GCC.I += /usr/include/libxml2
+ endif
diff --git a/HandBrake-no-contribs.patch b/HandBrake-no-contribs.patch
new file mode 100644
index 0000000..83487ef
--- /dev/null
+++ b/HandBrake-no-contribs.patch
@@ -0,0 +1,65 @@
+From: Sebastian Ramacher <sramacher(a)debian.org>
+Date: Fri, 1 Dec 2023 23:22:16 +0100
+Subject: Do not use contribs
+
+---
+ gtk/meson.build | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/gtk/meson.build b/gtk/meson.build
+index 6f41201..c072f50 100644
+--- a/gtk/meson.build
++++ b/gtk/meson.build
+@@ -22,8 +22,8 @@ if hb_dir == ''
+ hb_dir = meson.current_build_dir() / '..'
+ endif
+
+-hb_libdirs = [hb_dir / 'libhb', hb_dir / 'contrib/lib'] + get_option('extra-libdirs')
+-hb_incdirs = include_directories(hb_dir / 'libhb', hb_dir / 'contrib/include')
++hb_libdirs = [hb_dir / 'libhb'] + get_option('extra-libdirs')
++hb_incdirs = include_directories(hb_dir / 'libhb')
+
+ # External dependencies (required)
+ ghb_deps = [
+@@ -33,7 +33,6 @@ ghb_deps = [
+ cc.find_library('mp3lame', dirs: hb_libdirs),
+ dependency('dvdnav'),
+ dependency('dvdread'),
+- dependency('dav1d'),
+ dependency('SvtAv1Enc'),
+ dependency('fribidi'),
+ dependency('glib-2.0', version: glib_min),
+@@ -63,7 +62,6 @@ ghb_deps = [
+ dependency('vorbisenc'),
+ dependency('vpx'),
+ dependency('x264'),
+- dependency('zimg'),
+ dependency('zlib'),
+ ]
+
+diff -up HandBrake-1.7.3/libhb/module.defs.orig HandBrake-1.7.3/libhb/module.defs
+--- HandBrake-1.7.3/libhb/module.defs.orig 2024-02-10 23:22:33.000000000 +0100
++++ HandBrake-1.7.3/libhb/module.defs 2024-05-15 23:46:57.265752588 +0200
+@@ -1,7 +1,7 @@
+ __deps__ := A52DEC BZIP2 LIBVPX SVT-AV1 FFMPEG FREETYPE LAME LIBASS LIBDCA \
+ LIBDVDREAD LIBDVDNAV LIBICONV LIBSAMPLERATE LIBTHEORA LIBVORBIS LIBOGG \
+ LIBXML2 X264 X265 ZLIB LIBBLURAY FDKAAC LIBVPL LIBGNURX JANSSON \
+- HARFBUZZ LIBOPUS LIBSPEEX LIBDAV1D LIBJPEGTURBO LIBDOVI
++ HARFBUZZ LIBOPUS LIBSPEEX LIBJPEGTURBO LIBDOVI
+
+ ifeq (,$(filter $(HOST.system),darwin cygwin mingw))
+ __deps__ += FONTCONFIG
+diff -up HandBrake-1.7.3/test/module.defs.orig HandBrake-1.7.3/test/module.defs
+--- HandBrake-1.7.3/test/module.defs.orig 2024-05-15 23:05:14.263979341 +0200
++++ HandBrake-1.7.3/test/module.defs 2024-05-15 23:47:36.829590760 +0200
+@@ -16,8 +16,8 @@ TEST.libs = $(LIBHB.a)
+ TEST.GCC.l = \
+ ass avformat avfilter avcodec avutil swresample postproc mp3lame dvdnav \
+ dvdread fribidi swscale vpx theoraenc theoradec vorbis vorbisenc ogg \
+- x264 bluray freetype xml2 bz2 z jansson harfbuzz opus speex lzma dav1d \
+- turbojpeg zimg SvtAv1Enc
++ x264 bluray freetype xml2 bz2 z jansson harfbuzz opus speex lzma \
++ turbojpeg SvtAv1Enc
+
+ ifeq (,$(filter $(HOST.system),darwin cygwin mingw))
+ TEST.GCC.l += fontconfig
diff --git a/HandBrake-no-fdk_aac.patch b/HandBrake-no-fdk_aac.patch
index b984bba..934f236 100644
--- a/HandBrake-no-fdk_aac.patch
+++ b/HandBrake-no-fdk_aac.patch
@@ -1,14 +1,45 @@
-diff -up HandBrake-1.6.0/gtk/configure.ac.fdk HandBrake-1.6.0/gtk/configure.ac
---- HandBrake-1.6.0/gtk/configure.ac.fdk 2022-12-28 09:43:46.000000000 +0100
-+++ HandBrake-1.6.0/gtk/configure.ac 2023-01-23 20:50:40.075455676 +0100
-@@ -215,10 +215,6 @@ else
- HB_LIBS="$HB_LIBS -lx264"
- fi
+diff -up HandBrake-1.7.3/gtk/meson.build.orig HandBrake-1.7.3/gtk/meson.build
+--- HandBrake-1.7.3/gtk/meson.build.orig 2024-02-10 23:22:33.000000000 +0100
++++ HandBrake-1.7.3/gtk/meson.build 2024-05-15 22:54:38.645589239 +0200
+@@ -90,10 +90,6 @@ if get_option('libdovi').enabled()
+ ghb_deps += dependency('dovi')
+ endif
--if test "x$use_fdk_aac" = "xyes" ; then
-- HB_LIBS="$HB_LIBS -lfdk-aac"
--fi
+-if get_option('fdk-aac').enabled()
+- ghb_deps += dependency('fdk-aac')
+-endif
-
- if test "x$use_x265" = "xyes" ; then
- HB_LIBS="$HB_LIBS -lx265"
- fi
+ if get_option('qsv').enabled()
+ if host_machine.system() == 'windows'
+ ghb_deps += cc.find_library('vpl', dirs: hb_libdirs)
+diff -up HandBrake-1.7.3/gtk/meson_options.txt.orig HandBrake-1.7.3/gtk/meson_options.txt
+--- HandBrake-1.7.3/gtk/meson_options.txt.orig 2024-02-10 23:22:33.000000000 +0100
++++ HandBrake-1.7.3/gtk/meson_options.txt 2024-05-15 22:54:45.430561239 +0200
+@@ -3,11 +3,6 @@ option('extra-libdirs',
+ value: [],
+ description: 'Extra directories to search for libraries')
+
+-option('fdk-aac',
+- type: 'feature',
+- value: 'disabled',
+- description: 'Enable FDK AAC encoder')
+-
+ option('flatpak',
+ type: 'boolean',
+ value: false,
+diff -up HandBrake-1.7.3/gtk/module.defs.orig HandBrake-1.7.3/gtk/module.defs
+--- HandBrake-1.7.3/gtk/module.defs.orig 2024-02-10 23:22:33.000000000 +0100
++++ HandBrake-1.7.3/gtk/module.defs 2024-05-15 22:54:53.795526719 +0200
+@@ -53,12 +53,6 @@ else
+ GTK.CONFIGURE.extra += -Dgstreamer=disabled
+ endif
+
+-ifeq (1,$(FEATURE.fdk_aac))
+- GTK.CONFIGURE.extra += -Dfdk-aac=enabled
+-else
+- GTK.CONFIGURE.extra += -Dfdk-aac=disabled
+-endif
+-
+ ifeq (1,$(FEATURE.x265))
+ GTK.CONFIGURE.extra += -Dx265=enabled
+ else
diff --git a/HandBrake-no-libtool-nasm.patch b/HandBrake-no-libtool-nasm.patch
new file mode 100644
index 0000000..09efe93
--- /dev/null
+++ b/HandBrake-no-libtool-nasm.patch
@@ -0,0 +1,17 @@
+diff -up HandBrake-1.7.3/make/configure.py.orig HandBrake-1.7.3/make/configure.py
+--- HandBrake-1.7.3/make/configure.py.orig 2024-02-10 23:22:33.000000000 +0100
++++ HandBrake-1.7.3/make/configure.py 2024-05-15 22:56:32.656118746 +0200
+@@ -1685,11 +1685,11 @@ try:
+
+ autoconf = ToolProbe( 'AUTOCONF.exe', 'autoconf', 'autoconf', abort=True, minversion=([2,71,0] if build_tuple.match('*-*-darwin*') else [2,69,0]) )
+ automake = ToolProbe( 'AUTOMAKE.exe', 'automake', 'automake', abort=True, minversion=[1,13,0] )
+- libtool = ToolProbe( 'LIBTOOL.exe', 'libtool', 'libtool', abort=True )
++ libtool = ToolProbe( 'LIBTOOL.exe', 'libtool', 'libtool', abort=False )
+ lipo = ToolProbe( 'LIPO.exe', 'lipo', 'lipo', abort=False )
+ pkgconfig = ToolProbe( 'PKGCONFIG.exe', 'pkgconfig', 'pkg-config', abort=True, minversion=[0,27,0] )
+ meson = ToolProbe( 'MESON.exe', 'meson', 'meson', abort=True, minversion=[0,51,0] )
+- nasm = ToolProbe( 'NASM.exe', 'asm', 'nasm', abort=True, minversion=[2,13,0] )
++ nasm = ToolProbe( 'NASM.exe', 'asm', 'nasm', abort=False, minversion=[2,13,0] )
+ ninja = ToolProbe( 'NINJA.exe', 'ninja', 'ninja-build', 'ninja', abort=True )
+ cargo = ToolProbe( 'CARGO.exe', 'cargo', 'cargo', abort=False )
+ cargoc = ToolProbe( 'CARGO-C.exe', 'cargo-cbuild', 'cargo-cbuild', abort=False )
diff --git a/HandBrake-remove-ambient-viewing-support.patch b/HandBrake-remove-ambient-viewing-support.patch
new file mode 100644
index 0000000..0b97d23
--- /dev/null
+++ b/HandBrake-remove-ambient-viewing-support.patch
@@ -0,0 +1,72 @@
+From: Sebastian Ramacher <sramacher(a)debian.org>
+Date: Fri, 1 Dec 2023 23:02:49 +0100
+Subject: Remove ambient viewing support
+
+Support in ffmpeg and x265 is added via contrib patches.
+---
+ libhb/encx265.c | 8 --------
+ libhb/muxavformat.c | 14 --------------
+ libhb/stream.c | 6 ------
+ 3 files changed, 28 deletions(-)
+
+diff --git a/libhb/encx265.c b/libhb/encx265.c
+index 89f996d..b5356de 100644
+--- a/libhb/encx265.c
++++ b/libhb/encx265.c
+@@ -308,14 +308,6 @@ int encx265Init(hb_work_object_t *w, hb_job_t *job)
+ param->bHighTier = 0;
+ }
+
+- if (job->ambient.ambient_illuminance.num && job->ambient.ambient_illuminance.den)
+- {
+- param->ambientIlluminance = rescale(job->ambient.ambient_illuminance, 10000);
+- param->ambientLightX = rescale(job->ambient.ambient_light_x, 50000);
+- param->ambientLightY = rescale(job->ambient.ambient_light_y, 50000);
+- param->bEmitAmbientViewingEnvironment = 1;
+- }
+-
+ if (job->chroma_location != AVCHROMA_LOC_UNSPECIFIED)
+ {
+ char chromaLocation[256];
+diff --git a/libhb/muxavformat.c b/libhb/muxavformat.c
+index 20ecda0..b79f6ae 100644
+--- a/libhb/muxavformat.c
++++ b/libhb/muxavformat.c
+@@ -586,20 +586,6 @@ static int avformatInit( hb_mux_object_t * m )
+ }
+ }
+
+- if (job->ambient.ambient_illuminance.num && job->ambient.ambient_illuminance.den)
+- {
+- AVAmbientViewingEnvironment ambient = hb_ambient_hb_to_ff(job->ambient);
+-
+- uint8_t *ambient_data = av_malloc(sizeof(AVAmbientViewingEnvironment));
+- memcpy(ambient_data, &ambient, sizeof(AVAmbientViewingEnvironment));
+-
+- av_packet_side_data_add(&track->st->codecpar->coded_side_data,
+- &track->st->codecpar->nb_coded_side_data,
+- AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT,
+- ambient_data,
+- sizeof(AVAmbientViewingEnvironment), 0);
+- }
+-
+ if (job->passthru_dynamic_hdr_metadata & DOVI)
+ {
+ if (job->dovi.dv_profile == 5 && job->mux == HB_MUX_AV_MP4)
+diff --git a/libhb/stream.c b/libhb/stream.c
+index 2359547..46ddbfd 100644
+--- a/libhb/stream.c
++++ b/libhb/stream.c
+@@ -5894,12 +5894,6 @@ static hb_title_t *ffmpeg_title_scan( hb_stream_t *stream, hb_title_t *title )
+ title->coll.max_fall = coll->MaxFALL;
+ break;
+ }
+- case AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT:
+- {
+- AVAmbientViewingEnvironment *ambient = (AVAmbientViewingEnvironment *)sd.data;
+- title->ambient = hb_ambient_ff_to_hb(*ambient);
+- break;
+- }
+ case AV_PKT_DATA_DOVI_CONF:
+ {
+ AVDOVIDecoderConfigurationRecord *dovi = (AVDOVIDecoderConfigurationRecord *)sd.data;
diff --git a/HandBrake.spec b/HandBrake.spec
index 600b1c0..ce3f454 100644
--- a/HandBrake.spec
+++ b/HandBrake.spec
@@ -1,5 +1,5 @@
-%global commit0 04413a27e6d616cddd98c2c6468aca2bf91b87b5
-%global date 20230122
+%global commit0 86156a66c0d5ccc306487c1ff961a7b2328961b3
+%global date 20240210
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
%global tag %{version}
@@ -15,8 +15,8 @@
%global desktop_id fr.handbrake.ghb
Name: HandBrake
-Version: 1.6.1
-Release: 6%{!?tag:.%{date}git%{shortcommit0}}%{?dist}
+Version: 1.7.3
+Release: 1%{!?tag:.%{date}git%{shortcommit}}%{?dist}
Summary: An open-source multiplatform video transcoder
License: GPLv2+
URL: https://handbrake.fr/
@@ -33,18 +33,21 @@ Source0: https://github.com/%{name}/%{name}/archive/%{commit0}.tar.gz#/%{
%{?_without_ffmpeg:Source10: https://libav.org/releases/libav-12.tar.gz}
-# Pass strip tool override to gtk/configure
-Patch0: %{name}-nostrip.patch
+# Fix parsing of -DFOO from pkg-config --cflags libxml-2.0
+Patch0: %{name}-fix-cflags-parsing.patch
# Don't link with libva unnecessarily
Patch1: %{name}-no-libva.patch
# Don't link with fdk_aac unnecessarily
Patch2: %{name}-no-fdk_aac.patch
-# Fix build on non-x86 (without nasm)
-Patch3: %{name}-no-nasm.patch
+# Fix build on non-x86 (without nasm) and drop libtool requirement
+Patch3: %{name}-no-libtool-nasm.patch
# Patch from Gentoo
Patch4: %{name}-x265-link.patch
-# Fix build with GCC14
-Patch5: %{name}-modern-c.patch
+# Patches from Debian
+# https://salsa.debian.org/multimedia-team/handbrake/-/raw/master/debian/pa...
+Patch5: %{name}-no-contribs.patch
+# https://salsa.debian.org/multimedia-team/handbrake/-/raw/master/debian/pa...
+Patch6: %{name}-remove-ambient-viewing-support.patch
BuildRequires: a52dec-devel >= 0.7.4
BuildRequires: cmake
@@ -69,7 +72,6 @@ BuildRequires: libappindicator-gtk3-devel
# Should be >= 0.13.2:
BuildRequires: libass-devel >= 0.13.1
BuildRequires: libbluray-devel >= 0.9.3
-BuildRequires: libdav1d-devel
BuildRequires: libdrm-devel
BuildRequires: libdvdnav-devel >= 5.0.1
BuildRequires: libdvdread-devel >= 5.0.0
@@ -84,7 +86,6 @@ BuildRequires: libnotify-devel
BuildRequires: librsvg2-devel
BuildRequires: libsamplerate-devel
BuildRequires: libtheora-devel
-BuildRequires: libtool
BuildRequires: libvorbis-devel
# Should be >= 1.5:
BuildRequires: libvpx-devel >= 1.3
@@ -102,7 +103,6 @@ BuildRequires: svt-av1-devel
BuildRequires: x264-devel >= 0.148
BuildRequires: x265-devel >= 1.9
BuildRequires: xz-devel
-BuildRequires: zimg-devel
Requires: hicolor-icon-theme
# needed for reading encrypted DVDs
@@ -149,15 +149,13 @@ gpgv2 --keyring %{S:2} %{S:1} %{S:0}
%patch -P3 -p1
%patch -P4 -p1
%patch -P5 -p1
+%patch -P6 -p1
# Use system libraries in place of bundled ones
-for module in a52dec fdk-aac %{!?_without_ffmpeg:ffmpeg} libdav1d libdvdnav libdvdread libbluray %{?_with_vpl:libmfx libvpl} nvenc libvpx svt-av1 x265; do
+for module in a52dec fdk-aac %{!?_without_ffmpeg:ffmpeg} libdvdnav libdvdread libbluray %{?_with_vpl:libmfx libvpl} nvenc libvpx svt-av1 x265; do
sed -i -e "/MODULES += contrib\/$module/d" make/include/main.defs
done
-# Fix desktop file
-sed -i -e 's/%{desktop_id}.svg/%{desktop_id}/g' gtk/src/%{desktop_id}.desktop
-
%build
echo "HASH=%{commit0}" > version.txt
echo "SHORTHASH=%{shortcommit0}" >> version.txt
@@ -166,6 +164,7 @@ echo "DATE=$(date "+%Y-%m-%d %T" -d %{date})" >> version.txt
echo "TAG=%{tag}" >> version.txt
echo "TAG_HASH=%{commit0}" >> version.txt
%endif
+sed -i -e 's/^\(GIT_TAG\)=\(.*\)/\1=%{version}/' gtk/data/version.sh
# This makes build stop if any download is attempted
export http_proxy=http://127.0.0.1
@@ -185,7 +184,6 @@ echo "GCC.args.g.none = " >> custom.defs
--verbose \
--disable-df-fetch \
--disable-df-verify \
- --disable-gtk-update-checks \
%{?_with_asm:--enable-asm} \
--enable-x265 \
--disable-numa \
@@ -197,15 +195,6 @@ echo "GCC.args.g.none = " >> custom.defs
%install
%make_install -C build
-# Desktop file, icons and AppStream metadata from FlatPak build (more complete)
-rm -f %{buildroot}%{_datadir}/applications/ghb.desktop \
- %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/hb-icon.svg
-
-install -D -p -m 644 gtk/src/%{desktop_id}.desktop \
- %{buildroot}%{_datadir}/applications/%{desktop_id}.desktop
-install -D -p -m 644 gtk/src/%{desktop_id}.svg \
- %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{desktop_id}.svg
-
%find_lang ghb
%check
@@ -226,6 +215,13 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{desktop_id}.
%{_bindir}/HandBrakeCLI
%changelog
+* Wed May 15 2024 Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net> - 1.7.3-1
+- Update to version 1.7.3.
+- Drop obsolete patches
+- Fix build with system FFmpeg/x265
+- Drop unused dependencies
+- Fix libxml2 cflags parsing
+
* Sat Apr 06 2024 Leigh Scott <leigh123linux(a)gmail.com> - 1.6.1-6
- Rebuild for new x265 version
diff --git a/sources b/sources
index 3bcdc47..64c0173 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (HandBrake-1.6.1-source.tar.bz2) = e5cc0fee5bf063c4cdb8f64a772dac6800a7214bfdc65042c121e0e81878599fe615b499ebf6466bb78740314374ad8b8fa364fb24ff86852183e7dbbf565617
-SHA512 (HandBrake-1.6.1-source.tar.bz2.sig) = 040def2c1e23bf16d4a83e7a2cea4a37b74bf3e03cfb22d245d51c8476510ba33d1a0e967a5dba56c5222ed293f134e3fad99cc0c37d3fdbdb925aa709802986
+SHA512 (HandBrake-1.7.3-source.tar.bz2) = 2a934ef3fef5c9d3a23976c6138a35cc1a098dc20b482259788ea58c5c3a581d772fc73c3e00bb1c6b605a050cbeef44ec8df181f6e3e9503aef458df629a927
+SHA512 (HandBrake-1.7.3-source.tar.bz2.sig) = 2b2307ae83b43ea3fed806d19b0f4a53d650ea8b50cdd5c2fa918d29f756f6b955dc9f5388de2cde31c63241da1115168657d855a5dbac6f400b0b7e3896b14b
4 months
[x265] Backport a fix for crashes when encoding with variable length SEI
by Dominik Mierzejewski
commit 60b68e6291ba5cbbcef1ac092397b92e9f1fbe87
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Thu May 16 01:04:27 2024 +0200
Backport a fix for crashes when encoding with variable length SEI
This is also included in HandBrake upstream x265 fork.
https://bitbucket.org/multicoreware/x265_git/pull-requests/10
x265-sei-length-crash-fix.patch | 29 +++++++++++++++++++++++++++++
x265.spec | 7 ++++++-
2 files changed, 35 insertions(+), 1 deletion(-)
---
diff --git a/x265-sei-length-crash-fix.patch b/x265-sei-length-crash-fix.patch
new file mode 100644
index 0000000..87c6d49
--- /dev/null
+++ b/x265-sei-length-crash-fix.patch
@@ -0,0 +1,29 @@
+From 8454caf458c5f5d20cce711ff8ea8de55ec1ae50 Mon Sep 17 00:00:00 2001
+From: harlanc <hailiang8(a)staff.weibo.com>
+Date: Thu, 1 Dec 2022 07:46:13 +0000
+Subject: [PATCH] fix crash when SEI length is variable
+
+---
+ source/encoder/encoder.cpp | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp
+index 0fea6553c..5a3fcafc7 100644
+--- a/source/encoder/encoder.cpp
++++ b/source/encoder/encoder.cpp
+@@ -1103,6 +1103,12 @@ void Encoder::copyUserSEIMessages(Frame *frame, const x265_picture* pic_in)
+ input = seiMsg;
+ else
+ input = pic_in->userSEI.payloads[i];
++
++ if (frame->m_userSEI.payloads[i].payload && (frame->m_userSEI.payloads[i].payloadSize < input.payloadSize))
++ {
++ delete[] frame->m_userSEI.payloads[i].payload;
++ frame->m_userSEI.payloads[i].payload = NULL;
++ }
+
+ if (!frame->m_userSEI.payloads[i].payload)
+ frame->m_userSEI.payloads[i].payload = new uint8_t[input.payloadSize];
+--
+2.45.0
+
diff --git a/x265.spec b/x265.spec
index ad3020d..1cfa787 100644
--- a/x265.spec
+++ b/x265.spec
@@ -6,7 +6,7 @@
Summary: H.265/HEVC encoder
Name: x265
Version: 3.6
-Release: 1%{?dist}
+Release: 2%{?dist}
URL: http://x265.org/
# source/Lib/TLibCommon - BSD
# source/Lib/TLibEncoder - BSD
@@ -18,6 +18,8 @@ Source0: https://bitbucket.org/multicoreware/%{name}_git/downloads/%{name}_%{
Patch0: x265-pic.patch
Patch1: x265-high-bit-depth-soname.patch
Patch2: x265-pkgconfig_path_fix.patch
+# https://bitbucket.org/multicoreware/x265_git/pull-requests/10
+Patch3: https://bitbucket.org/harlancc/x265_git/commits/8454caf458c5f5d20cce711ff...
BuildRequires: gcc-c++
BuildRequires: git
@@ -152,6 +154,9 @@ done
%{_libdir}/pkgconfig/x265.pc
%changelog
+* Thu May 16 2024 Dominik Mierzejewski <rpm(a)greysector.net> - 3.6-2
+- Backport a fix for crashes when encoding with variable length SEI
+
* Sat Apr 06 2024 Leigh Scott <leigh123linux(a)gmail.com> - 3.6-1
- Update to 3.6
4 months