commit: 49d8dbf493d39289f695cef7f8656bcc0bd39193
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 27 07:18:47 2025 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Oct 19 13:21:41 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49d8dbf4
media-video/ffmpeg-compat: sync with ffmpeg
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
media-video/ffmpeg-compat/ffmpeg-compat-6.1.3.ebuild | 14 +++-----------
media-video/ffmpeg-compat/ffmpeg-compat-7.1.1.ebuild | 14 +++-----------
media-video/ffmpeg-compat/ffmpeg-compat-7.1.2.ebuild | 14 +++-----------
media-video/ffmpeg-compat/metadata.xml | 5 -----
4 files changed, 9 insertions(+), 38 deletions(-)
diff --git a/media-video/ffmpeg-compat/ffmpeg-compat-6.1.3.ebuild
b/media-video/ffmpeg-compat/ffmpeg-compat-6.1.3.ebuild
index 1340bff431e3..139b75fdb4c0 100644
--- a/media-video/ffmpeg-compat/ffmpeg-compat-6.1.3.ebuild
+++ b/media-video/ffmpeg-compat/ffmpeg-compat-6.1.3.ebuild
@@ -87,7 +87,6 @@ FFMPEG_IUSE_MAP=(
lv2
lzma
modplug:libmodplug
- npp:^libnpp@nonfree # no multilib
nvenc:cuvid,ffnvcodec,nvdec,nvenc
openal
opencl
@@ -140,7 +139,7 @@ LICENSE="
GPL-2+
amr? ( GPL-3+ ) amrenc? ( GPL-3+ ) libaribb24? ( GPL-3+ )
gmp? ( GPL-3+ ) openssl? ( GPL-3+ )
- fdk? ( all-rights-reserved ) npp? ( all-rights-reserved )
+ fdk? ( all-rights-reserved )
)
!gpl? (
LGPL-2.1+
@@ -161,7 +160,6 @@ REQUIRED_USE="
fribidi? ( truetype )
gmp? ( !librtmp )
libplacebo? ( vulkan )
- npp? ( nvenc )
shaderc? ( vulkan )
libaribb24? ( gpl ) cdio? ( gpl ) frei0r? ( gpl ) postproc? ( gpl )
rubberband? ( gpl ) samba? ( gpl ) vidstab? ( gpl ) x264? ( gpl )
@@ -169,7 +167,7 @@ REQUIRED_USE="
${FFMPEG_UNSLOTTED:+chromium? ( opus )}
${FFMPEG_SOC_PATCH:+soc? ( drm )}
"
-RESTRICT="gpl? ( fdk? ( bindist ) npp? ( bindist ) )"
+RESTRICT="gpl? ( fdk? ( bindist ) )"
# dlopen: amdgpu-pro-amf, vulkan-loader
COMMON_DEPEND="
@@ -233,7 +231,6 @@ COMMON_DEPEND="
)
lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
modplug? ( media-libs/libmodplug[${MULTILIB_USEDEP}] )
- npp? ( dev-util/nvidia-cuda-toolkit:= )
openal? ( media-libs/openal[${MULTILIB_USEDEP}] )
opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
opengl? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] )
@@ -396,12 +393,6 @@ src_prepare() {
}
multilib_src_configure() {
- if use npp && multilib_is_native_abi; then
- local -x CPPFLAGS=${CPPFLAGS} LDFLAGS=${LDFLAGS}
- append-cppflags $($(tc-getPKG_CONFIG) --cflags nppc || die)
- append-ldflags $($(tc-getPKG_CONFIG) --libs-only-L nppc || die)
- fi
-
local conf=( "${S}"/configure ) # not autotools-based
local prefix=${EPREFIX}/usr
@@ -468,6 +459,7 @@ multilib_src_configure() {
--disable-libglslang # prefer USE=shaderc (bug
#918989,#920283,#922333)
--disable-liblensfun # https://trac.ffmpeg.org/ticket/9112
(abandoned?)
--disable-libmfx # prefer libvpl for USE=qsv
+ --disable-libnpp # deprecated and not supported for cuda 13.0+
--disable-libopencv # leaving for later due to circular
opencv[ffmpeg]
--disable-librist # librist itself needs attention first (bug
#822012)
--disable-libtensorflow # causes headaches, and is gone
diff --git a/media-video/ffmpeg-compat/ffmpeg-compat-7.1.1.ebuild
b/media-video/ffmpeg-compat/ffmpeg-compat-7.1.1.ebuild
index 3b92cea2ed5f..a6d092ab79ca 100644
--- a/media-video/ffmpeg-compat/ffmpeg-compat-7.1.1.ebuild
+++ b/media-video/ffmpeg-compat/ffmpeg-compat-7.1.1.ebuild
@@ -89,7 +89,6 @@ FFMPEG_IUSE_MAP=(
lv2
lzma
modplug:libmodplug
- npp:^libnpp@nonfree # no multilib
nvenc:cuvid,ffnvcodec,nvdec,nvenc
openal
opencl
@@ -144,7 +143,7 @@ LICENSE="
GPL-2+
amr? ( GPL-3+ ) amrenc? ( GPL-3+ ) libaribb24? ( GPL-3+ )
gmp? ( GPL-3+ ) openssl? ( GPL-3+ )
- fdk? ( all-rights-reserved ) npp? ( all-rights-reserved )
+ fdk? ( all-rights-reserved )
)
!gpl? (
LGPL-2.1+
@@ -165,7 +164,6 @@ REQUIRED_USE="
fribidi? ( truetype )
gmp? ( !librtmp )
libplacebo? ( vulkan )
- npp? ( nvenc )
shaderc? ( vulkan )
libaribb24? ( gpl ) cdio? ( gpl ) dvd? ( gpl ) frei0r? ( gpl )
postproc? ( gpl ) rubberband? ( gpl ) samba? ( gpl )
@@ -173,7 +171,7 @@ REQUIRED_USE="
${FFMPEG_UNSLOTTED:+chromium? ( opus )}
${FFMPEG_SOC_PATCH:+soc? ( drm )}
"
-RESTRICT="gpl? ( fdk? ( bindist ) npp? ( bindist ) )"
+RESTRICT="gpl? ( fdk? ( bindist ) )"
# dlopen: amdgpu-pro-amf, vulkan-loader
COMMON_DEPEND="
@@ -242,7 +240,6 @@ COMMON_DEPEND="
)
lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
modplug? ( media-libs/libmodplug[${MULTILIB_USEDEP}] )
- npp? ( dev-util/nvidia-cuda-toolkit:= )
openal? ( media-libs/openal[${MULTILIB_USEDEP}] )
opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
opengl? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] )
@@ -405,12 +402,6 @@ src_prepare() {
}
multilib_src_configure() {
- if use npp && multilib_is_native_abi; then
- local -x CPPFLAGS=${CPPFLAGS} LDFLAGS=${LDFLAGS}
- append-cppflags $($(tc-getPKG_CONFIG) --cflags nppc || die)
- append-ldflags $($(tc-getPKG_CONFIG) --libs-only-L nppc || die)
- fi
-
local conf=( "${S}"/configure ) # not autotools-based
local prefix=${EPREFIX}/usr
@@ -481,6 +472,7 @@ multilib_src_configure() {
--disable-libglslang # prefer USE=shaderc (bug
#918989,#920283,#922333)
--disable-liblensfun # https://trac.ffmpeg.org/ticket/9112
(abandoned?)
--disable-libmfx # prefer libvpl for USE=qsv
+ --disable-libnpp # deprecated and not supported for cuda 13.0+
--disable-libopencv # leaving for later due to circular
opencv[ffmpeg]
--disable-librist # librist itself needs attention first (bug
#822012)
--disable-libtensorflow # causes headaches, and is gone
diff --git a/media-video/ffmpeg-compat/ffmpeg-compat-7.1.2.ebuild
b/media-video/ffmpeg-compat/ffmpeg-compat-7.1.2.ebuild
index 916add1209e8..617bad0627a5 100644
--- a/media-video/ffmpeg-compat/ffmpeg-compat-7.1.2.ebuild
+++ b/media-video/ffmpeg-compat/ffmpeg-compat-7.1.2.ebuild
@@ -89,7 +89,6 @@ FFMPEG_IUSE_MAP=(
lv2
lzma
modplug:libmodplug
- npp:^libnpp@nonfree # no multilib
nvenc:cuvid,ffnvcodec,nvdec,nvenc
openal
opencl
@@ -144,7 +143,7 @@ LICENSE="
GPL-2+
amr? ( GPL-3+ ) amrenc? ( GPL-3+ ) libaribb24? ( GPL-3+ )
gmp? ( GPL-3+ ) openssl? ( GPL-3+ )
- fdk? ( all-rights-reserved ) npp? ( all-rights-reserved )
+ fdk? ( all-rights-reserved )
)
!gpl? (
LGPL-2.1+
@@ -165,7 +164,6 @@ REQUIRED_USE="
fribidi? ( truetype )
gmp? ( !librtmp )
libplacebo? ( vulkan )
- npp? ( nvenc )
shaderc? ( vulkan )
libaribb24? ( gpl ) cdio? ( gpl ) dvd? ( gpl ) frei0r? ( gpl )
postproc? ( gpl ) rubberband? ( gpl ) samba? ( gpl )
@@ -173,7 +171,7 @@ REQUIRED_USE="
${FFMPEG_UNSLOTTED:+chromium? ( opus )}
${FFMPEG_SOC_PATCH:+soc? ( drm )}
"
-RESTRICT="gpl? ( fdk? ( bindist ) npp? ( bindist ) )"
+RESTRICT="gpl? ( fdk? ( bindist ) )"
# dlopen: amdgpu-pro-amf, vulkan-loader
COMMON_DEPEND="
@@ -242,7 +240,6 @@ COMMON_DEPEND="
)
lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
modplug? ( media-libs/libmodplug[${MULTILIB_USEDEP}] )
- npp? ( dev-util/nvidia-cuda-toolkit:= )
openal? ( media-libs/openal[${MULTILIB_USEDEP}] )
opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
opengl? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] )
@@ -405,12 +402,6 @@ src_prepare() {
}
multilib_src_configure() {
- if use npp && multilib_is_native_abi; then
- local -x CPPFLAGS=${CPPFLAGS} LDFLAGS=${LDFLAGS}
- append-cppflags $($(tc-getPKG_CONFIG) --cflags nppc || die)
- append-ldflags $($(tc-getPKG_CONFIG) --libs-only-L nppc || die)
- fi
-
local conf=( "${S}"/configure ) # not autotools-based
local prefix=${EPREFIX}/usr
@@ -481,6 +472,7 @@ multilib_src_configure() {
--disable-libglslang # prefer USE=shaderc (bug
#918989,#920283,#922333)
--disable-liblensfun # https://trac.ffmpeg.org/ticket/9112
(abandoned?)
--disable-libmfx # prefer libvpl for USE=qsv
+ --disable-libnpp # deprecated and not supported for cuda 13.0+
--disable-libopencv # leaving for later due to circular
opencv[ffmpeg]
--disable-librist # librist itself needs attention first (bug
#822012)
--disable-libtensorflow # causes headaches, and is gone
diff --git a/media-video/ffmpeg-compat/metadata.xml
b/media-video/ffmpeg-compat/metadata.xml
index 09ae2fd5ed7d..b8417e7c374b 100644
--- a/media-video/ffmpeg-compat/metadata.xml
+++ b/media-video/ffmpeg-compat/metadata.xml
@@ -63,11 +63,6 @@
<flag name="libsoxr">Enable use of the audio resampler from
<pkg>media-libs/soxr</pkg></flag>
<flag name="libtesseract">Enable Optical Character Recognition
(OCR) filter support via <pkg>app-text/tesseract</pkg></flag>
<flag name="lv2">Enable use of filters through
<pkg>media-libs/lv2</pkg></flag>
- <flag name="npp">
- Enable Nvidia Performance Primitives-based filters via
- <pkg>dev-util/nvidia-cuda-toolkit</pkg> (warning: if
USE=gpl
- is enabled, this produces non-redistributable build)
- </flag>
<flag name="openh264">Enable H.264 encoding support via
<pkg>media-libs/openh264</pkg></flag>
<flag name="openmpt">Enable MPTM tracked music files decoding
support via <pkg>media-libs/libopenmpt</pkg></flag>
<flag name="openssl">
