diff options
author | Loïc Bartoletti <lbartoletti@FreeBSD.org> | 2021-10-24 18:51:36 +0000 |
---|---|---|
committer | Loïc Bartoletti <lbartoletti@FreeBSD.org> | 2022-01-27 06:12:26 +0000 |
commit | 4f0a5e1540c391610950d6ae9ce64ba0dd218d72 (patch) | |
tree | e0e3a0327237691d3fe5df542835ced376d3bfae /multimedia | |
parent | cc7a787d5f043014dcea80bd0058dd7117a5e308 (diff) | |
download | ports-4f0a5e1540c391610950d6ae9ce64ba0dd218d72.tar.gz ports-4f0a5e1540c391610950d6ae9ce64ba0dd218d72.zip |
PyQt: Update sip to 6.5.0, reintroduce sip4 and simplify PyQt framework.
SIP:
As mentioned in the update from sip to sip5, this is a transitional version
to remove what is deprecated in sip4.
Sip6 completely removes the deprecated parts.
Unfortunately, some ports — mostly cura things — can not use sip6, so we
reintroduce sip4.
PyQt:
At the same time, we took the opportunity to simplify PyQT and propose only one
package as for devel/pyside2. */py-qt5-* have been merged — excepted chart,
networkauth and webengine — into devel/py-qt5-pyqt.
This allows us to be in adequacy with the packages that the author of these
libraries proposes, namely:
PyQt - devel/py-qt5-pyqt
PyQt-Charts - x11-toolkits/py-qt5-chart
PyQt-NetworkAuth – net/py-qt5-networkauth
PyQt-WebEngine – www/py-qt5-webengine
SIP – devel/py-sip
py-sip - devel/py-qt5-sip
PyQt-builder - devel/py-qtbuilder
Qscintilla - devel/py-qt5-qscintilla2
Reviewed by: diizzy, kde
Tested by: kai, rhurlin, arrowd, madpilot
Approved by: makc, tcberner, kde
Differential Revision: https://reviews.freebsd.org/D33237
Exp-run by: antoine
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/Makefile | 2 | ||||
-rw-r--r-- | multimedia/openshot/Makefile | 2 | ||||
-rw-r--r-- | multimedia/py-qt5-multimedia/Makefile | 30 | ||||
-rw-r--r-- | multimedia/py-qt5-multimedia/pkg-descr | 4 | ||||
-rw-r--r-- | multimedia/py-qt5-multimedia/pkg-plist | 82 | ||||
-rw-r--r-- | multimedia/py-qt5-multimediawidgets/Makefile | 30 | ||||
-rw-r--r-- | multimedia/py-qt5-multimediawidgets/pkg-descr | 4 | ||||
-rw-r--r-- | multimedia/py-qt5-multimediawidgets/pkg-plist | 8 |
8 files changed, 1 insertions, 161 deletions
diff --git a/multimedia/Makefile b/multimedia/Makefile index 5ddb430761c2..f2e4a1f74041 100644 --- a/multimedia/Makefile +++ b/multimedia/Makefile @@ -336,8 +336,6 @@ SUBDIR += py-periscope SUBDIR += py-pretty_midi SUBDIR += py-pymediainfo - SUBDIR += py-qt5-multimedia - SUBDIR += py-qt5-multimediawidgets SUBDIR += py-soco SUBDIR += py-subliminal SUBDIR += py-tvnamer diff --git a/multimedia/openshot/Makefile b/multimedia/openshot/Makefile index 1a4426595d15..57cc45e6bff7 100644 --- a/multimedia/openshot/Makefile +++ b/multimedia/openshot/Makefile @@ -22,7 +22,7 @@ USES= desktop-file-utils pyqt:5 python:3.5+ shared-mime-info shebangfix USE_GITHUB= yes GH_ACCOUNT= OpenShot GH_PROJECT= ${PORTNAME}-qt -USE_PYQT= core gui svg webkitwidgets widgets +USE_PYQT= pyqt5 USE_PYTHON= distutils optsuffix SHEBANG_FILES= src/language/generate_translations.py\ src/language/show_translations.py\ diff --git a/multimedia/py-qt5-multimedia/Makefile b/multimedia/py-qt5-multimedia/Makefile deleted file mode 100644 index 3359473832bf..000000000000 --- a/multimedia/py-qt5-multimedia/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -PORTNAME= multimedia -PORTREVISION= 3 -CATEGORIES= multimedia devel python - -MAINTAINER= kde@FreeBSD.org -COMMENT= Python bindings for the Qt5 toolkit, QtMultimedia module - -CONFIGURE_ARGS= --enable QtMultimedia -PYQT_DIST= yes - -USES= gl python:3.5+ pyqt:5 qt:5 -USE_GL= gl -USE_PYQT= sip_build core_run gui_run network_run -USE_PYTHON= concurrent flavors py3kplist -USE_QT= core gui multimedia network qmake_build - -OPTIONS_DEFINE= API DEBUG -OPTIONS_DEFAULT=API -OPTIONS_SUB= yes - -API_DESC= Install QtMultimedia API for QScintilla2 -API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${PYQT_APIDIR} -API_CONFIGURE_OFF= --no-qsci-api -API_LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2-qt5 -DEBUG_CONFIGURE_ON= --debug --trace - -post-install: - ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtMultimedia.so - -.include <bsd.port.mk> diff --git a/multimedia/py-qt5-multimedia/pkg-descr b/multimedia/py-qt5-multimedia/pkg-descr deleted file mode 100644 index d0c96b271c3d..000000000000 --- a/multimedia/py-qt5-multimedia/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -PyQt5 is a set of Python bindings for Qt5 application framework. -This package provides the QtMultimedia module. - -WWW: https://riverbankcomputing.com/software/pyqt diff --git a/multimedia/py-qt5-multimedia/pkg-plist b/multimedia/py-qt5-multimedia/pkg-plist deleted file mode 100644 index 5736b5809346..000000000000 --- a/multimedia/py-qt5-multimedia/pkg-plist +++ /dev/null @@ -1,82 +0,0 @@ -%%PYTHON_SITELIBDIR%%/PyQt5/QtMultimedia.pyi -%%PYTHON_SITELIBDIR%%/PyQt5/QtMultimedia.so -%%PYQT_APIDIR%%/api/python/QtMultimedia.api -%%PYQT_SIPDIR%%/QtMultimedia/QtMultimediamod.sip -%%PYQT_SIPDIR%%/QtMultimedia/qabstractvideobuffer.sip -%%PYQT_SIPDIR%%/QtMultimedia/qabstractvideofilter.sip -%%PYQT_SIPDIR%%/QtMultimedia/qabstractvideosurface.sip -%%PYQT_SIPDIR%%/QtMultimedia/qaudio.sip -%%PYQT_SIPDIR%%/QtMultimedia/qaudiobuffer.sip -%%PYQT_SIPDIR%%/QtMultimedia/qaudiodecoder.sip -%%PYQT_SIPDIR%%/QtMultimedia/qaudiodecodercontrol.sip -%%PYQT_SIPDIR%%/QtMultimedia/qaudiodeviceinfo.sip -%%PYQT_SIPDIR%%/QtMultimedia/qaudioencodersettingscontrol.sip -%%PYQT_SIPDIR%%/QtMultimedia/qaudioformat.sip -%%PYQT_SIPDIR%%/QtMultimedia/qaudioinput.sip -%%PYQT_SIPDIR%%/QtMultimedia/qaudioinputselectorcontrol.sip -%%PYQT_SIPDIR%%/QtMultimedia/qaudiooutput.sip -%%PYQT_SIPDIR%%/QtMultimedia/qaudiooutputselectorcontrol.sip -%%PYQT_SIPDIR%%/QtMultimedia/qaudioprobe.sip -%%PYQT_SIPDIR%%/QtMultimedia/qaudiorecorder.sip -%%PYQT_SIPDIR%%/QtMultimedia/qaudiorolecontrol.sip -%%PYQT_SIPDIR%%/QtMultimedia/qcamera.sip -%%PYQT_SIPDIR%%/QtMultimedia/qcameracapturebufferformatcontrol.sip -%%PYQT_SIPDIR%%/QtMultimedia/qcameracapturedestinationcontrol.sip -%%PYQT_SIPDIR%%/QtMultimedia/qcameracontrol.sip -%%PYQT_SIPDIR%%/QtMultimedia/qcameraexposure.sip -%%PYQT_SIPDIR%%/QtMultimedia/qcameraexposurecontrol.sip -%%PYQT_SIPDIR%%/QtMultimedia/qcamerafeedbackcontrol.sip -%%PYQT_SIPDIR%%/QtMultimedia/qcameraflashcontrol.sip -%%PYQT_SIPDIR%%/QtMultimedia/qcamerafocus.sip -%%PYQT_SIPDIR%%/QtMultimedia/qcamerafocuscontrol.sip -%%PYQT_SIPDIR%%/QtMultimedia/qcameraimagecapture.sip -%%PYQT_SIPDIR%%/QtMultimedia/qcameraimagecapturecontrol.sip -%%PYQT_SIPDIR%%/QtMultimedia/qcameraimageprocessing.sip -%%PYQT_SIPDIR%%/QtMultimedia/qcameraimageprocessingcontrol.sip -%%PYQT_SIPDIR%%/QtMultimedia/qcamerainfo.sip -%%PYQT_SIPDIR%%/QtMultimedia/qcamerainfocontrol.sip -%%PYQT_SIPDIR%%/QtMultimedia/qcameralockscontrol.sip -%%PYQT_SIPDIR%%/QtMultimedia/qcameraviewfindersettings.sip -%%PYQT_SIPDIR%%/QtMultimedia/qcameraviewfindersettingscontrol.sip -%%PYQT_SIPDIR%%/QtMultimedia/qcamerazoomcontrol.sip -%%PYQT_SIPDIR%%/QtMultimedia/qcustomaudiorolecontrol.sip -%%PYQT_SIPDIR%%/QtMultimedia/qimageencodercontrol.sip -%%PYQT_SIPDIR%%/QtMultimedia/qmediaaudioprobecontrol.sip -%%PYQT_SIPDIR%%/QtMultimedia/qmediaavailabilitycontrol.sip -%%PYQT_SIPDIR%%/QtMultimedia/qmediabindableinterface.sip -%%PYQT_SIPDIR%%/QtMultimedia/qmediacontainercontrol.sip -%%PYQT_SIPDIR%%/QtMultimedia/qmediacontent.sip -%%PYQT_SIPDIR%%/QtMultimedia/qmediacontrol.sip -%%PYQT_SIPDIR%%/QtMultimedia/qmediaencodersettings.sip -%%PYQT_SIPDIR%%/QtMultimedia/qmediagaplessplaybackcontrol.sip -%%PYQT_SIPDIR%%/QtMultimedia/qmediametadata.sip -%%PYQT_SIPDIR%%/QtMultimedia/qmedianetworkaccesscontrol.sip -%%PYQT_SIPDIR%%/QtMultimedia/qmediaobject.sip -%%PYQT_SIPDIR%%/QtMultimedia/qmediaplayer.sip -%%PYQT_SIPDIR%%/QtMultimedia/qmediaplayercontrol.sip -%%PYQT_SIPDIR%%/QtMultimedia/qmediaplaylist.sip -%%PYQT_SIPDIR%%/QtMultimedia/qmediarecorder.sip -%%PYQT_SIPDIR%%/QtMultimedia/qmediarecordercontrol.sip -%%PYQT_SIPDIR%%/QtMultimedia/qmediaresource.sip -%%PYQT_SIPDIR%%/QtMultimedia/qmediaservice.sip -%%PYQT_SIPDIR%%/QtMultimedia/qmediastreamscontrol.sip -%%PYQT_SIPDIR%%/QtMultimedia/qmediatimerange.sip -%%PYQT_SIPDIR%%/QtMultimedia/qmediavideoprobecontrol.sip -%%PYQT_SIPDIR%%/QtMultimedia/qmetadatareadercontrol.sip -%%PYQT_SIPDIR%%/QtMultimedia/qmetadatawritercontrol.sip -%%PYQT_SIPDIR%%/QtMultimedia/qmultimedia.sip -%%PYQT_SIPDIR%%/QtMultimedia/qpymultimedia_qlist.sip -%%PYQT_SIPDIR%%/QtMultimedia/qradiodata.sip -%%PYQT_SIPDIR%%/QtMultimedia/qradiodatacontrol.sip -%%PYQT_SIPDIR%%/QtMultimedia/qradiotuner.sip -%%PYQT_SIPDIR%%/QtMultimedia/qradiotunercontrol.sip -%%PYQT_SIPDIR%%/QtMultimedia/qsound.sip -%%PYQT_SIPDIR%%/QtMultimedia/qsoundeffect.sip -%%PYQT_SIPDIR%%/QtMultimedia/qvideodeviceselectorcontrol.sip -%%PYQT_SIPDIR%%/QtMultimedia/qvideoencodersettingscontrol.sip -%%PYQT_SIPDIR%%/QtMultimedia/qvideoframe.sip -%%PYQT_SIPDIR%%/QtMultimedia/qvideoprobe.sip -%%PYQT_SIPDIR%%/QtMultimedia/qvideorenderercontrol.sip -%%PYQT_SIPDIR%%/QtMultimedia/qvideosurfaceformat.sip -%%PYQT_SIPDIR%%/QtMultimedia/qvideowindowcontrol.sip - diff --git a/multimedia/py-qt5-multimediawidgets/Makefile b/multimedia/py-qt5-multimediawidgets/Makefile deleted file mode 100644 index 0e6c10c80d2d..000000000000 --- a/multimedia/py-qt5-multimediawidgets/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -PORTNAME= multimediawidgets -PORTREVISION= 3 -CATEGORIES= multimedia devel python - -MAINTAINER= kde@FreeBSD.org -COMMENT= Python bindings for the Qt5 toolkit, QtMultimediaWidgets module - -CONFIGURE_ARGS= --enable QtMultimediaWidgets -PYQT_DIST= yes - -USES= gl python:3.5+ pyqt:5 qt:5 -USE_GL= gl -USE_PYQT= sip_build core_run multimedia_run widgets_run -USE_PYTHON= concurrent flavors py3kplist -USE_QT= core gui multimedia network widgets qmake_build - -OPTIONS_DEFINE= API DEBUG -OPTIONS_DEFAULT=API -OPTIONS_SUB= yes - -API_DESC= Install QtMultimedia API for QScintilla2 -API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${PYQT_APIDIR} -API_CONFIGURE_OFF= --no-qsci-api -API_LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2-qt5 -DEBUG_CONFIGURE_ON= --debug --trace - -post-install: - ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtMultimediaWidgets.so - -.include <bsd.port.mk> diff --git a/multimedia/py-qt5-multimediawidgets/pkg-descr b/multimedia/py-qt5-multimediawidgets/pkg-descr deleted file mode 100644 index d0c96b271c3d..000000000000 --- a/multimedia/py-qt5-multimediawidgets/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -PyQt5 is a set of Python bindings for Qt5 application framework. -This package provides the QtMultimedia module. - -WWW: https://riverbankcomputing.com/software/pyqt diff --git a/multimedia/py-qt5-multimediawidgets/pkg-plist b/multimedia/py-qt5-multimediawidgets/pkg-plist deleted file mode 100644 index e12a0e2664ff..000000000000 --- a/multimedia/py-qt5-multimediawidgets/pkg-plist +++ /dev/null @@ -1,8 +0,0 @@ -%%PYTHON_SITELIBDIR%%/PyQt5/QtMultimediaWidgets.so -%%PYTHON_SITELIBDIR%%/PyQt5/QtMultimediaWidgets.pyi -%%PYQT_SIPDIR%%/QtMultimediaWidgets/QtMultimediaWidgetsmod.sip -%%PYQT_SIPDIR%%/QtMultimediaWidgets/qcameraviewfinder.sip -%%PYQT_SIPDIR%%/QtMultimediaWidgets/qgraphicsvideoitem.sip -%%PYQT_SIPDIR%%/QtMultimediaWidgets/qvideowidget.sip -%%PYQT_SIPDIR%%/QtMultimediaWidgets/qvideowidgetcontrol.sip -%%API%%%%PYQT_APIDIR%%/api/python/QtMultimediaWidgets.api |