diff options
Diffstat (limited to 'dev-qt/qtmultimedia')
| -rw-r--r-- | dev-qt/qtmultimedia/files/qtmultimedia-5.15.2-no-qtopengl.patch | 14 | ||||
| -rw-r--r-- | dev-qt/qtmultimedia/qtmultimedia-5.15.2-r2.ebuild | 3 |
2 files changed, 16 insertions, 1 deletions
diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-5.15.2-no-qtopengl.patch b/dev-qt/qtmultimedia/files/qtmultimedia-5.15.2-no-qtopengl.patch new file mode 100644 index 000000000000..471bfabcce8e --- /dev/null +++ b/dev-qt/qtmultimedia/files/qtmultimedia-5.15.2-no-qtopengl.patch @@ -0,0 +1,14 @@ +Widgets were ported away from QtOpenGL in 5.15.0 but bogus dependency +remained: https://bugreports.qt.io/browse/QTBUG-81902 + +--- a/src/multimediawidgets/multimediawidgets.pro ++++ b/src/multimediawidgets/multimediawidgets.pro +@@ -2,8 +2,6 @@ + TARGET = QtMultimediaWidgets + QT = core gui multimedia widgets-private + QT_PRIVATE += multimedia-private +-qtHaveModule(opengl): \ +- QT_PRIVATE += opengl + + PRIVATE_HEADERS += \ + qvideowidget_p.h \ diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r2.ebuild index 46226e531823..8148aa4f31be 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r2.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r2.ebuild @@ -31,7 +31,6 @@ RDEPEND=" openal? ( media-libs/openal ) ) widgets? ( - =dev-qt/qtopengl-${QT5_PV}* =dev-qt/qtwidgets-${QT5_PV}*[gles2-only=] media-libs/libglvnd ) @@ -40,6 +39,8 @@ DEPEND="${RDEPEND} gstreamer? ( x11-base/xorg-proto ) " +PATCHES=( "${FILESDIR}/${PN}-5.15.2-no-qtopengl.patch" ) + src_prepare() { sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \ src/multimedia/multimedia.pro || die |