diff options
Diffstat (limited to 'multimedia')
24 files changed, 256 insertions, 250 deletions
diff --git a/multimedia/ffms2/Makefile b/multimedia/ffms2/Makefile index e914a59843da..e0289ee9ae82 100644 --- a/multimedia/ffms2/Makefile +++ b/multimedia/ffms2/Makefile @@ -1,12 +1,9 @@ PORTNAME= ffms2 -DISTVERSION= 2.40 -PORTREVISION= 3 +DISTVERSION= 5.0 CATEGORIES= multimedia PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= 96cbf38ea938.patch:-p1 # https://github.com/FFMS/ffms2/pull/380 -PATCHFILES+= 586d87de3f89.patch:-p1 # https://github.com/FFMS/ffms2/pull/380 -PATCHFILES+= 45673149e9a2.patch:-p1 # https://github.com/FFMS/ffms2/pull/380 +PATCHFILES= 25cef14386fcaaa58ee547065deee8f6e82c56a2.patch:-p1 MAINTAINER= ports@FreeBSD.org COMMENT= FFmpeg-based source library and VapourSynth plugin @@ -22,27 +19,26 @@ USE_GITHUB= yes GH_ACCOUNT= FFMS USES= autoreconf compiler:c++11-lib gmake libtool pathfix pkgconfig -EXCLUDE= VSHelper.h VSScript.h VapourSynth.h -EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ,} -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-static -CPPFLAGS+= `pkg-config vapoursynth --cflags` -INSTALL_TARGET= install-strip USE_LDCONFIG= yes + +EXTRACT_AFTER_ARGS= --exclude src/vapoursynth/V*.h \ + --no-same-owner --no-same-permissions + +GNU_CONFIGURE= yes + DATADIR= ${PREFIX}/lib/vapoursynth +INSTALL_TARGET= install-strip -OPTIONS_DEFINE= DOCS +CONFIGURE_ARGS= --enable-static -pre-configure: - @${MKDIR} ${WRKSRC}/src/config # from autogen.sh +OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e '/^dist_doc_DATA/s,=,& \ - doc/${PORTNAME}-vapoursynth.md,' \ - ${WRKSRC}/Makefile.am + doc/${PORTNAME}-vapoursynth.md,' \ + ${WRKSRC}/Makefile.am -post-install: - ${MKDIR} ${STAGEDIR}${DATADIR} - ${LN} -sf ../lib${PORTNAME}.so ${STAGEDIR}${DATADIR}/ +pre-configure: + @${MKDIR} ${WRKSRC}/src/config # from autogen.sh .include <bsd.port.mk> diff --git a/multimedia/ffms2/distinfo b/multimedia/ffms2/distinfo index a8d034f5d271..448224476f05 100644 --- a/multimedia/ffms2/distinfo +++ b/multimedia/ffms2/distinfo @@ -1,9 +1,5 @@ -TIMESTAMP = 1598095686 -SHA256 (FFMS-ffms2-2.40_GH0.tar.gz) = 82e95662946f3d6e1b529eadbd72bed196adfbc41368b2d50493efce6e716320 -SIZE (FFMS-ffms2-2.40_GH0.tar.gz) = 140356 -SHA256 (96cbf38ea938.patch) = dd063e21c6e7887614ab5fb1009cf9b353066829771d4426dfe779d74dfac758 -SIZE (96cbf38ea938.patch) = 13422 -SHA256 (586d87de3f89.patch) = d5ec6ee44bf8f0a2bd943c1c61bace33b7b80559137b71fe5c4af5e7dd9ac7f8 -SIZE (586d87de3f89.patch) = 931 -SHA256 (45673149e9a2.patch) = ecef89ce1bb4158181c96eecdbc2c37e49a880a88e72a271b54ce98832dcf049 -SIZE (45673149e9a2.patch) = 3693 +TIMESTAMP = 1756589822 +SHA256 (FFMS-ffms2-5.0_GH0.tar.gz) = 7770af0bbc0063f9580a6a5c8e7c51f1788f171d7da0b352e48a1e60943a8c3c +SIZE (FFMS-ffms2-5.0_GH0.tar.gz) = 167985 +SHA256 (25cef14386fcaaa58ee547065deee8f6e82c56a2.patch) = f60096f07d8cf63a3abf8aa1066746e174541523bdc642ec2eabde5b1f286926 +SIZE (25cef14386fcaaa58ee547065deee8f6e82c56a2.patch) = 1145 diff --git a/multimedia/ffms2/files/patch-use-system-vapoursynth b/multimedia/ffms2/files/patch-use-system-vapoursynth new file mode 100644 index 000000000000..58c8f06affaf --- /dev/null +++ b/multimedia/ffms2/files/patch-use-system-vapoursynth @@ -0,0 +1,34 @@ +diff -up ffms2-5.0/configure.ac.orig ffms2-5.0/configure.ac +--- configure.ac.orig 2024-05-28 16:52:48.000000000 +0200 ++++ configure.ac 2024-09-20 12:13:11.134979566 +0200 +@@ -118,6 +118,10 @@ if test "$FFMPEG_WORKS" = no; then + AC_MSG_FAILURE([cannot link with FFmpeg]) + fi + ++PKG_CHECK_MODULES(VAPOURSYNTH, [vapoursynth]) ++ ++AC_SUBST([VAPOURSYNTH_CFLAGS]) ++ + src_core_libffms2_la_LDFLAGS="" + AC_MSG_CHECKING([whether -Wl,-Bsymbolic is needed]) + if test "$enable_shared" = yes; then +diff -up ffms2-5.0/Makefile.am.orig ffms2-5.0/Makefile.am +--- Makefile.am.orig 2024-09-20 12:12:14.272194649 +0200 ++++ Makefile.am 2024-09-20 12:13:00.781018729 +0200 +@@ -14,6 +14,7 @@ AM_CPPFLAGS = \ + -DFFMS_EXPORTS \ + -D__STDC_CONSTANT_MACROS \ + @FFMPEG_CFLAGS@ \ ++ @VAPOURSYNTH_CFLAGS@ \ + @ZLIB_CPPFLAGS@ \ + -include config.h + AM_CXXFLAGS = -fvisibility=hidden +@@ -39,8 +40,6 @@ src_core_libffms2_la_SOURCES = \ + src/core/videoutils.h \ + src/core/zipfile.cpp \ + src/core/zipfile.h \ +- src/vapoursynth/VapourSynth4.h \ +- src/vapoursynth/VSHelper4.h \ + src/vapoursynth/vapoursource4.cpp \ + src/vapoursynth/vapoursource4.h \ + src/vapoursynth/vapoursynth4.cpp diff --git a/multimedia/ffms2/pkg-plist b/multimedia/ffms2/pkg-plist index d4164d07ee7d..40a0e0e525ea 100644 --- a/multimedia/ffms2/pkg-plist +++ b/multimedia/ffms2/pkg-plist @@ -3,9 +3,8 @@ include/ffms.h include/ffmscompat.h lib/libffms2.a lib/libffms2.so -lib/libffms2.so.4 -lib/libffms2.so.4.0.0 -%%DATADIR%%/libffms2.so +lib/libffms2.so.5 +lib/libffms2.so.5.0.0 libdata/pkgconfig/ffms2.pc %%PORTDOCS%%%%DOCSDIR%%/ffms2-api.md %%PORTDOCS%%%%DOCSDIR%%/ffms2-changelog.md diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile index 6a6567b03279..01d2a8acfc69 100644 --- a/multimedia/handbrake/Makefile +++ b/multimedia/handbrake/Makefile @@ -1,6 +1,5 @@ PORTNAME= handbrake -DISTVERSION= 1.9.2 -PORTREVISION= 3 +DISTVERSION= 1.10.1 CATEGORIES= multimedia MASTER_SITES= https://github.com/HandBrake/HandBrake/releases/download/${DISTVERSION}/ MASTER_SITES+= https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/:contrib @@ -13,10 +12,11 @@ MAINTAINER= naito.yuichiro@gmail.com COMMENT= Versatile DVD ripper and video transcoder WWW= https://handbrake.fr/ -LICENSE= GPLv2 +LICENSE= GPLv2 FDK_AAC +LICENSE_COMB= multi LICENSE_NAME_FDK_AAC= Software License for The Fraunhofer FDK AAC Codec Library for Android LICENSE_FILE_FDK_AAC= ${WRKDIR}/${DISTFILES:Mfdk*:R:R}/NOTICE -LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING LICENSE_PERMS_FDK_AAC= dist-mirror pkg-mirror auto-accept ONLY_FOR_ARCHS= amd64 powerpc powerpc64 powerpc64le @@ -45,16 +45,16 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus \ USES= autoreconf:build compiler:c11 gmake iconv libtool:build \ localbase:ldflags ninja:build pkgconfig python:build -CONTRIB_FILES= SVT-AV1-v2.3.0.tar.gz \ +CONTRIB_FILES= SVT-AV1-v3.1.0.tar.gz \ fdk-aac-2.0.3.tar.gz \ - ffmpeg-7.1.tar.bz2 \ + ffmpeg-7.1.1.tar.bz2 \ libbluray-1.3.4.tar.bz2 \ libdvdnav-6.1.1.tar.bz2 \ libdvdread-6.1.3.tar.bz2 \ dav1d-1.5.1.tar.bz2 \ - dovi_tool-libdovi-3.1.2.tar.gz \ - x265_4.1.tar.gz \ - zimg-3.0.5.tar.gz + dovi_tool-libdovi-3.3.2.tar.gz \ + x265-snapshot-20250729-13276.tar.gz \ + zimg-snapshot-20250624.tar.gz .if !defined(PACKAGE_BUILDING) # DVDCSS version hardcoded in contrib/libdvdread/libdvdread-5.0.0-6-gcb1ae87/src/dvd_input.c (dlopen'ed) diff --git a/multimedia/handbrake/distinfo b/multimedia/handbrake/distinfo index 6f6d4ac82c9b..9ad80a170b71 100644 --- a/multimedia/handbrake/distinfo +++ b/multimedia/handbrake/distinfo @@ -1,12 +1,12 @@ -TIMESTAMP = 1740479422 -SHA256 (handbrake/HandBrake-1.9.2-source.tar.bz2) = f56696b9863a6c926c0eabdcb980cece9aa222c650278d455ac6873d3220ce49 -SIZE (handbrake/HandBrake-1.9.2-source.tar.bz2) = 9431665 -SHA256 (handbrake/SVT-AV1-v2.3.0.tar.gz) = ebb0b484ef4a0dc281e94342a9f73ad458496f5d3457eca7465bec943910c6c3 -SIZE (handbrake/SVT-AV1-v2.3.0.tar.gz) = 10839376 +TIMESTAMP = 1756263493 +SHA256 (handbrake/HandBrake-1.10.1-source.tar.bz2) = eafa87d64b99c457240675f6b89a7f6aa3c1eb56352ec057a0a0949ba449fe8e +SIZE (handbrake/HandBrake-1.10.1-source.tar.bz2) = 9484661 +SHA256 (handbrake/SVT-AV1-v3.1.0.tar.gz) = 3999586c261dc3d8690fd1489fc74da4e0fdff9159c8ce2b76ddfac001ad96d3 +SIZE (handbrake/SVT-AV1-v3.1.0.tar.gz) = 10908555 SHA256 (handbrake/fdk-aac-2.0.3.tar.gz) = e25671cd96b10bad896aa42ab91a695a9e573395262baed4e4a2ff178d6a3a78 SIZE (handbrake/fdk-aac-2.0.3.tar.gz) = 2518649 -SHA256 (handbrake/ffmpeg-7.1.tar.bz2) = fd59e6160476095082e94150ada5a6032d7dcc282fe38ce682a00c18e7820528 -SIZE (handbrake/ffmpeg-7.1.tar.bz2) = 13260188 +SHA256 (handbrake/ffmpeg-7.1.1.tar.bz2) = 0c8da2f11579a01e014fc007cbacf5bb4da1d06afd0b43c7f8097ec7c0f143ba +SIZE (handbrake/ffmpeg-7.1.1.tar.bz2) = 13278839 SHA256 (handbrake/libbluray-1.3.4.tar.bz2) = 478ffd68a0f5dde8ef6ca989b7f035b5a0a22c599142e5cd3ff7b03bbebe5f2b SIZE (handbrake/libbluray-1.3.4.tar.bz2) = 756323 SHA256 (handbrake/libdvdnav-6.1.1.tar.bz2) = c191a7475947d323ff7680cf92c0fb1be8237701885f37656c64d04e98d18d48 @@ -15,9 +15,9 @@ SHA256 (handbrake/libdvdread-6.1.3.tar.bz2) = ce35454997a208cbe50e91232f0e73fb1a SIZE (handbrake/libdvdread-6.1.3.tar.bz2) = 395439 SHA256 (handbrake/dav1d-1.5.1.tar.bz2) = 4eddffd108f098e307b93c9da57b6125224dc5877b1b3d157b31be6ae8f1f093 SIZE (handbrake/dav1d-1.5.1.tar.bz2) = 1214503 -SHA256 (handbrake/dovi_tool-libdovi-3.1.2.tar.gz) = 3c74f8f6afdb7d4be97210df201a28a48676b2ebe10c20961176e81e2fd98c36 -SIZE (handbrake/dovi_tool-libdovi-3.1.2.tar.gz) = 450556 -SHA256 (handbrake/x265_4.1.tar.gz) = ef05940bdbf8e2f24c93d799ae8c5d19f43cd235d01c17fa5acf3fa77b48c032 -SIZE (handbrake/x265_4.1.tar.gz) = 1722231 -SHA256 (handbrake/zimg-3.0.5.tar.gz) = a9a0226bf85e0d83c41a8ebe4e3e690e1348682f6a2a7838f1b8cbff1b799bcf -SIZE (handbrake/zimg-3.0.5.tar.gz) = 326694 +SHA256 (handbrake/dovi_tool-libdovi-3.3.2.tar.gz) = 8ccb1922d7dbb57bc4f2c15c10b90c462f7a5f292efe317c116db923728dd3f1 +SIZE (handbrake/dovi_tool-libdovi-3.3.2.tar.gz) = 489628 +SHA256 (handbrake/x265-snapshot-20250729-13276.tar.gz) = 3feb40d5f7fc37aba193a686a4445efff332f18d0f4830c6af565c3e18d340a8 +SIZE (handbrake/x265-snapshot-20250729-13276.tar.gz) = 1738652 +SHA256 (handbrake/zimg-snapshot-20250624.tar.gz) = 19a96cdc266466be58be86a9271bedb1f080bf4cc14f5ed58ac39dc5b970fd17 +SIZE (handbrake/zimg-snapshot-20250624.tar.gz) = 3217869 diff --git a/multimedia/handbrake/files/patch-contrib_ffmpeg_module.defs b/multimedia/handbrake/files/patch-contrib_ffmpeg_module.defs index 178198ba7762..1ab6fbcaafbd 100644 --- a/multimedia/handbrake/files/patch-contrib_ffmpeg_module.defs +++ b/multimedia/handbrake/files/patch-contrib_ffmpeg_module.defs @@ -1,20 +1,10 @@ -Disable vulkan support. -Handbrake doesn't require Vulkan but if it is installed in build environment -(for other ports like QT5), It fails to build Handbrake, because following -definitions has been removed since vulkan-headers-1.3.238. - -* VK_EXT_VIDEO_DECODE_H264_EXTENSION_NAME -* VK_EXT_VIDEO_DECODE_H265_EXTENSION_NAME - ---- contrib/ffmpeg/module.defs.orig 2024-12-01 15:28:40 UTC +--- contrib/ffmpeg/module.defs.orig 2025-08-08 16:41:24 UTC +++ contrib/ffmpeg/module.defs -@@ -34,8 +34,10 @@ FFMPEG.CONFIGURE.extra = \ - --enable-filters \ +@@ -35,6 +35,7 @@ FFMPEG.CONFIGURE.extra = \ --disable-hwaccels \ --disable-vdpau \ -+ --disable-vulkan \ --disable-postproc \ ++ --disable-vulkan \ --disable-encoders \ -+ --disable-xlib \ --enable-libmp3lame \ - --enable-encoder=ac3 \ + --enable-encoder=aac \ diff --git a/multimedia/handbrake/files/patch-libhb_enc__qsv.c b/multimedia/handbrake/files/patch-libhb_enc__qsv.c deleted file mode 100644 index 51f61011c734..000000000000 --- a/multimedia/handbrake/files/patch-libhb_enc__qsv.c +++ /dev/null @@ -1,67 +0,0 @@ ---- libhb/enc_qsv.c.orig 2024-12-01 15:28:40 UTC -+++ libhb/enc_qsv.c -@@ -174,7 +174,9 @@ static int log_encoder_params(const hb_work_private_t - { - const mfxExtCodingOption *option1 = NULL; - const mfxExtCodingOption2 *option2 = NULL; -+#if (MFX_VERSION >= 2012) - const mfxExtAV1ScreenContentTools *extScreenContentCoding = NULL; -+#endif - const mfxExtHyperModeParam *extHyperModeOption = NULL; - - for (int i = 0; i < videoParam->NumExtParam; i++) -@@ -188,10 +190,12 @@ static int log_encoder_params(const hb_work_private_t - { - option2 = (mfxExtCodingOption2*)videoParam->ExtParam[i]; - } -+#if (MFX_VERSION >= 2012) - else if (option->Header.BufferId == MFX_EXTBUFF_AV1_SCREEN_CONTENT_TOOLS) - { - extScreenContentCoding = (mfxExtAV1ScreenContentTools*)videoParam->ExtParam[i]; - } -+#endif - else if (option->Header.BufferId == MFX_EXTBUFF_HYPER_MODE_PARAM) - { - extHyperModeOption = (mfxExtHyperModeParam*)videoParam->ExtParam[i]; -@@ -221,13 +225,14 @@ static int log_encoder_params(const hb_work_private_t - hb_log("encqsvInit: GopRefDist %"PRIu16" GopPicSize %"PRIu16" NumRefFrame %"PRIu16" IdrInterval %"PRIu16"", - videoParam->mfx.GopRefDist, videoParam->mfx.GopPicSize, videoParam->mfx.NumRefFrame, videoParam->mfx.IdrInterval); - -+#if (MFX_VERSION >= 2012) - if (extScreenContentCoding && ((extScreenContentCoding->IntraBlockCopy == MFX_CODINGOPTION_ON) || (extScreenContentCoding->Palette == MFX_CODINGOPTION_ON))) - { - hb_log("encqsvInit: ScreenContentCoding is enabled IBC %s, Palette %s", - (extScreenContentCoding->IntraBlockCopy == MFX_CODINGOPTION_ON) ? "on" : "off", - (extScreenContentCoding->Palette == MFX_CODINGOPTION_ON) ? "on" : "off"); - } -- -+#endif - if (pv->qsv_info->capabilities & HB_QSV_CAP_B_REF_PYRAMID) - { - hb_log("encqsvInit: BFramesMax %d BRefType %s", -@@ -1670,7 +1675,9 @@ int encqsvInit(hb_work_object_t *w, hb_job_t *job) - mfxSession session = (mfxSession)0; - mfxExtCodingOption option1_buf, *option1 = &option1_buf; - mfxExtCodingOption2 option2_buf, *option2 = &option2_buf; -+#if (MFX_VERSION >= 2012) - mfxExtAV1ScreenContentTools screencont_coding_buf, *screencont_coding = &screencont_coding_buf; -+#endif - mfxExtCodingOptionSPSPPS sps_pps_buf, *sps_pps = &sps_pps_buf; - mfxExtAV1BitstreamParam av1_bitstream_buf, *av1_bitstream = &av1_bitstream_buf; - mfxExtChromaLocInfo chroma_loc_info_buf, *chroma_loc_info = &chroma_loc_info_buf; -@@ -1795,6 +1802,7 @@ int encqsvInit(hb_work_object_t *w, hb_job_t *job) - { - videoParam.ExtParam[videoParam.NumExtParam++] = (mfxExtBuffer*)hyper_encode; - } -+#if (MFX_VERSION >= 2012) - memset(screencont_coding, 0, sizeof(mfxExtAV1ScreenContentTools)); - screencont_coding->Header.BufferId = MFX_EXTBUFF_AV1_SCREEN_CONTENT_TOOLS; - screencont_coding->Header.BufferSz = sizeof(mfxExtAV1ScreenContentTools); -@@ -1802,6 +1810,7 @@ int encqsvInit(hb_work_object_t *w, hb_job_t *job) - { - videoParam.ExtParam[videoParam.NumExtParam++] = (mfxExtBuffer*)screencont_coding; - } -+#endif - /* Query actual encoding parameters after MFXVideoENCODE_Init, some of them could be overridden */ - sts = MFXVideoENCODE_GetVideoParam(session, &videoParam); - if (sts != MFX_ERR_NONE) diff --git a/multimedia/handbrake/files/patch-libhb_handbrake_qsv__common.h b/multimedia/handbrake/files/patch-libhb_handbrake_qsv__common.h index 87c487304cad..d96a628ca015 100644 --- a/multimedia/handbrake/files/patch-libhb_handbrake_qsv__common.h +++ b/multimedia/handbrake/files/patch-libhb_handbrake_qsv__common.h @@ -1,12 +1,17 @@ ---- libhb/handbrake/qsv_common.h.orig 2024-12-01 15:28:40 UTC +--- libhb/handbrake/qsv_common.h.orig 2025-08-08 16:41:24 UTC +++ libhb/handbrake/qsv_common.h -@@ -171,7 +171,9 @@ typedef struct +@@ -260,8 +260,13 @@ typedef struct + { mfxExtCodingOption2 codingOption2; - mfxExtVideoSignalInfo videoSignalInfo; - mfxExtHyperModeParam hyperEncodeParam; + hb_triplet_t* hyperEncodeParam; +#if (MFX_VERSION >= 2012) mfxExtAV1ScreenContentTools av1ScreenContentToolsParam; +- +#endif - mfxExtChromaLocInfo chromaLocInfo; - mfxExtMasteringDisplayColourVolume masteringDisplayColourVolume; - mfxExtContentLightLevelInfo contentLightLevelInfo; ++ mfxExtChromaLocInfo chromaLocInfo; ++ mfxExtMasteringDisplayColourVolume masteringDisplayColourVolume; ++ mfxExtContentLightLevelInfo contentLightLevelInfo; ++ mfxExtAV1BitstreamParam av1BitstreamParam; + struct + { + int b_pyramid; diff --git a/multimedia/handbrake/files/patch-libhb_qsv__common.c b/multimedia/handbrake/files/patch-libhb_qsv__common.c index 78580b06be46..b0b892e337e7 100644 --- a/multimedia/handbrake/files/patch-libhb_qsv__common.c +++ b/multimedia/handbrake/files/patch-libhb_qsv__common.c @@ -1,6 +1,6 @@ ---- libhb/qsv_common.c.orig 2024-12-01 15:28:40 UTC +--- libhb/qsv_common.c.orig 2025-08-08 16:41:24 UTC +++ libhb/qsv_common.c -@@ -463,6 +463,7 @@ int qsv_map_mfx_platform_codename(int mfx_platform_cod +@@ -390,6 +390,7 @@ int qsv_map_mfx_platform_codename(int mfx_platform_cod case MFX_PLATFORM_DG2: case MFX_PLATFORM_ALDERLAKE_N: case MFX_PLATFORM_KEEMBAY: @@ -8,7 +8,7 @@ case MFX_PLATFORM_METEORLAKE: case MFX_PLATFORM_BATTLEMAGE: case MFX_PLATFORM_ARROWLAKE: -@@ -471,6 +472,7 @@ int qsv_map_mfx_platform_codename(int mfx_platform_cod +@@ -398,6 +399,7 @@ int qsv_map_mfx_platform_codename(int mfx_platform_cod case MFX_PLATFORM_LUNARLAKE: platform = HB_CPU_PLATFORM_INTEL_LNL; break; @@ -16,35 +16,34 @@ default: platform = HB_CPU_PLATFORM_UNSPECIFIED; } -@@ -984,7 +986,7 @@ static void init_ext_av1bitstream_option(mfxExtAV1Bits - extAV1BitstreamParam->Header.BufferSz = sizeof(mfxExtAV1BitstreamParam); - extAV1BitstreamParam->WriteIVFHeaders = MFX_CODINGOPTION_OFF; +@@ -928,6 +930,7 @@ static void init_ext_coding_option2(mfxExtCodingOption + extCodingOption2->NumMbPerSlice = 2040; // 1920x1088/4 } -- + +#if (MFX_VERSION >= 2012) - static void init_ext_av1screencontent_tools(mfxExtAV1ScreenContentTools *extScreenContentTools) + static void init_ext_av1bitstream_option(mfxExtAV1BitstreamParam *extAV1BitstreamParam) { - if (extScreenContentTools == NULL) -@@ -998,7 +1000,7 @@ static void init_ext_av1screencontent_tools(mfxExtAV1S + if (extAV1BitstreamParam == NULL) +@@ -954,6 +957,7 @@ static void init_ext_av1screencontent_tools(mfxExtAV1S extScreenContentTools->IntraBlockCopy = MFX_CODINGOPTION_OFF; extScreenContentTools->Palette = MFX_CODINGOPTION_OFF; } -- +#endif + static int query_capabilities(mfxSession session, int index, mfxVersion version, hb_qsv_info_t *info, int lowpower) { - /* -@@ -1026,7 +1028,9 @@ static int query_capabilities(mfxSession session, int +@@ -981,8 +985,10 @@ static int query_capabilities(mfxSession session, int + mfxExtChromaLocInfo extChromaLocInfo; mfxExtMasteringDisplayColourVolume extMasteringDisplayColourVolume; mfxExtContentLightLevelInfo extContentLightLevelInfo; - mfxExtAV1BitstreamParam extAV1BitstreamParam; +#if (MFX_VERSION >= 2012) + mfxExtAV1BitstreamParam extAV1BitstreamParam; mfxExtAV1ScreenContentTools extAV1ScreenContentToolsParam; +#endif mfxExtHyperModeParam extHyperEncodeParam; /* Reset capabilities before querying */ -@@ -1460,6 +1464,7 @@ static int query_capabilities(mfxSession session, int +@@ -1416,6 +1422,7 @@ static int query_capabilities(mfxSession session, int info->capabilities |= HB_QSV_CAP_HYPERENCODE; } } @@ -52,7 +51,7 @@ if ((lowpower == MFX_CODINGOPTION_ON) && (info->codec_id == MFX_CODEC_AV1)) { init_video_param(&videoParam); -@@ -1494,6 +1499,7 @@ static int query_capabilities(mfxSession session, int +@@ -1450,6 +1457,7 @@ static int query_capabilities(mfxSession session, int info->capabilities |= HB_QSV_CAP_AV1_SCREENCONTENT; } } @@ -60,7 +59,7 @@ } return 0; -@@ -1935,10 +1941,12 @@ static void log_encoder_capabilities(const int log_lev +@@ -1891,10 +1899,12 @@ static void log_encoder_capabilities(const int log_lev strcat(buffer, "+nmpslice"); } } @@ -73,15 +72,31 @@ if (caps & HB_QSV_CAP_HYPERENCODE) { strcat(buffer, " hyperencode"); -@@ -3011,6 +3019,7 @@ int hb_qsv_param_parse(hb_qsv_param_t *param, hb_qsv_i - param->hyperEncodeParam.Mode = mode->value; +@@ -2686,6 +2696,7 @@ int hb_qsv_select_ffmpeg_options(qsv_data_t * qsv_data + hb_log("encavcodec: using Low Power mode"); + } + ++#if (MFX_VERSION >= 2012) + if((qsv_data->qsv_info->capabilities & HB_QSV_CAP_AV1_SCREENCONTENT) && + qsv_data->param.av1ScreenContentToolsParam.IntraBlockCopy) + { +@@ -2705,6 +2716,7 @@ int hb_qsv_select_ffmpeg_options(qsv_data_t * qsv_data + hb_log("encavcodec: ScreenContentCoding is enabled Palette %s", + qsv_data->param.av1ScreenContentToolsParam.Palette ? "on" : "off"); + } ++#endif + + // Transcoding Info + MFX_STRUCT_TO_AV_OPTS(BRCParamMultiplier) +@@ -3318,6 +3330,7 @@ int hb_qsv_param_parse(AVDictionary** av_opts, hb_qsv_ + param->hyperEncodeParam = mode; } } +#if (MFX_VERSION >= 2012) else if (!strcasecmp(key, "palette")) { if (info->capabilities & HB_QSV_CAP_AV1_SCREENCONTENT) -@@ -3041,6 +3050,7 @@ int hb_qsv_param_parse(hb_qsv_param_t *param, hb_qsv_i +@@ -3348,6 +3361,7 @@ int hb_qsv_param_parse(AVDictionary** av_opts, hb_qsv_ return HB_QSV_PARAM_UNSUPPORTED; } } @@ -89,32 +104,24 @@ else if (!strcasecmp(key, "async-depth")) { int async_depth = hb_qsv_atoi(value, &error); -@@ -3527,13 +3537,14 @@ int hb_qsv_param_default(hb_qsv_param_t *param, mfxVid - param->av1BitstreamParam.Header.BufferId = MFX_EXTBUFF_AV1_BITSTREAM_PARAM; - param->av1BitstreamParam.Header.BufferSz = sizeof(mfxExtAV1BitstreamParam); - param->av1BitstreamParam.WriteIVFHeaders = MFX_CODINGOPTION_OFF; +@@ -3617,6 +3631,12 @@ int hb_qsv_param_default(hb_qsv_param_t *param, hb_qsv + // introduced in API 2.5 + param->hyperEncodeParam = hb_triplet4key(hb_qsv_hyper_encode_modes, "off"); + ++ memset(¶m->av1BitstreamParam, 0, sizeof(mfxExtAV1BitstreamParam)); ++ param->av1BitstreamParam.Header.BufferId = MFX_EXTBUFF_AV1_BITSTREAM_PARAM; ++ param->av1BitstreamParam.Header.BufferSz = sizeof(mfxExtAV1BitstreamParam); ++ param->av1BitstreamParam.WriteIVFHeaders = MFX_CODINGOPTION_OFF; ++ +#if (MFX_VERSION >= 2012) // introduced in API 2.11 memset(¶m->av1ScreenContentToolsParam, 0, sizeof(mfxExtAV1ScreenContentTools)); param->av1ScreenContentToolsParam.Header.BufferId = MFX_EXTBUFF_AV1_SCREEN_CONTENT_TOOLS; - param->av1ScreenContentToolsParam.Header.BufferSz = sizeof(mfxExtAV1ScreenContentTools); - param->av1ScreenContentToolsParam.IntraBlockCopy = MFX_CODINGOPTION_OFF; - param->av1ScreenContentToolsParam.Palette = MFX_CODINGOPTION_OFF; -- -+#endif - // GOP & rate control - param->gop.b_pyramid = 1; // enabled by default (if supported) - param->gop.gop_pic_size = -1; // set automatically -@@ -3607,10 +3618,12 @@ int hb_qsv_param_default(hb_qsv_param_t *param, mfxVid - { - param->videoParam->ExtParam[param->videoParam->NumExtParam++] = (mfxExtBuffer*)¶m->av1BitstreamParam; - } -+#if (MFX_VERSION >= 2012) - if (info->capabilities & HB_QSV_CAP_AV1_SCREENCONTENT) - { - param->videoParam->ExtParam[param->videoParam->NumExtParam++] = (mfxExtBuffer*)¶m->av1ScreenContentToolsParam; - } +@@ -3639,6 +3659,7 @@ int hb_qsv_param_default(hb_qsv_param_t *param, hb_qsv + param->rc.vbv_buffer_init = .0; // set automatically + + param->low_power = 0; +#endif + #if defined(_WIN32) || defined(__MINGW32__) if (info->capabilities & HB_QSV_CAP_LOWPOWER_ENCODE) - { diff --git a/multimedia/handbrake/files/patch-make_include_contrib.defs b/multimedia/handbrake/files/patch-make_include_contrib.defs new file mode 100644 index 000000000000..058246d98b42 --- /dev/null +++ b/multimedia/handbrake/files/patch-make_include_contrib.defs @@ -0,0 +1,11 @@ +--- make/include/contrib.defs.orig 2025-08-23 10:38:18 UTC ++++ make/include/contrib.defs +@@ -60,7 +60,7 @@ define import.CONTRIB.defs + $(1).EXTRACT.target = $$($(1).build/).stamp.$$($(1).name).extract + define $(1).EXTRACT + $$(RM.exe) -fr $$($(1).EXTRACT.dir/) +- $$(TAR.exe) xfC $$($(1).FETCH.distfile) $$($(1).build/) ++ $$(TAR.exe) xfC $$($(1).FETCH.distfile) $$($(1).build/) --no-xattrs + $$(TOUCH.exe) $$@ + endef + diff --git a/multimedia/handbrake/pkg-plist b/multimedia/handbrake/pkg-plist index 58dff1638400..47c05301ae8f 100644 --- a/multimedia/handbrake/pkg-plist +++ b/multimedia/handbrake/pkg-plist @@ -3,37 +3,20 @@ bin/HandBrakeCLI %%X11%%bin/HandBrake %%X11%%share/applications/fr.handbrake.ghb.desktop %%X11%%share/icons/hicolor/scalable/apps/fr.handbrake.ghb.svg -%%X11%%share/locale/af/LC_MESSAGES/ghb.mo %%X11%%share/locale/bg/LC_MESSAGES/ghb.mo %%X11%%share/locale/ca/LC_MESSAGES/ghb.mo %%X11%%share/locale/co/LC_MESSAGES/ghb.mo -%%X11%%share/locale/cs/LC_MESSAGES/ghb.mo -%%X11%%share/locale/da/LC_MESSAGES/ghb.mo %%X11%%share/locale/de/LC_MESSAGES/ghb.mo %%X11%%share/locale/es/LC_MESSAGES/ghb.mo %%X11%%share/locale/eu/LC_MESSAGES/ghb.mo %%X11%%share/locale/fi/LC_MESSAGES/ghb.mo %%X11%%share/locale/fr/LC_MESSAGES/ghb.mo -%%X11%%share/locale/he/LC_MESSAGES/ghb.mo -%%X11%%share/locale/hr/LC_MESSAGES/ghb.mo %%X11%%share/locale/it/LC_MESSAGES/ghb.mo %%X11%%share/locale/ja/LC_MESSAGES/ghb.mo -%%X11%%share/locale/ka/LC_MESSAGES/ghb.mo %%X11%%share/locale/ko/LC_MESSAGES/ghb.mo %%X11%%share/locale/nl/LC_MESSAGES/ghb.mo -%%X11%%share/locale/no/LC_MESSAGES/ghb.mo -%%X11%%share/locale/pl/LC_MESSAGES/ghb.mo -%%X11%%share/locale/pt/LC_MESSAGES/ghb.mo %%X11%%share/locale/pt_BR/LC_MESSAGES/ghb.mo -%%X11%%share/locale/ro/LC_MESSAGES/ghb.mo -%%X11%%share/locale/ru/LC_MESSAGES/ghb.mo -%%X11%%share/locale/si/LC_MESSAGES/ghb.mo -%%X11%%share/locale/sk/LC_MESSAGES/ghb.mo %%X11%%share/locale/sl_SI/LC_MESSAGES/ghb.mo %%X11%%share/locale/sv/LC_MESSAGES/ghb.mo -%%X11%%share/locale/th/LC_MESSAGES/ghb.mo -%%X11%%share/locale/tr/LC_MESSAGES/ghb.mo -%%X11%%share/locale/uk_UA/LC_MESSAGES/ghb.mo %%X11%%share/locale/zh_CN/LC_MESSAGES/ghb.mo -%%X11%%share/locale/zh_TW/LC_MESSAGES/ghb.mo %%X11%%share/metainfo/fr.handbrake.ghb.metainfo.xml diff --git a/multimedia/kew/Makefile b/multimedia/kew/Makefile index 53684fd0e945..a19c95840a64 100644 --- a/multimedia/kew/Makefile +++ b/multimedia/kew/Makefile @@ -1,6 +1,7 @@ PORTNAME= kew DISTVERSIONPREFIX= v DISTVERSION= 3.4.1 +PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= yuri@FreeBSD.org diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile index 8e10172157b4..4299cef229c5 100644 --- a/multimedia/mpv/Makefile +++ b/multimedia/mpv/Makefile @@ -1,10 +1,13 @@ PORTNAME= mpv DISTVERSIONPREFIX= v DISTVERSION= 0.40.0 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= multimedia audio +PATCH_SITES= https://github.com/mpv-player/mpv/commit/ +PATCHFILES= 26b29fba02a2782f68e2906f837d21201fc6f1b9.patch:-p1 + MAINTAINER= multimedia@FreeBSD.org COMMENT= Free and open-source general-purpose video player WWW= https://mpv.io diff --git a/multimedia/mpv/distinfo b/multimedia/mpv/distinfo index 614447cd682c..6b56c0e1e5dc 100644 --- a/multimedia/mpv/distinfo +++ b/multimedia/mpv/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1742924007 +TIMESTAMP = 1756628590 SHA256 (mpv-player-mpv-v0.40.0_GH0.tar.gz) = 10a0f4654f62140a6dd4d380dcf0bbdbdcf6e697556863dc499c296182f081a3 SIZE (mpv-player-mpv-v0.40.0_GH0.tar.gz) = 3561474 +SHA256 (26b29fba02a2782f68e2906f837d21201fc6f1b9.patch) = 9596f2390a120a54d1bc48a3937d6f236feab0c4cecaae8a0d3dec59a38e29b3 +SIZE (26b29fba02a2782f68e2906f837d21201fc6f1b9.patch) = 1569 diff --git a/multimedia/nymphcast/Makefile b/multimedia/nymphcast/Makefile index 92f621330a0e..a92397b3d2e7 100644 --- a/multimedia/nymphcast/Makefile +++ b/multimedia/nymphcast/Makefile @@ -1,6 +1,6 @@ PORTNAME= NymphCast DISTVERSION= v0.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= multimedia MAINTAINER= adridg@FreeBSD.org diff --git a/multimedia/obuparse/Makefile b/multimedia/obuparse/Makefile index f0d5f5b76336..6e156c658e1a 100644 --- a/multimedia/obuparse/Makefile +++ b/multimedia/obuparse/Makefile @@ -1,5 +1,6 @@ PORTNAME= obuparse -DISTVERSION= g20241212 +DISTVERSIONPREFIX= v +DISTVERSION= 2.0.1 CATEGORIES= multimedia MAINTAINER= diizzy@FreeBSD.org @@ -9,22 +10,19 @@ WWW= https://github.com/dwbuiten/obuparse LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/LICENSE -USES= gmake +USES= cmake USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= dwbuiten -GH_TAGNAME= 918524a - -MAKE_ARGS+= PREFIX="${STAGEDIR}${PREFIX}" - -INSTALL_TARGET= install-shared PLIST_FILES= include/obuparse.h \ lib/libobuparse.so \ - lib/libobuparse.so.1 + lib/libobuparse.so.2 \ + lib/libobuparse.so.${DISTVERSION} -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libobuparse.so.1 +post-patch: + @${REINPLACE_CMD} -e 's|%%DISTVERSION%%|${DISTVERSION}|g' \ + ${PATCH_WRKSRC}/CMakeLists.txt .include <bsd.port.mk> diff --git a/multimedia/obuparse/distinfo b/multimedia/obuparse/distinfo index 2cf89e5bdd7f..a877f417306f 100644 --- a/multimedia/obuparse/distinfo +++ b/multimedia/obuparse/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743990877 -SHA256 (dwbuiten-obuparse-g20241212-918524a_GH0.tar.gz) = b23bb4a6eeb77514a5bbc64448666f62cea94bce5346b6ee605b76386a776804 -SIZE (dwbuiten-obuparse-g20241212-918524a_GH0.tar.gz) = 29526 +TIMESTAMP = 1756578144 +SHA256 (dwbuiten-obuparse-v2.0.1_GH0.tar.gz) = 99198db70a34f5448a188983208d52aac8b1ed5d076913d3f621b5abffc3cb71 +SIZE (dwbuiten-obuparse-v2.0.1_GH0.tar.gz) = 29651 diff --git a/multimedia/obuparse/files/patch-CMakeLists.txt b/multimedia/obuparse/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..9b8ca2dc856a --- /dev/null +++ b/multimedia/obuparse/files/patch-CMakeLists.txt @@ -0,0 +1,78 @@ +--- CMakeLists.txt.orig 2025-08-30 18:33:06 UTC ++++ CMakeLists.txt +@@ -0,0 +1,75 @@ ++cmake_minimum_required(VERSION 3.15) ++ ++project(OBUParse VERSION %%DISTVERSION%% LANGUAGES C) ++ ++# --- Set Standard Output Directories --- ++set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) ++set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) ++set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) ++ ++# --- Build Options --- ++# On MSVC, we only build static to avoid DLL export complexity and naming collisions. ++# On other platforms (including MinGW on Windows), we can build both. ++option(BUILD_SHARED_LIBS "Build the shared library" ON) ++option(BUILD_STATIC_LIBS "Build the static library" OFF) ++ ++if(NOT BUILD_SHARED_LIBS AND NOT BUILD_STATIC_LIBS) ++ message(FATAL_ERROR "You must choose to build at least one library type.") ++endif() ++ ++# --- Library Targets --- ++ ++if(BUILD_SHARED_LIBS) # This block will now be skipped on MSVC ++ add_library(obuparse_shared SHARED obuparse.c) ++ set_target_properties(obuparse_shared PROPERTIES ++ OUTPUT_NAME "obuparse" ++ VERSION ${PROJECT_VERSION} ++ SOVERSION 2 ++ EXPORT_NAME "shared" ++ ) ++ target_include_directories(obuparse_shared PUBLIC ++ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> ++ $<INSTALL_INTERFACE:include> ++ ) ++ add_library(OBUParse::shared ALIAS obuparse_shared) ++endif() ++ ++if(BUILD_STATIC_LIBS) ++ add_library(obuparse_static STATIC obuparse.c) ++ # The naming collision only happens with MSVC, not MinGW. ++ if(MSVC) ++ set_target_properties(obuparse_static PROPERTIES OUTPUT_NAME "obuparses") ++ else() ++ set_target_properties(obuparse_static PROPERTIES OUTPUT_NAME "obuparse") ++ endif() ++ set_target_properties(obuparse_static PROPERTIES EXPORT_NAME "static") ++ target_include_directories(obuparse_static PUBLIC ++ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> ++ $<INSTALL_INTERFACE:include> ++ ) ++ add_library(OBUParse::static ALIAS obuparse_static) ++endif() ++ ++# --- Installation --- ++include(GNUInstallDirs) ++ ++# Install the public header file ++install(FILES obuparse.h ++ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" ++) ++ ++set(BUILT_TARGETS "") ++if(TARGET obuparse_static) ++ list(APPEND BUILT_TARGETS obuparse_static) ++endif() ++if(TARGET obuparse_shared) ++ list(APPEND BUILT_TARGETS obuparse_shared) ++endif() ++ ++# Install the library targets that were built, and the tool ++install(TARGETS ${BUILT_TARGETS} ++ EXPORT OBUParseTargets ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ++ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ++) diff --git a/multimedia/obuparse/files/patch-Makefile b/multimedia/obuparse/files/patch-Makefile deleted file mode 100644 index b371f44188b8..000000000000 --- a/multimedia/obuparse/files/patch-Makefile +++ /dev/null @@ -1,33 +0,0 @@ ---- Makefile.orig 2023-07-12 18:02:40 UTC -+++ Makefile -@@ -1,9 +1,9 @@ - PREFIX=/usr/local - --CFLAGS := -O3 -std=c99 -Wall -Wextra -g -fPIC -I. $(CPPFLAGS) -+CFLAGS += -std=c99 -Wall -Wextra -fPIC -I. $(CPPFLAGS) - LDFLAGS += --CC := $(CROSS)gcc --AR := $(CROSS)ar -+CC := $(CC) -+AR := $(AR) - - ifneq (,$(findstring mingw,$(CC))) - LIBSUF=.dll -@@ -11,7 +11,7 @@ ifneq (,$(findstring mingw,$(CC))) - SYSTEM=MINGW - else - LIBSUF=.so -- LDFLAGS=-Wl,--version-script,obuparse.v -+ LDFLAGS+= -Wl,--version-script,obuparse.v - endif - - all: libobuparse$(LIBSUF) libobuparse.a -@@ -24,7 +24,7 @@ libobuparse.a: obuparse.o - $(AR) rcs $@ $^ - - libobuparse$(LIBSUF): obuparse.o -- $(CC) $(LDFLAGS) -shared $^ -o $@ -+ $(CC) $(LDFLAGS) -shared $^ -o $@ -Wl,-soname,libobuparse$(LIBSUF).1 - - install: install-shared install-static - diff --git a/multimedia/pitivi/Makefile b/multimedia/pitivi/Makefile index e3d0425730dd..20e000ba9056 100644 --- a/multimedia/pitivi/Makefile +++ b/multimedia/pitivi/Makefile @@ -1,6 +1,6 @@ PORTNAME= pitivi DISTVERSION= 2023.03 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= GNOME diff --git a/multimedia/py-moviepy/Makefile b/multimedia/py-moviepy/Makefile index 788382e359c8..6440ffaa63b8 100644 --- a/multimedia/py-moviepy/Makefile +++ b/multimedia/py-moviepy/Makefile @@ -1,5 +1,6 @@ PORTNAME= moviepy PORTVERSION= 2.2.1 +PORTREVISION= 1 CATEGORIES= multimedia python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/multimedia/py-tartube/Makefile b/multimedia/py-tartube/Makefile index 58f33925ea0f..0fe4f7d270d2 100644 --- a/multimedia/py-tartube/Makefile +++ b/multimedia/py-tartube/Makefile @@ -1,5 +1,6 @@ PORTNAME= tartube DISTVERSION= 2.5.164 +PORTREVISION= 1 CATEGORIES= multimedia python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/multimedia/ytfzf/Makefile b/multimedia/ytfzf/Makefile index 02f2097bed31..f1a4cf1713c7 100644 --- a/multimedia/ytfzf/Makefile +++ b/multimedia/ytfzf/Makefile @@ -1,6 +1,7 @@ PORTNAME= ytfzf DISTVERSIONPREFIX= v DISTVERSION= 2.6.2 +PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= eduardo@FreeBSD.org |