diff options
| -rw-r--r-- | MOVED | 1 | ||||
| -rw-r--r-- | multimedia/Makefile | 1 | ||||
| -rw-r--r-- | multimedia/ffmpeg6/Makefile | 273 | ||||
| -rw-r--r-- | multimedia/ffmpeg6/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/ffmpeg6/files/patch-configure | 35 | ||||
| -rw-r--r-- | multimedia/ffmpeg6/files/patch-doc-Makefile | 11 | ||||
| -rw-r--r-- | multimedia/ffmpeg6/files/patch-libavcodec_libsvtav1.c | 26 | ||||
| -rw-r--r-- | multimedia/ffmpeg6/files/patch-libavfilter_vf__lensfun.c | 51 | ||||
| -rw-r--r-- | multimedia/ffmpeg6/files/patch-libavformat_rtsp.c | 44 | ||||
| -rw-r--r-- | multimedia/ffmpeg6/files/patch-libavutil-common.h | 13 | ||||
| -rw-r--r-- | multimedia/ffmpeg6/files/patch-libavutil-x86-asm.h | 11 | ||||
| -rw-r--r-- | multimedia/ffmpeg6/files/patch-libavutil_hwcontext__drm.c | 24 | ||||
| -rw-r--r-- | multimedia/ffmpeg6/override.mk | 8 | ||||
| -rw-r--r-- | multimedia/ffmpeg6/pkg-descr | 6 | ||||
| -rw-r--r-- | multimedia/ffmpeg6/pkg-plist | 226 |
15 files changed, 1 insertions, 732 deletions
@@ -5716,3 +5716,4 @@ www/py-qt5-webengine||2026-10-01|Has expired: Depends on deprecated Qt5 WebEngin www/qt5-webengine||2026-10-01|Has expired: Based on outdated Chromium devel/py-importlib-metadata6|devel/py-importlib-metadata7|2026-10-01|Has expired: No consumers left use devel/py-importlib-metadata7 sysutils/py-appjail-gui||2026-10-02|Has expired: Upstream repo archived on Sep 02, 2026 +multimedia/ffmpeg6||2026-10-04|Removed: no consumers left diff --git a/multimedia/Makefile b/multimedia/Makefile index ceb339803a4b..1f61d5e9739f 100644 --- a/multimedia/Makefile +++ b/multimedia/Makefile @@ -57,7 +57,6 @@ SUBDIR += ffmpeg SUBDIR += ffmpeg3 SUBDIR += ffmpeg4 - SUBDIR += ffmpeg6 SUBDIR += ffmpegthumbnailer SUBDIR += ffms2 SUBDIR += ffnvcodec-headers diff --git a/multimedia/ffmpeg6/Makefile b/multimedia/ffmpeg6/Makefile deleted file mode 100644 index 0e70545c7915..000000000000 --- a/multimedia/ffmpeg6/Makefile +++ /dev/null @@ -1,273 +0,0 @@ -PORTNAME= ffmpeg -PORTVERSION= 6.1.6 -PORTREVISION= 2 -CATEGORIES= multimedia audio net -MASTER_SITES= https://ffmpeg.org/releases/ -PKGNAMESUFFIX= 6 - -MAINTAINER= thierry@FreeBSD.org -COMMENT= Realtime audio/video encoder/converter and streaming server (legacy 6.* series) -WWW= https://ffmpeg.org/ - -LICENSE= GPLv3+ LGPL3+ -LICENSE_COMB= multi -LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING.GPLv3 -LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LGPLv3 - -BUILD_DEPENDS= ${BUILD_DEPENDS_${ARCH}} -BUILD_DEPENDS_aarch64= as:devel/binutils -BUILD_DEPENDS_amd64= nasm:devel/nasm -BUILD_DEPENDS_armv6= as:devel/binutils -BUILD_DEPENDS_armv7= as:devel/binutils -BUILD_DEPENDS_i386= nasm:devel/nasm - -HAS_CONFIGURE= yes -CONFIGURE_ARGS= --disable-alsa \ - --disable-libopencore-amrnb \ - --disable-libopencore-amrwb \ - --disable-libaribb24 \ - --disable-libbs2b \ - --disable-libcaca \ - --disable-libcdio \ - --disable-libcodec2 \ - --disable-libdavs2 \ - --disable-libdc1394 \ - --disable-libfdk-aac \ - --disable-libflite \ - --disable-libfribidi \ - --disable-libglslang \ - --disable-libgme \ - --disable-libgsm \ - --disable-libilbc \ - --disable-libjack \ - --disable-libkvazaar \ - --disable-ladspa \ - --disable-libklvanc \ - --disable-liblensfun \ - --disable-libbluray \ - --disable-librsvg \ - --disable-lv2 \ - --disable-libmfx \ - --disable-libmodplug \ - --disable-libmysofa \ - --disable-nvenc \ - --disable-openal \ - --disable-opencl \ - --disable-opengl \ - --disable-libopenh264 \ - --disable-libopenjpeg \ - --disable-libopenmpt \ - --disable-libopenvino \ - --disable-pocketsphinx \ - --disable-libpulse \ - --disable-librabbitmq \ - --disable-librav1e \ - --disable-librist \ - --disable-librubberband \ - --disable-sdl2 \ - --disable-libsmbclient \ - --disable-libsnappy \ - --disable-sndio \ - --disable-libsoxr \ - --disable-libspeex \ - --disable-libsrt \ - --disable-libssh \ - --disable-libtensorflow \ - --disable-libtesseract \ - --disable-libtheora \ - --disable-libtwolame \ - --disable-libuavs3d \ - --disable-vapoursynth \ - --disable-libvidstab \ - --disable-libvo-amrwbenc \ - --disable-vulkan \ - --disable-libxavs2 \ - --disable-libxvid \ - --disable-outdev=xv \ - --disable-libzimg \ - --disable-libzmq \ - --disable-libzvbi \ - --disable-gcrypt \ - --disable-mbedtls \ - --disable-openssl \ - --disable-libtls \ - --disable-nonfree -.if defined(WITH_DEBUG) -CONFIGURE_ARGS+=--disable-stripping -.else -CONFIGURE_ARGS+=--disable-debug -.endif -CONFIGURE_LOG= ffbuild/config.log -USES= compiler:c11 cpe gmake localbase:ldflags perl5 \ - pkgconfig shebangfix tar:xz -USE_LDCONFIG= yes -USE_PERL5= build -SHEBANG_FILES= doc/texi2pod.pl -NOPRECIOUSMAKEVARS= yes # ARCH - -.ifdef PKGNAMESUFFIX -PORTSCOUT= limit:^6\. -PREFIX= ${LOCALBASE}/${PKGBASE} # avoid conflict with the default -.endif - -OPTIONS_DEFINE= DOCS - -# aom -LIB_DEPENDS+= libaom.so:multimedia/aom -CONFIGURE_ARGS+= --enable-libaom - -# asm support -CONFIGURE_ARGS+= --enable-asm - -# ass -LIB_DEPENDS+= libass.so:multimedia/libass -CONFIGURE_ARGS+= --enable-libass - -# dav1d -LIB_DEPENDS+= libdav1d.so:multimedia/dav1d -CONFIGURE_ARGS+= --enable-libdav1d - -# docs -DOCS_BUILD_DEPENDS= texi2html:textproc/texi2html -DOCS_CONFIGURE_ENABLE= htmlpages -DOCS_BINARY_ALIAS= makeinfo=${FALSE} # force texi2html - -# drm -LIB_DEPENDS+= libdrm.so:graphics/libdrm -CONFIGURE_ARGS+= --enable-libdrm - -# fontconfig -LIB_DEPENDS+= libfontconfig.so:x11-fonts/fontconfig -CONFIGURE_ARGS+= --enable-fontconfig - -# freetype -LIB_DEPENDS+= libfreetype.so:print/freetype2 -CONFIGURE_ARGS+= --enable-libfreetype - -# frei0r -BUILD_DEPENDS+= ${LOCALBASE}/include/frei0r.h:graphics/frei0r -CONFIGURE_ARGS+= --enable-frei0r - -# gnutls -LIB_DEPENDS+= libgnutls.so:security/gnutls -CONFIGURE_ARGS+= --enable-gnutls - -# gmp -LIB_DEPENDS+= libgmp.so:math/gmp -CONFIGURE_ARGS+= --enable-gmp - -# iconv -USES+= iconv -CONFIGURE_ARGS+= --enable-iconv - -# lame -LIB_DEPENDS+= libmp3lame.so:audio/lame -CONFIGURE_ARGS+= --enable-libmp3lame - -# libxml -USES+= gnome -USE_GNOME+= libxml2 -CONFIGURE_ARGS+= --enable-libxml2 - -# libv4l -BUILD_DEPENDS+= v4l_compat>0:multimedia/v4l_compat -LIB_DEPENDS+= libv4l2.so:multimedia/libv4l -CONFIGURE_ARGS+= --enable-libv4l2 - -# network -CONFIGURE_ARGS+= --enable-network - -# optimizations -CONFIGURE_ARGS+= --enable-optimizations - -# opus -LIB_DEPENDS+= libopus.so:audio/opus -CONFIGURE_ARGS+= --enable-libopus - -# rtcpu -CONFIGURE_ARGS+= --enable-runtime-cpudetect - -# svt-av1 -LIB_DEPENDS+= libSvtAv1Enc.so:multimedia/svt-av1 -CONFIGURE_ARGS+= --enable-libsvtav1 - -# vaapi -LIB_DEPENDS+= libva.so:multimedia/libva -CONFIGURE_ARGS+= --enable-vaapi - -# vdpau -USES+= xorg -USE_XORG+= x11 -LIB_DEPENDS+= libvdpau.so:multimedia/libvdpau -CONFIGURE_ARGS+= --enable-vdpau - -# vmaf -LIB_DEPENDS+= libvmaf.so:multimedia/vmaf -CONFIGURE_ARGS+= --enable-libvmaf - -# vorbis -LIB_DEPENDS+= libvorbisenc.so:audio/libvorbis -CONFIGURE_ARGS+= --enable-libvorbis - -# vp8 -LIB_DEPENDS+= libvpx.so:multimedia/libvpx -CONFIGURE_ARGS+= --enable-libvpx - -# webp -LIB_DEPENDS+= libwebp.so:graphics/webp -CONFIGURE_ARGS+= --enable-libwebp - -# x264 -LIB_DEPENDS+= libx264.so:multimedia/libx264 -CONFIGURE_ARGS+= --enable-libx264 - -# x265 -LIB_DEPENDS+= libx265.so:multimedia/x265 -CONFIGURE_ARGS+= --enable-libx265 - -# xcb -#USES+= xorg -USE_XORG+= xcb -CONFIGURE_ARGS+= --enable-libxcb - -# License knobs -CONFIGURE_ARGS+= --enable-version3 - -INSTALL_TARGET= install-progs install-doc install-data \ - install-libs install-headers install-examples -TEST_TARGET= check - -DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} -DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} -MAKE_ENV+= V=1 -LDFLAGS_aarch64=-Wl,-z,notext -LDFLAGS_armv6= -Wl,-z,notext -LDFLAGS_armv7= -Wl,-z,notext -LDFLAGS_i386= -Wl,-z,notext - -CONFIGURE_ARGS+=--prefix="${PREFIX}" \ - --mandir="${PREFIX}/share/man" \ - --datadir="${DATADIR}" \ - --docdir="${DOCSDIR}" \ - --pkgconfigdir="${PREFIX}/libdata/pkgconfig" \ - --disable-static \ - --disable-libcelt \ - --enable-shared \ - --enable-pic \ - --enable-gpl \ - --cc="${CC}" \ - --cxx="${CXX}" - -DOC_FILES= Changelog CREDITS INSTALL.md LICENSE.md MAINTAINERS \ - README.md RELEASE_NOTES -# under doc subdirectory -DOC_DOCFILES= APIchanges *.txt -PORTDOCS= * - -post-install: - (cd ${WRKSRC} && ${COPYTREE_SHARE} \ - "${DOC_FILES}" ${STAGEDIR}${DOCSDIR}) - (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \ - "${DOC_DOCFILES}" ${STAGEDIR}${DOCSDIR}) - -.include <bsd.port.mk> diff --git a/multimedia/ffmpeg6/distinfo b/multimedia/ffmpeg6/distinfo deleted file mode 100644 index 3d4628dc3d55..000000000000 --- a/multimedia/ffmpeg6/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1782151909 -SHA256 (ffmpeg-6.1.6.tar.xz) = d4fcb164028dd3beee5d92c0ac72e46aac6973c75ea12dc14de07bf8f407370a -SIZE (ffmpeg-6.1.6.tar.xz) = 10497884 diff --git a/multimedia/ffmpeg6/files/patch-configure b/multimedia/ffmpeg6/files/patch-configure deleted file mode 100644 index 0487e53ede67..000000000000 --- a/multimedia/ffmpeg6/files/patch-configure +++ /dev/null @@ -1,35 +0,0 @@ -https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/3d29724c008d - ---- configure.orig 2025-11-23 02:57:58 UTC -+++ configure -@@ -3963,15 +3963,7 @@ host_os=$target_os_default - host_os=$target_os_default - - # machine --if test "$target_os_default" = aix; then -- arch_default=$(uname -p) -- strip_default="strip -X32_64" -- nm_default="nm -g -X32_64" --elif test "$MSYSTEM_CARCH" != ""; then -- arch_default="$MSYSTEM_CARCH" --else -- arch_default=$(uname -m) --fi -+arch_default=$(uname -p) - cpu="generic" - intrinsics="none" - -@@ -6729,12 +6721,7 @@ enabled libharfbuzz && require_pkg_config libhar - enabled libfreetype && require_pkg_config libfreetype freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType - enabled libfribidi && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info - enabled libharfbuzz && require_pkg_config libharfbuzz harfbuzz hb.h hb_buffer_create --enabled libglslang && { check_lib spirv_compiler glslang/Include/glslang_c_interface.h glslang_initialize_process \ -- -lglslang -lMachineIndependent -lOSDependent -lHLSL -lOGLCompiler -lGenericCodeGen \ -- -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ -lm || -- require spirv_compiler glslang/Include/glslang_c_interface.h glslang_initialize_process \ -- -lglslang -lOSDependent -lHLSL -lOGLCompiler \ -- -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ -lm; } -+enabled libglslang && require_cpp libglslang glslang/SPIRV/GlslangToSpv.h "glslang::TIntermediate*" -lglslang -lMachineIndependent -lOSDependent -lGenericCodeGen -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ - enabled libgme && { check_pkg_config libgme libgme gme/gme.h gme_new_emu || - require libgme gme/gme.h gme_new_emu -lgme -lstdc++; } - enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do diff --git a/multimedia/ffmpeg6/files/patch-doc-Makefile b/multimedia/ffmpeg6/files/patch-doc-Makefile deleted file mode 100644 index 85ecbde5f2f2..000000000000 --- a/multimedia/ffmpeg6/files/patch-doc-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- doc/Makefile.orig 2025-11-23 02:57:58 UTC -+++ doc/Makefile -@@ -123,7 +123,7 @@ ifdef CONFIG_MANPAGES - endif - - ifdef CONFIG_MANPAGES --install-progs-$(CONFIG_DOC): install-man -+#install-progs-$(CONFIG_DOC): install-man - - install-man: $(MANPAGES) - $(Q)mkdir -p "$(MANDIR)/man1" diff --git a/multimedia/ffmpeg6/files/patch-libavcodec_libsvtav1.c b/multimedia/ffmpeg6/files/patch-libavcodec_libsvtav1.c deleted file mode 100644 index f707c5aa6d81..000000000000 --- a/multimedia/ffmpeg6/files/patch-libavcodec_libsvtav1.c +++ /dev/null @@ -1,26 +0,0 @@ ---- libavcodec/libsvtav1.c.orig 2025-11-23 02:57:58 UTC -+++ libavcodec/libsvtav1.c -@@ -195,7 +195,11 @@ static int config_enc_params(EbSvtAv1EncConfiguration - } else if (svt_enc->qp > 0) { - param->qp = svt_enc->qp; - param->rate_control_mode = 0; -+#if SVT_AV1_CHECK_VERSION(4, 0, 1) -+ param->aq_mode = 0; -+#else - param->enable_adaptive_quantization = 0; -+#endif - } - - desc = av_pix_fmt_desc_get(avctx->pix_fmt); -@@ -389,7 +393,11 @@ static av_cold int eb_enc_init(AVCodecContext *avctx) - - svt_enc->eos_flag = EOS_NOT_REACHED; - -+#if SVT_AV1_CHECK_VERSION(3, 0, 0) -+ svt_ret = svt_av1_enc_init_handle(&svt_enc->svt_handle, &svt_enc->enc_params); -+#else - svt_ret = svt_av1_enc_init_handle(&svt_enc->svt_handle, svt_enc, &svt_enc->enc_params); -+#endif - if (svt_ret != EB_ErrorNone) { - return svt_print_error(avctx, svt_ret, "Error initializing encoder handle"); - } diff --git a/multimedia/ffmpeg6/files/patch-libavfilter_vf__lensfun.c b/multimedia/ffmpeg6/files/patch-libavfilter_vf__lensfun.c deleted file mode 100644 index 0bc120e8a03d..000000000000 --- a/multimedia/ffmpeg6/files/patch-libavfilter_vf__lensfun.c +++ /dev/null @@ -1,51 +0,0 @@ -Partially revert https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/8b78eb312de9 -until graphics/lensfun is updated to a version that contains -https://github.com/lensfun/lensfun/commit/b135e05d729d - ---- libavfilter/vf_lensfun.c.orig 2025-11-23 02:57:58 UTC -+++ libavfilter/vf_lensfun.c -@@ -213,20 +213,39 @@ static int config_props(AVFilterLink *inlink) - - if (!lensfun->modifier) { - if (lensfun->camera && lensfun->lens) { -- lensfun->modifier = lf_modifier_create(lensfun->lens, -+ lensfun->modifier = lf_modifier_create( -+#if (LF_VERSION > 0x35F00) -+ lensfun->lens, - lensfun->focal_length, -+#endif - lensfun->camera->CropFactor, - inlink->w, - inlink->h, LF_PF_U8, lensfun->reverse); - if (lensfun->mode & VIGNETTING) -- lf_modifier_enable_vignetting_correction(lensfun->modifier, lensfun->aperture, lensfun->focus_distance); -+ lf_modifier_enable_vignetting_correction(lensfun->modifier, -+#if (LF_VERSION <= 0x35F00) -+ lensfun->lens, lensfun->focal_length, -+#endif -+ lensfun->aperture, lensfun->focus_distance); - if (lensfun->mode & GEOMETRY_DISTORTION) { -- lf_modifier_enable_distortion_correction(lensfun->modifier); -- lf_modifier_enable_projection_transform(lensfun->modifier, lensfun->target_geometry); -+ lf_modifier_enable_distortion_correction(lensfun->modifier, -+#if (LF_VERSION <= 0x35F00) -+ lensfun->lens, lensfun->focal_length -+#endif -+ ); -+ lf_modifier_enable_projection_transform(lensfun->modifier, -+#if (LF_VERSION <= 0x35F00) -+ lensfun->lens, lensfun->focal_length, -+#endif -+ lensfun->target_geometry); - lf_modifier_enable_scaling(lensfun->modifier, lensfun->scale); - } - if (lensfun->mode & SUBPIXEL_DISTORTION) -- lf_modifier_enable_tca_correction(lensfun->modifier); -+ lf_modifier_enable_tca_correction(lensfun->modifier, -+#if (LF_VERSION <= 0x35F00) -+ lensfun->lens, lensfun->focal_length -+#endif -+ ); - } else { - // lensfun->camera and lensfun->lens should have been initialized - return AVERROR_BUG; diff --git a/multimedia/ffmpeg6/files/patch-libavformat_rtsp.c b/multimedia/ffmpeg6/files/patch-libavformat_rtsp.c deleted file mode 100644 index 0a2343320910..000000000000 --- a/multimedia/ffmpeg6/files/patch-libavformat_rtsp.c +++ /dev/null @@ -1,44 +0,0 @@ ---- libavformat/rtsp.c.orig 2025-11-23 02:57:58 UTC -+++ libavformat/rtsp.c -@@ -1680,7 +1680,12 @@ int ff_rtsp_make_setup_request(AVFormatContext *s, con - } - if (ttl > 0) - snprintf(optbuf, sizeof(optbuf), "?ttl=%d", ttl); -- getnameinfo((struct sockaddr*) &addr, sizeof(addr), -+ getnameinfo((struct sockaddr*) &addr, -+#if HAVE_STRUCT_SOCKADDR_SA_LEN -+ ((struct sockaddr*) &addr)->sa_len, -+#else -+ sizeof(addr), -+#endif - namebuf, sizeof(namebuf), NULL, 0, NI_NUMERICHOST); - ff_url_join(url, sizeof(url), "rtp", NULL, namebuf, - port, "%s", optbuf); -@@ -1914,8 +1919,13 @@ redirect: - goto fail; - } - if (!getpeername(tcp_fd, (struct sockaddr*) &peer, &peer_len)) { -- getnameinfo((struct sockaddr*) &peer, peer_len, host, sizeof(host), -- NULL, 0, NI_NUMERICHOST); -+ getnameinfo((struct sockaddr*) &peer, -+#if HAVE_STRUCT_SOCKADDR_SA_LEN -+ ((struct sockaddr*) &peer)->sa_len, -+#else -+ peer_len, -+#endif -+ host, sizeof(host), NULL, 0, NI_NUMERICHOST); - } - - /* request options supported by the server; this also detects server -@@ -2430,7 +2440,11 @@ static int sdp_read_header(AVFormatContext *s) - const char *p; - - err = getnameinfo((struct sockaddr*) &rtsp_st->sdp_ip, -+#if HAVE_STRUCT_SOCKADDR_SA_LEN -+ ((struct sockaddr*) &rtsp_st->sdp_ip)->sa_len, -+#else - sizeof(rtsp_st->sdp_ip), -+#endif - namebuf, sizeof(namebuf), NULL, 0, NI_NUMERICHOST); - if (err) { - av_log(s, AV_LOG_ERROR, "getnameinfo: %s\n", gai_strerror(err)); diff --git a/multimedia/ffmpeg6/files/patch-libavutil-common.h b/multimedia/ffmpeg6/files/patch-libavutil-common.h deleted file mode 100644 index db8e2b9429de..000000000000 --- a/multimedia/ffmpeg6/files/patch-libavutil-common.h +++ /dev/null @@ -1,13 +0,0 @@ ---- libavutil/common.h.orig 2025-11-23 02:58:01 UTC -+++ libavutil/common.h -@@ -43,6 +43,10 @@ - #include "error.h" - #include "macros.h" - -+#ifndef UINT64_C -+#define UINT64_C(c) (c ## UL) -+#endif -+ - //rounded division & shift - #define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b)) - /* assume b>0 */ diff --git a/multimedia/ffmpeg6/files/patch-libavutil-x86-asm.h b/multimedia/ffmpeg6/files/patch-libavutil-x86-asm.h deleted file mode 100644 index 7f9a7d5e59f1..000000000000 --- a/multimedia/ffmpeg6/files/patch-libavutil-x86-asm.h +++ /dev/null @@ -1,11 +0,0 @@ ---- libavutil/x86/asm.h.orig 2023-11-09 23:38:51 UTC -+++ libavutil/x86/asm.h -@@ -72,7 +72,7 @@ typedef int x86_reg; - typedef int x86_reg; - #endif - --#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE)) -+#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE && !defined(__clang__))) - #define HAVE_6REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE || HAVE_EBP_AVAILABLE)) - - #if ARCH_X86_64 && defined(PIC) diff --git a/multimedia/ffmpeg6/files/patch-libavutil_hwcontext__drm.c b/multimedia/ffmpeg6/files/patch-libavutil_hwcontext__drm.c deleted file mode 100644 index f5e186300975..000000000000 --- a/multimedia/ffmpeg6/files/patch-libavutil_hwcontext__drm.c +++ /dev/null @@ -1,24 +0,0 @@ -drm-kmod doesn't expose uAPI yet, so bundle like Mesa - ---- libavutil/hwcontext_drm.c.orig 2022-07-22 17:58:39 UTC -+++ libavutil/hwcontext_drm.c -@@ -28,6 +28,19 @@ - #if HAVE_LINUX_DMA_BUF_H - #include <linux/dma-buf.h> - #include <sys/ioctl.h> -+#else // BSDs -+#undef HAVE_LINUX_DMA_BUF_H -+#define HAVE_LINUX_DMA_BUF_H 1 -+#include <sys/ioctl.h> -+struct dma_buf_sync { -+ uint64_t flags; -+}; -+#define DMA_BUF_BASE 'b' -+#define DMA_BUF_IOCTL_SYNC _IOW(DMA_BUF_BASE, 0, struct dma_buf_sync) -+#define DMA_BUF_SYNC_READ (1 << 0) -+#define DMA_BUF_SYNC_WRITE (2 << 0) -+#define DMA_BUF_SYNC_START (0 << 2) -+#define DMA_BUF_SYNC_END (1 << 2) - #endif - - #include <drm.h> diff --git a/multimedia/ffmpeg6/override.mk b/multimedia/ffmpeg6/override.mk deleted file mode 100644 index b53e2bf23122..000000000000 --- a/multimedia/ffmpeg6/override.mk +++ /dev/null @@ -1,8 +0,0 @@ -FF_SUFFIX= 6 - -BUILD_DEPENDS:= ${BUILD_DEPENDS:S/ffmpeg/&${FF_SUFFIX}/g} -LIB_DEPENDS:= ${LIB_DEPENDS:S/ffmpeg$/&${FF_SUFFIX}/} - -USES+= localbase # -isystem -CONFIGURE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg${FF_SUFFIX}/libdata/pkgconfig" -MAKE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg${FF_SUFFIX}/libdata/pkgconfig" diff --git a/multimedia/ffmpeg6/pkg-descr b/multimedia/ffmpeg6/pkg-descr deleted file mode 100644 index cdf2caea028c..000000000000 --- a/multimedia/ffmpeg6/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -FFmpeg is a complete, cross-platform solution to record, convert and stream -audio and video. It includes libavcodec - the leading audio/video codec -library. - -Note: this is a legacy version, to be used as a dependency for ports which - don't support the lattest. diff --git a/multimedia/ffmpeg6/pkg-plist b/multimedia/ffmpeg6/pkg-plist deleted file mode 100644 index 252068e2fe69..000000000000 --- a/multimedia/ffmpeg6/pkg-plist +++ /dev/null @@ -1,226 +0,0 @@ -bin/ffmpeg -bin/ffprobe -include/libavcodec/ac3_parser.h -include/libavcodec/adts_parser.h -include/libavcodec/avcodec.h -include/libavcodec/avdct.h -include/libavcodec/avfft.h -include/libavcodec/bsf.h -include/libavcodec/codec.h -include/libavcodec/codec_desc.h -include/libavcodec/codec_id.h -include/libavcodec/codec_par.h -include/libavcodec/d3d11va.h -include/libavcodec/defs.h -include/libavcodec/dirac.h -include/libavcodec/dv_profile.h -include/libavcodec/dxva2.h -include/libavcodec/jni.h -include/libavcodec/mediacodec.h -include/libavcodec/packet.h -include/libavcodec/qsv.h -include/libavcodec/vdpau.h -include/libavcodec/version.h -include/libavcodec/version_major.h -include/libavcodec/videotoolbox.h -include/libavcodec/vorbis_parser.h -include/libavcodec/xvmc.h -include/libavdevice/avdevice.h -include/libavdevice/version.h -include/libavdevice/version_major.h -include/libavfilter/avfilter.h -include/libavfilter/buffersink.h -include/libavfilter/buffersrc.h -include/libavfilter/version.h -include/libavfilter/version_major.h -include/libavformat/avformat.h -include/libavformat/avio.h -include/libavformat/version.h -include/libavformat/version_major.h -include/libavutil/adler32.h -include/libavutil/aes.h -include/libavutil/aes_ctr.h -include/libavutil/ambient_viewing_environment.h -include/libavutil/attributes.h -include/libavutil/audio_fifo.h -include/libavutil/avassert.h -include/libavutil/avconfig.h -include/libavutil/avstring.h -include/libavutil/avutil.h -include/libavutil/base64.h -include/libavutil/blowfish.h -include/libavutil/bprint.h -include/libavutil/bswap.h -include/libavutil/buffer.h -include/libavutil/camellia.h -include/libavutil/cast5.h -include/libavutil/channel_layout.h -include/libavutil/common.h -include/libavutil/cpu.h -include/libavutil/crc.h -include/libavutil/csp.h -include/libavutil/des.h -include/libavutil/detection_bbox.h -include/libavutil/dict.h -include/libavutil/display.h -include/libavutil/dovi_meta.h -include/libavutil/downmix_info.h -include/libavutil/encryption_info.h -include/libavutil/error.h -include/libavutil/eval.h -include/libavutil/executor.h -include/libavutil/ffversion.h -include/libavutil/fifo.h -include/libavutil/file.h -include/libavutil/film_grain_params.h -include/libavutil/frame.h -include/libavutil/hash.h -include/libavutil/hdr_dynamic_metadata.h -include/libavutil/hdr_dynamic_vivid_metadata.h -include/libavutil/hmac.h -include/libavutil/hwcontext.h -include/libavutil/hwcontext_cuda.h -include/libavutil/hwcontext_d3d11va.h -include/libavutil/hwcontext_drm.h -include/libavutil/hwcontext_dxva2.h -include/libavutil/hwcontext_mediacodec.h -include/libavutil/hwcontext_opencl.h -include/libavutil/hwcontext_qsv.h -include/libavutil/hwcontext_vaapi.h -include/libavutil/hwcontext_vdpau.h -include/libavutil/hwcontext_videotoolbox.h -include/libavutil/hwcontext_vulkan.h -include/libavutil/imgutils.h -include/libavutil/intfloat.h -include/libavutil/intreadwrite.h -include/libavutil/lfg.h -include/libavutil/log.h -include/libavutil/lzo.h -include/libavutil/macros.h -include/libavutil/mastering_display_metadata.h -include/libavutil/mathematics.h -include/libavutil/md5.h -include/libavutil/mem.h -include/libavutil/motion_vector.h -include/libavutil/murmur3.h -include/libavutil/opt.h -include/libavutil/parseutils.h -include/libavutil/pixdesc.h -include/libavutil/pixelutils.h -include/libavutil/pixfmt.h -include/libavutil/random_seed.h -include/libavutil/rational.h -include/libavutil/rc4.h -include/libavutil/replaygain.h -include/libavutil/ripemd.h -include/libavutil/samplefmt.h -include/libavutil/sha.h -include/libavutil/sha512.h -include/libavutil/spherical.h -include/libavutil/stereo3d.h -include/libavutil/tea.h -include/libavutil/threadmessage.h -include/libavutil/time.h -include/libavutil/timecode.h -include/libavutil/timestamp.h -include/libavutil/tree.h -include/libavutil/twofish.h -include/libavutil/tx.h -include/libavutil/uuid.h -include/libavutil/version.h -include/libavutil/video_enc_params.h -include/libavutil/video_hint.h -include/libavutil/xtea.h -include/libpostproc/postprocess.h -include/libpostproc/version.h -include/libpostproc/version_major.h -include/libswresample/swresample.h -include/libswresample/version.h -include/libswresample/version_major.h -include/libswscale/swscale.h -include/libswscale/version.h -include/libswscale/version_major.h -lib/libavcodec.so -lib/libavcodec.so.60 -lib/libavcodec.so.60.31.102 -lib/libavdevice.so -lib/libavdevice.so.60 -lib/libavdevice.so.60.3.100 -lib/libavfilter.so -lib/libavfilter.so.9 -lib/libavfilter.so.9.12.100 -lib/libavformat.so -lib/libavformat.so.60 -lib/libavformat.so.60.16.101 -lib/libavutil.so -lib/libavutil.so.58 -lib/libavutil.so.58.29.100 -lib/libpostproc.so -lib/libpostproc.so.57 -lib/libpostproc.so.57.3.100 -lib/libswresample.so -lib/libswresample.so.4 -lib/libswresample.so.4.12.100 -lib/libswscale.so -lib/libswscale.so.7 -lib/libswscale.so.7.5.100 -libdata/pkgconfig/libavcodec.pc -libdata/pkgconfig/libavdevice.pc -libdata/pkgconfig/libavfilter.pc -libdata/pkgconfig/libavformat.pc -libdata/pkgconfig/libavutil.pc -libdata/pkgconfig/libpostproc.pc -libdata/pkgconfig/libswresample.pc -libdata/pkgconfig/libswscale.pc -%%DATADIR%%/examples/Makefile -%%DATADIR%%/examples/README -%%DATADIR%%/examples/avio_http_serve_files.c -%%DATADIR%%/examples/avio_list_dir.c -%%DATADIR%%/examples/avio_read_callback.c -%%DATADIR%%/examples/decode_audio.c -%%DATADIR%%/examples/decode_filter_audio.c -%%DATADIR%%/examples/decode_filter_video.c -%%DATADIR%%/examples/decode_video.c -%%DATADIR%%/examples/demux_decode.c -%%DATADIR%%/examples/encode_audio.c -%%DATADIR%%/examples/encode_video.c -%%DATADIR%%/examples/extract_mvs.c -%%DATADIR%%/examples/filter_audio.c -%%DATADIR%%/examples/hw_decode.c -%%DATADIR%%/examples/mux.c -%%DATADIR%%/examples/qsv_decode.c -%%DATADIR%%/examples/qsv_transcode.c -%%DATADIR%%/examples/remux.c -%%DATADIR%%/examples/resample_audio.c -%%DATADIR%%/examples/scale_video.c -%%DATADIR%%/examples/show_metadata.c -%%DATADIR%%/examples/transcode.c -%%DATADIR%%/examples/transcode_aac.c -%%DATADIR%%/examples/vaapi_encode.c -%%DATADIR%%/examples/vaapi_transcode.c -%%DATADIR%%/ffprobe.xsd -%%DATADIR%%/libvpx-1080p.ffpreset -%%DATADIR%%/libvpx-1080p50_60.ffpreset -%%DATADIR%%/libvpx-360p.ffpreset -%%DATADIR%%/libvpx-720p.ffpreset -%%DATADIR%%/libvpx-720p50_60.ffpreset -share/man/man1/ffmpeg-all.1.gz -share/man/man1/ffmpeg-bitstream-filters.1.gz -share/man/man1/ffmpeg-codecs.1.gz -share/man/man1/ffmpeg-devices.1.gz -share/man/man1/ffmpeg-filters.1.gz -share/man/man1/ffmpeg-formats.1.gz -share/man/man1/ffmpeg-protocols.1.gz -share/man/man1/ffmpeg-resampler.1.gz -share/man/man1/ffmpeg-scaler.1.gz -share/man/man1/ffmpeg-utils.1.gz -share/man/man1/ffmpeg.1.gz -share/man/man1/ffprobe-all.1.gz -share/man/man1/ffprobe.1.gz -share/man/man3/libavcodec.3.gz -share/man/man3/libavdevice.3.gz -share/man/man3/libavfilter.3.gz -share/man/man3/libavformat.3.gz -share/man/man3/libavutil.3.gz -share/man/man3/libswresample.3.gz -share/man/man3/libswscale.3.gz |