commit: 5febd248e5aaa08ddbff934f09f20b0c9414e47d Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Sat Sep 27 06:52:50 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=5febd248
media-video/ffmpeg: remove IUSE=npp ffmpeg has deprecated[1] libnpp support, seems does not intend to fix it for cuda 13.0, and has added a ./configure check to abort if it finds >=13.0 (in live). Rather than update our npp cuda 13 patch to bypass that check or add upper bounds, let's just drop support. Debated making that change only in the live ebuild unless it gets backported (might), but given cuda 13 breaks npp for older nvidia cards at /runtime/ that may lead users to report bugs to ffmpeg (not us) when it's not even supposed to be buildable with it, feel we're better off killing it. USE=libplacebo and/or USE=cuda should be sufficient alternatives. Users that really want to keep using npp while it still works can use EXTRA_ECONF=--enable-libnpp but no support will be given. Will revisit if upstream ffmpeg un-deprecates it and handles issues. [1] https://code.ffmpeg.org/FFmpeg/FFmpeg/commit/994a3684 Closes: https://bugs.gentoo.org/695210 (obsolete) Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> media-video/ffmpeg/ffmpeg-6.1.3.ebuild | 14 +-- media-video/ffmpeg/ffmpeg-7.1.1-r2.ebuild | 14 +-- media-video/ffmpeg/ffmpeg-7.1.2.ebuild | 14 +-- media-video/ffmpeg/ffmpeg-8.0.ebuild | 15 +-- media-video/ffmpeg/ffmpeg-9999.ebuild | 15 +-- media-video/ffmpeg/files/ffmpeg-7.1.1-npp13.patch | 122 ---------------------- media-video/ffmpeg/metadata.xml | 5 - 7 files changed, 15 insertions(+), 184 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-6.1.3.ebuild b/media-video/ffmpeg/ffmpeg-6.1.3.ebuild index 1340bff431e3..139b75fdb4c0 100644 --- a/media-video/ffmpeg/ffmpeg-6.1.3.ebuild +++ b/media-video/ffmpeg/ffmpeg-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/ffmpeg-7.1.1-r2.ebuild b/media-video/ffmpeg/ffmpeg-7.1.1-r2.ebuild index 3b92cea2ed5f..a6d092ab79ca 100644 --- a/media-video/ffmpeg/ffmpeg-7.1.1-r2.ebuild +++ b/media-video/ffmpeg/ffmpeg-7.1.1-r2.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/ffmpeg-7.1.2.ebuild b/media-video/ffmpeg/ffmpeg-7.1.2.ebuild index 916add1209e8..617bad0627a5 100644 --- a/media-video/ffmpeg/ffmpeg-7.1.2.ebuild +++ b/media-video/ffmpeg/ffmpeg-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/ffmpeg-8.0.ebuild b/media-video/ffmpeg/ffmpeg-8.0.ebuild index a5c0b49bdebd..6ff2b32ac0c2 100644 --- a/media-video/ffmpeg/ffmpeg-8.0.ebuild +++ b/media-video/ffmpeg/ffmpeg-8.0.ebuild @@ -89,7 +89,6 @@ FFMPEG_IUSE_MAP=( lv2 lzma modplug:libmodplug - npp:^libnpp@nonfree # no multilib nvenc:cuvid,ffnvcodec,nvdec,nvenc openal opencl @@ -143,7 +142,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+ @@ -164,7 +163,6 @@ REQUIRED_USE=" fribidi? ( truetype ) gmp? ( !librtmp ) libplacebo? ( vulkan ) - npp? ( nvenc ) shaderc? ( vulkan ) libaribb24? ( gpl ) cdio? ( gpl ) dvd? ( gpl ) frei0r? ( gpl ) rubberband? ( gpl ) samba? ( gpl ) vidstab? ( gpl ) x264? ( gpl ) @@ -172,7 +170,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 COMMON_DEPEND=" @@ -241,7 +239,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}] ) @@ -339,7 +336,6 @@ MULTILIB_WRAPPED_HEADERS=( PATCHES=( "${FILESDIR}"/ffmpeg-6.1-opencl-parallel-gmake-fix.patch - "${FILESDIR}"/ffmpeg-7.1.1-npp13.patch ) pkg_pretend() { @@ -400,12 +396,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 @@ -479,6 +469,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/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 178d8023f4c2..1dc8e029d530 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -88,7 +88,6 @@ FFMPEG_IUSE_MAP=( lv2 lzma modplug:libmodplug - npp:^libnpp@nonfree # no multilib nvenc:cuvid,ffnvcodec,nvdec,nvenc openal opencl @@ -142,7 +141,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+ @@ -163,7 +162,6 @@ REQUIRED_USE=" fribidi? ( truetype ) gmp? ( !librtmp ) libplacebo? ( vulkan ) - npp? ( nvenc ) shaderc? ( vulkan ) libaribb24? ( gpl ) cdio? ( gpl ) dvd? ( gpl ) frei0r? ( gpl ) rubberband? ( gpl ) samba? ( gpl ) vidstab? ( gpl ) x264? ( gpl ) @@ -171,7 +169,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 COMMON_DEPEND=" @@ -240,7 +238,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}] ) @@ -338,7 +335,6 @@ MULTILIB_WRAPPED_HEADERS=( PATCHES=( "${FILESDIR}"/ffmpeg-6.1-opencl-parallel-gmake-fix.patch - "${FILESDIR}"/ffmpeg-7.1.1-npp13.patch ) pkg_pretend() { @@ -399,12 +395,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 +471,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/files/ffmpeg-7.1.1-npp13.patch b/media-video/ffmpeg/files/ffmpeg-7.1.1-npp13.patch deleted file mode 100644 index e458c725db0f..000000000000 --- a/media-video/ffmpeg/files/ffmpeg-7.1.1-npp13.patch +++ /dev/null @@ -1,122 +0,0 @@ -https://code.ffmpeg.org/FFmpeg/FFmpeg/issues/20191 - -Non-_Ctx functions been deprecated for some time and ->=nvidia-cuda-toolkit-13.0.0 removes the old functions. - -Just a quick fix (written by me), not familiar with npp but should -work. Given we don't support old NPP that lacked _Ctx in Gentoo, -there should be no need to keep the old calls in this quick fix. - -Signed-off-by: Ionen Wolkens <[email protected]> ---- a/libavfilter/vf_scale_npp.c -+++ b/libavfilter/vf_scale_npp.c -@@ -710,11 +710,13 @@ - AVHWFramesContext *in_frames_ctx = (AVHWFramesContext*)in->hw_frames_ctx->data; - NppStatus err; -+ NppStreamContext nppStreamCtx; -+ nppStreamCtx.hStream = NULL; // default stream - - switch (in_frames_ctx->sw_format) { - case AV_PIX_FMT_NV12: -- err = nppiYCbCr420_8u_P2P3R(in->data[0], in->linesize[0], -+ err = nppiYCbCr420_8u_P2P3R_Ctx(in->data[0], in->linesize[0], - in->data[1], in->linesize[1], - out->data, out->linesize, -- (NppiSize){ in->width, in->height }); -+ (NppiSize){ in->width, in->height }, nppStreamCtx); - break; - default: -@@ -734,4 +736,6 @@ - NPPScaleContext *s = ctx->priv; - NppStatus err; -+ NppStreamContext nppStreamCtx; -+ nppStreamCtx.hStream = NULL; // default stream - int i; - -@@ -742,10 +746,10 @@ - int oh = stage->planes_out[i].height; - -- err = nppiResizeSqrPixel_8u_C1R(in->data[i], (NppiSize){ iw, ih }, -+ err = nppiResizeSqrPixel_8u_C1R_Ctx(in->data[i], (NppiSize){ iw, ih }, - in->linesize[i], (NppiRect){ 0, 0, iw, ih }, - out->data[i], out->linesize[i], - (NppiRect){ 0, 0, ow, oh }, - (double)ow / iw, (double)oh / ih, -- 0.0, 0.0, s->interp_algo); -+ 0.0, 0.0, s->interp_algo, nppStreamCtx); - if (err != NPP_SUCCESS) { - av_log(ctx, AV_LOG_ERROR, "NPP resize error: %d\n", err); -@@ -762,12 +766,14 @@ - AVHWFramesContext *out_frames_ctx = (AVHWFramesContext*)out->hw_frames_ctx->data; - NppStatus err; -+ NppStreamContext nppStreamCtx; -+ nppStreamCtx.hStream = NULL; // default stream - - switch (out_frames_ctx->sw_format) { - case AV_PIX_FMT_NV12: -- err = nppiYCbCr420_8u_P3P2R((const uint8_t**)in->data, -+ err = nppiYCbCr420_8u_P3P2R_Ctx((const uint8_t**)in->data, - in->linesize, - out->data[0], out->linesize[0], - out->data[1], out->linesize[1], -- (NppiSize){ in->width, in->height }); -+ (NppiSize){ in->width, in->height }, nppStreamCtx); - break; - default: ---- a/libavfilter/vf_sharpen_npp.c -+++ b/libavfilter/vf_sharpen_npp.c -@@ -159,4 +159,6 @@ - AVHWFramesContext* in_ctx = (AVHWFramesContext*)inl->hw_frames_ctx->data; - NPPSharpenContext* s = ctx->priv; -+ NppStreamContext nppStreamCtx; -+ nppStreamCtx.hStream = NULL; // default stream - - const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(in_ctx->sw_format); -@@ -166,7 +168,7 @@ - int oh = AV_CEIL_RSHIFT(in->height, (i == 1 || i == 2) ? desc->log2_chroma_h : 0); - -- NppStatus err = nppiFilterSharpenBorder_8u_C1R( -+ NppStatus err = nppiFilterSharpenBorder_8u_C1R_Ctx( - in->data[i], in->linesize[i], (NppiSize){ow, oh}, (NppiPoint){0, 0}, -- out->data[i], out->linesize[i], (NppiSize){ow, oh}, s->border_type); -+ out->data[i], out->linesize[i], (NppiSize){ow, oh}, s->border_type, nppStreamCtx); - if (err != NPP_SUCCESS) { - av_log(ctx, AV_LOG_ERROR, "NPP sharpen error: %d\n", err); ---- a/libavfilter/vf_transpose_npp.c -+++ b/libavfilter/vf_transpose_npp.c -@@ -295,4 +295,6 @@ - NPPTransposeContext *s = ctx->priv; - NppStatus err; -+ NppStreamContext nppStreamCtx; -+ nppStreamCtx.hStream = NULL; // default stream - int i; - -@@ -310,9 +312,9 @@ - int shifth = (s->dir == NPP_TRANSPOSE_CCLOCK || s->dir == NPP_TRANSPOSE_CLOCK_FLIP) ? oh - 1 : 0; - -- err = nppiRotate_8u_C1R(in->data[i], (NppiSize){ iw, ih }, -+ err = nppiRotate_8u_C1R_Ctx(in->data[i], (NppiSize){ iw, ih }, - in->linesize[i], (NppiRect){ 0, 0, iw, ih }, - out->data[i], out->linesize[i], - (NppiRect){ 0, 0, ow, oh }, -- angle, shiftw, shifth, NPPI_INTER_NN); -+ angle, shiftw, shifth, NPPI_INTER_NN, nppStreamCtx); - if (err != NPP_SUCCESS) { - av_log(ctx, AV_LOG_ERROR, "NPP rotate error: %d\n", err); -@@ -328,4 +330,6 @@ - { - NppStatus err; -+ NppStreamContext nppStreamCtx; -+ nppStreamCtx.hStream = NULL; // default stream - int i; - -@@ -334,7 +338,7 @@ - int ih = stage->planes_in[i].height; - -- err = nppiTranspose_8u_C1R(in->data[i], in->linesize[i], -+ err = nppiTranspose_8u_C1R_Ctx(in->data[i], in->linesize[i], - out->data[i], out->linesize[i], -- (NppiSize){ iw, ih }); -+ (NppiSize){ iw, ih }, nppStreamCtx); - if (err != NPP_SUCCESS) { - av_log(ctx, AV_LOG_ERROR, "NPP transpose error: %d\n", err); diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml index 16ef48fc6446..5cd3a02a36fc 100644 --- a/media-video/ffmpeg/metadata.xml +++ b/media-video/ffmpeg/metadata.xml @@ -64,11 +64,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">
