From 8029e3b1117c9613e2f704cfb09d0796f34fd361 Mon Sep 17 00:00:00 2001
From: "Alex Xu (Hello71)" <alex_y_xu@yahoo.ca>
Date: Wed, 17 Nov 2021 18:57:03 -0500
Subject: media-video/ffmpeg: libjxl

---
 media-video/ffmpeg/Manifest               | 1 +
 media-video/ffmpeg/ffmpeg-4.4.1-r2.ebuild | 5 ++++-
 media-video/ffmpeg/metadata.xml           | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'media-video/ffmpeg')

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 63eef1f..af7927e 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1 +1,2 @@
 DIST ffmpeg-4.4.1.tar.bz2 11494996 BLAKE2B 050b0501cb21f44451d59bf3b20b18d55234636b5a69a4962103d63f80ce9af172cc2cecb1e33b92334fcf635b283afddbdfa20cbd6deb526008cdb34ae01c16 SHA512 c41e63ffa9f5465ea3a7f4a8b255b299a2f49d5868ada4310a2344b8fea02476365c44871defd5609da55c805cbb58f34063dbdd4b203ade932cba8b3cfefc72
+DIST ffmpeg-libjxl.patch.xz 8852 BLAKE2B ce64d3ad307a89889ce1115a450f8e6b33113781317d767c1bf229ffb1b4f675b98599613326f17afa8c32f938aa31592e9e29014b9f62f4ca96da123923a33e SHA512 dffe3cf72479a34ad4587d2da4d2f539ec8d2d45d1a1d48046a70a55a5de5e4f736dca3f2591f48602343603f5b8d4ddfcb6dc61513920bc8ccc1e30adc6cdac
diff --git a/media-video/ffmpeg/ffmpeg-4.4.1-r2.ebuild b/media-video/ffmpeg/ffmpeg-4.4.1-r2.ebuild
index 00ac60f..1783a20 100644
--- a/media-video/ffmpeg/ffmpeg-4.4.1-r2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.4.1-r2.ebuild
@@ -32,6 +32,7 @@ elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
 else # Release
 	SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.bz2"
 fi
+SRC_URI+=" https://www.alxu.ca/ffmpeg-libjxl.patch.xz"
 FFMPEG_REVISION="${PV#*_p}"
 
 SLOT="0/${FFMPEG_SUBSLOT}"
@@ -78,7 +79,7 @@ FFMPEG_FLAG_MAP=(
 		libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack
 		# decoders
 		amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 +dav1d:libdav1d fdk:libfdk-aac
-		jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
+		jpeg2k:libopenjpeg jpegxl:libjxl bluray:libbluray gme:libgme gsm:libgsm
 		libaribb24 mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
 		speex:libspeex srt:libsrt svg:librsvg video_cards_nvidia:ffnvcodec
 		vorbis:libvorbis vpx:libvpx zvbi:libzvbi
@@ -219,6 +220,7 @@ RDEPEND="
 	)
 	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
 	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
+	jpegxl? ( media-libs/libjxl[${MULTILIB_USEDEP}] )
 	libaom? ( >=media-libs/libaom-1.0.0-r1:=[${MULTILIB_USEDEP}] )
 	libaribb24? ( >=media-libs/aribb24-1.0.3-r2[${MULTILIB_USEDEP}] )
 	libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
@@ -323,6 +325,7 @@ S=${WORKDIR}/${P/_/-}
 
 PATCHES=(
 	"${FILESDIR}"/chromium-r1.patch
+	"${WORKDIR}"/ffmpeg-libjxl.patch
 )
 
 MULTILIB_WRAPPED_HEADERS=(
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index 57aecd4..6239f9d 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -23,6 +23,7 @@
 	<flag name="gpl">Build GPL code. Should be enabled unless you require LGPL binaries.</flag>
 	<flag name="hardcoded-tables">Use pre-calculated tables rather than calculating them on the fly.</flag>
 	<flag name="iec61883"> Support for FireWire DV/HDV input device using <pkg>media-libs/libiec61883</pkg>.</flag>
+	<flag name="jpegxl">Enables JPEG XL decoding via <pkg>media-libs/libjxl</pkg>.</flag>
 	<flag name="kvazaar">Enables <pkg>media-libs/kvazaar</pkg> based HEVC encoder.</flag>
 	<flag name="libaom">Enables <pkg>media-libs/libaom</pkg> based AV1 codec support.</flag>
 	<flag name="libaribb24">Enables ARIB text and caption decoding via <pkg>media-libs/aribb24</pkg>.</flag>
-- 
cgit v1.2.3-70-g09d2