* [PR PATCH] X265, ffmpeg, handbrake, libheif: update
@ 2025-01-20 21:47 1is7ac3
2025-01-20 22:07 ` [PR PATCH] [Updated] " 1is7ac3
` (18 more replies)
0 siblings, 19 replies; 20+ messages in thread
From: 1is7ac3 @ 2025-01-20 21:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1250 bytes --]
There is a new pull request by 1is7ac3 against master on the void-packages repository
https://github.com/1is7ac3/void-packages x265
https://github.com/void-linux/void-packages/pull/54056
X265, ffmpeg, handbrake, libheif: update
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (X86_64-GLIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
<!-- - armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/54056.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-x265-54056.patch --]
[-- Type: text/x-diff, Size: 22312 bytes --]
From 94c8060fd52144be735ac09225a2a1131cdfda43 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 20 Jan 2025 14:34:41 -0300
Subject: [PATCH 01/10] x265: update to 4.1.
---
common/shlibs | 2 +-
.../x265/patches/handbrake-ambientlight.patch | 115 ------------------
srcpkgs/x265/patches/x265-pic.patch | 11 --
srcpkgs/x265/template | 36 +++---
4 files changed, 19 insertions(+), 145 deletions(-)
delete mode 100644 srcpkgs/x265/patches/handbrake-ambientlight.patch
delete mode 100644 srcpkgs/x265/patches/x265-pic.patch
diff --git a/common/shlibs b/common/shlibs
index 3dcacc7de76d9d..ce1334b4ca9774 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1957,7 +1957,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
libQt5WebKit.so.5 qt5-webkit-5.6.0_1
libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.209 x265-3.6_1
+libx265.so.215 x265-4.1_1
libQt5Xdg.so.3 libqt5xdg-3.2.0_1
libQt5XdgIconLoader.so.3 libqt5xdg-3.2.0_1
libQt6Xdg.so.4 libqtxdg-4.0.0_1
diff --git a/srcpkgs/x265/patches/handbrake-ambientlight.patch b/srcpkgs/x265/patches/handbrake-ambientlight.patch
deleted file mode 100644
index ab36a9c35c9de4..00000000000000
--- a/srcpkgs/x265/patches/handbrake-ambientlight.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-diff --git a/source/common/param.cpp b/source/common/param.cpp
-index 8c32fafa2..0b56235c9 100755
---- a/source/common/param.cpp
-+++ b/source/common/param.cpp
-@@ -378,6 +378,7 @@ void x265_param_default(x265_param* param)
- param->preferredTransferCharacteristics = -1;
- param->pictureStructure = -1;
- param->bEmitCLL = 1;
-+ param->bEmitAmbientViewingEnvironment = 0;
-
- param->bEnableFrameDuplication = 0;
- param->dupThreshold = 70;
-@@ -1880,6 +1881,7 @@ int x265_check_params(x265_param* param)
- || param->bEmitIDRRecoverySEI
- || !!param->interlaceMode
- || param->preferredTransferCharacteristics > 1
-+ || param->bEmitAmbientViewingEnvironment
- || param->toneMapFile
- || param->naluFile);
-
-@@ -2766,6 +2768,10 @@ void x265_copy_params(x265_param* dst, x265_param* src)
- dst->bEmitCLL = src->bEmitCLL;
- dst->maxCLL = src->maxCLL;
- dst->maxFALL = src->maxFALL;
-+ dst->ambientIlluminance = src->ambientIlluminance;
-+ dst->ambientLightX = src->ambientLightX;
-+ dst->ambientLightY = src->ambientLightY;
-+ dst->bEmitAmbientViewingEnvironment = src->bEmitAmbientViewingEnvironment;
- dst->log2MaxPocLsb = src->log2MaxPocLsb;
- dst->bEmitVUIHRDInfo = src->bEmitVUIHRDInfo;
- dst->bEmitVUITimingInfo = src->bEmitVUITimingInfo;
-diff --git a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp
-index 5950f87e9..545283474 100644
---- a/source/encoder/encoder.cpp
-+++ b/source/encoder/encoder.cpp
-@@ -3276,6 +3276,15 @@ void Encoder::getStreamHeaders(NALList& list, Entropy& sbacCoder, Bitstream& bs)
- }
- }
-
-+ if (m_param->bEmitAmbientViewingEnvironment)
-+ {
-+ SEIAmbientViewingEnvironment ambientsei;
-+ ambientsei.ambientIlluminance = m_param->ambientIlluminance;
-+ ambientsei.ambientLightX = m_param->ambientLightX;
-+ ambientsei.ambientLightY = m_param->ambientLightY;
-+ ambientsei.writeSEImessages(bs, m_sps, NAL_UNIT_PREFIX_SEI, list, m_param->bSingleSeiNal);
-+ }
-+
- if (m_param->bEmitInfoSEI)
- {
- char *opts = x265_param2string(m_param, m_sps.conformanceWindow.rightOffset, m_sps.conformanceWindow.bottomOffset);
-diff --git a/source/encoder/sei.h b/source/encoder/sei.h
-index 03e210639..712e4efb4 100644
---- a/source/encoder/sei.h
-+++ b/source/encoder/sei.h
-@@ -242,6 +242,25 @@ public:
- }
- };
-
-+class SEIAmbientViewingEnvironment : public SEI
-+{
-+public:
-+ SEIAmbientViewingEnvironment()
-+ {
-+ m_payloadType = AMBIENT_VIEWING_ENVIRONMENT;
-+ m_payloadSize = 8;
-+ }
-+ uint32_t ambientIlluminance;
-+ uint16_t ambientLightX;
-+ uint16_t ambientLightY;
-+ void writeSEI(const SPS&)
-+ {
-+ WRITE_CODE(ambientIlluminance, 32, "ambient_illuminance");
-+ WRITE_CODE(ambientLightX, 16, "ambient_light_x");
-+ WRITE_CODE(ambientLightY, 16, "ambient_light_y");
-+ }
-+};
-+
- class SEIDecodedPictureHash : public SEI
- {
- public:
-diff --git a/source/x265.h b/source/x265.h
-index 9f3abd9d9..b6a4d3fe1 100644
---- a/source/x265.h
-+++ b/source/x265.h
-@@ -371,6 +371,7 @@ typedef enum
- MASTERING_DISPLAY_INFO = 137,
- CONTENT_LIGHT_LEVEL_INFO = 144,
- ALTERNATIVE_TRANSFER_CHARACTERISTICS = 147,
-+ AMBIENT_VIEWING_ENVIRONMENT = 148,
- } SEIPayloadType;
-
- typedef struct x265_sei_payload
-@@ -1903,6 +1904,11 @@ typedef struct x265_param
- * value to that value. */
- uint16_t maxLuma;
-
-+ /* ISO/IEC 23008-2:2017, D.2.39 ambient viewing environment SEI message */
-+ uint32_t ambientIlluminance;
-+ uint16_t ambientLightX;
-+ uint16_t ambientLightY;
-+
- /* Maximum of the picture order count */
- int log2MaxPocLsb;
-
-@@ -2114,6 +2120,9 @@ typedef struct x265_param
- /*Emit content light level info SEI*/
- int bEmitCLL;
-
-+ /* Emit ambient viewing environment SEI */
-+ int bEmitAmbientViewingEnvironment;
-+
- /*
- * Signals picture structure SEI timing message for every frame
- * picture structure 7 is signalled for frame doubling
diff --git a/srcpkgs/x265/patches/x265-pic.patch b/srcpkgs/x265/patches/x265-pic.patch
deleted file mode 100644
index 117c155e575f6b..00000000000000
--- a/srcpkgs/x265/patches/x265-pic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/source/CMakeLists.txt
-+++ b/source/CMakeLists.txt
-@@ -158,7 +162,7 @@ if(GCC)
- add_definitions(-D__STDC_LIMIT_MACROS=1)
- add_definitions(-std=gnu++98)
- if(ENABLE_PIC)
-- add_definitions(-fPIC)
-+ add_definitions(-fPIC -DPIC)
- endif(ENABLE_PIC)
- if(NATIVE_BUILD)
- if(INTEL_CXX)
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index 7991e00bac7642..a4a4b5d5a7fc33 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,6 +1,6 @@
# Template file for 'x265'
pkgname=x265
-version=3.6
+version=4.1
revision=1
build_wrksrc=source
build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://x265.org/"
distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=206329b9599c78d06969a1b7b7bb939f7c99a459ab283b2e93f76854bd34ca7b
+checksum=7d23cdcdbd510728202c0dfbf7c51eda26a395de2096c504c2b10d6035711102
build_options="altivec assembly"
@@ -19,31 +19,31 @@ desc_option_altivec="Enable AltiVec support on ppc64 (POWER8 and higher only)"
desc_option_assembly="Enable assembly support on x86/ARM"
case "$XBPS_TARGET_MACHINE" in
- ppc64le*) build_options_default="altivec" ;;
- # on ARM, enabling it currently fails with undefined reference to
- # x265::setupAssemblyPrimitives(x265::EncoderPrimitives&, int)
- x86_64*|i686*) build_options_default="assembly" ;;
- *) ;;
+ppc64le*) build_options_default="altivec" ;;
+# on ARM, enabling it currently fails with undefined reference to
+# x265::setupAssemblyPrimitives(x265::EncoderPrimitives&, int)
+x86_64* | i686*) build_options_default="assembly" ;;
+*) ;;
esac
if [ "$build_option_assembly" ]; then
case "$XBPS_TARGET_MACHINE" in
- x86_64*|i686*)
- # see https://bitbucket.org/multicoreware/x265_git/issues/559
- configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
- hostmakedepends+=" nasm"
- ;;
- *) ;;
+ x86_64* | i686*)
+ # see https://bitbucket.org/multicoreware/x265_git/issues/559
+ configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
+ hostmakedepends+=" nasm"
+ ;;
+ *) ;;
esac
fi
case "$XBPS_TARGET_MACHINE" in
- ppc64*)
- # altivec does not build without power8 being enabled
- configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF)
+ppc64*)
+ # altivec does not build without power8 being enabled
+ configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF)
-DCPU_POWER8=$(vopt_if altivec ON OFF)"
- ;;
- *) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;;
+ ;;
+*) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;;
esac
pre_configure() {
From 5a54d615e875d47894fee4935121b8801efcbf09 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 20 Jan 2025 18:35:00 -0300
Subject: [PATCH 02/10] gimp: revbump for x265-4.1.
---
srcpkgs/gimp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index a50409d5ce5af1..d6d0d3291d2f19 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
# Template file for 'gimp'
pkgname=gimp
version=2.10.38
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-check-update --datadir=/usr/share --disable-python"
hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
From e1fb8273a769527e19043624bc032f47372f1a23 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 20 Jan 2025 18:35:56 -0300
Subject: [PATCH 03/10] ffmpeg: update to 4.4.5.
---
.../patches/armv5tel-floating-point.patch | 18 -----
srcpkgs/ffmpeg/patches/binutils-2.41.patch | 73 -------------------
...h-libavcodec-libsvtav1-ten_bit_format.diff | 40 ----------
srcpkgs/ffmpeg/template | 6 +-
4 files changed, 3 insertions(+), 134 deletions(-)
delete mode 100644 srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
delete mode 100644 srcpkgs/ffmpeg/patches/binutils-2.41.patch
delete mode 100644 srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
diff --git a/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch b/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
deleted file mode 100644
index 9a55178c74f0fd..00000000000000
--- a/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/libavfilter/vf_drawtext.c 2017-10-26 21:03:03.000000000 +0200
-+++ b/libavfilter/vf_drawtext.c 2017-11-21 11:06:49.602284422 +0100
-@@ -39,6 +39,15 @@
- #endif
- #include <fenv.h>
-
-+#if (FE_ALL_EXCEPT == 0)
-+/* E.g. ARM soft float does not define these */
-+#define FE_INVALID 0
-+#define FE_DIVBYZERO 0
-+#define FE_OVERFLOW 0
-+#define FE_UNDERFLOW 0
-+#define FE_INEXACT 0
-+#endif
-+
- #if CONFIG_LIBFONTCONFIG
- #include <fontconfig/fontconfig.h>
- #endif
diff --git a/srcpkgs/ffmpeg/patches/binutils-2.41.patch b/srcpkgs/ffmpeg/patches/binutils-2.41.patch
deleted file mode 100644
index 53a596d0ee7d4e..00000000000000
--- a/srcpkgs/ffmpeg/patches/binutils-2.41.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
-Date: Sun, 16 Jul 2023 18:18:02 +0300
-Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift
- instructions within inline assembly
-
-Fixes assembling with binutil as >= 2.41
-
-Signed-off-by: James Almer <jamrial@gmail.com>
----
- libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++---
- 1 file changed, 23 insertions(+), 3 deletions(-)
-
-diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
-index 6298f5ed1983b..ca7e2dffc1076 100644
---- a/libavcodec/x86/mathops.h
-+++ b/libavcodec/x86/mathops.h
-@@ -35,12 +35,20 @@
- static av_always_inline av_const int MULL(int a, int b, unsigned shift)
- {
- int rt, dummy;
-+ if (__builtin_constant_p(shift))
- __asm__ (
- "imull %3 \n\t"
- "shrdl %4, %%edx, %%eax \n\t"
- :"=a"(rt), "=d"(dummy)
-- :"a"(a), "rm"(b), "ci"((uint8_t)shift)
-+ :"a"(a), "rm"(b), "i"(shift & 0x1F)
- );
-+ else
-+ __asm__ (
-+ "imull %3 \n\t"
-+ "shrdl %4, %%edx, %%eax \n\t"
-+ :"=a"(rt), "=d"(dummy)
-+ :"a"(a), "rm"(b), "c"((uint8_t)shift)
-+ );
- return rt;
- }
-
-@@ -113,19 +121,31 @@ __asm__ volatile(\
- // avoid +32 for shift optimization (gcc should do that ...)
- #define NEG_SSR32 NEG_SSR32
- static inline int32_t NEG_SSR32( int32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("sarl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("sarl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
- #define NEG_USR32 NEG_USR32
- static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("shrl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("shrl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
diff --git a/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff b/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
deleted file mode 100644
index aa948f7a8a2dfb..00000000000000
--- a/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-#==================================================================================================
-# From 031f1561cd286596cdb374da32f8aa816ce3b135 Mon Sep 17 00:00:00 2001
-# From: Christopher Degawa <christopher.degawa@intel.com>
-# Date: Thu, 20 Oct 2022 22:55:27 -0500
-# Subject: [PATCH] avcodec/libsvtav1: remove compressed_ten_bit_format and simplify alloc_buffer
-#
-# compressed_ten_bit_format has been deprecated upstream and has no effect
-# and can be removed. Plus, technically it was never used in the first place
-# since it would require the app (ffmpeg) to set it and do additional
-# processing of the input frames.
-#
-# Also simplify alloc_buffer by removing calculations relating to the non-existant processing.
-#
-# Signed-off-by: Christopher Degawa <christopher.degawa@intel.com>
-#==================================================================================================
---- a/libavcodec/libsvtav1.c
-+++ b/libavcodec/libsvtav1.c
-@@ -124,16 +124,12 @@ static int svt_print_error(void *log_ctx, EbErrorType err,
-
- static int alloc_buffer(EbSvtAv1EncConfiguration *config, SvtContext *svt_enc)
- {
-- const int pack_mode_10bit =
-- (config->encoder_bit_depth > 8) && (config->compressed_ten_bit_format == 0) ? 1 : 0;
-- const size_t luma_size_8bit =
-- config->source_width * config->source_height * (1 << pack_mode_10bit);
-- const size_t luma_size_10bit =
-- (config->encoder_bit_depth > 8 && pack_mode_10bit == 0) ? luma_size_8bit : 0;
-+ const size_t luma_size = config->source_width * config->source_height *
-+ (config->encoder_bit_depth > 8 ? 2 : 1);
-
- EbSvtIOFormat *in_data;
-
-- svt_enc->raw_size = (luma_size_8bit + luma_size_10bit) * 3 / 2;
-+ svt_enc->raw_size = luma_size * 3 / 2;
-
- // allocate buffer for in and out
- svt_enc->in_buf = av_mallocz(sizeof(*svt_enc->in_buf));
---
-GitLab
-
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 6b36bcfc98137f..91eccfd78c1b04 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,8 +1,8 @@
# Template file for 'ffmpeg'
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg
-version=4.4.4
-revision=10
+version=4.4.5
+revision=1
build_style=meta
short_desc="Decoding, encoding and streaming software (transitional dummy package)"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
homepage="https://www.ffmpeg.org"
changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
distfiles="https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"
-checksum=e80b380d595c809060f66f96a5d849511ef4a76a26b76eacf5778b94c3570309
+checksum=f9514e0d3515aee5a271283df71636e1d1ff7274b15853bcd84e144be416ab07
hostmakedepends="pkg-config perl"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
From 3feb1427cc7a574852247e119679a28158ebdded Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 20 Jan 2025 18:36:21 -0300
Subject: [PATCH 04/10] libheif: update to 1.19.5.
---
srcpkgs/libheif/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 8edff25f6f05d4..67eaf114759408 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,7 +1,7 @@
# Template file for 'libheif'.
pkgname=libheif
-version=1.18.1
-revision=2
+version=1.19.5
+revision=1
build_style=cmake
makedepends="libjpeg-turbo-devel libpng-devel libde265-devel x265-devel
libaom-devel"
@@ -11,7 +11,7 @@ license="LGPL-3.0-or-later"
homepage="https://github.com/strukturag/libheif"
changelog="https://github.com/strukturag/libheif/releases"
distfiles="https://github.com/strukturag/libheif/archive/v${version}.tar.gz"
-checksum=73bc94442038d44d56fe730f72516ae53134eb15b878a7ad89ef60fac93a3318
+checksum=5cd9a3e28493310358e1c1299cd596cc4c7ae5fb985eceb758fa6141424e58bb
libheif-devel_package() {
short_desc+=" - development files"
From 7bf03df4e469f50bcfb92cc0957cd279ccbe0d5a Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 20 Jan 2025 18:36:39 -0300
Subject: [PATCH 05/10] handbrake: update to 1.9.0.
---
srcpkgs/handbrake/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index d32651a0abd02d..bfc151d51f823b 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,6 +1,6 @@
# Template file for 'handbrake'
pkgname=handbrake
-version=1.8.1
+version=1.9.0
revision=1
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
@@ -23,7 +23,7 @@ license="GPL-2.0-only"
homepage="https://handbrake.fr/"
changelog="https://github.com/HandBrake/HandBrake/releases"
distfiles="https://github.com/HandBrake/HandBrake/releases/download/${version}/HandBrake-${version}-source.tar.bz2"
-checksum=f411d54b1760b61b2361343ffa8f9d857f228cd477f885659e0322b619adee90
+checksum=c15b451502f5c938798595df897a41290e8881b3efb8edd69ff7db2d985733b0
nocross=yes
build_options="fdk_aac nvenc qsv"
From 409c0783f7198bb24a2e29deaed57cf8022e76a9 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 20 Jan 2025 18:39:00 -0300
Subject: [PATCH 06/10] vlc: revbump for x265-4.1.
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 36480ab955335593fb3e65c5e88984c91b49b75e Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 20 Jan 2025 18:39:29 -0300
Subject: [PATCH 07/10] ffmpeg6: revbump for x265-4.1.
---
srcpkgs/ffmpeg6/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ffmpeg6/template b/srcpkgs/ffmpeg6/template
index 9b66727465200e..5ca80c5f1b7f8f 100644
--- a/srcpkgs/ffmpeg6/template
+++ b/srcpkgs/ffmpeg6/template
@@ -2,7 +2,7 @@
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg6
version=6.1.2
-revision=3
+revision=4
hostmakedepends="pkg-config perl"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
libXext-devel libXvMC-devel libxcb-devel lame-devel libtheora-devel
From 70b51e311cee5392949a5824ae087f14bf83167b Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 20 Jan 2025 18:40:05 -0300
Subject: [PATCH 08/10] baresip: revbump for x265-4.1.
---
srcpkgs/baresip/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index 5f5ff9f179a7b2..b81b265a5a39bc 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
# Template file for 'baresip'
pkgname=baresip
version=3.18.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config glib-devel"
makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
From 1f9b415848e2d8a5087574392260ae712f313fa1 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 20 Jan 2025 18:40:28 -0300
Subject: [PATCH 09/10] digikam: revbump for x265-4.1.
---
srcpkgs/digikam/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/digikam/template b/srcpkgs/digikam/template
index 1a64d3c760563f..68208cb1f36a93 100644
--- a/srcpkgs/digikam/template
+++ b/srcpkgs/digikam/template
@@ -1,7 +1,7 @@
# Template file for 'digikam'
pkgname=digikam
version=8.5.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DBUILD_WITH_QT6=ON
From 7cbb5bfacef7722a72c1ed17758f387840bb5ae5 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 20 Jan 2025 18:40:53 -0300
Subject: [PATCH 10/10] avidemux: revbump for x265-4.1.
---
srcpkgs/avidemux/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index d66f8524bd0e28..b972ecac92ed31 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
# Template file for 'avidemux'
pkgname=avidemux
version=2.8.1
-revision=2
+revision=3
# Can't be compiled for aarch64, arm* or mips*
archs="x86_64* i686*"
hostmakedepends="cmake pkg-config qt5-host-tools qt5-devel tar yasm"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] X265, ffmpeg, handbrake, libheif: update
2025-01-20 21:47 [PR PATCH] X265, ffmpeg, handbrake, libheif: update 1is7ac3
@ 2025-01-20 22:07 ` 1is7ac3
2025-01-21 10:49 ` [PR PATCH] [Updated] X265, ffmpeg and " 1is7ac3
` (17 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: 1is7ac3 @ 2025-01-20 22:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1255 bytes --]
There is an updated pull request by 1is7ac3 against master on the void-packages repository
https://github.com/1is7ac3/void-packages x265
https://github.com/void-linux/void-packages/pull/54056
X265, ffmpeg, handbrake, libheif: update
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (X86_64-GLIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
<!-- - armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/54056.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-x265-54056.patch --]
[-- Type: text/x-diff, Size: 21639 bytes --]
From 5dc6662375b0f9ec896d12ea61fe36f5cc41e1de Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 20 Jan 2025 14:34:41 -0300
Subject: [PATCH 01/10] x265: update to 4.1.
---
common/shlibs | 2 +-
.../x265/patches/handbrake-ambientlight.patch | 115 ------------------
srcpkgs/x265/patches/x265-pic.patch | 11 --
srcpkgs/x265/template | 28 ++---
4 files changed, 15 insertions(+), 141 deletions(-)
delete mode 100644 srcpkgs/x265/patches/handbrake-ambientlight.patch
delete mode 100644 srcpkgs/x265/patches/x265-pic.patch
diff --git a/common/shlibs b/common/shlibs
index 3dcacc7de76d9d..ce1334b4ca9774 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1957,7 +1957,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
libQt5WebKit.so.5 qt5-webkit-5.6.0_1
libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.209 x265-3.6_1
+libx265.so.215 x265-4.1_1
libQt5Xdg.so.3 libqt5xdg-3.2.0_1
libQt5XdgIconLoader.so.3 libqt5xdg-3.2.0_1
libQt6Xdg.so.4 libqtxdg-4.0.0_1
diff --git a/srcpkgs/x265/patches/handbrake-ambientlight.patch b/srcpkgs/x265/patches/handbrake-ambientlight.patch
deleted file mode 100644
index ab36a9c35c9de4..00000000000000
--- a/srcpkgs/x265/patches/handbrake-ambientlight.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-diff --git a/source/common/param.cpp b/source/common/param.cpp
-index 8c32fafa2..0b56235c9 100755
---- a/source/common/param.cpp
-+++ b/source/common/param.cpp
-@@ -378,6 +378,7 @@ void x265_param_default(x265_param* param)
- param->preferredTransferCharacteristics = -1;
- param->pictureStructure = -1;
- param->bEmitCLL = 1;
-+ param->bEmitAmbientViewingEnvironment = 0;
-
- param->bEnableFrameDuplication = 0;
- param->dupThreshold = 70;
-@@ -1880,6 +1881,7 @@ int x265_check_params(x265_param* param)
- || param->bEmitIDRRecoverySEI
- || !!param->interlaceMode
- || param->preferredTransferCharacteristics > 1
-+ || param->bEmitAmbientViewingEnvironment
- || param->toneMapFile
- || param->naluFile);
-
-@@ -2766,6 +2768,10 @@ void x265_copy_params(x265_param* dst, x265_param* src)
- dst->bEmitCLL = src->bEmitCLL;
- dst->maxCLL = src->maxCLL;
- dst->maxFALL = src->maxFALL;
-+ dst->ambientIlluminance = src->ambientIlluminance;
-+ dst->ambientLightX = src->ambientLightX;
-+ dst->ambientLightY = src->ambientLightY;
-+ dst->bEmitAmbientViewingEnvironment = src->bEmitAmbientViewingEnvironment;
- dst->log2MaxPocLsb = src->log2MaxPocLsb;
- dst->bEmitVUIHRDInfo = src->bEmitVUIHRDInfo;
- dst->bEmitVUITimingInfo = src->bEmitVUITimingInfo;
-diff --git a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp
-index 5950f87e9..545283474 100644
---- a/source/encoder/encoder.cpp
-+++ b/source/encoder/encoder.cpp
-@@ -3276,6 +3276,15 @@ void Encoder::getStreamHeaders(NALList& list, Entropy& sbacCoder, Bitstream& bs)
- }
- }
-
-+ if (m_param->bEmitAmbientViewingEnvironment)
-+ {
-+ SEIAmbientViewingEnvironment ambientsei;
-+ ambientsei.ambientIlluminance = m_param->ambientIlluminance;
-+ ambientsei.ambientLightX = m_param->ambientLightX;
-+ ambientsei.ambientLightY = m_param->ambientLightY;
-+ ambientsei.writeSEImessages(bs, m_sps, NAL_UNIT_PREFIX_SEI, list, m_param->bSingleSeiNal);
-+ }
-+
- if (m_param->bEmitInfoSEI)
- {
- char *opts = x265_param2string(m_param, m_sps.conformanceWindow.rightOffset, m_sps.conformanceWindow.bottomOffset);
-diff --git a/source/encoder/sei.h b/source/encoder/sei.h
-index 03e210639..712e4efb4 100644
---- a/source/encoder/sei.h
-+++ b/source/encoder/sei.h
-@@ -242,6 +242,25 @@ public:
- }
- };
-
-+class SEIAmbientViewingEnvironment : public SEI
-+{
-+public:
-+ SEIAmbientViewingEnvironment()
-+ {
-+ m_payloadType = AMBIENT_VIEWING_ENVIRONMENT;
-+ m_payloadSize = 8;
-+ }
-+ uint32_t ambientIlluminance;
-+ uint16_t ambientLightX;
-+ uint16_t ambientLightY;
-+ void writeSEI(const SPS&)
-+ {
-+ WRITE_CODE(ambientIlluminance, 32, "ambient_illuminance");
-+ WRITE_CODE(ambientLightX, 16, "ambient_light_x");
-+ WRITE_CODE(ambientLightY, 16, "ambient_light_y");
-+ }
-+};
-+
- class SEIDecodedPictureHash : public SEI
- {
- public:
-diff --git a/source/x265.h b/source/x265.h
-index 9f3abd9d9..b6a4d3fe1 100644
---- a/source/x265.h
-+++ b/source/x265.h
-@@ -371,6 +371,7 @@ typedef enum
- MASTERING_DISPLAY_INFO = 137,
- CONTENT_LIGHT_LEVEL_INFO = 144,
- ALTERNATIVE_TRANSFER_CHARACTERISTICS = 147,
-+ AMBIENT_VIEWING_ENVIRONMENT = 148,
- } SEIPayloadType;
-
- typedef struct x265_sei_payload
-@@ -1903,6 +1904,11 @@ typedef struct x265_param
- * value to that value. */
- uint16_t maxLuma;
-
-+ /* ISO/IEC 23008-2:2017, D.2.39 ambient viewing environment SEI message */
-+ uint32_t ambientIlluminance;
-+ uint16_t ambientLightX;
-+ uint16_t ambientLightY;
-+
- /* Maximum of the picture order count */
- int log2MaxPocLsb;
-
-@@ -2114,6 +2120,9 @@ typedef struct x265_param
- /*Emit content light level info SEI*/
- int bEmitCLL;
-
-+ /* Emit ambient viewing environment SEI */
-+ int bEmitAmbientViewingEnvironment;
-+
- /*
- * Signals picture structure SEI timing message for every frame
- * picture structure 7 is signalled for frame doubling
diff --git a/srcpkgs/x265/patches/x265-pic.patch b/srcpkgs/x265/patches/x265-pic.patch
deleted file mode 100644
index 117c155e575f6b..00000000000000
--- a/srcpkgs/x265/patches/x265-pic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/source/CMakeLists.txt
-+++ b/source/CMakeLists.txt
-@@ -158,7 +162,7 @@ if(GCC)
- add_definitions(-D__STDC_LIMIT_MACROS=1)
- add_definitions(-std=gnu++98)
- if(ENABLE_PIC)
-- add_definitions(-fPIC)
-+ add_definitions(-fPIC -DPIC)
- endif(ENABLE_PIC)
- if(NATIVE_BUILD)
- if(INTEL_CXX)
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index 7991e00bac7642..18dfe492f0c052 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,6 +1,6 @@
# Template file for 'x265'
pkgname=x265
-version=3.6
+version=4.1
revision=1
build_wrksrc=source
build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://x265.org/"
distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=206329b9599c78d06969a1b7b7bb939f7c99a459ab283b2e93f76854bd34ca7b
+checksum=7d23cdcdbd510728202c0dfbf7c51eda26a395de2096c504c2b10d6035711102
build_options="altivec assembly"
@@ -22,28 +22,28 @@ case "$XBPS_TARGET_MACHINE" in
ppc64le*) build_options_default="altivec" ;;
# on ARM, enabling it currently fails with undefined reference to
# x265::setupAssemblyPrimitives(x265::EncoderPrimitives&, int)
- x86_64*|i686*) build_options_default="assembly" ;;
+ x86_64* | i686*) build_options_default="assembly" ;;
*) ;;
esac
if [ "$build_option_assembly" ]; then
case "$XBPS_TARGET_MACHINE" in
- x86_64*|i686*)
- # see https://bitbucket.org/multicoreware/x265_git/issues/559
- configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
- hostmakedepends+=" nasm"
- ;;
- *) ;;
+ x86_64* | i686*)
+ # see https://bitbucket.org/multicoreware/x265_git/issues/559
+ configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
+ hostmakedepends+=" nasm"
+ ;;
+ *) ;;
esac
fi
case "$XBPS_TARGET_MACHINE" in
- ppc64*)
- # altivec does not build without power8 being enabled
- configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF)
+ppc64*)
+ # altivec does not build without power8 being enabled
+ configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF)
-DCPU_POWER8=$(vopt_if altivec ON OFF)"
- ;;
- *) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;;
+ ;;
+*) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;;
esac
pre_configure() {
From d9148a5fe8e1cd267b4659e3872f6431586411d6 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 20 Jan 2025 18:58:07 -0300
Subject: [PATCH 02/10] handbrake: revbump for x265-4.1.
---
srcpkgs/handbrake/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index d32651a0abd02d..22fb9b6f4eb7d7 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.8.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
From d9445f1d7f605bcce6131c8ddb5e3f47b0470ae3 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 20 Jan 2025 18:59:19 -0300
Subject: [PATCH 03/10] ffmpeg: update to 4.4.5.
---
.../patches/armv5tel-floating-point.patch | 18 -----
srcpkgs/ffmpeg/patches/binutils-2.41.patch | 73 -------------------
...h-libavcodec-libsvtav1-ten_bit_format.diff | 40 ----------
srcpkgs/ffmpeg/template | 6 +-
4 files changed, 3 insertions(+), 134 deletions(-)
delete mode 100644 srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
delete mode 100644 srcpkgs/ffmpeg/patches/binutils-2.41.patch
delete mode 100644 srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
diff --git a/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch b/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
deleted file mode 100644
index 9a55178c74f0fd..00000000000000
--- a/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/libavfilter/vf_drawtext.c 2017-10-26 21:03:03.000000000 +0200
-+++ b/libavfilter/vf_drawtext.c 2017-11-21 11:06:49.602284422 +0100
-@@ -39,6 +39,15 @@
- #endif
- #include <fenv.h>
-
-+#if (FE_ALL_EXCEPT == 0)
-+/* E.g. ARM soft float does not define these */
-+#define FE_INVALID 0
-+#define FE_DIVBYZERO 0
-+#define FE_OVERFLOW 0
-+#define FE_UNDERFLOW 0
-+#define FE_INEXACT 0
-+#endif
-+
- #if CONFIG_LIBFONTCONFIG
- #include <fontconfig/fontconfig.h>
- #endif
diff --git a/srcpkgs/ffmpeg/patches/binutils-2.41.patch b/srcpkgs/ffmpeg/patches/binutils-2.41.patch
deleted file mode 100644
index 53a596d0ee7d4e..00000000000000
--- a/srcpkgs/ffmpeg/patches/binutils-2.41.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
-Date: Sun, 16 Jul 2023 18:18:02 +0300
-Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift
- instructions within inline assembly
-
-Fixes assembling with binutil as >= 2.41
-
-Signed-off-by: James Almer <jamrial@gmail.com>
----
- libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++---
- 1 file changed, 23 insertions(+), 3 deletions(-)
-
-diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
-index 6298f5ed1983b..ca7e2dffc1076 100644
---- a/libavcodec/x86/mathops.h
-+++ b/libavcodec/x86/mathops.h
-@@ -35,12 +35,20 @@
- static av_always_inline av_const int MULL(int a, int b, unsigned shift)
- {
- int rt, dummy;
-+ if (__builtin_constant_p(shift))
- __asm__ (
- "imull %3 \n\t"
- "shrdl %4, %%edx, %%eax \n\t"
- :"=a"(rt), "=d"(dummy)
-- :"a"(a), "rm"(b), "ci"((uint8_t)shift)
-+ :"a"(a), "rm"(b), "i"(shift & 0x1F)
- );
-+ else
-+ __asm__ (
-+ "imull %3 \n\t"
-+ "shrdl %4, %%edx, %%eax \n\t"
-+ :"=a"(rt), "=d"(dummy)
-+ :"a"(a), "rm"(b), "c"((uint8_t)shift)
-+ );
- return rt;
- }
-
-@@ -113,19 +121,31 @@ __asm__ volatile(\
- // avoid +32 for shift optimization (gcc should do that ...)
- #define NEG_SSR32 NEG_SSR32
- static inline int32_t NEG_SSR32( int32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("sarl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("sarl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
- #define NEG_USR32 NEG_USR32
- static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("shrl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("shrl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
diff --git a/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff b/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
deleted file mode 100644
index aa948f7a8a2dfb..00000000000000
--- a/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-#==================================================================================================
-# From 031f1561cd286596cdb374da32f8aa816ce3b135 Mon Sep 17 00:00:00 2001
-# From: Christopher Degawa <christopher.degawa@intel.com>
-# Date: Thu, 20 Oct 2022 22:55:27 -0500
-# Subject: [PATCH] avcodec/libsvtav1: remove compressed_ten_bit_format and simplify alloc_buffer
-#
-# compressed_ten_bit_format has been deprecated upstream and has no effect
-# and can be removed. Plus, technically it was never used in the first place
-# since it would require the app (ffmpeg) to set it and do additional
-# processing of the input frames.
-#
-# Also simplify alloc_buffer by removing calculations relating to the non-existant processing.
-#
-# Signed-off-by: Christopher Degawa <christopher.degawa@intel.com>
-#==================================================================================================
---- a/libavcodec/libsvtav1.c
-+++ b/libavcodec/libsvtav1.c
-@@ -124,16 +124,12 @@ static int svt_print_error(void *log_ctx, EbErrorType err,
-
- static int alloc_buffer(EbSvtAv1EncConfiguration *config, SvtContext *svt_enc)
- {
-- const int pack_mode_10bit =
-- (config->encoder_bit_depth > 8) && (config->compressed_ten_bit_format == 0) ? 1 : 0;
-- const size_t luma_size_8bit =
-- config->source_width * config->source_height * (1 << pack_mode_10bit);
-- const size_t luma_size_10bit =
-- (config->encoder_bit_depth > 8 && pack_mode_10bit == 0) ? luma_size_8bit : 0;
-+ const size_t luma_size = config->source_width * config->source_height *
-+ (config->encoder_bit_depth > 8 ? 2 : 1);
-
- EbSvtIOFormat *in_data;
-
-- svt_enc->raw_size = (luma_size_8bit + luma_size_10bit) * 3 / 2;
-+ svt_enc->raw_size = luma_size * 3 / 2;
-
- // allocate buffer for in and out
- svt_enc->in_buf = av_mallocz(sizeof(*svt_enc->in_buf));
---
-GitLab
-
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 6b36bcfc98137f..91eccfd78c1b04 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,8 +1,8 @@
# Template file for 'ffmpeg'
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg
-version=4.4.4
-revision=10
+version=4.4.5
+revision=1
build_style=meta
short_desc="Decoding, encoding and streaming software (transitional dummy package)"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
homepage="https://www.ffmpeg.org"
changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
distfiles="https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"
-checksum=e80b380d595c809060f66f96a5d849511ef4a76a26b76eacf5778b94c3570309
+checksum=f9514e0d3515aee5a271283df71636e1d1ff7274b15853bcd84e144be416ab07
hostmakedepends="pkg-config perl"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
From df59bfb8efcaa9affa26bd43855767afe51d4a6f Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 20 Jan 2025 19:02:32 -0300
Subject: [PATCH 04/10] libheif: update to 1.19.5.
---
srcpkgs/libheif/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 8edff25f6f05d4..6468c7ffcfac3f 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,7 +1,7 @@
-# Template file for 'libheif'.
+# Template file for 'libheif'
pkgname=libheif
-version=1.18.1
-revision=2
+version=1.19.5
+revision=1
build_style=cmake
makedepends="libjpeg-turbo-devel libpng-devel libde265-devel x265-devel
libaom-devel"
@@ -11,7 +11,7 @@ license="LGPL-3.0-or-later"
homepage="https://github.com/strukturag/libheif"
changelog="https://github.com/strukturag/libheif/releases"
distfiles="https://github.com/strukturag/libheif/archive/v${version}.tar.gz"
-checksum=73bc94442038d44d56fe730f72516ae53134eb15b878a7ad89ef60fac93a3318
+checksum=5cd9a3e28493310358e1c1299cd596cc4c7ae5fb985eceb758fa6141424e58bb
libheif-devel_package() {
short_desc+=" - development files"
From 365e3e3b2515f14689fdf06a6086efd9689f33ee Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 20 Jan 2025 19:05:18 -0300
Subject: [PATCH 05/10] ffmpeg6: revbump for x265-4.1.
---
srcpkgs/ffmpeg6/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ffmpeg6/template b/srcpkgs/ffmpeg6/template
index 9b66727465200e..5ca80c5f1b7f8f 100644
--- a/srcpkgs/ffmpeg6/template
+++ b/srcpkgs/ffmpeg6/template
@@ -2,7 +2,7 @@
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg6
version=6.1.2
-revision=3
+revision=4
hostmakedepends="pkg-config perl"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
libXext-devel libXvMC-devel libxcb-devel lame-devel libtheora-devel
From e0c1bb94c335fc878ba636d586dc660b81f7dc05 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 20 Jan 2025 19:05:40 -0300
Subject: [PATCH 06/10] vlc: revbump for x265-4.1.
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 1b44e2d5a04f17f99c548735f27c8b0f2686d936 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 20 Jan 2025 19:05:59 -0300
Subject: [PATCH 07/10] gimp: revbump for x265-4.1.
---
srcpkgs/gimp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index a50409d5ce5af1..d6d0d3291d2f19 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
# Template file for 'gimp'
pkgname=gimp
version=2.10.38
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-check-update --datadir=/usr/share --disable-python"
hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
From 404b0b37c6c69712d687307b4647c425b66c6be4 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 20 Jan 2025 19:06:29 -0300
Subject: [PATCH 08/10] avidemux: revbump for x265-4.1.
---
srcpkgs/avidemux/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index d66f8524bd0e28..b972ecac92ed31 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
# Template file for 'avidemux'
pkgname=avidemux
version=2.8.1
-revision=2
+revision=3
# Can't be compiled for aarch64, arm* or mips*
archs="x86_64* i686*"
hostmakedepends="cmake pkg-config qt5-host-tools qt5-devel tar yasm"
From 05ed0ebe71d7244d79948678a01d976e2b80ecb5 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 20 Jan 2025 19:06:53 -0300
Subject: [PATCH 09/10] baresip: revbump for x265-4.1.
---
srcpkgs/baresip/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index 5f5ff9f179a7b2..b81b265a5a39bc 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
# Template file for 'baresip'
pkgname=baresip
version=3.18.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config glib-devel"
makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
From 1b7f63d57cc9a9a5bb59f8ea2c5a256b73d221e8 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 20 Jan 2025 19:07:19 -0300
Subject: [PATCH 10/10] digikam: revbump for x265-4.1.
---
srcpkgs/digikam/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/digikam/template b/srcpkgs/digikam/template
index 1a64d3c760563f..68208cb1f36a93 100644
--- a/srcpkgs/digikam/template
+++ b/srcpkgs/digikam/template
@@ -1,7 +1,7 @@
# Template file for 'digikam'
pkgname=digikam
version=8.5.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DBUILD_WITH_QT6=ON
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] X265, ffmpeg and libheif: update
2025-01-20 21:47 [PR PATCH] X265, ffmpeg, handbrake, libheif: update 1is7ac3
2025-01-20 22:07 ` [PR PATCH] [Updated] " 1is7ac3
@ 2025-01-21 10:49 ` 1is7ac3
2025-01-22 3:20 ` 1is7ac3
` (16 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: 1is7ac3 @ 2025-01-21 10:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1247 bytes --]
There is an updated pull request by 1is7ac3 against master on the void-packages repository
https://github.com/1is7ac3/void-packages x265
https://github.com/void-linux/void-packages/pull/54056
X265, ffmpeg and libheif: update
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (X86_64-GLIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
<!-- - armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/54056.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-x265-54056.patch --]
[-- Type: text/x-diff, Size: 21751 bytes --]
From b03b5a31b4d8419306100fb15bdd9a5e952291bb Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 20 Jan 2025 14:34:41 -0300
Subject: [PATCH 01/10] x265: update to 4.1.
---
common/shlibs | 2 +-
.../x265/patches/handbrake-ambientlight.patch | 115 ------------------
srcpkgs/x265/patches/x265-pic.patch | 11 --
srcpkgs/x265/template | 28 ++---
4 files changed, 15 insertions(+), 141 deletions(-)
delete mode 100644 srcpkgs/x265/patches/handbrake-ambientlight.patch
delete mode 100644 srcpkgs/x265/patches/x265-pic.patch
diff --git a/common/shlibs b/common/shlibs
index 72852d4cb6aec6..2d327f4b327e86 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1958,7 +1958,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
libQt5WebKit.so.5 qt5-webkit-5.6.0_1
libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.209 x265-3.6_1
+libx265.so.215 x265-4.1_1
libQt5Xdg.so.3 libqt5xdg-3.2.0_1
libQt5XdgIconLoader.so.3 libqt5xdg-3.2.0_1
libQt6Xdg.so.4 libqtxdg-4.0.0_1
diff --git a/srcpkgs/x265/patches/handbrake-ambientlight.patch b/srcpkgs/x265/patches/handbrake-ambientlight.patch
deleted file mode 100644
index ab36a9c35c9de4..00000000000000
--- a/srcpkgs/x265/patches/handbrake-ambientlight.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-diff --git a/source/common/param.cpp b/source/common/param.cpp
-index 8c32fafa2..0b56235c9 100755
---- a/source/common/param.cpp
-+++ b/source/common/param.cpp
-@@ -378,6 +378,7 @@ void x265_param_default(x265_param* param)
- param->preferredTransferCharacteristics = -1;
- param->pictureStructure = -1;
- param->bEmitCLL = 1;
-+ param->bEmitAmbientViewingEnvironment = 0;
-
- param->bEnableFrameDuplication = 0;
- param->dupThreshold = 70;
-@@ -1880,6 +1881,7 @@ int x265_check_params(x265_param* param)
- || param->bEmitIDRRecoverySEI
- || !!param->interlaceMode
- || param->preferredTransferCharacteristics > 1
-+ || param->bEmitAmbientViewingEnvironment
- || param->toneMapFile
- || param->naluFile);
-
-@@ -2766,6 +2768,10 @@ void x265_copy_params(x265_param* dst, x265_param* src)
- dst->bEmitCLL = src->bEmitCLL;
- dst->maxCLL = src->maxCLL;
- dst->maxFALL = src->maxFALL;
-+ dst->ambientIlluminance = src->ambientIlluminance;
-+ dst->ambientLightX = src->ambientLightX;
-+ dst->ambientLightY = src->ambientLightY;
-+ dst->bEmitAmbientViewingEnvironment = src->bEmitAmbientViewingEnvironment;
- dst->log2MaxPocLsb = src->log2MaxPocLsb;
- dst->bEmitVUIHRDInfo = src->bEmitVUIHRDInfo;
- dst->bEmitVUITimingInfo = src->bEmitVUITimingInfo;
-diff --git a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp
-index 5950f87e9..545283474 100644
---- a/source/encoder/encoder.cpp
-+++ b/source/encoder/encoder.cpp
-@@ -3276,6 +3276,15 @@ void Encoder::getStreamHeaders(NALList& list, Entropy& sbacCoder, Bitstream& bs)
- }
- }
-
-+ if (m_param->bEmitAmbientViewingEnvironment)
-+ {
-+ SEIAmbientViewingEnvironment ambientsei;
-+ ambientsei.ambientIlluminance = m_param->ambientIlluminance;
-+ ambientsei.ambientLightX = m_param->ambientLightX;
-+ ambientsei.ambientLightY = m_param->ambientLightY;
-+ ambientsei.writeSEImessages(bs, m_sps, NAL_UNIT_PREFIX_SEI, list, m_param->bSingleSeiNal);
-+ }
-+
- if (m_param->bEmitInfoSEI)
- {
- char *opts = x265_param2string(m_param, m_sps.conformanceWindow.rightOffset, m_sps.conformanceWindow.bottomOffset);
-diff --git a/source/encoder/sei.h b/source/encoder/sei.h
-index 03e210639..712e4efb4 100644
---- a/source/encoder/sei.h
-+++ b/source/encoder/sei.h
-@@ -242,6 +242,25 @@ public:
- }
- };
-
-+class SEIAmbientViewingEnvironment : public SEI
-+{
-+public:
-+ SEIAmbientViewingEnvironment()
-+ {
-+ m_payloadType = AMBIENT_VIEWING_ENVIRONMENT;
-+ m_payloadSize = 8;
-+ }
-+ uint32_t ambientIlluminance;
-+ uint16_t ambientLightX;
-+ uint16_t ambientLightY;
-+ void writeSEI(const SPS&)
-+ {
-+ WRITE_CODE(ambientIlluminance, 32, "ambient_illuminance");
-+ WRITE_CODE(ambientLightX, 16, "ambient_light_x");
-+ WRITE_CODE(ambientLightY, 16, "ambient_light_y");
-+ }
-+};
-+
- class SEIDecodedPictureHash : public SEI
- {
- public:
-diff --git a/source/x265.h b/source/x265.h
-index 9f3abd9d9..b6a4d3fe1 100644
---- a/source/x265.h
-+++ b/source/x265.h
-@@ -371,6 +371,7 @@ typedef enum
- MASTERING_DISPLAY_INFO = 137,
- CONTENT_LIGHT_LEVEL_INFO = 144,
- ALTERNATIVE_TRANSFER_CHARACTERISTICS = 147,
-+ AMBIENT_VIEWING_ENVIRONMENT = 148,
- } SEIPayloadType;
-
- typedef struct x265_sei_payload
-@@ -1903,6 +1904,11 @@ typedef struct x265_param
- * value to that value. */
- uint16_t maxLuma;
-
-+ /* ISO/IEC 23008-2:2017, D.2.39 ambient viewing environment SEI message */
-+ uint32_t ambientIlluminance;
-+ uint16_t ambientLightX;
-+ uint16_t ambientLightY;
-+
- /* Maximum of the picture order count */
- int log2MaxPocLsb;
-
-@@ -2114,6 +2120,9 @@ typedef struct x265_param
- /*Emit content light level info SEI*/
- int bEmitCLL;
-
-+ /* Emit ambient viewing environment SEI */
-+ int bEmitAmbientViewingEnvironment;
-+
- /*
- * Signals picture structure SEI timing message for every frame
- * picture structure 7 is signalled for frame doubling
diff --git a/srcpkgs/x265/patches/x265-pic.patch b/srcpkgs/x265/patches/x265-pic.patch
deleted file mode 100644
index 117c155e575f6b..00000000000000
--- a/srcpkgs/x265/patches/x265-pic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/source/CMakeLists.txt
-+++ b/source/CMakeLists.txt
-@@ -158,7 +162,7 @@ if(GCC)
- add_definitions(-D__STDC_LIMIT_MACROS=1)
- add_definitions(-std=gnu++98)
- if(ENABLE_PIC)
-- add_definitions(-fPIC)
-+ add_definitions(-fPIC -DPIC)
- endif(ENABLE_PIC)
- if(NATIVE_BUILD)
- if(INTEL_CXX)
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index 7991e00bac7642..18dfe492f0c052 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,6 +1,6 @@
# Template file for 'x265'
pkgname=x265
-version=3.6
+version=4.1
revision=1
build_wrksrc=source
build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://x265.org/"
distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=206329b9599c78d06969a1b7b7bb939f7c99a459ab283b2e93f76854bd34ca7b
+checksum=7d23cdcdbd510728202c0dfbf7c51eda26a395de2096c504c2b10d6035711102
build_options="altivec assembly"
@@ -22,28 +22,28 @@ case "$XBPS_TARGET_MACHINE" in
ppc64le*) build_options_default="altivec" ;;
# on ARM, enabling it currently fails with undefined reference to
# x265::setupAssemblyPrimitives(x265::EncoderPrimitives&, int)
- x86_64*|i686*) build_options_default="assembly" ;;
+ x86_64* | i686*) build_options_default="assembly" ;;
*) ;;
esac
if [ "$build_option_assembly" ]; then
case "$XBPS_TARGET_MACHINE" in
- x86_64*|i686*)
- # see https://bitbucket.org/multicoreware/x265_git/issues/559
- configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
- hostmakedepends+=" nasm"
- ;;
- *) ;;
+ x86_64* | i686*)
+ # see https://bitbucket.org/multicoreware/x265_git/issues/559
+ configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
+ hostmakedepends+=" nasm"
+ ;;
+ *) ;;
esac
fi
case "$XBPS_TARGET_MACHINE" in
- ppc64*)
- # altivec does not build without power8 being enabled
- configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF)
+ppc64*)
+ # altivec does not build without power8 being enabled
+ configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF)
-DCPU_POWER8=$(vopt_if altivec ON OFF)"
- ;;
- *) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;;
+ ;;
+*) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;;
esac
pre_configure() {
From 032b1ce397e5ad3b7767d17f31adf9b32e0fb1d7 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 20 Jan 2025 18:58:07 -0300
Subject: [PATCH 02/10] handbrake: revbump for x265-4.1.
---
srcpkgs/handbrake/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index d32651a0abd02d..22fb9b6f4eb7d7 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.8.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
From 68e7fd53ac456a34e36f263925c1b80a3c76143e Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 20 Jan 2025 18:59:19 -0300
Subject: [PATCH 03/10] ffmpeg: update to 4.4.5.
---
.../patches/armv5tel-floating-point.patch | 18 -----
srcpkgs/ffmpeg/patches/binutils-2.41.patch | 73 -------------------
...h-libavcodec-libsvtav1-ten_bit_format.diff | 40 ----------
srcpkgs/ffmpeg/template | 6 +-
4 files changed, 3 insertions(+), 134 deletions(-)
delete mode 100644 srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
delete mode 100644 srcpkgs/ffmpeg/patches/binutils-2.41.patch
delete mode 100644 srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
diff --git a/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch b/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
deleted file mode 100644
index 9a55178c74f0fd..00000000000000
--- a/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/libavfilter/vf_drawtext.c 2017-10-26 21:03:03.000000000 +0200
-+++ b/libavfilter/vf_drawtext.c 2017-11-21 11:06:49.602284422 +0100
-@@ -39,6 +39,15 @@
- #endif
- #include <fenv.h>
-
-+#if (FE_ALL_EXCEPT == 0)
-+/* E.g. ARM soft float does not define these */
-+#define FE_INVALID 0
-+#define FE_DIVBYZERO 0
-+#define FE_OVERFLOW 0
-+#define FE_UNDERFLOW 0
-+#define FE_INEXACT 0
-+#endif
-+
- #if CONFIG_LIBFONTCONFIG
- #include <fontconfig/fontconfig.h>
- #endif
diff --git a/srcpkgs/ffmpeg/patches/binutils-2.41.patch b/srcpkgs/ffmpeg/patches/binutils-2.41.patch
deleted file mode 100644
index 53a596d0ee7d4e..00000000000000
--- a/srcpkgs/ffmpeg/patches/binutils-2.41.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
-Date: Sun, 16 Jul 2023 18:18:02 +0300
-Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift
- instructions within inline assembly
-
-Fixes assembling with binutil as >= 2.41
-
-Signed-off-by: James Almer <jamrial@gmail.com>
----
- libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++---
- 1 file changed, 23 insertions(+), 3 deletions(-)
-
-diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
-index 6298f5ed1983b..ca7e2dffc1076 100644
---- a/libavcodec/x86/mathops.h
-+++ b/libavcodec/x86/mathops.h
-@@ -35,12 +35,20 @@
- static av_always_inline av_const int MULL(int a, int b, unsigned shift)
- {
- int rt, dummy;
-+ if (__builtin_constant_p(shift))
- __asm__ (
- "imull %3 \n\t"
- "shrdl %4, %%edx, %%eax \n\t"
- :"=a"(rt), "=d"(dummy)
-- :"a"(a), "rm"(b), "ci"((uint8_t)shift)
-+ :"a"(a), "rm"(b), "i"(shift & 0x1F)
- );
-+ else
-+ __asm__ (
-+ "imull %3 \n\t"
-+ "shrdl %4, %%edx, %%eax \n\t"
-+ :"=a"(rt), "=d"(dummy)
-+ :"a"(a), "rm"(b), "c"((uint8_t)shift)
-+ );
- return rt;
- }
-
-@@ -113,19 +121,31 @@ __asm__ volatile(\
- // avoid +32 for shift optimization (gcc should do that ...)
- #define NEG_SSR32 NEG_SSR32
- static inline int32_t NEG_SSR32( int32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("sarl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("sarl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
- #define NEG_USR32 NEG_USR32
- static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("shrl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("shrl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
diff --git a/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff b/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
deleted file mode 100644
index aa948f7a8a2dfb..00000000000000
--- a/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-#==================================================================================================
-# From 031f1561cd286596cdb374da32f8aa816ce3b135 Mon Sep 17 00:00:00 2001
-# From: Christopher Degawa <christopher.degawa@intel.com>
-# Date: Thu, 20 Oct 2022 22:55:27 -0500
-# Subject: [PATCH] avcodec/libsvtav1: remove compressed_ten_bit_format and simplify alloc_buffer
-#
-# compressed_ten_bit_format has been deprecated upstream and has no effect
-# and can be removed. Plus, technically it was never used in the first place
-# since it would require the app (ffmpeg) to set it and do additional
-# processing of the input frames.
-#
-# Also simplify alloc_buffer by removing calculations relating to the non-existant processing.
-#
-# Signed-off-by: Christopher Degawa <christopher.degawa@intel.com>
-#==================================================================================================
---- a/libavcodec/libsvtav1.c
-+++ b/libavcodec/libsvtav1.c
-@@ -124,16 +124,12 @@ static int svt_print_error(void *log_ctx, EbErrorType err,
-
- static int alloc_buffer(EbSvtAv1EncConfiguration *config, SvtContext *svt_enc)
- {
-- const int pack_mode_10bit =
-- (config->encoder_bit_depth > 8) && (config->compressed_ten_bit_format == 0) ? 1 : 0;
-- const size_t luma_size_8bit =
-- config->source_width * config->source_height * (1 << pack_mode_10bit);
-- const size_t luma_size_10bit =
-- (config->encoder_bit_depth > 8 && pack_mode_10bit == 0) ? luma_size_8bit : 0;
-+ const size_t luma_size = config->source_width * config->source_height *
-+ (config->encoder_bit_depth > 8 ? 2 : 1);
-
- EbSvtIOFormat *in_data;
-
-- svt_enc->raw_size = (luma_size_8bit + luma_size_10bit) * 3 / 2;
-+ svt_enc->raw_size = luma_size * 3 / 2;
-
- // allocate buffer for in and out
- svt_enc->in_buf = av_mallocz(sizeof(*svt_enc->in_buf));
---
-GitLab
-
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 6b36bcfc98137f..91eccfd78c1b04 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,8 +1,8 @@
# Template file for 'ffmpeg'
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg
-version=4.4.4
-revision=10
+version=4.4.5
+revision=1
build_style=meta
short_desc="Decoding, encoding and streaming software (transitional dummy package)"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
homepage="https://www.ffmpeg.org"
changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
distfiles="https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"
-checksum=e80b380d595c809060f66f96a5d849511ef4a76a26b76eacf5778b94c3570309
+checksum=f9514e0d3515aee5a271283df71636e1d1ff7274b15853bcd84e144be416ab07
hostmakedepends="pkg-config perl"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
From 4aa9b384750d17b4c52f51d8876c28bc6607ed23 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Tue, 21 Jan 2025 07:44:18 -0300
Subject: [PATCH 04/10] ffmpeg6: revbump for x265-4.1.
---
srcpkgs/ffmpeg6/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ffmpeg6/template b/srcpkgs/ffmpeg6/template
index 9b66727465200e..5ca80c5f1b7f8f 100644
--- a/srcpkgs/ffmpeg6/template
+++ b/srcpkgs/ffmpeg6/template
@@ -2,7 +2,7 @@
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg6
version=6.1.2
-revision=3
+revision=4
hostmakedepends="pkg-config perl"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
libXext-devel libXvMC-devel libxcb-devel lame-devel libtheora-devel
From f5b35fddd39ec9423d6dfe9c0c02ec3fe89929ee Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Tue, 21 Jan 2025 07:44:52 -0300
Subject: [PATCH 05/10] vlc: revbump for x265-4.1.
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From d5db4b5147df468f47229171827f8b1550d60971 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Tue, 21 Jan 2025 07:45:33 -0300
Subject: [PATCH 06/10] avidemux: revbump for x265-4.1.
---
srcpkgs/avidemux/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index d66f8524bd0e28..b972ecac92ed31 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
# Template file for 'avidemux'
pkgname=avidemux
version=2.8.1
-revision=2
+revision=3
# Can't be compiled for aarch64, arm* or mips*
archs="x86_64* i686*"
hostmakedepends="cmake pkg-config qt5-host-tools qt5-devel tar yasm"
From db81bec30c52cccd4d805abaf68a9aa6d7dabc10 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Tue, 21 Jan 2025 07:45:48 -0300
Subject: [PATCH 07/10] baresip: revbump for x265-4.1.
---
srcpkgs/baresip/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index 5f5ff9f179a7b2..b81b265a5a39bc 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
# Template file for 'baresip'
pkgname=baresip
version=3.18.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config glib-devel"
makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
From 0884211946f04df6efb01cb8d6e1a1834a0b88f0 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Tue, 21 Jan 2025 07:46:09 -0300
Subject: [PATCH 08/10] digikam: revbump for x265-4.1.
---
srcpkgs/digikam/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/digikam/template b/srcpkgs/digikam/template
index 1a64d3c760563f..68208cb1f36a93 100644
--- a/srcpkgs/digikam/template
+++ b/srcpkgs/digikam/template
@@ -1,7 +1,7 @@
# Template file for 'digikam'
pkgname=digikam
version=8.5.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DBUILD_WITH_QT6=ON
From 1ad2c7ebc910e4231c5e62ae584528ecb57aa6ec Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Tue, 21 Jan 2025 07:46:39 -0300
Subject: [PATCH 09/10] gimp: revbump for x265-4.1.
---
srcpkgs/gimp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index a50409d5ce5af1..d6d0d3291d2f19 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
# Template file for 'gimp'
pkgname=gimp
version=2.10.38
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-check-update --datadir=/usr/share --disable-python"
hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
From e4b3578fe68a623f9e97424db7053f7ca2fda3fc Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Tue, 21 Jan 2025 07:47:47 -0300
Subject: [PATCH 10/10] libheif: update to 1.19.5.
---
srcpkgs/libheif/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 8edff25f6f05d4..18d356aa1000c5 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,8 +1,9 @@
-# Template file for 'libheif'.
+# Template file for 'libheif'
pkgname=libheif
-version=1.18.1
-revision=2
+version=1.19.5
+revision=1
build_style=cmake
+configure_args="-DBUILD_TESTING=OFF"
makedepends="libjpeg-turbo-devel libpng-devel libde265-devel x265-devel
libaom-devel"
short_desc="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
@@ -11,7 +12,7 @@ license="LGPL-3.0-or-later"
homepage="https://github.com/strukturag/libheif"
changelog="https://github.com/strukturag/libheif/releases"
distfiles="https://github.com/strukturag/libheif/archive/v${version}.tar.gz"
-checksum=73bc94442038d44d56fe730f72516ae53134eb15b878a7ad89ef60fac93a3318
+checksum=5cd9a3e28493310358e1c1299cd596cc4c7ae5fb985eceb758fa6141424e58bb
libheif-devel_package() {
short_desc+=" - development files"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] X265, ffmpeg and libheif: update
2025-01-20 21:47 [PR PATCH] X265, ffmpeg, handbrake, libheif: update 1is7ac3
2025-01-20 22:07 ` [PR PATCH] [Updated] " 1is7ac3
2025-01-21 10:49 ` [PR PATCH] [Updated] X265, ffmpeg and " 1is7ac3
@ 2025-01-22 3:20 ` 1is7ac3
2025-01-24 4:39 ` 1is7ac3
` (15 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: 1is7ac3 @ 2025-01-22 3:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1247 bytes --]
There is an updated pull request by 1is7ac3 against master on the void-packages repository
https://github.com/1is7ac3/void-packages x265
https://github.com/void-linux/void-packages/pull/54056
X265, ffmpeg and libheif: update
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (X86_64-GLIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
<!-- - armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/54056.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-x265-54056.patch --]
[-- Type: text/x-diff, Size: 22658 bytes --]
From b03b5a31b4d8419306100fb15bdd9a5e952291bb Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 20 Jan 2025 14:34:41 -0300
Subject: [PATCH 01/10] x265: update to 4.1.
---
common/shlibs | 2 +-
.../x265/patches/handbrake-ambientlight.patch | 115 ------------------
srcpkgs/x265/patches/x265-pic.patch | 11 --
srcpkgs/x265/template | 28 ++---
4 files changed, 15 insertions(+), 141 deletions(-)
delete mode 100644 srcpkgs/x265/patches/handbrake-ambientlight.patch
delete mode 100644 srcpkgs/x265/patches/x265-pic.patch
diff --git a/common/shlibs b/common/shlibs
index 72852d4cb6aec6..2d327f4b327e86 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1958,7 +1958,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
libQt5WebKit.so.5 qt5-webkit-5.6.0_1
libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.209 x265-3.6_1
+libx265.so.215 x265-4.1_1
libQt5Xdg.so.3 libqt5xdg-3.2.0_1
libQt5XdgIconLoader.so.3 libqt5xdg-3.2.0_1
libQt6Xdg.so.4 libqtxdg-4.0.0_1
diff --git a/srcpkgs/x265/patches/handbrake-ambientlight.patch b/srcpkgs/x265/patches/handbrake-ambientlight.patch
deleted file mode 100644
index ab36a9c35c9de4..00000000000000
--- a/srcpkgs/x265/patches/handbrake-ambientlight.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-diff --git a/source/common/param.cpp b/source/common/param.cpp
-index 8c32fafa2..0b56235c9 100755
---- a/source/common/param.cpp
-+++ b/source/common/param.cpp
-@@ -378,6 +378,7 @@ void x265_param_default(x265_param* param)
- param->preferredTransferCharacteristics = -1;
- param->pictureStructure = -1;
- param->bEmitCLL = 1;
-+ param->bEmitAmbientViewingEnvironment = 0;
-
- param->bEnableFrameDuplication = 0;
- param->dupThreshold = 70;
-@@ -1880,6 +1881,7 @@ int x265_check_params(x265_param* param)
- || param->bEmitIDRRecoverySEI
- || !!param->interlaceMode
- || param->preferredTransferCharacteristics > 1
-+ || param->bEmitAmbientViewingEnvironment
- || param->toneMapFile
- || param->naluFile);
-
-@@ -2766,6 +2768,10 @@ void x265_copy_params(x265_param* dst, x265_param* src)
- dst->bEmitCLL = src->bEmitCLL;
- dst->maxCLL = src->maxCLL;
- dst->maxFALL = src->maxFALL;
-+ dst->ambientIlluminance = src->ambientIlluminance;
-+ dst->ambientLightX = src->ambientLightX;
-+ dst->ambientLightY = src->ambientLightY;
-+ dst->bEmitAmbientViewingEnvironment = src->bEmitAmbientViewingEnvironment;
- dst->log2MaxPocLsb = src->log2MaxPocLsb;
- dst->bEmitVUIHRDInfo = src->bEmitVUIHRDInfo;
- dst->bEmitVUITimingInfo = src->bEmitVUITimingInfo;
-diff --git a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp
-index 5950f87e9..545283474 100644
---- a/source/encoder/encoder.cpp
-+++ b/source/encoder/encoder.cpp
-@@ -3276,6 +3276,15 @@ void Encoder::getStreamHeaders(NALList& list, Entropy& sbacCoder, Bitstream& bs)
- }
- }
-
-+ if (m_param->bEmitAmbientViewingEnvironment)
-+ {
-+ SEIAmbientViewingEnvironment ambientsei;
-+ ambientsei.ambientIlluminance = m_param->ambientIlluminance;
-+ ambientsei.ambientLightX = m_param->ambientLightX;
-+ ambientsei.ambientLightY = m_param->ambientLightY;
-+ ambientsei.writeSEImessages(bs, m_sps, NAL_UNIT_PREFIX_SEI, list, m_param->bSingleSeiNal);
-+ }
-+
- if (m_param->bEmitInfoSEI)
- {
- char *opts = x265_param2string(m_param, m_sps.conformanceWindow.rightOffset, m_sps.conformanceWindow.bottomOffset);
-diff --git a/source/encoder/sei.h b/source/encoder/sei.h
-index 03e210639..712e4efb4 100644
---- a/source/encoder/sei.h
-+++ b/source/encoder/sei.h
-@@ -242,6 +242,25 @@ public:
- }
- };
-
-+class SEIAmbientViewingEnvironment : public SEI
-+{
-+public:
-+ SEIAmbientViewingEnvironment()
-+ {
-+ m_payloadType = AMBIENT_VIEWING_ENVIRONMENT;
-+ m_payloadSize = 8;
-+ }
-+ uint32_t ambientIlluminance;
-+ uint16_t ambientLightX;
-+ uint16_t ambientLightY;
-+ void writeSEI(const SPS&)
-+ {
-+ WRITE_CODE(ambientIlluminance, 32, "ambient_illuminance");
-+ WRITE_CODE(ambientLightX, 16, "ambient_light_x");
-+ WRITE_CODE(ambientLightY, 16, "ambient_light_y");
-+ }
-+};
-+
- class SEIDecodedPictureHash : public SEI
- {
- public:
-diff --git a/source/x265.h b/source/x265.h
-index 9f3abd9d9..b6a4d3fe1 100644
---- a/source/x265.h
-+++ b/source/x265.h
-@@ -371,6 +371,7 @@ typedef enum
- MASTERING_DISPLAY_INFO = 137,
- CONTENT_LIGHT_LEVEL_INFO = 144,
- ALTERNATIVE_TRANSFER_CHARACTERISTICS = 147,
-+ AMBIENT_VIEWING_ENVIRONMENT = 148,
- } SEIPayloadType;
-
- typedef struct x265_sei_payload
-@@ -1903,6 +1904,11 @@ typedef struct x265_param
- * value to that value. */
- uint16_t maxLuma;
-
-+ /* ISO/IEC 23008-2:2017, D.2.39 ambient viewing environment SEI message */
-+ uint32_t ambientIlluminance;
-+ uint16_t ambientLightX;
-+ uint16_t ambientLightY;
-+
- /* Maximum of the picture order count */
- int log2MaxPocLsb;
-
-@@ -2114,6 +2120,9 @@ typedef struct x265_param
- /*Emit content light level info SEI*/
- int bEmitCLL;
-
-+ /* Emit ambient viewing environment SEI */
-+ int bEmitAmbientViewingEnvironment;
-+
- /*
- * Signals picture structure SEI timing message for every frame
- * picture structure 7 is signalled for frame doubling
diff --git a/srcpkgs/x265/patches/x265-pic.patch b/srcpkgs/x265/patches/x265-pic.patch
deleted file mode 100644
index 117c155e575f6b..00000000000000
--- a/srcpkgs/x265/patches/x265-pic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/source/CMakeLists.txt
-+++ b/source/CMakeLists.txt
-@@ -158,7 +162,7 @@ if(GCC)
- add_definitions(-D__STDC_LIMIT_MACROS=1)
- add_definitions(-std=gnu++98)
- if(ENABLE_PIC)
-- add_definitions(-fPIC)
-+ add_definitions(-fPIC -DPIC)
- endif(ENABLE_PIC)
- if(NATIVE_BUILD)
- if(INTEL_CXX)
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index 7991e00bac7642..18dfe492f0c052 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,6 +1,6 @@
# Template file for 'x265'
pkgname=x265
-version=3.6
+version=4.1
revision=1
build_wrksrc=source
build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://x265.org/"
distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=206329b9599c78d06969a1b7b7bb939f7c99a459ab283b2e93f76854bd34ca7b
+checksum=7d23cdcdbd510728202c0dfbf7c51eda26a395de2096c504c2b10d6035711102
build_options="altivec assembly"
@@ -22,28 +22,28 @@ case "$XBPS_TARGET_MACHINE" in
ppc64le*) build_options_default="altivec" ;;
# on ARM, enabling it currently fails with undefined reference to
# x265::setupAssemblyPrimitives(x265::EncoderPrimitives&, int)
- x86_64*|i686*) build_options_default="assembly" ;;
+ x86_64* | i686*) build_options_default="assembly" ;;
*) ;;
esac
if [ "$build_option_assembly" ]; then
case "$XBPS_TARGET_MACHINE" in
- x86_64*|i686*)
- # see https://bitbucket.org/multicoreware/x265_git/issues/559
- configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
- hostmakedepends+=" nasm"
- ;;
- *) ;;
+ x86_64* | i686*)
+ # see https://bitbucket.org/multicoreware/x265_git/issues/559
+ configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
+ hostmakedepends+=" nasm"
+ ;;
+ *) ;;
esac
fi
case "$XBPS_TARGET_MACHINE" in
- ppc64*)
- # altivec does not build without power8 being enabled
- configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF)
+ppc64*)
+ # altivec does not build without power8 being enabled
+ configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF)
-DCPU_POWER8=$(vopt_if altivec ON OFF)"
- ;;
- *) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;;
+ ;;
+*) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;;
esac
pre_configure() {
From b03e04ce338e9419ef8da621765131c975c898a6 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Wed, 22 Jan 2025 00:12:53 -0300
Subject: [PATCH 02/10] ffmpeg: update to 4.4.5.
---
.../patches/armv5tel-floating-point.patch | 18 -----
srcpkgs/ffmpeg/patches/binutils-2.41.patch | 73 -------------------
...h-libavcodec-libsvtav1-ten_bit_format.diff | 40 ----------
srcpkgs/ffmpeg/template | 6 +-
4 files changed, 3 insertions(+), 134 deletions(-)
delete mode 100644 srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
delete mode 100644 srcpkgs/ffmpeg/patches/binutils-2.41.patch
delete mode 100644 srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
diff --git a/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch b/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
deleted file mode 100644
index 9a55178c74f0fd..00000000000000
--- a/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/libavfilter/vf_drawtext.c 2017-10-26 21:03:03.000000000 +0200
-+++ b/libavfilter/vf_drawtext.c 2017-11-21 11:06:49.602284422 +0100
-@@ -39,6 +39,15 @@
- #endif
- #include <fenv.h>
-
-+#if (FE_ALL_EXCEPT == 0)
-+/* E.g. ARM soft float does not define these */
-+#define FE_INVALID 0
-+#define FE_DIVBYZERO 0
-+#define FE_OVERFLOW 0
-+#define FE_UNDERFLOW 0
-+#define FE_INEXACT 0
-+#endif
-+
- #if CONFIG_LIBFONTCONFIG
- #include <fontconfig/fontconfig.h>
- #endif
diff --git a/srcpkgs/ffmpeg/patches/binutils-2.41.patch b/srcpkgs/ffmpeg/patches/binutils-2.41.patch
deleted file mode 100644
index 53a596d0ee7d4e..00000000000000
--- a/srcpkgs/ffmpeg/patches/binutils-2.41.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
-Date: Sun, 16 Jul 2023 18:18:02 +0300
-Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift
- instructions within inline assembly
-
-Fixes assembling with binutil as >= 2.41
-
-Signed-off-by: James Almer <jamrial@gmail.com>
----
- libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++---
- 1 file changed, 23 insertions(+), 3 deletions(-)
-
-diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
-index 6298f5ed1983b..ca7e2dffc1076 100644
---- a/libavcodec/x86/mathops.h
-+++ b/libavcodec/x86/mathops.h
-@@ -35,12 +35,20 @@
- static av_always_inline av_const int MULL(int a, int b, unsigned shift)
- {
- int rt, dummy;
-+ if (__builtin_constant_p(shift))
- __asm__ (
- "imull %3 \n\t"
- "shrdl %4, %%edx, %%eax \n\t"
- :"=a"(rt), "=d"(dummy)
-- :"a"(a), "rm"(b), "ci"((uint8_t)shift)
-+ :"a"(a), "rm"(b), "i"(shift & 0x1F)
- );
-+ else
-+ __asm__ (
-+ "imull %3 \n\t"
-+ "shrdl %4, %%edx, %%eax \n\t"
-+ :"=a"(rt), "=d"(dummy)
-+ :"a"(a), "rm"(b), "c"((uint8_t)shift)
-+ );
- return rt;
- }
-
-@@ -113,19 +121,31 @@ __asm__ volatile(\
- // avoid +32 for shift optimization (gcc should do that ...)
- #define NEG_SSR32 NEG_SSR32
- static inline int32_t NEG_SSR32( int32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("sarl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("sarl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
- #define NEG_USR32 NEG_USR32
- static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("shrl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("shrl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
diff --git a/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff b/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
deleted file mode 100644
index aa948f7a8a2dfb..00000000000000
--- a/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-#==================================================================================================
-# From 031f1561cd286596cdb374da32f8aa816ce3b135 Mon Sep 17 00:00:00 2001
-# From: Christopher Degawa <christopher.degawa@intel.com>
-# Date: Thu, 20 Oct 2022 22:55:27 -0500
-# Subject: [PATCH] avcodec/libsvtav1: remove compressed_ten_bit_format and simplify alloc_buffer
-#
-# compressed_ten_bit_format has been deprecated upstream and has no effect
-# and can be removed. Plus, technically it was never used in the first place
-# since it would require the app (ffmpeg) to set it and do additional
-# processing of the input frames.
-#
-# Also simplify alloc_buffer by removing calculations relating to the non-existant processing.
-#
-# Signed-off-by: Christopher Degawa <christopher.degawa@intel.com>
-#==================================================================================================
---- a/libavcodec/libsvtav1.c
-+++ b/libavcodec/libsvtav1.c
-@@ -124,16 +124,12 @@ static int svt_print_error(void *log_ctx, EbErrorType err,
-
- static int alloc_buffer(EbSvtAv1EncConfiguration *config, SvtContext *svt_enc)
- {
-- const int pack_mode_10bit =
-- (config->encoder_bit_depth > 8) && (config->compressed_ten_bit_format == 0) ? 1 : 0;
-- const size_t luma_size_8bit =
-- config->source_width * config->source_height * (1 << pack_mode_10bit);
-- const size_t luma_size_10bit =
-- (config->encoder_bit_depth > 8 && pack_mode_10bit == 0) ? luma_size_8bit : 0;
-+ const size_t luma_size = config->source_width * config->source_height *
-+ (config->encoder_bit_depth > 8 ? 2 : 1);
-
- EbSvtIOFormat *in_data;
-
-- svt_enc->raw_size = (luma_size_8bit + luma_size_10bit) * 3 / 2;
-+ svt_enc->raw_size = luma_size * 3 / 2;
-
- // allocate buffer for in and out
- svt_enc->in_buf = av_mallocz(sizeof(*svt_enc->in_buf));
---
-GitLab
-
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 6b36bcfc98137f..91eccfd78c1b04 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,8 +1,8 @@
# Template file for 'ffmpeg'
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg
-version=4.4.4
-revision=10
+version=4.4.5
+revision=1
build_style=meta
short_desc="Decoding, encoding and streaming software (transitional dummy package)"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
homepage="https://www.ffmpeg.org"
changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
distfiles="https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"
-checksum=e80b380d595c809060f66f96a5d849511ef4a76a26b76eacf5778b94c3570309
+checksum=f9514e0d3515aee5a271283df71636e1d1ff7274b15853bcd84e144be416ab07
hostmakedepends="pkg-config perl"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
From 3439b5a34ff305f43b76e58b6dbd502f6a2ad807 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Wed, 22 Jan 2025 00:13:41 -0300
Subject: [PATCH 03/10] ffmpeg6: revbump for x265-4.1.
---
srcpkgs/ffmpeg6/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ffmpeg6/template b/srcpkgs/ffmpeg6/template
index 9b66727465200e..5ca80c5f1b7f8f 100644
--- a/srcpkgs/ffmpeg6/template
+++ b/srcpkgs/ffmpeg6/template
@@ -2,7 +2,7 @@
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg6
version=6.1.2
-revision=3
+revision=4
hostmakedepends="pkg-config perl"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
libXext-devel libXvMC-devel libxcb-devel lame-devel libtheora-devel
From 6ad6542a36ec2a59349c1bbcc7bdd4ddbdf1bc7f Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Wed, 22 Jan 2025 00:14:45 -0300
Subject: [PATCH 04/10] gimp: revbump for x265-4.1.
---
srcpkgs/gimp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index a50409d5ce5af1..d6d0d3291d2f19 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
# Template file for 'gimp'
pkgname=gimp
version=2.10.38
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-check-update --datadir=/usr/share --disable-python"
hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
From 829341b95f846aec1cfd0a79c644471cb6bdaa0f Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Wed, 22 Jan 2025 00:15:33 -0300
Subject: [PATCH 05/10] avidemux: revbump for x265-4.1.
---
srcpkgs/avidemux/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index d66f8524bd0e28..b972ecac92ed31 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
# Template file for 'avidemux'
pkgname=avidemux
version=2.8.1
-revision=2
+revision=3
# Can't be compiled for aarch64, arm* or mips*
archs="x86_64* i686*"
hostmakedepends="cmake pkg-config qt5-host-tools qt5-devel tar yasm"
From 6e5a6993c08db77a0267e9088c1492fee2ec3879 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Wed, 22 Jan 2025 00:16:32 -0300
Subject: [PATCH 06/10] digikam: revbump for x265-4.1.
---
srcpkgs/digikam/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/digikam/template b/srcpkgs/digikam/template
index 1a64d3c760563f..68208cb1f36a93 100644
--- a/srcpkgs/digikam/template
+++ b/srcpkgs/digikam/template
@@ -1,7 +1,7 @@
# Template file for 'digikam'
pkgname=digikam
version=8.5.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DBUILD_WITH_QT6=ON
From d9667bc3f4965d5a40e39b2279adeab217a77ea1 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Wed, 22 Jan 2025 00:17:37 -0300
Subject: [PATCH 07/10] baresip: revbump for x265-4.1.
---
srcpkgs/baresip/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index 5f5ff9f179a7b2..b81b265a5a39bc 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
# Template file for 'baresip'
pkgname=baresip
version=3.18.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config glib-devel"
makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
From ba2c573794ea9f48ebefc1f5f9ff27317d2a350c Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Wed, 22 Jan 2025 00:18:09 -0300
Subject: [PATCH 08/10] vlc: revbump for x265-4.1.
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 6c466b7a752bb8399b421f34786ec5238edcc3a7 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Wed, 22 Jan 2025 00:19:48 -0300
Subject: [PATCH 09/10] libheif: update to 1.19.5.
---
srcpkgs/libheif/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 8edff25f6f05d4..18d356aa1000c5 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,8 +1,9 @@
-# Template file for 'libheif'.
+# Template file for 'libheif'
pkgname=libheif
-version=1.18.1
-revision=2
+version=1.19.5
+revision=1
build_style=cmake
+configure_args="-DBUILD_TESTING=OFF"
makedepends="libjpeg-turbo-devel libpng-devel libde265-devel x265-devel
libaom-devel"
short_desc="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
@@ -11,7 +12,7 @@ license="LGPL-3.0-or-later"
homepage="https://github.com/strukturag/libheif"
changelog="https://github.com/strukturag/libheif/releases"
distfiles="https://github.com/strukturag/libheif/archive/v${version}.tar.gz"
-checksum=73bc94442038d44d56fe730f72516ae53134eb15b878a7ad89ef60fac93a3318
+checksum=5cd9a3e28493310358e1c1299cd596cc4c7ae5fb985eceb758fa6141424e58bb
libheif-devel_package() {
short_desc+=" - development files"
From 827770c50db3b79c9b9bfe09ccd18a52e9f45c41 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Wed, 22 Jan 2025 00:20:11 -0300
Subject: [PATCH 10/10] handbrake: update to 1.9.0.
---
srcpkgs/handbrake/template | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index d32651a0abd02d..3f71aa3c92dc08 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,6 +1,6 @@
# Template file for 'handbrake'
pkgname=handbrake
-version=1.8.1
+version=1.9.0
revision=1
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
@@ -23,7 +23,7 @@ license="GPL-2.0-only"
homepage="https://handbrake.fr/"
changelog="https://github.com/HandBrake/HandBrake/releases"
distfiles="https://github.com/HandBrake/HandBrake/releases/download/${version}/HandBrake-${version}-source.tar.bz2"
-checksum=f411d54b1760b61b2361343ffa8f9d857f228cd477f885659e0322b619adee90
+checksum=c15b451502f5c938798595df897a41290e8881b3efb8edd69ff7db2d985733b0
nocross=yes
build_options="fdk_aac nvenc qsv"
@@ -39,21 +39,6 @@ case "$XBPS_TARGET_MACHINE" in
;;
esac
-pre_configure() {
- # use system libraries, don't download them
- mv contrib/ffmpeg bkffmpeg
- rm -rf contrib/*
- mv bkffmpeg contrib/ffmpeg
- for module in fdk-aac libbluray libdav1d libdvdnav libdvdread nvenc \
- x264 x265 zimg svt-av1 libvpl; do
- vsed -i "/MODULES += contrib\/${module}/d" make/include/main.defs
- done
-}
-
-pre_build() {
- unset AS LD
-}
-
handbrake-cli_package() {
short_desc+=" - CLI utility"
pkg_install() {
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] X265, ffmpeg and libheif: update
2025-01-20 21:47 [PR PATCH] X265, ffmpeg, handbrake, libheif: update 1is7ac3
` (2 preceding siblings ...)
2025-01-22 3:20 ` 1is7ac3
@ 2025-01-24 4:39 ` 1is7ac3
2025-01-26 23:20 ` 1is7ac3
` (14 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: 1is7ac3 @ 2025-01-24 4:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1247 bytes --]
There is an updated pull request by 1is7ac3 against master on the void-packages repository
https://github.com/1is7ac3/void-packages x265
https://github.com/void-linux/void-packages/pull/54056
X265, ffmpeg and libheif: update
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (X86_64-GLIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
<!-- - armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/54056.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-x265-54056.patch --]
[-- Type: text/x-diff, Size: 21930 bytes --]
From b03b5a31b4d8419306100fb15bdd9a5e952291bb Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 20 Jan 2025 14:34:41 -0300
Subject: [PATCH 1/9] x265: update to 4.1.
---
common/shlibs | 2 +-
.../x265/patches/handbrake-ambientlight.patch | 115 ------------------
srcpkgs/x265/patches/x265-pic.patch | 11 --
srcpkgs/x265/template | 28 ++---
4 files changed, 15 insertions(+), 141 deletions(-)
delete mode 100644 srcpkgs/x265/patches/handbrake-ambientlight.patch
delete mode 100644 srcpkgs/x265/patches/x265-pic.patch
diff --git a/common/shlibs b/common/shlibs
index 72852d4cb6aec6..2d327f4b327e86 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1958,7 +1958,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
libQt5WebKit.so.5 qt5-webkit-5.6.0_1
libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.209 x265-3.6_1
+libx265.so.215 x265-4.1_1
libQt5Xdg.so.3 libqt5xdg-3.2.0_1
libQt5XdgIconLoader.so.3 libqt5xdg-3.2.0_1
libQt6Xdg.so.4 libqtxdg-4.0.0_1
diff --git a/srcpkgs/x265/patches/handbrake-ambientlight.patch b/srcpkgs/x265/patches/handbrake-ambientlight.patch
deleted file mode 100644
index ab36a9c35c9de4..00000000000000
--- a/srcpkgs/x265/patches/handbrake-ambientlight.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-diff --git a/source/common/param.cpp b/source/common/param.cpp
-index 8c32fafa2..0b56235c9 100755
---- a/source/common/param.cpp
-+++ b/source/common/param.cpp
-@@ -378,6 +378,7 @@ void x265_param_default(x265_param* param)
- param->preferredTransferCharacteristics = -1;
- param->pictureStructure = -1;
- param->bEmitCLL = 1;
-+ param->bEmitAmbientViewingEnvironment = 0;
-
- param->bEnableFrameDuplication = 0;
- param->dupThreshold = 70;
-@@ -1880,6 +1881,7 @@ int x265_check_params(x265_param* param)
- || param->bEmitIDRRecoverySEI
- || !!param->interlaceMode
- || param->preferredTransferCharacteristics > 1
-+ || param->bEmitAmbientViewingEnvironment
- || param->toneMapFile
- || param->naluFile);
-
-@@ -2766,6 +2768,10 @@ void x265_copy_params(x265_param* dst, x265_param* src)
- dst->bEmitCLL = src->bEmitCLL;
- dst->maxCLL = src->maxCLL;
- dst->maxFALL = src->maxFALL;
-+ dst->ambientIlluminance = src->ambientIlluminance;
-+ dst->ambientLightX = src->ambientLightX;
-+ dst->ambientLightY = src->ambientLightY;
-+ dst->bEmitAmbientViewingEnvironment = src->bEmitAmbientViewingEnvironment;
- dst->log2MaxPocLsb = src->log2MaxPocLsb;
- dst->bEmitVUIHRDInfo = src->bEmitVUIHRDInfo;
- dst->bEmitVUITimingInfo = src->bEmitVUITimingInfo;
-diff --git a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp
-index 5950f87e9..545283474 100644
---- a/source/encoder/encoder.cpp
-+++ b/source/encoder/encoder.cpp
-@@ -3276,6 +3276,15 @@ void Encoder::getStreamHeaders(NALList& list, Entropy& sbacCoder, Bitstream& bs)
- }
- }
-
-+ if (m_param->bEmitAmbientViewingEnvironment)
-+ {
-+ SEIAmbientViewingEnvironment ambientsei;
-+ ambientsei.ambientIlluminance = m_param->ambientIlluminance;
-+ ambientsei.ambientLightX = m_param->ambientLightX;
-+ ambientsei.ambientLightY = m_param->ambientLightY;
-+ ambientsei.writeSEImessages(bs, m_sps, NAL_UNIT_PREFIX_SEI, list, m_param->bSingleSeiNal);
-+ }
-+
- if (m_param->bEmitInfoSEI)
- {
- char *opts = x265_param2string(m_param, m_sps.conformanceWindow.rightOffset, m_sps.conformanceWindow.bottomOffset);
-diff --git a/source/encoder/sei.h b/source/encoder/sei.h
-index 03e210639..712e4efb4 100644
---- a/source/encoder/sei.h
-+++ b/source/encoder/sei.h
-@@ -242,6 +242,25 @@ public:
- }
- };
-
-+class SEIAmbientViewingEnvironment : public SEI
-+{
-+public:
-+ SEIAmbientViewingEnvironment()
-+ {
-+ m_payloadType = AMBIENT_VIEWING_ENVIRONMENT;
-+ m_payloadSize = 8;
-+ }
-+ uint32_t ambientIlluminance;
-+ uint16_t ambientLightX;
-+ uint16_t ambientLightY;
-+ void writeSEI(const SPS&)
-+ {
-+ WRITE_CODE(ambientIlluminance, 32, "ambient_illuminance");
-+ WRITE_CODE(ambientLightX, 16, "ambient_light_x");
-+ WRITE_CODE(ambientLightY, 16, "ambient_light_y");
-+ }
-+};
-+
- class SEIDecodedPictureHash : public SEI
- {
- public:
-diff --git a/source/x265.h b/source/x265.h
-index 9f3abd9d9..b6a4d3fe1 100644
---- a/source/x265.h
-+++ b/source/x265.h
-@@ -371,6 +371,7 @@ typedef enum
- MASTERING_DISPLAY_INFO = 137,
- CONTENT_LIGHT_LEVEL_INFO = 144,
- ALTERNATIVE_TRANSFER_CHARACTERISTICS = 147,
-+ AMBIENT_VIEWING_ENVIRONMENT = 148,
- } SEIPayloadType;
-
- typedef struct x265_sei_payload
-@@ -1903,6 +1904,11 @@ typedef struct x265_param
- * value to that value. */
- uint16_t maxLuma;
-
-+ /* ISO/IEC 23008-2:2017, D.2.39 ambient viewing environment SEI message */
-+ uint32_t ambientIlluminance;
-+ uint16_t ambientLightX;
-+ uint16_t ambientLightY;
-+
- /* Maximum of the picture order count */
- int log2MaxPocLsb;
-
-@@ -2114,6 +2120,9 @@ typedef struct x265_param
- /*Emit content light level info SEI*/
- int bEmitCLL;
-
-+ /* Emit ambient viewing environment SEI */
-+ int bEmitAmbientViewingEnvironment;
-+
- /*
- * Signals picture structure SEI timing message for every frame
- * picture structure 7 is signalled for frame doubling
diff --git a/srcpkgs/x265/patches/x265-pic.patch b/srcpkgs/x265/patches/x265-pic.patch
deleted file mode 100644
index 117c155e575f6b..00000000000000
--- a/srcpkgs/x265/patches/x265-pic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/source/CMakeLists.txt
-+++ b/source/CMakeLists.txt
-@@ -158,7 +162,7 @@ if(GCC)
- add_definitions(-D__STDC_LIMIT_MACROS=1)
- add_definitions(-std=gnu++98)
- if(ENABLE_PIC)
-- add_definitions(-fPIC)
-+ add_definitions(-fPIC -DPIC)
- endif(ENABLE_PIC)
- if(NATIVE_BUILD)
- if(INTEL_CXX)
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index 7991e00bac7642..18dfe492f0c052 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,6 +1,6 @@
# Template file for 'x265'
pkgname=x265
-version=3.6
+version=4.1
revision=1
build_wrksrc=source
build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://x265.org/"
distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=206329b9599c78d06969a1b7b7bb939f7c99a459ab283b2e93f76854bd34ca7b
+checksum=7d23cdcdbd510728202c0dfbf7c51eda26a395de2096c504c2b10d6035711102
build_options="altivec assembly"
@@ -22,28 +22,28 @@ case "$XBPS_TARGET_MACHINE" in
ppc64le*) build_options_default="altivec" ;;
# on ARM, enabling it currently fails with undefined reference to
# x265::setupAssemblyPrimitives(x265::EncoderPrimitives&, int)
- x86_64*|i686*) build_options_default="assembly" ;;
+ x86_64* | i686*) build_options_default="assembly" ;;
*) ;;
esac
if [ "$build_option_assembly" ]; then
case "$XBPS_TARGET_MACHINE" in
- x86_64*|i686*)
- # see https://bitbucket.org/multicoreware/x265_git/issues/559
- configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
- hostmakedepends+=" nasm"
- ;;
- *) ;;
+ x86_64* | i686*)
+ # see https://bitbucket.org/multicoreware/x265_git/issues/559
+ configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
+ hostmakedepends+=" nasm"
+ ;;
+ *) ;;
esac
fi
case "$XBPS_TARGET_MACHINE" in
- ppc64*)
- # altivec does not build without power8 being enabled
- configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF)
+ppc64*)
+ # altivec does not build without power8 being enabled
+ configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF)
-DCPU_POWER8=$(vopt_if altivec ON OFF)"
- ;;
- *) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;;
+ ;;
+*) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;;
esac
pre_configure() {
From b03e04ce338e9419ef8da621765131c975c898a6 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Wed, 22 Jan 2025 00:12:53 -0300
Subject: [PATCH 2/9] ffmpeg: update to 4.4.5.
---
.../patches/armv5tel-floating-point.patch | 18 -----
srcpkgs/ffmpeg/patches/binutils-2.41.patch | 73 -------------------
...h-libavcodec-libsvtav1-ten_bit_format.diff | 40 ----------
srcpkgs/ffmpeg/template | 6 +-
4 files changed, 3 insertions(+), 134 deletions(-)
delete mode 100644 srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
delete mode 100644 srcpkgs/ffmpeg/patches/binutils-2.41.patch
delete mode 100644 srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
diff --git a/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch b/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
deleted file mode 100644
index 9a55178c74f0fd..00000000000000
--- a/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/libavfilter/vf_drawtext.c 2017-10-26 21:03:03.000000000 +0200
-+++ b/libavfilter/vf_drawtext.c 2017-11-21 11:06:49.602284422 +0100
-@@ -39,6 +39,15 @@
- #endif
- #include <fenv.h>
-
-+#if (FE_ALL_EXCEPT == 0)
-+/* E.g. ARM soft float does not define these */
-+#define FE_INVALID 0
-+#define FE_DIVBYZERO 0
-+#define FE_OVERFLOW 0
-+#define FE_UNDERFLOW 0
-+#define FE_INEXACT 0
-+#endif
-+
- #if CONFIG_LIBFONTCONFIG
- #include <fontconfig/fontconfig.h>
- #endif
diff --git a/srcpkgs/ffmpeg/patches/binutils-2.41.patch b/srcpkgs/ffmpeg/patches/binutils-2.41.patch
deleted file mode 100644
index 53a596d0ee7d4e..00000000000000
--- a/srcpkgs/ffmpeg/patches/binutils-2.41.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
-Date: Sun, 16 Jul 2023 18:18:02 +0300
-Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift
- instructions within inline assembly
-
-Fixes assembling with binutil as >= 2.41
-
-Signed-off-by: James Almer <jamrial@gmail.com>
----
- libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++---
- 1 file changed, 23 insertions(+), 3 deletions(-)
-
-diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
-index 6298f5ed1983b..ca7e2dffc1076 100644
---- a/libavcodec/x86/mathops.h
-+++ b/libavcodec/x86/mathops.h
-@@ -35,12 +35,20 @@
- static av_always_inline av_const int MULL(int a, int b, unsigned shift)
- {
- int rt, dummy;
-+ if (__builtin_constant_p(shift))
- __asm__ (
- "imull %3 \n\t"
- "shrdl %4, %%edx, %%eax \n\t"
- :"=a"(rt), "=d"(dummy)
-- :"a"(a), "rm"(b), "ci"((uint8_t)shift)
-+ :"a"(a), "rm"(b), "i"(shift & 0x1F)
- );
-+ else
-+ __asm__ (
-+ "imull %3 \n\t"
-+ "shrdl %4, %%edx, %%eax \n\t"
-+ :"=a"(rt), "=d"(dummy)
-+ :"a"(a), "rm"(b), "c"((uint8_t)shift)
-+ );
- return rt;
- }
-
-@@ -113,19 +121,31 @@ __asm__ volatile(\
- // avoid +32 for shift optimization (gcc should do that ...)
- #define NEG_SSR32 NEG_SSR32
- static inline int32_t NEG_SSR32( int32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("sarl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("sarl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
- #define NEG_USR32 NEG_USR32
- static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("shrl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("shrl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
diff --git a/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff b/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
deleted file mode 100644
index aa948f7a8a2dfb..00000000000000
--- a/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-#==================================================================================================
-# From 031f1561cd286596cdb374da32f8aa816ce3b135 Mon Sep 17 00:00:00 2001
-# From: Christopher Degawa <christopher.degawa@intel.com>
-# Date: Thu, 20 Oct 2022 22:55:27 -0500
-# Subject: [PATCH] avcodec/libsvtav1: remove compressed_ten_bit_format and simplify alloc_buffer
-#
-# compressed_ten_bit_format has been deprecated upstream and has no effect
-# and can be removed. Plus, technically it was never used in the first place
-# since it would require the app (ffmpeg) to set it and do additional
-# processing of the input frames.
-#
-# Also simplify alloc_buffer by removing calculations relating to the non-existant processing.
-#
-# Signed-off-by: Christopher Degawa <christopher.degawa@intel.com>
-#==================================================================================================
---- a/libavcodec/libsvtav1.c
-+++ b/libavcodec/libsvtav1.c
-@@ -124,16 +124,12 @@ static int svt_print_error(void *log_ctx, EbErrorType err,
-
- static int alloc_buffer(EbSvtAv1EncConfiguration *config, SvtContext *svt_enc)
- {
-- const int pack_mode_10bit =
-- (config->encoder_bit_depth > 8) && (config->compressed_ten_bit_format == 0) ? 1 : 0;
-- const size_t luma_size_8bit =
-- config->source_width * config->source_height * (1 << pack_mode_10bit);
-- const size_t luma_size_10bit =
-- (config->encoder_bit_depth > 8 && pack_mode_10bit == 0) ? luma_size_8bit : 0;
-+ const size_t luma_size = config->source_width * config->source_height *
-+ (config->encoder_bit_depth > 8 ? 2 : 1);
-
- EbSvtIOFormat *in_data;
-
-- svt_enc->raw_size = (luma_size_8bit + luma_size_10bit) * 3 / 2;
-+ svt_enc->raw_size = luma_size * 3 / 2;
-
- // allocate buffer for in and out
- svt_enc->in_buf = av_mallocz(sizeof(*svt_enc->in_buf));
---
-GitLab
-
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 6b36bcfc98137f..91eccfd78c1b04 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,8 +1,8 @@
# Template file for 'ffmpeg'
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg
-version=4.4.4
-revision=10
+version=4.4.5
+revision=1
build_style=meta
short_desc="Decoding, encoding and streaming software (transitional dummy package)"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
homepage="https://www.ffmpeg.org"
changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
distfiles="https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"
-checksum=e80b380d595c809060f66f96a5d849511ef4a76a26b76eacf5778b94c3570309
+checksum=f9514e0d3515aee5a271283df71636e1d1ff7274b15853bcd84e144be416ab07
hostmakedepends="pkg-config perl"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
From 3439b5a34ff305f43b76e58b6dbd502f6a2ad807 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Wed, 22 Jan 2025 00:13:41 -0300
Subject: [PATCH 3/9] ffmpeg6: revbump for x265-4.1.
---
srcpkgs/ffmpeg6/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ffmpeg6/template b/srcpkgs/ffmpeg6/template
index 9b66727465200e..5ca80c5f1b7f8f 100644
--- a/srcpkgs/ffmpeg6/template
+++ b/srcpkgs/ffmpeg6/template
@@ -2,7 +2,7 @@
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg6
version=6.1.2
-revision=3
+revision=4
hostmakedepends="pkg-config perl"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
libXext-devel libXvMC-devel libxcb-devel lame-devel libtheora-devel
From 6ad6542a36ec2a59349c1bbcc7bdd4ddbdf1bc7f Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Wed, 22 Jan 2025 00:14:45 -0300
Subject: [PATCH 4/9] gimp: revbump for x265-4.1.
---
srcpkgs/gimp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index a50409d5ce5af1..d6d0d3291d2f19 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
# Template file for 'gimp'
pkgname=gimp
version=2.10.38
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-check-update --datadir=/usr/share --disable-python"
hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
From 88727c8cf0e9a761c2874d6133d59037d4d46bb5 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Fri, 24 Jan 2025 01:36:54 -0300
Subject: [PATCH 5/9] baresip: revbump for x265-4.1.
---
srcpkgs/baresip/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index 5f5ff9f179a7b2..b81b265a5a39bc 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
# Template file for 'baresip'
pkgname=baresip
version=3.18.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config glib-devel"
makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
From 00873f566d4c92c66c1998b8afffa3604a47499b Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Fri, 24 Jan 2025 01:37:39 -0300
Subject: [PATCH 6/9] digikam: revbump for x265-4.1.
---
srcpkgs/digikam/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/digikam/template b/srcpkgs/digikam/template
index 1a64d3c760563f..68208cb1f36a93 100644
--- a/srcpkgs/digikam/template
+++ b/srcpkgs/digikam/template
@@ -1,7 +1,7 @@
# Template file for 'digikam'
pkgname=digikam
version=8.5.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DBUILD_WITH_QT6=ON
From 6dd699db25aec5c47f85bd214cb9ca426bb3f263 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Fri, 24 Jan 2025 01:38:20 -0300
Subject: [PATCH 7/9] vlc: revbump for x265-4.1.
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From d562c22505119c049b33bc993651406b88f673e4 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Fri, 24 Jan 2025 01:38:41 -0300
Subject: [PATCH 8/9] libheif: update to 1.19.5.
---
srcpkgs/libheif/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 8edff25f6f05d4..18d356aa1000c5 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,8 +1,9 @@
-# Template file for 'libheif'.
+# Template file for 'libheif'
pkgname=libheif
-version=1.18.1
-revision=2
+version=1.19.5
+revision=1
build_style=cmake
+configure_args="-DBUILD_TESTING=OFF"
makedepends="libjpeg-turbo-devel libpng-devel libde265-devel x265-devel
libaom-devel"
short_desc="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
@@ -11,7 +12,7 @@ license="LGPL-3.0-or-later"
homepage="https://github.com/strukturag/libheif"
changelog="https://github.com/strukturag/libheif/releases"
distfiles="https://github.com/strukturag/libheif/archive/v${version}.tar.gz"
-checksum=73bc94442038d44d56fe730f72516ae53134eb15b878a7ad89ef60fac93a3318
+checksum=5cd9a3e28493310358e1c1299cd596cc4c7ae5fb985eceb758fa6141424e58bb
libheif-devel_package() {
short_desc+=" - development files"
From 892bac9d4f370c4d6981c816066baa0c6c76428b Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Fri, 24 Jan 2025 01:38:47 -0300
Subject: [PATCH 9/9] handbrake: update to 1.9.0.
---
srcpkgs/handbrake/template | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index d32651a0abd02d..3f71aa3c92dc08 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,6 +1,6 @@
# Template file for 'handbrake'
pkgname=handbrake
-version=1.8.1
+version=1.9.0
revision=1
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
@@ -23,7 +23,7 @@ license="GPL-2.0-only"
homepage="https://handbrake.fr/"
changelog="https://github.com/HandBrake/HandBrake/releases"
distfiles="https://github.com/HandBrake/HandBrake/releases/download/${version}/HandBrake-${version}-source.tar.bz2"
-checksum=f411d54b1760b61b2361343ffa8f9d857f228cd477f885659e0322b619adee90
+checksum=c15b451502f5c938798595df897a41290e8881b3efb8edd69ff7db2d985733b0
nocross=yes
build_options="fdk_aac nvenc qsv"
@@ -39,21 +39,6 @@ case "$XBPS_TARGET_MACHINE" in
;;
esac
-pre_configure() {
- # use system libraries, don't download them
- mv contrib/ffmpeg bkffmpeg
- rm -rf contrib/*
- mv bkffmpeg contrib/ffmpeg
- for module in fdk-aac libbluray libdav1d libdvdnav libdvdread nvenc \
- x264 x265 zimg svt-av1 libvpl; do
- vsed -i "/MODULES += contrib\/${module}/d" make/include/main.defs
- done
-}
-
-pre_build() {
- unset AS LD
-}
-
handbrake-cli_package() {
short_desc+=" - CLI utility"
pkg_install() {
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] X265, ffmpeg and libheif: update
2025-01-20 21:47 [PR PATCH] X265, ffmpeg, handbrake, libheif: update 1is7ac3
` (3 preceding siblings ...)
2025-01-24 4:39 ` 1is7ac3
@ 2025-01-26 23:20 ` 1is7ac3
2025-02-03 19:34 ` 1is7ac3
` (13 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: 1is7ac3 @ 2025-01-26 23:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1247 bytes --]
There is an updated pull request by 1is7ac3 against master on the void-packages repository
https://github.com/1is7ac3/void-packages x265
https://github.com/void-linux/void-packages/pull/54056
X265, ffmpeg and libheif: update
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (X86_64-GLIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
<!-- - armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/54056.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-x265-54056.patch --]
[-- Type: text/x-diff, Size: 24669 bytes --]
From ee9208b1515ad3a3c8b158fbe49176829c601033 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 20 Jan 2025 14:34:41 -0300
Subject: [PATCH 01/10] x265: update to 4.0.
---
common/shlibs | 2 +-
.../x265/patches/handbrake-ambientlight.patch | 115 ------------------
srcpkgs/x265/patches/x265-pic.patch | 11 --
srcpkgs/x265/template | 28 ++---
4 files changed, 15 insertions(+), 141 deletions(-)
delete mode 100644 srcpkgs/x265/patches/handbrake-ambientlight.patch
delete mode 100644 srcpkgs/x265/patches/x265-pic.patch
diff --git a/common/shlibs b/common/shlibs
index 72852d4cb6aec6..d786714df1aab8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1958,7 +1958,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
libQt5WebKit.so.5 qt5-webkit-5.6.0_1
libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.209 x265-3.6_1
+libx265.so.212 x265-4.0_1
libQt5Xdg.so.3 libqt5xdg-3.2.0_1
libQt5XdgIconLoader.so.3 libqt5xdg-3.2.0_1
libQt6Xdg.so.4 libqtxdg-4.0.0_1
diff --git a/srcpkgs/x265/patches/handbrake-ambientlight.patch b/srcpkgs/x265/patches/handbrake-ambientlight.patch
deleted file mode 100644
index ab36a9c35c9de4..00000000000000
--- a/srcpkgs/x265/patches/handbrake-ambientlight.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-diff --git a/source/common/param.cpp b/source/common/param.cpp
-index 8c32fafa2..0b56235c9 100755
---- a/source/common/param.cpp
-+++ b/source/common/param.cpp
-@@ -378,6 +378,7 @@ void x265_param_default(x265_param* param)
- param->preferredTransferCharacteristics = -1;
- param->pictureStructure = -1;
- param->bEmitCLL = 1;
-+ param->bEmitAmbientViewingEnvironment = 0;
-
- param->bEnableFrameDuplication = 0;
- param->dupThreshold = 70;
-@@ -1880,6 +1881,7 @@ int x265_check_params(x265_param* param)
- || param->bEmitIDRRecoverySEI
- || !!param->interlaceMode
- || param->preferredTransferCharacteristics > 1
-+ || param->bEmitAmbientViewingEnvironment
- || param->toneMapFile
- || param->naluFile);
-
-@@ -2766,6 +2768,10 @@ void x265_copy_params(x265_param* dst, x265_param* src)
- dst->bEmitCLL = src->bEmitCLL;
- dst->maxCLL = src->maxCLL;
- dst->maxFALL = src->maxFALL;
-+ dst->ambientIlluminance = src->ambientIlluminance;
-+ dst->ambientLightX = src->ambientLightX;
-+ dst->ambientLightY = src->ambientLightY;
-+ dst->bEmitAmbientViewingEnvironment = src->bEmitAmbientViewingEnvironment;
- dst->log2MaxPocLsb = src->log2MaxPocLsb;
- dst->bEmitVUIHRDInfo = src->bEmitVUIHRDInfo;
- dst->bEmitVUITimingInfo = src->bEmitVUITimingInfo;
-diff --git a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp
-index 5950f87e9..545283474 100644
---- a/source/encoder/encoder.cpp
-+++ b/source/encoder/encoder.cpp
-@@ -3276,6 +3276,15 @@ void Encoder::getStreamHeaders(NALList& list, Entropy& sbacCoder, Bitstream& bs)
- }
- }
-
-+ if (m_param->bEmitAmbientViewingEnvironment)
-+ {
-+ SEIAmbientViewingEnvironment ambientsei;
-+ ambientsei.ambientIlluminance = m_param->ambientIlluminance;
-+ ambientsei.ambientLightX = m_param->ambientLightX;
-+ ambientsei.ambientLightY = m_param->ambientLightY;
-+ ambientsei.writeSEImessages(bs, m_sps, NAL_UNIT_PREFIX_SEI, list, m_param->bSingleSeiNal);
-+ }
-+
- if (m_param->bEmitInfoSEI)
- {
- char *opts = x265_param2string(m_param, m_sps.conformanceWindow.rightOffset, m_sps.conformanceWindow.bottomOffset);
-diff --git a/source/encoder/sei.h b/source/encoder/sei.h
-index 03e210639..712e4efb4 100644
---- a/source/encoder/sei.h
-+++ b/source/encoder/sei.h
-@@ -242,6 +242,25 @@ public:
- }
- };
-
-+class SEIAmbientViewingEnvironment : public SEI
-+{
-+public:
-+ SEIAmbientViewingEnvironment()
-+ {
-+ m_payloadType = AMBIENT_VIEWING_ENVIRONMENT;
-+ m_payloadSize = 8;
-+ }
-+ uint32_t ambientIlluminance;
-+ uint16_t ambientLightX;
-+ uint16_t ambientLightY;
-+ void writeSEI(const SPS&)
-+ {
-+ WRITE_CODE(ambientIlluminance, 32, "ambient_illuminance");
-+ WRITE_CODE(ambientLightX, 16, "ambient_light_x");
-+ WRITE_CODE(ambientLightY, 16, "ambient_light_y");
-+ }
-+};
-+
- class SEIDecodedPictureHash : public SEI
- {
- public:
-diff --git a/source/x265.h b/source/x265.h
-index 9f3abd9d9..b6a4d3fe1 100644
---- a/source/x265.h
-+++ b/source/x265.h
-@@ -371,6 +371,7 @@ typedef enum
- MASTERING_DISPLAY_INFO = 137,
- CONTENT_LIGHT_LEVEL_INFO = 144,
- ALTERNATIVE_TRANSFER_CHARACTERISTICS = 147,
-+ AMBIENT_VIEWING_ENVIRONMENT = 148,
- } SEIPayloadType;
-
- typedef struct x265_sei_payload
-@@ -1903,6 +1904,11 @@ typedef struct x265_param
- * value to that value. */
- uint16_t maxLuma;
-
-+ /* ISO/IEC 23008-2:2017, D.2.39 ambient viewing environment SEI message */
-+ uint32_t ambientIlluminance;
-+ uint16_t ambientLightX;
-+ uint16_t ambientLightY;
-+
- /* Maximum of the picture order count */
- int log2MaxPocLsb;
-
-@@ -2114,6 +2120,9 @@ typedef struct x265_param
- /*Emit content light level info SEI*/
- int bEmitCLL;
-
-+ /* Emit ambient viewing environment SEI */
-+ int bEmitAmbientViewingEnvironment;
-+
- /*
- * Signals picture structure SEI timing message for every frame
- * picture structure 7 is signalled for frame doubling
diff --git a/srcpkgs/x265/patches/x265-pic.patch b/srcpkgs/x265/patches/x265-pic.patch
deleted file mode 100644
index 117c155e575f6b..00000000000000
--- a/srcpkgs/x265/patches/x265-pic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/source/CMakeLists.txt
-+++ b/source/CMakeLists.txt
-@@ -158,7 +162,7 @@ if(GCC)
- add_definitions(-D__STDC_LIMIT_MACROS=1)
- add_definitions(-std=gnu++98)
- if(ENABLE_PIC)
-- add_definitions(-fPIC)
-+ add_definitions(-fPIC -DPIC)
- endif(ENABLE_PIC)
- if(NATIVE_BUILD)
- if(INTEL_CXX)
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index 7991e00bac7642..81ffbd521ca957 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,6 +1,6 @@
# Template file for 'x265'
pkgname=x265
-version=3.6
+version=4.0
revision=1
build_wrksrc=source
build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://x265.org/"
distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=206329b9599c78d06969a1b7b7bb939f7c99a459ab283b2e93f76854bd34ca7b
+checksum=66b64be4b316362fdadb33ad8273a74236042cc380691bdbec42946b0437a389
build_options="altivec assembly"
@@ -22,28 +22,28 @@ case "$XBPS_TARGET_MACHINE" in
ppc64le*) build_options_default="altivec" ;;
# on ARM, enabling it currently fails with undefined reference to
# x265::setupAssemblyPrimitives(x265::EncoderPrimitives&, int)
- x86_64*|i686*) build_options_default="assembly" ;;
+ x86_64* | i686*) build_options_default="assembly" ;;
*) ;;
esac
if [ "$build_option_assembly" ]; then
case "$XBPS_TARGET_MACHINE" in
- x86_64*|i686*)
- # see https://bitbucket.org/multicoreware/x265_git/issues/559
- configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
- hostmakedepends+=" nasm"
- ;;
- *) ;;
+ x86_64* | i686*)
+ # see https://bitbucket.org/multicoreware/x265_git/issues/559
+ configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
+ hostmakedepends+=" nasm"
+ ;;
+ *) ;;
esac
fi
case "$XBPS_TARGET_MACHINE" in
- ppc64*)
- # altivec does not build without power8 being enabled
- configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF)
+ppc64*)
+ # altivec does not build without power8 being enabled
+ configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF)
-DCPU_POWER8=$(vopt_if altivec ON OFF)"
- ;;
- *) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;;
+ ;;
+*) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;;
esac
pre_configure() {
From dce62f0ed886c2cce85a41469e2e535976c42c6e Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 26 Jan 2025 19:35:55 -0300
Subject: [PATCH 02/10] ffmpeg6: revbump for x265-4.0.
---
srcpkgs/ffmpeg6/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ffmpeg6/template b/srcpkgs/ffmpeg6/template
index 9b66727465200e..5ca80c5f1b7f8f 100644
--- a/srcpkgs/ffmpeg6/template
+++ b/srcpkgs/ffmpeg6/template
@@ -2,7 +2,7 @@
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg6
version=6.1.2
-revision=3
+revision=4
hostmakedepends="pkg-config perl"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
libXext-devel libXvMC-devel libxcb-devel lame-devel libtheora-devel
From 06b57ec1652bf191e46e416bf7e8859f0e2cd0a2 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 26 Jan 2025 19:37:14 -0300
Subject: [PATCH 03/10] ffmpeg: update to 4.4.5.
---
.../patches/armv5tel-floating-point.patch | 18 -----
srcpkgs/ffmpeg/patches/binutils-2.41.patch | 73 -------------------
...h-libavcodec-libsvtav1-ten_bit_format.diff | 40 ----------
srcpkgs/ffmpeg/template | 6 +-
4 files changed, 3 insertions(+), 134 deletions(-)
delete mode 100644 srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
delete mode 100644 srcpkgs/ffmpeg/patches/binutils-2.41.patch
delete mode 100644 srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
diff --git a/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch b/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
deleted file mode 100644
index 9a55178c74f0fd..00000000000000
--- a/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/libavfilter/vf_drawtext.c 2017-10-26 21:03:03.000000000 +0200
-+++ b/libavfilter/vf_drawtext.c 2017-11-21 11:06:49.602284422 +0100
-@@ -39,6 +39,15 @@
- #endif
- #include <fenv.h>
-
-+#if (FE_ALL_EXCEPT == 0)
-+/* E.g. ARM soft float does not define these */
-+#define FE_INVALID 0
-+#define FE_DIVBYZERO 0
-+#define FE_OVERFLOW 0
-+#define FE_UNDERFLOW 0
-+#define FE_INEXACT 0
-+#endif
-+
- #if CONFIG_LIBFONTCONFIG
- #include <fontconfig/fontconfig.h>
- #endif
diff --git a/srcpkgs/ffmpeg/patches/binutils-2.41.patch b/srcpkgs/ffmpeg/patches/binutils-2.41.patch
deleted file mode 100644
index 53a596d0ee7d4e..00000000000000
--- a/srcpkgs/ffmpeg/patches/binutils-2.41.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
-Date: Sun, 16 Jul 2023 18:18:02 +0300
-Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift
- instructions within inline assembly
-
-Fixes assembling with binutil as >= 2.41
-
-Signed-off-by: James Almer <jamrial@gmail.com>
----
- libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++---
- 1 file changed, 23 insertions(+), 3 deletions(-)
-
-diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
-index 6298f5ed1983b..ca7e2dffc1076 100644
---- a/libavcodec/x86/mathops.h
-+++ b/libavcodec/x86/mathops.h
-@@ -35,12 +35,20 @@
- static av_always_inline av_const int MULL(int a, int b, unsigned shift)
- {
- int rt, dummy;
-+ if (__builtin_constant_p(shift))
- __asm__ (
- "imull %3 \n\t"
- "shrdl %4, %%edx, %%eax \n\t"
- :"=a"(rt), "=d"(dummy)
-- :"a"(a), "rm"(b), "ci"((uint8_t)shift)
-+ :"a"(a), "rm"(b), "i"(shift & 0x1F)
- );
-+ else
-+ __asm__ (
-+ "imull %3 \n\t"
-+ "shrdl %4, %%edx, %%eax \n\t"
-+ :"=a"(rt), "=d"(dummy)
-+ :"a"(a), "rm"(b), "c"((uint8_t)shift)
-+ );
- return rt;
- }
-
-@@ -113,19 +121,31 @@ __asm__ volatile(\
- // avoid +32 for shift optimization (gcc should do that ...)
- #define NEG_SSR32 NEG_SSR32
- static inline int32_t NEG_SSR32( int32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("sarl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("sarl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
- #define NEG_USR32 NEG_USR32
- static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("shrl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("shrl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
diff --git a/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff b/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
deleted file mode 100644
index aa948f7a8a2dfb..00000000000000
--- a/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-#==================================================================================================
-# From 031f1561cd286596cdb374da32f8aa816ce3b135 Mon Sep 17 00:00:00 2001
-# From: Christopher Degawa <christopher.degawa@intel.com>
-# Date: Thu, 20 Oct 2022 22:55:27 -0500
-# Subject: [PATCH] avcodec/libsvtav1: remove compressed_ten_bit_format and simplify alloc_buffer
-#
-# compressed_ten_bit_format has been deprecated upstream and has no effect
-# and can be removed. Plus, technically it was never used in the first place
-# since it would require the app (ffmpeg) to set it and do additional
-# processing of the input frames.
-#
-# Also simplify alloc_buffer by removing calculations relating to the non-existant processing.
-#
-# Signed-off-by: Christopher Degawa <christopher.degawa@intel.com>
-#==================================================================================================
---- a/libavcodec/libsvtav1.c
-+++ b/libavcodec/libsvtav1.c
-@@ -124,16 +124,12 @@ static int svt_print_error(void *log_ctx, EbErrorType err,
-
- static int alloc_buffer(EbSvtAv1EncConfiguration *config, SvtContext *svt_enc)
- {
-- const int pack_mode_10bit =
-- (config->encoder_bit_depth > 8) && (config->compressed_ten_bit_format == 0) ? 1 : 0;
-- const size_t luma_size_8bit =
-- config->source_width * config->source_height * (1 << pack_mode_10bit);
-- const size_t luma_size_10bit =
-- (config->encoder_bit_depth > 8 && pack_mode_10bit == 0) ? luma_size_8bit : 0;
-+ const size_t luma_size = config->source_width * config->source_height *
-+ (config->encoder_bit_depth > 8 ? 2 : 1);
-
- EbSvtIOFormat *in_data;
-
-- svt_enc->raw_size = (luma_size_8bit + luma_size_10bit) * 3 / 2;
-+ svt_enc->raw_size = luma_size * 3 / 2;
-
- // allocate buffer for in and out
- svt_enc->in_buf = av_mallocz(sizeof(*svt_enc->in_buf));
---
-GitLab
-
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 6b36bcfc98137f..91eccfd78c1b04 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,8 +1,8 @@
# Template file for 'ffmpeg'
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg
-version=4.4.4
-revision=10
+version=4.4.5
+revision=1
build_style=meta
short_desc="Decoding, encoding and streaming software (transitional dummy package)"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
homepage="https://www.ffmpeg.org"
changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
distfiles="https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"
-checksum=e80b380d595c809060f66f96a5d849511ef4a76a26b76eacf5778b94c3570309
+checksum=f9514e0d3515aee5a271283df71636e1d1ff7274b15853bcd84e144be416ab07
hostmakedepends="pkg-config perl"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
From 5f7308df33e6f08fa39e871a814039449b1ecb1f Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 26 Jan 2025 19:46:16 -0300
Subject: [PATCH 04/10] handbrake: update to 1.9.0.
---
srcpkgs/handbrake/template | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index d32651a0abd02d..3f71aa3c92dc08 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,6 +1,6 @@
# Template file for 'handbrake'
pkgname=handbrake
-version=1.8.1
+version=1.9.0
revision=1
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
@@ -23,7 +23,7 @@ license="GPL-2.0-only"
homepage="https://handbrake.fr/"
changelog="https://github.com/HandBrake/HandBrake/releases"
distfiles="https://github.com/HandBrake/HandBrake/releases/download/${version}/HandBrake-${version}-source.tar.bz2"
-checksum=f411d54b1760b61b2361343ffa8f9d857f228cd477f885659e0322b619adee90
+checksum=c15b451502f5c938798595df897a41290e8881b3efb8edd69ff7db2d985733b0
nocross=yes
build_options="fdk_aac nvenc qsv"
@@ -39,21 +39,6 @@ case "$XBPS_TARGET_MACHINE" in
;;
esac
-pre_configure() {
- # use system libraries, don't download them
- mv contrib/ffmpeg bkffmpeg
- rm -rf contrib/*
- mv bkffmpeg contrib/ffmpeg
- for module in fdk-aac libbluray libdav1d libdvdnav libdvdread nvenc \
- x264 x265 zimg svt-av1 libvpl; do
- vsed -i "/MODULES += contrib\/${module}/d" make/include/main.defs
- done
-}
-
-pre_build() {
- unset AS LD
-}
-
handbrake-cli_package() {
short_desc+=" - CLI utility"
pkg_install() {
From 0342a878391c30c02736c24de746c88c510f2654 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 26 Jan 2025 19:46:47 -0300
Subject: [PATCH 05/10] libheif: update to 1.19.5.
---
srcpkgs/libheif/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 8edff25f6f05d4..18d356aa1000c5 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,8 +1,9 @@
-# Template file for 'libheif'.
+# Template file for 'libheif'
pkgname=libheif
-version=1.18.1
-revision=2
+version=1.19.5
+revision=1
build_style=cmake
+configure_args="-DBUILD_TESTING=OFF"
makedepends="libjpeg-turbo-devel libpng-devel libde265-devel x265-devel
libaom-devel"
short_desc="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
@@ -11,7 +12,7 @@ license="LGPL-3.0-or-later"
homepage="https://github.com/strukturag/libheif"
changelog="https://github.com/strukturag/libheif/releases"
distfiles="https://github.com/strukturag/libheif/archive/v${version}.tar.gz"
-checksum=73bc94442038d44d56fe730f72516ae53134eb15b878a7ad89ef60fac93a3318
+checksum=5cd9a3e28493310358e1c1299cd596cc4c7ae5fb985eceb758fa6141424e58bb
libheif-devel_package() {
short_desc+=" - development files"
From 7cd73eef5adaec23189864c5c2ff376d28109b7c Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 26 Jan 2025 19:47:24 -0300
Subject: [PATCH 06/10] baresip: revbump for x265-4.0.
---
srcpkgs/baresip/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index 5f5ff9f179a7b2..b81b265a5a39bc 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
# Template file for 'baresip'
pkgname=baresip
version=3.18.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config glib-devel"
makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
From d6a0839cc9687e7e46e85cbc76a573663d20b46e Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 26 Jan 2025 19:47:50 -0300
Subject: [PATCH 07/10] digikam: revbump for x265-4.0.
---
srcpkgs/digikam/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/digikam/template b/srcpkgs/digikam/template
index 1a64d3c760563f..68208cb1f36a93 100644
--- a/srcpkgs/digikam/template
+++ b/srcpkgs/digikam/template
@@ -1,7 +1,7 @@
# Template file for 'digikam'
pkgname=digikam
version=8.5.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DBUILD_WITH_QT6=ON
From af403cdbee5af75552140ffb70a12736b032791e Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 26 Jan 2025 19:51:51 -0300
Subject: [PATCH 08/10] gimp: revbump for x265-4.0.
---
srcpkgs/gimp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index a50409d5ce5af1..d6d0d3291d2f19 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
# Template file for 'gimp'
pkgname=gimp
version=2.10.38
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-check-update --datadir=/usr/share --disable-python"
hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
From f00ff7447bd10aaed7fb3159be7a072c85b4aab1 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 26 Jan 2025 19:52:13 -0300
Subject: [PATCH 09/10] vlc: revbump for x265-4.0.
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 18565f3acbf4dd9fd6d3c4d97d7d3ea7d3bcc124 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 26 Jan 2025 20:19:37 -0300
Subject: [PATCH 10/10] avidemux: revbump for x265-4.0.
---
srcpkgs/avidemux/patches/ADM_x265.patch | 44 +++++++++++++++++++++++++
srcpkgs/avidemux/template | 2 +-
2 files changed, 45 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/avidemux/patches/ADM_x265.patch
diff --git a/srcpkgs/avidemux/patches/ADM_x265.patch b/srcpkgs/avidemux/patches/ADM_x265.patch
new file mode 100644
index 00000000000000..6db76d7ffc332e
--- /dev/null
+++ b/srcpkgs/avidemux/patches/ADM_x265.patch
@@ -0,0 +1,44 @@
+--- a/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp 2022-09-17 10:59:17.000000000 -0300
++++ b/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp 2025-01-26 19:27:19.796218401 -0300
+@@ -205,15 +205,20 @@
+ //
+ x265_nal *nal;
+ uint32_t nbNal = 0;
+- x265_picture pic_out;
+- api->picture_init(¶m,&pic_out);
++ x265_picture pic_out[MAX_SCALABLE_LAYERS];
++ x265_picture *pic_out_ptr[MAX_SCALABLE_LAYERS];
+ out->flags = 0;
+
++ for (int i = 0; i < MAX_SCALABLE_LAYERS; i++)
++ {
++ api->picture_init(¶m,&pic_out[i]);
++ pic_out_ptr[i] = &pic_out[i];
++ }
+ int er;
+ if(false==gotFrame)
+ {
+ ADM_info("Flushing delayed frames\n");
+- er = api->encoder_encode(handle, &nal, &nbNal, NULL, &pic_out);
++ er = api->encoder_encode(handle, &nal, &nbNal, NULL, pic_out_ptr);
+ if(er<=0)
+ {
+ ADM_info ("End of flush\n");
+@@ -221,7 +226,7 @@
+ }
+ }else
+ {
+- er = api->encoder_encode(handle, &nal, &nbNal, &pic, &pic_out);
++ er = api->encoder_encode(handle, &nal, &nbNal, &pic, pic_out_ptr);
+ if(er<0)
+ {
+ ADM_error ("[x265] Error encoding %d\n",er);
+@@ -236,7 +241,7 @@
+
+
+ // 3-encode
+- if(false==postAmble(out,nbNal,nal,&pic_out))
++ if(false==postAmble(out,nbNal,nal,pic_out_ptr[0]))
+ {
+ ADM_warning("[x265] postAmble failed\n");
+ return false;
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index d66f8524bd0e28..b972ecac92ed31 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
# Template file for 'avidemux'
pkgname=avidemux
version=2.8.1
-revision=2
+revision=3
# Can't be compiled for aarch64, arm* or mips*
archs="x86_64* i686*"
hostmakedepends="cmake pkg-config qt5-host-tools qt5-devel tar yasm"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] X265, ffmpeg and libheif: update
2025-01-20 21:47 [PR PATCH] X265, ffmpeg, handbrake, libheif: update 1is7ac3
` (4 preceding siblings ...)
2025-01-26 23:20 ` 1is7ac3
@ 2025-02-03 19:34 ` 1is7ac3
2025-02-03 19:57 ` 1is7ac3
` (12 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: 1is7ac3 @ 2025-02-03 19:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1247 bytes --]
There is an updated pull request by 1is7ac3 against master on the void-packages repository
https://github.com/1is7ac3/void-packages x265
https://github.com/void-linux/void-packages/pull/54056
X265, ffmpeg and libheif: update
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (X86_64-GLIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
<!-- - armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/54056.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-x265-54056.patch --]
[-- Type: text/x-diff, Size: 18876 bytes --]
From 74caa7a1c165e53fec922db9e2a93e2b02e7c33a Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 16:13:06 -0300
Subject: [PATCH 01/11] x265: update to 4.0.
---
common/shlibs | 2 +-
.../x265/patches/handbrake-ambientlight.patch | 50 +++++++++----------
srcpkgs/x265/template | 28 +++++------
3 files changed, 38 insertions(+), 42 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 175786786b4936..fa604a005cf107 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1953,7 +1953,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
libQt5WebKit.so.5 qt5-webkit-5.6.0_1
libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.209 x265-3.6_1
+libx265.so.212 x265-4.0_1
libQt5Xdg.so.3 libqt5xdg-3.2.0_1
libQt5XdgIconLoader.so.3 libqt5xdg-3.2.0_1
libQt6Xdg.so.4 libqtxdg-4.0.0_1
diff --git a/srcpkgs/x265/patches/handbrake-ambientlight.patch b/srcpkgs/x265/patches/handbrake-ambientlight.patch
index ab36a9c35c9de4..5c966e42f0c373 100644
--- a/srcpkgs/x265/patches/handbrake-ambientlight.patch
+++ b/srcpkgs/x265/patches/handbrake-ambientlight.patch
@@ -1,8 +1,7 @@
-diff --git a/source/common/param.cpp b/source/common/param.cpp
-index 8c32fafa2..0b56235c9 100755
---- a/source/common/param.cpp
-+++ b/source/common/param.cpp
-@@ -378,6 +378,7 @@ void x265_param_default(x265_param* param)
+diff -ru a/source/common/param.cpp b/source/common/param.cpp
+--- a/source/common/param.cpp 2024-09-13 09:51:43.000000000 -0300
++++ b/source/common/param.cpp 2025-02-03 13:27:31.474334833 -0300
+@@ -380,6 +380,7 @@
param->preferredTransferCharacteristics = -1;
param->pictureStructure = -1;
param->bEmitCLL = 1;
@@ -10,7 +9,7 @@ index 8c32fafa2..0b56235c9 100755
param->bEnableFrameDuplication = 0;
param->dupThreshold = 70;
-@@ -1880,6 +1881,7 @@ int x265_check_params(x265_param* param)
+@@ -1929,6 +1930,7 @@
|| param->bEmitIDRRecoverySEI
|| !!param->interlaceMode
|| param->preferredTransferCharacteristics > 1
@@ -18,7 +17,7 @@ index 8c32fafa2..0b56235c9 100755
|| param->toneMapFile
|| param->naluFile);
-@@ -2766,6 +2768,10 @@ void x265_copy_params(x265_param* dst, x265_param* src)
+@@ -2850,6 +2852,10 @@
dst->bEmitCLL = src->bEmitCLL;
dst->maxCLL = src->maxCLL;
dst->maxFALL = src->maxFALL;
@@ -29,11 +28,10 @@ index 8c32fafa2..0b56235c9 100755
dst->log2MaxPocLsb = src->log2MaxPocLsb;
dst->bEmitVUIHRDInfo = src->bEmitVUIHRDInfo;
dst->bEmitVUITimingInfo = src->bEmitVUITimingInfo;
-diff --git a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp
-index 5950f87e9..545283474 100644
---- a/source/encoder/encoder.cpp
-+++ b/source/encoder/encoder.cpp
-@@ -3276,6 +3276,15 @@ void Encoder::getStreamHeaders(NALList& list, Entropy& sbacCoder, Bitstream& bs)
+diff -ru a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp
+--- a/source/encoder/encoder.cpp 2024-09-13 09:51:43.000000000 -0300
++++ b/source/encoder/encoder.cpp 2025-02-03 13:28:37.551336750 -0300
+@@ -3423,6 +3423,15 @@
}
}
@@ -49,11 +47,10 @@ index 5950f87e9..545283474 100644
if (m_param->bEmitInfoSEI)
{
char *opts = x265_param2string(m_param, m_sps.conformanceWindow.rightOffset, m_sps.conformanceWindow.bottomOffset);
-diff --git a/source/encoder/sei.h b/source/encoder/sei.h
-index 03e210639..712e4efb4 100644
---- a/source/encoder/sei.h
-+++ b/source/encoder/sei.h
-@@ -242,6 +242,25 @@ public:
+diff -ru a/source/encoder/sei.h b/source/encoder/sei.h
+--- a/source/encoder/sei.h 2024-09-13 09:51:43.000000000 -0300
++++ b/source/encoder/sei.h 2025-02-03 13:30:41.386953402 -0300
+@@ -464,6 +464,25 @@
}
};
@@ -79,19 +76,18 @@ index 03e210639..712e4efb4 100644
class SEIDecodedPictureHash : public SEI
{
public:
-diff --git a/source/x265.h b/source/x265.h
-index 9f3abd9d9..b6a4d3fe1 100644
---- a/source/x265.h
-+++ b/source/x265.h
-@@ -371,6 +371,7 @@ typedef enum
+diff -ru a/source/x265.h b/source/x265.h
+--- a/source/x265.h 2024-09-13 09:51:43.000000000 -0300
++++ b/source/x265.h 2025-02-03 13:32:46.662499030 -0300
+@@ -371,6 +371,7 @@
MASTERING_DISPLAY_INFO = 137,
CONTENT_LIGHT_LEVEL_INFO = 144,
ALTERNATIVE_TRANSFER_CHARACTERISTICS = 147,
+ AMBIENT_VIEWING_ENVIRONMENT = 148,
- } SEIPayloadType;
-
- typedef struct x265_sei_payload
-@@ -1903,6 +1904,11 @@ typedef struct x265_param
+ ALPHA_CHANNEL_INFO = 165,
+ THREE_DIMENSIONAL_REFERENCE_DISPLAYS_INFO = 176,
+ MULTIVIEW_SCENE_INFO = 178,
+@@ -1956,6 +1957,11 @@
* value to that value. */
uint16_t maxLuma;
@@ -103,7 +99,7 @@ index 9f3abd9d9..b6a4d3fe1 100644
/* Maximum of the picture order count */
int log2MaxPocLsb;
-@@ -2114,6 +2120,9 @@ typedef struct x265_param
+@@ -2167,6 +2173,9 @@
/*Emit content light level info SEI*/
int bEmitCLL;
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index 7991e00bac7642..81ffbd521ca957 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,6 +1,6 @@
# Template file for 'x265'
pkgname=x265
-version=3.6
+version=4.0
revision=1
build_wrksrc=source
build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://x265.org/"
distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=206329b9599c78d06969a1b7b7bb939f7c99a459ab283b2e93f76854bd34ca7b
+checksum=66b64be4b316362fdadb33ad8273a74236042cc380691bdbec42946b0437a389
build_options="altivec assembly"
@@ -22,28 +22,28 @@ case "$XBPS_TARGET_MACHINE" in
ppc64le*) build_options_default="altivec" ;;
# on ARM, enabling it currently fails with undefined reference to
# x265::setupAssemblyPrimitives(x265::EncoderPrimitives&, int)
- x86_64*|i686*) build_options_default="assembly" ;;
+ x86_64* | i686*) build_options_default="assembly" ;;
*) ;;
esac
if [ "$build_option_assembly" ]; then
case "$XBPS_TARGET_MACHINE" in
- x86_64*|i686*)
- # see https://bitbucket.org/multicoreware/x265_git/issues/559
- configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
- hostmakedepends+=" nasm"
- ;;
- *) ;;
+ x86_64* | i686*)
+ # see https://bitbucket.org/multicoreware/x265_git/issues/559
+ configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
+ hostmakedepends+=" nasm"
+ ;;
+ *) ;;
esac
fi
case "$XBPS_TARGET_MACHINE" in
- ppc64*)
- # altivec does not build without power8 being enabled
- configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF)
+ppc64*)
+ # altivec does not build without power8 being enabled
+ configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF)
-DCPU_POWER8=$(vopt_if altivec ON OFF)"
- ;;
- *) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;;
+ ;;
+*) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;;
esac
pre_configure() {
From dd8d2788f9c6d1579e7489be5848f81224783abd Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 16:16:34 -0300
Subject: [PATCH 02/11] ffmpeg: update to 4.4.5.
---
srcpkgs/ffmpeg/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 6b36bcfc98137f..91eccfd78c1b04 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,8 +1,8 @@
# Template file for 'ffmpeg'
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg
-version=4.4.4
-revision=10
+version=4.4.5
+revision=1
build_style=meta
short_desc="Decoding, encoding and streaming software (transitional dummy package)"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
homepage="https://www.ffmpeg.org"
changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
distfiles="https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"
-checksum=e80b380d595c809060f66f96a5d849511ef4a76a26b76eacf5778b94c3570309
+checksum=f9514e0d3515aee5a271283df71636e1d1ff7274b15853bcd84e144be416ab07
hostmakedepends="pkg-config perl"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
From 1bd49db5fb256b57ea87e4e638f91d44118ca930 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 16:16:41 -0300
Subject: [PATCH 03/11] libheif: update to 1.19.5.
---
srcpkgs/libheif/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 8edff25f6f05d4..18d356aa1000c5 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,8 +1,9 @@
-# Template file for 'libheif'.
+# Template file for 'libheif'
pkgname=libheif
-version=1.18.1
-revision=2
+version=1.19.5
+revision=1
build_style=cmake
+configure_args="-DBUILD_TESTING=OFF"
makedepends="libjpeg-turbo-devel libpng-devel libde265-devel x265-devel
libaom-devel"
short_desc="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
@@ -11,7 +12,7 @@ license="LGPL-3.0-or-later"
homepage="https://github.com/strukturag/libheif"
changelog="https://github.com/strukturag/libheif/releases"
distfiles="https://github.com/strukturag/libheif/archive/v${version}.tar.gz"
-checksum=73bc94442038d44d56fe730f72516ae53134eb15b878a7ad89ef60fac93a3318
+checksum=5cd9a3e28493310358e1c1299cd596cc4c7ae5fb985eceb758fa6141424e58bb
libheif-devel_package() {
short_desc+=" - development files"
From ee4e92246b879791624828fc24d4e105a7464b27 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 16:17:29 -0300
Subject: [PATCH 04/11] vlc: revbump for x265-4.0.
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From da402f42918197579f334ccaa7ae15a0a00b5173 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 16:18:02 -0300
Subject: [PATCH 05/11] gimp: revbump for x265-4.0.
---
srcpkgs/gimp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index a50409d5ce5af1..d6d0d3291d2f19 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
# Template file for 'gimp'
pkgname=gimp
version=2.10.38
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-check-update --datadir=/usr/share --disable-python"
hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
From 0a710f15dc41cabbd4a0b275ed6516e2c4618a3c Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 16:18:29 -0300
Subject: [PATCH 06/11] digikam: revbump for x265-4.0.
---
srcpkgs/digikam/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/digikam/template b/srcpkgs/digikam/template
index 1a64d3c760563f..68208cb1f36a93 100644
--- a/srcpkgs/digikam/template
+++ b/srcpkgs/digikam/template
@@ -1,7 +1,7 @@
# Template file for 'digikam'
pkgname=digikam
version=8.5.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DBUILD_WITH_QT6=ON
From faf625b47fea2ce509f0df7c56a45af818dbd787 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 16:19:12 -0300
Subject: [PATCH 07/11] ffmpeg6: revbump for x265-4.0.
---
srcpkgs/ffmpeg6/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ffmpeg6/template b/srcpkgs/ffmpeg6/template
index 9b66727465200e..5ca80c5f1b7f8f 100644
--- a/srcpkgs/ffmpeg6/template
+++ b/srcpkgs/ffmpeg6/template
@@ -2,7 +2,7 @@
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg6
version=6.1.2
-revision=3
+revision=4
hostmakedepends="pkg-config perl"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
libXext-devel libXvMC-devel libxcb-devel lame-devel libtheora-devel
From cb43cce26ac60b5169487649715fc95a445bd21f Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 16:19:42 -0300
Subject: [PATCH 08/11] baresip: revbump for x265-4.0.
---
srcpkgs/baresip/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index 5f5ff9f179a7b2..b81b265a5a39bc 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
# Template file for 'baresip'
pkgname=baresip
version=3.18.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config glib-devel"
makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
From a58186a4489f6f59bad4e24ad2007f7ab60c7832 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 16:20:16 -0300
Subject: [PATCH 09/11] oneVPL: update to 2.14.0.
---
srcpkgs/oneVPL/patches/cross-pc.patch | 4 ++--
srcpkgs/oneVPL/template | 11 +++--------
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/oneVPL/patches/cross-pc.patch b/srcpkgs/oneVPL/patches/cross-pc.patch
index 0b24a2124c9b2f..a330997ccea6dd 100644
--- a/srcpkgs/oneVPL/patches/cross-pc.patch
+++ b/srcpkgs/oneVPL/patches/cross-pc.patch
@@ -1,5 +1,5 @@
---- a/dispatcher/pkgconfig/vpl.pc.in 2023-07-21 23:28:38.000000000 +0200
-+++ - 2023-11-14 10:16:46.665168740 +0100
+--- a/libvpl/pkgconfig/vpl.pc.in 2023-11-29 19:59:08.000000000 -0300
++++ b/libvpl/pkgconfig/vpl.pc.in 2025-02-03 06:53:57.919092912 -0300
@@ -1,6 +1,6 @@
-prefix=@pc_rel_prefix@
-libdir=@pc_rel_libdir@
diff --git a/srcpkgs/oneVPL/template b/srcpkgs/oneVPL/template
index 20dcd04f5f4976..605da7db149743 100644
--- a/srcpkgs/oneVPL/template
+++ b/srcpkgs/oneVPL/template
@@ -1,7 +1,7 @@
# Template file for 'oneVPL'
pkgname=oneVPL
-version=2023.3.1
-revision=2
+version=2.14.0
+revision=1
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libva-devel libX11-devel"
@@ -11,7 +11,7 @@ license="MIT"
homepage="https://github.com/oneapi-src/oneVPL"
changelog="https://github.com/oneapi-src/oneVPL/blob/master/CHANGELOG.md"
distfiles="https://github.com/oneapi-src/oneVPL/archive/refs/tags/v$version.tar.gz"
-checksum=4411543519486a2450f6f5af06a077596e7888a551768594e9dfa2a46b23b6f5
+checksum=7c6bff1c1708d910032c2e6c44998ffff3f5fdbf06b00972bc48bf2dd9e5ac06
post_install() {
vlicense LICENSE
@@ -33,11 +33,6 @@ oneVPL-examples_package() {
short_desc+=" - examples"
depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
- vmove usr/bin/sample_decode
- vmove usr/bin/sample_encode
- vmove usr/bin/sample_multi_transcode
- vmove usr/bin/sample_vpp
- vmove usr/bin/vpl-inspect
vmove usr/share/vpl/examples
}
}
From 6f9d51cff539bd48ea4f04a393ddac3a033687e2 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 16:20:44 -0300
Subject: [PATCH 10/11] avidemux: revbump for x265-4.0.
---
srcpkgs/avidemux/patches/ADM_x265.patch | 44 +++++++++++++++++++++++++
srcpkgs/avidemux/template | 2 +-
2 files changed, 45 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/avidemux/patches/ADM_x265.patch
diff --git a/srcpkgs/avidemux/patches/ADM_x265.patch b/srcpkgs/avidemux/patches/ADM_x265.patch
new file mode 100644
index 00000000000000..6db76d7ffc332e
--- /dev/null
+++ b/srcpkgs/avidemux/patches/ADM_x265.patch
@@ -0,0 +1,44 @@
+--- a/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp 2022-09-17 10:59:17.000000000 -0300
++++ b/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp 2025-01-26 19:27:19.796218401 -0300
+@@ -205,15 +205,20 @@
+ //
+ x265_nal *nal;
+ uint32_t nbNal = 0;
+- x265_picture pic_out;
+- api->picture_init(¶m,&pic_out);
++ x265_picture pic_out[MAX_SCALABLE_LAYERS];
++ x265_picture *pic_out_ptr[MAX_SCALABLE_LAYERS];
+ out->flags = 0;
+
++ for (int i = 0; i < MAX_SCALABLE_LAYERS; i++)
++ {
++ api->picture_init(¶m,&pic_out[i]);
++ pic_out_ptr[i] = &pic_out[i];
++ }
+ int er;
+ if(false==gotFrame)
+ {
+ ADM_info("Flushing delayed frames\n");
+- er = api->encoder_encode(handle, &nal, &nbNal, NULL, &pic_out);
++ er = api->encoder_encode(handle, &nal, &nbNal, NULL, pic_out_ptr);
+ if(er<=0)
+ {
+ ADM_info ("End of flush\n");
+@@ -221,7 +226,7 @@
+ }
+ }else
+ {
+- er = api->encoder_encode(handle, &nal, &nbNal, &pic, &pic_out);
++ er = api->encoder_encode(handle, &nal, &nbNal, &pic, pic_out_ptr);
+ if(er<0)
+ {
+ ADM_error ("[x265] Error encoding %d\n",er);
+@@ -236,7 +241,7 @@
+
+
+ // 3-encode
+- if(false==postAmble(out,nbNal,nal,&pic_out))
++ if(false==postAmble(out,nbNal,nal,pic_out_ptr[0]))
+ {
+ ADM_warning("[x265] postAmble failed\n");
+ return false;
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index d66f8524bd0e28..b972ecac92ed31 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
# Template file for 'avidemux'
pkgname=avidemux
version=2.8.1
-revision=2
+revision=3
# Can't be compiled for aarch64, arm* or mips*
archs="x86_64* i686*"
hostmakedepends="cmake pkg-config qt5-host-tools qt5-devel tar yasm"
From db6e232853e78552a9da5bf25f2a977f0beaf957 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 16:21:09 -0300
Subject: [PATCH 11/11] handbrake: revbump for x265-4.0.
---
srcpkgs/handbrake/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index d32651a0abd02d..22fb9b6f4eb7d7 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.8.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] X265, ffmpeg and libheif: update
2025-01-20 21:47 [PR PATCH] X265, ffmpeg, handbrake, libheif: update 1is7ac3
` (5 preceding siblings ...)
2025-02-03 19:34 ` 1is7ac3
@ 2025-02-03 19:57 ` 1is7ac3
2025-02-03 20:20 ` 1is7ac3
` (11 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: 1is7ac3 @ 2025-02-03 19:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1247 bytes --]
There is an updated pull request by 1is7ac3 against master on the void-packages repository
https://github.com/1is7ac3/void-packages x265
https://github.com/void-linux/void-packages/pull/54056
X265, ffmpeg and libheif: update
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (X86_64-GLIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
<!-- - armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/54056.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-x265-54056.patch --]
[-- Type: text/x-diff, Size: 16810 bytes --]
From 74caa7a1c165e53fec922db9e2a93e2b02e7c33a Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 16:13:06 -0300
Subject: [PATCH 01/10] x265: update to 4.0.
---
common/shlibs | 2 +-
.../x265/patches/handbrake-ambientlight.patch | 50 +++++++++----------
srcpkgs/x265/template | 28 +++++------
3 files changed, 38 insertions(+), 42 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 175786786b4936..fa604a005cf107 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1953,7 +1953,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
libQt5WebKit.so.5 qt5-webkit-5.6.0_1
libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.209 x265-3.6_1
+libx265.so.212 x265-4.0_1
libQt5Xdg.so.3 libqt5xdg-3.2.0_1
libQt5XdgIconLoader.so.3 libqt5xdg-3.2.0_1
libQt6Xdg.so.4 libqtxdg-4.0.0_1
diff --git a/srcpkgs/x265/patches/handbrake-ambientlight.patch b/srcpkgs/x265/patches/handbrake-ambientlight.patch
index ab36a9c35c9de4..5c966e42f0c373 100644
--- a/srcpkgs/x265/patches/handbrake-ambientlight.patch
+++ b/srcpkgs/x265/patches/handbrake-ambientlight.patch
@@ -1,8 +1,7 @@
-diff --git a/source/common/param.cpp b/source/common/param.cpp
-index 8c32fafa2..0b56235c9 100755
---- a/source/common/param.cpp
-+++ b/source/common/param.cpp
-@@ -378,6 +378,7 @@ void x265_param_default(x265_param* param)
+diff -ru a/source/common/param.cpp b/source/common/param.cpp
+--- a/source/common/param.cpp 2024-09-13 09:51:43.000000000 -0300
++++ b/source/common/param.cpp 2025-02-03 13:27:31.474334833 -0300
+@@ -380,6 +380,7 @@
param->preferredTransferCharacteristics = -1;
param->pictureStructure = -1;
param->bEmitCLL = 1;
@@ -10,7 +9,7 @@ index 8c32fafa2..0b56235c9 100755
param->bEnableFrameDuplication = 0;
param->dupThreshold = 70;
-@@ -1880,6 +1881,7 @@ int x265_check_params(x265_param* param)
+@@ -1929,6 +1930,7 @@
|| param->bEmitIDRRecoverySEI
|| !!param->interlaceMode
|| param->preferredTransferCharacteristics > 1
@@ -18,7 +17,7 @@ index 8c32fafa2..0b56235c9 100755
|| param->toneMapFile
|| param->naluFile);
-@@ -2766,6 +2768,10 @@ void x265_copy_params(x265_param* dst, x265_param* src)
+@@ -2850,6 +2852,10 @@
dst->bEmitCLL = src->bEmitCLL;
dst->maxCLL = src->maxCLL;
dst->maxFALL = src->maxFALL;
@@ -29,11 +28,10 @@ index 8c32fafa2..0b56235c9 100755
dst->log2MaxPocLsb = src->log2MaxPocLsb;
dst->bEmitVUIHRDInfo = src->bEmitVUIHRDInfo;
dst->bEmitVUITimingInfo = src->bEmitVUITimingInfo;
-diff --git a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp
-index 5950f87e9..545283474 100644
---- a/source/encoder/encoder.cpp
-+++ b/source/encoder/encoder.cpp
-@@ -3276,6 +3276,15 @@ void Encoder::getStreamHeaders(NALList& list, Entropy& sbacCoder, Bitstream& bs)
+diff -ru a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp
+--- a/source/encoder/encoder.cpp 2024-09-13 09:51:43.000000000 -0300
++++ b/source/encoder/encoder.cpp 2025-02-03 13:28:37.551336750 -0300
+@@ -3423,6 +3423,15 @@
}
}
@@ -49,11 +47,10 @@ index 5950f87e9..545283474 100644
if (m_param->bEmitInfoSEI)
{
char *opts = x265_param2string(m_param, m_sps.conformanceWindow.rightOffset, m_sps.conformanceWindow.bottomOffset);
-diff --git a/source/encoder/sei.h b/source/encoder/sei.h
-index 03e210639..712e4efb4 100644
---- a/source/encoder/sei.h
-+++ b/source/encoder/sei.h
-@@ -242,6 +242,25 @@ public:
+diff -ru a/source/encoder/sei.h b/source/encoder/sei.h
+--- a/source/encoder/sei.h 2024-09-13 09:51:43.000000000 -0300
++++ b/source/encoder/sei.h 2025-02-03 13:30:41.386953402 -0300
+@@ -464,6 +464,25 @@
}
};
@@ -79,19 +76,18 @@ index 03e210639..712e4efb4 100644
class SEIDecodedPictureHash : public SEI
{
public:
-diff --git a/source/x265.h b/source/x265.h
-index 9f3abd9d9..b6a4d3fe1 100644
---- a/source/x265.h
-+++ b/source/x265.h
-@@ -371,6 +371,7 @@ typedef enum
+diff -ru a/source/x265.h b/source/x265.h
+--- a/source/x265.h 2024-09-13 09:51:43.000000000 -0300
++++ b/source/x265.h 2025-02-03 13:32:46.662499030 -0300
+@@ -371,6 +371,7 @@
MASTERING_DISPLAY_INFO = 137,
CONTENT_LIGHT_LEVEL_INFO = 144,
ALTERNATIVE_TRANSFER_CHARACTERISTICS = 147,
+ AMBIENT_VIEWING_ENVIRONMENT = 148,
- } SEIPayloadType;
-
- typedef struct x265_sei_payload
-@@ -1903,6 +1904,11 @@ typedef struct x265_param
+ ALPHA_CHANNEL_INFO = 165,
+ THREE_DIMENSIONAL_REFERENCE_DISPLAYS_INFO = 176,
+ MULTIVIEW_SCENE_INFO = 178,
+@@ -1956,6 +1957,11 @@
* value to that value. */
uint16_t maxLuma;
@@ -103,7 +99,7 @@ index 9f3abd9d9..b6a4d3fe1 100644
/* Maximum of the picture order count */
int log2MaxPocLsb;
-@@ -2114,6 +2120,9 @@ typedef struct x265_param
+@@ -2167,6 +2173,9 @@
/*Emit content light level info SEI*/
int bEmitCLL;
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index 7991e00bac7642..81ffbd521ca957 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,6 +1,6 @@
# Template file for 'x265'
pkgname=x265
-version=3.6
+version=4.0
revision=1
build_wrksrc=source
build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://x265.org/"
distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=206329b9599c78d06969a1b7b7bb939f7c99a459ab283b2e93f76854bd34ca7b
+checksum=66b64be4b316362fdadb33ad8273a74236042cc380691bdbec42946b0437a389
build_options="altivec assembly"
@@ -22,28 +22,28 @@ case "$XBPS_TARGET_MACHINE" in
ppc64le*) build_options_default="altivec" ;;
# on ARM, enabling it currently fails with undefined reference to
# x265::setupAssemblyPrimitives(x265::EncoderPrimitives&, int)
- x86_64*|i686*) build_options_default="assembly" ;;
+ x86_64* | i686*) build_options_default="assembly" ;;
*) ;;
esac
if [ "$build_option_assembly" ]; then
case "$XBPS_TARGET_MACHINE" in
- x86_64*|i686*)
- # see https://bitbucket.org/multicoreware/x265_git/issues/559
- configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
- hostmakedepends+=" nasm"
- ;;
- *) ;;
+ x86_64* | i686*)
+ # see https://bitbucket.org/multicoreware/x265_git/issues/559
+ configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
+ hostmakedepends+=" nasm"
+ ;;
+ *) ;;
esac
fi
case "$XBPS_TARGET_MACHINE" in
- ppc64*)
- # altivec does not build without power8 being enabled
- configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF)
+ppc64*)
+ # altivec does not build without power8 being enabled
+ configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF)
-DCPU_POWER8=$(vopt_if altivec ON OFF)"
- ;;
- *) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;;
+ ;;
+*) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;;
esac
pre_configure() {
From dd8d2788f9c6d1579e7489be5848f81224783abd Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 16:16:34 -0300
Subject: [PATCH 02/10] ffmpeg: update to 4.4.5.
---
srcpkgs/ffmpeg/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 6b36bcfc98137f..91eccfd78c1b04 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,8 +1,8 @@
# Template file for 'ffmpeg'
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg
-version=4.4.4
-revision=10
+version=4.4.5
+revision=1
build_style=meta
short_desc="Decoding, encoding and streaming software (transitional dummy package)"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
homepage="https://www.ffmpeg.org"
changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
distfiles="https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"
-checksum=e80b380d595c809060f66f96a5d849511ef4a76a26b76eacf5778b94c3570309
+checksum=f9514e0d3515aee5a271283df71636e1d1ff7274b15853bcd84e144be416ab07
hostmakedepends="pkg-config perl"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
From 1bd49db5fb256b57ea87e4e638f91d44118ca930 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 16:16:41 -0300
Subject: [PATCH 03/10] libheif: update to 1.19.5.
---
srcpkgs/libheif/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 8edff25f6f05d4..18d356aa1000c5 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,8 +1,9 @@
-# Template file for 'libheif'.
+# Template file for 'libheif'
pkgname=libheif
-version=1.18.1
-revision=2
+version=1.19.5
+revision=1
build_style=cmake
+configure_args="-DBUILD_TESTING=OFF"
makedepends="libjpeg-turbo-devel libpng-devel libde265-devel x265-devel
libaom-devel"
short_desc="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
@@ -11,7 +12,7 @@ license="LGPL-3.0-or-later"
homepage="https://github.com/strukturag/libheif"
changelog="https://github.com/strukturag/libheif/releases"
distfiles="https://github.com/strukturag/libheif/archive/v${version}.tar.gz"
-checksum=73bc94442038d44d56fe730f72516ae53134eb15b878a7ad89ef60fac93a3318
+checksum=5cd9a3e28493310358e1c1299cd596cc4c7ae5fb985eceb758fa6141424e58bb
libheif-devel_package() {
short_desc+=" - development files"
From ee4e92246b879791624828fc24d4e105a7464b27 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 16:17:29 -0300
Subject: [PATCH 04/10] vlc: revbump for x265-4.0.
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From da402f42918197579f334ccaa7ae15a0a00b5173 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 16:18:02 -0300
Subject: [PATCH 05/10] gimp: revbump for x265-4.0.
---
srcpkgs/gimp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index a50409d5ce5af1..d6d0d3291d2f19 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
# Template file for 'gimp'
pkgname=gimp
version=2.10.38
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-check-update --datadir=/usr/share --disable-python"
hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
From 0a710f15dc41cabbd4a0b275ed6516e2c4618a3c Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 16:18:29 -0300
Subject: [PATCH 06/10] digikam: revbump for x265-4.0.
---
srcpkgs/digikam/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/digikam/template b/srcpkgs/digikam/template
index 1a64d3c760563f..68208cb1f36a93 100644
--- a/srcpkgs/digikam/template
+++ b/srcpkgs/digikam/template
@@ -1,7 +1,7 @@
# Template file for 'digikam'
pkgname=digikam
version=8.5.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DBUILD_WITH_QT6=ON
From faf625b47fea2ce509f0df7c56a45af818dbd787 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 16:19:12 -0300
Subject: [PATCH 07/10] ffmpeg6: revbump for x265-4.0.
---
srcpkgs/ffmpeg6/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ffmpeg6/template b/srcpkgs/ffmpeg6/template
index 9b66727465200e..5ca80c5f1b7f8f 100644
--- a/srcpkgs/ffmpeg6/template
+++ b/srcpkgs/ffmpeg6/template
@@ -2,7 +2,7 @@
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg6
version=6.1.2
-revision=3
+revision=4
hostmakedepends="pkg-config perl"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
libXext-devel libXvMC-devel libxcb-devel lame-devel libtheora-devel
From cb43cce26ac60b5169487649715fc95a445bd21f Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 16:19:42 -0300
Subject: [PATCH 08/10] baresip: revbump for x265-4.0.
---
srcpkgs/baresip/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index 5f5ff9f179a7b2..b81b265a5a39bc 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
# Template file for 'baresip'
pkgname=baresip
version=3.18.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config glib-devel"
makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
From be2fdb7734fc89f0049187705219aa2570d33bac Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 16:56:29 -0300
Subject: [PATCH 09/10] avidemux: revbump for x265-4.0.
---
srcpkgs/avidemux/patches/ADM_x265.patch | 44 +++++++++++++++++++++++++
srcpkgs/avidemux/template | 2 +-
2 files changed, 45 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/avidemux/patches/ADM_x265.patch
diff --git a/srcpkgs/avidemux/patches/ADM_x265.patch b/srcpkgs/avidemux/patches/ADM_x265.patch
new file mode 100644
index 00000000000000..6db76d7ffc332e
--- /dev/null
+++ b/srcpkgs/avidemux/patches/ADM_x265.patch
@@ -0,0 +1,44 @@
+--- a/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp 2022-09-17 10:59:17.000000000 -0300
++++ b/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp 2025-01-26 19:27:19.796218401 -0300
+@@ -205,15 +205,20 @@
+ //
+ x265_nal *nal;
+ uint32_t nbNal = 0;
+- x265_picture pic_out;
+- api->picture_init(¶m,&pic_out);
++ x265_picture pic_out[MAX_SCALABLE_LAYERS];
++ x265_picture *pic_out_ptr[MAX_SCALABLE_LAYERS];
+ out->flags = 0;
+
++ for (int i = 0; i < MAX_SCALABLE_LAYERS; i++)
++ {
++ api->picture_init(¶m,&pic_out[i]);
++ pic_out_ptr[i] = &pic_out[i];
++ }
+ int er;
+ if(false==gotFrame)
+ {
+ ADM_info("Flushing delayed frames\n");
+- er = api->encoder_encode(handle, &nal, &nbNal, NULL, &pic_out);
++ er = api->encoder_encode(handle, &nal, &nbNal, NULL, pic_out_ptr);
+ if(er<=0)
+ {
+ ADM_info ("End of flush\n");
+@@ -221,7 +226,7 @@
+ }
+ }else
+ {
+- er = api->encoder_encode(handle, &nal, &nbNal, &pic, &pic_out);
++ er = api->encoder_encode(handle, &nal, &nbNal, &pic, pic_out_ptr);
+ if(er<0)
+ {
+ ADM_error ("[x265] Error encoding %d\n",er);
+@@ -236,7 +241,7 @@
+
+
+ // 3-encode
+- if(false==postAmble(out,nbNal,nal,&pic_out))
++ if(false==postAmble(out,nbNal,nal,pic_out_ptr[0]))
+ {
+ ADM_warning("[x265] postAmble failed\n");
+ return false;
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index d66f8524bd0e28..b972ecac92ed31 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
# Template file for 'avidemux'
pkgname=avidemux
version=2.8.1
-revision=2
+revision=3
# Can't be compiled for aarch64, arm* or mips*
archs="x86_64* i686*"
hostmakedepends="cmake pkg-config qt5-host-tools qt5-devel tar yasm"
From 276da8c99387b5474e8a7e787fdb634e0e308727 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 16:56:55 -0300
Subject: [PATCH 10/10] handbrake: revbump for x265-4.0.
---
srcpkgs/handbrake/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index d32651a0abd02d..22fb9b6f4eb7d7 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.8.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] X265, ffmpeg and libheif: update
2025-01-20 21:47 [PR PATCH] X265, ffmpeg, handbrake, libheif: update 1is7ac3
` (6 preceding siblings ...)
2025-02-03 19:57 ` 1is7ac3
@ 2025-02-03 20:20 ` 1is7ac3
2025-02-03 20:41 ` 1is7ac3
` (10 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: 1is7ac3 @ 2025-02-03 20:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1247 bytes --]
There is an updated pull request by 1is7ac3 against master on the void-packages repository
https://github.com/1is7ac3/void-packages x265
https://github.com/void-linux/void-packages/pull/54056
X265, ffmpeg and libheif: update
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (X86_64-GLIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
<!-- - armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/54056.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-x265-54056.patch --]
[-- Type: text/x-diff, Size: 24178 bytes --]
From 74caa7a1c165e53fec922db9e2a93e2b02e7c33a Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 16:13:06 -0300
Subject: [PATCH 01/10] x265: update to 4.0.
---
common/shlibs | 2 +-
.../x265/patches/handbrake-ambientlight.patch | 50 +++++++++----------
srcpkgs/x265/template | 28 +++++------
3 files changed, 38 insertions(+), 42 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 175786786b4936..fa604a005cf107 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1953,7 +1953,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
libQt5WebKit.so.5 qt5-webkit-5.6.0_1
libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.209 x265-3.6_1
+libx265.so.212 x265-4.0_1
libQt5Xdg.so.3 libqt5xdg-3.2.0_1
libQt5XdgIconLoader.so.3 libqt5xdg-3.2.0_1
libQt6Xdg.so.4 libqtxdg-4.0.0_1
diff --git a/srcpkgs/x265/patches/handbrake-ambientlight.patch b/srcpkgs/x265/patches/handbrake-ambientlight.patch
index ab36a9c35c9de4..5c966e42f0c373 100644
--- a/srcpkgs/x265/patches/handbrake-ambientlight.patch
+++ b/srcpkgs/x265/patches/handbrake-ambientlight.patch
@@ -1,8 +1,7 @@
-diff --git a/source/common/param.cpp b/source/common/param.cpp
-index 8c32fafa2..0b56235c9 100755
---- a/source/common/param.cpp
-+++ b/source/common/param.cpp
-@@ -378,6 +378,7 @@ void x265_param_default(x265_param* param)
+diff -ru a/source/common/param.cpp b/source/common/param.cpp
+--- a/source/common/param.cpp 2024-09-13 09:51:43.000000000 -0300
++++ b/source/common/param.cpp 2025-02-03 13:27:31.474334833 -0300
+@@ -380,6 +380,7 @@
param->preferredTransferCharacteristics = -1;
param->pictureStructure = -1;
param->bEmitCLL = 1;
@@ -10,7 +9,7 @@ index 8c32fafa2..0b56235c9 100755
param->bEnableFrameDuplication = 0;
param->dupThreshold = 70;
-@@ -1880,6 +1881,7 @@ int x265_check_params(x265_param* param)
+@@ -1929,6 +1930,7 @@
|| param->bEmitIDRRecoverySEI
|| !!param->interlaceMode
|| param->preferredTransferCharacteristics > 1
@@ -18,7 +17,7 @@ index 8c32fafa2..0b56235c9 100755
|| param->toneMapFile
|| param->naluFile);
-@@ -2766,6 +2768,10 @@ void x265_copy_params(x265_param* dst, x265_param* src)
+@@ -2850,6 +2852,10 @@
dst->bEmitCLL = src->bEmitCLL;
dst->maxCLL = src->maxCLL;
dst->maxFALL = src->maxFALL;
@@ -29,11 +28,10 @@ index 8c32fafa2..0b56235c9 100755
dst->log2MaxPocLsb = src->log2MaxPocLsb;
dst->bEmitVUIHRDInfo = src->bEmitVUIHRDInfo;
dst->bEmitVUITimingInfo = src->bEmitVUITimingInfo;
-diff --git a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp
-index 5950f87e9..545283474 100644
---- a/source/encoder/encoder.cpp
-+++ b/source/encoder/encoder.cpp
-@@ -3276,6 +3276,15 @@ void Encoder::getStreamHeaders(NALList& list, Entropy& sbacCoder, Bitstream& bs)
+diff -ru a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp
+--- a/source/encoder/encoder.cpp 2024-09-13 09:51:43.000000000 -0300
++++ b/source/encoder/encoder.cpp 2025-02-03 13:28:37.551336750 -0300
+@@ -3423,6 +3423,15 @@
}
}
@@ -49,11 +47,10 @@ index 5950f87e9..545283474 100644
if (m_param->bEmitInfoSEI)
{
char *opts = x265_param2string(m_param, m_sps.conformanceWindow.rightOffset, m_sps.conformanceWindow.bottomOffset);
-diff --git a/source/encoder/sei.h b/source/encoder/sei.h
-index 03e210639..712e4efb4 100644
---- a/source/encoder/sei.h
-+++ b/source/encoder/sei.h
-@@ -242,6 +242,25 @@ public:
+diff -ru a/source/encoder/sei.h b/source/encoder/sei.h
+--- a/source/encoder/sei.h 2024-09-13 09:51:43.000000000 -0300
++++ b/source/encoder/sei.h 2025-02-03 13:30:41.386953402 -0300
+@@ -464,6 +464,25 @@
}
};
@@ -79,19 +76,18 @@ index 03e210639..712e4efb4 100644
class SEIDecodedPictureHash : public SEI
{
public:
-diff --git a/source/x265.h b/source/x265.h
-index 9f3abd9d9..b6a4d3fe1 100644
---- a/source/x265.h
-+++ b/source/x265.h
-@@ -371,6 +371,7 @@ typedef enum
+diff -ru a/source/x265.h b/source/x265.h
+--- a/source/x265.h 2024-09-13 09:51:43.000000000 -0300
++++ b/source/x265.h 2025-02-03 13:32:46.662499030 -0300
+@@ -371,6 +371,7 @@
MASTERING_DISPLAY_INFO = 137,
CONTENT_LIGHT_LEVEL_INFO = 144,
ALTERNATIVE_TRANSFER_CHARACTERISTICS = 147,
+ AMBIENT_VIEWING_ENVIRONMENT = 148,
- } SEIPayloadType;
-
- typedef struct x265_sei_payload
-@@ -1903,6 +1904,11 @@ typedef struct x265_param
+ ALPHA_CHANNEL_INFO = 165,
+ THREE_DIMENSIONAL_REFERENCE_DISPLAYS_INFO = 176,
+ MULTIVIEW_SCENE_INFO = 178,
+@@ -1956,6 +1957,11 @@
* value to that value. */
uint16_t maxLuma;
@@ -103,7 +99,7 @@ index 9f3abd9d9..b6a4d3fe1 100644
/* Maximum of the picture order count */
int log2MaxPocLsb;
-@@ -2114,6 +2120,9 @@ typedef struct x265_param
+@@ -2167,6 +2173,9 @@
/*Emit content light level info SEI*/
int bEmitCLL;
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index 7991e00bac7642..81ffbd521ca957 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,6 +1,6 @@
# Template file for 'x265'
pkgname=x265
-version=3.6
+version=4.0
revision=1
build_wrksrc=source
build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://x265.org/"
distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=206329b9599c78d06969a1b7b7bb939f7c99a459ab283b2e93f76854bd34ca7b
+checksum=66b64be4b316362fdadb33ad8273a74236042cc380691bdbec42946b0437a389
build_options="altivec assembly"
@@ -22,28 +22,28 @@ case "$XBPS_TARGET_MACHINE" in
ppc64le*) build_options_default="altivec" ;;
# on ARM, enabling it currently fails with undefined reference to
# x265::setupAssemblyPrimitives(x265::EncoderPrimitives&, int)
- x86_64*|i686*) build_options_default="assembly" ;;
+ x86_64* | i686*) build_options_default="assembly" ;;
*) ;;
esac
if [ "$build_option_assembly" ]; then
case "$XBPS_TARGET_MACHINE" in
- x86_64*|i686*)
- # see https://bitbucket.org/multicoreware/x265_git/issues/559
- configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
- hostmakedepends+=" nasm"
- ;;
- *) ;;
+ x86_64* | i686*)
+ # see https://bitbucket.org/multicoreware/x265_git/issues/559
+ configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
+ hostmakedepends+=" nasm"
+ ;;
+ *) ;;
esac
fi
case "$XBPS_TARGET_MACHINE" in
- ppc64*)
- # altivec does not build without power8 being enabled
- configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF)
+ppc64*)
+ # altivec does not build without power8 being enabled
+ configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF)
-DCPU_POWER8=$(vopt_if altivec ON OFF)"
- ;;
- *) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;;
+ ;;
+*) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;;
esac
pre_configure() {
From a62f3d464d90593020e884c8396e38115fed8615 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:15:26 -0300
Subject: [PATCH 02/10] libheif: update to 1.19.5.
---
srcpkgs/libheif/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 8edff25f6f05d4..18d356aa1000c5 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,8 +1,9 @@
-# Template file for 'libheif'.
+# Template file for 'libheif'
pkgname=libheif
-version=1.18.1
-revision=2
+version=1.19.5
+revision=1
build_style=cmake
+configure_args="-DBUILD_TESTING=OFF"
makedepends="libjpeg-turbo-devel libpng-devel libde265-devel x265-devel
libaom-devel"
short_desc="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
@@ -11,7 +12,7 @@ license="LGPL-3.0-or-later"
homepage="https://github.com/strukturag/libheif"
changelog="https://github.com/strukturag/libheif/releases"
distfiles="https://github.com/strukturag/libheif/archive/v${version}.tar.gz"
-checksum=73bc94442038d44d56fe730f72516ae53134eb15b878a7ad89ef60fac93a3318
+checksum=5cd9a3e28493310358e1c1299cd596cc4c7ae5fb985eceb758fa6141424e58bb
libheif-devel_package() {
short_desc+=" - development files"
From 7768b6bef7047a8970652f202da2a70e931b97d7 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:15:47 -0300
Subject: [PATCH 03/10] vlc: revbump for x265-4.0.
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From a54057f2e0addee44f85fa669dc7bb1a56595f36 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:16:11 -0300
Subject: [PATCH 04/10] baresip: revbump for x265-4.0.
---
srcpkgs/baresip/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index 5f5ff9f179a7b2..b81b265a5a39bc 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
# Template file for 'baresip'
pkgname=baresip
version=3.18.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config glib-devel"
makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
From 7b922503d63b53b66f3ded7ec362c80bfc42ecb4 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:16:46 -0300
Subject: [PATCH 05/10] digikam: revbump for x265-4.0.
---
srcpkgs/digikam/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/digikam/template b/srcpkgs/digikam/template
index 1a64d3c760563f..68208cb1f36a93 100644
--- a/srcpkgs/digikam/template
+++ b/srcpkgs/digikam/template
@@ -1,7 +1,7 @@
# Template file for 'digikam'
pkgname=digikam
version=8.5.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DBUILD_WITH_QT6=ON
From 47077ff76f1caa9b62d3db3ae179db041aee3afa Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:17:27 -0300
Subject: [PATCH 06/10] gimp: revbump for x265-4.0.
---
srcpkgs/gimp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index a50409d5ce5af1..d6d0d3291d2f19 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
# Template file for 'gimp'
pkgname=gimp
version=2.10.38
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-check-update --datadir=/usr/share --disable-python"
hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
From 46722a9f48c12579666d5b85ab0aaaff3270f7f3 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:18:00 -0300
Subject: [PATCH 07/10] ffmpeg6: revbump for x265-4.0.
---
srcpkgs/ffmpeg6/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ffmpeg6/template b/srcpkgs/ffmpeg6/template
index 9b66727465200e..5ca80c5f1b7f8f 100644
--- a/srcpkgs/ffmpeg6/template
+++ b/srcpkgs/ffmpeg6/template
@@ -2,7 +2,7 @@
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg6
version=6.1.2
-revision=3
+revision=4
hostmakedepends="pkg-config perl"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
libXext-devel libXvMC-devel libxcb-devel lame-devel libtheora-devel
From 1275f080def1d2befa0bb824f704a2a029bc97bd Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:18:43 -0300
Subject: [PATCH 08/10] avidemux: revbump for x265-4.0.
---
srcpkgs/avidemux/patches/ADM_x265.patch | 44 +++++++++++++++++++++++++
srcpkgs/avidemux/template | 2 +-
2 files changed, 45 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/avidemux/patches/ADM_x265.patch
diff --git a/srcpkgs/avidemux/patches/ADM_x265.patch b/srcpkgs/avidemux/patches/ADM_x265.patch
new file mode 100644
index 00000000000000..6db76d7ffc332e
--- /dev/null
+++ b/srcpkgs/avidemux/patches/ADM_x265.patch
@@ -0,0 +1,44 @@
+--- a/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp 2022-09-17 10:59:17.000000000 -0300
++++ b/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp 2025-01-26 19:27:19.796218401 -0300
+@@ -205,15 +205,20 @@
+ //
+ x265_nal *nal;
+ uint32_t nbNal = 0;
+- x265_picture pic_out;
+- api->picture_init(¶m,&pic_out);
++ x265_picture pic_out[MAX_SCALABLE_LAYERS];
++ x265_picture *pic_out_ptr[MAX_SCALABLE_LAYERS];
+ out->flags = 0;
+
++ for (int i = 0; i < MAX_SCALABLE_LAYERS; i++)
++ {
++ api->picture_init(¶m,&pic_out[i]);
++ pic_out_ptr[i] = &pic_out[i];
++ }
+ int er;
+ if(false==gotFrame)
+ {
+ ADM_info("Flushing delayed frames\n");
+- er = api->encoder_encode(handle, &nal, &nbNal, NULL, &pic_out);
++ er = api->encoder_encode(handle, &nal, &nbNal, NULL, pic_out_ptr);
+ if(er<=0)
+ {
+ ADM_info ("End of flush\n");
+@@ -221,7 +226,7 @@
+ }
+ }else
+ {
+- er = api->encoder_encode(handle, &nal, &nbNal, &pic, &pic_out);
++ er = api->encoder_encode(handle, &nal, &nbNal, &pic, pic_out_ptr);
+ if(er<0)
+ {
+ ADM_error ("[x265] Error encoding %d\n",er);
+@@ -236,7 +241,7 @@
+
+
+ // 3-encode
+- if(false==postAmble(out,nbNal,nal,&pic_out))
++ if(false==postAmble(out,nbNal,nal,pic_out_ptr[0]))
+ {
+ ADM_warning("[x265] postAmble failed\n");
+ return false;
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index d66f8524bd0e28..b972ecac92ed31 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
# Template file for 'avidemux'
pkgname=avidemux
version=2.8.1
-revision=2
+revision=3
# Can't be compiled for aarch64, arm* or mips*
archs="x86_64* i686*"
hostmakedepends="cmake pkg-config qt5-host-tools qt5-devel tar yasm"
From 679f12c2bba2ba0d5a2b41095ea6093a5f86d9f3 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:18:59 -0300
Subject: [PATCH 09/10] ffmpeg: update to 4.4.5.
---
.../patches/armv5tel-floating-point.patch | 18 -----
srcpkgs/ffmpeg/patches/binutils-2.41.patch | 73 -------------------
...h-libavcodec-libsvtav1-ten_bit_format.diff | 40 ----------
.../workaround-mesa-readeon-vaapi-bug.patch | 28 -------
srcpkgs/ffmpeg/template | 6 +-
5 files changed, 3 insertions(+), 162 deletions(-)
delete mode 100644 srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
delete mode 100644 srcpkgs/ffmpeg/patches/binutils-2.41.patch
delete mode 100644 srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
delete mode 100644 srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch
diff --git a/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch b/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
deleted file mode 100644
index 9a55178c74f0fd..00000000000000
--- a/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/libavfilter/vf_drawtext.c 2017-10-26 21:03:03.000000000 +0200
-+++ b/libavfilter/vf_drawtext.c 2017-11-21 11:06:49.602284422 +0100
-@@ -39,6 +39,15 @@
- #endif
- #include <fenv.h>
-
-+#if (FE_ALL_EXCEPT == 0)
-+/* E.g. ARM soft float does not define these */
-+#define FE_INVALID 0
-+#define FE_DIVBYZERO 0
-+#define FE_OVERFLOW 0
-+#define FE_UNDERFLOW 0
-+#define FE_INEXACT 0
-+#endif
-+
- #if CONFIG_LIBFONTCONFIG
- #include <fontconfig/fontconfig.h>
- #endif
diff --git a/srcpkgs/ffmpeg/patches/binutils-2.41.patch b/srcpkgs/ffmpeg/patches/binutils-2.41.patch
deleted file mode 100644
index 53a596d0ee7d4e..00000000000000
--- a/srcpkgs/ffmpeg/patches/binutils-2.41.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
-Date: Sun, 16 Jul 2023 18:18:02 +0300
-Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift
- instructions within inline assembly
-
-Fixes assembling with binutil as >= 2.41
-
-Signed-off-by: James Almer <jamrial@gmail.com>
----
- libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++---
- 1 file changed, 23 insertions(+), 3 deletions(-)
-
-diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
-index 6298f5ed1983b..ca7e2dffc1076 100644
---- a/libavcodec/x86/mathops.h
-+++ b/libavcodec/x86/mathops.h
-@@ -35,12 +35,20 @@
- static av_always_inline av_const int MULL(int a, int b, unsigned shift)
- {
- int rt, dummy;
-+ if (__builtin_constant_p(shift))
- __asm__ (
- "imull %3 \n\t"
- "shrdl %4, %%edx, %%eax \n\t"
- :"=a"(rt), "=d"(dummy)
-- :"a"(a), "rm"(b), "ci"((uint8_t)shift)
-+ :"a"(a), "rm"(b), "i"(shift & 0x1F)
- );
-+ else
-+ __asm__ (
-+ "imull %3 \n\t"
-+ "shrdl %4, %%edx, %%eax \n\t"
-+ :"=a"(rt), "=d"(dummy)
-+ :"a"(a), "rm"(b), "c"((uint8_t)shift)
-+ );
- return rt;
- }
-
-@@ -113,19 +121,31 @@ __asm__ volatile(\
- // avoid +32 for shift optimization (gcc should do that ...)
- #define NEG_SSR32 NEG_SSR32
- static inline int32_t NEG_SSR32( int32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("sarl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("sarl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
- #define NEG_USR32 NEG_USR32
- static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("shrl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("shrl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
diff --git a/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff b/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
deleted file mode 100644
index aa948f7a8a2dfb..00000000000000
--- a/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-#==================================================================================================
-# From 031f1561cd286596cdb374da32f8aa816ce3b135 Mon Sep 17 00:00:00 2001
-# From: Christopher Degawa <christopher.degawa@intel.com>
-# Date: Thu, 20 Oct 2022 22:55:27 -0500
-# Subject: [PATCH] avcodec/libsvtav1: remove compressed_ten_bit_format and simplify alloc_buffer
-#
-# compressed_ten_bit_format has been deprecated upstream and has no effect
-# and can be removed. Plus, technically it was never used in the first place
-# since it would require the app (ffmpeg) to set it and do additional
-# processing of the input frames.
-#
-# Also simplify alloc_buffer by removing calculations relating to the non-existant processing.
-#
-# Signed-off-by: Christopher Degawa <christopher.degawa@intel.com>
-#==================================================================================================
---- a/libavcodec/libsvtav1.c
-+++ b/libavcodec/libsvtav1.c
-@@ -124,16 +124,12 @@ static int svt_print_error(void *log_ctx, EbErrorType err,
-
- static int alloc_buffer(EbSvtAv1EncConfiguration *config, SvtContext *svt_enc)
- {
-- const int pack_mode_10bit =
-- (config->encoder_bit_depth > 8) && (config->compressed_ten_bit_format == 0) ? 1 : 0;
-- const size_t luma_size_8bit =
-- config->source_width * config->source_height * (1 << pack_mode_10bit);
-- const size_t luma_size_10bit =
-- (config->encoder_bit_depth > 8 && pack_mode_10bit == 0) ? luma_size_8bit : 0;
-+ const size_t luma_size = config->source_width * config->source_height *
-+ (config->encoder_bit_depth > 8 ? 2 : 1);
-
- EbSvtIOFormat *in_data;
-
-- svt_enc->raw_size = (luma_size_8bit + luma_size_10bit) * 3 / 2;
-+ svt_enc->raw_size = luma_size * 3 / 2;
-
- // allocate buffer for in and out
- svt_enc->in_buf = av_mallocz(sizeof(*svt_enc->in_buf));
---
-GitLab
-
diff --git a/srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch b/srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch
deleted file mode 100644
index 00e3f68a415b84..00000000000000
--- a/srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 811d290844206fc73dc39c3e5b67d5d895baedf8 Mon Sep 17 00:00:00 2001
-From: Rainer Hochecker <fernetmenta@online.de>
-Date: Sat, 26 Jan 2019 19:48:35 +0100
-Subject: [PATCH] avcodec/vaapi_h264: skip decode if pic has no slices
-
-This fixes / workarounds https://bugs.freedesktop.org/show_bug.cgi?id=105368.
-It was hit frequently when watching h264 channels received via DVB-X.
-Corresponding kodi bug: https://github.com/xbmc/xbmc/issues/15704
----
- libavcodec/vaapi_h264.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c
-index 5854587a255..f12fdc457a4 100644
---- a/libavcodec/vaapi_h264.c
-+++ b/libavcodec/vaapi_h264.c
-@@ -317,6 +317,11 @@ static int vaapi_h264_end_frame(AVCodecContext *avctx)
- H264SliceContext *sl = &h->slice_ctx[0];
- int ret;
-
-+ if (pic->nb_slices == 0) {
-+ ret = AVERROR_INVALIDDATA;
-+ goto finish;
-+ }
-+
- ret = ff_vaapi_decode_issue(avctx, pic);
- if (ret < 0)
- goto finish;
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 6b36bcfc98137f..91eccfd78c1b04 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,8 +1,8 @@
# Template file for 'ffmpeg'
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg
-version=4.4.4
-revision=10
+version=4.4.5
+revision=1
build_style=meta
short_desc="Decoding, encoding and streaming software (transitional dummy package)"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
homepage="https://www.ffmpeg.org"
changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
distfiles="https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"
-checksum=e80b380d595c809060f66f96a5d849511ef4a76a26b76eacf5778b94c3570309
+checksum=f9514e0d3515aee5a271283df71636e1d1ff7274b15853bcd84e144be416ab07
hostmakedepends="pkg-config perl"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
From 47a16b17ed9c2642d2f9d6fc848b5cabc958932d Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:19:33 -0300
Subject: [PATCH 10/10] handbrake: revbump for x265-4.0.
---
srcpkgs/handbrake/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index d32651a0abd02d..22fb9b6f4eb7d7 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.8.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] X265, ffmpeg and libheif: update
2025-01-20 21:47 [PR PATCH] X265, ffmpeg, handbrake, libheif: update 1is7ac3
` (7 preceding siblings ...)
2025-02-03 20:20 ` 1is7ac3
@ 2025-02-03 20:41 ` 1is7ac3
2025-02-06 4:16 ` 1is7ac3
` (9 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: 1is7ac3 @ 2025-02-03 20:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1247 bytes --]
There is an updated pull request by 1is7ac3 against master on the void-packages repository
https://github.com/1is7ac3/void-packages x265
https://github.com/void-linux/void-packages/pull/54056
X265, ffmpeg and libheif: update
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (X86_64-GLIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
<!-- - armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/54056.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-x265-54056.patch --]
[-- Type: text/x-diff, Size: 24178 bytes --]
From 6f9e74d9349a03d627139407cd0d12048cc9a8f5 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 16:13:06 -0300
Subject: [PATCH 01/10] x265: update to 4.0.
---
common/shlibs | 2 +-
.../x265/patches/handbrake-ambientlight.patch | 50 +++++++++----------
srcpkgs/x265/template | 28 +++++------
3 files changed, 38 insertions(+), 42 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index c03c19f37b8cde..5058498ba3c5b7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1953,7 +1953,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
libQt5WebKit.so.5 qt5-webkit-5.6.0_1
libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.209 x265-3.6_1
+libx265.so.212 x265-4.0_1
libQt5Xdg.so.3 libqt5xdg-3.2.0_1
libQt5XdgIconLoader.so.3 libqt5xdg-3.2.0_1
libQt6Xdg.so.4 libqtxdg-4.0.0_1
diff --git a/srcpkgs/x265/patches/handbrake-ambientlight.patch b/srcpkgs/x265/patches/handbrake-ambientlight.patch
index ab36a9c35c9de4..5c966e42f0c373 100644
--- a/srcpkgs/x265/patches/handbrake-ambientlight.patch
+++ b/srcpkgs/x265/patches/handbrake-ambientlight.patch
@@ -1,8 +1,7 @@
-diff --git a/source/common/param.cpp b/source/common/param.cpp
-index 8c32fafa2..0b56235c9 100755
---- a/source/common/param.cpp
-+++ b/source/common/param.cpp
-@@ -378,6 +378,7 @@ void x265_param_default(x265_param* param)
+diff -ru a/source/common/param.cpp b/source/common/param.cpp
+--- a/source/common/param.cpp 2024-09-13 09:51:43.000000000 -0300
++++ b/source/common/param.cpp 2025-02-03 13:27:31.474334833 -0300
+@@ -380,6 +380,7 @@
param->preferredTransferCharacteristics = -1;
param->pictureStructure = -1;
param->bEmitCLL = 1;
@@ -10,7 +9,7 @@ index 8c32fafa2..0b56235c9 100755
param->bEnableFrameDuplication = 0;
param->dupThreshold = 70;
-@@ -1880,6 +1881,7 @@ int x265_check_params(x265_param* param)
+@@ -1929,6 +1930,7 @@
|| param->bEmitIDRRecoverySEI
|| !!param->interlaceMode
|| param->preferredTransferCharacteristics > 1
@@ -18,7 +17,7 @@ index 8c32fafa2..0b56235c9 100755
|| param->toneMapFile
|| param->naluFile);
-@@ -2766,6 +2768,10 @@ void x265_copy_params(x265_param* dst, x265_param* src)
+@@ -2850,6 +2852,10 @@
dst->bEmitCLL = src->bEmitCLL;
dst->maxCLL = src->maxCLL;
dst->maxFALL = src->maxFALL;
@@ -29,11 +28,10 @@ index 8c32fafa2..0b56235c9 100755
dst->log2MaxPocLsb = src->log2MaxPocLsb;
dst->bEmitVUIHRDInfo = src->bEmitVUIHRDInfo;
dst->bEmitVUITimingInfo = src->bEmitVUITimingInfo;
-diff --git a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp
-index 5950f87e9..545283474 100644
---- a/source/encoder/encoder.cpp
-+++ b/source/encoder/encoder.cpp
-@@ -3276,6 +3276,15 @@ void Encoder::getStreamHeaders(NALList& list, Entropy& sbacCoder, Bitstream& bs)
+diff -ru a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp
+--- a/source/encoder/encoder.cpp 2024-09-13 09:51:43.000000000 -0300
++++ b/source/encoder/encoder.cpp 2025-02-03 13:28:37.551336750 -0300
+@@ -3423,6 +3423,15 @@
}
}
@@ -49,11 +47,10 @@ index 5950f87e9..545283474 100644
if (m_param->bEmitInfoSEI)
{
char *opts = x265_param2string(m_param, m_sps.conformanceWindow.rightOffset, m_sps.conformanceWindow.bottomOffset);
-diff --git a/source/encoder/sei.h b/source/encoder/sei.h
-index 03e210639..712e4efb4 100644
---- a/source/encoder/sei.h
-+++ b/source/encoder/sei.h
-@@ -242,6 +242,25 @@ public:
+diff -ru a/source/encoder/sei.h b/source/encoder/sei.h
+--- a/source/encoder/sei.h 2024-09-13 09:51:43.000000000 -0300
++++ b/source/encoder/sei.h 2025-02-03 13:30:41.386953402 -0300
+@@ -464,6 +464,25 @@
}
};
@@ -79,19 +76,18 @@ index 03e210639..712e4efb4 100644
class SEIDecodedPictureHash : public SEI
{
public:
-diff --git a/source/x265.h b/source/x265.h
-index 9f3abd9d9..b6a4d3fe1 100644
---- a/source/x265.h
-+++ b/source/x265.h
-@@ -371,6 +371,7 @@ typedef enum
+diff -ru a/source/x265.h b/source/x265.h
+--- a/source/x265.h 2024-09-13 09:51:43.000000000 -0300
++++ b/source/x265.h 2025-02-03 13:32:46.662499030 -0300
+@@ -371,6 +371,7 @@
MASTERING_DISPLAY_INFO = 137,
CONTENT_LIGHT_LEVEL_INFO = 144,
ALTERNATIVE_TRANSFER_CHARACTERISTICS = 147,
+ AMBIENT_VIEWING_ENVIRONMENT = 148,
- } SEIPayloadType;
-
- typedef struct x265_sei_payload
-@@ -1903,6 +1904,11 @@ typedef struct x265_param
+ ALPHA_CHANNEL_INFO = 165,
+ THREE_DIMENSIONAL_REFERENCE_DISPLAYS_INFO = 176,
+ MULTIVIEW_SCENE_INFO = 178,
+@@ -1956,6 +1957,11 @@
* value to that value. */
uint16_t maxLuma;
@@ -103,7 +99,7 @@ index 9f3abd9d9..b6a4d3fe1 100644
/* Maximum of the picture order count */
int log2MaxPocLsb;
-@@ -2114,6 +2120,9 @@ typedef struct x265_param
+@@ -2167,6 +2173,9 @@
/*Emit content light level info SEI*/
int bEmitCLL;
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index 7991e00bac7642..81ffbd521ca957 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,6 +1,6 @@
# Template file for 'x265'
pkgname=x265
-version=3.6
+version=4.0
revision=1
build_wrksrc=source
build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://x265.org/"
distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=206329b9599c78d06969a1b7b7bb939f7c99a459ab283b2e93f76854bd34ca7b
+checksum=66b64be4b316362fdadb33ad8273a74236042cc380691bdbec42946b0437a389
build_options="altivec assembly"
@@ -22,28 +22,28 @@ case "$XBPS_TARGET_MACHINE" in
ppc64le*) build_options_default="altivec" ;;
# on ARM, enabling it currently fails with undefined reference to
# x265::setupAssemblyPrimitives(x265::EncoderPrimitives&, int)
- x86_64*|i686*) build_options_default="assembly" ;;
+ x86_64* | i686*) build_options_default="assembly" ;;
*) ;;
esac
if [ "$build_option_assembly" ]; then
case "$XBPS_TARGET_MACHINE" in
- x86_64*|i686*)
- # see https://bitbucket.org/multicoreware/x265_git/issues/559
- configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
- hostmakedepends+=" nasm"
- ;;
- *) ;;
+ x86_64* | i686*)
+ # see https://bitbucket.org/multicoreware/x265_git/issues/559
+ configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
+ hostmakedepends+=" nasm"
+ ;;
+ *) ;;
esac
fi
case "$XBPS_TARGET_MACHINE" in
- ppc64*)
- # altivec does not build without power8 being enabled
- configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF)
+ppc64*)
+ # altivec does not build without power8 being enabled
+ configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF)
-DCPU_POWER8=$(vopt_if altivec ON OFF)"
- ;;
- *) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;;
+ ;;
+*) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;;
esac
pre_configure() {
From d26d17b25a3a21be38110eee9815e327b2ee8e23 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:15:26 -0300
Subject: [PATCH 02/10] libheif: update to 1.19.5.
---
srcpkgs/libheif/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 8edff25f6f05d4..18d356aa1000c5 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,8 +1,9 @@
-# Template file for 'libheif'.
+# Template file for 'libheif'
pkgname=libheif
-version=1.18.1
-revision=2
+version=1.19.5
+revision=1
build_style=cmake
+configure_args="-DBUILD_TESTING=OFF"
makedepends="libjpeg-turbo-devel libpng-devel libde265-devel x265-devel
libaom-devel"
short_desc="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
@@ -11,7 +12,7 @@ license="LGPL-3.0-or-later"
homepage="https://github.com/strukturag/libheif"
changelog="https://github.com/strukturag/libheif/releases"
distfiles="https://github.com/strukturag/libheif/archive/v${version}.tar.gz"
-checksum=73bc94442038d44d56fe730f72516ae53134eb15b878a7ad89ef60fac93a3318
+checksum=5cd9a3e28493310358e1c1299cd596cc4c7ae5fb985eceb758fa6141424e58bb
libheif-devel_package() {
short_desc+=" - development files"
From fcc60254196ad84727fb80061b2882bb4db64a32 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:15:47 -0300
Subject: [PATCH 03/10] vlc: revbump for x265-4.0.
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From f617669dcbfa1552c85f2120f2607684f5851d2e Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:16:11 -0300
Subject: [PATCH 04/10] baresip: revbump for x265-4.0.
---
srcpkgs/baresip/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index 5f5ff9f179a7b2..b81b265a5a39bc 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
# Template file for 'baresip'
pkgname=baresip
version=3.18.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config glib-devel"
makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
From 1c7443979b6e570219add20e46e56e09e5d677d1 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:16:46 -0300
Subject: [PATCH 05/10] digikam: revbump for x265-4.0.
---
srcpkgs/digikam/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/digikam/template b/srcpkgs/digikam/template
index 1a64d3c760563f..68208cb1f36a93 100644
--- a/srcpkgs/digikam/template
+++ b/srcpkgs/digikam/template
@@ -1,7 +1,7 @@
# Template file for 'digikam'
pkgname=digikam
version=8.5.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DBUILD_WITH_QT6=ON
From fb16c680d85c07c9bbf682735fd9f16dcf75b7ec Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:17:27 -0300
Subject: [PATCH 06/10] gimp: revbump for x265-4.0.
---
srcpkgs/gimp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index a50409d5ce5af1..d6d0d3291d2f19 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
# Template file for 'gimp'
pkgname=gimp
version=2.10.38
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-check-update --datadir=/usr/share --disable-python"
hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
From 1582410ffa138fa7223ae7f7eae62ca0948c5cdc Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:18:00 -0300
Subject: [PATCH 07/10] ffmpeg6: revbump for x265-4.0.
---
srcpkgs/ffmpeg6/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ffmpeg6/template b/srcpkgs/ffmpeg6/template
index 9b66727465200e..5ca80c5f1b7f8f 100644
--- a/srcpkgs/ffmpeg6/template
+++ b/srcpkgs/ffmpeg6/template
@@ -2,7 +2,7 @@
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg6
version=6.1.2
-revision=3
+revision=4
hostmakedepends="pkg-config perl"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
libXext-devel libXvMC-devel libxcb-devel lame-devel libtheora-devel
From d4a2c21b8a489ac8cd0e637bf6b5232cd5cd1901 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:18:43 -0300
Subject: [PATCH 08/10] avidemux: revbump for x265-4.0.
---
srcpkgs/avidemux/patches/ADM_x265.patch | 44 +++++++++++++++++++++++++
srcpkgs/avidemux/template | 2 +-
2 files changed, 45 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/avidemux/patches/ADM_x265.patch
diff --git a/srcpkgs/avidemux/patches/ADM_x265.patch b/srcpkgs/avidemux/patches/ADM_x265.patch
new file mode 100644
index 00000000000000..6db76d7ffc332e
--- /dev/null
+++ b/srcpkgs/avidemux/patches/ADM_x265.patch
@@ -0,0 +1,44 @@
+--- a/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp 2022-09-17 10:59:17.000000000 -0300
++++ b/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp 2025-01-26 19:27:19.796218401 -0300
+@@ -205,15 +205,20 @@
+ //
+ x265_nal *nal;
+ uint32_t nbNal = 0;
+- x265_picture pic_out;
+- api->picture_init(¶m,&pic_out);
++ x265_picture pic_out[MAX_SCALABLE_LAYERS];
++ x265_picture *pic_out_ptr[MAX_SCALABLE_LAYERS];
+ out->flags = 0;
+
++ for (int i = 0; i < MAX_SCALABLE_LAYERS; i++)
++ {
++ api->picture_init(¶m,&pic_out[i]);
++ pic_out_ptr[i] = &pic_out[i];
++ }
+ int er;
+ if(false==gotFrame)
+ {
+ ADM_info("Flushing delayed frames\n");
+- er = api->encoder_encode(handle, &nal, &nbNal, NULL, &pic_out);
++ er = api->encoder_encode(handle, &nal, &nbNal, NULL, pic_out_ptr);
+ if(er<=0)
+ {
+ ADM_info ("End of flush\n");
+@@ -221,7 +226,7 @@
+ }
+ }else
+ {
+- er = api->encoder_encode(handle, &nal, &nbNal, &pic, &pic_out);
++ er = api->encoder_encode(handle, &nal, &nbNal, &pic, pic_out_ptr);
+ if(er<0)
+ {
+ ADM_error ("[x265] Error encoding %d\n",er);
+@@ -236,7 +241,7 @@
+
+
+ // 3-encode
+- if(false==postAmble(out,nbNal,nal,&pic_out))
++ if(false==postAmble(out,nbNal,nal,pic_out_ptr[0]))
+ {
+ ADM_warning("[x265] postAmble failed\n");
+ return false;
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index d66f8524bd0e28..b972ecac92ed31 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
# Template file for 'avidemux'
pkgname=avidemux
version=2.8.1
-revision=2
+revision=3
# Can't be compiled for aarch64, arm* or mips*
archs="x86_64* i686*"
hostmakedepends="cmake pkg-config qt5-host-tools qt5-devel tar yasm"
From e08cadb1556168792ca6dc8fdcf79e3ec21c67df Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:18:59 -0300
Subject: [PATCH 09/10] ffmpeg: update to 4.4.5.
---
.../patches/armv5tel-floating-point.patch | 18 -----
srcpkgs/ffmpeg/patches/binutils-2.41.patch | 73 -------------------
...h-libavcodec-libsvtav1-ten_bit_format.diff | 40 ----------
.../workaround-mesa-readeon-vaapi-bug.patch | 28 -------
srcpkgs/ffmpeg/template | 6 +-
5 files changed, 3 insertions(+), 162 deletions(-)
delete mode 100644 srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
delete mode 100644 srcpkgs/ffmpeg/patches/binutils-2.41.patch
delete mode 100644 srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
delete mode 100644 srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch
diff --git a/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch b/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
deleted file mode 100644
index 9a55178c74f0fd..00000000000000
--- a/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/libavfilter/vf_drawtext.c 2017-10-26 21:03:03.000000000 +0200
-+++ b/libavfilter/vf_drawtext.c 2017-11-21 11:06:49.602284422 +0100
-@@ -39,6 +39,15 @@
- #endif
- #include <fenv.h>
-
-+#if (FE_ALL_EXCEPT == 0)
-+/* E.g. ARM soft float does not define these */
-+#define FE_INVALID 0
-+#define FE_DIVBYZERO 0
-+#define FE_OVERFLOW 0
-+#define FE_UNDERFLOW 0
-+#define FE_INEXACT 0
-+#endif
-+
- #if CONFIG_LIBFONTCONFIG
- #include <fontconfig/fontconfig.h>
- #endif
diff --git a/srcpkgs/ffmpeg/patches/binutils-2.41.patch b/srcpkgs/ffmpeg/patches/binutils-2.41.patch
deleted file mode 100644
index 53a596d0ee7d4e..00000000000000
--- a/srcpkgs/ffmpeg/patches/binutils-2.41.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
-Date: Sun, 16 Jul 2023 18:18:02 +0300
-Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift
- instructions within inline assembly
-
-Fixes assembling with binutil as >= 2.41
-
-Signed-off-by: James Almer <jamrial@gmail.com>
----
- libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++---
- 1 file changed, 23 insertions(+), 3 deletions(-)
-
-diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
-index 6298f5ed1983b..ca7e2dffc1076 100644
---- a/libavcodec/x86/mathops.h
-+++ b/libavcodec/x86/mathops.h
-@@ -35,12 +35,20 @@
- static av_always_inline av_const int MULL(int a, int b, unsigned shift)
- {
- int rt, dummy;
-+ if (__builtin_constant_p(shift))
- __asm__ (
- "imull %3 \n\t"
- "shrdl %4, %%edx, %%eax \n\t"
- :"=a"(rt), "=d"(dummy)
-- :"a"(a), "rm"(b), "ci"((uint8_t)shift)
-+ :"a"(a), "rm"(b), "i"(shift & 0x1F)
- );
-+ else
-+ __asm__ (
-+ "imull %3 \n\t"
-+ "shrdl %4, %%edx, %%eax \n\t"
-+ :"=a"(rt), "=d"(dummy)
-+ :"a"(a), "rm"(b), "c"((uint8_t)shift)
-+ );
- return rt;
- }
-
-@@ -113,19 +121,31 @@ __asm__ volatile(\
- // avoid +32 for shift optimization (gcc should do that ...)
- #define NEG_SSR32 NEG_SSR32
- static inline int32_t NEG_SSR32( int32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("sarl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("sarl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
- #define NEG_USR32 NEG_USR32
- static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("shrl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("shrl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
diff --git a/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff b/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
deleted file mode 100644
index aa948f7a8a2dfb..00000000000000
--- a/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-#==================================================================================================
-# From 031f1561cd286596cdb374da32f8aa816ce3b135 Mon Sep 17 00:00:00 2001
-# From: Christopher Degawa <christopher.degawa@intel.com>
-# Date: Thu, 20 Oct 2022 22:55:27 -0500
-# Subject: [PATCH] avcodec/libsvtav1: remove compressed_ten_bit_format and simplify alloc_buffer
-#
-# compressed_ten_bit_format has been deprecated upstream and has no effect
-# and can be removed. Plus, technically it was never used in the first place
-# since it would require the app (ffmpeg) to set it and do additional
-# processing of the input frames.
-#
-# Also simplify alloc_buffer by removing calculations relating to the non-existant processing.
-#
-# Signed-off-by: Christopher Degawa <christopher.degawa@intel.com>
-#==================================================================================================
---- a/libavcodec/libsvtav1.c
-+++ b/libavcodec/libsvtav1.c
-@@ -124,16 +124,12 @@ static int svt_print_error(void *log_ctx, EbErrorType err,
-
- static int alloc_buffer(EbSvtAv1EncConfiguration *config, SvtContext *svt_enc)
- {
-- const int pack_mode_10bit =
-- (config->encoder_bit_depth > 8) && (config->compressed_ten_bit_format == 0) ? 1 : 0;
-- const size_t luma_size_8bit =
-- config->source_width * config->source_height * (1 << pack_mode_10bit);
-- const size_t luma_size_10bit =
-- (config->encoder_bit_depth > 8 && pack_mode_10bit == 0) ? luma_size_8bit : 0;
-+ const size_t luma_size = config->source_width * config->source_height *
-+ (config->encoder_bit_depth > 8 ? 2 : 1);
-
- EbSvtIOFormat *in_data;
-
-- svt_enc->raw_size = (luma_size_8bit + luma_size_10bit) * 3 / 2;
-+ svt_enc->raw_size = luma_size * 3 / 2;
-
- // allocate buffer for in and out
- svt_enc->in_buf = av_mallocz(sizeof(*svt_enc->in_buf));
---
-GitLab
-
diff --git a/srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch b/srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch
deleted file mode 100644
index 00e3f68a415b84..00000000000000
--- a/srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 811d290844206fc73dc39c3e5b67d5d895baedf8 Mon Sep 17 00:00:00 2001
-From: Rainer Hochecker <fernetmenta@online.de>
-Date: Sat, 26 Jan 2019 19:48:35 +0100
-Subject: [PATCH] avcodec/vaapi_h264: skip decode if pic has no slices
-
-This fixes / workarounds https://bugs.freedesktop.org/show_bug.cgi?id=105368.
-It was hit frequently when watching h264 channels received via DVB-X.
-Corresponding kodi bug: https://github.com/xbmc/xbmc/issues/15704
----
- libavcodec/vaapi_h264.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c
-index 5854587a255..f12fdc457a4 100644
---- a/libavcodec/vaapi_h264.c
-+++ b/libavcodec/vaapi_h264.c
-@@ -317,6 +317,11 @@ static int vaapi_h264_end_frame(AVCodecContext *avctx)
- H264SliceContext *sl = &h->slice_ctx[0];
- int ret;
-
-+ if (pic->nb_slices == 0) {
-+ ret = AVERROR_INVALIDDATA;
-+ goto finish;
-+ }
-+
- ret = ff_vaapi_decode_issue(avctx, pic);
- if (ret < 0)
- goto finish;
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 6b36bcfc98137f..91eccfd78c1b04 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,8 +1,8 @@
# Template file for 'ffmpeg'
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg
-version=4.4.4
-revision=10
+version=4.4.5
+revision=1
build_style=meta
short_desc="Decoding, encoding and streaming software (transitional dummy package)"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
homepage="https://www.ffmpeg.org"
changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
distfiles="https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"
-checksum=e80b380d595c809060f66f96a5d849511ef4a76a26b76eacf5778b94c3570309
+checksum=f9514e0d3515aee5a271283df71636e1d1ff7274b15853bcd84e144be416ab07
hostmakedepends="pkg-config perl"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
From c999c639ea7908d8d965eee58faa8e4847833952 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:19:33 -0300
Subject: [PATCH 10/10] handbrake: revbump for x265-4.0.
---
srcpkgs/handbrake/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index d32651a0abd02d..22fb9b6f4eb7d7 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.8.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] X265, ffmpeg and libheif: update
2025-01-20 21:47 [PR PATCH] X265, ffmpeg, handbrake, libheif: update 1is7ac3
` (8 preceding siblings ...)
2025-02-03 20:41 ` 1is7ac3
@ 2025-02-06 4:16 ` 1is7ac3
2025-03-24 0:07 ` 1is7ac3
` (8 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: 1is7ac3 @ 2025-02-06 4:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1247 bytes --]
There is an updated pull request by 1is7ac3 against master on the void-packages repository
https://github.com/1is7ac3/void-packages x265
https://github.com/void-linux/void-packages/pull/54056
X265, ffmpeg and libheif: update
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (X86_64-GLIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
<!-- - armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/54056.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-x265-54056.patch --]
[-- Type: text/x-diff, Size: 24178 bytes --]
From ce55da0c8721e963b938ec800c6943b74ab7fc76 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 16:13:06 -0300
Subject: [PATCH 01/10] x265: update to 4.0.
---
common/shlibs | 2 +-
.../x265/patches/handbrake-ambientlight.patch | 50 +++++++++----------
srcpkgs/x265/template | 28 +++++------
3 files changed, 38 insertions(+), 42 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index d402931a0fe9a4..5839a46bff8923 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1953,7 +1953,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
libQt5WebKit.so.5 qt5-webkit-5.6.0_1
libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.209 x265-3.6_1
+libx265.so.212 x265-4.0_1
libQt5Xdg.so.3 libqt5xdg-3.2.0_1
libQt5XdgIconLoader.so.3 libqt5xdg-3.2.0_1
libQt6Xdg.so.4 libqtxdg-4.0.0_1
diff --git a/srcpkgs/x265/patches/handbrake-ambientlight.patch b/srcpkgs/x265/patches/handbrake-ambientlight.patch
index ab36a9c35c9de4..5c966e42f0c373 100644
--- a/srcpkgs/x265/patches/handbrake-ambientlight.patch
+++ b/srcpkgs/x265/patches/handbrake-ambientlight.patch
@@ -1,8 +1,7 @@
-diff --git a/source/common/param.cpp b/source/common/param.cpp
-index 8c32fafa2..0b56235c9 100755
---- a/source/common/param.cpp
-+++ b/source/common/param.cpp
-@@ -378,6 +378,7 @@ void x265_param_default(x265_param* param)
+diff -ru a/source/common/param.cpp b/source/common/param.cpp
+--- a/source/common/param.cpp 2024-09-13 09:51:43.000000000 -0300
++++ b/source/common/param.cpp 2025-02-03 13:27:31.474334833 -0300
+@@ -380,6 +380,7 @@
param->preferredTransferCharacteristics = -1;
param->pictureStructure = -1;
param->bEmitCLL = 1;
@@ -10,7 +9,7 @@ index 8c32fafa2..0b56235c9 100755
param->bEnableFrameDuplication = 0;
param->dupThreshold = 70;
-@@ -1880,6 +1881,7 @@ int x265_check_params(x265_param* param)
+@@ -1929,6 +1930,7 @@
|| param->bEmitIDRRecoverySEI
|| !!param->interlaceMode
|| param->preferredTransferCharacteristics > 1
@@ -18,7 +17,7 @@ index 8c32fafa2..0b56235c9 100755
|| param->toneMapFile
|| param->naluFile);
-@@ -2766,6 +2768,10 @@ void x265_copy_params(x265_param* dst, x265_param* src)
+@@ -2850,6 +2852,10 @@
dst->bEmitCLL = src->bEmitCLL;
dst->maxCLL = src->maxCLL;
dst->maxFALL = src->maxFALL;
@@ -29,11 +28,10 @@ index 8c32fafa2..0b56235c9 100755
dst->log2MaxPocLsb = src->log2MaxPocLsb;
dst->bEmitVUIHRDInfo = src->bEmitVUIHRDInfo;
dst->bEmitVUITimingInfo = src->bEmitVUITimingInfo;
-diff --git a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp
-index 5950f87e9..545283474 100644
---- a/source/encoder/encoder.cpp
-+++ b/source/encoder/encoder.cpp
-@@ -3276,6 +3276,15 @@ void Encoder::getStreamHeaders(NALList& list, Entropy& sbacCoder, Bitstream& bs)
+diff -ru a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp
+--- a/source/encoder/encoder.cpp 2024-09-13 09:51:43.000000000 -0300
++++ b/source/encoder/encoder.cpp 2025-02-03 13:28:37.551336750 -0300
+@@ -3423,6 +3423,15 @@
}
}
@@ -49,11 +47,10 @@ index 5950f87e9..545283474 100644
if (m_param->bEmitInfoSEI)
{
char *opts = x265_param2string(m_param, m_sps.conformanceWindow.rightOffset, m_sps.conformanceWindow.bottomOffset);
-diff --git a/source/encoder/sei.h b/source/encoder/sei.h
-index 03e210639..712e4efb4 100644
---- a/source/encoder/sei.h
-+++ b/source/encoder/sei.h
-@@ -242,6 +242,25 @@ public:
+diff -ru a/source/encoder/sei.h b/source/encoder/sei.h
+--- a/source/encoder/sei.h 2024-09-13 09:51:43.000000000 -0300
++++ b/source/encoder/sei.h 2025-02-03 13:30:41.386953402 -0300
+@@ -464,6 +464,25 @@
}
};
@@ -79,19 +76,18 @@ index 03e210639..712e4efb4 100644
class SEIDecodedPictureHash : public SEI
{
public:
-diff --git a/source/x265.h b/source/x265.h
-index 9f3abd9d9..b6a4d3fe1 100644
---- a/source/x265.h
-+++ b/source/x265.h
-@@ -371,6 +371,7 @@ typedef enum
+diff -ru a/source/x265.h b/source/x265.h
+--- a/source/x265.h 2024-09-13 09:51:43.000000000 -0300
++++ b/source/x265.h 2025-02-03 13:32:46.662499030 -0300
+@@ -371,6 +371,7 @@
MASTERING_DISPLAY_INFO = 137,
CONTENT_LIGHT_LEVEL_INFO = 144,
ALTERNATIVE_TRANSFER_CHARACTERISTICS = 147,
+ AMBIENT_VIEWING_ENVIRONMENT = 148,
- } SEIPayloadType;
-
- typedef struct x265_sei_payload
-@@ -1903,6 +1904,11 @@ typedef struct x265_param
+ ALPHA_CHANNEL_INFO = 165,
+ THREE_DIMENSIONAL_REFERENCE_DISPLAYS_INFO = 176,
+ MULTIVIEW_SCENE_INFO = 178,
+@@ -1956,6 +1957,11 @@
* value to that value. */
uint16_t maxLuma;
@@ -103,7 +99,7 @@ index 9f3abd9d9..b6a4d3fe1 100644
/* Maximum of the picture order count */
int log2MaxPocLsb;
-@@ -2114,6 +2120,9 @@ typedef struct x265_param
+@@ -2167,6 +2173,9 @@
/*Emit content light level info SEI*/
int bEmitCLL;
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index 7991e00bac7642..81ffbd521ca957 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,6 +1,6 @@
# Template file for 'x265'
pkgname=x265
-version=3.6
+version=4.0
revision=1
build_wrksrc=source
build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://x265.org/"
distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=206329b9599c78d06969a1b7b7bb939f7c99a459ab283b2e93f76854bd34ca7b
+checksum=66b64be4b316362fdadb33ad8273a74236042cc380691bdbec42946b0437a389
build_options="altivec assembly"
@@ -22,28 +22,28 @@ case "$XBPS_TARGET_MACHINE" in
ppc64le*) build_options_default="altivec" ;;
# on ARM, enabling it currently fails with undefined reference to
# x265::setupAssemblyPrimitives(x265::EncoderPrimitives&, int)
- x86_64*|i686*) build_options_default="assembly" ;;
+ x86_64* | i686*) build_options_default="assembly" ;;
*) ;;
esac
if [ "$build_option_assembly" ]; then
case "$XBPS_TARGET_MACHINE" in
- x86_64*|i686*)
- # see https://bitbucket.org/multicoreware/x265_git/issues/559
- configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
- hostmakedepends+=" nasm"
- ;;
- *) ;;
+ x86_64* | i686*)
+ # see https://bitbucket.org/multicoreware/x265_git/issues/559
+ configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
+ hostmakedepends+=" nasm"
+ ;;
+ *) ;;
esac
fi
case "$XBPS_TARGET_MACHINE" in
- ppc64*)
- # altivec does not build without power8 being enabled
- configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF)
+ppc64*)
+ # altivec does not build without power8 being enabled
+ configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF)
-DCPU_POWER8=$(vopt_if altivec ON OFF)"
- ;;
- *) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;;
+ ;;
+*) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;;
esac
pre_configure() {
From 9ca1712c496bcddbfca581bd28a3185df8938b0c Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:15:26 -0300
Subject: [PATCH 02/10] libheif: update to 1.19.5.
---
srcpkgs/libheif/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 8edff25f6f05d4..18d356aa1000c5 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,8 +1,9 @@
-# Template file for 'libheif'.
+# Template file for 'libheif'
pkgname=libheif
-version=1.18.1
-revision=2
+version=1.19.5
+revision=1
build_style=cmake
+configure_args="-DBUILD_TESTING=OFF"
makedepends="libjpeg-turbo-devel libpng-devel libde265-devel x265-devel
libaom-devel"
short_desc="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
@@ -11,7 +12,7 @@ license="LGPL-3.0-or-later"
homepage="https://github.com/strukturag/libheif"
changelog="https://github.com/strukturag/libheif/releases"
distfiles="https://github.com/strukturag/libheif/archive/v${version}.tar.gz"
-checksum=73bc94442038d44d56fe730f72516ae53134eb15b878a7ad89ef60fac93a3318
+checksum=5cd9a3e28493310358e1c1299cd596cc4c7ae5fb985eceb758fa6141424e58bb
libheif-devel_package() {
short_desc+=" - development files"
From 5165f8751d3623fcae99b5a9c0cf509b05352eac Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:15:47 -0300
Subject: [PATCH 03/10] vlc: revbump for x265-4.0.
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 88c664ebf5899c728b77ac651abfb259378b53d6 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:16:11 -0300
Subject: [PATCH 04/10] baresip: revbump for x265-4.0.
---
srcpkgs/baresip/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index 5f5ff9f179a7b2..b81b265a5a39bc 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
# Template file for 'baresip'
pkgname=baresip
version=3.18.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config glib-devel"
makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
From b9cd8dc90fa6b0866ce718d055b5321d1a512bf7 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:16:46 -0300
Subject: [PATCH 05/10] digikam: revbump for x265-4.0.
---
srcpkgs/digikam/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/digikam/template b/srcpkgs/digikam/template
index 1a64d3c760563f..68208cb1f36a93 100644
--- a/srcpkgs/digikam/template
+++ b/srcpkgs/digikam/template
@@ -1,7 +1,7 @@
# Template file for 'digikam'
pkgname=digikam
version=8.5.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DBUILD_WITH_QT6=ON
From d3f1927128b396f4f6872386b523de08fa1e4273 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:17:27 -0300
Subject: [PATCH 06/10] gimp: revbump for x265-4.0.
---
srcpkgs/gimp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index a50409d5ce5af1..d6d0d3291d2f19 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
# Template file for 'gimp'
pkgname=gimp
version=2.10.38
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-check-update --datadir=/usr/share --disable-python"
hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
From 49b4afd79b0f52c9a0fc806e52a2da29a347a2c8 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:18:00 -0300
Subject: [PATCH 07/10] ffmpeg6: revbump for x265-4.0.
---
srcpkgs/ffmpeg6/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ffmpeg6/template b/srcpkgs/ffmpeg6/template
index 9b66727465200e..5ca80c5f1b7f8f 100644
--- a/srcpkgs/ffmpeg6/template
+++ b/srcpkgs/ffmpeg6/template
@@ -2,7 +2,7 @@
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg6
version=6.1.2
-revision=3
+revision=4
hostmakedepends="pkg-config perl"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
libXext-devel libXvMC-devel libxcb-devel lame-devel libtheora-devel
From e206b111d140ab856481080ebe2e237ee6f3ce36 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:18:43 -0300
Subject: [PATCH 08/10] avidemux: revbump for x265-4.0.
---
srcpkgs/avidemux/patches/ADM_x265.patch | 44 +++++++++++++++++++++++++
srcpkgs/avidemux/template | 2 +-
2 files changed, 45 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/avidemux/patches/ADM_x265.patch
diff --git a/srcpkgs/avidemux/patches/ADM_x265.patch b/srcpkgs/avidemux/patches/ADM_x265.patch
new file mode 100644
index 00000000000000..6db76d7ffc332e
--- /dev/null
+++ b/srcpkgs/avidemux/patches/ADM_x265.patch
@@ -0,0 +1,44 @@
+--- a/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp 2022-09-17 10:59:17.000000000 -0300
++++ b/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp 2025-01-26 19:27:19.796218401 -0300
+@@ -205,15 +205,20 @@
+ //
+ x265_nal *nal;
+ uint32_t nbNal = 0;
+- x265_picture pic_out;
+- api->picture_init(¶m,&pic_out);
++ x265_picture pic_out[MAX_SCALABLE_LAYERS];
++ x265_picture *pic_out_ptr[MAX_SCALABLE_LAYERS];
+ out->flags = 0;
+
++ for (int i = 0; i < MAX_SCALABLE_LAYERS; i++)
++ {
++ api->picture_init(¶m,&pic_out[i]);
++ pic_out_ptr[i] = &pic_out[i];
++ }
+ int er;
+ if(false==gotFrame)
+ {
+ ADM_info("Flushing delayed frames\n");
+- er = api->encoder_encode(handle, &nal, &nbNal, NULL, &pic_out);
++ er = api->encoder_encode(handle, &nal, &nbNal, NULL, pic_out_ptr);
+ if(er<=0)
+ {
+ ADM_info ("End of flush\n");
+@@ -221,7 +226,7 @@
+ }
+ }else
+ {
+- er = api->encoder_encode(handle, &nal, &nbNal, &pic, &pic_out);
++ er = api->encoder_encode(handle, &nal, &nbNal, &pic, pic_out_ptr);
+ if(er<0)
+ {
+ ADM_error ("[x265] Error encoding %d\n",er);
+@@ -236,7 +241,7 @@
+
+
+ // 3-encode
+- if(false==postAmble(out,nbNal,nal,&pic_out))
++ if(false==postAmble(out,nbNal,nal,pic_out_ptr[0]))
+ {
+ ADM_warning("[x265] postAmble failed\n");
+ return false;
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index d66f8524bd0e28..b972ecac92ed31 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
# Template file for 'avidemux'
pkgname=avidemux
version=2.8.1
-revision=2
+revision=3
# Can't be compiled for aarch64, arm* or mips*
archs="x86_64* i686*"
hostmakedepends="cmake pkg-config qt5-host-tools qt5-devel tar yasm"
From 7ba86a8d9cf1f76adc696929cffd3f050d53bd3f Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:18:59 -0300
Subject: [PATCH 09/10] ffmpeg: update to 4.4.5.
---
.../patches/armv5tel-floating-point.patch | 18 -----
srcpkgs/ffmpeg/patches/binutils-2.41.patch | 73 -------------------
...h-libavcodec-libsvtav1-ten_bit_format.diff | 40 ----------
.../workaround-mesa-readeon-vaapi-bug.patch | 28 -------
srcpkgs/ffmpeg/template | 6 +-
5 files changed, 3 insertions(+), 162 deletions(-)
delete mode 100644 srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
delete mode 100644 srcpkgs/ffmpeg/patches/binutils-2.41.patch
delete mode 100644 srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
delete mode 100644 srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch
diff --git a/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch b/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
deleted file mode 100644
index 9a55178c74f0fd..00000000000000
--- a/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/libavfilter/vf_drawtext.c 2017-10-26 21:03:03.000000000 +0200
-+++ b/libavfilter/vf_drawtext.c 2017-11-21 11:06:49.602284422 +0100
-@@ -39,6 +39,15 @@
- #endif
- #include <fenv.h>
-
-+#if (FE_ALL_EXCEPT == 0)
-+/* E.g. ARM soft float does not define these */
-+#define FE_INVALID 0
-+#define FE_DIVBYZERO 0
-+#define FE_OVERFLOW 0
-+#define FE_UNDERFLOW 0
-+#define FE_INEXACT 0
-+#endif
-+
- #if CONFIG_LIBFONTCONFIG
- #include <fontconfig/fontconfig.h>
- #endif
diff --git a/srcpkgs/ffmpeg/patches/binutils-2.41.patch b/srcpkgs/ffmpeg/patches/binutils-2.41.patch
deleted file mode 100644
index 53a596d0ee7d4e..00000000000000
--- a/srcpkgs/ffmpeg/patches/binutils-2.41.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
-Date: Sun, 16 Jul 2023 18:18:02 +0300
-Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift
- instructions within inline assembly
-
-Fixes assembling with binutil as >= 2.41
-
-Signed-off-by: James Almer <jamrial@gmail.com>
----
- libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++---
- 1 file changed, 23 insertions(+), 3 deletions(-)
-
-diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
-index 6298f5ed1983b..ca7e2dffc1076 100644
---- a/libavcodec/x86/mathops.h
-+++ b/libavcodec/x86/mathops.h
-@@ -35,12 +35,20 @@
- static av_always_inline av_const int MULL(int a, int b, unsigned shift)
- {
- int rt, dummy;
-+ if (__builtin_constant_p(shift))
- __asm__ (
- "imull %3 \n\t"
- "shrdl %4, %%edx, %%eax \n\t"
- :"=a"(rt), "=d"(dummy)
-- :"a"(a), "rm"(b), "ci"((uint8_t)shift)
-+ :"a"(a), "rm"(b), "i"(shift & 0x1F)
- );
-+ else
-+ __asm__ (
-+ "imull %3 \n\t"
-+ "shrdl %4, %%edx, %%eax \n\t"
-+ :"=a"(rt), "=d"(dummy)
-+ :"a"(a), "rm"(b), "c"((uint8_t)shift)
-+ );
- return rt;
- }
-
-@@ -113,19 +121,31 @@ __asm__ volatile(\
- // avoid +32 for shift optimization (gcc should do that ...)
- #define NEG_SSR32 NEG_SSR32
- static inline int32_t NEG_SSR32( int32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("sarl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("sarl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
- #define NEG_USR32 NEG_USR32
- static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("shrl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("shrl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
diff --git a/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff b/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
deleted file mode 100644
index aa948f7a8a2dfb..00000000000000
--- a/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-#==================================================================================================
-# From 031f1561cd286596cdb374da32f8aa816ce3b135 Mon Sep 17 00:00:00 2001
-# From: Christopher Degawa <christopher.degawa@intel.com>
-# Date: Thu, 20 Oct 2022 22:55:27 -0500
-# Subject: [PATCH] avcodec/libsvtav1: remove compressed_ten_bit_format and simplify alloc_buffer
-#
-# compressed_ten_bit_format has been deprecated upstream and has no effect
-# and can be removed. Plus, technically it was never used in the first place
-# since it would require the app (ffmpeg) to set it and do additional
-# processing of the input frames.
-#
-# Also simplify alloc_buffer by removing calculations relating to the non-existant processing.
-#
-# Signed-off-by: Christopher Degawa <christopher.degawa@intel.com>
-#==================================================================================================
---- a/libavcodec/libsvtav1.c
-+++ b/libavcodec/libsvtav1.c
-@@ -124,16 +124,12 @@ static int svt_print_error(void *log_ctx, EbErrorType err,
-
- static int alloc_buffer(EbSvtAv1EncConfiguration *config, SvtContext *svt_enc)
- {
-- const int pack_mode_10bit =
-- (config->encoder_bit_depth > 8) && (config->compressed_ten_bit_format == 0) ? 1 : 0;
-- const size_t luma_size_8bit =
-- config->source_width * config->source_height * (1 << pack_mode_10bit);
-- const size_t luma_size_10bit =
-- (config->encoder_bit_depth > 8 && pack_mode_10bit == 0) ? luma_size_8bit : 0;
-+ const size_t luma_size = config->source_width * config->source_height *
-+ (config->encoder_bit_depth > 8 ? 2 : 1);
-
- EbSvtIOFormat *in_data;
-
-- svt_enc->raw_size = (luma_size_8bit + luma_size_10bit) * 3 / 2;
-+ svt_enc->raw_size = luma_size * 3 / 2;
-
- // allocate buffer for in and out
- svt_enc->in_buf = av_mallocz(sizeof(*svt_enc->in_buf));
---
-GitLab
-
diff --git a/srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch b/srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch
deleted file mode 100644
index 00e3f68a415b84..00000000000000
--- a/srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 811d290844206fc73dc39c3e5b67d5d895baedf8 Mon Sep 17 00:00:00 2001
-From: Rainer Hochecker <fernetmenta@online.de>
-Date: Sat, 26 Jan 2019 19:48:35 +0100
-Subject: [PATCH] avcodec/vaapi_h264: skip decode if pic has no slices
-
-This fixes / workarounds https://bugs.freedesktop.org/show_bug.cgi?id=105368.
-It was hit frequently when watching h264 channels received via DVB-X.
-Corresponding kodi bug: https://github.com/xbmc/xbmc/issues/15704
----
- libavcodec/vaapi_h264.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c
-index 5854587a255..f12fdc457a4 100644
---- a/libavcodec/vaapi_h264.c
-+++ b/libavcodec/vaapi_h264.c
-@@ -317,6 +317,11 @@ static int vaapi_h264_end_frame(AVCodecContext *avctx)
- H264SliceContext *sl = &h->slice_ctx[0];
- int ret;
-
-+ if (pic->nb_slices == 0) {
-+ ret = AVERROR_INVALIDDATA;
-+ goto finish;
-+ }
-+
- ret = ff_vaapi_decode_issue(avctx, pic);
- if (ret < 0)
- goto finish;
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 6b36bcfc98137f..91eccfd78c1b04 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,8 +1,8 @@
# Template file for 'ffmpeg'
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg
-version=4.4.4
-revision=10
+version=4.4.5
+revision=1
build_style=meta
short_desc="Decoding, encoding and streaming software (transitional dummy package)"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
homepage="https://www.ffmpeg.org"
changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
distfiles="https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"
-checksum=e80b380d595c809060f66f96a5d849511ef4a76a26b76eacf5778b94c3570309
+checksum=f9514e0d3515aee5a271283df71636e1d1ff7274b15853bcd84e144be416ab07
hostmakedepends="pkg-config perl"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
From 66e1ea8ab2f5cfc5a170203e507ab87cc1acbf87 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:19:33 -0300
Subject: [PATCH 10/10] handbrake: revbump for x265-4.0.
---
srcpkgs/handbrake/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index d32651a0abd02d..22fb9b6f4eb7d7 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.8.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] X265, ffmpeg and libheif: update
2025-01-20 21:47 [PR PATCH] X265, ffmpeg, handbrake, libheif: update 1is7ac3
` (9 preceding siblings ...)
2025-02-06 4:16 ` 1is7ac3
@ 2025-03-24 0:07 ` 1is7ac3
2025-03-24 0:41 ` 1is7ac3
` (7 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: 1is7ac3 @ 2025-03-24 0:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1247 bytes --]
There is an updated pull request by 1is7ac3 against master on the void-packages repository
https://github.com/1is7ac3/void-packages x265
https://github.com/void-linux/void-packages/pull/54056
X265, ffmpeg and libheif: update
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (X86_64-GLIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
<!-- - armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/54056.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-x265-54056.patch --]
[-- Type: text/x-diff, Size: 22153 bytes --]
From 96358aeba5cb2fd636c14cbe0340f50a1185e325 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 16:13:06 -0300
Subject: [PATCH 1/8] x265: update to 4.0.
---
common/shlibs | 2 +-
.../x265/patches/handbrake-ambientlight.patch | 50 +++++++++----------
srcpkgs/x265/template | 30 +++++------
3 files changed, 39 insertions(+), 43 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 4da43cdc620bcd..e9cab7f897a21b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1950,7 +1950,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
libQt5WebKit.so.5 qt5-webkit-5.6.0_1
libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.209 x265-3.6_1
+libx265.so.212 x265-4.0_1
libQt5Xdg.so.3 libqt5xdg-3.2.0_1
libQt5XdgIconLoader.so.3 libqt5xdg-3.2.0_1
libQt6Xdg.so.4 libqtxdg-4.0.0_1
diff --git a/srcpkgs/x265/patches/handbrake-ambientlight.patch b/srcpkgs/x265/patches/handbrake-ambientlight.patch
index ab36a9c35c9de4..5c966e42f0c373 100644
--- a/srcpkgs/x265/patches/handbrake-ambientlight.patch
+++ b/srcpkgs/x265/patches/handbrake-ambientlight.patch
@@ -1,8 +1,7 @@
-diff --git a/source/common/param.cpp b/source/common/param.cpp
-index 8c32fafa2..0b56235c9 100755
---- a/source/common/param.cpp
-+++ b/source/common/param.cpp
-@@ -378,6 +378,7 @@ void x265_param_default(x265_param* param)
+diff -ru a/source/common/param.cpp b/source/common/param.cpp
+--- a/source/common/param.cpp 2024-09-13 09:51:43.000000000 -0300
++++ b/source/common/param.cpp 2025-02-03 13:27:31.474334833 -0300
+@@ -380,6 +380,7 @@
param->preferredTransferCharacteristics = -1;
param->pictureStructure = -1;
param->bEmitCLL = 1;
@@ -10,7 +9,7 @@ index 8c32fafa2..0b56235c9 100755
param->bEnableFrameDuplication = 0;
param->dupThreshold = 70;
-@@ -1880,6 +1881,7 @@ int x265_check_params(x265_param* param)
+@@ -1929,6 +1930,7 @@
|| param->bEmitIDRRecoverySEI
|| !!param->interlaceMode
|| param->preferredTransferCharacteristics > 1
@@ -18,7 +17,7 @@ index 8c32fafa2..0b56235c9 100755
|| param->toneMapFile
|| param->naluFile);
-@@ -2766,6 +2768,10 @@ void x265_copy_params(x265_param* dst, x265_param* src)
+@@ -2850,6 +2852,10 @@
dst->bEmitCLL = src->bEmitCLL;
dst->maxCLL = src->maxCLL;
dst->maxFALL = src->maxFALL;
@@ -29,11 +28,10 @@ index 8c32fafa2..0b56235c9 100755
dst->log2MaxPocLsb = src->log2MaxPocLsb;
dst->bEmitVUIHRDInfo = src->bEmitVUIHRDInfo;
dst->bEmitVUITimingInfo = src->bEmitVUITimingInfo;
-diff --git a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp
-index 5950f87e9..545283474 100644
---- a/source/encoder/encoder.cpp
-+++ b/source/encoder/encoder.cpp
-@@ -3276,6 +3276,15 @@ void Encoder::getStreamHeaders(NALList& list, Entropy& sbacCoder, Bitstream& bs)
+diff -ru a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp
+--- a/source/encoder/encoder.cpp 2024-09-13 09:51:43.000000000 -0300
++++ b/source/encoder/encoder.cpp 2025-02-03 13:28:37.551336750 -0300
+@@ -3423,6 +3423,15 @@
}
}
@@ -49,11 +47,10 @@ index 5950f87e9..545283474 100644
if (m_param->bEmitInfoSEI)
{
char *opts = x265_param2string(m_param, m_sps.conformanceWindow.rightOffset, m_sps.conformanceWindow.bottomOffset);
-diff --git a/source/encoder/sei.h b/source/encoder/sei.h
-index 03e210639..712e4efb4 100644
---- a/source/encoder/sei.h
-+++ b/source/encoder/sei.h
-@@ -242,6 +242,25 @@ public:
+diff -ru a/source/encoder/sei.h b/source/encoder/sei.h
+--- a/source/encoder/sei.h 2024-09-13 09:51:43.000000000 -0300
++++ b/source/encoder/sei.h 2025-02-03 13:30:41.386953402 -0300
+@@ -464,6 +464,25 @@
}
};
@@ -79,19 +76,18 @@ index 03e210639..712e4efb4 100644
class SEIDecodedPictureHash : public SEI
{
public:
-diff --git a/source/x265.h b/source/x265.h
-index 9f3abd9d9..b6a4d3fe1 100644
---- a/source/x265.h
-+++ b/source/x265.h
-@@ -371,6 +371,7 @@ typedef enum
+diff -ru a/source/x265.h b/source/x265.h
+--- a/source/x265.h 2024-09-13 09:51:43.000000000 -0300
++++ b/source/x265.h 2025-02-03 13:32:46.662499030 -0300
+@@ -371,6 +371,7 @@
MASTERING_DISPLAY_INFO = 137,
CONTENT_LIGHT_LEVEL_INFO = 144,
ALTERNATIVE_TRANSFER_CHARACTERISTICS = 147,
+ AMBIENT_VIEWING_ENVIRONMENT = 148,
- } SEIPayloadType;
-
- typedef struct x265_sei_payload
-@@ -1903,6 +1904,11 @@ typedef struct x265_param
+ ALPHA_CHANNEL_INFO = 165,
+ THREE_DIMENSIONAL_REFERENCE_DISPLAYS_INFO = 176,
+ MULTIVIEW_SCENE_INFO = 178,
+@@ -1956,6 +1957,11 @@
* value to that value. */
uint16_t maxLuma;
@@ -103,7 +99,7 @@ index 9f3abd9d9..b6a4d3fe1 100644
/* Maximum of the picture order count */
int log2MaxPocLsb;
-@@ -2114,6 +2120,9 @@ typedef struct x265_param
+@@ -2167,6 +2173,9 @@
/*Emit content light level info SEI*/
int bEmitCLL;
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index d95e93552f6c04..4acc7cd5ff2b6d 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,7 +1,7 @@
# Template file for 'x265'
pkgname=x265
-version=3.6
-revision=2
+version=4.0
+revision=1
build_wrksrc=source
build_style=cmake
configure_args="-DENABLE_PIC=1 -DEXTRA_LINK_FLAGS='-L.'
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://x265.org/"
distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=206329b9599c78d06969a1b7b7bb939f7c99a459ab283b2e93f76854bd34ca7b
+checksum=66b64be4b316362fdadb33ad8273a74236042cc380691bdbec42946b0437a389
build_options="altivec assembly"
@@ -23,28 +23,28 @@ case "$XBPS_TARGET_MACHINE" in
ppc64le*) build_options_default="altivec" ;;
# on ARM, enabling it currently fails with undefined reference to
# x265::setupAssemblyPrimitives(x265::EncoderPrimitives&, int)
- x86_64*|i686*) build_options_default="assembly" ;;
+ x86_64* | i686*) build_options_default="assembly" ;;
*) ;;
esac
if [ "$build_option_assembly" ]; then
case "$XBPS_TARGET_MACHINE" in
- x86_64*|i686*)
- # see https://bitbucket.org/multicoreware/x265_git/issues/559
- configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
- hostmakedepends+=" nasm"
- ;;
- *) ;;
+ x86_64* | i686*)
+ # see https://bitbucket.org/multicoreware/x265_git/issues/559
+ configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
+ hostmakedepends+=" nasm"
+ ;;
+ *) ;;
esac
fi
case "$XBPS_TARGET_MACHINE" in
- ppc64*)
- # altivec does not build without power8 being enabled
- configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF)
+ppc64*)
+ # altivec does not build without power8 being enabled
+ configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF)
-DCPU_POWER8=$(vopt_if altivec ON OFF)"
- ;;
- *) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;;
+ ;;
+*) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;;
esac
pre_configure() {
From d925641965542593e003694105b29190c6cd49c6 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:15:26 -0300
Subject: [PATCH 2/8] libheif: rebuild for x265-4.0.
---
srcpkgs/libheif/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 3e5d16adbf365a..34bffb8c590811 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,8 +1,9 @@
# Template file for 'libheif'
pkgname=libheif
version=1.19.7
-revision=1
+revision=2
build_style=cmake
+configure_args="-DBUILD_TESTING=OFF"
makedepends="libjpeg-turbo-devel libpng-devel libde265-devel x265-devel
libaom-devel"
short_desc="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
From 938b7d8cb4f6e791365c46109c96aff9d931d514 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:15:47 -0300
Subject: [PATCH 3/8] vlc: revbump for x265-4.0.
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From c5d47ae2738d02cd8704573abfef4f36acd722b4 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:16:11 -0300
Subject: [PATCH 4/8] baresip: revbump for x265-4.0.
---
srcpkgs/baresip/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index 9ba4c08bc868fd..3419968c532e59 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
# Template file for 'baresip'
pkgname=baresip
version=3.20.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config glib-devel"
makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
From 868021389192a72b7142a4844a50610df51919a9 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:17:27 -0300
Subject: [PATCH 5/8] gimp: revbump for x265-4.0.
---
srcpkgs/gimp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index fb94c7126eaf5a..d1cb660d86d8e1 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
# Template file for 'gimp'
pkgname=gimp
version=3.0.0
-revision=1
+revision=2
build_style=meson
build_helper="gir qemu"
configure_args="-Dcheck-update=no -Drevision=$revision -Denable-default-bin=enabled
From dae825dc9e7a07a8d23e98f6f6c8436f7e0308af Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:18:43 -0300
Subject: [PATCH 6/8] avidemux: revbump for x265-4.0.
---
srcpkgs/avidemux/patches/ADM_x265.patch | 44 +++++++++++++++++++++++++
srcpkgs/avidemux/template | 2 +-
2 files changed, 45 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/avidemux/patches/ADM_x265.patch
diff --git a/srcpkgs/avidemux/patches/ADM_x265.patch b/srcpkgs/avidemux/patches/ADM_x265.patch
new file mode 100644
index 00000000000000..6db76d7ffc332e
--- /dev/null
+++ b/srcpkgs/avidemux/patches/ADM_x265.patch
@@ -0,0 +1,44 @@
+--- a/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp 2022-09-17 10:59:17.000000000 -0300
++++ b/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp 2025-01-26 19:27:19.796218401 -0300
+@@ -205,15 +205,20 @@
+ //
+ x265_nal *nal;
+ uint32_t nbNal = 0;
+- x265_picture pic_out;
+- api->picture_init(¶m,&pic_out);
++ x265_picture pic_out[MAX_SCALABLE_LAYERS];
++ x265_picture *pic_out_ptr[MAX_SCALABLE_LAYERS];
+ out->flags = 0;
+
++ for (int i = 0; i < MAX_SCALABLE_LAYERS; i++)
++ {
++ api->picture_init(¶m,&pic_out[i]);
++ pic_out_ptr[i] = &pic_out[i];
++ }
+ int er;
+ if(false==gotFrame)
+ {
+ ADM_info("Flushing delayed frames\n");
+- er = api->encoder_encode(handle, &nal, &nbNal, NULL, &pic_out);
++ er = api->encoder_encode(handle, &nal, &nbNal, NULL, pic_out_ptr);
+ if(er<=0)
+ {
+ ADM_info ("End of flush\n");
+@@ -221,7 +226,7 @@
+ }
+ }else
+ {
+- er = api->encoder_encode(handle, &nal, &nbNal, &pic, &pic_out);
++ er = api->encoder_encode(handle, &nal, &nbNal, &pic, pic_out_ptr);
+ if(er<0)
+ {
+ ADM_error ("[x265] Error encoding %d\n",er);
+@@ -236,7 +241,7 @@
+
+
+ // 3-encode
+- if(false==postAmble(out,nbNal,nal,&pic_out))
++ if(false==postAmble(out,nbNal,nal,pic_out_ptr[0]))
+ {
+ ADM_warning("[x265] postAmble failed\n");
+ return false;
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index d66f8524bd0e28..b972ecac92ed31 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
# Template file for 'avidemux'
pkgname=avidemux
version=2.8.1
-revision=2
+revision=3
# Can't be compiled for aarch64, arm* or mips*
archs="x86_64* i686*"
hostmakedepends="cmake pkg-config qt5-host-tools qt5-devel tar yasm"
From 873fe7cbe7266afdaf141daa70a97c0019cc6f01 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:18:59 -0300
Subject: [PATCH 7/8] ffmpeg: update to 4.4.5.
---
.../patches/armv5tel-floating-point.patch | 18 -----
srcpkgs/ffmpeg/patches/binutils-2.41.patch | 73 -------------------
...h-libavcodec-libsvtav1-ten_bit_format.diff | 40 ----------
.../workaround-mesa-readeon-vaapi-bug.patch | 28 -------
srcpkgs/ffmpeg/template | 6 +-
5 files changed, 3 insertions(+), 162 deletions(-)
delete mode 100644 srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
delete mode 100644 srcpkgs/ffmpeg/patches/binutils-2.41.patch
delete mode 100644 srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
delete mode 100644 srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch
diff --git a/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch b/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
deleted file mode 100644
index 9a55178c74f0fd..00000000000000
--- a/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/libavfilter/vf_drawtext.c 2017-10-26 21:03:03.000000000 +0200
-+++ b/libavfilter/vf_drawtext.c 2017-11-21 11:06:49.602284422 +0100
-@@ -39,6 +39,15 @@
- #endif
- #include <fenv.h>
-
-+#if (FE_ALL_EXCEPT == 0)
-+/* E.g. ARM soft float does not define these */
-+#define FE_INVALID 0
-+#define FE_DIVBYZERO 0
-+#define FE_OVERFLOW 0
-+#define FE_UNDERFLOW 0
-+#define FE_INEXACT 0
-+#endif
-+
- #if CONFIG_LIBFONTCONFIG
- #include <fontconfig/fontconfig.h>
- #endif
diff --git a/srcpkgs/ffmpeg/patches/binutils-2.41.patch b/srcpkgs/ffmpeg/patches/binutils-2.41.patch
deleted file mode 100644
index 53a596d0ee7d4e..00000000000000
--- a/srcpkgs/ffmpeg/patches/binutils-2.41.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
-Date: Sun, 16 Jul 2023 18:18:02 +0300
-Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift
- instructions within inline assembly
-
-Fixes assembling with binutil as >= 2.41
-
-Signed-off-by: James Almer <jamrial@gmail.com>
----
- libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++---
- 1 file changed, 23 insertions(+), 3 deletions(-)
-
-diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
-index 6298f5ed1983b..ca7e2dffc1076 100644
---- a/libavcodec/x86/mathops.h
-+++ b/libavcodec/x86/mathops.h
-@@ -35,12 +35,20 @@
- static av_always_inline av_const int MULL(int a, int b, unsigned shift)
- {
- int rt, dummy;
-+ if (__builtin_constant_p(shift))
- __asm__ (
- "imull %3 \n\t"
- "shrdl %4, %%edx, %%eax \n\t"
- :"=a"(rt), "=d"(dummy)
-- :"a"(a), "rm"(b), "ci"((uint8_t)shift)
-+ :"a"(a), "rm"(b), "i"(shift & 0x1F)
- );
-+ else
-+ __asm__ (
-+ "imull %3 \n\t"
-+ "shrdl %4, %%edx, %%eax \n\t"
-+ :"=a"(rt), "=d"(dummy)
-+ :"a"(a), "rm"(b), "c"((uint8_t)shift)
-+ );
- return rt;
- }
-
-@@ -113,19 +121,31 @@ __asm__ volatile(\
- // avoid +32 for shift optimization (gcc should do that ...)
- #define NEG_SSR32 NEG_SSR32
- static inline int32_t NEG_SSR32( int32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("sarl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("sarl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
- #define NEG_USR32 NEG_USR32
- static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("shrl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("shrl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
diff --git a/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff b/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
deleted file mode 100644
index aa948f7a8a2dfb..00000000000000
--- a/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-#==================================================================================================
-# From 031f1561cd286596cdb374da32f8aa816ce3b135 Mon Sep 17 00:00:00 2001
-# From: Christopher Degawa <christopher.degawa@intel.com>
-# Date: Thu, 20 Oct 2022 22:55:27 -0500
-# Subject: [PATCH] avcodec/libsvtav1: remove compressed_ten_bit_format and simplify alloc_buffer
-#
-# compressed_ten_bit_format has been deprecated upstream and has no effect
-# and can be removed. Plus, technically it was never used in the first place
-# since it would require the app (ffmpeg) to set it and do additional
-# processing of the input frames.
-#
-# Also simplify alloc_buffer by removing calculations relating to the non-existant processing.
-#
-# Signed-off-by: Christopher Degawa <christopher.degawa@intel.com>
-#==================================================================================================
---- a/libavcodec/libsvtav1.c
-+++ b/libavcodec/libsvtav1.c
-@@ -124,16 +124,12 @@ static int svt_print_error(void *log_ctx, EbErrorType err,
-
- static int alloc_buffer(EbSvtAv1EncConfiguration *config, SvtContext *svt_enc)
- {
-- const int pack_mode_10bit =
-- (config->encoder_bit_depth > 8) && (config->compressed_ten_bit_format == 0) ? 1 : 0;
-- const size_t luma_size_8bit =
-- config->source_width * config->source_height * (1 << pack_mode_10bit);
-- const size_t luma_size_10bit =
-- (config->encoder_bit_depth > 8 && pack_mode_10bit == 0) ? luma_size_8bit : 0;
-+ const size_t luma_size = config->source_width * config->source_height *
-+ (config->encoder_bit_depth > 8 ? 2 : 1);
-
- EbSvtIOFormat *in_data;
-
-- svt_enc->raw_size = (luma_size_8bit + luma_size_10bit) * 3 / 2;
-+ svt_enc->raw_size = luma_size * 3 / 2;
-
- // allocate buffer for in and out
- svt_enc->in_buf = av_mallocz(sizeof(*svt_enc->in_buf));
---
-GitLab
-
diff --git a/srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch b/srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch
deleted file mode 100644
index 00e3f68a415b84..00000000000000
--- a/srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 811d290844206fc73dc39c3e5b67d5d895baedf8 Mon Sep 17 00:00:00 2001
-From: Rainer Hochecker <fernetmenta@online.de>
-Date: Sat, 26 Jan 2019 19:48:35 +0100
-Subject: [PATCH] avcodec/vaapi_h264: skip decode if pic has no slices
-
-This fixes / workarounds https://bugs.freedesktop.org/show_bug.cgi?id=105368.
-It was hit frequently when watching h264 channels received via DVB-X.
-Corresponding kodi bug: https://github.com/xbmc/xbmc/issues/15704
----
- libavcodec/vaapi_h264.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c
-index 5854587a255..f12fdc457a4 100644
---- a/libavcodec/vaapi_h264.c
-+++ b/libavcodec/vaapi_h264.c
-@@ -317,6 +317,11 @@ static int vaapi_h264_end_frame(AVCodecContext *avctx)
- H264SliceContext *sl = &h->slice_ctx[0];
- int ret;
-
-+ if (pic->nb_slices == 0) {
-+ ret = AVERROR_INVALIDDATA;
-+ goto finish;
-+ }
-+
- ret = ff_vaapi_decode_issue(avctx, pic);
- if (ret < 0)
- goto finish;
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 08297151181c07..b560d9df0ce126 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,8 +1,8 @@
# Template file for 'ffmpeg'
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg
-version=4.4.4
-revision=11
+version=4.4.5
+revision=1
build_style=meta
short_desc="Decoding, encoding and streaming software (transitional dummy package)"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
homepage="https://www.ffmpeg.org"
changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
distfiles="https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"
-checksum=e80b380d595c809060f66f96a5d849511ef4a76a26b76eacf5778b94c3570309
+checksum=f9514e0d3515aee5a271283df71636e1d1ff7274b15853bcd84e144be416ab07
hostmakedepends="pkg-config perl"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
From c041077996d1b90eeb4845c6c12db25a060817e0 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:19:33 -0300
Subject: [PATCH 8/8] handbrake: revbump for x265-4.0.
---
srcpkgs/handbrake/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index d32651a0abd02d..22fb9b6f4eb7d7 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.8.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] X265, ffmpeg and libheif: update
2025-01-20 21:47 [PR PATCH] X265, ffmpeg, handbrake, libheif: update 1is7ac3
` (10 preceding siblings ...)
2025-03-24 0:07 ` 1is7ac3
@ 2025-03-24 0:41 ` 1is7ac3
2025-03-26 4:24 ` 1is7ac3
` (6 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: 1is7ac3 @ 2025-03-24 0:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1247 bytes --]
There is an updated pull request by 1is7ac3 against master on the void-packages repository
https://github.com/1is7ac3/void-packages x265
https://github.com/void-linux/void-packages/pull/54056
X265, ffmpeg and libheif: update
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (X86_64-GLIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
<!-- - armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/54056.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-x265-54056.patch --]
[-- Type: text/x-diff, Size: 28696 bytes --]
From 96358aeba5cb2fd636c14cbe0340f50a1185e325 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 16:13:06 -0300
Subject: [PATCH 1/9] x265: update to 4.0.
---
common/shlibs | 2 +-
.../x265/patches/handbrake-ambientlight.patch | 50 +++++++++----------
srcpkgs/x265/template | 30 +++++------
3 files changed, 39 insertions(+), 43 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 4da43cdc620bcd..e9cab7f897a21b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1950,7 +1950,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
libQt5WebKit.so.5 qt5-webkit-5.6.0_1
libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.209 x265-3.6_1
+libx265.so.212 x265-4.0_1
libQt5Xdg.so.3 libqt5xdg-3.2.0_1
libQt5XdgIconLoader.so.3 libqt5xdg-3.2.0_1
libQt6Xdg.so.4 libqtxdg-4.0.0_1
diff --git a/srcpkgs/x265/patches/handbrake-ambientlight.patch b/srcpkgs/x265/patches/handbrake-ambientlight.patch
index ab36a9c35c9de4..5c966e42f0c373 100644
--- a/srcpkgs/x265/patches/handbrake-ambientlight.patch
+++ b/srcpkgs/x265/patches/handbrake-ambientlight.patch
@@ -1,8 +1,7 @@
-diff --git a/source/common/param.cpp b/source/common/param.cpp
-index 8c32fafa2..0b56235c9 100755
---- a/source/common/param.cpp
-+++ b/source/common/param.cpp
-@@ -378,6 +378,7 @@ void x265_param_default(x265_param* param)
+diff -ru a/source/common/param.cpp b/source/common/param.cpp
+--- a/source/common/param.cpp 2024-09-13 09:51:43.000000000 -0300
++++ b/source/common/param.cpp 2025-02-03 13:27:31.474334833 -0300
+@@ -380,6 +380,7 @@
param->preferredTransferCharacteristics = -1;
param->pictureStructure = -1;
param->bEmitCLL = 1;
@@ -10,7 +9,7 @@ index 8c32fafa2..0b56235c9 100755
param->bEnableFrameDuplication = 0;
param->dupThreshold = 70;
-@@ -1880,6 +1881,7 @@ int x265_check_params(x265_param* param)
+@@ -1929,6 +1930,7 @@
|| param->bEmitIDRRecoverySEI
|| !!param->interlaceMode
|| param->preferredTransferCharacteristics > 1
@@ -18,7 +17,7 @@ index 8c32fafa2..0b56235c9 100755
|| param->toneMapFile
|| param->naluFile);
-@@ -2766,6 +2768,10 @@ void x265_copy_params(x265_param* dst, x265_param* src)
+@@ -2850,6 +2852,10 @@
dst->bEmitCLL = src->bEmitCLL;
dst->maxCLL = src->maxCLL;
dst->maxFALL = src->maxFALL;
@@ -29,11 +28,10 @@ index 8c32fafa2..0b56235c9 100755
dst->log2MaxPocLsb = src->log2MaxPocLsb;
dst->bEmitVUIHRDInfo = src->bEmitVUIHRDInfo;
dst->bEmitVUITimingInfo = src->bEmitVUITimingInfo;
-diff --git a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp
-index 5950f87e9..545283474 100644
---- a/source/encoder/encoder.cpp
-+++ b/source/encoder/encoder.cpp
-@@ -3276,6 +3276,15 @@ void Encoder::getStreamHeaders(NALList& list, Entropy& sbacCoder, Bitstream& bs)
+diff -ru a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp
+--- a/source/encoder/encoder.cpp 2024-09-13 09:51:43.000000000 -0300
++++ b/source/encoder/encoder.cpp 2025-02-03 13:28:37.551336750 -0300
+@@ -3423,6 +3423,15 @@
}
}
@@ -49,11 +47,10 @@ index 5950f87e9..545283474 100644
if (m_param->bEmitInfoSEI)
{
char *opts = x265_param2string(m_param, m_sps.conformanceWindow.rightOffset, m_sps.conformanceWindow.bottomOffset);
-diff --git a/source/encoder/sei.h b/source/encoder/sei.h
-index 03e210639..712e4efb4 100644
---- a/source/encoder/sei.h
-+++ b/source/encoder/sei.h
-@@ -242,6 +242,25 @@ public:
+diff -ru a/source/encoder/sei.h b/source/encoder/sei.h
+--- a/source/encoder/sei.h 2024-09-13 09:51:43.000000000 -0300
++++ b/source/encoder/sei.h 2025-02-03 13:30:41.386953402 -0300
+@@ -464,6 +464,25 @@
}
};
@@ -79,19 +76,18 @@ index 03e210639..712e4efb4 100644
class SEIDecodedPictureHash : public SEI
{
public:
-diff --git a/source/x265.h b/source/x265.h
-index 9f3abd9d9..b6a4d3fe1 100644
---- a/source/x265.h
-+++ b/source/x265.h
-@@ -371,6 +371,7 @@ typedef enum
+diff -ru a/source/x265.h b/source/x265.h
+--- a/source/x265.h 2024-09-13 09:51:43.000000000 -0300
++++ b/source/x265.h 2025-02-03 13:32:46.662499030 -0300
+@@ -371,6 +371,7 @@
MASTERING_DISPLAY_INFO = 137,
CONTENT_LIGHT_LEVEL_INFO = 144,
ALTERNATIVE_TRANSFER_CHARACTERISTICS = 147,
+ AMBIENT_VIEWING_ENVIRONMENT = 148,
- } SEIPayloadType;
-
- typedef struct x265_sei_payload
-@@ -1903,6 +1904,11 @@ typedef struct x265_param
+ ALPHA_CHANNEL_INFO = 165,
+ THREE_DIMENSIONAL_REFERENCE_DISPLAYS_INFO = 176,
+ MULTIVIEW_SCENE_INFO = 178,
+@@ -1956,6 +1957,11 @@
* value to that value. */
uint16_t maxLuma;
@@ -103,7 +99,7 @@ index 9f3abd9d9..b6a4d3fe1 100644
/* Maximum of the picture order count */
int log2MaxPocLsb;
-@@ -2114,6 +2120,9 @@ typedef struct x265_param
+@@ -2167,6 +2173,9 @@
/*Emit content light level info SEI*/
int bEmitCLL;
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index d95e93552f6c04..4acc7cd5ff2b6d 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,7 +1,7 @@
# Template file for 'x265'
pkgname=x265
-version=3.6
-revision=2
+version=4.0
+revision=1
build_wrksrc=source
build_style=cmake
configure_args="-DENABLE_PIC=1 -DEXTRA_LINK_FLAGS='-L.'
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://x265.org/"
distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=206329b9599c78d06969a1b7b7bb939f7c99a459ab283b2e93f76854bd34ca7b
+checksum=66b64be4b316362fdadb33ad8273a74236042cc380691bdbec42946b0437a389
build_options="altivec assembly"
@@ -23,28 +23,28 @@ case "$XBPS_TARGET_MACHINE" in
ppc64le*) build_options_default="altivec" ;;
# on ARM, enabling it currently fails with undefined reference to
# x265::setupAssemblyPrimitives(x265::EncoderPrimitives&, int)
- x86_64*|i686*) build_options_default="assembly" ;;
+ x86_64* | i686*) build_options_default="assembly" ;;
*) ;;
esac
if [ "$build_option_assembly" ]; then
case "$XBPS_TARGET_MACHINE" in
- x86_64*|i686*)
- # see https://bitbucket.org/multicoreware/x265_git/issues/559
- configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
- hostmakedepends+=" nasm"
- ;;
- *) ;;
+ x86_64* | i686*)
+ # see https://bitbucket.org/multicoreware/x265_git/issues/559
+ configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
+ hostmakedepends+=" nasm"
+ ;;
+ *) ;;
esac
fi
case "$XBPS_TARGET_MACHINE" in
- ppc64*)
- # altivec does not build without power8 being enabled
- configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF)
+ppc64*)
+ # altivec does not build without power8 being enabled
+ configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF)
-DCPU_POWER8=$(vopt_if altivec ON OFF)"
- ;;
- *) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;;
+ ;;
+*) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;;
esac
pre_configure() {
From d925641965542593e003694105b29190c6cd49c6 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:15:26 -0300
Subject: [PATCH 2/9] libheif: rebuild for x265-4.0.
---
srcpkgs/libheif/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 3e5d16adbf365a..34bffb8c590811 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,8 +1,9 @@
# Template file for 'libheif'
pkgname=libheif
version=1.19.7
-revision=1
+revision=2
build_style=cmake
+configure_args="-DBUILD_TESTING=OFF"
makedepends="libjpeg-turbo-devel libpng-devel libde265-devel x265-devel
libaom-devel"
short_desc="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
From 938b7d8cb4f6e791365c46109c96aff9d931d514 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:15:47 -0300
Subject: [PATCH 3/9] vlc: revbump for x265-4.0.
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From c5d47ae2738d02cd8704573abfef4f36acd722b4 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:16:11 -0300
Subject: [PATCH 4/9] baresip: revbump for x265-4.0.
---
srcpkgs/baresip/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index 9ba4c08bc868fd..3419968c532e59 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
# Template file for 'baresip'
pkgname=baresip
version=3.20.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config glib-devel"
makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
From 868021389192a72b7142a4844a50610df51919a9 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:17:27 -0300
Subject: [PATCH 5/9] gimp: revbump for x265-4.0.
---
srcpkgs/gimp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index fb94c7126eaf5a..d1cb660d86d8e1 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
# Template file for 'gimp'
pkgname=gimp
version=3.0.0
-revision=1
+revision=2
build_style=meson
build_helper="gir qemu"
configure_args="-Dcheck-update=no -Drevision=$revision -Denable-default-bin=enabled
From dae825dc9e7a07a8d23e98f6f6c8436f7e0308af Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:18:43 -0300
Subject: [PATCH 6/9] avidemux: revbump for x265-4.0.
---
srcpkgs/avidemux/patches/ADM_x265.patch | 44 +++++++++++++++++++++++++
srcpkgs/avidemux/template | 2 +-
2 files changed, 45 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/avidemux/patches/ADM_x265.patch
diff --git a/srcpkgs/avidemux/patches/ADM_x265.patch b/srcpkgs/avidemux/patches/ADM_x265.patch
new file mode 100644
index 00000000000000..6db76d7ffc332e
--- /dev/null
+++ b/srcpkgs/avidemux/patches/ADM_x265.patch
@@ -0,0 +1,44 @@
+--- a/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp 2022-09-17 10:59:17.000000000 -0300
++++ b/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp 2025-01-26 19:27:19.796218401 -0300
+@@ -205,15 +205,20 @@
+ //
+ x265_nal *nal;
+ uint32_t nbNal = 0;
+- x265_picture pic_out;
+- api->picture_init(¶m,&pic_out);
++ x265_picture pic_out[MAX_SCALABLE_LAYERS];
++ x265_picture *pic_out_ptr[MAX_SCALABLE_LAYERS];
+ out->flags = 0;
+
++ for (int i = 0; i < MAX_SCALABLE_LAYERS; i++)
++ {
++ api->picture_init(¶m,&pic_out[i]);
++ pic_out_ptr[i] = &pic_out[i];
++ }
+ int er;
+ if(false==gotFrame)
+ {
+ ADM_info("Flushing delayed frames\n");
+- er = api->encoder_encode(handle, &nal, &nbNal, NULL, &pic_out);
++ er = api->encoder_encode(handle, &nal, &nbNal, NULL, pic_out_ptr);
+ if(er<=0)
+ {
+ ADM_info ("End of flush\n");
+@@ -221,7 +226,7 @@
+ }
+ }else
+ {
+- er = api->encoder_encode(handle, &nal, &nbNal, &pic, &pic_out);
++ er = api->encoder_encode(handle, &nal, &nbNal, &pic, pic_out_ptr);
+ if(er<0)
+ {
+ ADM_error ("[x265] Error encoding %d\n",er);
+@@ -236,7 +241,7 @@
+
+
+ // 3-encode
+- if(false==postAmble(out,nbNal,nal,&pic_out))
++ if(false==postAmble(out,nbNal,nal,pic_out_ptr[0]))
+ {
+ ADM_warning("[x265] postAmble failed\n");
+ return false;
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index d66f8524bd0e28..b972ecac92ed31 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
# Template file for 'avidemux'
pkgname=avidemux
version=2.8.1
-revision=2
+revision=3
# Can't be compiled for aarch64, arm* or mips*
archs="x86_64* i686*"
hostmakedepends="cmake pkg-config qt5-host-tools qt5-devel tar yasm"
From 950300aebd4e72311ae8d0cfb55109eefd5baa61 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 23 Mar 2025 21:39:17 -0300
Subject: [PATCH 7/9] ffmpeg: update to 4.4.5.
---
srcpkgs/ffmpeg/patches/00001-v4l-config.patch | 31 -------
.../ffmpeg/patches/00002-v4l-ioctl-musl.patch | 87 -------------------
.../patches/armv5tel-floating-point.patch | 18 ----
srcpkgs/ffmpeg/patches/binutils-2.41.patch | 73 ----------------
...h-libavcodec-libsvtav1-ten_bit_format.diff | 40 ---------
.../workaround-mesa-readeon-vaapi-bug.patch | 28 ------
srcpkgs/ffmpeg/template | 6 +-
7 files changed, 3 insertions(+), 280 deletions(-)
delete mode 100644 srcpkgs/ffmpeg/patches/00001-v4l-config.patch
delete mode 100644 srcpkgs/ffmpeg/patches/00002-v4l-ioctl-musl.patch
delete mode 100644 srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
delete mode 100644 srcpkgs/ffmpeg/patches/binutils-2.41.patch
delete mode 100644 srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
delete mode 100644 srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch
diff --git a/srcpkgs/ffmpeg/patches/00001-v4l-config.patch b/srcpkgs/ffmpeg/patches/00001-v4l-config.patch
deleted file mode 100644
index e8dfdda98bce89..00000000000000
--- a/srcpkgs/ffmpeg/patches/00001-v4l-config.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 7405f1ad5351cc24b91a0227aeeaf24ff9d12278 Mon Sep 17 00:00:00 2001
-From: Ramiro Polla <ramiro.polla@gmail.com>
-Date: Wed, 3 Jul 2024 00:30:08 +0200
-Subject: [PATCH] configure: restore autodetection of v4l2 and fbdev
-
-The detection logic for v4l2 and fbdev was accidentally modified to
-depend on v4l2-m2m in 43b3412.
----
- configure | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/configure b/configure
-index b28221f258965..fa2e384350958 100755
---- a/configure
-+++ b/configure
-@@ -7145,11 +7145,12 @@ pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man
- rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout || disable rsync_contimeout
- xmllint --version > /dev/null 2>&1 && enable xmllint || disable xmllint
-
-+check_headers linux/fb.h
-+check_headers linux/videodev2.h
-+test_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_sanitized struct_v4l2_frmivalenum_discrete
-+
- # check V4L2 codecs available in the API
- if enabled v4l2_m2m; then
-- check_headers linux/fb.h
-- check_headers linux/videodev2.h
-- test_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_sanitized struct_v4l2_frmivalenum_discrete
- check_cc v4l2_m2m linux/videodev2.h "int i = V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_VIDEO_M2M | V4L2_BUF_FLAG_LAST;"
- check_cc vc1_v4l2_m2m linux/videodev2.h "int i = V4L2_PIX_FMT_VC1_ANNEX_G;"
- check_cc mpeg1_v4l2_m2m linux/videodev2.h "int i = V4L2_PIX_FMT_MPEG1;"
diff --git a/srcpkgs/ffmpeg/patches/00002-v4l-ioctl-musl.patch b/srcpkgs/ffmpeg/patches/00002-v4l-ioctl-musl.patch
deleted file mode 100644
index 681fb5d4f706ad..00000000000000
--- a/srcpkgs/ffmpeg/patches/00002-v4l-ioctl-musl.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 008b0b4a3b0cbafa568d0dcbf78c798d56929802 Mon Sep 17 00:00:00 2001
-From: Brad Smith <brad-at-comstyle.com@ffmpeg.org>
-Date: Sun, 5 May 2024 23:59:47 -0400
-Subject: [PATCH] lavd/v4l2: Use proper field type for second parameter of
- ioctl() with BSD's
-
-The proper type was used until 73251678c83cbe24d08264da693411b166239bc7.
-
-This covers all of the OS's that currently have V4L2 support, permutations
-of Linux glibc/musl, Android bionic, FreeBSD, NetBSD, OpenBSD, Solaris.
-
-Copied from FreeBSD ports patch.
-
-Signed-off-by: Brad Smith <brad@comstyle.com>
-Signed-off-by: Marton Balint <cus@passwd.hu>
-(cherry picked from commit 9e674b31606c805dd31b4bb754364a72a5877238)
-Signed-off-by: Brad Smith <brad@comstyle.com>
----
- libavdevice/v4l2.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
-index 365bacd7714b6..1dcbe04bb1741 100644
---- a/libavdevice/v4l2.c
-+++ b/libavdevice/v4l2.c
-@@ -95,10 +95,10 @@ struct video_data {
- int (*open_f)(const char *file, int oflag, ...);
- int (*close_f)(int fd);
- int (*dup_f)(int fd);
--#ifdef __GLIBC__
-- int (*ioctl_f)(int fd, unsigned long int request, ...);
--#else
-+#if defined(__sun) || defined(__BIONIC__) || defined(__musl__) /* POSIX-like */
- int (*ioctl_f)(int fd, int request, ...);
-+#else
-+ int (*ioctl_f)(int fd, unsigned long int request, ...);
- #endif
- ssize_t (*read_f)(int fd, void *buffer, size_t n);
- void *(*mmap_f)(void *start, size_t length, int prot, int flags, int fd, int64_t offset);
-From af17f55202e285d4d3d502078e5b6a41bcca90fb Mon Sep 17 00:00:00 2001
-From: Ramiro Polla <ramiro.polla@gmail.com>
-Date: Thu, 29 Aug 2024 15:40:00 +0200
-Subject: [PATCH] configure: improve check for POSIX ioctl
-
-Instead of relying on system #ifdefs which may or may not be correct,
-detect the POSIX ioctl signature at configure time.
-
-(cherry picked from commit 00b64fca55a3a009c9d0e391c85f4fd3291e5d12)
-Signed-off-by: Brad Smith <brad@comstyle.com>
----
- configure | 2 ++
- libavdevice/v4l2.c | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index c89d3ad1ec291..175b70e20735c 100755
---- a/configure
-+++ b/configure
-@@ -2340,6 +2340,7 @@ HAVE_LIST="
- opencl_vaapi_intel_media
- perl
- pod2man
-+ posix_ioctl
- texi2html
- "
-
-@@ -6616,6 +6617,7 @@ rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout || d
- check_headers linux/fb.h
- check_headers linux/videodev2.h
- test_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_sanitized struct_v4l2_frmivalenum_discrete
-+test_code cc sys/ioctl.h "int ioctl(int, int, ...)" && enable posix_ioctl
-
- # check V4L2 codecs available in the API
- if enabled v4l2_m2m; then
-diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
-index 1dcbe04bb1741..f90490eebfc86 100644
---- a/libavdevice/v4l2.c
-+++ b/libavdevice/v4l2.c
-@@ -95,7 +95,7 @@ struct video_data {
- int (*open_f)(const char *file, int oflag, ...);
- int (*close_f)(int fd);
- int (*dup_f)(int fd);
--#if defined(__sun) || defined(__BIONIC__) || defined(__musl__) /* POSIX-like */
-+#if HAVE_POSIX_IOCTL
- int (*ioctl_f)(int fd, int request, ...);
- #else
- int (*ioctl_f)(int fd, unsigned long int request, ...);
diff --git a/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch b/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
deleted file mode 100644
index 9a55178c74f0fd..00000000000000
--- a/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/libavfilter/vf_drawtext.c 2017-10-26 21:03:03.000000000 +0200
-+++ b/libavfilter/vf_drawtext.c 2017-11-21 11:06:49.602284422 +0100
-@@ -39,6 +39,15 @@
- #endif
- #include <fenv.h>
-
-+#if (FE_ALL_EXCEPT == 0)
-+/* E.g. ARM soft float does not define these */
-+#define FE_INVALID 0
-+#define FE_DIVBYZERO 0
-+#define FE_OVERFLOW 0
-+#define FE_UNDERFLOW 0
-+#define FE_INEXACT 0
-+#endif
-+
- #if CONFIG_LIBFONTCONFIG
- #include <fontconfig/fontconfig.h>
- #endif
diff --git a/srcpkgs/ffmpeg/patches/binutils-2.41.patch b/srcpkgs/ffmpeg/patches/binutils-2.41.patch
deleted file mode 100644
index 53a596d0ee7d4e..00000000000000
--- a/srcpkgs/ffmpeg/patches/binutils-2.41.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
-Date: Sun, 16 Jul 2023 18:18:02 +0300
-Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift
- instructions within inline assembly
-
-Fixes assembling with binutil as >= 2.41
-
-Signed-off-by: James Almer <jamrial@gmail.com>
----
- libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++---
- 1 file changed, 23 insertions(+), 3 deletions(-)
-
-diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
-index 6298f5ed1983b..ca7e2dffc1076 100644
---- a/libavcodec/x86/mathops.h
-+++ b/libavcodec/x86/mathops.h
-@@ -35,12 +35,20 @@
- static av_always_inline av_const int MULL(int a, int b, unsigned shift)
- {
- int rt, dummy;
-+ if (__builtin_constant_p(shift))
- __asm__ (
- "imull %3 \n\t"
- "shrdl %4, %%edx, %%eax \n\t"
- :"=a"(rt), "=d"(dummy)
-- :"a"(a), "rm"(b), "ci"((uint8_t)shift)
-+ :"a"(a), "rm"(b), "i"(shift & 0x1F)
- );
-+ else
-+ __asm__ (
-+ "imull %3 \n\t"
-+ "shrdl %4, %%edx, %%eax \n\t"
-+ :"=a"(rt), "=d"(dummy)
-+ :"a"(a), "rm"(b), "c"((uint8_t)shift)
-+ );
- return rt;
- }
-
-@@ -113,19 +121,31 @@ __asm__ volatile(\
- // avoid +32 for shift optimization (gcc should do that ...)
- #define NEG_SSR32 NEG_SSR32
- static inline int32_t NEG_SSR32( int32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("sarl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("sarl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
- #define NEG_USR32 NEG_USR32
- static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("shrl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("shrl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
diff --git a/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff b/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
deleted file mode 100644
index aa948f7a8a2dfb..00000000000000
--- a/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-#==================================================================================================
-# From 031f1561cd286596cdb374da32f8aa816ce3b135 Mon Sep 17 00:00:00 2001
-# From: Christopher Degawa <christopher.degawa@intel.com>
-# Date: Thu, 20 Oct 2022 22:55:27 -0500
-# Subject: [PATCH] avcodec/libsvtav1: remove compressed_ten_bit_format and simplify alloc_buffer
-#
-# compressed_ten_bit_format has been deprecated upstream and has no effect
-# and can be removed. Plus, technically it was never used in the first place
-# since it would require the app (ffmpeg) to set it and do additional
-# processing of the input frames.
-#
-# Also simplify alloc_buffer by removing calculations relating to the non-existant processing.
-#
-# Signed-off-by: Christopher Degawa <christopher.degawa@intel.com>
-#==================================================================================================
---- a/libavcodec/libsvtav1.c
-+++ b/libavcodec/libsvtav1.c
-@@ -124,16 +124,12 @@ static int svt_print_error(void *log_ctx, EbErrorType err,
-
- static int alloc_buffer(EbSvtAv1EncConfiguration *config, SvtContext *svt_enc)
- {
-- const int pack_mode_10bit =
-- (config->encoder_bit_depth > 8) && (config->compressed_ten_bit_format == 0) ? 1 : 0;
-- const size_t luma_size_8bit =
-- config->source_width * config->source_height * (1 << pack_mode_10bit);
-- const size_t luma_size_10bit =
-- (config->encoder_bit_depth > 8 && pack_mode_10bit == 0) ? luma_size_8bit : 0;
-+ const size_t luma_size = config->source_width * config->source_height *
-+ (config->encoder_bit_depth > 8 ? 2 : 1);
-
- EbSvtIOFormat *in_data;
-
-- svt_enc->raw_size = (luma_size_8bit + luma_size_10bit) * 3 / 2;
-+ svt_enc->raw_size = luma_size * 3 / 2;
-
- // allocate buffer for in and out
- svt_enc->in_buf = av_mallocz(sizeof(*svt_enc->in_buf));
---
-GitLab
-
diff --git a/srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch b/srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch
deleted file mode 100644
index 00e3f68a415b84..00000000000000
--- a/srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 811d290844206fc73dc39c3e5b67d5d895baedf8 Mon Sep 17 00:00:00 2001
-From: Rainer Hochecker <fernetmenta@online.de>
-Date: Sat, 26 Jan 2019 19:48:35 +0100
-Subject: [PATCH] avcodec/vaapi_h264: skip decode if pic has no slices
-
-This fixes / workarounds https://bugs.freedesktop.org/show_bug.cgi?id=105368.
-It was hit frequently when watching h264 channels received via DVB-X.
-Corresponding kodi bug: https://github.com/xbmc/xbmc/issues/15704
----
- libavcodec/vaapi_h264.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c
-index 5854587a255..f12fdc457a4 100644
---- a/libavcodec/vaapi_h264.c
-+++ b/libavcodec/vaapi_h264.c
-@@ -317,6 +317,11 @@ static int vaapi_h264_end_frame(AVCodecContext *avctx)
- H264SliceContext *sl = &h->slice_ctx[0];
- int ret;
-
-+ if (pic->nb_slices == 0) {
-+ ret = AVERROR_INVALIDDATA;
-+ goto finish;
-+ }
-+
- ret = ff_vaapi_decode_issue(avctx, pic);
- if (ret < 0)
- goto finish;
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 08297151181c07..b560d9df0ce126 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,8 +1,8 @@
# Template file for 'ffmpeg'
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg
-version=4.4.4
-revision=11
+version=4.4.5
+revision=1
build_style=meta
short_desc="Decoding, encoding and streaming software (transitional dummy package)"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
homepage="https://www.ffmpeg.org"
changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
distfiles="https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"
-checksum=e80b380d595c809060f66f96a5d849511ef4a76a26b76eacf5778b94c3570309
+checksum=f9514e0d3515aee5a271283df71636e1d1ff7274b15853bcd84e144be416ab07
hostmakedepends="pkg-config perl"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
From ba49aabd7eb1a4300eb83eb5e7993a882ce1bd36 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 23 Mar 2025 21:40:28 -0300
Subject: [PATCH 8/9] ffmpeg6: rebuild for x265-4.0
---
srcpkgs/ffmpeg6/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ffmpeg6/template b/srcpkgs/ffmpeg6/template
index 5ca80c5f1b7f8f..d0855f2994a67f 100644
--- a/srcpkgs/ffmpeg6/template
+++ b/srcpkgs/ffmpeg6/template
@@ -2,7 +2,7 @@
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg6
version=6.1.2
-revision=4
+revision=5
hostmakedepends="pkg-config perl"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
libXext-devel libXvMC-devel libxcb-devel lame-devel libtheora-devel
From f144ad2307fe2d0c5a2c6bb782641f0632b63549 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 23 Mar 2025 21:41:38 -0300
Subject: [PATCH 9/9] handbrake: rebuild for x265-4.0.
---
srcpkgs/handbrake/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index d32651a0abd02d..22fb9b6f4eb7d7 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.8.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] X265, ffmpeg and libheif: update
2025-01-20 21:47 [PR PATCH] X265, ffmpeg, handbrake, libheif: update 1is7ac3
` (11 preceding siblings ...)
2025-03-24 0:41 ` 1is7ac3
@ 2025-03-26 4:24 ` 1is7ac3
2025-03-28 2:18 ` 1is7ac3
` (5 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: 1is7ac3 @ 2025-03-26 4:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1247 bytes --]
There is an updated pull request by 1is7ac3 against master on the void-packages repository
https://github.com/1is7ac3/void-packages x265
https://github.com/void-linux/void-packages/pull/54056
X265, ffmpeg and libheif: update
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (X86_64-GLIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
<!-- - armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/54056.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-x265-54056.patch --]
[-- Type: text/x-diff, Size: 28696 bytes --]
From a3195691010a98827d33f9866f2d5946e93a2b75 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 16:13:06 -0300
Subject: [PATCH 1/9] x265: update to 4.0.
---
common/shlibs | 2 +-
.../x265/patches/handbrake-ambientlight.patch | 50 +++++++++----------
srcpkgs/x265/template | 30 +++++------
3 files changed, 39 insertions(+), 43 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 3a5a8ce427f6ec..bb14058434794c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1950,7 +1950,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
libQt5WebKit.so.5 qt5-webkit-5.6.0_1
libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.209 x265-3.6_1
+libx265.so.212 x265-4.0_1
libQt5Xdg.so.3 libqt5xdg-3.2.0_1
libQt5XdgIconLoader.so.3 libqt5xdg-3.2.0_1
libQt6Xdg.so.4 libqtxdg-4.0.0_1
diff --git a/srcpkgs/x265/patches/handbrake-ambientlight.patch b/srcpkgs/x265/patches/handbrake-ambientlight.patch
index ab36a9c35c9de4..5c966e42f0c373 100644
--- a/srcpkgs/x265/patches/handbrake-ambientlight.patch
+++ b/srcpkgs/x265/patches/handbrake-ambientlight.patch
@@ -1,8 +1,7 @@
-diff --git a/source/common/param.cpp b/source/common/param.cpp
-index 8c32fafa2..0b56235c9 100755
---- a/source/common/param.cpp
-+++ b/source/common/param.cpp
-@@ -378,6 +378,7 @@ void x265_param_default(x265_param* param)
+diff -ru a/source/common/param.cpp b/source/common/param.cpp
+--- a/source/common/param.cpp 2024-09-13 09:51:43.000000000 -0300
++++ b/source/common/param.cpp 2025-02-03 13:27:31.474334833 -0300
+@@ -380,6 +380,7 @@
param->preferredTransferCharacteristics = -1;
param->pictureStructure = -1;
param->bEmitCLL = 1;
@@ -10,7 +9,7 @@ index 8c32fafa2..0b56235c9 100755
param->bEnableFrameDuplication = 0;
param->dupThreshold = 70;
-@@ -1880,6 +1881,7 @@ int x265_check_params(x265_param* param)
+@@ -1929,6 +1930,7 @@
|| param->bEmitIDRRecoverySEI
|| !!param->interlaceMode
|| param->preferredTransferCharacteristics > 1
@@ -18,7 +17,7 @@ index 8c32fafa2..0b56235c9 100755
|| param->toneMapFile
|| param->naluFile);
-@@ -2766,6 +2768,10 @@ void x265_copy_params(x265_param* dst, x265_param* src)
+@@ -2850,6 +2852,10 @@
dst->bEmitCLL = src->bEmitCLL;
dst->maxCLL = src->maxCLL;
dst->maxFALL = src->maxFALL;
@@ -29,11 +28,10 @@ index 8c32fafa2..0b56235c9 100755
dst->log2MaxPocLsb = src->log2MaxPocLsb;
dst->bEmitVUIHRDInfo = src->bEmitVUIHRDInfo;
dst->bEmitVUITimingInfo = src->bEmitVUITimingInfo;
-diff --git a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp
-index 5950f87e9..545283474 100644
---- a/source/encoder/encoder.cpp
-+++ b/source/encoder/encoder.cpp
-@@ -3276,6 +3276,15 @@ void Encoder::getStreamHeaders(NALList& list, Entropy& sbacCoder, Bitstream& bs)
+diff -ru a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp
+--- a/source/encoder/encoder.cpp 2024-09-13 09:51:43.000000000 -0300
++++ b/source/encoder/encoder.cpp 2025-02-03 13:28:37.551336750 -0300
+@@ -3423,6 +3423,15 @@
}
}
@@ -49,11 +47,10 @@ index 5950f87e9..545283474 100644
if (m_param->bEmitInfoSEI)
{
char *opts = x265_param2string(m_param, m_sps.conformanceWindow.rightOffset, m_sps.conformanceWindow.bottomOffset);
-diff --git a/source/encoder/sei.h b/source/encoder/sei.h
-index 03e210639..712e4efb4 100644
---- a/source/encoder/sei.h
-+++ b/source/encoder/sei.h
-@@ -242,6 +242,25 @@ public:
+diff -ru a/source/encoder/sei.h b/source/encoder/sei.h
+--- a/source/encoder/sei.h 2024-09-13 09:51:43.000000000 -0300
++++ b/source/encoder/sei.h 2025-02-03 13:30:41.386953402 -0300
+@@ -464,6 +464,25 @@
}
};
@@ -79,19 +76,18 @@ index 03e210639..712e4efb4 100644
class SEIDecodedPictureHash : public SEI
{
public:
-diff --git a/source/x265.h b/source/x265.h
-index 9f3abd9d9..b6a4d3fe1 100644
---- a/source/x265.h
-+++ b/source/x265.h
-@@ -371,6 +371,7 @@ typedef enum
+diff -ru a/source/x265.h b/source/x265.h
+--- a/source/x265.h 2024-09-13 09:51:43.000000000 -0300
++++ b/source/x265.h 2025-02-03 13:32:46.662499030 -0300
+@@ -371,6 +371,7 @@
MASTERING_DISPLAY_INFO = 137,
CONTENT_LIGHT_LEVEL_INFO = 144,
ALTERNATIVE_TRANSFER_CHARACTERISTICS = 147,
+ AMBIENT_VIEWING_ENVIRONMENT = 148,
- } SEIPayloadType;
-
- typedef struct x265_sei_payload
-@@ -1903,6 +1904,11 @@ typedef struct x265_param
+ ALPHA_CHANNEL_INFO = 165,
+ THREE_DIMENSIONAL_REFERENCE_DISPLAYS_INFO = 176,
+ MULTIVIEW_SCENE_INFO = 178,
+@@ -1956,6 +1957,11 @@
* value to that value. */
uint16_t maxLuma;
@@ -103,7 +99,7 @@ index 9f3abd9d9..b6a4d3fe1 100644
/* Maximum of the picture order count */
int log2MaxPocLsb;
-@@ -2114,6 +2120,9 @@ typedef struct x265_param
+@@ -2167,6 +2173,9 @@
/*Emit content light level info SEI*/
int bEmitCLL;
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index d95e93552f6c04..4acc7cd5ff2b6d 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,7 +1,7 @@
# Template file for 'x265'
pkgname=x265
-version=3.6
-revision=2
+version=4.0
+revision=1
build_wrksrc=source
build_style=cmake
configure_args="-DENABLE_PIC=1 -DEXTRA_LINK_FLAGS='-L.'
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://x265.org/"
distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=206329b9599c78d06969a1b7b7bb939f7c99a459ab283b2e93f76854bd34ca7b
+checksum=66b64be4b316362fdadb33ad8273a74236042cc380691bdbec42946b0437a389
build_options="altivec assembly"
@@ -23,28 +23,28 @@ case "$XBPS_TARGET_MACHINE" in
ppc64le*) build_options_default="altivec" ;;
# on ARM, enabling it currently fails with undefined reference to
# x265::setupAssemblyPrimitives(x265::EncoderPrimitives&, int)
- x86_64*|i686*) build_options_default="assembly" ;;
+ x86_64* | i686*) build_options_default="assembly" ;;
*) ;;
esac
if [ "$build_option_assembly" ]; then
case "$XBPS_TARGET_MACHINE" in
- x86_64*|i686*)
- # see https://bitbucket.org/multicoreware/x265_git/issues/559
- configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
- hostmakedepends+=" nasm"
- ;;
- *) ;;
+ x86_64* | i686*)
+ # see https://bitbucket.org/multicoreware/x265_git/issues/559
+ configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
+ hostmakedepends+=" nasm"
+ ;;
+ *) ;;
esac
fi
case "$XBPS_TARGET_MACHINE" in
- ppc64*)
- # altivec does not build without power8 being enabled
- configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF)
+ppc64*)
+ # altivec does not build without power8 being enabled
+ configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF)
-DCPU_POWER8=$(vopt_if altivec ON OFF)"
- ;;
- *) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;;
+ ;;
+*) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;;
esac
pre_configure() {
From ce1cc305f5479a343a6fee7f0f2c05dac40f79c4 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:15:26 -0300
Subject: [PATCH 2/9] libheif: rebuild for x265-4.0.
---
srcpkgs/libheif/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 3e5d16adbf365a..34bffb8c590811 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,8 +1,9 @@
# Template file for 'libheif'
pkgname=libheif
version=1.19.7
-revision=1
+revision=2
build_style=cmake
+configure_args="-DBUILD_TESTING=OFF"
makedepends="libjpeg-turbo-devel libpng-devel libde265-devel x265-devel
libaom-devel"
short_desc="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
From 61356fb7388c5ba3e383ffdcdf6aaf29ad6413ff Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:15:47 -0300
Subject: [PATCH 3/9] vlc: revbump for x265-4.0.
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 0eb4cc304a6f52cd116efe4af5787139ebbad308 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:16:11 -0300
Subject: [PATCH 4/9] baresip: revbump for x265-4.0.
---
srcpkgs/baresip/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index 9ba4c08bc868fd..3419968c532e59 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
# Template file for 'baresip'
pkgname=baresip
version=3.20.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config glib-devel"
makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
From aa412a0aaa7ff7f30de5205d198ba23101d0dd9b Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:17:27 -0300
Subject: [PATCH 5/9] gimp: revbump for x265-4.0.
---
srcpkgs/gimp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index d40c6e0fff19aa..62c59c021585f2 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
# Template file for 'gimp'
pkgname=gimp
version=3.0.2
-revision=1
+revision=2
build_style=meson
build_helper="gir qemu"
configure_args="-Dcheck-update=no -Drevision=$revision -Denable-default-bin=enabled
From fd04df9c51cebbaf5b77794fe77250ab76d4f4f4 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:18:43 -0300
Subject: [PATCH 6/9] avidemux: revbump for x265-4.0.
---
srcpkgs/avidemux/patches/ADM_x265.patch | 44 +++++++++++++++++++++++++
srcpkgs/avidemux/template | 2 +-
2 files changed, 45 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/avidemux/patches/ADM_x265.patch
diff --git a/srcpkgs/avidemux/patches/ADM_x265.patch b/srcpkgs/avidemux/patches/ADM_x265.patch
new file mode 100644
index 00000000000000..6db76d7ffc332e
--- /dev/null
+++ b/srcpkgs/avidemux/patches/ADM_x265.patch
@@ -0,0 +1,44 @@
+--- a/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp 2022-09-17 10:59:17.000000000 -0300
++++ b/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp 2025-01-26 19:27:19.796218401 -0300
+@@ -205,15 +205,20 @@
+ //
+ x265_nal *nal;
+ uint32_t nbNal = 0;
+- x265_picture pic_out;
+- api->picture_init(¶m,&pic_out);
++ x265_picture pic_out[MAX_SCALABLE_LAYERS];
++ x265_picture *pic_out_ptr[MAX_SCALABLE_LAYERS];
+ out->flags = 0;
+
++ for (int i = 0; i < MAX_SCALABLE_LAYERS; i++)
++ {
++ api->picture_init(¶m,&pic_out[i]);
++ pic_out_ptr[i] = &pic_out[i];
++ }
+ int er;
+ if(false==gotFrame)
+ {
+ ADM_info("Flushing delayed frames\n");
+- er = api->encoder_encode(handle, &nal, &nbNal, NULL, &pic_out);
++ er = api->encoder_encode(handle, &nal, &nbNal, NULL, pic_out_ptr);
+ if(er<=0)
+ {
+ ADM_info ("End of flush\n");
+@@ -221,7 +226,7 @@
+ }
+ }else
+ {
+- er = api->encoder_encode(handle, &nal, &nbNal, &pic, &pic_out);
++ er = api->encoder_encode(handle, &nal, &nbNal, &pic, pic_out_ptr);
+ if(er<0)
+ {
+ ADM_error ("[x265] Error encoding %d\n",er);
+@@ -236,7 +241,7 @@
+
+
+ // 3-encode
+- if(false==postAmble(out,nbNal,nal,&pic_out))
++ if(false==postAmble(out,nbNal,nal,pic_out_ptr[0]))
+ {
+ ADM_warning("[x265] postAmble failed\n");
+ return false;
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index d66f8524bd0e28..b972ecac92ed31 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
# Template file for 'avidemux'
pkgname=avidemux
version=2.8.1
-revision=2
+revision=3
# Can't be compiled for aarch64, arm* or mips*
archs="x86_64* i686*"
hostmakedepends="cmake pkg-config qt5-host-tools qt5-devel tar yasm"
From b08f9f06fa6d96865b7b86370e138170dd5a1d74 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 23 Mar 2025 21:39:17 -0300
Subject: [PATCH 7/9] ffmpeg: update to 4.4.5.
---
srcpkgs/ffmpeg/patches/00001-v4l-config.patch | 31 -------
.../ffmpeg/patches/00002-v4l-ioctl-musl.patch | 87 -------------------
.../patches/armv5tel-floating-point.patch | 18 ----
srcpkgs/ffmpeg/patches/binutils-2.41.patch | 73 ----------------
...h-libavcodec-libsvtav1-ten_bit_format.diff | 40 ---------
.../workaround-mesa-readeon-vaapi-bug.patch | 28 ------
srcpkgs/ffmpeg/template | 6 +-
7 files changed, 3 insertions(+), 280 deletions(-)
delete mode 100644 srcpkgs/ffmpeg/patches/00001-v4l-config.patch
delete mode 100644 srcpkgs/ffmpeg/patches/00002-v4l-ioctl-musl.patch
delete mode 100644 srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
delete mode 100644 srcpkgs/ffmpeg/patches/binutils-2.41.patch
delete mode 100644 srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
delete mode 100644 srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch
diff --git a/srcpkgs/ffmpeg/patches/00001-v4l-config.patch b/srcpkgs/ffmpeg/patches/00001-v4l-config.patch
deleted file mode 100644
index e8dfdda98bce89..00000000000000
--- a/srcpkgs/ffmpeg/patches/00001-v4l-config.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 7405f1ad5351cc24b91a0227aeeaf24ff9d12278 Mon Sep 17 00:00:00 2001
-From: Ramiro Polla <ramiro.polla@gmail.com>
-Date: Wed, 3 Jul 2024 00:30:08 +0200
-Subject: [PATCH] configure: restore autodetection of v4l2 and fbdev
-
-The detection logic for v4l2 and fbdev was accidentally modified to
-depend on v4l2-m2m in 43b3412.
----
- configure | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/configure b/configure
-index b28221f258965..fa2e384350958 100755
---- a/configure
-+++ b/configure
-@@ -7145,11 +7145,12 @@ pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man
- rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout || disable rsync_contimeout
- xmllint --version > /dev/null 2>&1 && enable xmllint || disable xmllint
-
-+check_headers linux/fb.h
-+check_headers linux/videodev2.h
-+test_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_sanitized struct_v4l2_frmivalenum_discrete
-+
- # check V4L2 codecs available in the API
- if enabled v4l2_m2m; then
-- check_headers linux/fb.h
-- check_headers linux/videodev2.h
-- test_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_sanitized struct_v4l2_frmivalenum_discrete
- check_cc v4l2_m2m linux/videodev2.h "int i = V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_VIDEO_M2M | V4L2_BUF_FLAG_LAST;"
- check_cc vc1_v4l2_m2m linux/videodev2.h "int i = V4L2_PIX_FMT_VC1_ANNEX_G;"
- check_cc mpeg1_v4l2_m2m linux/videodev2.h "int i = V4L2_PIX_FMT_MPEG1;"
diff --git a/srcpkgs/ffmpeg/patches/00002-v4l-ioctl-musl.patch b/srcpkgs/ffmpeg/patches/00002-v4l-ioctl-musl.patch
deleted file mode 100644
index 681fb5d4f706ad..00000000000000
--- a/srcpkgs/ffmpeg/patches/00002-v4l-ioctl-musl.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 008b0b4a3b0cbafa568d0dcbf78c798d56929802 Mon Sep 17 00:00:00 2001
-From: Brad Smith <brad-at-comstyle.com@ffmpeg.org>
-Date: Sun, 5 May 2024 23:59:47 -0400
-Subject: [PATCH] lavd/v4l2: Use proper field type for second parameter of
- ioctl() with BSD's
-
-The proper type was used until 73251678c83cbe24d08264da693411b166239bc7.
-
-This covers all of the OS's that currently have V4L2 support, permutations
-of Linux glibc/musl, Android bionic, FreeBSD, NetBSD, OpenBSD, Solaris.
-
-Copied from FreeBSD ports patch.
-
-Signed-off-by: Brad Smith <brad@comstyle.com>
-Signed-off-by: Marton Balint <cus@passwd.hu>
-(cherry picked from commit 9e674b31606c805dd31b4bb754364a72a5877238)
-Signed-off-by: Brad Smith <brad@comstyle.com>
----
- libavdevice/v4l2.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
-index 365bacd7714b6..1dcbe04bb1741 100644
---- a/libavdevice/v4l2.c
-+++ b/libavdevice/v4l2.c
-@@ -95,10 +95,10 @@ struct video_data {
- int (*open_f)(const char *file, int oflag, ...);
- int (*close_f)(int fd);
- int (*dup_f)(int fd);
--#ifdef __GLIBC__
-- int (*ioctl_f)(int fd, unsigned long int request, ...);
--#else
-+#if defined(__sun) || defined(__BIONIC__) || defined(__musl__) /* POSIX-like */
- int (*ioctl_f)(int fd, int request, ...);
-+#else
-+ int (*ioctl_f)(int fd, unsigned long int request, ...);
- #endif
- ssize_t (*read_f)(int fd, void *buffer, size_t n);
- void *(*mmap_f)(void *start, size_t length, int prot, int flags, int fd, int64_t offset);
-From af17f55202e285d4d3d502078e5b6a41bcca90fb Mon Sep 17 00:00:00 2001
-From: Ramiro Polla <ramiro.polla@gmail.com>
-Date: Thu, 29 Aug 2024 15:40:00 +0200
-Subject: [PATCH] configure: improve check for POSIX ioctl
-
-Instead of relying on system #ifdefs which may or may not be correct,
-detect the POSIX ioctl signature at configure time.
-
-(cherry picked from commit 00b64fca55a3a009c9d0e391c85f4fd3291e5d12)
-Signed-off-by: Brad Smith <brad@comstyle.com>
----
- configure | 2 ++
- libavdevice/v4l2.c | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index c89d3ad1ec291..175b70e20735c 100755
---- a/configure
-+++ b/configure
-@@ -2340,6 +2340,7 @@ HAVE_LIST="
- opencl_vaapi_intel_media
- perl
- pod2man
-+ posix_ioctl
- texi2html
- "
-
-@@ -6616,6 +6617,7 @@ rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout || d
- check_headers linux/fb.h
- check_headers linux/videodev2.h
- test_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_sanitized struct_v4l2_frmivalenum_discrete
-+test_code cc sys/ioctl.h "int ioctl(int, int, ...)" && enable posix_ioctl
-
- # check V4L2 codecs available in the API
- if enabled v4l2_m2m; then
-diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
-index 1dcbe04bb1741..f90490eebfc86 100644
---- a/libavdevice/v4l2.c
-+++ b/libavdevice/v4l2.c
-@@ -95,7 +95,7 @@ struct video_data {
- int (*open_f)(const char *file, int oflag, ...);
- int (*close_f)(int fd);
- int (*dup_f)(int fd);
--#if defined(__sun) || defined(__BIONIC__) || defined(__musl__) /* POSIX-like */
-+#if HAVE_POSIX_IOCTL
- int (*ioctl_f)(int fd, int request, ...);
- #else
- int (*ioctl_f)(int fd, unsigned long int request, ...);
diff --git a/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch b/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
deleted file mode 100644
index 9a55178c74f0fd..00000000000000
--- a/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/libavfilter/vf_drawtext.c 2017-10-26 21:03:03.000000000 +0200
-+++ b/libavfilter/vf_drawtext.c 2017-11-21 11:06:49.602284422 +0100
-@@ -39,6 +39,15 @@
- #endif
- #include <fenv.h>
-
-+#if (FE_ALL_EXCEPT == 0)
-+/* E.g. ARM soft float does not define these */
-+#define FE_INVALID 0
-+#define FE_DIVBYZERO 0
-+#define FE_OVERFLOW 0
-+#define FE_UNDERFLOW 0
-+#define FE_INEXACT 0
-+#endif
-+
- #if CONFIG_LIBFONTCONFIG
- #include <fontconfig/fontconfig.h>
- #endif
diff --git a/srcpkgs/ffmpeg/patches/binutils-2.41.patch b/srcpkgs/ffmpeg/patches/binutils-2.41.patch
deleted file mode 100644
index 53a596d0ee7d4e..00000000000000
--- a/srcpkgs/ffmpeg/patches/binutils-2.41.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
-Date: Sun, 16 Jul 2023 18:18:02 +0300
-Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift
- instructions within inline assembly
-
-Fixes assembling with binutil as >= 2.41
-
-Signed-off-by: James Almer <jamrial@gmail.com>
----
- libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++---
- 1 file changed, 23 insertions(+), 3 deletions(-)
-
-diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
-index 6298f5ed1983b..ca7e2dffc1076 100644
---- a/libavcodec/x86/mathops.h
-+++ b/libavcodec/x86/mathops.h
-@@ -35,12 +35,20 @@
- static av_always_inline av_const int MULL(int a, int b, unsigned shift)
- {
- int rt, dummy;
-+ if (__builtin_constant_p(shift))
- __asm__ (
- "imull %3 \n\t"
- "shrdl %4, %%edx, %%eax \n\t"
- :"=a"(rt), "=d"(dummy)
-- :"a"(a), "rm"(b), "ci"((uint8_t)shift)
-+ :"a"(a), "rm"(b), "i"(shift & 0x1F)
- );
-+ else
-+ __asm__ (
-+ "imull %3 \n\t"
-+ "shrdl %4, %%edx, %%eax \n\t"
-+ :"=a"(rt), "=d"(dummy)
-+ :"a"(a), "rm"(b), "c"((uint8_t)shift)
-+ );
- return rt;
- }
-
-@@ -113,19 +121,31 @@ __asm__ volatile(\
- // avoid +32 for shift optimization (gcc should do that ...)
- #define NEG_SSR32 NEG_SSR32
- static inline int32_t NEG_SSR32( int32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("sarl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("sarl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
- #define NEG_USR32 NEG_USR32
- static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("shrl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("shrl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
diff --git a/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff b/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
deleted file mode 100644
index aa948f7a8a2dfb..00000000000000
--- a/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-#==================================================================================================
-# From 031f1561cd286596cdb374da32f8aa816ce3b135 Mon Sep 17 00:00:00 2001
-# From: Christopher Degawa <christopher.degawa@intel.com>
-# Date: Thu, 20 Oct 2022 22:55:27 -0500
-# Subject: [PATCH] avcodec/libsvtav1: remove compressed_ten_bit_format and simplify alloc_buffer
-#
-# compressed_ten_bit_format has been deprecated upstream and has no effect
-# and can be removed. Plus, technically it was never used in the first place
-# since it would require the app (ffmpeg) to set it and do additional
-# processing of the input frames.
-#
-# Also simplify alloc_buffer by removing calculations relating to the non-existant processing.
-#
-# Signed-off-by: Christopher Degawa <christopher.degawa@intel.com>
-#==================================================================================================
---- a/libavcodec/libsvtav1.c
-+++ b/libavcodec/libsvtav1.c
-@@ -124,16 +124,12 @@ static int svt_print_error(void *log_ctx, EbErrorType err,
-
- static int alloc_buffer(EbSvtAv1EncConfiguration *config, SvtContext *svt_enc)
- {
-- const int pack_mode_10bit =
-- (config->encoder_bit_depth > 8) && (config->compressed_ten_bit_format == 0) ? 1 : 0;
-- const size_t luma_size_8bit =
-- config->source_width * config->source_height * (1 << pack_mode_10bit);
-- const size_t luma_size_10bit =
-- (config->encoder_bit_depth > 8 && pack_mode_10bit == 0) ? luma_size_8bit : 0;
-+ const size_t luma_size = config->source_width * config->source_height *
-+ (config->encoder_bit_depth > 8 ? 2 : 1);
-
- EbSvtIOFormat *in_data;
-
-- svt_enc->raw_size = (luma_size_8bit + luma_size_10bit) * 3 / 2;
-+ svt_enc->raw_size = luma_size * 3 / 2;
-
- // allocate buffer for in and out
- svt_enc->in_buf = av_mallocz(sizeof(*svt_enc->in_buf));
---
-GitLab
-
diff --git a/srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch b/srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch
deleted file mode 100644
index 00e3f68a415b84..00000000000000
--- a/srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 811d290844206fc73dc39c3e5b67d5d895baedf8 Mon Sep 17 00:00:00 2001
-From: Rainer Hochecker <fernetmenta@online.de>
-Date: Sat, 26 Jan 2019 19:48:35 +0100
-Subject: [PATCH] avcodec/vaapi_h264: skip decode if pic has no slices
-
-This fixes / workarounds https://bugs.freedesktop.org/show_bug.cgi?id=105368.
-It was hit frequently when watching h264 channels received via DVB-X.
-Corresponding kodi bug: https://github.com/xbmc/xbmc/issues/15704
----
- libavcodec/vaapi_h264.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c
-index 5854587a255..f12fdc457a4 100644
---- a/libavcodec/vaapi_h264.c
-+++ b/libavcodec/vaapi_h264.c
-@@ -317,6 +317,11 @@ static int vaapi_h264_end_frame(AVCodecContext *avctx)
- H264SliceContext *sl = &h->slice_ctx[0];
- int ret;
-
-+ if (pic->nb_slices == 0) {
-+ ret = AVERROR_INVALIDDATA;
-+ goto finish;
-+ }
-+
- ret = ff_vaapi_decode_issue(avctx, pic);
- if (ret < 0)
- goto finish;
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 08297151181c07..b560d9df0ce126 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,8 +1,8 @@
# Template file for 'ffmpeg'
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg
-version=4.4.4
-revision=11
+version=4.4.5
+revision=1
build_style=meta
short_desc="Decoding, encoding and streaming software (transitional dummy package)"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
homepage="https://www.ffmpeg.org"
changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
distfiles="https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"
-checksum=e80b380d595c809060f66f96a5d849511ef4a76a26b76eacf5778b94c3570309
+checksum=f9514e0d3515aee5a271283df71636e1d1ff7274b15853bcd84e144be416ab07
hostmakedepends="pkg-config perl"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
From 2be4a79b55a95e88e13a75ec704970a8a9b2863f Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 23 Mar 2025 21:40:28 -0300
Subject: [PATCH 8/9] ffmpeg6: rebuild for x265-4.0
---
srcpkgs/ffmpeg6/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ffmpeg6/template b/srcpkgs/ffmpeg6/template
index 5ca80c5f1b7f8f..d0855f2994a67f 100644
--- a/srcpkgs/ffmpeg6/template
+++ b/srcpkgs/ffmpeg6/template
@@ -2,7 +2,7 @@
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg6
version=6.1.2
-revision=4
+revision=5
hostmakedepends="pkg-config perl"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
libXext-devel libXvMC-devel libxcb-devel lame-devel libtheora-devel
From 4fe2f5e1ab635158d02ee7ab60f48b3ee3b7cb7e Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 23 Mar 2025 21:41:38 -0300
Subject: [PATCH 9/9] handbrake: rebuild for x265-4.0.
---
srcpkgs/handbrake/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index d32651a0abd02d..22fb9b6f4eb7d7 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.8.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] X265, ffmpeg and libheif: update
2025-01-20 21:47 [PR PATCH] X265, ffmpeg, handbrake, libheif: update 1is7ac3
` (12 preceding siblings ...)
2025-03-26 4:24 ` 1is7ac3
@ 2025-03-28 2:18 ` 1is7ac3
2025-03-30 22:50 ` 1is7ac3
` (4 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: 1is7ac3 @ 2025-03-28 2:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1247 bytes --]
There is an updated pull request by 1is7ac3 against master on the void-packages repository
https://github.com/1is7ac3/void-packages x265
https://github.com/void-linux/void-packages/pull/54056
X265, ffmpeg and libheif: update
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (X86_64-GLIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
<!-- - armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/54056.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-x265-54056.patch --]
[-- Type: text/x-diff, Size: 28696 bytes --]
From 5c6a9f461d74baa95bf846ad43c3be04eb40d922 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 16:13:06 -0300
Subject: [PATCH 1/9] x265: update to 4.0.
---
common/shlibs | 2 +-
.../x265/patches/handbrake-ambientlight.patch | 50 +++++++++----------
srcpkgs/x265/template | 30 +++++------
3 files changed, 39 insertions(+), 43 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 3a5a8ce427f6ec..bb14058434794c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1950,7 +1950,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
libQt5WebKit.so.5 qt5-webkit-5.6.0_1
libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.209 x265-3.6_1
+libx265.so.212 x265-4.0_1
libQt5Xdg.so.3 libqt5xdg-3.2.0_1
libQt5XdgIconLoader.so.3 libqt5xdg-3.2.0_1
libQt6Xdg.so.4 libqtxdg-4.0.0_1
diff --git a/srcpkgs/x265/patches/handbrake-ambientlight.patch b/srcpkgs/x265/patches/handbrake-ambientlight.patch
index ab36a9c35c9de4..5c966e42f0c373 100644
--- a/srcpkgs/x265/patches/handbrake-ambientlight.patch
+++ b/srcpkgs/x265/patches/handbrake-ambientlight.patch
@@ -1,8 +1,7 @@
-diff --git a/source/common/param.cpp b/source/common/param.cpp
-index 8c32fafa2..0b56235c9 100755
---- a/source/common/param.cpp
-+++ b/source/common/param.cpp
-@@ -378,6 +378,7 @@ void x265_param_default(x265_param* param)
+diff -ru a/source/common/param.cpp b/source/common/param.cpp
+--- a/source/common/param.cpp 2024-09-13 09:51:43.000000000 -0300
++++ b/source/common/param.cpp 2025-02-03 13:27:31.474334833 -0300
+@@ -380,6 +380,7 @@
param->preferredTransferCharacteristics = -1;
param->pictureStructure = -1;
param->bEmitCLL = 1;
@@ -10,7 +9,7 @@ index 8c32fafa2..0b56235c9 100755
param->bEnableFrameDuplication = 0;
param->dupThreshold = 70;
-@@ -1880,6 +1881,7 @@ int x265_check_params(x265_param* param)
+@@ -1929,6 +1930,7 @@
|| param->bEmitIDRRecoverySEI
|| !!param->interlaceMode
|| param->preferredTransferCharacteristics > 1
@@ -18,7 +17,7 @@ index 8c32fafa2..0b56235c9 100755
|| param->toneMapFile
|| param->naluFile);
-@@ -2766,6 +2768,10 @@ void x265_copy_params(x265_param* dst, x265_param* src)
+@@ -2850,6 +2852,10 @@
dst->bEmitCLL = src->bEmitCLL;
dst->maxCLL = src->maxCLL;
dst->maxFALL = src->maxFALL;
@@ -29,11 +28,10 @@ index 8c32fafa2..0b56235c9 100755
dst->log2MaxPocLsb = src->log2MaxPocLsb;
dst->bEmitVUIHRDInfo = src->bEmitVUIHRDInfo;
dst->bEmitVUITimingInfo = src->bEmitVUITimingInfo;
-diff --git a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp
-index 5950f87e9..545283474 100644
---- a/source/encoder/encoder.cpp
-+++ b/source/encoder/encoder.cpp
-@@ -3276,6 +3276,15 @@ void Encoder::getStreamHeaders(NALList& list, Entropy& sbacCoder, Bitstream& bs)
+diff -ru a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp
+--- a/source/encoder/encoder.cpp 2024-09-13 09:51:43.000000000 -0300
++++ b/source/encoder/encoder.cpp 2025-02-03 13:28:37.551336750 -0300
+@@ -3423,6 +3423,15 @@
}
}
@@ -49,11 +47,10 @@ index 5950f87e9..545283474 100644
if (m_param->bEmitInfoSEI)
{
char *opts = x265_param2string(m_param, m_sps.conformanceWindow.rightOffset, m_sps.conformanceWindow.bottomOffset);
-diff --git a/source/encoder/sei.h b/source/encoder/sei.h
-index 03e210639..712e4efb4 100644
---- a/source/encoder/sei.h
-+++ b/source/encoder/sei.h
-@@ -242,6 +242,25 @@ public:
+diff -ru a/source/encoder/sei.h b/source/encoder/sei.h
+--- a/source/encoder/sei.h 2024-09-13 09:51:43.000000000 -0300
++++ b/source/encoder/sei.h 2025-02-03 13:30:41.386953402 -0300
+@@ -464,6 +464,25 @@
}
};
@@ -79,19 +76,18 @@ index 03e210639..712e4efb4 100644
class SEIDecodedPictureHash : public SEI
{
public:
-diff --git a/source/x265.h b/source/x265.h
-index 9f3abd9d9..b6a4d3fe1 100644
---- a/source/x265.h
-+++ b/source/x265.h
-@@ -371,6 +371,7 @@ typedef enum
+diff -ru a/source/x265.h b/source/x265.h
+--- a/source/x265.h 2024-09-13 09:51:43.000000000 -0300
++++ b/source/x265.h 2025-02-03 13:32:46.662499030 -0300
+@@ -371,6 +371,7 @@
MASTERING_DISPLAY_INFO = 137,
CONTENT_LIGHT_LEVEL_INFO = 144,
ALTERNATIVE_TRANSFER_CHARACTERISTICS = 147,
+ AMBIENT_VIEWING_ENVIRONMENT = 148,
- } SEIPayloadType;
-
- typedef struct x265_sei_payload
-@@ -1903,6 +1904,11 @@ typedef struct x265_param
+ ALPHA_CHANNEL_INFO = 165,
+ THREE_DIMENSIONAL_REFERENCE_DISPLAYS_INFO = 176,
+ MULTIVIEW_SCENE_INFO = 178,
+@@ -1956,6 +1957,11 @@
* value to that value. */
uint16_t maxLuma;
@@ -103,7 +99,7 @@ index 9f3abd9d9..b6a4d3fe1 100644
/* Maximum of the picture order count */
int log2MaxPocLsb;
-@@ -2114,6 +2120,9 @@ typedef struct x265_param
+@@ -2167,6 +2173,9 @@
/*Emit content light level info SEI*/
int bEmitCLL;
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index d95e93552f6c04..4acc7cd5ff2b6d 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,7 +1,7 @@
# Template file for 'x265'
pkgname=x265
-version=3.6
-revision=2
+version=4.0
+revision=1
build_wrksrc=source
build_style=cmake
configure_args="-DENABLE_PIC=1 -DEXTRA_LINK_FLAGS='-L.'
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://x265.org/"
distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=206329b9599c78d06969a1b7b7bb939f7c99a459ab283b2e93f76854bd34ca7b
+checksum=66b64be4b316362fdadb33ad8273a74236042cc380691bdbec42946b0437a389
build_options="altivec assembly"
@@ -23,28 +23,28 @@ case "$XBPS_TARGET_MACHINE" in
ppc64le*) build_options_default="altivec" ;;
# on ARM, enabling it currently fails with undefined reference to
# x265::setupAssemblyPrimitives(x265::EncoderPrimitives&, int)
- x86_64*|i686*) build_options_default="assembly" ;;
+ x86_64* | i686*) build_options_default="assembly" ;;
*) ;;
esac
if [ "$build_option_assembly" ]; then
case "$XBPS_TARGET_MACHINE" in
- x86_64*|i686*)
- # see https://bitbucket.org/multicoreware/x265_git/issues/559
- configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
- hostmakedepends+=" nasm"
- ;;
- *) ;;
+ x86_64* | i686*)
+ # see https://bitbucket.org/multicoreware/x265_git/issues/559
+ configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
+ hostmakedepends+=" nasm"
+ ;;
+ *) ;;
esac
fi
case "$XBPS_TARGET_MACHINE" in
- ppc64*)
- # altivec does not build without power8 being enabled
- configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF)
+ppc64*)
+ # altivec does not build without power8 being enabled
+ configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF)
-DCPU_POWER8=$(vopt_if altivec ON OFF)"
- ;;
- *) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;;
+ ;;
+*) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;;
esac
pre_configure() {
From 170096178dfab1611477db071aa3064222fa1caa Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:15:26 -0300
Subject: [PATCH 2/9] libheif: rebuild for x265-4.0.
---
srcpkgs/libheif/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 3e5d16adbf365a..34bffb8c590811 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,8 +1,9 @@
# Template file for 'libheif'
pkgname=libheif
version=1.19.7
-revision=1
+revision=2
build_style=cmake
+configure_args="-DBUILD_TESTING=OFF"
makedepends="libjpeg-turbo-devel libpng-devel libde265-devel x265-devel
libaom-devel"
short_desc="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
From c39f984978e476478aa2334ff18cc62bd5e97391 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:15:47 -0300
Subject: [PATCH 3/9] vlc: revbump for x265-4.0.
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 2160a0e128f0665c38bdc14d9f399f60edd73fea Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:16:11 -0300
Subject: [PATCH 4/9] baresip: revbump for x265-4.0.
---
srcpkgs/baresip/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index 9ba4c08bc868fd..3419968c532e59 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
# Template file for 'baresip'
pkgname=baresip
version=3.20.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config glib-devel"
makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
From 4d635beefc19491c82138a2ec064cd37807909a0 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:17:27 -0300
Subject: [PATCH 5/9] gimp: revbump for x265-4.0.
---
srcpkgs/gimp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index d40c6e0fff19aa..62c59c021585f2 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
# Template file for 'gimp'
pkgname=gimp
version=3.0.2
-revision=1
+revision=2
build_style=meson
build_helper="gir qemu"
configure_args="-Dcheck-update=no -Drevision=$revision -Denable-default-bin=enabled
From cf06ff8e0cac9717068f68f8ceaa77a5e490d78a Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:18:43 -0300
Subject: [PATCH 6/9] avidemux: revbump for x265-4.0.
---
srcpkgs/avidemux/patches/ADM_x265.patch | 44 +++++++++++++++++++++++++
srcpkgs/avidemux/template | 2 +-
2 files changed, 45 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/avidemux/patches/ADM_x265.patch
diff --git a/srcpkgs/avidemux/patches/ADM_x265.patch b/srcpkgs/avidemux/patches/ADM_x265.patch
new file mode 100644
index 00000000000000..6db76d7ffc332e
--- /dev/null
+++ b/srcpkgs/avidemux/patches/ADM_x265.patch
@@ -0,0 +1,44 @@
+--- a/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp 2022-09-17 10:59:17.000000000 -0300
++++ b/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp 2025-01-26 19:27:19.796218401 -0300
+@@ -205,15 +205,20 @@
+ //
+ x265_nal *nal;
+ uint32_t nbNal = 0;
+- x265_picture pic_out;
+- api->picture_init(¶m,&pic_out);
++ x265_picture pic_out[MAX_SCALABLE_LAYERS];
++ x265_picture *pic_out_ptr[MAX_SCALABLE_LAYERS];
+ out->flags = 0;
+
++ for (int i = 0; i < MAX_SCALABLE_LAYERS; i++)
++ {
++ api->picture_init(¶m,&pic_out[i]);
++ pic_out_ptr[i] = &pic_out[i];
++ }
+ int er;
+ if(false==gotFrame)
+ {
+ ADM_info("Flushing delayed frames\n");
+- er = api->encoder_encode(handle, &nal, &nbNal, NULL, &pic_out);
++ er = api->encoder_encode(handle, &nal, &nbNal, NULL, pic_out_ptr);
+ if(er<=0)
+ {
+ ADM_info ("End of flush\n");
+@@ -221,7 +226,7 @@
+ }
+ }else
+ {
+- er = api->encoder_encode(handle, &nal, &nbNal, &pic, &pic_out);
++ er = api->encoder_encode(handle, &nal, &nbNal, &pic, pic_out_ptr);
+ if(er<0)
+ {
+ ADM_error ("[x265] Error encoding %d\n",er);
+@@ -236,7 +241,7 @@
+
+
+ // 3-encode
+- if(false==postAmble(out,nbNal,nal,&pic_out))
++ if(false==postAmble(out,nbNal,nal,pic_out_ptr[0]))
+ {
+ ADM_warning("[x265] postAmble failed\n");
+ return false;
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index d66f8524bd0e28..b972ecac92ed31 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
# Template file for 'avidemux'
pkgname=avidemux
version=2.8.1
-revision=2
+revision=3
# Can't be compiled for aarch64, arm* or mips*
archs="x86_64* i686*"
hostmakedepends="cmake pkg-config qt5-host-tools qt5-devel tar yasm"
From fea91fbfb5566ccead1589d2eb5d5ab265b7ed73 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 23 Mar 2025 21:39:17 -0300
Subject: [PATCH 7/9] ffmpeg: update to 4.4.5.
---
srcpkgs/ffmpeg/patches/00001-v4l-config.patch | 31 -------
.../ffmpeg/patches/00002-v4l-ioctl-musl.patch | 87 -------------------
.../patches/armv5tel-floating-point.patch | 18 ----
srcpkgs/ffmpeg/patches/binutils-2.41.patch | 73 ----------------
...h-libavcodec-libsvtav1-ten_bit_format.diff | 40 ---------
.../workaround-mesa-readeon-vaapi-bug.patch | 28 ------
srcpkgs/ffmpeg/template | 6 +-
7 files changed, 3 insertions(+), 280 deletions(-)
delete mode 100644 srcpkgs/ffmpeg/patches/00001-v4l-config.patch
delete mode 100644 srcpkgs/ffmpeg/patches/00002-v4l-ioctl-musl.patch
delete mode 100644 srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
delete mode 100644 srcpkgs/ffmpeg/patches/binutils-2.41.patch
delete mode 100644 srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
delete mode 100644 srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch
diff --git a/srcpkgs/ffmpeg/patches/00001-v4l-config.patch b/srcpkgs/ffmpeg/patches/00001-v4l-config.patch
deleted file mode 100644
index e8dfdda98bce89..00000000000000
--- a/srcpkgs/ffmpeg/patches/00001-v4l-config.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 7405f1ad5351cc24b91a0227aeeaf24ff9d12278 Mon Sep 17 00:00:00 2001
-From: Ramiro Polla <ramiro.polla@gmail.com>
-Date: Wed, 3 Jul 2024 00:30:08 +0200
-Subject: [PATCH] configure: restore autodetection of v4l2 and fbdev
-
-The detection logic for v4l2 and fbdev was accidentally modified to
-depend on v4l2-m2m in 43b3412.
----
- configure | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/configure b/configure
-index b28221f258965..fa2e384350958 100755
---- a/configure
-+++ b/configure
-@@ -7145,11 +7145,12 @@ pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man
- rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout || disable rsync_contimeout
- xmllint --version > /dev/null 2>&1 && enable xmllint || disable xmllint
-
-+check_headers linux/fb.h
-+check_headers linux/videodev2.h
-+test_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_sanitized struct_v4l2_frmivalenum_discrete
-+
- # check V4L2 codecs available in the API
- if enabled v4l2_m2m; then
-- check_headers linux/fb.h
-- check_headers linux/videodev2.h
-- test_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_sanitized struct_v4l2_frmivalenum_discrete
- check_cc v4l2_m2m linux/videodev2.h "int i = V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_VIDEO_M2M | V4L2_BUF_FLAG_LAST;"
- check_cc vc1_v4l2_m2m linux/videodev2.h "int i = V4L2_PIX_FMT_VC1_ANNEX_G;"
- check_cc mpeg1_v4l2_m2m linux/videodev2.h "int i = V4L2_PIX_FMT_MPEG1;"
diff --git a/srcpkgs/ffmpeg/patches/00002-v4l-ioctl-musl.patch b/srcpkgs/ffmpeg/patches/00002-v4l-ioctl-musl.patch
deleted file mode 100644
index 681fb5d4f706ad..00000000000000
--- a/srcpkgs/ffmpeg/patches/00002-v4l-ioctl-musl.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 008b0b4a3b0cbafa568d0dcbf78c798d56929802 Mon Sep 17 00:00:00 2001
-From: Brad Smith <brad-at-comstyle.com@ffmpeg.org>
-Date: Sun, 5 May 2024 23:59:47 -0400
-Subject: [PATCH] lavd/v4l2: Use proper field type for second parameter of
- ioctl() with BSD's
-
-The proper type was used until 73251678c83cbe24d08264da693411b166239bc7.
-
-This covers all of the OS's that currently have V4L2 support, permutations
-of Linux glibc/musl, Android bionic, FreeBSD, NetBSD, OpenBSD, Solaris.
-
-Copied from FreeBSD ports patch.
-
-Signed-off-by: Brad Smith <brad@comstyle.com>
-Signed-off-by: Marton Balint <cus@passwd.hu>
-(cherry picked from commit 9e674b31606c805dd31b4bb754364a72a5877238)
-Signed-off-by: Brad Smith <brad@comstyle.com>
----
- libavdevice/v4l2.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
-index 365bacd7714b6..1dcbe04bb1741 100644
---- a/libavdevice/v4l2.c
-+++ b/libavdevice/v4l2.c
-@@ -95,10 +95,10 @@ struct video_data {
- int (*open_f)(const char *file, int oflag, ...);
- int (*close_f)(int fd);
- int (*dup_f)(int fd);
--#ifdef __GLIBC__
-- int (*ioctl_f)(int fd, unsigned long int request, ...);
--#else
-+#if defined(__sun) || defined(__BIONIC__) || defined(__musl__) /* POSIX-like */
- int (*ioctl_f)(int fd, int request, ...);
-+#else
-+ int (*ioctl_f)(int fd, unsigned long int request, ...);
- #endif
- ssize_t (*read_f)(int fd, void *buffer, size_t n);
- void *(*mmap_f)(void *start, size_t length, int prot, int flags, int fd, int64_t offset);
-From af17f55202e285d4d3d502078e5b6a41bcca90fb Mon Sep 17 00:00:00 2001
-From: Ramiro Polla <ramiro.polla@gmail.com>
-Date: Thu, 29 Aug 2024 15:40:00 +0200
-Subject: [PATCH] configure: improve check for POSIX ioctl
-
-Instead of relying on system #ifdefs which may or may not be correct,
-detect the POSIX ioctl signature at configure time.
-
-(cherry picked from commit 00b64fca55a3a009c9d0e391c85f4fd3291e5d12)
-Signed-off-by: Brad Smith <brad@comstyle.com>
----
- configure | 2 ++
- libavdevice/v4l2.c | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index c89d3ad1ec291..175b70e20735c 100755
---- a/configure
-+++ b/configure
-@@ -2340,6 +2340,7 @@ HAVE_LIST="
- opencl_vaapi_intel_media
- perl
- pod2man
-+ posix_ioctl
- texi2html
- "
-
-@@ -6616,6 +6617,7 @@ rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout || d
- check_headers linux/fb.h
- check_headers linux/videodev2.h
- test_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_sanitized struct_v4l2_frmivalenum_discrete
-+test_code cc sys/ioctl.h "int ioctl(int, int, ...)" && enable posix_ioctl
-
- # check V4L2 codecs available in the API
- if enabled v4l2_m2m; then
-diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
-index 1dcbe04bb1741..f90490eebfc86 100644
---- a/libavdevice/v4l2.c
-+++ b/libavdevice/v4l2.c
-@@ -95,7 +95,7 @@ struct video_data {
- int (*open_f)(const char *file, int oflag, ...);
- int (*close_f)(int fd);
- int (*dup_f)(int fd);
--#if defined(__sun) || defined(__BIONIC__) || defined(__musl__) /* POSIX-like */
-+#if HAVE_POSIX_IOCTL
- int (*ioctl_f)(int fd, int request, ...);
- #else
- int (*ioctl_f)(int fd, unsigned long int request, ...);
diff --git a/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch b/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
deleted file mode 100644
index 9a55178c74f0fd..00000000000000
--- a/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/libavfilter/vf_drawtext.c 2017-10-26 21:03:03.000000000 +0200
-+++ b/libavfilter/vf_drawtext.c 2017-11-21 11:06:49.602284422 +0100
-@@ -39,6 +39,15 @@
- #endif
- #include <fenv.h>
-
-+#if (FE_ALL_EXCEPT == 0)
-+/* E.g. ARM soft float does not define these */
-+#define FE_INVALID 0
-+#define FE_DIVBYZERO 0
-+#define FE_OVERFLOW 0
-+#define FE_UNDERFLOW 0
-+#define FE_INEXACT 0
-+#endif
-+
- #if CONFIG_LIBFONTCONFIG
- #include <fontconfig/fontconfig.h>
- #endif
diff --git a/srcpkgs/ffmpeg/patches/binutils-2.41.patch b/srcpkgs/ffmpeg/patches/binutils-2.41.patch
deleted file mode 100644
index 53a596d0ee7d4e..00000000000000
--- a/srcpkgs/ffmpeg/patches/binutils-2.41.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
-Date: Sun, 16 Jul 2023 18:18:02 +0300
-Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift
- instructions within inline assembly
-
-Fixes assembling with binutil as >= 2.41
-
-Signed-off-by: James Almer <jamrial@gmail.com>
----
- libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++---
- 1 file changed, 23 insertions(+), 3 deletions(-)
-
-diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
-index 6298f5ed1983b..ca7e2dffc1076 100644
---- a/libavcodec/x86/mathops.h
-+++ b/libavcodec/x86/mathops.h
-@@ -35,12 +35,20 @@
- static av_always_inline av_const int MULL(int a, int b, unsigned shift)
- {
- int rt, dummy;
-+ if (__builtin_constant_p(shift))
- __asm__ (
- "imull %3 \n\t"
- "shrdl %4, %%edx, %%eax \n\t"
- :"=a"(rt), "=d"(dummy)
-- :"a"(a), "rm"(b), "ci"((uint8_t)shift)
-+ :"a"(a), "rm"(b), "i"(shift & 0x1F)
- );
-+ else
-+ __asm__ (
-+ "imull %3 \n\t"
-+ "shrdl %4, %%edx, %%eax \n\t"
-+ :"=a"(rt), "=d"(dummy)
-+ :"a"(a), "rm"(b), "c"((uint8_t)shift)
-+ );
- return rt;
- }
-
-@@ -113,19 +121,31 @@ __asm__ volatile(\
- // avoid +32 for shift optimization (gcc should do that ...)
- #define NEG_SSR32 NEG_SSR32
- static inline int32_t NEG_SSR32( int32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("sarl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("sarl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
- #define NEG_USR32 NEG_USR32
- static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("shrl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("shrl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
diff --git a/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff b/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
deleted file mode 100644
index aa948f7a8a2dfb..00000000000000
--- a/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-#==================================================================================================
-# From 031f1561cd286596cdb374da32f8aa816ce3b135 Mon Sep 17 00:00:00 2001
-# From: Christopher Degawa <christopher.degawa@intel.com>
-# Date: Thu, 20 Oct 2022 22:55:27 -0500
-# Subject: [PATCH] avcodec/libsvtav1: remove compressed_ten_bit_format and simplify alloc_buffer
-#
-# compressed_ten_bit_format has been deprecated upstream and has no effect
-# and can be removed. Plus, technically it was never used in the first place
-# since it would require the app (ffmpeg) to set it and do additional
-# processing of the input frames.
-#
-# Also simplify alloc_buffer by removing calculations relating to the non-existant processing.
-#
-# Signed-off-by: Christopher Degawa <christopher.degawa@intel.com>
-#==================================================================================================
---- a/libavcodec/libsvtav1.c
-+++ b/libavcodec/libsvtav1.c
-@@ -124,16 +124,12 @@ static int svt_print_error(void *log_ctx, EbErrorType err,
-
- static int alloc_buffer(EbSvtAv1EncConfiguration *config, SvtContext *svt_enc)
- {
-- const int pack_mode_10bit =
-- (config->encoder_bit_depth > 8) && (config->compressed_ten_bit_format == 0) ? 1 : 0;
-- const size_t luma_size_8bit =
-- config->source_width * config->source_height * (1 << pack_mode_10bit);
-- const size_t luma_size_10bit =
-- (config->encoder_bit_depth > 8 && pack_mode_10bit == 0) ? luma_size_8bit : 0;
-+ const size_t luma_size = config->source_width * config->source_height *
-+ (config->encoder_bit_depth > 8 ? 2 : 1);
-
- EbSvtIOFormat *in_data;
-
-- svt_enc->raw_size = (luma_size_8bit + luma_size_10bit) * 3 / 2;
-+ svt_enc->raw_size = luma_size * 3 / 2;
-
- // allocate buffer for in and out
- svt_enc->in_buf = av_mallocz(sizeof(*svt_enc->in_buf));
---
-GitLab
-
diff --git a/srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch b/srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch
deleted file mode 100644
index 00e3f68a415b84..00000000000000
--- a/srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 811d290844206fc73dc39c3e5b67d5d895baedf8 Mon Sep 17 00:00:00 2001
-From: Rainer Hochecker <fernetmenta@online.de>
-Date: Sat, 26 Jan 2019 19:48:35 +0100
-Subject: [PATCH] avcodec/vaapi_h264: skip decode if pic has no slices
-
-This fixes / workarounds https://bugs.freedesktop.org/show_bug.cgi?id=105368.
-It was hit frequently when watching h264 channels received via DVB-X.
-Corresponding kodi bug: https://github.com/xbmc/xbmc/issues/15704
----
- libavcodec/vaapi_h264.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c
-index 5854587a255..f12fdc457a4 100644
---- a/libavcodec/vaapi_h264.c
-+++ b/libavcodec/vaapi_h264.c
-@@ -317,6 +317,11 @@ static int vaapi_h264_end_frame(AVCodecContext *avctx)
- H264SliceContext *sl = &h->slice_ctx[0];
- int ret;
-
-+ if (pic->nb_slices == 0) {
-+ ret = AVERROR_INVALIDDATA;
-+ goto finish;
-+ }
-+
- ret = ff_vaapi_decode_issue(avctx, pic);
- if (ret < 0)
- goto finish;
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 08297151181c07..b560d9df0ce126 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,8 +1,8 @@
# Template file for 'ffmpeg'
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg
-version=4.4.4
-revision=11
+version=4.4.5
+revision=1
build_style=meta
short_desc="Decoding, encoding and streaming software (transitional dummy package)"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
homepage="https://www.ffmpeg.org"
changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
distfiles="https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"
-checksum=e80b380d595c809060f66f96a5d849511ef4a76a26b76eacf5778b94c3570309
+checksum=f9514e0d3515aee5a271283df71636e1d1ff7274b15853bcd84e144be416ab07
hostmakedepends="pkg-config perl"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
From e169ea15258b29bf6cd474fe28cb01e4c6d84165 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 23 Mar 2025 21:40:28 -0300
Subject: [PATCH 8/9] ffmpeg6: rebuild for x265-4.0
---
srcpkgs/ffmpeg6/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ffmpeg6/template b/srcpkgs/ffmpeg6/template
index 5ca80c5f1b7f8f..d0855f2994a67f 100644
--- a/srcpkgs/ffmpeg6/template
+++ b/srcpkgs/ffmpeg6/template
@@ -2,7 +2,7 @@
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg6
version=6.1.2
-revision=4
+revision=5
hostmakedepends="pkg-config perl"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
libXext-devel libXvMC-devel libxcb-devel lame-devel libtheora-devel
From dd40356ab0ab7a83c01c32c064dc923c50f552d5 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 23 Mar 2025 21:41:38 -0300
Subject: [PATCH 9/9] handbrake: rebuild for x265-4.0.
---
srcpkgs/handbrake/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index d32651a0abd02d..22fb9b6f4eb7d7 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.8.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] X265, ffmpeg and libheif: update
2025-01-20 21:47 [PR PATCH] X265, ffmpeg, handbrake, libheif: update 1is7ac3
` (13 preceding siblings ...)
2025-03-28 2:18 ` 1is7ac3
@ 2025-03-30 22:50 ` 1is7ac3
2025-03-30 23:24 ` 1is7ac3
` (3 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: 1is7ac3 @ 2025-03-30 22:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1247 bytes --]
There is an updated pull request by 1is7ac3 against master on the void-packages repository
https://github.com/1is7ac3/void-packages x265
https://github.com/void-linux/void-packages/pull/54056
X265, ffmpeg and libheif: update
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (X86_64-GLIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
<!-- - armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/54056.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-x265-54056.patch --]
[-- Type: text/x-diff, Size: 27891 bytes --]
From b4366408e0d224315636553ad8367d0086535138 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 16:13:06 -0300
Subject: [PATCH 1/8] x265: update to 4.0.
---
common/shlibs | 2 +-
.../x265/patches/handbrake-ambientlight.patch | 50 +++++++++----------
srcpkgs/x265/template | 30 +++++------
3 files changed, 39 insertions(+), 43 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 0bd2d1fb7e4696..0c0c44daf37775 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1950,7 +1950,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
libQt5WebKit.so.5 qt5-webkit-5.6.0_1
libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.209 x265-3.6_1
+libx265.so.212 x265-4.0_1
libQt5Xdg.so.3 libqt5xdg-3.2.0_1
libQt5XdgIconLoader.so.3 libqt5xdg-3.2.0_1
libQt6Xdg.so.4 libqtxdg-4.0.0_1
diff --git a/srcpkgs/x265/patches/handbrake-ambientlight.patch b/srcpkgs/x265/patches/handbrake-ambientlight.patch
index ab36a9c35c9de4..5c966e42f0c373 100644
--- a/srcpkgs/x265/patches/handbrake-ambientlight.patch
+++ b/srcpkgs/x265/patches/handbrake-ambientlight.patch
@@ -1,8 +1,7 @@
-diff --git a/source/common/param.cpp b/source/common/param.cpp
-index 8c32fafa2..0b56235c9 100755
---- a/source/common/param.cpp
-+++ b/source/common/param.cpp
-@@ -378,6 +378,7 @@ void x265_param_default(x265_param* param)
+diff -ru a/source/common/param.cpp b/source/common/param.cpp
+--- a/source/common/param.cpp 2024-09-13 09:51:43.000000000 -0300
++++ b/source/common/param.cpp 2025-02-03 13:27:31.474334833 -0300
+@@ -380,6 +380,7 @@
param->preferredTransferCharacteristics = -1;
param->pictureStructure = -1;
param->bEmitCLL = 1;
@@ -10,7 +9,7 @@ index 8c32fafa2..0b56235c9 100755
param->bEnableFrameDuplication = 0;
param->dupThreshold = 70;
-@@ -1880,6 +1881,7 @@ int x265_check_params(x265_param* param)
+@@ -1929,6 +1930,7 @@
|| param->bEmitIDRRecoverySEI
|| !!param->interlaceMode
|| param->preferredTransferCharacteristics > 1
@@ -18,7 +17,7 @@ index 8c32fafa2..0b56235c9 100755
|| param->toneMapFile
|| param->naluFile);
-@@ -2766,6 +2768,10 @@ void x265_copy_params(x265_param* dst, x265_param* src)
+@@ -2850,6 +2852,10 @@
dst->bEmitCLL = src->bEmitCLL;
dst->maxCLL = src->maxCLL;
dst->maxFALL = src->maxFALL;
@@ -29,11 +28,10 @@ index 8c32fafa2..0b56235c9 100755
dst->log2MaxPocLsb = src->log2MaxPocLsb;
dst->bEmitVUIHRDInfo = src->bEmitVUIHRDInfo;
dst->bEmitVUITimingInfo = src->bEmitVUITimingInfo;
-diff --git a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp
-index 5950f87e9..545283474 100644
---- a/source/encoder/encoder.cpp
-+++ b/source/encoder/encoder.cpp
-@@ -3276,6 +3276,15 @@ void Encoder::getStreamHeaders(NALList& list, Entropy& sbacCoder, Bitstream& bs)
+diff -ru a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp
+--- a/source/encoder/encoder.cpp 2024-09-13 09:51:43.000000000 -0300
++++ b/source/encoder/encoder.cpp 2025-02-03 13:28:37.551336750 -0300
+@@ -3423,6 +3423,15 @@
}
}
@@ -49,11 +47,10 @@ index 5950f87e9..545283474 100644
if (m_param->bEmitInfoSEI)
{
char *opts = x265_param2string(m_param, m_sps.conformanceWindow.rightOffset, m_sps.conformanceWindow.bottomOffset);
-diff --git a/source/encoder/sei.h b/source/encoder/sei.h
-index 03e210639..712e4efb4 100644
---- a/source/encoder/sei.h
-+++ b/source/encoder/sei.h
-@@ -242,6 +242,25 @@ public:
+diff -ru a/source/encoder/sei.h b/source/encoder/sei.h
+--- a/source/encoder/sei.h 2024-09-13 09:51:43.000000000 -0300
++++ b/source/encoder/sei.h 2025-02-03 13:30:41.386953402 -0300
+@@ -464,6 +464,25 @@
}
};
@@ -79,19 +76,18 @@ index 03e210639..712e4efb4 100644
class SEIDecodedPictureHash : public SEI
{
public:
-diff --git a/source/x265.h b/source/x265.h
-index 9f3abd9d9..b6a4d3fe1 100644
---- a/source/x265.h
-+++ b/source/x265.h
-@@ -371,6 +371,7 @@ typedef enum
+diff -ru a/source/x265.h b/source/x265.h
+--- a/source/x265.h 2024-09-13 09:51:43.000000000 -0300
++++ b/source/x265.h 2025-02-03 13:32:46.662499030 -0300
+@@ -371,6 +371,7 @@
MASTERING_DISPLAY_INFO = 137,
CONTENT_LIGHT_LEVEL_INFO = 144,
ALTERNATIVE_TRANSFER_CHARACTERISTICS = 147,
+ AMBIENT_VIEWING_ENVIRONMENT = 148,
- } SEIPayloadType;
-
- typedef struct x265_sei_payload
-@@ -1903,6 +1904,11 @@ typedef struct x265_param
+ ALPHA_CHANNEL_INFO = 165,
+ THREE_DIMENSIONAL_REFERENCE_DISPLAYS_INFO = 176,
+ MULTIVIEW_SCENE_INFO = 178,
+@@ -1956,6 +1957,11 @@
* value to that value. */
uint16_t maxLuma;
@@ -103,7 +99,7 @@ index 9f3abd9d9..b6a4d3fe1 100644
/* Maximum of the picture order count */
int log2MaxPocLsb;
-@@ -2114,6 +2120,9 @@ typedef struct x265_param
+@@ -2167,6 +2173,9 @@
/*Emit content light level info SEI*/
int bEmitCLL;
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index d95e93552f6c04..4acc7cd5ff2b6d 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,7 +1,7 @@
# Template file for 'x265'
pkgname=x265
-version=3.6
-revision=2
+version=4.0
+revision=1
build_wrksrc=source
build_style=cmake
configure_args="-DENABLE_PIC=1 -DEXTRA_LINK_FLAGS='-L.'
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://x265.org/"
distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=206329b9599c78d06969a1b7b7bb939f7c99a459ab283b2e93f76854bd34ca7b
+checksum=66b64be4b316362fdadb33ad8273a74236042cc380691bdbec42946b0437a389
build_options="altivec assembly"
@@ -23,28 +23,28 @@ case "$XBPS_TARGET_MACHINE" in
ppc64le*) build_options_default="altivec" ;;
# on ARM, enabling it currently fails with undefined reference to
# x265::setupAssemblyPrimitives(x265::EncoderPrimitives&, int)
- x86_64*|i686*) build_options_default="assembly" ;;
+ x86_64* | i686*) build_options_default="assembly" ;;
*) ;;
esac
if [ "$build_option_assembly" ]; then
case "$XBPS_TARGET_MACHINE" in
- x86_64*|i686*)
- # see https://bitbucket.org/multicoreware/x265_git/issues/559
- configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
- hostmakedepends+=" nasm"
- ;;
- *) ;;
+ x86_64* | i686*)
+ # see https://bitbucket.org/multicoreware/x265_git/issues/559
+ configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
+ hostmakedepends+=" nasm"
+ ;;
+ *) ;;
esac
fi
case "$XBPS_TARGET_MACHINE" in
- ppc64*)
- # altivec does not build without power8 being enabled
- configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF)
+ppc64*)
+ # altivec does not build without power8 being enabled
+ configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF)
-DCPU_POWER8=$(vopt_if altivec ON OFF)"
- ;;
- *) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;;
+ ;;
+*) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;;
esac
pre_configure() {
From eb56d8086b4302b445a7209cd6e04a6a8b4db3d9 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:15:26 -0300
Subject: [PATCH 2/8] libheif: rebuild for x265-4.0.
---
srcpkgs/libheif/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 3e5d16adbf365a..34bffb8c590811 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,8 +1,9 @@
# Template file for 'libheif'
pkgname=libheif
version=1.19.7
-revision=1
+revision=2
build_style=cmake
+configure_args="-DBUILD_TESTING=OFF"
makedepends="libjpeg-turbo-devel libpng-devel libde265-devel x265-devel
libaom-devel"
short_desc="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
From 175a9c95f5bbbe52bdd424e8b8a8d79db9a8064f Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:15:47 -0300
Subject: [PATCH 3/8] vlc: revbump for x265-4.0.
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From e12bc66e4e2c1d8d065e2cb75e2356fa26ea0c1e Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:16:11 -0300
Subject: [PATCH 4/8] baresip: revbump for x265-4.0.
---
srcpkgs/baresip/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index 9ba4c08bc868fd..3419968c532e59 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
# Template file for 'baresip'
pkgname=baresip
version=3.20.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config glib-devel"
makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
From 38facc01b7970a8d9d61199900ef0cd378826966 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:17:27 -0300
Subject: [PATCH 5/8] gimp: revbump for x265-4.0.
---
srcpkgs/gimp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index d40c6e0fff19aa..62c59c021585f2 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
# Template file for 'gimp'
pkgname=gimp
version=3.0.2
-revision=1
+revision=2
build_style=meson
build_helper="gir qemu"
configure_args="-Dcheck-update=no -Drevision=$revision -Denable-default-bin=enabled
From 3ae6f491c83a3ca730902a90aa844d20f515c7b3 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 3 Feb 2025 17:18:43 -0300
Subject: [PATCH 6/8] avidemux: revbump for x265-4.0.
---
srcpkgs/avidemux/patches/ADM_x265.patch | 44 +++++++++++++++++++++++++
srcpkgs/avidemux/template | 2 +-
2 files changed, 45 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/avidemux/patches/ADM_x265.patch
diff --git a/srcpkgs/avidemux/patches/ADM_x265.patch b/srcpkgs/avidemux/patches/ADM_x265.patch
new file mode 100644
index 00000000000000..6db76d7ffc332e
--- /dev/null
+++ b/srcpkgs/avidemux/patches/ADM_x265.patch
@@ -0,0 +1,44 @@
+--- a/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp 2022-09-17 10:59:17.000000000 -0300
++++ b/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp 2025-01-26 19:27:19.796218401 -0300
+@@ -205,15 +205,20 @@
+ //
+ x265_nal *nal;
+ uint32_t nbNal = 0;
+- x265_picture pic_out;
+- api->picture_init(¶m,&pic_out);
++ x265_picture pic_out[MAX_SCALABLE_LAYERS];
++ x265_picture *pic_out_ptr[MAX_SCALABLE_LAYERS];
+ out->flags = 0;
+
++ for (int i = 0; i < MAX_SCALABLE_LAYERS; i++)
++ {
++ api->picture_init(¶m,&pic_out[i]);
++ pic_out_ptr[i] = &pic_out[i];
++ }
+ int er;
+ if(false==gotFrame)
+ {
+ ADM_info("Flushing delayed frames\n");
+- er = api->encoder_encode(handle, &nal, &nbNal, NULL, &pic_out);
++ er = api->encoder_encode(handle, &nal, &nbNal, NULL, pic_out_ptr);
+ if(er<=0)
+ {
+ ADM_info ("End of flush\n");
+@@ -221,7 +226,7 @@
+ }
+ }else
+ {
+- er = api->encoder_encode(handle, &nal, &nbNal, &pic, &pic_out);
++ er = api->encoder_encode(handle, &nal, &nbNal, &pic, pic_out_ptr);
+ if(er<0)
+ {
+ ADM_error ("[x265] Error encoding %d\n",er);
+@@ -236,7 +241,7 @@
+
+
+ // 3-encode
+- if(false==postAmble(out,nbNal,nal,&pic_out))
++ if(false==postAmble(out,nbNal,nal,pic_out_ptr[0]))
+ {
+ ADM_warning("[x265] postAmble failed\n");
+ return false;
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index d66f8524bd0e28..b972ecac92ed31 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
# Template file for 'avidemux'
pkgname=avidemux
version=2.8.1
-revision=2
+revision=3
# Can't be compiled for aarch64, arm* or mips*
archs="x86_64* i686*"
hostmakedepends="cmake pkg-config qt5-host-tools qt5-devel tar yasm"
From 5d0d050f3418ac62cf8bbbb2ade36efb622e3d65 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 23 Mar 2025 21:39:17 -0300
Subject: [PATCH 7/8] ffmpeg: update to 4.4.5.
---
srcpkgs/ffmpeg/patches/00001-v4l-config.patch | 31 -------
.../ffmpeg/patches/00002-v4l-ioctl-musl.patch | 87 -------------------
.../patches/armv5tel-floating-point.patch | 18 ----
srcpkgs/ffmpeg/patches/binutils-2.41.patch | 73 ----------------
...h-libavcodec-libsvtav1-ten_bit_format.diff | 40 ---------
.../workaround-mesa-readeon-vaapi-bug.patch | 28 ------
srcpkgs/ffmpeg/template | 6 +-
7 files changed, 3 insertions(+), 280 deletions(-)
delete mode 100644 srcpkgs/ffmpeg/patches/00001-v4l-config.patch
delete mode 100644 srcpkgs/ffmpeg/patches/00002-v4l-ioctl-musl.patch
delete mode 100644 srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
delete mode 100644 srcpkgs/ffmpeg/patches/binutils-2.41.patch
delete mode 100644 srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
delete mode 100644 srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch
diff --git a/srcpkgs/ffmpeg/patches/00001-v4l-config.patch b/srcpkgs/ffmpeg/patches/00001-v4l-config.patch
deleted file mode 100644
index e8dfdda98bce89..00000000000000
--- a/srcpkgs/ffmpeg/patches/00001-v4l-config.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 7405f1ad5351cc24b91a0227aeeaf24ff9d12278 Mon Sep 17 00:00:00 2001
-From: Ramiro Polla <ramiro.polla@gmail.com>
-Date: Wed, 3 Jul 2024 00:30:08 +0200
-Subject: [PATCH] configure: restore autodetection of v4l2 and fbdev
-
-The detection logic for v4l2 and fbdev was accidentally modified to
-depend on v4l2-m2m in 43b3412.
----
- configure | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/configure b/configure
-index b28221f258965..fa2e384350958 100755
---- a/configure
-+++ b/configure
-@@ -7145,11 +7145,12 @@ pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man
- rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout || disable rsync_contimeout
- xmllint --version > /dev/null 2>&1 && enable xmllint || disable xmllint
-
-+check_headers linux/fb.h
-+check_headers linux/videodev2.h
-+test_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_sanitized struct_v4l2_frmivalenum_discrete
-+
- # check V4L2 codecs available in the API
- if enabled v4l2_m2m; then
-- check_headers linux/fb.h
-- check_headers linux/videodev2.h
-- test_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_sanitized struct_v4l2_frmivalenum_discrete
- check_cc v4l2_m2m linux/videodev2.h "int i = V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_VIDEO_M2M | V4L2_BUF_FLAG_LAST;"
- check_cc vc1_v4l2_m2m linux/videodev2.h "int i = V4L2_PIX_FMT_VC1_ANNEX_G;"
- check_cc mpeg1_v4l2_m2m linux/videodev2.h "int i = V4L2_PIX_FMT_MPEG1;"
diff --git a/srcpkgs/ffmpeg/patches/00002-v4l-ioctl-musl.patch b/srcpkgs/ffmpeg/patches/00002-v4l-ioctl-musl.patch
deleted file mode 100644
index 681fb5d4f706ad..00000000000000
--- a/srcpkgs/ffmpeg/patches/00002-v4l-ioctl-musl.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 008b0b4a3b0cbafa568d0dcbf78c798d56929802 Mon Sep 17 00:00:00 2001
-From: Brad Smith <brad-at-comstyle.com@ffmpeg.org>
-Date: Sun, 5 May 2024 23:59:47 -0400
-Subject: [PATCH] lavd/v4l2: Use proper field type for second parameter of
- ioctl() with BSD's
-
-The proper type was used until 73251678c83cbe24d08264da693411b166239bc7.
-
-This covers all of the OS's that currently have V4L2 support, permutations
-of Linux glibc/musl, Android bionic, FreeBSD, NetBSD, OpenBSD, Solaris.
-
-Copied from FreeBSD ports patch.
-
-Signed-off-by: Brad Smith <brad@comstyle.com>
-Signed-off-by: Marton Balint <cus@passwd.hu>
-(cherry picked from commit 9e674b31606c805dd31b4bb754364a72a5877238)
-Signed-off-by: Brad Smith <brad@comstyle.com>
----
- libavdevice/v4l2.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
-index 365bacd7714b6..1dcbe04bb1741 100644
---- a/libavdevice/v4l2.c
-+++ b/libavdevice/v4l2.c
-@@ -95,10 +95,10 @@ struct video_data {
- int (*open_f)(const char *file, int oflag, ...);
- int (*close_f)(int fd);
- int (*dup_f)(int fd);
--#ifdef __GLIBC__
-- int (*ioctl_f)(int fd, unsigned long int request, ...);
--#else
-+#if defined(__sun) || defined(__BIONIC__) || defined(__musl__) /* POSIX-like */
- int (*ioctl_f)(int fd, int request, ...);
-+#else
-+ int (*ioctl_f)(int fd, unsigned long int request, ...);
- #endif
- ssize_t (*read_f)(int fd, void *buffer, size_t n);
- void *(*mmap_f)(void *start, size_t length, int prot, int flags, int fd, int64_t offset);
-From af17f55202e285d4d3d502078e5b6a41bcca90fb Mon Sep 17 00:00:00 2001
-From: Ramiro Polla <ramiro.polla@gmail.com>
-Date: Thu, 29 Aug 2024 15:40:00 +0200
-Subject: [PATCH] configure: improve check for POSIX ioctl
-
-Instead of relying on system #ifdefs which may or may not be correct,
-detect the POSIX ioctl signature at configure time.
-
-(cherry picked from commit 00b64fca55a3a009c9d0e391c85f4fd3291e5d12)
-Signed-off-by: Brad Smith <brad@comstyle.com>
----
- configure | 2 ++
- libavdevice/v4l2.c | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index c89d3ad1ec291..175b70e20735c 100755
---- a/configure
-+++ b/configure
-@@ -2340,6 +2340,7 @@ HAVE_LIST="
- opencl_vaapi_intel_media
- perl
- pod2man
-+ posix_ioctl
- texi2html
- "
-
-@@ -6616,6 +6617,7 @@ rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout || d
- check_headers linux/fb.h
- check_headers linux/videodev2.h
- test_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_sanitized struct_v4l2_frmivalenum_discrete
-+test_code cc sys/ioctl.h "int ioctl(int, int, ...)" && enable posix_ioctl
-
- # check V4L2 codecs available in the API
- if enabled v4l2_m2m; then
-diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
-index 1dcbe04bb1741..f90490eebfc86 100644
---- a/libavdevice/v4l2.c
-+++ b/libavdevice/v4l2.c
-@@ -95,7 +95,7 @@ struct video_data {
- int (*open_f)(const char *file, int oflag, ...);
- int (*close_f)(int fd);
- int (*dup_f)(int fd);
--#if defined(__sun) || defined(__BIONIC__) || defined(__musl__) /* POSIX-like */
-+#if HAVE_POSIX_IOCTL
- int (*ioctl_f)(int fd, int request, ...);
- #else
- int (*ioctl_f)(int fd, unsigned long int request, ...);
diff --git a/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch b/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
deleted file mode 100644
index 9a55178c74f0fd..00000000000000
--- a/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/libavfilter/vf_drawtext.c 2017-10-26 21:03:03.000000000 +0200
-+++ b/libavfilter/vf_drawtext.c 2017-11-21 11:06:49.602284422 +0100
-@@ -39,6 +39,15 @@
- #endif
- #include <fenv.h>
-
-+#if (FE_ALL_EXCEPT == 0)
-+/* E.g. ARM soft float does not define these */
-+#define FE_INVALID 0
-+#define FE_DIVBYZERO 0
-+#define FE_OVERFLOW 0
-+#define FE_UNDERFLOW 0
-+#define FE_INEXACT 0
-+#endif
-+
- #if CONFIG_LIBFONTCONFIG
- #include <fontconfig/fontconfig.h>
- #endif
diff --git a/srcpkgs/ffmpeg/patches/binutils-2.41.patch b/srcpkgs/ffmpeg/patches/binutils-2.41.patch
deleted file mode 100644
index 53a596d0ee7d4e..00000000000000
--- a/srcpkgs/ffmpeg/patches/binutils-2.41.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
-Date: Sun, 16 Jul 2023 18:18:02 +0300
-Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift
- instructions within inline assembly
-
-Fixes assembling with binutil as >= 2.41
-
-Signed-off-by: James Almer <jamrial@gmail.com>
----
- libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++---
- 1 file changed, 23 insertions(+), 3 deletions(-)
-
-diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
-index 6298f5ed1983b..ca7e2dffc1076 100644
---- a/libavcodec/x86/mathops.h
-+++ b/libavcodec/x86/mathops.h
-@@ -35,12 +35,20 @@
- static av_always_inline av_const int MULL(int a, int b, unsigned shift)
- {
- int rt, dummy;
-+ if (__builtin_constant_p(shift))
- __asm__ (
- "imull %3 \n\t"
- "shrdl %4, %%edx, %%eax \n\t"
- :"=a"(rt), "=d"(dummy)
-- :"a"(a), "rm"(b), "ci"((uint8_t)shift)
-+ :"a"(a), "rm"(b), "i"(shift & 0x1F)
- );
-+ else
-+ __asm__ (
-+ "imull %3 \n\t"
-+ "shrdl %4, %%edx, %%eax \n\t"
-+ :"=a"(rt), "=d"(dummy)
-+ :"a"(a), "rm"(b), "c"((uint8_t)shift)
-+ );
- return rt;
- }
-
-@@ -113,19 +121,31 @@ __asm__ volatile(\
- // avoid +32 for shift optimization (gcc should do that ...)
- #define NEG_SSR32 NEG_SSR32
- static inline int32_t NEG_SSR32( int32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("sarl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("sarl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
- #define NEG_USR32 NEG_USR32
- static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("shrl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("shrl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
diff --git a/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff b/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
deleted file mode 100644
index aa948f7a8a2dfb..00000000000000
--- a/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-#==================================================================================================
-# From 031f1561cd286596cdb374da32f8aa816ce3b135 Mon Sep 17 00:00:00 2001
-# From: Christopher Degawa <christopher.degawa@intel.com>
-# Date: Thu, 20 Oct 2022 22:55:27 -0500
-# Subject: [PATCH] avcodec/libsvtav1: remove compressed_ten_bit_format and simplify alloc_buffer
-#
-# compressed_ten_bit_format has been deprecated upstream and has no effect
-# and can be removed. Plus, technically it was never used in the first place
-# since it would require the app (ffmpeg) to set it and do additional
-# processing of the input frames.
-#
-# Also simplify alloc_buffer by removing calculations relating to the non-existant processing.
-#
-# Signed-off-by: Christopher Degawa <christopher.degawa@intel.com>
-#==================================================================================================
---- a/libavcodec/libsvtav1.c
-+++ b/libavcodec/libsvtav1.c
-@@ -124,16 +124,12 @@ static int svt_print_error(void *log_ctx, EbErrorType err,
-
- static int alloc_buffer(EbSvtAv1EncConfiguration *config, SvtContext *svt_enc)
- {
-- const int pack_mode_10bit =
-- (config->encoder_bit_depth > 8) && (config->compressed_ten_bit_format == 0) ? 1 : 0;
-- const size_t luma_size_8bit =
-- config->source_width * config->source_height * (1 << pack_mode_10bit);
-- const size_t luma_size_10bit =
-- (config->encoder_bit_depth > 8 && pack_mode_10bit == 0) ? luma_size_8bit : 0;
-+ const size_t luma_size = config->source_width * config->source_height *
-+ (config->encoder_bit_depth > 8 ? 2 : 1);
-
- EbSvtIOFormat *in_data;
-
-- svt_enc->raw_size = (luma_size_8bit + luma_size_10bit) * 3 / 2;
-+ svt_enc->raw_size = luma_size * 3 / 2;
-
- // allocate buffer for in and out
- svt_enc->in_buf = av_mallocz(sizeof(*svt_enc->in_buf));
---
-GitLab
-
diff --git a/srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch b/srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch
deleted file mode 100644
index 00e3f68a415b84..00000000000000
--- a/srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 811d290844206fc73dc39c3e5b67d5d895baedf8 Mon Sep 17 00:00:00 2001
-From: Rainer Hochecker <fernetmenta@online.de>
-Date: Sat, 26 Jan 2019 19:48:35 +0100
-Subject: [PATCH] avcodec/vaapi_h264: skip decode if pic has no slices
-
-This fixes / workarounds https://bugs.freedesktop.org/show_bug.cgi?id=105368.
-It was hit frequently when watching h264 channels received via DVB-X.
-Corresponding kodi bug: https://github.com/xbmc/xbmc/issues/15704
----
- libavcodec/vaapi_h264.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c
-index 5854587a255..f12fdc457a4 100644
---- a/libavcodec/vaapi_h264.c
-+++ b/libavcodec/vaapi_h264.c
-@@ -317,6 +317,11 @@ static int vaapi_h264_end_frame(AVCodecContext *avctx)
- H264SliceContext *sl = &h->slice_ctx[0];
- int ret;
-
-+ if (pic->nb_slices == 0) {
-+ ret = AVERROR_INVALIDDATA;
-+ goto finish;
-+ }
-+
- ret = ff_vaapi_decode_issue(avctx, pic);
- if (ret < 0)
- goto finish;
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 08297151181c07..b560d9df0ce126 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,8 +1,8 @@
# Template file for 'ffmpeg'
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg
-version=4.4.4
-revision=11
+version=4.4.5
+revision=1
build_style=meta
short_desc="Decoding, encoding and streaming software (transitional dummy package)"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
homepage="https://www.ffmpeg.org"
changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
distfiles="https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"
-checksum=e80b380d595c809060f66f96a5d849511ef4a76a26b76eacf5778b94c3570309
+checksum=f9514e0d3515aee5a271283df71636e1d1ff7274b15853bcd84e144be416ab07
hostmakedepends="pkg-config perl"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
From a02e508a25785f34516cbe1e6764b1761517aece Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 23 Mar 2025 21:41:38 -0300
Subject: [PATCH 8/8] handbrake: rebuild for x265-4.0.
---
srcpkgs/handbrake/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index d32651a0abd02d..22fb9b6f4eb7d7 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.8.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] X265, ffmpeg and libheif: update
2025-01-20 21:47 [PR PATCH] X265, ffmpeg, handbrake, libheif: update 1is7ac3
` (14 preceding siblings ...)
2025-03-30 22:50 ` 1is7ac3
@ 2025-03-30 23:24 ` 1is7ac3
2025-03-31 4:11 ` 1is7ac3
` (2 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: 1is7ac3 @ 2025-03-30 23:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1247 bytes --]
There is an updated pull request by 1is7ac3 against master on the void-packages repository
https://github.com/1is7ac3/void-packages x265
https://github.com/void-linux/void-packages/pull/54056
X265, ffmpeg and libheif: update
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (X86_64-GLIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
<!-- - armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/54056.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-x265-54056.patch --]
[-- Type: text/x-diff, Size: 26673 bytes --]
From 57d1d43e13e16d1813400bed885f010079b4f521 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 30 Mar 2025 20:08:17 -0300
Subject: [PATCH 1/9] x265: update to 4.0.
---
.../x265/patches/handbrake-ambientlight.patch | 50 +++++++++----------
srcpkgs/x265/template | 30 +++++------
2 files changed, 38 insertions(+), 42 deletions(-)
diff --git a/srcpkgs/x265/patches/handbrake-ambientlight.patch b/srcpkgs/x265/patches/handbrake-ambientlight.patch
index ab36a9c35c9de4..5c966e42f0c373 100644
--- a/srcpkgs/x265/patches/handbrake-ambientlight.patch
+++ b/srcpkgs/x265/patches/handbrake-ambientlight.patch
@@ -1,8 +1,7 @@
-diff --git a/source/common/param.cpp b/source/common/param.cpp
-index 8c32fafa2..0b56235c9 100755
---- a/source/common/param.cpp
-+++ b/source/common/param.cpp
-@@ -378,6 +378,7 @@ void x265_param_default(x265_param* param)
+diff -ru a/source/common/param.cpp b/source/common/param.cpp
+--- a/source/common/param.cpp 2024-09-13 09:51:43.000000000 -0300
++++ b/source/common/param.cpp 2025-02-03 13:27:31.474334833 -0300
+@@ -380,6 +380,7 @@
param->preferredTransferCharacteristics = -1;
param->pictureStructure = -1;
param->bEmitCLL = 1;
@@ -10,7 +9,7 @@ index 8c32fafa2..0b56235c9 100755
param->bEnableFrameDuplication = 0;
param->dupThreshold = 70;
-@@ -1880,6 +1881,7 @@ int x265_check_params(x265_param* param)
+@@ -1929,6 +1930,7 @@
|| param->bEmitIDRRecoverySEI
|| !!param->interlaceMode
|| param->preferredTransferCharacteristics > 1
@@ -18,7 +17,7 @@ index 8c32fafa2..0b56235c9 100755
|| param->toneMapFile
|| param->naluFile);
-@@ -2766,6 +2768,10 @@ void x265_copy_params(x265_param* dst, x265_param* src)
+@@ -2850,6 +2852,10 @@
dst->bEmitCLL = src->bEmitCLL;
dst->maxCLL = src->maxCLL;
dst->maxFALL = src->maxFALL;
@@ -29,11 +28,10 @@ index 8c32fafa2..0b56235c9 100755
dst->log2MaxPocLsb = src->log2MaxPocLsb;
dst->bEmitVUIHRDInfo = src->bEmitVUIHRDInfo;
dst->bEmitVUITimingInfo = src->bEmitVUITimingInfo;
-diff --git a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp
-index 5950f87e9..545283474 100644
---- a/source/encoder/encoder.cpp
-+++ b/source/encoder/encoder.cpp
-@@ -3276,6 +3276,15 @@ void Encoder::getStreamHeaders(NALList& list, Entropy& sbacCoder, Bitstream& bs)
+diff -ru a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp
+--- a/source/encoder/encoder.cpp 2024-09-13 09:51:43.000000000 -0300
++++ b/source/encoder/encoder.cpp 2025-02-03 13:28:37.551336750 -0300
+@@ -3423,6 +3423,15 @@
}
}
@@ -49,11 +47,10 @@ index 5950f87e9..545283474 100644
if (m_param->bEmitInfoSEI)
{
char *opts = x265_param2string(m_param, m_sps.conformanceWindow.rightOffset, m_sps.conformanceWindow.bottomOffset);
-diff --git a/source/encoder/sei.h b/source/encoder/sei.h
-index 03e210639..712e4efb4 100644
---- a/source/encoder/sei.h
-+++ b/source/encoder/sei.h
-@@ -242,6 +242,25 @@ public:
+diff -ru a/source/encoder/sei.h b/source/encoder/sei.h
+--- a/source/encoder/sei.h 2024-09-13 09:51:43.000000000 -0300
++++ b/source/encoder/sei.h 2025-02-03 13:30:41.386953402 -0300
+@@ -464,6 +464,25 @@
}
};
@@ -79,19 +76,18 @@ index 03e210639..712e4efb4 100644
class SEIDecodedPictureHash : public SEI
{
public:
-diff --git a/source/x265.h b/source/x265.h
-index 9f3abd9d9..b6a4d3fe1 100644
---- a/source/x265.h
-+++ b/source/x265.h
-@@ -371,6 +371,7 @@ typedef enum
+diff -ru a/source/x265.h b/source/x265.h
+--- a/source/x265.h 2024-09-13 09:51:43.000000000 -0300
++++ b/source/x265.h 2025-02-03 13:32:46.662499030 -0300
+@@ -371,6 +371,7 @@
MASTERING_DISPLAY_INFO = 137,
CONTENT_LIGHT_LEVEL_INFO = 144,
ALTERNATIVE_TRANSFER_CHARACTERISTICS = 147,
+ AMBIENT_VIEWING_ENVIRONMENT = 148,
- } SEIPayloadType;
-
- typedef struct x265_sei_payload
-@@ -1903,6 +1904,11 @@ typedef struct x265_param
+ ALPHA_CHANNEL_INFO = 165,
+ THREE_DIMENSIONAL_REFERENCE_DISPLAYS_INFO = 176,
+ MULTIVIEW_SCENE_INFO = 178,
+@@ -1956,6 +1957,11 @@
* value to that value. */
uint16_t maxLuma;
@@ -103,7 +99,7 @@ index 9f3abd9d9..b6a4d3fe1 100644
/* Maximum of the picture order count */
int log2MaxPocLsb;
-@@ -2114,6 +2120,9 @@ typedef struct x265_param
+@@ -2167,6 +2173,9 @@
/*Emit content light level info SEI*/
int bEmitCLL;
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index d95e93552f6c04..4acc7cd5ff2b6d 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,7 +1,7 @@
# Template file for 'x265'
pkgname=x265
-version=3.6
-revision=2
+version=4.0
+revision=1
build_wrksrc=source
build_style=cmake
configure_args="-DENABLE_PIC=1 -DEXTRA_LINK_FLAGS='-L.'
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://x265.org/"
distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=206329b9599c78d06969a1b7b7bb939f7c99a459ab283b2e93f76854bd34ca7b
+checksum=66b64be4b316362fdadb33ad8273a74236042cc380691bdbec42946b0437a389
build_options="altivec assembly"
@@ -23,28 +23,28 @@ case "$XBPS_TARGET_MACHINE" in
ppc64le*) build_options_default="altivec" ;;
# on ARM, enabling it currently fails with undefined reference to
# x265::setupAssemblyPrimitives(x265::EncoderPrimitives&, int)
- x86_64*|i686*) build_options_default="assembly" ;;
+ x86_64* | i686*) build_options_default="assembly" ;;
*) ;;
esac
if [ "$build_option_assembly" ]; then
case "$XBPS_TARGET_MACHINE" in
- x86_64*|i686*)
- # see https://bitbucket.org/multicoreware/x265_git/issues/559
- configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
- hostmakedepends+=" nasm"
- ;;
- *) ;;
+ x86_64* | i686*)
+ # see https://bitbucket.org/multicoreware/x265_git/issues/559
+ configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
+ hostmakedepends+=" nasm"
+ ;;
+ *) ;;
esac
fi
case "$XBPS_TARGET_MACHINE" in
- ppc64*)
- # altivec does not build without power8 being enabled
- configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF)
+ppc64*)
+ # altivec does not build without power8 being enabled
+ configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF)
-DCPU_POWER8=$(vopt_if altivec ON OFF)"
- ;;
- *) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;;
+ ;;
+*) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;;
esac
pre_configure() {
From aa864ae42cb1a2664b8ef43c8a963708ad3c04f4 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 30 Mar 2025 20:10:25 -0300
Subject: [PATCH 2/9] ffmpeg: update to 4.4.5.
---
srcpkgs/ffmpeg/patches/00001-v4l-config.patch | 31 -------
.../ffmpeg/patches/00002-v4l-ioctl-musl.patch | 87 -------------------
.../patches/armv5tel-floating-point.patch | 18 ----
srcpkgs/ffmpeg/patches/binutils-2.41.patch | 73 ----------------
...h-libavcodec-libsvtav1-ten_bit_format.diff | 40 ---------
.../workaround-mesa-readeon-vaapi-bug.patch | 28 ------
srcpkgs/ffmpeg/template | 6 +-
7 files changed, 3 insertions(+), 280 deletions(-)
delete mode 100644 srcpkgs/ffmpeg/patches/00001-v4l-config.patch
delete mode 100644 srcpkgs/ffmpeg/patches/00002-v4l-ioctl-musl.patch
delete mode 100644 srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
delete mode 100644 srcpkgs/ffmpeg/patches/binutils-2.41.patch
delete mode 100644 srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
delete mode 100644 srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch
diff --git a/srcpkgs/ffmpeg/patches/00001-v4l-config.patch b/srcpkgs/ffmpeg/patches/00001-v4l-config.patch
deleted file mode 100644
index e8dfdda98bce89..00000000000000
--- a/srcpkgs/ffmpeg/patches/00001-v4l-config.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 7405f1ad5351cc24b91a0227aeeaf24ff9d12278 Mon Sep 17 00:00:00 2001
-From: Ramiro Polla <ramiro.polla@gmail.com>
-Date: Wed, 3 Jul 2024 00:30:08 +0200
-Subject: [PATCH] configure: restore autodetection of v4l2 and fbdev
-
-The detection logic for v4l2 and fbdev was accidentally modified to
-depend on v4l2-m2m in 43b3412.
----
- configure | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/configure b/configure
-index b28221f258965..fa2e384350958 100755
---- a/configure
-+++ b/configure
-@@ -7145,11 +7145,12 @@ pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man
- rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout || disable rsync_contimeout
- xmllint --version > /dev/null 2>&1 && enable xmllint || disable xmllint
-
-+check_headers linux/fb.h
-+check_headers linux/videodev2.h
-+test_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_sanitized struct_v4l2_frmivalenum_discrete
-+
- # check V4L2 codecs available in the API
- if enabled v4l2_m2m; then
-- check_headers linux/fb.h
-- check_headers linux/videodev2.h
-- test_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_sanitized struct_v4l2_frmivalenum_discrete
- check_cc v4l2_m2m linux/videodev2.h "int i = V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_VIDEO_M2M | V4L2_BUF_FLAG_LAST;"
- check_cc vc1_v4l2_m2m linux/videodev2.h "int i = V4L2_PIX_FMT_VC1_ANNEX_G;"
- check_cc mpeg1_v4l2_m2m linux/videodev2.h "int i = V4L2_PIX_FMT_MPEG1;"
diff --git a/srcpkgs/ffmpeg/patches/00002-v4l-ioctl-musl.patch b/srcpkgs/ffmpeg/patches/00002-v4l-ioctl-musl.patch
deleted file mode 100644
index 681fb5d4f706ad..00000000000000
--- a/srcpkgs/ffmpeg/patches/00002-v4l-ioctl-musl.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 008b0b4a3b0cbafa568d0dcbf78c798d56929802 Mon Sep 17 00:00:00 2001
-From: Brad Smith <brad-at-comstyle.com@ffmpeg.org>
-Date: Sun, 5 May 2024 23:59:47 -0400
-Subject: [PATCH] lavd/v4l2: Use proper field type for second parameter of
- ioctl() with BSD's
-
-The proper type was used until 73251678c83cbe24d08264da693411b166239bc7.
-
-This covers all of the OS's that currently have V4L2 support, permutations
-of Linux glibc/musl, Android bionic, FreeBSD, NetBSD, OpenBSD, Solaris.
-
-Copied from FreeBSD ports patch.
-
-Signed-off-by: Brad Smith <brad@comstyle.com>
-Signed-off-by: Marton Balint <cus@passwd.hu>
-(cherry picked from commit 9e674b31606c805dd31b4bb754364a72a5877238)
-Signed-off-by: Brad Smith <brad@comstyle.com>
----
- libavdevice/v4l2.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
-index 365bacd7714b6..1dcbe04bb1741 100644
---- a/libavdevice/v4l2.c
-+++ b/libavdevice/v4l2.c
-@@ -95,10 +95,10 @@ struct video_data {
- int (*open_f)(const char *file, int oflag, ...);
- int (*close_f)(int fd);
- int (*dup_f)(int fd);
--#ifdef __GLIBC__
-- int (*ioctl_f)(int fd, unsigned long int request, ...);
--#else
-+#if defined(__sun) || defined(__BIONIC__) || defined(__musl__) /* POSIX-like */
- int (*ioctl_f)(int fd, int request, ...);
-+#else
-+ int (*ioctl_f)(int fd, unsigned long int request, ...);
- #endif
- ssize_t (*read_f)(int fd, void *buffer, size_t n);
- void *(*mmap_f)(void *start, size_t length, int prot, int flags, int fd, int64_t offset);
-From af17f55202e285d4d3d502078e5b6a41bcca90fb Mon Sep 17 00:00:00 2001
-From: Ramiro Polla <ramiro.polla@gmail.com>
-Date: Thu, 29 Aug 2024 15:40:00 +0200
-Subject: [PATCH] configure: improve check for POSIX ioctl
-
-Instead of relying on system #ifdefs which may or may not be correct,
-detect the POSIX ioctl signature at configure time.
-
-(cherry picked from commit 00b64fca55a3a009c9d0e391c85f4fd3291e5d12)
-Signed-off-by: Brad Smith <brad@comstyle.com>
----
- configure | 2 ++
- libavdevice/v4l2.c | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index c89d3ad1ec291..175b70e20735c 100755
---- a/configure
-+++ b/configure
-@@ -2340,6 +2340,7 @@ HAVE_LIST="
- opencl_vaapi_intel_media
- perl
- pod2man
-+ posix_ioctl
- texi2html
- "
-
-@@ -6616,6 +6617,7 @@ rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout || d
- check_headers linux/fb.h
- check_headers linux/videodev2.h
- test_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_sanitized struct_v4l2_frmivalenum_discrete
-+test_code cc sys/ioctl.h "int ioctl(int, int, ...)" && enable posix_ioctl
-
- # check V4L2 codecs available in the API
- if enabled v4l2_m2m; then
-diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
-index 1dcbe04bb1741..f90490eebfc86 100644
---- a/libavdevice/v4l2.c
-+++ b/libavdevice/v4l2.c
-@@ -95,7 +95,7 @@ struct video_data {
- int (*open_f)(const char *file, int oflag, ...);
- int (*close_f)(int fd);
- int (*dup_f)(int fd);
--#if defined(__sun) || defined(__BIONIC__) || defined(__musl__) /* POSIX-like */
-+#if HAVE_POSIX_IOCTL
- int (*ioctl_f)(int fd, int request, ...);
- #else
- int (*ioctl_f)(int fd, unsigned long int request, ...);
diff --git a/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch b/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
deleted file mode 100644
index 9a55178c74f0fd..00000000000000
--- a/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/libavfilter/vf_drawtext.c 2017-10-26 21:03:03.000000000 +0200
-+++ b/libavfilter/vf_drawtext.c 2017-11-21 11:06:49.602284422 +0100
-@@ -39,6 +39,15 @@
- #endif
- #include <fenv.h>
-
-+#if (FE_ALL_EXCEPT == 0)
-+/* E.g. ARM soft float does not define these */
-+#define FE_INVALID 0
-+#define FE_DIVBYZERO 0
-+#define FE_OVERFLOW 0
-+#define FE_UNDERFLOW 0
-+#define FE_INEXACT 0
-+#endif
-+
- #if CONFIG_LIBFONTCONFIG
- #include <fontconfig/fontconfig.h>
- #endif
diff --git a/srcpkgs/ffmpeg/patches/binutils-2.41.patch b/srcpkgs/ffmpeg/patches/binutils-2.41.patch
deleted file mode 100644
index 53a596d0ee7d4e..00000000000000
--- a/srcpkgs/ffmpeg/patches/binutils-2.41.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
-Date: Sun, 16 Jul 2023 18:18:02 +0300
-Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift
- instructions within inline assembly
-
-Fixes assembling with binutil as >= 2.41
-
-Signed-off-by: James Almer <jamrial@gmail.com>
----
- libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++---
- 1 file changed, 23 insertions(+), 3 deletions(-)
-
-diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
-index 6298f5ed1983b..ca7e2dffc1076 100644
---- a/libavcodec/x86/mathops.h
-+++ b/libavcodec/x86/mathops.h
-@@ -35,12 +35,20 @@
- static av_always_inline av_const int MULL(int a, int b, unsigned shift)
- {
- int rt, dummy;
-+ if (__builtin_constant_p(shift))
- __asm__ (
- "imull %3 \n\t"
- "shrdl %4, %%edx, %%eax \n\t"
- :"=a"(rt), "=d"(dummy)
-- :"a"(a), "rm"(b), "ci"((uint8_t)shift)
-+ :"a"(a), "rm"(b), "i"(shift & 0x1F)
- );
-+ else
-+ __asm__ (
-+ "imull %3 \n\t"
-+ "shrdl %4, %%edx, %%eax \n\t"
-+ :"=a"(rt), "=d"(dummy)
-+ :"a"(a), "rm"(b), "c"((uint8_t)shift)
-+ );
- return rt;
- }
-
-@@ -113,19 +121,31 @@ __asm__ volatile(\
- // avoid +32 for shift optimization (gcc should do that ...)
- #define NEG_SSR32 NEG_SSR32
- static inline int32_t NEG_SSR32( int32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("sarl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("sarl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
- #define NEG_USR32 NEG_USR32
- static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("shrl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("shrl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
diff --git a/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff b/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
deleted file mode 100644
index aa948f7a8a2dfb..00000000000000
--- a/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-#==================================================================================================
-# From 031f1561cd286596cdb374da32f8aa816ce3b135 Mon Sep 17 00:00:00 2001
-# From: Christopher Degawa <christopher.degawa@intel.com>
-# Date: Thu, 20 Oct 2022 22:55:27 -0500
-# Subject: [PATCH] avcodec/libsvtav1: remove compressed_ten_bit_format and simplify alloc_buffer
-#
-# compressed_ten_bit_format has been deprecated upstream and has no effect
-# and can be removed. Plus, technically it was never used in the first place
-# since it would require the app (ffmpeg) to set it and do additional
-# processing of the input frames.
-#
-# Also simplify alloc_buffer by removing calculations relating to the non-existant processing.
-#
-# Signed-off-by: Christopher Degawa <christopher.degawa@intel.com>
-#==================================================================================================
---- a/libavcodec/libsvtav1.c
-+++ b/libavcodec/libsvtav1.c
-@@ -124,16 +124,12 @@ static int svt_print_error(void *log_ctx, EbErrorType err,
-
- static int alloc_buffer(EbSvtAv1EncConfiguration *config, SvtContext *svt_enc)
- {
-- const int pack_mode_10bit =
-- (config->encoder_bit_depth > 8) && (config->compressed_ten_bit_format == 0) ? 1 : 0;
-- const size_t luma_size_8bit =
-- config->source_width * config->source_height * (1 << pack_mode_10bit);
-- const size_t luma_size_10bit =
-- (config->encoder_bit_depth > 8 && pack_mode_10bit == 0) ? luma_size_8bit : 0;
-+ const size_t luma_size = config->source_width * config->source_height *
-+ (config->encoder_bit_depth > 8 ? 2 : 1);
-
- EbSvtIOFormat *in_data;
-
-- svt_enc->raw_size = (luma_size_8bit + luma_size_10bit) * 3 / 2;
-+ svt_enc->raw_size = luma_size * 3 / 2;
-
- // allocate buffer for in and out
- svt_enc->in_buf = av_mallocz(sizeof(*svt_enc->in_buf));
---
-GitLab
-
diff --git a/srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch b/srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch
deleted file mode 100644
index 00e3f68a415b84..00000000000000
--- a/srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 811d290844206fc73dc39c3e5b67d5d895baedf8 Mon Sep 17 00:00:00 2001
-From: Rainer Hochecker <fernetmenta@online.de>
-Date: Sat, 26 Jan 2019 19:48:35 +0100
-Subject: [PATCH] avcodec/vaapi_h264: skip decode if pic has no slices
-
-This fixes / workarounds https://bugs.freedesktop.org/show_bug.cgi?id=105368.
-It was hit frequently when watching h264 channels received via DVB-X.
-Corresponding kodi bug: https://github.com/xbmc/xbmc/issues/15704
----
- libavcodec/vaapi_h264.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c
-index 5854587a255..f12fdc457a4 100644
---- a/libavcodec/vaapi_h264.c
-+++ b/libavcodec/vaapi_h264.c
-@@ -317,6 +317,11 @@ static int vaapi_h264_end_frame(AVCodecContext *avctx)
- H264SliceContext *sl = &h->slice_ctx[0];
- int ret;
-
-+ if (pic->nb_slices == 0) {
-+ ret = AVERROR_INVALIDDATA;
-+ goto finish;
-+ }
-+
- ret = ff_vaapi_decode_issue(avctx, pic);
- if (ret < 0)
- goto finish;
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 08297151181c07..b560d9df0ce126 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,8 +1,8 @@
# Template file for 'ffmpeg'
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg
-version=4.4.4
-revision=11
+version=4.4.5
+revision=1
build_style=meta
short_desc="Decoding, encoding and streaming software (transitional dummy package)"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
homepage="https://www.ffmpeg.org"
changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
distfiles="https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"
-checksum=e80b380d595c809060f66f96a5d849511ef4a76a26b76eacf5778b94c3570309
+checksum=f9514e0d3515aee5a271283df71636e1d1ff7274b15853bcd84e144be416ab07
hostmakedepends="pkg-config perl"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
From fb1ea35491bc88349407d337dbf70db73df5dec1 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 30 Mar 2025 20:13:04 -0300
Subject: [PATCH 3/9] ffmpeg6: rebuild for x265-4.0.
---
common/shlibs | 2 +-
srcpkgs/ffmpeg6/template | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 0bd2d1fb7e4696..0c0c44daf37775 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1950,7 +1950,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
libQt5WebKit.so.5 qt5-webkit-5.6.0_1
libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.209 x265-3.6_1
+libx265.so.212 x265-4.0_1
libQt5Xdg.so.3 libqt5xdg-3.2.0_1
libQt5XdgIconLoader.so.3 libqt5xdg-3.2.0_1
libQt6Xdg.so.4 libqtxdg-4.0.0_1
diff --git a/srcpkgs/ffmpeg6/template b/srcpkgs/ffmpeg6/template
index 0921a445ccd4a4..e2c459be2e4f9c 100644
--- a/srcpkgs/ffmpeg6/template
+++ b/srcpkgs/ffmpeg6/template
@@ -2,7 +2,7 @@
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg6
version=6.1.2
-revision=5
+revision=6
hostmakedepends="pkg-config perl"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
libXext-devel libXvMC-devel libxcb-devel lame-devel libtheora-devel
From 997f66f6597e8f763e03a1e90bdc15b2b46b8365 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 30 Mar 2025 20:16:45 -0300
Subject: [PATCH 4/9] libheif: rebuild for x265-4.0.
---
srcpkgs/libheif/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 3e5d16adbf365a..34bffb8c590811 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,8 +1,9 @@
# Template file for 'libheif'
pkgname=libheif
version=1.19.7
-revision=1
+revision=2
build_style=cmake
+configure_args="-DBUILD_TESTING=OFF"
makedepends="libjpeg-turbo-devel libpng-devel libde265-devel x265-devel
libaom-devel"
short_desc="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
From d322f928be61f99496e72d279216a26342749da3 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 30 Mar 2025 20:20:08 -0300
Subject: [PATCH 5/9] vlc: rebuild for x265-4.0.
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 4e25c752fb2b3dccf6d7465ebdb00fd7ce40e755 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 30 Mar 2025 20:21:43 -0300
Subject: [PATCH 6/9] baresip: rebuild for x265-4.0.
---
srcpkgs/baresip/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index 9ba4c08bc868fd..3419968c532e59 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
# Template file for 'baresip'
pkgname=baresip
version=3.20.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config glib-devel"
makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
From 1755b9b2d553b7aefe4d08ddc579adbc73537980 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 30 Mar 2025 20:22:24 -0300
Subject: [PATCH 7/9] avidemux: rebuild for x265-4.0.
---
srcpkgs/avidemux/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index d66f8524bd0e28..b972ecac92ed31 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
# Template file for 'avidemux'
pkgname=avidemux
version=2.8.1
-revision=2
+revision=3
# Can't be compiled for aarch64, arm* or mips*
archs="x86_64* i686*"
hostmakedepends="cmake pkg-config qt5-host-tools qt5-devel tar yasm"
From 71b0db41cfdd3fbd1f988ff55e0aea1f3cf46ef9 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 30 Mar 2025 20:23:13 -0300
Subject: [PATCH 8/9] gimp: rebuild for x265-4.0.
---
srcpkgs/gimp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index d40c6e0fff19aa..62c59c021585f2 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
# Template file for 'gimp'
pkgname=gimp
version=3.0.2
-revision=1
+revision=2
build_style=meson
build_helper="gir qemu"
configure_args="-Dcheck-update=no -Drevision=$revision -Denable-default-bin=enabled
From 6d890da5f4bc1c6dc396bbb4eedea32429bb16f9 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 30 Mar 2025 20:23:54 -0300
Subject: [PATCH 9/9] handbrake: rebuild for x265-4.0.
---
srcpkgs/handbrake/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index d32651a0abd02d..22fb9b6f4eb7d7 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.8.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] X265, ffmpeg and libheif: update
2025-01-20 21:47 [PR PATCH] X265, ffmpeg, handbrake, libheif: update 1is7ac3
` (15 preceding siblings ...)
2025-03-30 23:24 ` 1is7ac3
@ 2025-03-31 4:11 ` 1is7ac3
2025-03-31 7:41 ` oreo639
2025-03-31 9:12 ` [PR PATCH] [Updated] " 1is7ac3
18 siblings, 0 replies; 20+ messages in thread
From: 1is7ac3 @ 2025-03-31 4:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1247 bytes --]
There is an updated pull request by 1is7ac3 against master on the void-packages repository
https://github.com/1is7ac3/void-packages x265
https://github.com/void-linux/void-packages/pull/54056
X265, ffmpeg and libheif: update
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (X86_64-GLIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
<!-- - armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/54056.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-x265-54056.patch --]
[-- Type: text/x-diff, Size: 28684 bytes --]
From 57d1d43e13e16d1813400bed885f010079b4f521 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 30 Mar 2025 20:08:17 -0300
Subject: [PATCH 1/9] x265: update to 4.0.
---
.../x265/patches/handbrake-ambientlight.patch | 50 +++++++++----------
srcpkgs/x265/template | 30 +++++------
2 files changed, 38 insertions(+), 42 deletions(-)
diff --git a/srcpkgs/x265/patches/handbrake-ambientlight.patch b/srcpkgs/x265/patches/handbrake-ambientlight.patch
index ab36a9c35c9de4..5c966e42f0c373 100644
--- a/srcpkgs/x265/patches/handbrake-ambientlight.patch
+++ b/srcpkgs/x265/patches/handbrake-ambientlight.patch
@@ -1,8 +1,7 @@
-diff --git a/source/common/param.cpp b/source/common/param.cpp
-index 8c32fafa2..0b56235c9 100755
---- a/source/common/param.cpp
-+++ b/source/common/param.cpp
-@@ -378,6 +378,7 @@ void x265_param_default(x265_param* param)
+diff -ru a/source/common/param.cpp b/source/common/param.cpp
+--- a/source/common/param.cpp 2024-09-13 09:51:43.000000000 -0300
++++ b/source/common/param.cpp 2025-02-03 13:27:31.474334833 -0300
+@@ -380,6 +380,7 @@
param->preferredTransferCharacteristics = -1;
param->pictureStructure = -1;
param->bEmitCLL = 1;
@@ -10,7 +9,7 @@ index 8c32fafa2..0b56235c9 100755
param->bEnableFrameDuplication = 0;
param->dupThreshold = 70;
-@@ -1880,6 +1881,7 @@ int x265_check_params(x265_param* param)
+@@ -1929,6 +1930,7 @@
|| param->bEmitIDRRecoverySEI
|| !!param->interlaceMode
|| param->preferredTransferCharacteristics > 1
@@ -18,7 +17,7 @@ index 8c32fafa2..0b56235c9 100755
|| param->toneMapFile
|| param->naluFile);
-@@ -2766,6 +2768,10 @@ void x265_copy_params(x265_param* dst, x265_param* src)
+@@ -2850,6 +2852,10 @@
dst->bEmitCLL = src->bEmitCLL;
dst->maxCLL = src->maxCLL;
dst->maxFALL = src->maxFALL;
@@ -29,11 +28,10 @@ index 8c32fafa2..0b56235c9 100755
dst->log2MaxPocLsb = src->log2MaxPocLsb;
dst->bEmitVUIHRDInfo = src->bEmitVUIHRDInfo;
dst->bEmitVUITimingInfo = src->bEmitVUITimingInfo;
-diff --git a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp
-index 5950f87e9..545283474 100644
---- a/source/encoder/encoder.cpp
-+++ b/source/encoder/encoder.cpp
-@@ -3276,6 +3276,15 @@ void Encoder::getStreamHeaders(NALList& list, Entropy& sbacCoder, Bitstream& bs)
+diff -ru a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp
+--- a/source/encoder/encoder.cpp 2024-09-13 09:51:43.000000000 -0300
++++ b/source/encoder/encoder.cpp 2025-02-03 13:28:37.551336750 -0300
+@@ -3423,6 +3423,15 @@
}
}
@@ -49,11 +47,10 @@ index 5950f87e9..545283474 100644
if (m_param->bEmitInfoSEI)
{
char *opts = x265_param2string(m_param, m_sps.conformanceWindow.rightOffset, m_sps.conformanceWindow.bottomOffset);
-diff --git a/source/encoder/sei.h b/source/encoder/sei.h
-index 03e210639..712e4efb4 100644
---- a/source/encoder/sei.h
-+++ b/source/encoder/sei.h
-@@ -242,6 +242,25 @@ public:
+diff -ru a/source/encoder/sei.h b/source/encoder/sei.h
+--- a/source/encoder/sei.h 2024-09-13 09:51:43.000000000 -0300
++++ b/source/encoder/sei.h 2025-02-03 13:30:41.386953402 -0300
+@@ -464,6 +464,25 @@
}
};
@@ -79,19 +76,18 @@ index 03e210639..712e4efb4 100644
class SEIDecodedPictureHash : public SEI
{
public:
-diff --git a/source/x265.h b/source/x265.h
-index 9f3abd9d9..b6a4d3fe1 100644
---- a/source/x265.h
-+++ b/source/x265.h
-@@ -371,6 +371,7 @@ typedef enum
+diff -ru a/source/x265.h b/source/x265.h
+--- a/source/x265.h 2024-09-13 09:51:43.000000000 -0300
++++ b/source/x265.h 2025-02-03 13:32:46.662499030 -0300
+@@ -371,6 +371,7 @@
MASTERING_DISPLAY_INFO = 137,
CONTENT_LIGHT_LEVEL_INFO = 144,
ALTERNATIVE_TRANSFER_CHARACTERISTICS = 147,
+ AMBIENT_VIEWING_ENVIRONMENT = 148,
- } SEIPayloadType;
-
- typedef struct x265_sei_payload
-@@ -1903,6 +1904,11 @@ typedef struct x265_param
+ ALPHA_CHANNEL_INFO = 165,
+ THREE_DIMENSIONAL_REFERENCE_DISPLAYS_INFO = 176,
+ MULTIVIEW_SCENE_INFO = 178,
+@@ -1956,6 +1957,11 @@
* value to that value. */
uint16_t maxLuma;
@@ -103,7 +99,7 @@ index 9f3abd9d9..b6a4d3fe1 100644
/* Maximum of the picture order count */
int log2MaxPocLsb;
-@@ -2114,6 +2120,9 @@ typedef struct x265_param
+@@ -2167,6 +2173,9 @@
/*Emit content light level info SEI*/
int bEmitCLL;
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index d95e93552f6c04..4acc7cd5ff2b6d 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,7 +1,7 @@
# Template file for 'x265'
pkgname=x265
-version=3.6
-revision=2
+version=4.0
+revision=1
build_wrksrc=source
build_style=cmake
configure_args="-DENABLE_PIC=1 -DEXTRA_LINK_FLAGS='-L.'
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://x265.org/"
distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=206329b9599c78d06969a1b7b7bb939f7c99a459ab283b2e93f76854bd34ca7b
+checksum=66b64be4b316362fdadb33ad8273a74236042cc380691bdbec42946b0437a389
build_options="altivec assembly"
@@ -23,28 +23,28 @@ case "$XBPS_TARGET_MACHINE" in
ppc64le*) build_options_default="altivec" ;;
# on ARM, enabling it currently fails with undefined reference to
# x265::setupAssemblyPrimitives(x265::EncoderPrimitives&, int)
- x86_64*|i686*) build_options_default="assembly" ;;
+ x86_64* | i686*) build_options_default="assembly" ;;
*) ;;
esac
if [ "$build_option_assembly" ]; then
case "$XBPS_TARGET_MACHINE" in
- x86_64*|i686*)
- # see https://bitbucket.org/multicoreware/x265_git/issues/559
- configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
- hostmakedepends+=" nasm"
- ;;
- *) ;;
+ x86_64* | i686*)
+ # see https://bitbucket.org/multicoreware/x265_git/issues/559
+ configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
+ hostmakedepends+=" nasm"
+ ;;
+ *) ;;
esac
fi
case "$XBPS_TARGET_MACHINE" in
- ppc64*)
- # altivec does not build without power8 being enabled
- configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF)
+ppc64*)
+ # altivec does not build without power8 being enabled
+ configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF)
-DCPU_POWER8=$(vopt_if altivec ON OFF)"
- ;;
- *) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;;
+ ;;
+*) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;;
esac
pre_configure() {
From aa864ae42cb1a2664b8ef43c8a963708ad3c04f4 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 30 Mar 2025 20:10:25 -0300
Subject: [PATCH 2/9] ffmpeg: update to 4.4.5.
---
srcpkgs/ffmpeg/patches/00001-v4l-config.patch | 31 -------
.../ffmpeg/patches/00002-v4l-ioctl-musl.patch | 87 -------------------
.../patches/armv5tel-floating-point.patch | 18 ----
srcpkgs/ffmpeg/patches/binutils-2.41.patch | 73 ----------------
...h-libavcodec-libsvtav1-ten_bit_format.diff | 40 ---------
.../workaround-mesa-readeon-vaapi-bug.patch | 28 ------
srcpkgs/ffmpeg/template | 6 +-
7 files changed, 3 insertions(+), 280 deletions(-)
delete mode 100644 srcpkgs/ffmpeg/patches/00001-v4l-config.patch
delete mode 100644 srcpkgs/ffmpeg/patches/00002-v4l-ioctl-musl.patch
delete mode 100644 srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
delete mode 100644 srcpkgs/ffmpeg/patches/binutils-2.41.patch
delete mode 100644 srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
delete mode 100644 srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch
diff --git a/srcpkgs/ffmpeg/patches/00001-v4l-config.patch b/srcpkgs/ffmpeg/patches/00001-v4l-config.patch
deleted file mode 100644
index e8dfdda98bce89..00000000000000
--- a/srcpkgs/ffmpeg/patches/00001-v4l-config.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 7405f1ad5351cc24b91a0227aeeaf24ff9d12278 Mon Sep 17 00:00:00 2001
-From: Ramiro Polla <ramiro.polla@gmail.com>
-Date: Wed, 3 Jul 2024 00:30:08 +0200
-Subject: [PATCH] configure: restore autodetection of v4l2 and fbdev
-
-The detection logic for v4l2 and fbdev was accidentally modified to
-depend on v4l2-m2m in 43b3412.
----
- configure | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/configure b/configure
-index b28221f258965..fa2e384350958 100755
---- a/configure
-+++ b/configure
-@@ -7145,11 +7145,12 @@ pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man
- rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout || disable rsync_contimeout
- xmllint --version > /dev/null 2>&1 && enable xmllint || disable xmllint
-
-+check_headers linux/fb.h
-+check_headers linux/videodev2.h
-+test_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_sanitized struct_v4l2_frmivalenum_discrete
-+
- # check V4L2 codecs available in the API
- if enabled v4l2_m2m; then
-- check_headers linux/fb.h
-- check_headers linux/videodev2.h
-- test_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_sanitized struct_v4l2_frmivalenum_discrete
- check_cc v4l2_m2m linux/videodev2.h "int i = V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_VIDEO_M2M | V4L2_BUF_FLAG_LAST;"
- check_cc vc1_v4l2_m2m linux/videodev2.h "int i = V4L2_PIX_FMT_VC1_ANNEX_G;"
- check_cc mpeg1_v4l2_m2m linux/videodev2.h "int i = V4L2_PIX_FMT_MPEG1;"
diff --git a/srcpkgs/ffmpeg/patches/00002-v4l-ioctl-musl.patch b/srcpkgs/ffmpeg/patches/00002-v4l-ioctl-musl.patch
deleted file mode 100644
index 681fb5d4f706ad..00000000000000
--- a/srcpkgs/ffmpeg/patches/00002-v4l-ioctl-musl.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 008b0b4a3b0cbafa568d0dcbf78c798d56929802 Mon Sep 17 00:00:00 2001
-From: Brad Smith <brad-at-comstyle.com@ffmpeg.org>
-Date: Sun, 5 May 2024 23:59:47 -0400
-Subject: [PATCH] lavd/v4l2: Use proper field type for second parameter of
- ioctl() with BSD's
-
-The proper type was used until 73251678c83cbe24d08264da693411b166239bc7.
-
-This covers all of the OS's that currently have V4L2 support, permutations
-of Linux glibc/musl, Android bionic, FreeBSD, NetBSD, OpenBSD, Solaris.
-
-Copied from FreeBSD ports patch.
-
-Signed-off-by: Brad Smith <brad@comstyle.com>
-Signed-off-by: Marton Balint <cus@passwd.hu>
-(cherry picked from commit 9e674b31606c805dd31b4bb754364a72a5877238)
-Signed-off-by: Brad Smith <brad@comstyle.com>
----
- libavdevice/v4l2.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
-index 365bacd7714b6..1dcbe04bb1741 100644
---- a/libavdevice/v4l2.c
-+++ b/libavdevice/v4l2.c
-@@ -95,10 +95,10 @@ struct video_data {
- int (*open_f)(const char *file, int oflag, ...);
- int (*close_f)(int fd);
- int (*dup_f)(int fd);
--#ifdef __GLIBC__
-- int (*ioctl_f)(int fd, unsigned long int request, ...);
--#else
-+#if defined(__sun) || defined(__BIONIC__) || defined(__musl__) /* POSIX-like */
- int (*ioctl_f)(int fd, int request, ...);
-+#else
-+ int (*ioctl_f)(int fd, unsigned long int request, ...);
- #endif
- ssize_t (*read_f)(int fd, void *buffer, size_t n);
- void *(*mmap_f)(void *start, size_t length, int prot, int flags, int fd, int64_t offset);
-From af17f55202e285d4d3d502078e5b6a41bcca90fb Mon Sep 17 00:00:00 2001
-From: Ramiro Polla <ramiro.polla@gmail.com>
-Date: Thu, 29 Aug 2024 15:40:00 +0200
-Subject: [PATCH] configure: improve check for POSIX ioctl
-
-Instead of relying on system #ifdefs which may or may not be correct,
-detect the POSIX ioctl signature at configure time.
-
-(cherry picked from commit 00b64fca55a3a009c9d0e391c85f4fd3291e5d12)
-Signed-off-by: Brad Smith <brad@comstyle.com>
----
- configure | 2 ++
- libavdevice/v4l2.c | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index c89d3ad1ec291..175b70e20735c 100755
---- a/configure
-+++ b/configure
-@@ -2340,6 +2340,7 @@ HAVE_LIST="
- opencl_vaapi_intel_media
- perl
- pod2man
-+ posix_ioctl
- texi2html
- "
-
-@@ -6616,6 +6617,7 @@ rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout || d
- check_headers linux/fb.h
- check_headers linux/videodev2.h
- test_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_sanitized struct_v4l2_frmivalenum_discrete
-+test_code cc sys/ioctl.h "int ioctl(int, int, ...)" && enable posix_ioctl
-
- # check V4L2 codecs available in the API
- if enabled v4l2_m2m; then
-diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
-index 1dcbe04bb1741..f90490eebfc86 100644
---- a/libavdevice/v4l2.c
-+++ b/libavdevice/v4l2.c
-@@ -95,7 +95,7 @@ struct video_data {
- int (*open_f)(const char *file, int oflag, ...);
- int (*close_f)(int fd);
- int (*dup_f)(int fd);
--#if defined(__sun) || defined(__BIONIC__) || defined(__musl__) /* POSIX-like */
-+#if HAVE_POSIX_IOCTL
- int (*ioctl_f)(int fd, int request, ...);
- #else
- int (*ioctl_f)(int fd, unsigned long int request, ...);
diff --git a/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch b/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
deleted file mode 100644
index 9a55178c74f0fd..00000000000000
--- a/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/libavfilter/vf_drawtext.c 2017-10-26 21:03:03.000000000 +0200
-+++ b/libavfilter/vf_drawtext.c 2017-11-21 11:06:49.602284422 +0100
-@@ -39,6 +39,15 @@
- #endif
- #include <fenv.h>
-
-+#if (FE_ALL_EXCEPT == 0)
-+/* E.g. ARM soft float does not define these */
-+#define FE_INVALID 0
-+#define FE_DIVBYZERO 0
-+#define FE_OVERFLOW 0
-+#define FE_UNDERFLOW 0
-+#define FE_INEXACT 0
-+#endif
-+
- #if CONFIG_LIBFONTCONFIG
- #include <fontconfig/fontconfig.h>
- #endif
diff --git a/srcpkgs/ffmpeg/patches/binutils-2.41.patch b/srcpkgs/ffmpeg/patches/binutils-2.41.patch
deleted file mode 100644
index 53a596d0ee7d4e..00000000000000
--- a/srcpkgs/ffmpeg/patches/binutils-2.41.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
-Date: Sun, 16 Jul 2023 18:18:02 +0300
-Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift
- instructions within inline assembly
-
-Fixes assembling with binutil as >= 2.41
-
-Signed-off-by: James Almer <jamrial@gmail.com>
----
- libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++---
- 1 file changed, 23 insertions(+), 3 deletions(-)
-
-diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
-index 6298f5ed1983b..ca7e2dffc1076 100644
---- a/libavcodec/x86/mathops.h
-+++ b/libavcodec/x86/mathops.h
-@@ -35,12 +35,20 @@
- static av_always_inline av_const int MULL(int a, int b, unsigned shift)
- {
- int rt, dummy;
-+ if (__builtin_constant_p(shift))
- __asm__ (
- "imull %3 \n\t"
- "shrdl %4, %%edx, %%eax \n\t"
- :"=a"(rt), "=d"(dummy)
-- :"a"(a), "rm"(b), "ci"((uint8_t)shift)
-+ :"a"(a), "rm"(b), "i"(shift & 0x1F)
- );
-+ else
-+ __asm__ (
-+ "imull %3 \n\t"
-+ "shrdl %4, %%edx, %%eax \n\t"
-+ :"=a"(rt), "=d"(dummy)
-+ :"a"(a), "rm"(b), "c"((uint8_t)shift)
-+ );
- return rt;
- }
-
-@@ -113,19 +121,31 @@ __asm__ volatile(\
- // avoid +32 for shift optimization (gcc should do that ...)
- #define NEG_SSR32 NEG_SSR32
- static inline int32_t NEG_SSR32( int32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("sarl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("sarl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
- #define NEG_USR32 NEG_USR32
- static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("shrl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("shrl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
diff --git a/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff b/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
deleted file mode 100644
index aa948f7a8a2dfb..00000000000000
--- a/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-#==================================================================================================
-# From 031f1561cd286596cdb374da32f8aa816ce3b135 Mon Sep 17 00:00:00 2001
-# From: Christopher Degawa <christopher.degawa@intel.com>
-# Date: Thu, 20 Oct 2022 22:55:27 -0500
-# Subject: [PATCH] avcodec/libsvtav1: remove compressed_ten_bit_format and simplify alloc_buffer
-#
-# compressed_ten_bit_format has been deprecated upstream and has no effect
-# and can be removed. Plus, technically it was never used in the first place
-# since it would require the app (ffmpeg) to set it and do additional
-# processing of the input frames.
-#
-# Also simplify alloc_buffer by removing calculations relating to the non-existant processing.
-#
-# Signed-off-by: Christopher Degawa <christopher.degawa@intel.com>
-#==================================================================================================
---- a/libavcodec/libsvtav1.c
-+++ b/libavcodec/libsvtav1.c
-@@ -124,16 +124,12 @@ static int svt_print_error(void *log_ctx, EbErrorType err,
-
- static int alloc_buffer(EbSvtAv1EncConfiguration *config, SvtContext *svt_enc)
- {
-- const int pack_mode_10bit =
-- (config->encoder_bit_depth > 8) && (config->compressed_ten_bit_format == 0) ? 1 : 0;
-- const size_t luma_size_8bit =
-- config->source_width * config->source_height * (1 << pack_mode_10bit);
-- const size_t luma_size_10bit =
-- (config->encoder_bit_depth > 8 && pack_mode_10bit == 0) ? luma_size_8bit : 0;
-+ const size_t luma_size = config->source_width * config->source_height *
-+ (config->encoder_bit_depth > 8 ? 2 : 1);
-
- EbSvtIOFormat *in_data;
-
-- svt_enc->raw_size = (luma_size_8bit + luma_size_10bit) * 3 / 2;
-+ svt_enc->raw_size = luma_size * 3 / 2;
-
- // allocate buffer for in and out
- svt_enc->in_buf = av_mallocz(sizeof(*svt_enc->in_buf));
---
-GitLab
-
diff --git a/srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch b/srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch
deleted file mode 100644
index 00e3f68a415b84..00000000000000
--- a/srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 811d290844206fc73dc39c3e5b67d5d895baedf8 Mon Sep 17 00:00:00 2001
-From: Rainer Hochecker <fernetmenta@online.de>
-Date: Sat, 26 Jan 2019 19:48:35 +0100
-Subject: [PATCH] avcodec/vaapi_h264: skip decode if pic has no slices
-
-This fixes / workarounds https://bugs.freedesktop.org/show_bug.cgi?id=105368.
-It was hit frequently when watching h264 channels received via DVB-X.
-Corresponding kodi bug: https://github.com/xbmc/xbmc/issues/15704
----
- libavcodec/vaapi_h264.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c
-index 5854587a255..f12fdc457a4 100644
---- a/libavcodec/vaapi_h264.c
-+++ b/libavcodec/vaapi_h264.c
-@@ -317,6 +317,11 @@ static int vaapi_h264_end_frame(AVCodecContext *avctx)
- H264SliceContext *sl = &h->slice_ctx[0];
- int ret;
-
-+ if (pic->nb_slices == 0) {
-+ ret = AVERROR_INVALIDDATA;
-+ goto finish;
-+ }
-+
- ret = ff_vaapi_decode_issue(avctx, pic);
- if (ret < 0)
- goto finish;
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 08297151181c07..b560d9df0ce126 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,8 +1,8 @@
# Template file for 'ffmpeg'
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg
-version=4.4.4
-revision=11
+version=4.4.5
+revision=1
build_style=meta
short_desc="Decoding, encoding and streaming software (transitional dummy package)"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
homepage="https://www.ffmpeg.org"
changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
distfiles="https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"
-checksum=e80b380d595c809060f66f96a5d849511ef4a76a26b76eacf5778b94c3570309
+checksum=f9514e0d3515aee5a271283df71636e1d1ff7274b15853bcd84e144be416ab07
hostmakedepends="pkg-config perl"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
From fb1ea35491bc88349407d337dbf70db73df5dec1 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 30 Mar 2025 20:13:04 -0300
Subject: [PATCH 3/9] ffmpeg6: rebuild for x265-4.0.
---
common/shlibs | 2 +-
srcpkgs/ffmpeg6/template | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 0bd2d1fb7e4696..0c0c44daf37775 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1950,7 +1950,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
libQt5WebKit.so.5 qt5-webkit-5.6.0_1
libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.209 x265-3.6_1
+libx265.so.212 x265-4.0_1
libQt5Xdg.so.3 libqt5xdg-3.2.0_1
libQt5XdgIconLoader.so.3 libqt5xdg-3.2.0_1
libQt6Xdg.so.4 libqtxdg-4.0.0_1
diff --git a/srcpkgs/ffmpeg6/template b/srcpkgs/ffmpeg6/template
index 0921a445ccd4a4..e2c459be2e4f9c 100644
--- a/srcpkgs/ffmpeg6/template
+++ b/srcpkgs/ffmpeg6/template
@@ -2,7 +2,7 @@
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg6
version=6.1.2
-revision=5
+revision=6
hostmakedepends="pkg-config perl"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
libXext-devel libXvMC-devel libxcb-devel lame-devel libtheora-devel
From 997f66f6597e8f763e03a1e90bdc15b2b46b8365 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 30 Mar 2025 20:16:45 -0300
Subject: [PATCH 4/9] libheif: rebuild for x265-4.0.
---
srcpkgs/libheif/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 3e5d16adbf365a..34bffb8c590811 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,8 +1,9 @@
# Template file for 'libheif'
pkgname=libheif
version=1.19.7
-revision=1
+revision=2
build_style=cmake
+configure_args="-DBUILD_TESTING=OFF"
makedepends="libjpeg-turbo-devel libpng-devel libde265-devel x265-devel
libaom-devel"
short_desc="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
From d322f928be61f99496e72d279216a26342749da3 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 30 Mar 2025 20:20:08 -0300
Subject: [PATCH 5/9] vlc: rebuild for x265-4.0.
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 4e25c752fb2b3dccf6d7465ebdb00fd7ce40e755 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 30 Mar 2025 20:21:43 -0300
Subject: [PATCH 6/9] baresip: rebuild for x265-4.0.
---
srcpkgs/baresip/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index 9ba4c08bc868fd..3419968c532e59 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
# Template file for 'baresip'
pkgname=baresip
version=3.20.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config glib-devel"
makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
From f97d2e146288295232d1dab2e47e0c14e86759f0 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 31 Mar 2025 01:08:51 -0300
Subject: [PATCH 7/9] gimp: rebuild for x265-4.0.
---
srcpkgs/gimp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index d40c6e0fff19aa..62c59c021585f2 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
# Template file for 'gimp'
pkgname=gimp
version=3.0.2
-revision=1
+revision=2
build_style=meson
build_helper="gir qemu"
configure_args="-Dcheck-update=no -Drevision=$revision -Denable-default-bin=enabled
From 64a835a80953f5c5939cb82950b3bb4582a87c04 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 31 Mar 2025 01:10:28 -0300
Subject: [PATCH 8/9] handbrake: rebuild for x265-4.0.
---
srcpkgs/handbrake/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index d32651a0abd02d..22fb9b6f4eb7d7 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.8.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
From 9208261020c46c77d5120690c0072d373ba07466 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 31 Mar 2025 01:11:17 -0300
Subject: [PATCH 9/9] avidemux: rebuild for x265-4.0.
---
srcpkgs/avidemux/patches/ADM_x265.patch | 44 +++++++++++++++++++++++++
srcpkgs/avidemux/template | 2 +-
2 files changed, 45 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/avidemux/patches/ADM_x265.patch
diff --git a/srcpkgs/avidemux/patches/ADM_x265.patch b/srcpkgs/avidemux/patches/ADM_x265.patch
new file mode 100644
index 00000000000000..6db76d7ffc332e
--- /dev/null
+++ b/srcpkgs/avidemux/patches/ADM_x265.patch
@@ -0,0 +1,44 @@
+--- a/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp 2022-09-17 10:59:17.000000000 -0300
++++ b/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp 2025-01-26 19:27:19.796218401 -0300
+@@ -205,15 +205,20 @@
+ //
+ x265_nal *nal;
+ uint32_t nbNal = 0;
+- x265_picture pic_out;
+- api->picture_init(¶m,&pic_out);
++ x265_picture pic_out[MAX_SCALABLE_LAYERS];
++ x265_picture *pic_out_ptr[MAX_SCALABLE_LAYERS];
+ out->flags = 0;
+
++ for (int i = 0; i < MAX_SCALABLE_LAYERS; i++)
++ {
++ api->picture_init(¶m,&pic_out[i]);
++ pic_out_ptr[i] = &pic_out[i];
++ }
+ int er;
+ if(false==gotFrame)
+ {
+ ADM_info("Flushing delayed frames\n");
+- er = api->encoder_encode(handle, &nal, &nbNal, NULL, &pic_out);
++ er = api->encoder_encode(handle, &nal, &nbNal, NULL, pic_out_ptr);
+ if(er<=0)
+ {
+ ADM_info ("End of flush\n");
+@@ -221,7 +226,7 @@
+ }
+ }else
+ {
+- er = api->encoder_encode(handle, &nal, &nbNal, &pic, &pic_out);
++ er = api->encoder_encode(handle, &nal, &nbNal, &pic, pic_out_ptr);
+ if(er<0)
+ {
+ ADM_error ("[x265] Error encoding %d\n",er);
+@@ -236,7 +241,7 @@
+
+
+ // 3-encode
+- if(false==postAmble(out,nbNal,nal,&pic_out))
++ if(false==postAmble(out,nbNal,nal,pic_out_ptr[0]))
+ {
+ ADM_warning("[x265] postAmble failed\n");
+ return false;
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index d66f8524bd0e28..b972ecac92ed31 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
# Template file for 'avidemux'
pkgname=avidemux
version=2.8.1
-revision=2
+revision=3
# Can't be compiled for aarch64, arm* or mips*
archs="x86_64* i686*"
hostmakedepends="cmake pkg-config qt5-host-tools qt5-devel tar yasm"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: X265, ffmpeg and libheif: update
2025-01-20 21:47 [PR PATCH] X265, ffmpeg, handbrake, libheif: update 1is7ac3
` (16 preceding siblings ...)
2025-03-31 4:11 ` 1is7ac3
@ 2025-03-31 7:41 ` oreo639
2025-03-31 9:12 ` [PR PATCH] [Updated] " 1is7ac3
18 siblings, 0 replies; 20+ messages in thread
From: oreo639 @ 2025-03-31 7:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 178 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/54056#issuecomment-2765379115
Comment:
digikam needs to be rebuilt as well.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] X265, ffmpeg and libheif: update
2025-01-20 21:47 [PR PATCH] X265, ffmpeg, handbrake, libheif: update 1is7ac3
` (17 preceding siblings ...)
2025-03-31 7:41 ` oreo639
@ 2025-03-31 9:12 ` 1is7ac3
18 siblings, 0 replies; 20+ messages in thread
From: 1is7ac3 @ 2025-03-31 9:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1247 bytes --]
There is an updated pull request by 1is7ac3 against master on the void-packages repository
https://github.com/1is7ac3/void-packages x265
https://github.com/void-linux/void-packages/pull/54056
X265, ffmpeg and libheif: update
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (X86_64-GLIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
<!-- - armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/54056.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-x265-54056.patch --]
[-- Type: text/x-diff, Size: 29417 bytes --]
From 57d1d43e13e16d1813400bed885f010079b4f521 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 30 Mar 2025 20:08:17 -0300
Subject: [PATCH 01/10] x265: update to 4.0.
---
.../x265/patches/handbrake-ambientlight.patch | 50 +++++++++----------
srcpkgs/x265/template | 30 +++++------
2 files changed, 38 insertions(+), 42 deletions(-)
diff --git a/srcpkgs/x265/patches/handbrake-ambientlight.patch b/srcpkgs/x265/patches/handbrake-ambientlight.patch
index ab36a9c35c9de4..5c966e42f0c373 100644
--- a/srcpkgs/x265/patches/handbrake-ambientlight.patch
+++ b/srcpkgs/x265/patches/handbrake-ambientlight.patch
@@ -1,8 +1,7 @@
-diff --git a/source/common/param.cpp b/source/common/param.cpp
-index 8c32fafa2..0b56235c9 100755
---- a/source/common/param.cpp
-+++ b/source/common/param.cpp
-@@ -378,6 +378,7 @@ void x265_param_default(x265_param* param)
+diff -ru a/source/common/param.cpp b/source/common/param.cpp
+--- a/source/common/param.cpp 2024-09-13 09:51:43.000000000 -0300
++++ b/source/common/param.cpp 2025-02-03 13:27:31.474334833 -0300
+@@ -380,6 +380,7 @@
param->preferredTransferCharacteristics = -1;
param->pictureStructure = -1;
param->bEmitCLL = 1;
@@ -10,7 +9,7 @@ index 8c32fafa2..0b56235c9 100755
param->bEnableFrameDuplication = 0;
param->dupThreshold = 70;
-@@ -1880,6 +1881,7 @@ int x265_check_params(x265_param* param)
+@@ -1929,6 +1930,7 @@
|| param->bEmitIDRRecoverySEI
|| !!param->interlaceMode
|| param->preferredTransferCharacteristics > 1
@@ -18,7 +17,7 @@ index 8c32fafa2..0b56235c9 100755
|| param->toneMapFile
|| param->naluFile);
-@@ -2766,6 +2768,10 @@ void x265_copy_params(x265_param* dst, x265_param* src)
+@@ -2850,6 +2852,10 @@
dst->bEmitCLL = src->bEmitCLL;
dst->maxCLL = src->maxCLL;
dst->maxFALL = src->maxFALL;
@@ -29,11 +28,10 @@ index 8c32fafa2..0b56235c9 100755
dst->log2MaxPocLsb = src->log2MaxPocLsb;
dst->bEmitVUIHRDInfo = src->bEmitVUIHRDInfo;
dst->bEmitVUITimingInfo = src->bEmitVUITimingInfo;
-diff --git a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp
-index 5950f87e9..545283474 100644
---- a/source/encoder/encoder.cpp
-+++ b/source/encoder/encoder.cpp
-@@ -3276,6 +3276,15 @@ void Encoder::getStreamHeaders(NALList& list, Entropy& sbacCoder, Bitstream& bs)
+diff -ru a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp
+--- a/source/encoder/encoder.cpp 2024-09-13 09:51:43.000000000 -0300
++++ b/source/encoder/encoder.cpp 2025-02-03 13:28:37.551336750 -0300
+@@ -3423,6 +3423,15 @@
}
}
@@ -49,11 +47,10 @@ index 5950f87e9..545283474 100644
if (m_param->bEmitInfoSEI)
{
char *opts = x265_param2string(m_param, m_sps.conformanceWindow.rightOffset, m_sps.conformanceWindow.bottomOffset);
-diff --git a/source/encoder/sei.h b/source/encoder/sei.h
-index 03e210639..712e4efb4 100644
---- a/source/encoder/sei.h
-+++ b/source/encoder/sei.h
-@@ -242,6 +242,25 @@ public:
+diff -ru a/source/encoder/sei.h b/source/encoder/sei.h
+--- a/source/encoder/sei.h 2024-09-13 09:51:43.000000000 -0300
++++ b/source/encoder/sei.h 2025-02-03 13:30:41.386953402 -0300
+@@ -464,6 +464,25 @@
}
};
@@ -79,19 +76,18 @@ index 03e210639..712e4efb4 100644
class SEIDecodedPictureHash : public SEI
{
public:
-diff --git a/source/x265.h b/source/x265.h
-index 9f3abd9d9..b6a4d3fe1 100644
---- a/source/x265.h
-+++ b/source/x265.h
-@@ -371,6 +371,7 @@ typedef enum
+diff -ru a/source/x265.h b/source/x265.h
+--- a/source/x265.h 2024-09-13 09:51:43.000000000 -0300
++++ b/source/x265.h 2025-02-03 13:32:46.662499030 -0300
+@@ -371,6 +371,7 @@
MASTERING_DISPLAY_INFO = 137,
CONTENT_LIGHT_LEVEL_INFO = 144,
ALTERNATIVE_TRANSFER_CHARACTERISTICS = 147,
+ AMBIENT_VIEWING_ENVIRONMENT = 148,
- } SEIPayloadType;
-
- typedef struct x265_sei_payload
-@@ -1903,6 +1904,11 @@ typedef struct x265_param
+ ALPHA_CHANNEL_INFO = 165,
+ THREE_DIMENSIONAL_REFERENCE_DISPLAYS_INFO = 176,
+ MULTIVIEW_SCENE_INFO = 178,
+@@ -1956,6 +1957,11 @@
* value to that value. */
uint16_t maxLuma;
@@ -103,7 +99,7 @@ index 9f3abd9d9..b6a4d3fe1 100644
/* Maximum of the picture order count */
int log2MaxPocLsb;
-@@ -2114,6 +2120,9 @@ typedef struct x265_param
+@@ -2167,6 +2173,9 @@
/*Emit content light level info SEI*/
int bEmitCLL;
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index d95e93552f6c04..4acc7cd5ff2b6d 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,7 +1,7 @@
# Template file for 'x265'
pkgname=x265
-version=3.6
-revision=2
+version=4.0
+revision=1
build_wrksrc=source
build_style=cmake
configure_args="-DENABLE_PIC=1 -DEXTRA_LINK_FLAGS='-L.'
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://x265.org/"
distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=206329b9599c78d06969a1b7b7bb939f7c99a459ab283b2e93f76854bd34ca7b
+checksum=66b64be4b316362fdadb33ad8273a74236042cc380691bdbec42946b0437a389
build_options="altivec assembly"
@@ -23,28 +23,28 @@ case "$XBPS_TARGET_MACHINE" in
ppc64le*) build_options_default="altivec" ;;
# on ARM, enabling it currently fails with undefined reference to
# x265::setupAssemblyPrimitives(x265::EncoderPrimitives&, int)
- x86_64*|i686*) build_options_default="assembly" ;;
+ x86_64* | i686*) build_options_default="assembly" ;;
*) ;;
esac
if [ "$build_option_assembly" ]; then
case "$XBPS_TARGET_MACHINE" in
- x86_64*|i686*)
- # see https://bitbucket.org/multicoreware/x265_git/issues/559
- configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
- hostmakedepends+=" nasm"
- ;;
- *) ;;
+ x86_64* | i686*)
+ # see https://bitbucket.org/multicoreware/x265_git/issues/559
+ configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
+ hostmakedepends+=" nasm"
+ ;;
+ *) ;;
esac
fi
case "$XBPS_TARGET_MACHINE" in
- ppc64*)
- # altivec does not build without power8 being enabled
- configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF)
+ppc64*)
+ # altivec does not build without power8 being enabled
+ configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF)
-DCPU_POWER8=$(vopt_if altivec ON OFF)"
- ;;
- *) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;;
+ ;;
+*) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;;
esac
pre_configure() {
From aa864ae42cb1a2664b8ef43c8a963708ad3c04f4 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 30 Mar 2025 20:10:25 -0300
Subject: [PATCH 02/10] ffmpeg: update to 4.4.5.
---
srcpkgs/ffmpeg/patches/00001-v4l-config.patch | 31 -------
.../ffmpeg/patches/00002-v4l-ioctl-musl.patch | 87 -------------------
.../patches/armv5tel-floating-point.patch | 18 ----
srcpkgs/ffmpeg/patches/binutils-2.41.patch | 73 ----------------
...h-libavcodec-libsvtav1-ten_bit_format.diff | 40 ---------
.../workaround-mesa-readeon-vaapi-bug.patch | 28 ------
srcpkgs/ffmpeg/template | 6 +-
7 files changed, 3 insertions(+), 280 deletions(-)
delete mode 100644 srcpkgs/ffmpeg/patches/00001-v4l-config.patch
delete mode 100644 srcpkgs/ffmpeg/patches/00002-v4l-ioctl-musl.patch
delete mode 100644 srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
delete mode 100644 srcpkgs/ffmpeg/patches/binutils-2.41.patch
delete mode 100644 srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
delete mode 100644 srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch
diff --git a/srcpkgs/ffmpeg/patches/00001-v4l-config.patch b/srcpkgs/ffmpeg/patches/00001-v4l-config.patch
deleted file mode 100644
index e8dfdda98bce89..00000000000000
--- a/srcpkgs/ffmpeg/patches/00001-v4l-config.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 7405f1ad5351cc24b91a0227aeeaf24ff9d12278 Mon Sep 17 00:00:00 2001
-From: Ramiro Polla <ramiro.polla@gmail.com>
-Date: Wed, 3 Jul 2024 00:30:08 +0200
-Subject: [PATCH] configure: restore autodetection of v4l2 and fbdev
-
-The detection logic for v4l2 and fbdev was accidentally modified to
-depend on v4l2-m2m in 43b3412.
----
- configure | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/configure b/configure
-index b28221f258965..fa2e384350958 100755
---- a/configure
-+++ b/configure
-@@ -7145,11 +7145,12 @@ pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man
- rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout || disable rsync_contimeout
- xmllint --version > /dev/null 2>&1 && enable xmllint || disable xmllint
-
-+check_headers linux/fb.h
-+check_headers linux/videodev2.h
-+test_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_sanitized struct_v4l2_frmivalenum_discrete
-+
- # check V4L2 codecs available in the API
- if enabled v4l2_m2m; then
-- check_headers linux/fb.h
-- check_headers linux/videodev2.h
-- test_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_sanitized struct_v4l2_frmivalenum_discrete
- check_cc v4l2_m2m linux/videodev2.h "int i = V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_VIDEO_M2M | V4L2_BUF_FLAG_LAST;"
- check_cc vc1_v4l2_m2m linux/videodev2.h "int i = V4L2_PIX_FMT_VC1_ANNEX_G;"
- check_cc mpeg1_v4l2_m2m linux/videodev2.h "int i = V4L2_PIX_FMT_MPEG1;"
diff --git a/srcpkgs/ffmpeg/patches/00002-v4l-ioctl-musl.patch b/srcpkgs/ffmpeg/patches/00002-v4l-ioctl-musl.patch
deleted file mode 100644
index 681fb5d4f706ad..00000000000000
--- a/srcpkgs/ffmpeg/patches/00002-v4l-ioctl-musl.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 008b0b4a3b0cbafa568d0dcbf78c798d56929802 Mon Sep 17 00:00:00 2001
-From: Brad Smith <brad-at-comstyle.com@ffmpeg.org>
-Date: Sun, 5 May 2024 23:59:47 -0400
-Subject: [PATCH] lavd/v4l2: Use proper field type for second parameter of
- ioctl() with BSD's
-
-The proper type was used until 73251678c83cbe24d08264da693411b166239bc7.
-
-This covers all of the OS's that currently have V4L2 support, permutations
-of Linux glibc/musl, Android bionic, FreeBSD, NetBSD, OpenBSD, Solaris.
-
-Copied from FreeBSD ports patch.
-
-Signed-off-by: Brad Smith <brad@comstyle.com>
-Signed-off-by: Marton Balint <cus@passwd.hu>
-(cherry picked from commit 9e674b31606c805dd31b4bb754364a72a5877238)
-Signed-off-by: Brad Smith <brad@comstyle.com>
----
- libavdevice/v4l2.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
-index 365bacd7714b6..1dcbe04bb1741 100644
---- a/libavdevice/v4l2.c
-+++ b/libavdevice/v4l2.c
-@@ -95,10 +95,10 @@ struct video_data {
- int (*open_f)(const char *file, int oflag, ...);
- int (*close_f)(int fd);
- int (*dup_f)(int fd);
--#ifdef __GLIBC__
-- int (*ioctl_f)(int fd, unsigned long int request, ...);
--#else
-+#if defined(__sun) || defined(__BIONIC__) || defined(__musl__) /* POSIX-like */
- int (*ioctl_f)(int fd, int request, ...);
-+#else
-+ int (*ioctl_f)(int fd, unsigned long int request, ...);
- #endif
- ssize_t (*read_f)(int fd, void *buffer, size_t n);
- void *(*mmap_f)(void *start, size_t length, int prot, int flags, int fd, int64_t offset);
-From af17f55202e285d4d3d502078e5b6a41bcca90fb Mon Sep 17 00:00:00 2001
-From: Ramiro Polla <ramiro.polla@gmail.com>
-Date: Thu, 29 Aug 2024 15:40:00 +0200
-Subject: [PATCH] configure: improve check for POSIX ioctl
-
-Instead of relying on system #ifdefs which may or may not be correct,
-detect the POSIX ioctl signature at configure time.
-
-(cherry picked from commit 00b64fca55a3a009c9d0e391c85f4fd3291e5d12)
-Signed-off-by: Brad Smith <brad@comstyle.com>
----
- configure | 2 ++
- libavdevice/v4l2.c | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index c89d3ad1ec291..175b70e20735c 100755
---- a/configure
-+++ b/configure
-@@ -2340,6 +2340,7 @@ HAVE_LIST="
- opencl_vaapi_intel_media
- perl
- pod2man
-+ posix_ioctl
- texi2html
- "
-
-@@ -6616,6 +6617,7 @@ rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout || d
- check_headers linux/fb.h
- check_headers linux/videodev2.h
- test_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_sanitized struct_v4l2_frmivalenum_discrete
-+test_code cc sys/ioctl.h "int ioctl(int, int, ...)" && enable posix_ioctl
-
- # check V4L2 codecs available in the API
- if enabled v4l2_m2m; then
-diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
-index 1dcbe04bb1741..f90490eebfc86 100644
---- a/libavdevice/v4l2.c
-+++ b/libavdevice/v4l2.c
-@@ -95,7 +95,7 @@ struct video_data {
- int (*open_f)(const char *file, int oflag, ...);
- int (*close_f)(int fd);
- int (*dup_f)(int fd);
--#if defined(__sun) || defined(__BIONIC__) || defined(__musl__) /* POSIX-like */
-+#if HAVE_POSIX_IOCTL
- int (*ioctl_f)(int fd, int request, ...);
- #else
- int (*ioctl_f)(int fd, unsigned long int request, ...);
diff --git a/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch b/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
deleted file mode 100644
index 9a55178c74f0fd..00000000000000
--- a/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/libavfilter/vf_drawtext.c 2017-10-26 21:03:03.000000000 +0200
-+++ b/libavfilter/vf_drawtext.c 2017-11-21 11:06:49.602284422 +0100
-@@ -39,6 +39,15 @@
- #endif
- #include <fenv.h>
-
-+#if (FE_ALL_EXCEPT == 0)
-+/* E.g. ARM soft float does not define these */
-+#define FE_INVALID 0
-+#define FE_DIVBYZERO 0
-+#define FE_OVERFLOW 0
-+#define FE_UNDERFLOW 0
-+#define FE_INEXACT 0
-+#endif
-+
- #if CONFIG_LIBFONTCONFIG
- #include <fontconfig/fontconfig.h>
- #endif
diff --git a/srcpkgs/ffmpeg/patches/binutils-2.41.patch b/srcpkgs/ffmpeg/patches/binutils-2.41.patch
deleted file mode 100644
index 53a596d0ee7d4e..00000000000000
--- a/srcpkgs/ffmpeg/patches/binutils-2.41.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
-Date: Sun, 16 Jul 2023 18:18:02 +0300
-Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift
- instructions within inline assembly
-
-Fixes assembling with binutil as >= 2.41
-
-Signed-off-by: James Almer <jamrial@gmail.com>
----
- libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++---
- 1 file changed, 23 insertions(+), 3 deletions(-)
-
-diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
-index 6298f5ed1983b..ca7e2dffc1076 100644
---- a/libavcodec/x86/mathops.h
-+++ b/libavcodec/x86/mathops.h
-@@ -35,12 +35,20 @@
- static av_always_inline av_const int MULL(int a, int b, unsigned shift)
- {
- int rt, dummy;
-+ if (__builtin_constant_p(shift))
- __asm__ (
- "imull %3 \n\t"
- "shrdl %4, %%edx, %%eax \n\t"
- :"=a"(rt), "=d"(dummy)
-- :"a"(a), "rm"(b), "ci"((uint8_t)shift)
-+ :"a"(a), "rm"(b), "i"(shift & 0x1F)
- );
-+ else
-+ __asm__ (
-+ "imull %3 \n\t"
-+ "shrdl %4, %%edx, %%eax \n\t"
-+ :"=a"(rt), "=d"(dummy)
-+ :"a"(a), "rm"(b), "c"((uint8_t)shift)
-+ );
- return rt;
- }
-
-@@ -113,19 +121,31 @@ __asm__ volatile(\
- // avoid +32 for shift optimization (gcc should do that ...)
- #define NEG_SSR32 NEG_SSR32
- static inline int32_t NEG_SSR32( int32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("sarl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("sarl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
- #define NEG_USR32 NEG_USR32
- static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("shrl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("shrl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
diff --git a/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff b/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
deleted file mode 100644
index aa948f7a8a2dfb..00000000000000
--- a/srcpkgs/ffmpeg/patches/patch-libavcodec-libsvtav1-ten_bit_format.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-#==================================================================================================
-# From 031f1561cd286596cdb374da32f8aa816ce3b135 Mon Sep 17 00:00:00 2001
-# From: Christopher Degawa <christopher.degawa@intel.com>
-# Date: Thu, 20 Oct 2022 22:55:27 -0500
-# Subject: [PATCH] avcodec/libsvtav1: remove compressed_ten_bit_format and simplify alloc_buffer
-#
-# compressed_ten_bit_format has been deprecated upstream and has no effect
-# and can be removed. Plus, technically it was never used in the first place
-# since it would require the app (ffmpeg) to set it and do additional
-# processing of the input frames.
-#
-# Also simplify alloc_buffer by removing calculations relating to the non-existant processing.
-#
-# Signed-off-by: Christopher Degawa <christopher.degawa@intel.com>
-#==================================================================================================
---- a/libavcodec/libsvtav1.c
-+++ b/libavcodec/libsvtav1.c
-@@ -124,16 +124,12 @@ static int svt_print_error(void *log_ctx, EbErrorType err,
-
- static int alloc_buffer(EbSvtAv1EncConfiguration *config, SvtContext *svt_enc)
- {
-- const int pack_mode_10bit =
-- (config->encoder_bit_depth > 8) && (config->compressed_ten_bit_format == 0) ? 1 : 0;
-- const size_t luma_size_8bit =
-- config->source_width * config->source_height * (1 << pack_mode_10bit);
-- const size_t luma_size_10bit =
-- (config->encoder_bit_depth > 8 && pack_mode_10bit == 0) ? luma_size_8bit : 0;
-+ const size_t luma_size = config->source_width * config->source_height *
-+ (config->encoder_bit_depth > 8 ? 2 : 1);
-
- EbSvtIOFormat *in_data;
-
-- svt_enc->raw_size = (luma_size_8bit + luma_size_10bit) * 3 / 2;
-+ svt_enc->raw_size = luma_size * 3 / 2;
-
- // allocate buffer for in and out
- svt_enc->in_buf = av_mallocz(sizeof(*svt_enc->in_buf));
---
-GitLab
-
diff --git a/srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch b/srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch
deleted file mode 100644
index 00e3f68a415b84..00000000000000
--- a/srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 811d290844206fc73dc39c3e5b67d5d895baedf8 Mon Sep 17 00:00:00 2001
-From: Rainer Hochecker <fernetmenta@online.de>
-Date: Sat, 26 Jan 2019 19:48:35 +0100
-Subject: [PATCH] avcodec/vaapi_h264: skip decode if pic has no slices
-
-This fixes / workarounds https://bugs.freedesktop.org/show_bug.cgi?id=105368.
-It was hit frequently when watching h264 channels received via DVB-X.
-Corresponding kodi bug: https://github.com/xbmc/xbmc/issues/15704
----
- libavcodec/vaapi_h264.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c
-index 5854587a255..f12fdc457a4 100644
---- a/libavcodec/vaapi_h264.c
-+++ b/libavcodec/vaapi_h264.c
-@@ -317,6 +317,11 @@ static int vaapi_h264_end_frame(AVCodecContext *avctx)
- H264SliceContext *sl = &h->slice_ctx[0];
- int ret;
-
-+ if (pic->nb_slices == 0) {
-+ ret = AVERROR_INVALIDDATA;
-+ goto finish;
-+ }
-+
- ret = ff_vaapi_decode_issue(avctx, pic);
- if (ret < 0)
- goto finish;
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 08297151181c07..b560d9df0ce126 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,8 +1,8 @@
# Template file for 'ffmpeg'
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg
-version=4.4.4
-revision=11
+version=4.4.5
+revision=1
build_style=meta
short_desc="Decoding, encoding and streaming software (transitional dummy package)"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
homepage="https://www.ffmpeg.org"
changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
distfiles="https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"
-checksum=e80b380d595c809060f66f96a5d849511ef4a76a26b76eacf5778b94c3570309
+checksum=f9514e0d3515aee5a271283df71636e1d1ff7274b15853bcd84e144be416ab07
hostmakedepends="pkg-config perl"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
From fb1ea35491bc88349407d337dbf70db73df5dec1 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 30 Mar 2025 20:13:04 -0300
Subject: [PATCH 03/10] ffmpeg6: rebuild for x265-4.0.
---
common/shlibs | 2 +-
srcpkgs/ffmpeg6/template | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 0bd2d1fb7e4696..0c0c44daf37775 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1950,7 +1950,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
libQt5WebKit.so.5 qt5-webkit-5.6.0_1
libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.209 x265-3.6_1
+libx265.so.212 x265-4.0_1
libQt5Xdg.so.3 libqt5xdg-3.2.0_1
libQt5XdgIconLoader.so.3 libqt5xdg-3.2.0_1
libQt6Xdg.so.4 libqtxdg-4.0.0_1
diff --git a/srcpkgs/ffmpeg6/template b/srcpkgs/ffmpeg6/template
index 0921a445ccd4a4..e2c459be2e4f9c 100644
--- a/srcpkgs/ffmpeg6/template
+++ b/srcpkgs/ffmpeg6/template
@@ -2,7 +2,7 @@
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg6
version=6.1.2
-revision=5
+revision=6
hostmakedepends="pkg-config perl"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
libXext-devel libXvMC-devel libxcb-devel lame-devel libtheora-devel
From 997f66f6597e8f763e03a1e90bdc15b2b46b8365 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 30 Mar 2025 20:16:45 -0300
Subject: [PATCH 04/10] libheif: rebuild for x265-4.0.
---
srcpkgs/libheif/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 3e5d16adbf365a..34bffb8c590811 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,8 +1,9 @@
# Template file for 'libheif'
pkgname=libheif
version=1.19.7
-revision=1
+revision=2
build_style=cmake
+configure_args="-DBUILD_TESTING=OFF"
makedepends="libjpeg-turbo-devel libpng-devel libde265-devel x265-devel
libaom-devel"
short_desc="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
From d322f928be61f99496e72d279216a26342749da3 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 30 Mar 2025 20:20:08 -0300
Subject: [PATCH 05/10] vlc: rebuild for x265-4.0.
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 4e25c752fb2b3dccf6d7465ebdb00fd7ce40e755 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 30 Mar 2025 20:21:43 -0300
Subject: [PATCH 06/10] baresip: rebuild for x265-4.0.
---
srcpkgs/baresip/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index 9ba4c08bc868fd..3419968c532e59 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
# Template file for 'baresip'
pkgname=baresip
version=3.20.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config glib-devel"
makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
From f97d2e146288295232d1dab2e47e0c14e86759f0 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 31 Mar 2025 01:08:51 -0300
Subject: [PATCH 07/10] gimp: rebuild for x265-4.0.
---
srcpkgs/gimp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index d40c6e0fff19aa..62c59c021585f2 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
# Template file for 'gimp'
pkgname=gimp
version=3.0.2
-revision=1
+revision=2
build_style=meson
build_helper="gir qemu"
configure_args="-Dcheck-update=no -Drevision=$revision -Denable-default-bin=enabled
From 64a835a80953f5c5939cb82950b3bb4582a87c04 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 31 Mar 2025 01:10:28 -0300
Subject: [PATCH 08/10] handbrake: rebuild for x265-4.0.
---
srcpkgs/handbrake/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index d32651a0abd02d..22fb9b6f4eb7d7 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.8.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--force --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"
From 9208261020c46c77d5120690c0072d373ba07466 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 31 Mar 2025 01:11:17 -0300
Subject: [PATCH 09/10] avidemux: rebuild for x265-4.0.
---
srcpkgs/avidemux/patches/ADM_x265.patch | 44 +++++++++++++++++++++++++
srcpkgs/avidemux/template | 2 +-
2 files changed, 45 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/avidemux/patches/ADM_x265.patch
diff --git a/srcpkgs/avidemux/patches/ADM_x265.patch b/srcpkgs/avidemux/patches/ADM_x265.patch
new file mode 100644
index 00000000000000..6db76d7ffc332e
--- /dev/null
+++ b/srcpkgs/avidemux/patches/ADM_x265.patch
@@ -0,0 +1,44 @@
+--- a/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp 2022-09-17 10:59:17.000000000 -0300
++++ b/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp 2025-01-26 19:27:19.796218401 -0300
+@@ -205,15 +205,20 @@
+ //
+ x265_nal *nal;
+ uint32_t nbNal = 0;
+- x265_picture pic_out;
+- api->picture_init(¶m,&pic_out);
++ x265_picture pic_out[MAX_SCALABLE_LAYERS];
++ x265_picture *pic_out_ptr[MAX_SCALABLE_LAYERS];
+ out->flags = 0;
+
++ for (int i = 0; i < MAX_SCALABLE_LAYERS; i++)
++ {
++ api->picture_init(¶m,&pic_out[i]);
++ pic_out_ptr[i] = &pic_out[i];
++ }
+ int er;
+ if(false==gotFrame)
+ {
+ ADM_info("Flushing delayed frames\n");
+- er = api->encoder_encode(handle, &nal, &nbNal, NULL, &pic_out);
++ er = api->encoder_encode(handle, &nal, &nbNal, NULL, pic_out_ptr);
+ if(er<=0)
+ {
+ ADM_info ("End of flush\n");
+@@ -221,7 +226,7 @@
+ }
+ }else
+ {
+- er = api->encoder_encode(handle, &nal, &nbNal, &pic, &pic_out);
++ er = api->encoder_encode(handle, &nal, &nbNal, &pic, pic_out_ptr);
+ if(er<0)
+ {
+ ADM_error ("[x265] Error encoding %d\n",er);
+@@ -236,7 +241,7 @@
+
+
+ // 3-encode
+- if(false==postAmble(out,nbNal,nal,&pic_out))
++ if(false==postAmble(out,nbNal,nal,pic_out_ptr[0]))
+ {
+ ADM_warning("[x265] postAmble failed\n");
+ return false;
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index d66f8524bd0e28..b972ecac92ed31 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
# Template file for 'avidemux'
pkgname=avidemux
version=2.8.1
-revision=2
+revision=3
# Can't be compiled for aarch64, arm* or mips*
archs="x86_64* i686*"
hostmakedepends="cmake pkg-config qt5-host-tools qt5-devel tar yasm"
From 46f8485fc0095b8b851630a55c2e5553f2d222ee Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 31 Mar 2025 06:11:26 -0300
Subject: [PATCH 10/10] digikam: rebuild for x265-4.0.
---
srcpkgs/digikam/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/digikam/template b/srcpkgs/digikam/template
index 68208cb1f36a93..b33fe6e7626643 100644
--- a/srcpkgs/digikam/template
+++ b/srcpkgs/digikam/template
@@ -1,7 +1,7 @@
# Template file for 'digikam'
pkgname=digikam
version=8.5.0
-revision=3
+revision=4
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DBUILD_WITH_QT6=ON
^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2025-03-31 9:12 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-01-20 21:47 [PR PATCH] X265, ffmpeg, handbrake, libheif: update 1is7ac3
2025-01-20 22:07 ` [PR PATCH] [Updated] " 1is7ac3
2025-01-21 10:49 ` [PR PATCH] [Updated] X265, ffmpeg and " 1is7ac3
2025-01-22 3:20 ` 1is7ac3
2025-01-24 4:39 ` 1is7ac3
2025-01-26 23:20 ` 1is7ac3
2025-02-03 19:34 ` 1is7ac3
2025-02-03 19:57 ` 1is7ac3
2025-02-03 20:20 ` 1is7ac3
2025-02-03 20:41 ` 1is7ac3
2025-02-06 4:16 ` 1is7ac3
2025-03-24 0:07 ` 1is7ac3
2025-03-24 0:41 ` 1is7ac3
2025-03-26 4:24 ` 1is7ac3
2025-03-28 2:18 ` 1is7ac3
2025-03-30 22:50 ` 1is7ac3
2025-03-30 23:24 ` 1is7ac3
2025-03-31 4:11 ` 1is7ac3
2025-03-31 7:41 ` oreo639
2025-03-31 9:12 ` [PR PATCH] [Updated] " 1is7ac3
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).