Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 41B3B84EE6 for ; Thu, 3 Aug 2023 02:03:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id ONVZWSMs3qdk for ; Thu, 3 Aug 2023 02:03:16 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id A1B4884CF2 for ; Thu, 3 Aug 2023 02:03:16 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 958C2FBDB; Thu, 3 Aug 2023 02:03:16 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_169102819660840" MIME-Version: 1.0 Date: Thu, 3 Aug 2023 02:03:16 +0000 From: "Mark Davies" Subject: CVS commit: pkgsrc/multimedia/mlt To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: markd@netbsd.org X-Mailer: log_accum Message-Id: <20230803020316.958C2FBDB@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_169102819660840 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="UTF-8" Module Name: pkgsrc Committed By: markd Date: Thu Aug 3 02:03:16 UTC 2023 Modified Files: pkgsrc/multimedia/mlt: Makefile PLIST distinfo pkgsrc/multimedia/mlt/patches: patch-src_framework_mlt__properties.c patch-src_framework_mlt__property.h Log Message: mlt: update to 7.18.0 v7.18.0 released Framework * Added mlt_audio_free_data(). * Added meta.playlist.clip_position and meta.playlist.clip_length properties to mlt_playlist. * Fixed mlt_frame_get_audio fails on mlt_audio_none. Modules * Added two audio filters to core module to be used on a playlist/track. * Fixed a crash in vidstab filter on image format change. * Fixed font weight in qtext filter on Qt 6. * Fixed yuv420p not working in rescale filter. * Fixed text shadow outline in kdenlivetitle producer. * Fixed crash when changing the profile with count producer. * Fixed constructor corruption in frei0r module. * Fixed deinterlace link was added to invalid producer in xml producer. * Fixed producers not indicating progressive scan video. * Fixed video scan mode detection in avformat producers that only indicate on their container format and not on frames such as Ut Video in Matroska. * Fixed very large images in qimage producer on Qt 6. * Fixed seeking on clips that use speed_map in timeremap link. * Fixed a color level problem with sRGB inputs in the movit module. * Fixed avformat producer’s deallocation function for AVCodecContext. * Fixed field order of qtblend and frei0r.cairoblend transitions. * Changed the avformat producer seek_threshold default to 64. * Updated ebur128 filter to version 1.2.6. v7.16.0 released Framework * Added a chain_normalizers.ini to the data directory. * Added New C functions to support deinterlacer links. * Added support for loading a filter as a link via mlt_link_filter_init(). * Added enum mlt_deinterlacer. * Added new 10-bit YUV members to enum mlt_image_format. * Fixed a deadlock and improved quality of start of playback when mlt_consumer property prefill is greater than 1. * Fixed a couple of data races in mlt_events and mlt_consumer. * Fixed a crash in mlt_frame_clone() with movit and the mask_start filter. Modules * Fixed regressions in version 7.14.0: * Added avformat/avdeinterlace (default) and xine/deinterlace links. * Fixed deinterlacing in the multi and qglsl consumers. * Added 10-bit video support to movit.convert filter. * Several things in the avformat producer. * Fixed FFmpeg version 6 compilation error. * Fixed rendering the text outline in kdenlivetitle producer. * Fixed 'movit.rect property animation. * Fixed corrupt video in crop filter when mlt_image_yuv420p requested. * Fixed possible null pointer crashes in some audio filters. * Fixed a possible roi assert crash in opencv.tracker filter. * Added support for “Nano” algo to the opencv.tracker filter. * Added the property fix_background_alpha to the luma transition. v7.14.0 released Framework * Added functions to get detailed info about a producer more directly. * Added functions to add normalizer links to chains. * Changed locale_t to mlt_locale_t to avoid redefinition on some systems. * Fixed the value provided with event “consumer-thread-join” to be mlt_event_data_thread as documented. * Fixed mlt_image_format_planes() for mlt_image_yuv420p. Modules * Added a swresample link to the avformat module. * Added a resample link to the resample module. * Fixed compatibility of avformat module with FFmpeg version 6. * Fixed rotoscoping filter when request image size different than profile. * Fixed timeremap link breaking crop filter. * Fixed audio/video sync in avformat producer when the video start time is not 0. * Improved seeking on a WMA audio file in avformat producer. * Optimization to set AVDISCARD_ALL on disinterested streams in avformat producer. * Added separate demuxing thread in avformat producer. * Added filtergraph property to the avformat producer. * Fixed filter movit.convert’s CPU image converter in mlt_tractor and mlt_frame_clone(). * Fixed using movit module with mlt_chain. * Fixed 10-bit full range YUV color input with Movit. * Fixed aspect ratio issues in qtblend filter transform. * Fixed the movit.luma transition. * Changed the qglsl consumer to use an OpenGL core profile version 3.2 context to make it compatible with recent Movit versions. * Upgraded glaxnimate git submodule to version 0.5.2. * Fixed xml producer incorrectly adds a path prefix to a consumer producer. * Fixed using opencv.tracker filter with mlt_chain. * Added interlace-aware chroma conversion from mlt_image_yuv422 to yuv420p in the avformat consumer. * Added the speed_map property to the timeremap link. * Fixed the loader producer not injecting the consumer producer when a xml producer changes the frame rate. * Fixed ‘loader’ producer corrupts the profile colorspace and description when it injects a consumer producer. * Added a loader-nogl producer to the core module based on loader but prevents adding movit-based filters. * Changed count producer to take an optional string argument with the name of a loader producer. * Fixed yadif deinterlace not working in a mlt_chain. * Fixed the bob, weave, greedy, onefield deinterlace filter methods on x86-64 architecture. v7.12.0 released This version is released soon after 7.10.0 to fix a couple of major new bugs in the popular qtblend and frei0r.cairoblend transitions. It also includes new color animation APIs with sensible interpolation! v7.10.0 released The highlight of this version is support for Qt 6. To generate a diff of this commit: cvs rdiff -u -r1.129 -r1.130 pkgsrc/multimedia/mlt/Makefile cvs rdiff -u -r1.7 -r1.8 pkgsrc/multimedia/mlt/PLIST cvs rdiff -u -r1.15 -r1.16 pkgsrc/multimedia/mlt/distinfo cvs rdiff -u -r1.3 -r1.4 \ pkgsrc/multimedia/mlt/patches/patch-src_framework_mlt__properties.c \ pkgsrc/multimedia/mlt/patches/patch-src_framework_mlt__property.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_169102819660840 Content-Disposition: inline Content-Length: 10561 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/multimedia/mlt/Makefile diff -u pkgsrc/multimedia/mlt/Makefile:1.129 pkgsrc/multimedia/mlt/Makefile:1.130 --- pkgsrc/multimedia/mlt/Makefile:1.129 Mon May 22 21:00:40 2023 +++ pkgsrc/multimedia/mlt/Makefile Thu Aug 3 02:03:16 2023 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.129 2023/05/22 21:00:40 wiz Exp $ +# $NetBSD: Makefile,v 1.130 2023/08/03 02:03:16 markd Exp $ -DISTNAME= mlt-7.8.0 -PKGREVISION= 7 +DISTNAME= mlt-7.18.0 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_GITHUB:=mltframework/} GITHUB_TAG= v${PKGVERSION_NOREV} @@ -13,7 +12,6 @@ LICENSE= gnu-gpl-v2 USE_TOOLS+= pkg-config gmake USE_LANGUAGES= c c++ -USE_CMAKE= YES CFLAGS.NetBSD+= -DHAVE_LOCALE_H -DHAVE_STRTOD_L -D__SETLOCALE_SOURCE__ @@ -25,6 +23,7 @@ SUBST_SED.frei0r= -e 's^/usr/lib/frei0r- PKGCONFIG_OVERRIDE+= mlt++.pc.in PKGCONFIG_OVERRIDE+= mlt-framework.pc.in +.include "../../devel/cmake/build.mk" .include "../../audio/alsa-lib/buildlink3.mk" .include "../../audio/jack/buildlink3.mk" .include "../../audio/ladspa/buildlink3.mk" @@ -39,7 +38,7 @@ PKGCONFIG_OVERRIDE+= mlt-framework.pc.in .include "../../devel/pango/buildlink3.mk" .include "../../graphics/gdk-pixbuf2/buildlink3.mk" .include "../../graphics/libexif/buildlink3.mk" -.include "../../multimedia/ffmpeg4/buildlink3.mk" +.include "../../multimedia/ffmpeg5/buildlink3.mk" .include "../../multimedia/frei0r/buildlink3.mk" .include "../../multimedia/libdv/buildlink3.mk" .include "../../multimedia/movit/buildlink3.mk" Index: pkgsrc/multimedia/mlt/PLIST diff -u pkgsrc/multimedia/mlt/PLIST:1.7 pkgsrc/multimedia/mlt/PLIST:1.8 --- pkgsrc/multimedia/mlt/PLIST:1.7 Thu Sep 29 00:06:48 2022 +++ pkgsrc/multimedia/mlt/PLIST Thu Aug 3 02:03:16 2023 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2022/09/29 00:06:48 markd Exp $ +@comment $NetBSD: PLIST,v 1.8 2023/08/03 02:03:16 markd Exp $ bin/melt bin/melt-7 include/mlt-7/framework/mlt.h @@ -96,12 +96,20 @@ lib/pkgconfig/mlt-framework-7.pc man/man1/melt-7.1 share/mlt-7/avformat/blacklist.txt share/mlt-7/avformat/consumer_avformat.yml +share/mlt-7/avformat/filter_avcolour_space.yml +share/mlt-7/avformat/filter_avdeinterlace.yml +share/mlt-7/avformat/filter_swresample.yml +share/mlt-7/avformat/filter_swscale.yml +share/mlt-7/avformat/link_avdeinterlace.yml +share/mlt-7/avformat/link_swresample.yml share/mlt-7/avformat/producer_avformat.yml share/mlt-7/avformat/resolution_scale.yml share/mlt-7/avformat/yuv_only.txt +share/mlt-7/chain_normalizers.ini share/mlt-7/core/consumer_multi.yml share/mlt-7/core/filter_audiomap.yml share/mlt-7/core/filter_audiowave.yml +share/mlt-7/core/filter_autofade.yml share/mlt-7/core/filter_box_blur.yml share/mlt-7/core/filter_brightness.yml share/mlt-7/core/filter_channelcopy.yml @@ -128,6 +136,7 @@ share/mlt-7/core/loader.ini share/mlt-7/core/producer_colour.yml share/mlt-7/core/producer_consumer.yml share/mlt-7/core/producer_hold.yml +share/mlt-7/core/producer_loader-nogl.yml share/mlt-7/core/producer_loader.yml share/mlt-7/core/producer_melt.yml share/mlt-7/core/producer_melt_file.yml @@ -159,6 +168,8 @@ share/mlt-7/kdenlive/filter_wave.yml share/mlt-7/kdenlive/producer_framebuffer.yml share/mlt-7/metaschema.yaml share/mlt-7/movit/filter_movit_blur.yml +share/mlt-7/movit/filter_movit_convert.yml +share/mlt-7/movit/filter_movit_crop.yml share/mlt-7/movit/filter_movit_deconvolution_sharpen.yml share/mlt-7/movit/filter_movit_diffusion.yml share/mlt-7/movit/filter_movit_flip.yml @@ -167,6 +178,8 @@ share/mlt-7/movit/filter_movit_lift_gamm share/mlt-7/movit/filter_movit_mirror.yml share/mlt-7/movit/filter_movit_opacity.yml share/mlt-7/movit/filter_movit_rect.yml +share/mlt-7/movit/filter_movit_resample.yml +share/mlt-7/movit/filter_movit_resize.yml share/mlt-7/movit/filter_movit_saturation.yml share/mlt-7/movit/filter_movit_vignette.yml share/mlt-7/movit/filter_movit_white_balance.yml @@ -303,6 +316,14 @@ share/mlt-7/presets/consumer/avformat/st share/mlt-7/presets/consumer/avformat/stills/TGA share/mlt-7/presets/consumer/avformat/stills/TIFF share/mlt-7/presets/consumer/avformat/stills/webp +share/mlt-7/presets/consumer/avformat/ten_bit/AV1 +share/mlt-7/presets/consumer/avformat/ten_bit/DNxHR-HQ +share/mlt-7/presets/consumer/avformat/ten_bit/FFV1 +share/mlt-7/presets/consumer/avformat/ten_bit/ProRes 422 +share/mlt-7/presets/consumer/avformat/ten_bit/ProRes 444 +share/mlt-7/presets/consumer/avformat/ten_bit/ProRes HQ +share/mlt-7/presets/consumer/avformat/ten_bit/x264-high10 +share/mlt-7/presets/consumer/avformat/ten_bit/x265-main10 share/mlt-7/presets/consumer/avformat/vp9 share/mlt-7/presets/consumer/avformat/webm share/mlt-7/presets/consumer/avformat/webm-pass1 @@ -402,6 +423,8 @@ share/mlt-7/profiles/vertical_hd_60 share/mlt-7/qt/filter_audiolevelgraph.yml share/mlt-7/qt/filter_audiospectrum.yml share/mlt-7/qt/filter_audiowaveform.yml +share/mlt-7/qt/filter_gpsgraphic.yml +share/mlt-7/qt/filter_gpstext.yml share/mlt-7/qt/filter_lightshow.yml share/mlt-7/qt/filter_qtblend.yml share/mlt-7/qt/filter_qtcrop.yml @@ -413,14 +436,16 @@ share/mlt-7/qt/producer_qtext.yml share/mlt-7/qt/transition_qtblend.yml share/mlt-7/qt/transition_vqm.yml share/mlt-7/resample/filter_resample.yml +share/mlt-7/resample/link_resample.yml share/mlt-7/rtaudio/consumer_rtaudio.yml share/mlt-7/sdl2/consumer_sdl2.yml share/mlt-7/sdl2/consumer_sdl2_audio.yml share/mlt-7/sox/filter_sox.yml share/mlt-7/sox/filter_sox_effect.yml share/mlt-7/vorbis/producer_vorbis.yml +share/mlt-7/xine/filter_deinterlace.yml +share/mlt-7/xine/link_deinterlace.yml share/mlt-7/xml/consumer_xml.yml -share/mlt-7/xml/filter_gpstext.yml share/mlt-7/xml/mlt-xml.dtd share/mlt-7/xml/producer_xml-nogl.yml share/mlt-7/xml/producer_xml-string.yml Index: pkgsrc/multimedia/mlt/distinfo diff -u pkgsrc/multimedia/mlt/distinfo:1.15 pkgsrc/multimedia/mlt/distinfo:1.16 --- pkgsrc/multimedia/mlt/distinfo:1.15 Thu Sep 29 00:06:48 2022 +++ pkgsrc/multimedia/mlt/distinfo Thu Aug 3 02:03:16 2023 @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.15 2022/09/29 00:06:48 markd Exp $ +$NetBSD: distinfo,v 1.16 2023/08/03 02:03:16 markd Exp $ -BLAKE2s (mlt-7.8.0.tar.gz) = b5b1b20d1db2e52afccad244bb9f6d41b558ca127f84b48777e586f83b29ea9e -SHA512 (mlt-7.8.0.tar.gz) = da24e59a8fab719eb5352fd3583578938e7f2161f022747e476fe817746ea4c44b8e4319d1b7fefcf075087c255664efdbed1ce81dd22904b68335b5b218f7b2 -Size (mlt-7.8.0.tar.gz) = 1221406 bytes -SHA1 (patch-src_framework_mlt__properties.c) = 5e8b30cdabb90ed96a122a2654dc254f74a87374 -SHA1 (patch-src_framework_mlt__property.h) = d477cd70b6fecba00f26a5c8f155c9bab73aea03 +BLAKE2s (mlt-7.18.0.tar.gz) = 76a8fe593fd64a42bd35668f8dcbfaf0abb1da40861c5799821d912c6e50fd74 +SHA512 (mlt-7.18.0.tar.gz) = ad2b17df520a636319d6b5e54f1cc3bfd2196329fa45a36310986e3f3563e2b160ca5b9f393f5f3e62e6d4d275856e68b1ba8614e3712624c127ce37834d9b78 +Size (mlt-7.18.0.tar.gz) = 1317235 bytes +SHA1 (patch-src_framework_mlt__properties.c) = b6488d86d8411e5754c034e85f55776e66b66f55 +SHA1 (patch-src_framework_mlt__property.h) = 1303179e736e42d458991b8e128bbbcfafac2118 Index: pkgsrc/multimedia/mlt/patches/patch-src_framework_mlt__properties.c diff -u pkgsrc/multimedia/mlt/patches/patch-src_framework_mlt__properties.c:1.3 pkgsrc/multimedia/mlt/patches/patch-src_framework_mlt__properties.c:1.4 --- pkgsrc/multimedia/mlt/patches/patch-src_framework_mlt__properties.c:1.3 Wed Nov 27 21:32:09 2019 +++ pkgsrc/multimedia/mlt/patches/patch-src_framework_mlt__properties.c Thu Aug 3 02:03:16 2023 @@ -1,24 +1,24 @@ -$NetBSD: patch-src_framework_mlt__properties.c,v 1.3 2019/11/27 21:32:09 markd Exp $ +$NetBSD: patch-src_framework_mlt__properties.c,v 1.4 2023/08/03 02:03:16 markd Exp $ Add conditional section for __NetBSD__ ---- src/framework/mlt_properties.c.orig 2019-11-12 01:44:42.000000000 +0000 +--- src/framework/mlt_properties.c.orig 2023-07-28 18:06:26.000000000 +0000 +++ src/framework/mlt_properties.c -@@ -141,7 +141,7 @@ int mlt_properties_set_lcnumeric( mlt_pr - { - property_list *list = self->local; +@@ -144,7 +144,7 @@ int mlt_properties_set_lcnumeric(mlt_pro + if (self && locale) { + property_list *list = self->local; -#if defined(__GLIBC__) || defined(__APPLE__) +#if defined(__GLIBC__) || defined(__APPLE__) || (defined(__NetBSD__) && defined(LC_C_LOCALE)) - if ( list->locale ) - freelocale( list->locale ); - list->locale = newlocale( LC_NUMERIC_MASK, locale, NULL ); -@@ -1425,7 +1425,7 @@ void mlt_properties_close( mlt_propertie - free( list->name[ index ] ); - } + if (list->locale) + freelocale(list->locale); + list->locale = newlocale(LC_NUMERIC_MASK, locale, NULL); +@@ -1509,7 +1509,7 @@ void mlt_properties_close(mlt_properties + free(list->name[index]); + } -#if defined(__GLIBC__) || defined(__APPLE__) +#if defined(__GLIBC__) || defined(__APPLE__) || (defined(__NetBSD__) && defined(LC_C_LOCALE)) - // Cleanup locale - if ( list->locale ) - freelocale( list->locale ); + // Cleanup locale + if (list->locale) + freelocale(list->locale); Index: pkgsrc/multimedia/mlt/patches/patch-src_framework_mlt__property.h diff -u pkgsrc/multimedia/mlt/patches/patch-src_framework_mlt__property.h:1.3 pkgsrc/multimedia/mlt/patches/patch-src_framework_mlt__property.h:1.4 --- pkgsrc/multimedia/mlt/patches/patch-src_framework_mlt__property.h:1.3 Wed Nov 27 21:32:09 2019 +++ pkgsrc/multimedia/mlt/patches/patch-src_framework_mlt__property.h Thu Aug 3 02:03:16 2023 @@ -1,14 +1,15 @@ -$NetBSD: patch-src_framework_mlt__property.h,v 1.3 2019/11/27 21:32:09 markd Exp $ +$NetBSD: patch-src_framework_mlt__property.h,v 1.4 2023/08/03 02:03:16 markd Exp $ Add conditional section for __NetBSD__ ---- src/framework/mlt_property.h.orig 2019-11-12 14:44:42.000000000 +1300 +--- src/framework/mlt_property.h.orig 2023-07-28 18:06:26.000000000 +0000 +++ src/framework/mlt_property.h -@@ -37,6 +37,7 @@ - #elif defined(__OpenBSD__) - /* XXX matches __nop_locale glue in libc++ */ - typedef void* locale_t; -+#elif defined(__NetBSD__) && defined(LC_C_LOCALE) - #else - typedef char* locale_t; +@@ -30,7 +30,7 @@ + #include #endif + +-#if (defined(__linux__) && !defined(__APPLE__)) ++#if (defined(__linux__) && !defined(__APPLE__)) || (defined(__NetBSD__) && defined(LC_C_LOCALE)) + #include + typedef locale_t mlt_locale_t; + #elif defined(__APPLE__) || (defined(__FreeBSD_version) && __FreeBSD_version >= 900506) --_----------=_169102819660840--