diff options
| -rw-r--r-- | MOVED | 1 | ||||
| -rw-r--r-- | Mk/Uses/mlt.mk | 2 | ||||
| -rw-r--r-- | multimedia/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/kdenlive/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/mlt7-qt/Makefile (renamed from multimedia/mlt7-qt5/Makefile) | 31 | ||||
| -rw-r--r-- | multimedia/mlt7-qt/pkg-plist | 16 | ||||
| -rw-r--r-- | multimedia/mlt7-qt5/pkg-plist | 14 | ||||
| -rw-r--r-- | multimedia/mlt7/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/mlt7/distinfo | 6 | ||||
| -rw-r--r-- | multimedia/mlt7/pkg-plist | 67 |
10 files changed, 81 insertions, 62 deletions
@@ -17635,3 +17635,4 @@ net-mgmt/zabbix5-frontend||2022-12-08|Requires php74 which was EOL on 2022-11-28 multimedia/php-pHash||2022-12-08|Requires php74 which was EOL on 2022-11-28 print/pecl-pdflib||2022-12-09|Requires php74 which was EOL on 2022-11-28 ftp/php-fastdfs||2022-12-09|Requires php74 which was EOL on 2022-11-28 +multimedia/mlt7-qt5|multimedia/mlt7-qt|2022-12-10|Flavorized for Qt5 and Qt6 diff --git a/Mk/Uses/mlt.mk b/Mk/Uses/mlt.mk index 3a0f2cfeb25d..c88415b5efc8 100644 --- a/Mk/Uses/mlt.mk +++ b/Mk/Uses/mlt.mk @@ -39,7 +39,7 @@ _MLT_NODEPEND= yes # Library dependencies _MLT6_VERSION= 6.26.1 -_MLT7_VERSION= 7.8.0 +_MLT7_VERSION= 7.10.0 _MLT6_PORTNAME= mlt6 _MLT7_PORTNAME= mlt7 _MLT6_LIB= libmlt.so diff --git a/multimedia/Makefile b/multimedia/Makefile index aa06b9c60923..46bbc46bccff 100644 --- a/multimedia/Makefile +++ b/multimedia/Makefile @@ -232,7 +232,7 @@ SUBDIR += mlt6-qt5 SUBDIR += mlt7 SUBDIR += mlt7-glaxnimate - SUBDIR += mlt7-qt5 + SUBDIR += mlt7-qt SUBDIR += motion SUBDIR += mp3cd SUBDIR += mp4v2 diff --git a/multimedia/kdenlive/Makefile b/multimedia/kdenlive/Makefile index 4b80b0295517..86bc0cbabb8c 100644 --- a/multimedia/kdenlive/Makefile +++ b/multimedia/kdenlive/Makefile @@ -13,7 +13,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \ ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \ ${LOCALBASE}/lib/mlt-7/libmltglaxnimate.so:multimedia/mlt7-glaxnimate RUN_DEPENDS= ffmpeg${FFMPEG_SUFX}:multimedia/ffmpeg${FFMPEG_SUFX} \ - ${LOCALBASE}/lib/mlt-7/libmltqt.so:multimedia/mlt7-qt5 \ + ${LOCALBASE}/lib/mlt-7/libmltqt.so:multimedia/mlt7-qt@qt5 \ ${LOCALBASE}/lib/mlt-7/libmltglaxnimate.so:multimedia/mlt7-glaxnimate USES= cmake compiler:c++11-lang desktop-file-utils gettext-tools \ diff --git a/multimedia/mlt7-qt5/Makefile b/multimedia/mlt7-qt/Makefile index b1b4f5d86613..292cfb7f26a0 100644 --- a/multimedia/mlt7-qt5/Makefile +++ b/multimedia/mlt7-qt/Makefile @@ -1,8 +1,8 @@ MASTERDIR= ${.CURDIR:H}/mlt7 -SLAVEPORT= qt5 +SLAVEPORT= qt PORTREVISION= 0 -PKGNAMESUFFIX= -qt5 +PKGNAMESUFFIX= -${FLAVOR} COMMENT= Qt plugin for the MLT multimedia framework CATEGORIES= multimedia kde @@ -13,23 +13,40 @@ LICENSE_COMB= multi LIB_DEPENDS= libexif.so:graphics/libexif \ libfftw3.so:math/fftw3 -USES= qt:5 xorg +FLAVORS= qt5 qt6 +FLAVOR?= qt5 + +USES= qt:${FLAVOR:S/qt//} xorg USE_CXXSTD= c++11 -USE_QT= core gui svg widgets xml \ - buildtools:build qmake:build + +USE_QT= ${_USE_QT_${FLAVOR}} USE_XORG= x11 CONFLICTS_INSTALL= mlt6-qt5 +# Flavor handling +_USE_QT_qt5= core gui svg widgets xml \ + buildtools:build qmake:build +_USE_QT_qt6= 5compat base svg +_CMAKE_ON_qt5= MOD_QT +_CMAKE_ON_qt6= MOD_QT6 +_CMAKE_OFF_qt5= MOD_QT6 +_CMAKE_OFF_qt6= MOD_QT +_PLIST_SUB_qt5= QT_VERSION_SUFFIX= +_PLIST_SUB_qt6= QT_VERSION_SUFFIX=6 + # Only enable Qt binding, and disable everything else -CMAKE_ON= MOD_QT +CMAKE_ON= ${_CMAKE_ON_${FLAVOR}} CMAKE_OFF= MOD_AVFORMAT MOD_DECKLINK MOD_FEEDS MOD_FREI0R MOD_GDK MOD_GTK2 \ MOD_JACKRACK MOD_KDENLIVE MOD_LUMAS MOD_MOTION_EST MOD_NORMALIZE \ MOD_OLDFILM MOD_OPENCV MOD_OPENGL MOD_PLUSGPL MOD_PLUS MOD_RESAMPLE \ MOD_RTAUDIO MOD_RUBBERBAND MOD_SDL2 MOD_SOX MOD_VIDSTAB MOD_VMFX \ MOD_VORBIS MOD_XINE MOD_XML \ SWIG_CSHARP SWIG_JAVA SWIG_LUA SWIG_NODEJS SWIG_PERL \ - SWIG_PHP SWIG_PYTHON SWIG_RUBY SWIG_TCL + SWIG_PHP SWIG_PYTHON SWIG_RUBY SWIG_TCL \ + ${_CMAKE_OFF_${FLAVOR}} + +PLIST_SUB+= ${_PLIST_SUB_${FLAVOR}} BUILD_WRKSRC= ${WRKDIR}/.build/src/modules/qt diff --git a/multimedia/mlt7-qt/pkg-plist b/multimedia/mlt7-qt/pkg-plist new file mode 100644 index 000000000000..7f22349345a2 --- /dev/null +++ b/multimedia/mlt7-qt/pkg-plist @@ -0,0 +1,16 @@ +lib/mlt-7/libmltqt%%QT_VERSION_SUFFIX%%.so +%%DATADIR%%/qt%%QT_VERSION_SUFFIX%%/filter_audiolevelgraph.yml +%%DATADIR%%/qt%%QT_VERSION_SUFFIX%%/filter_audiospectrum.yml +%%DATADIR%%/qt%%QT_VERSION_SUFFIX%%/filter_audiowaveform.yml +%%DATADIR%%/qt%%QT_VERSION_SUFFIX%%/filter_gpsgraphic.yml +%%DATADIR%%/qt%%QT_VERSION_SUFFIX%%/filter_gpstext.yml +%%DATADIR%%/qt%%QT_VERSION_SUFFIX%%/filter_lightshow.yml +%%DATADIR%%/qt%%QT_VERSION_SUFFIX%%/filter_qtblend.yml +%%DATADIR%%/qt%%QT_VERSION_SUFFIX%%/filter_qtcrop.yml +%%DATADIR%%/qt%%QT_VERSION_SUFFIX%%/filter_qtext.yml +%%DATADIR%%/qt%%QT_VERSION_SUFFIX%%/filter_typewriter.yml +%%DATADIR%%/qt%%QT_VERSION_SUFFIX%%/producer_kdenlivetitle.yml +%%DATADIR%%/qt%%QT_VERSION_SUFFIX%%/producer_qimage.yml +%%DATADIR%%/qt%%QT_VERSION_SUFFIX%%/producer_qtext.yml +%%DATADIR%%/qt%%QT_VERSION_SUFFIX%%/transition_qtblend.yml +%%DATADIR%%/qt%%QT_VERSION_SUFFIX%%/transition_vqm.yml diff --git a/multimedia/mlt7-qt5/pkg-plist b/multimedia/mlt7-qt5/pkg-plist deleted file mode 100644 index 919a668b09ff..000000000000 --- a/multimedia/mlt7-qt5/pkg-plist +++ /dev/null @@ -1,14 +0,0 @@ -lib/mlt-7/libmltqt.so -%%DATADIR%%/qt/filter_audiolevelgraph.yml -%%DATADIR%%/qt/filter_audiospectrum.yml -%%DATADIR%%/qt/filter_audiowaveform.yml -%%DATADIR%%/qt/filter_lightshow.yml -%%DATADIR%%/qt/filter_qtblend.yml -%%DATADIR%%/qt/filter_qtcrop.yml -%%DATADIR%%/qt/filter_qtext.yml -%%DATADIR%%/qt/filter_typewriter.yml -%%DATADIR%%/qt/producer_kdenlivetitle.yml -%%DATADIR%%/qt/producer_qimage.yml -%%DATADIR%%/qt/producer_qtext.yml -%%DATADIR%%/qt/transition_qtblend.yml -%%DATADIR%%/qt/transition_vqm.yml diff --git a/multimedia/mlt7/Makefile b/multimedia/mlt7/Makefile index 25d5c21d3778..9d4bd8652024 100644 --- a/multimedia/mlt7/Makefile +++ b/multimedia/mlt7/Makefile @@ -1,6 +1,6 @@ PORTNAME= ${_MLT_PORTNAME} DISTVERSION= ${_MLT_VERSION} -PORTREVISION= 2 +PORTREVISION= 0 CATEGORIES?= multimedia # Don't use GitHub "fake" downloads that are auto-generated from a # tag; the project uploads tarballs for each release. diff --git a/multimedia/mlt7/distinfo b/multimedia/mlt7/distinfo index 707b07936073..c298534fe36b 100644 --- a/multimedia/mlt7/distinfo +++ b/multimedia/mlt7/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1657170466 -SHA256 (mlt-7.8.0.tar.gz) = 66606d79f91b400a4d9380a911a5d771a48bd6413447fa2f3713459eba70242d -SIZE (mlt-7.8.0.tar.gz) = 1458730 +TIMESTAMP = 1667366288 +SHA256 (mlt-7.10.0.tar.gz) = 045de6034346ba1e81c83c157d37bf1079277b27ba56591b954c6bf26a04d30c +SIZE (mlt-7.10.0.tar.gz) = 1477502 diff --git a/multimedia/mlt7/pkg-plist b/multimedia/mlt7/pkg-plist index 3ceac493142c..68c279c23e01 100644 --- a/multimedia/mlt7/pkg-plist +++ b/multimedia/mlt7/pkg-plist @@ -247,20 +247,20 @@ share/man/man1/melt-7.1.gz %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/alpha/Ut Video %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/alpha/vp8 %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/alpha/vp9 -%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_720p_50/DNxHD -%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_720p_60/DNxHD -%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_720p_2398/DNxHD -%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_720p_5994/DNxHD %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_1080i_50/DNxHD %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_1080i_5994/DNxHD +%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_1080p_2398/DNxHD %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_1080p_24/DNxHD %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_1080p_25/DNxHD +%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_1080p_2997/DNxHD %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_1080p_30/DNxHD %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_1080p_50/DNxHD -%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_1080p_60/DNxHD -%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_1080p_2398/DNxHD -%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_1080p_2997/DNxHD %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_1080p_5994/DNxHD +%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_1080p_60/DNxHD +%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_720p_2398/DNxHD +%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_720p_50/DNxHD +%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_720p_5994/DNxHD +%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/atsc_720p_60/DNxHD %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/dv_ntsc/D10 %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/dv_ntsc/DV %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/dv_ntsc/DVCPRO50 @@ -277,14 +277,14 @@ share/man/man1/melt-7.1.gz %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/dv_pal_wide/DV %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/dv_pal_wide/DVCPRO50 %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/dv_pal_wide/DVD -%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/hdv_720_25p/HDV -%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/hdv_720_30p/HDV -%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/hdv_720_50p/HDV -%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/hdv_720_60p/HDV %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/hdv_1080_25p/HDV %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/hdv_1080_30p/HDV %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/hdv_1080_50i/HDV %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/hdv_1080_60i/HDV +%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/hdv_720_25p/HDV +%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/hdv_720_30p/HDV +%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/hdv_720_50p/HDV +%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/hdv_720_60p/HDV %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/intermediate/DNxHR-HQ %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/intermediate/MJPEG %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/intermediate/MPEG-2 @@ -324,25 +324,25 @@ share/man/man1/melt-7.1.gz %%MOVIT%%%%DATADIR%%/presets/filter/movit.opacity/fade_out %%DATADIR%%/presets/filter/volume/fade_in %%DATADIR%%/presets/filter/volume/fade_out -%%DATADIR%%/profiles/atsc_720p_24 -%%DATADIR%%/profiles/atsc_720p_25 -%%DATADIR%%/profiles/atsc_720p_30 -%%DATADIR%%/profiles/atsc_720p_50 -%%DATADIR%%/profiles/atsc_720p_60 -%%DATADIR%%/profiles/atsc_720p_2398 -%%DATADIR%%/profiles/atsc_720p_2997 -%%DATADIR%%/profiles/atsc_720p_5994 %%DATADIR%%/profiles/atsc_1080i_50 -%%DATADIR%%/profiles/atsc_1080i_60 %%DATADIR%%/profiles/atsc_1080i_5994 +%%DATADIR%%/profiles/atsc_1080i_60 +%%DATADIR%%/profiles/atsc_1080p_2398 %%DATADIR%%/profiles/atsc_1080p_24 %%DATADIR%%/profiles/atsc_1080p_25 +%%DATADIR%%/profiles/atsc_1080p_2997 %%DATADIR%%/profiles/atsc_1080p_30 %%DATADIR%%/profiles/atsc_1080p_50 -%%DATADIR%%/profiles/atsc_1080p_60 -%%DATADIR%%/profiles/atsc_1080p_2398 -%%DATADIR%%/profiles/atsc_1080p_2997 %%DATADIR%%/profiles/atsc_1080p_5994 +%%DATADIR%%/profiles/atsc_1080p_60 +%%DATADIR%%/profiles/atsc_720p_2398 +%%DATADIR%%/profiles/atsc_720p_24 +%%DATADIR%%/profiles/atsc_720p_25 +%%DATADIR%%/profiles/atsc_720p_2997 +%%DATADIR%%/profiles/atsc_720p_30 +%%DATADIR%%/profiles/atsc_720p_50 +%%DATADIR%%/profiles/atsc_720p_5994 +%%DATADIR%%/profiles/atsc_720p_60 %%DATADIR%%/profiles/cif_15 %%DATADIR%%/profiles/cif_ntsc %%DATADIR%%/profiles/cif_pal @@ -352,25 +352,25 @@ share/man/man1/melt-7.1.gz %%DATADIR%%/profiles/dv_ntsc_wide %%DATADIR%%/profiles/dv_pal %%DATADIR%%/profiles/dv_pal_wide -%%DATADIR%%/profiles/hdv_720_25p -%%DATADIR%%/profiles/hdv_720_30p -%%DATADIR%%/profiles/hdv_720_50p -%%DATADIR%%/profiles/hdv_720_60p %%DATADIR%%/profiles/hdv_1080_25p %%DATADIR%%/profiles/hdv_1080_30p %%DATADIR%%/profiles/hdv_1080_50i %%DATADIR%%/profiles/hdv_1080_60i +%%DATADIR%%/profiles/hdv_720_25p +%%DATADIR%%/profiles/hdv_720_30p +%%DATADIR%%/profiles/hdv_720_50p +%%DATADIR%%/profiles/hdv_720_60p %%DATADIR%%/profiles/qcif_15 %%DATADIR%%/profiles/qcif_ntsc %%DATADIR%%/profiles/qcif_pal +%%DATADIR%%/profiles/qhd_1440p_2398 %%DATADIR%%/profiles/qhd_1440p_24 %%DATADIR%%/profiles/qhd_1440p_25 +%%DATADIR%%/profiles/qhd_1440p_2997 %%DATADIR%%/profiles/qhd_1440p_30 %%DATADIR%%/profiles/qhd_1440p_50 -%%DATADIR%%/profiles/qhd_1440p_60 -%%DATADIR%%/profiles/qhd_1440p_2398 -%%DATADIR%%/profiles/qhd_1440p_2997 %%DATADIR%%/profiles/qhd_1440p_5994 +%%DATADIR%%/profiles/qhd_1440p_60 %%DATADIR%%/profiles/quarter_15 %%DATADIR%%/profiles/quarter_ntsc %%DATADIR%%/profiles/quarter_ntsc_wide @@ -388,14 +388,14 @@ share/man/man1/melt-7.1.gz %%DATADIR%%/profiles/svcd_ntsc_wide %%DATADIR%%/profiles/svcd_pal %%DATADIR%%/profiles/svcd_pal_wide +%%DATADIR%%/profiles/uhd_2160p_2398 %%DATADIR%%/profiles/uhd_2160p_24 %%DATADIR%%/profiles/uhd_2160p_25 +%%DATADIR%%/profiles/uhd_2160p_2997 %%DATADIR%%/profiles/uhd_2160p_30 %%DATADIR%%/profiles/uhd_2160p_50 -%%DATADIR%%/profiles/uhd_2160p_60 -%%DATADIR%%/profiles/uhd_2160p_2398 -%%DATADIR%%/profiles/uhd_2160p_2997 %%DATADIR%%/profiles/uhd_2160p_5994 +%%DATADIR%%/profiles/uhd_2160p_60 %%DATADIR%%/profiles/vcd_ntsc %%DATADIR%%/profiles/vcd_pal %%DATADIR%%/profiles/vertical_hd_30 @@ -411,7 +411,6 @@ share/man/man1/melt-7.1.gz %%VIDSTAB%%%%DATADIR%%/vid.stab/filter_vidstab.yml %%VORBIS%%%%DATADIR%%/vorbis/producer_vorbis.yml %%DATADIR%%/xml/consumer_xml.yml -%%DATADIR%%/xml/filter_gpstext.yml %%DATADIR%%/xml/mlt-xml.dtd %%DATADIR%%/xml/producer_xml-nogl.yml %%DATADIR%%/xml/producer_xml-string.yml |