From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/files/, dev-qt/qtmultimedia/
Date: Mon, 10 Apr 2023 21:41:29 +0000 (UTC) [thread overview]
Message-ID: <1681162670.51bb9b7819c2f252977cbe16fa8c6ef82a919194.asturm@gentoo> (raw)
commit: 51bb9b7819c2f252977cbe16fa8c6ef82a919194
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 10 21:37:50 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 10 21:37:50 2023 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=51bb9b78
dev-qt/qtmultimedia: Patch upstreamed
Upstream commit ff4c7bc3bf7ba4b748fdeb9d09887271c2b28505
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/qtmultimedia-5.15.2-no-qtopengl.patch | 14 --------------
dev-qt/qtmultimedia/qtmultimedia-5.15.9.9999.ebuild | 2 --
2 files changed, 16 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
deleted file mode 100644
index 471bfabc..00000000
--- a/dev-qt/qtmultimedia/files/qtmultimedia-5.15.2-no-qtopengl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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.9.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.15.9.9999.ebuild
index 531227bb..54a09964 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.15.9.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.15.9.9999.ebuild
@@ -40,8 +40,6 @@ 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
next reply other threads:[~2023-04-10 21:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-10 21:41 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-09-22 7:19 [gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/files/, dev-qt/qtmultimedia/ Andreas Sturmlechner
2019-06-20 21:17 Andreas Sturmlechner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1681162670.51bb9b7819c2f252977cbe16fa8c6ef82a919194.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox