public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-video/qmplay2/files/, media-video/qmplay2/
@ 2022-10-23 18:37 Arthur Zamarin
  0 siblings, 0 replies; 5+ messages in thread
From: Arthur Zamarin @ 2022-10-23 18:37 UTC (permalink / raw
  To: gentoo-commits

commit:     1801c947d72fd756a7433d49584a367a6a3bad14
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 23 18:37:39 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 23 18:37:39 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1801c947

media-video/qmplay2: add 22.10.23

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 media-video/qmplay2/Manifest                       |   1 +
 .../files/qmplay2-22.10.23-fix-includes.patch      |  44 +++++++
 media-video/qmplay2/qmplay2-22.10.23.ebuild        | 141 +++++++++++++++++++++
 3 files changed, 186 insertions(+)

diff --git a/media-video/qmplay2/Manifest b/media-video/qmplay2/Manifest
index 3de11e337f22..8088d0a7b6c3 100644
--- a/media-video/qmplay2/Manifest
+++ b/media-video/qmplay2/Manifest
@@ -1 +1,2 @@
 DIST QMPlay2-src-22.08.21.tar.xz 1618824 BLAKE2B ac980c4ad018749d4ee5dcd2dc580c96cccb82a73ff4fd52c65beb1d7131e294d2af65814c8966ffbe2a04eb489f9b9ba23b2764b83aa3f3d57546125dde4ceb SHA512 a6abc71bf87a8bcb2c2c0c63889f75de4e2de4375de0a528cb6950d2fb1ac6e767386d13a0e3f26b59cfccb88b4db4a8c26cbf57299da2031239a73e4971a4de
+DIST QMPlay2-src-22.10.23.tar.xz 1414804 BLAKE2B c0db1187538be8ab0806abd41fbfdae5a71dda450505af1956989a3ccc10fa52997b8652f280cd66837d12a84a7a058783b65df3d4bd35665c92f1262cd8d004 SHA512 80c9408a9085084857b5b433f009bf62784cf73ceb90218ec09132be227aae97136095811ffa1211375dcbfc1f51cbefaa3690c56fc8df51d9b1cf022ce0709f

diff --git a/media-video/qmplay2/files/qmplay2-22.10.23-fix-includes.patch b/media-video/qmplay2/files/qmplay2-22.10.23-fix-includes.patch
new file mode 100644
index 000000000000..eb77927f6ea9
--- /dev/null
+++ b/media-video/qmplay2/files/qmplay2-22.10.23-fix-includes.patch
@@ -0,0 +1,44 @@
+https://github.com/zaps166/QMPlay2/pull/541
+
+fix include memory with USE_VULKAN=OFF
+
+Those header files are using std::shared_ptr from memory header even
+when USE_VULKAN is OFF, so we must include them unconditionally.
+
+Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
+--- a/src/qmplay2/LibASS.hpp
++++ b/src/qmplay2/LibASS.hpp
+@@ -23,6 +23,7 @@
+ #include <QByteArray>
+ #include <QList>
+
++#include <memory>
+ #include <set>
+
+ class Settings;
+@@ -35,7 +36,6 @@ struct ass_renderer;
+ struct ass_image;
+
+ #ifdef USE_VULKAN
+-#include <memory>
+ namespace QmVk {
+ class BufferPool;
+ }
+--- a/src/qmplay2/QMPlay2OSD.hpp
++++ b/src/qmplay2/QMPlay2OSD.hpp
+@@ -25,14 +25,13 @@
+ #include <QRect>
+
+ #include <functional>
++#include <memory>
+ #include <vector>
+ #include <mutex>
+
+ #ifdef USE_VULKAN
+ #   include <QVector4D>
+
+-#   include <memory>
+-
+ namespace QmVk {
+
+ class Buffer;

diff --git a/media-video/qmplay2/qmplay2-22.10.23.ebuild b/media-video/qmplay2/qmplay2-22.10.23.ebuild
new file mode 100644
index 000000000000..1ef2e8a50818
--- /dev/null
+++ b/media-video/qmplay2/qmplay2-22.10.23.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="A Qt-based video player, which can play most formats and codecs"
+HOMEPAGE="https://github.com/zaps166/QMPlay2"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/zaps166/QMPlay2"
+else
+	SRC_URI="https://github.com/zaps166/QMPlay2/releases/download/${PV}/QMPlay2-src-${PV}.tar.xz"
+	S="${WORKDIR}/QMPlay2-src-${PV}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-3"
+SLOT="0"
+
+IUSE="avdevice +audiofilters +alsa cdio cuvid extensions gme inputs libass
+	modplug notifications opengl pipewire portaudio pulseaudio sid shaders
+	+taglib vaapi vdpau videofilters visualizations vulkan xv"
+
+REQUIRED_USE="
+	audiofilters? ( || ( alsa pipewire portaudio pulseaudio ) )
+	shaders? ( vulkan )"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-video/ffmpeg
+	|| (
+		dev-qt/qtgui:5[X(-)]
+		dev-qt/qtgui:5[xcb(-)]
+	)
+	alsa? ( media-libs/alsa-lib )
+	cdio? ( dev-libs/libcdio[cddb] )
+	extensions? ( dev-qt/qtdeclarative:5 )
+	gme? ( media-libs/game-music-emu )
+	libass? ( media-libs/libass )
+	opengl? ( virtual/opengl )
+	pipewire? ( media-video/pipewire )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	sid? ( media-libs/libsidplayfp )
+	shaders? ( >=media-libs/shaderc-2020.1 )
+	taglib? ( media-libs/taglib	)
+	vaapi? (
+		>=media-video/ffmpeg-4.1.3[vaapi]
+		media-libs/libva[X]
+	)
+	vdpau? ( media-video/ffmpeg[vdpau] )
+	videofilters? ( dev-qt/qtconcurrent:5 )
+	vulkan? (
+		>=dev-qt/qtgui-5.14.1:5[vulkan]
+		>=media-libs/vulkan-loader-1.2.133
+	)
+	xv? ( x11-libs/libXv )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-includes.patch"
+)
+
+src_prepare() {
+	# disable compress man pages
+	sed -r \
+		-e 's/if\(GZIP\)/if\(TRUE\)/' \
+		-e 's/(install.+QMPlay2\.1)\.gz/\1/' \
+		-i src/gui/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# core
+		-DUSE_LINK_TIME_OPTIMIZATION=false
+		-DUSE_UPDATES=OFF
+		-DUSE_ALSA=$(usex alsa)
+		-DUSE_AUDIOCD=$(usex cdio)
+		-DUSE_DBUS_SUSPEND=ON
+		-DUSE_FREEDESKTOP_NOTIFICATIONS=ON
+		-DUSE_LIBASS=$(usex libass)
+		-DUSE_NOTIFY=$(usex notifications)
+		-DUSE_OPENGL=$(usex opengl)
+		-DUSE_VULKAN=$(usex vulkan)
+		-DUSE_GLSLC=$(usex shaders)
+		-DUSE_XVIDEO=$(usex xv)
+
+		# ffmpeg
+		-DUSE_FFMPEG_AVDEVICE=$(usex avdevice)
+		-DUSE_FFMPEG_VAAPI=$(usex vaapi)
+		-DUSE_FFMPEG_VDPAU=$(usex vdpau)
+
+		# chiptune
+		-DUSE_CHIPTUNE_GME=$(usex gme)
+		-DUSE_CHIPTUNE_SID=$(usex sid)
+
+		# modules
+		-DUSE_AUDIOFILTERS=$(usex audiofilters)
+		-DUSE_CUVID=$(usex cuvid)
+		-DUSE_INPUTS=$(usex inputs)
+		-DUSE_MODPLUG=$(usex modplug)
+		-DUSE_PIPEWIRE=$(usex pipewire)
+		-DUSE_PORTAUDIO=$(usex portaudio)
+		-DUSE_PULSEAUDIO=$(usex pulseaudio)
+		-DUSE_TAGLIB=$(usex taglib)
+		-DUSE_VIDEOFILTERS=$(usex videofilters)
+		-DUSE_VISUALIZATIONS=$(usex visualizations)
+
+		# extensions
+		-DUSE_EXTENSIONS=$(usex extensions)
+	)
+
+	if use extensions; then
+		# Move inside an if, to remove unused option warning
+		mycmakeargs+=(
+			-DUSE_LASTFM=ON
+			-DUSE_LYRICS=ON
+			-DUSE_MEDIABROWSER=ON
+			-DUSE_MPRIS2=ON
+		)
+	fi
+
+	if [[ ${PV} == *9999 ]]; then
+		mycmakeargs+=( -DUSE_GIT_VERSION=true )
+	else
+		mycmakeargs+=( -DUSE_GIT_VERSION=false )
+	fi
+
+	cmake_src_configure
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/qmplay2/files/, media-video/qmplay2/
@ 2023-05-30 19:39 Andreas Sturmlechner
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2023-05-30 19:39 UTC (permalink / raw
  To: gentoo-commits

commit:     30a527678790d67911863fedae2953acbaad49f1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May 29 18:17:22 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 30 19:37:12 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30a52767

media-video/qmplay2: drop 22.10.23

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-video/qmplay2/Manifest                       |   1 -
 .../files/qmplay2-22.10.23-fix-includes.patch      |  44 -------
 media-video/qmplay2/qmplay2-22.10.23.ebuild        | 141 ---------------------
 3 files changed, 186 deletions(-)

diff --git a/media-video/qmplay2/Manifest b/media-video/qmplay2/Manifest
index 6e61c851eee9..4ccb1be40978 100644
--- a/media-video/qmplay2/Manifest
+++ b/media-video/qmplay2/Manifest
@@ -1,2 +1 @@
-DIST QMPlay2-src-22.10.23.tar.xz 1414804 BLAKE2B c0db1187538be8ab0806abd41fbfdae5a71dda450505af1956989a3ccc10fa52997b8652f280cd66837d12a84a7a058783b65df3d4bd35665c92f1262cd8d004 SHA512 80c9408a9085084857b5b433f009bf62784cf73ceb90218ec09132be227aae97136095811ffa1211375dcbfc1f51cbefaa3690c56fc8df51d9b1cf022ce0709f
 DIST QMPlay2-src-23.02.05.tar.xz 1428992 BLAKE2B 7296ed089306e50e1051c33c23dae30f14cbb166b9d9ea8c184e8aa027a261a658e1d7770c7d574784a5cde4890c66e2104927f4473f484562378c956bea4b3f SHA512 d2e998a2df08c98b7e0232de693ee17b5c703793e2b1edadde300ca39998f40f7ad58b5850ee1f8cddf1dd9489c7f96e664db7e9deba01a612d97707aad849c0

diff --git a/media-video/qmplay2/files/qmplay2-22.10.23-fix-includes.patch b/media-video/qmplay2/files/qmplay2-22.10.23-fix-includes.patch
deleted file mode 100644
index eb77927f6ea9..000000000000
--- a/media-video/qmplay2/files/qmplay2-22.10.23-fix-includes.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-https://github.com/zaps166/QMPlay2/pull/541
-
-fix include memory with USE_VULKAN=OFF
-
-Those header files are using std::shared_ptr from memory header even
-when USE_VULKAN is OFF, so we must include them unconditionally.
-
-Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
---- a/src/qmplay2/LibASS.hpp
-+++ b/src/qmplay2/LibASS.hpp
-@@ -23,6 +23,7 @@
- #include <QByteArray>
- #include <QList>
-
-+#include <memory>
- #include <set>
-
- class Settings;
-@@ -35,7 +36,6 @@ struct ass_renderer;
- struct ass_image;
-
- #ifdef USE_VULKAN
--#include <memory>
- namespace QmVk {
- class BufferPool;
- }
---- a/src/qmplay2/QMPlay2OSD.hpp
-+++ b/src/qmplay2/QMPlay2OSD.hpp
-@@ -25,14 +25,13 @@
- #include <QRect>
-
- #include <functional>
-+#include <memory>
- #include <vector>
- #include <mutex>
-
- #ifdef USE_VULKAN
- #   include <QVector4D>
-
--#   include <memory>
--
- namespace QmVk {
-
- class Buffer;

diff --git a/media-video/qmplay2/qmplay2-22.10.23.ebuild b/media-video/qmplay2/qmplay2-22.10.23.ebuild
deleted file mode 100644
index 1ef2e8a50818..000000000000
--- a/media-video/qmplay2/qmplay2-22.10.23.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="A Qt-based video player, which can play most formats and codecs"
-HOMEPAGE="https://github.com/zaps166/QMPlay2"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/zaps166/QMPlay2"
-else
-	SRC_URI="https://github.com/zaps166/QMPlay2/releases/download/${PV}/QMPlay2-src-${PV}.tar.xz"
-	S="${WORKDIR}/QMPlay2-src-${PV}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="LGPL-3"
-SLOT="0"
-
-IUSE="avdevice +audiofilters +alsa cdio cuvid extensions gme inputs libass
-	modplug notifications opengl pipewire portaudio pulseaudio sid shaders
-	+taglib vaapi vdpau videofilters visualizations vulkan xv"
-
-REQUIRED_USE="
-	audiofilters? ( || ( alsa pipewire portaudio pulseaudio ) )
-	shaders? ( vulkan )"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-video/ffmpeg
-	|| (
-		dev-qt/qtgui:5[X(-)]
-		dev-qt/qtgui:5[xcb(-)]
-	)
-	alsa? ( media-libs/alsa-lib )
-	cdio? ( dev-libs/libcdio[cddb] )
-	extensions? ( dev-qt/qtdeclarative:5 )
-	gme? ( media-libs/game-music-emu )
-	libass? ( media-libs/libass )
-	opengl? ( virtual/opengl )
-	pipewire? ( media-video/pipewire )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	sid? ( media-libs/libsidplayfp )
-	shaders? ( >=media-libs/shaderc-2020.1 )
-	taglib? ( media-libs/taglib	)
-	vaapi? (
-		>=media-video/ffmpeg-4.1.3[vaapi]
-		media-libs/libva[X]
-	)
-	vdpau? ( media-video/ffmpeg[vdpau] )
-	videofilters? ( dev-qt/qtconcurrent:5 )
-	vulkan? (
-		>=dev-qt/qtgui-5.14.1:5[vulkan]
-		>=media-libs/vulkan-loader-1.2.133
-	)
-	xv? ( x11-libs/libXv )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-includes.patch"
-)
-
-src_prepare() {
-	# disable compress man pages
-	sed -r \
-		-e 's/if\(GZIP\)/if\(TRUE\)/' \
-		-e 's/(install.+QMPlay2\.1)\.gz/\1/' \
-		-i src/gui/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# core
-		-DUSE_LINK_TIME_OPTIMIZATION=false
-		-DUSE_UPDATES=OFF
-		-DUSE_ALSA=$(usex alsa)
-		-DUSE_AUDIOCD=$(usex cdio)
-		-DUSE_DBUS_SUSPEND=ON
-		-DUSE_FREEDESKTOP_NOTIFICATIONS=ON
-		-DUSE_LIBASS=$(usex libass)
-		-DUSE_NOTIFY=$(usex notifications)
-		-DUSE_OPENGL=$(usex opengl)
-		-DUSE_VULKAN=$(usex vulkan)
-		-DUSE_GLSLC=$(usex shaders)
-		-DUSE_XVIDEO=$(usex xv)
-
-		# ffmpeg
-		-DUSE_FFMPEG_AVDEVICE=$(usex avdevice)
-		-DUSE_FFMPEG_VAAPI=$(usex vaapi)
-		-DUSE_FFMPEG_VDPAU=$(usex vdpau)
-
-		# chiptune
-		-DUSE_CHIPTUNE_GME=$(usex gme)
-		-DUSE_CHIPTUNE_SID=$(usex sid)
-
-		# modules
-		-DUSE_AUDIOFILTERS=$(usex audiofilters)
-		-DUSE_CUVID=$(usex cuvid)
-		-DUSE_INPUTS=$(usex inputs)
-		-DUSE_MODPLUG=$(usex modplug)
-		-DUSE_PIPEWIRE=$(usex pipewire)
-		-DUSE_PORTAUDIO=$(usex portaudio)
-		-DUSE_PULSEAUDIO=$(usex pulseaudio)
-		-DUSE_TAGLIB=$(usex taglib)
-		-DUSE_VIDEOFILTERS=$(usex videofilters)
-		-DUSE_VISUALIZATIONS=$(usex visualizations)
-
-		# extensions
-		-DUSE_EXTENSIONS=$(usex extensions)
-	)
-
-	if use extensions; then
-		# Move inside an if, to remove unused option warning
-		mycmakeargs+=(
-			-DUSE_LASTFM=ON
-			-DUSE_LYRICS=ON
-			-DUSE_MEDIABROWSER=ON
-			-DUSE_MPRIS2=ON
-		)
-	fi
-
-	if [[ ${PV} == *9999 ]]; then
-		mycmakeargs+=( -DUSE_GIT_VERSION=true )
-	else
-		mycmakeargs+=( -DUSE_GIT_VERSION=false )
-	fi
-
-	cmake_src_configure
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/qmplay2/files/, media-video/qmplay2/
@ 2023-06-28 18:30 Arthur Zamarin
  0 siblings, 0 replies; 5+ messages in thread
From: Arthur Zamarin @ 2023-06-28 18:30 UTC (permalink / raw
  To: gentoo-commits

commit:     ebcfe73d3318a677f06235e77c474961132ca873
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 28 18:28:33 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 28 18:30:22 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebcfe73d

media-video/qmplay2: drop 23.02.05-r1, 23.06.04

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 media-video/qmplay2/Manifest                       |   2 -
 .../files/qmplay2-23.02.05-fix-libva-glx.patch     |  13 --
 media-video/qmplay2/qmplay2-23.02.05-r1.ebuild     | 141 ---------------------
 media-video/qmplay2/qmplay2-23.06.04.ebuild        | 138 --------------------
 4 files changed, 294 deletions(-)

diff --git a/media-video/qmplay2/Manifest b/media-video/qmplay2/Manifest
index ad1e6c2e5ead..7ce36256efe1 100644
--- a/media-video/qmplay2/Manifest
+++ b/media-video/qmplay2/Manifest
@@ -1,3 +1 @@
-DIST QMPlay2-src-23.02.05.tar.xz 1428992 BLAKE2B 7296ed089306e50e1051c33c23dae30f14cbb166b9d9ea8c184e8aa027a261a658e1d7770c7d574784a5cde4890c66e2104927f4473f484562378c956bea4b3f SHA512 d2e998a2df08c98b7e0232de693ee17b5c703793e2b1edadde300ca39998f40f7ad58b5850ee1f8cddf1dd9489c7f96e664db7e9deba01a612d97707aad849c0
-DIST QMPlay2-src-23.06.04.tar.xz 1431232 BLAKE2B 7b50e7d28ab9025d7745114c7ee6036df1e1b23b34422ed4097f1ba4e68874efc58a0de68a5635e30cbdb2205777fbdc4f67f759f54cda7e2f926560e4bbc7af SHA512 7e6afb5830b5febd79aa2232d38ccb3483104dd89d20e7476027a7febfd770ccd1df7e6915543df379985d89d307bd1c3bbc8ebc8cc00f440b51e347ddbec0d5
 DIST QMPlay2-src-23.06.17.tar.xz 1432852 BLAKE2B 50512d89f443218bf89f1b54276ece0983d31cc1e563ef829396ed1fb4e5f0437cd25e5ccb3c426ecd668c334477024de8658594c59ae2781a0e54ff83653357 SHA512 62122533a9cfc7aebdbe28166d60816eea21e9c38df5f381817d01aac25a6f10bf806b5a6ccd24cb8fe4b6c7391138226c7a967fab019ad2dcd605797d8d6a28

diff --git a/media-video/qmplay2/files/qmplay2-23.02.05-fix-libva-glx.patch b/media-video/qmplay2/files/qmplay2-23.02.05-fix-libva-glx.patch
deleted file mode 100644
index e47aacf22a5f..000000000000
--- a/media-video/qmplay2/files/qmplay2-23.02.05-fix-libva-glx.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/905453
-
---- a/src/modules/FFmpeg/CMakeLists.txt
-+++ b/src/modules/FFmpeg/CMakeLists.txt
-@@ -67,7 +67,7 @@ if(USE_FFMPEG_VAAPI OR USE_FFMPEG_VDPAU OR USE_FFMPEG_DXVA2 OR USE_FFMPEG_D3D11V
-             list(APPEND FFmpeg_HDR VAAPIVulkan.hpp)
-             list(APPEND FFmpeg_SRC VAAPIVulkan.cpp)
-         endif()
--        pkg_check_modules(LBVA REQUIRED libva libva-glx libva-drm egl)
-+        pkg_check_modules(LBVA REQUIRED libva libva-drm egl)
-         include_directories(${LBVA_INCLUDE_DIRS})
-         link_directories(${LBVA_LIBRARY_DIRS})
-         list(APPEND FFmpeg_LIBS ${LBVA_LIBRARIES})

diff --git a/media-video/qmplay2/qmplay2-23.02.05-r1.ebuild b/media-video/qmplay2/qmplay2-23.02.05-r1.ebuild
deleted file mode 100644
index 162a1b938f4a..000000000000
--- a/media-video/qmplay2/qmplay2-23.02.05-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="A Qt-based video player, which can play most formats and codecs"
-HOMEPAGE="https://github.com/zaps166/QMPlay2"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/zaps166/QMPlay2"
-else
-	SRC_URI="https://github.com/zaps166/QMPlay2/releases/download/${PV}/QMPlay2-src-${PV}.tar.xz"
-	S="${WORKDIR}/QMPlay2-src-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="LGPL-3"
-SLOT="0"
-
-IUSE="avdevice +audiofilters +alsa cdio cuvid extensions gme inputs libass
-	modplug notifications opengl pipewire portaudio pulseaudio sid shaders
-	+taglib vaapi vdpau videofilters visualizations vulkan xv"
-
-REQUIRED_USE="
-	audiofilters? ( || ( alsa pipewire portaudio pulseaudio ) )
-	shaders? ( vulkan )"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-video/ffmpeg
-	|| (
-		dev-qt/qtgui:5[X(-)]
-		dev-qt/qtgui:5[xcb(-)]
-	)
-	alsa? ( media-libs/alsa-lib )
-	cdio? ( dev-libs/libcdio[cddb] )
-	extensions? ( dev-qt/qtdeclarative:5 )
-	gme? ( media-libs/game-music-emu )
-	libass? ( media-libs/libass )
-	opengl? ( virtual/opengl )
-	pipewire? ( media-video/pipewire )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-libs/libpulse )
-	sid? ( media-libs/libsidplayfp )
-	shaders? ( >=media-libs/shaderc-2020.1 )
-	taglib? ( media-libs/taglib	)
-	vaapi? (
-		>=media-video/ffmpeg-4.1.3[vaapi]
-		media-libs/libva[X]
-	)
-	vdpau? ( media-video/ffmpeg[vdpau] )
-	videofilters? ( dev-qt/qtconcurrent:5 )
-	vulkan? (
-		>=dev-qt/qtgui-5.14.1:5[vulkan]
-		>=media-libs/vulkan-loader-1.2.133
-	)
-	xv? ( x11-libs/libXv )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-23.02.05-fix-libva-glx.patch"
-)
-
-src_prepare() {
-	# disable compress man pages
-	sed -r \
-		-e 's/if\(GZIP\)/if\(TRUE\)/' \
-		-e 's/(install.+QMPlay2\.1)\.gz/\1/' \
-		-i src/gui/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# core
-		-DUSE_LINK_TIME_OPTIMIZATION=false
-		-DUSE_UPDATES=OFF
-		-DUSE_ALSA=$(usex alsa)
-		-DUSE_AUDIOCD=$(usex cdio)
-		-DUSE_DBUS_SUSPEND=ON
-		-DUSE_FREEDESKTOP_NOTIFICATIONS=ON
-		-DUSE_LIBASS=$(usex libass)
-		-DUSE_NOTIFY=$(usex notifications)
-		-DUSE_OPENGL=$(usex opengl)
-		-DUSE_VULKAN=$(usex vulkan)
-		-DUSE_GLSLC=$(usex shaders)
-		-DUSE_XVIDEO=$(usex xv)
-
-		# ffmpeg
-		-DUSE_FFMPEG_AVDEVICE=$(usex avdevice)
-		-DUSE_FFMPEG_VAAPI=$(usex vaapi)
-		-DUSE_FFMPEG_VDPAU=$(usex vdpau)
-
-		# chiptune
-		-DUSE_CHIPTUNE_GME=$(usex gme)
-		-DUSE_CHIPTUNE_SID=$(usex sid)
-
-		# modules
-		-DUSE_AUDIOFILTERS=$(usex audiofilters)
-		-DUSE_CUVID=$(usex cuvid)
-		-DUSE_INPUTS=$(usex inputs)
-		-DUSE_MODPLUG=$(usex modplug)
-		-DUSE_PIPEWIRE=$(usex pipewire)
-		-DUSE_PORTAUDIO=$(usex portaudio)
-		-DUSE_PULSEAUDIO=$(usex pulseaudio)
-		-DUSE_TAGLIB=$(usex taglib)
-		-DUSE_VIDEOFILTERS=$(usex videofilters)
-		-DUSE_VISUALIZATIONS=$(usex visualizations)
-
-		# extensions
-		-DUSE_EXTENSIONS=$(usex extensions)
-	)
-
-	if use extensions; then
-		# Move inside an if, to remove unused option warning
-		mycmakeargs+=(
-			-DUSE_LASTFM=ON
-			-DUSE_LYRICS=ON
-			-DUSE_MEDIABROWSER=ON
-			-DUSE_MPRIS2=ON
-		)
-	fi
-
-	if [[ ${PV} == *9999 ]]; then
-		mycmakeargs+=( -DUSE_GIT_VERSION=true )
-	else
-		mycmakeargs+=( -DUSE_GIT_VERSION=false )
-	fi
-
-	cmake_src_configure
-}

diff --git a/media-video/qmplay2/qmplay2-23.06.04.ebuild b/media-video/qmplay2/qmplay2-23.06.04.ebuild
deleted file mode 100644
index 1e5663f67ccb..000000000000
--- a/media-video/qmplay2/qmplay2-23.06.04.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="A Qt-based video player, which can play most formats and codecs"
-HOMEPAGE="https://github.com/zaps166/QMPlay2"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/zaps166/QMPlay2"
-else
-	SRC_URI="https://github.com/zaps166/QMPlay2/releases/download/${PV}/QMPlay2-src-${PV}.tar.xz"
-	S="${WORKDIR}/QMPlay2-src-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="LGPL-3"
-SLOT="0"
-
-IUSE="avdevice +audiofilters +alsa cdio cuvid extensions gme inputs libass
-	modplug notifications opengl pipewire portaudio pulseaudio sid shaders
-	+taglib vaapi vdpau videofilters visualizations vulkan xv"
-
-REQUIRED_USE="
-	audiofilters? ( || ( alsa pipewire portaudio pulseaudio ) )
-	shaders? ( vulkan )"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-video/ffmpeg
-	|| (
-		dev-qt/qtgui:5[X(-)]
-		dev-qt/qtgui:5[xcb(-)]
-	)
-	alsa? ( media-libs/alsa-lib )
-	cdio? ( dev-libs/libcdio[cddb] )
-	extensions? ( dev-qt/qtdeclarative:5 )
-	gme? ( media-libs/game-music-emu )
-	libass? ( media-libs/libass )
-	opengl? ( virtual/opengl )
-	pipewire? ( media-video/pipewire )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-libs/libpulse )
-	sid? ( media-libs/libsidplayfp )
-	shaders? ( >=media-libs/shaderc-2020.1 )
-	taglib? ( media-libs/taglib	)
-	vaapi? (
-		>=media-video/ffmpeg-4.1.3[vaapi]
-		media-libs/libva[X]
-	)
-	vdpau? ( media-video/ffmpeg[vdpau] )
-	videofilters? ( dev-qt/qtconcurrent:5 )
-	vulkan? (
-		>=dev-qt/qtgui-5.14.1:5[vulkan]
-		>=media-libs/vulkan-loader-1.2.133
-	)
-	xv? ( x11-libs/libXv )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-src_prepare() {
-	# disable compress man pages
-	sed -r \
-		-e 's/if\(GZIP\)/if\(TRUE\)/' \
-		-e 's/(install.+QMPlay2\.1)\.gz/\1/' \
-		-i src/gui/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_WITH_QT6=Off
-		# core
-		-DUSE_LINK_TIME_OPTIMIZATION=false
-		-DUSE_UPDATES=OFF
-		-DUSE_ALSA=$(usex alsa)
-		-DUSE_AUDIOCD=$(usex cdio)
-		-DUSE_DBUS_SUSPEND=ON
-		-DUSE_FREEDESKTOP_NOTIFICATIONS=ON
-		-DUSE_LIBASS=$(usex libass)
-		-DUSE_NOTIFY=$(usex notifications)
-		-DUSE_OPENGL=$(usex opengl)
-		-DUSE_VULKAN=$(usex vulkan)
-		-DUSE_GLSLC=$(usex shaders)
-		-DUSE_XVIDEO=$(usex xv)
-
-		# ffmpeg
-		-DUSE_FFMPEG_AVDEVICE=$(usex avdevice)
-		-DUSE_FFMPEG_VAAPI=$(usex vaapi)
-		-DUSE_FFMPEG_VDPAU=$(usex vdpau)
-
-		# chiptune
-		-DUSE_CHIPTUNE_GME=$(usex gme)
-		-DUSE_CHIPTUNE_SID=$(usex sid)
-
-		# modules
-		-DUSE_AUDIOFILTERS=$(usex audiofilters)
-		-DUSE_CUVID=$(usex cuvid)
-		-DUSE_INPUTS=$(usex inputs)
-		-DUSE_MODPLUG=$(usex modplug)
-		-DUSE_PIPEWIRE=$(usex pipewire)
-		-DUSE_PORTAUDIO=$(usex portaudio)
-		-DUSE_PULSEAUDIO=$(usex pulseaudio)
-		-DUSE_TAGLIB=$(usex taglib)
-		-DUSE_VIDEOFILTERS=$(usex videofilters)
-		-DUSE_VISUALIZATIONS=$(usex visualizations)
-
-		# extensions
-		-DUSE_EXTENSIONS=$(usex extensions)
-	)
-
-	if use extensions; then
-		# Move inside an if, to remove unused option warning
-		mycmakeargs+=(
-			-DUSE_LASTFM=ON
-			-DUSE_LYRICS=ON
-			-DUSE_MEDIABROWSER=ON
-			-DUSE_MPRIS2=ON
-		)
-	fi
-
-	if [[ ${PV} == *9999 ]]; then
-		mycmakeargs+=( -DUSE_GIT_VERSION=true )
-	else
-		mycmakeargs+=( -DUSE_GIT_VERSION=false )
-	fi
-
-	cmake_src_configure
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/qmplay2/files/, media-video/qmplay2/
@ 2025-06-28  6:24 Arthur Zamarin
  0 siblings, 0 replies; 5+ messages in thread
From: Arthur Zamarin @ 2025-06-28  6:24 UTC (permalink / raw
  To: gentoo-commits

commit:     771928ddc6fa721dfdd0a95262a011f1335de4f2
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 28 06:23:49 2025 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 28 06:24:44 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=771928dd

media-video/qmplay2: add 25.06.27

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 media-video/qmplay2/Manifest                       |   1 +
 .../files/qmplay2-25.06.27-revert-lld-stuff.patch  |  15 +++
 media-video/qmplay2/qmplay2-25.06.27.ebuild        | 128 +++++++++++++++++++++
 3 files changed, 144 insertions(+)

diff --git a/media-video/qmplay2/Manifest b/media-video/qmplay2/Manifest
index 18f3ddc92610..5da506964045 100644
--- a/media-video/qmplay2/Manifest
+++ b/media-video/qmplay2/Manifest
@@ -1,2 +1,3 @@
 DIST QMPlay2-src-25.01.19.tar.xz 2072396 BLAKE2B 42336e061294f8528f38fcad8850300b2c3e36857914b23ac086c5e15af83b710346463f5319e2b90c3c869659ef268fecbb967a3dcede0b32227d1ac719585c SHA512 a5745da1c53fd59f8bf47596cf1bb77f62c1af4585265695283153ef5b53f9f294a5fa2c8eb8683300ed13b99c52828a1cf3b5abd354c6bd8713087509589d69
 DIST QMPlay2-src-25.06.11.tar.xz 2105728 BLAKE2B 0905b3e4f252dc33b0b73a6e021296def2e735c15743c7a18ca1fdfcb5d9004cf6208754ad43388e4e32ba278e2d5c15b7a424e23bfc76ec6dc89f8e14e7125c SHA512 16042c228ec325ce4a29c6f22bbf4a088b8917aa0589f7bf21a1a38b104679ea7c3f4f956f50c4b7e5e8446c7e07b4619251f54648a0704f9d141cf92ff152bc
+DIST QMPlay2-src-25.06.27.tar.xz 2104364 BLAKE2B 58545f8cc15de8d954cc813bf5066cf5fbebcfdc29dccc9737b8b710edad85dda6a1a2c9fe6ddb30c1f8de0fbb23d1ab301c85f91ff9f9c76dcb1fc4e3ed6c5e SHA512 77505124c90f51c554ed6eeaabd5aa85c373843d41b8e1b83ab4c8cbe7beb6c6c656680539c625620607033089e842dd6476e7d4f8c526d739ba8934d5fad28f

diff --git a/media-video/qmplay2/files/qmplay2-25.06.27-revert-lld-stuff.patch b/media-video/qmplay2/files/qmplay2-25.06.27-revert-lld-stuff.patch
new file mode 100644
index 000000000000..110594104515
--- /dev/null
+++ b/media-video/qmplay2/files/qmplay2-25.06.27-revert-lld-stuff.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -383,12 +383,6 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang"
+         string(REPLACE ",--no-undefined" "" CMAKE_MODULE_LINKER_FLAGS ${CMAKE_MODULE_LINKER_FLAGS})
+         string(REPLACE "--no-undefined" "" CMAKE_MODULE_LINKER_FLAGS ${CMAKE_MODULE_LINKER_FLAGS})
+     endif()
+-
+-    if((NOT WIN32 AND NOT APPLE AND NOT ANDROID) AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+-        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=lld")
+-        set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -fuse-ld=lld")
+-        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=lld")
+-    endif()
+ endif()
+ 
+ if(APPLE)

diff --git a/media-video/qmplay2/qmplay2-25.06.27.ebuild b/media-video/qmplay2/qmplay2-25.06.27.ebuild
new file mode 100644
index 000000000000..45a15d65cea6
--- /dev/null
+++ b/media-video/qmplay2/qmplay2-25.06.27.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="A Qt-based video player, which can play most formats and codecs"
+HOMEPAGE="https://github.com/zaps166/QMPlay2"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/zaps166/QMPlay2"
+else
+	SRC_URI="https://github.com/zaps166/QMPlay2/releases/download/${PV}/QMPlay2-src-${PV}.tar.xz"
+	S="${WORKDIR}/QMPlay2-src-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="LGPL-3"
+SLOT="0"
+
+IUSE="avdevice +audiofilters +alsa cdio cuvid extensions gme inputs libass
+	modplug notifications opengl pipewire portaudio pulseaudio sid
+	shaders +taglib vaapi videofilters visualizations vulkan xv"
+
+REQUIRED_USE="
+	audiofilters? ( || ( alsa pipewire portaudio pulseaudio ) )
+	shaders? ( vulkan )
+"
+
+RDEPEND="
+	dev-qt/qtbase:6[concurrent,dbus,gui,network,opengl?,ssl,vulkan?,widgets]
+	dev-qt/qt5compat:6
+	dev-qt/qtsvg:6
+	media-video/ffmpeg:=[vaapi?]
+	alsa? ( media-libs/alsa-lib )
+	cdio? ( dev-libs/libcdio[cddb] )
+	extensions? ( dev-qt/qtdeclarative:6 )
+	gme? ( media-libs/game-music-emu )
+	libass? ( media-libs/libass )
+	opengl? ( virtual/opengl )
+	pipewire? ( media-video/pipewire )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-libs/libpulse )
+	sid? ( media-libs/libsidplayfp )
+	shaders? ( >=media-libs/shaderc-2020.1 )
+	taglib? ( media-libs/taglib:= )
+	vaapi? ( media-libs/libva[X] )
+	vulkan? ( >=media-libs/vulkan-loader-1.2.133 )
+	xv? ( x11-libs/libXv )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-qt/qttools:6[linguist]
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-25.06.27-revert-lld-stuff.patch"
+)
+
+src_prepare() {
+	# disable compress man pages
+	sed -i src/gui/CMakeLists.txt -r \
+		-e 's/if\(GZIP\)/if\(TRUE\)/' \
+		-e 's/(install.+QMPlay2\.1)\.gz/\1/' || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_WITH_QT6=ON
+		# core
+		-DUSE_UPDATES=OFF
+		-DUSE_ALSA=$(usex alsa)
+		-DUSE_AUDIOCD=$(usex cdio)
+		-DUSE_DBUS_PM=ON
+		-DUSE_FREEDESKTOP_NOTIFICATIONS=ON
+		-DUSE_LIBASS=$(usex libass)
+		-DUSE_NOTIFY=$(usex notifications)
+		-DUSE_OPENGL=$(usex opengl)
+		-DUSE_VULKAN=$(usex vulkan)
+		-DUSE_GLSLC=$(usex shaders)
+		-DUSE_XVIDEO=$(usex xv)
+
+		# ffmpeg
+		-DUSE_FFMPEG_AVDEVICE=$(usex avdevice)
+		-DUSE_FFMPEG_VAAPI=$(usex vaapi)
+
+		# chiptune
+		-DUSE_CHIPTUNE_GME=$(usex gme)
+		-DUSE_CHIPTUNE_SID=$(usex sid)
+
+		# modules
+		-DUSE_AUDIOFILTERS=$(usex audiofilters)
+		-DUSE_CUVID=$(usex cuvid)
+		-DUSE_INPUTS=$(usex inputs)
+		-DUSE_MODPLUG=$(usex modplug)
+		-DUSE_PIPEWIRE=$(usex pipewire)
+		-DUSE_PORTAUDIO=$(usex portaudio)
+		-DUSE_PULSEAUDIO=$(usex pulseaudio)
+		-DUSE_TAGLIB=$(usex taglib)
+		-DUSE_VIDEOFILTERS=$(usex videofilters)
+		-DUSE_VISUALIZATIONS=$(usex visualizations)
+
+		# extensions
+		-DUSE_EXTENSIONS=$(usex extensions)
+	)
+
+	if use extensions; then
+		# Move inside an if, to remove unused option warning
+		mycmakeargs+=(
+			-DUSE_LASTFM=ON
+			-DUSE_LYRICS=ON
+			-DUSE_MEDIABROWSER=ON
+			-DUSE_MPRIS2=ON
+		)
+	fi
+
+	if [[ ${PV} == *9999 ]]; then
+		mycmakeargs+=( -DUSE_GIT_VERSION=true )
+	else
+		mycmakeargs+=( -DUSE_GIT_VERSION=false )
+	fi
+
+	cmake_src_configure
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/qmplay2/files/, media-video/qmplay2/
@ 2025-09-05  8:10 Arthur Zamarin
  0 siblings, 0 replies; 5+ messages in thread
From: Arthur Zamarin @ 2025-09-05  8:10 UTC (permalink / raw
  To: gentoo-commits

commit:     aba0b0060caa46ee613ec92493a050cc7cb26d14
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  5 07:59:42 2025 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Sep  5 08:10:07 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aba0b006

media-video/qmplay2: drop 25.01.19

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 media-video/qmplay2/Manifest                       |   1 -
 .../qmplay2/files/qmplay2-25.06.11-fix-qmvk.patch  |  74 ------------
 media-video/qmplay2/qmplay2-25.01.19.ebuild        | 125 ---------------------
 3 files changed, 200 deletions(-)

diff --git a/media-video/qmplay2/Manifest b/media-video/qmplay2/Manifest
index 21061e859ef5..51d2269719cd 100644
--- a/media-video/qmplay2/Manifest
+++ b/media-video/qmplay2/Manifest
@@ -1,3 +1,2 @@
-DIST QMPlay2-src-25.01.19.tar.xz 2072396 BLAKE2B 42336e061294f8528f38fcad8850300b2c3e36857914b23ac086c5e15af83b710346463f5319e2b90c3c869659ef268fecbb967a3dcede0b32227d1ac719585c SHA512 a5745da1c53fd59f8bf47596cf1bb77f62c1af4585265695283153ef5b53f9f294a5fa2c8eb8683300ed13b99c52828a1cf3b5abd354c6bd8713087509589d69
 DIST QMPlay2-src-25.06.27.tar.xz 2104364 BLAKE2B 58545f8cc15de8d954cc813bf5066cf5fbebcfdc29dccc9737b8b710edad85dda6a1a2c9fe6ddb30c1f8de0fbb23d1ab301c85f91ff9f9c76dcb1fc4e3ed6c5e SHA512 77505124c90f51c554ed6eeaabd5aa85c373843d41b8e1b83ab4c8cbe7beb6c6c656680539c625620607033089e842dd6476e7d4f8c526d739ba8934d5fad28f
 DIST QMPlay2-src-25.09.03.tar.xz 2200080 BLAKE2B edf44816261a135926ab2ab615261afee8d5771eac34f91dda94e8b30b2e447c72dc1ca4761f7304870c0884dbb6294567e309f1c156e9ac484f42c956cb6d45 SHA512 f6112dd7a4e7811d7e0febfc1ed4b16882e8c90344ad780fda78e586839287ade82d50b44706b1c707d7725c6d61538a2298cc37452857136d89a7041d8ff37a

diff --git a/media-video/qmplay2/files/qmplay2-25.06.11-fix-qmvk.patch b/media-video/qmplay2/files/qmplay2-25.06.11-fix-qmvk.patch
deleted file mode 100644
index d82f032ba271..000000000000
--- a/media-video/qmplay2/files/qmplay2-25.06.11-fix-qmvk.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-https://github.com/zaps166/QMPlay2/commit/9744ec588866505dfd1020c28191be0d4b22f09a
-From: =?UTF-8?q?B=C5=82a=C5=BCej=20Szczygie=C5=82?= <mumei6102@gmail.com>
-Date: Mon, 16 Jun 2025 19:28:50 +0200
-Subject: [PATCH] Revert "CMake: Fix QmVk link on Android"
-
-This reverts commit bec93ba8cecab44e49b7b521e038983ef621123c.
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -434,11 +434,7 @@ find_package(${QT_PREFIX}Svg REQUIRED)
- 
- if(USE_VULKAN)
-     set(Vulkan_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/src/qmplay2/vulkan/headers/include")
--    if(ANDROID)
--        set(QMVK_LIBRARY_TYPE OBJECT)
--    else()
--        set(QMVK_LIBRARY_TYPE STATIC)
--    endif()
-+    set(QMVK_LIBRARY_TYPE STATIC)
-     set(QMVK_USE_PCH ${USE_PCH})
-     set(QMVK_WAIT_TIMEOUT_MS 2500)
-     add_subdirectory(src/qmvk)
---- a/src/qmplay2/CMakeLists.txt
-+++ b/src/qmplay2/CMakeLists.txt
-@@ -388,17 +388,10 @@ target_link_libraries(${PROJECT_NAME}
-     ${LIBQMPLAY2_LIBS}
- )
- if(USE_VULKAN)
--    if(ANDROID)
--        target_link_libraries(${PROJECT_NAME}
--            PRIVATE
--            $<TARGET_OBJECTS:QmVk>
--        )
--    else()
--        target_link_libraries(${PROJECT_NAME}
--            PRIVATE
--            $<TARGET_LINKER_FILE:QmVk>
--        )
--    endif()
-+    target_link_libraries(${PROJECT_NAME}
-+        PRIVATE
-+        $<TARGET_LINKER_FILE:QmVk>
-+    )
-     target_compile_definitions(${PROJECT_NAME}
-         PUBLIC
-         $<TARGET_PROPERTY:QmVk,INTERFACE_COMPILE_DEFINITIONS>
-https://github.com/zaps166/QMPlay2/commit/b26912bc727d32252d741afe4cc49b21d9f90708
-From: =?UTF-8?q?B=C5=82a=C5=BCej=20Szczygie=C5=82?= <mumei6102@gmail.com>
-Date: Mon, 16 Jun 2025 19:37:05 +0200
-Subject: [PATCH] CMake: Don't create QmVk static library
-
-This reverts commit 01f37839191f7ee7a6fd5ccd4cf8c160c2b9c1a6.
-
-Closes #916
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -434,7 +434,6 @@ find_package(${QT_PREFIX}Svg REQUIRED)
- 
- if(USE_VULKAN)
-     set(Vulkan_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/src/qmplay2/vulkan/headers/include")
--    set(QMVK_LIBRARY_TYPE STATIC)
-     set(QMVK_USE_PCH ${USE_PCH})
-     set(QMVK_WAIT_TIMEOUT_MS 2500)
-     add_subdirectory(src/qmvk)
---- a/src/qmplay2/CMakeLists.txt
-+++ b/src/qmplay2/CMakeLists.txt
-@@ -390,7 +390,7 @@ target_link_libraries(${PROJECT_NAME}
- if(USE_VULKAN)
-     target_link_libraries(${PROJECT_NAME}
-         PRIVATE
--        $<TARGET_LINKER_FILE:QmVk>
-+        $<FILTER:$<TARGET_OBJECTS:QmVk>,EXCLUDE,.*\\.[gp]ch>
-     )
-     target_compile_definitions(${PROJECT_NAME}
-         PUBLIC

diff --git a/media-video/qmplay2/qmplay2-25.01.19.ebuild b/media-video/qmplay2/qmplay2-25.01.19.ebuild
deleted file mode 100644
index 6c13763ed45a..000000000000
--- a/media-video/qmplay2/qmplay2-25.01.19.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="A Qt-based video player, which can play most formats and codecs"
-HOMEPAGE="https://github.com/zaps166/QMPlay2"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/zaps166/QMPlay2"
-else
-	SRC_URI="https://github.com/zaps166/QMPlay2/releases/download/${PV}/QMPlay2-src-${PV}.tar.xz"
-	S="${WORKDIR}/QMPlay2-src-${PV}"
-	KEYWORDS="amd64"
-fi
-
-LICENSE="LGPL-3"
-SLOT="0"
-
-IUSE="avdevice +audiofilters +alsa cdio cuvid extensions gme inputs libass
-	modplug notifications opengl pipewire portaudio pulseaudio sid
-	shaders +taglib vaapi videofilters visualizations vulkan xv"
-
-REQUIRED_USE="
-	audiofilters? ( || ( alsa pipewire portaudio pulseaudio ) )
-	shaders? ( vulkan )
-"
-
-RDEPEND="
-	dev-qt/qtbase:6[concurrent,dbus,gui,network,opengl?,ssl,vulkan?,widgets]
-	dev-qt/qt5compat:6
-	dev-qt/qtsvg:6
-	media-video/ffmpeg:=[vaapi?]
-	alsa? ( media-libs/alsa-lib )
-	cdio? ( dev-libs/libcdio[cddb] )
-	extensions? ( dev-qt/qtdeclarative:6 )
-	gme? ( media-libs/game-music-emu )
-	libass? ( media-libs/libass )
-	opengl? ( virtual/opengl )
-	pipewire? ( media-video/pipewire )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-libs/libpulse )
-	sid? ( media-libs/libsidplayfp )
-	shaders? ( >=media-libs/shaderc-2020.1 )
-	taglib? ( media-libs/taglib:= )
-	vaapi? ( media-libs/libva[X] )
-	vulkan? ( >=media-libs/vulkan-loader-1.2.133 )
-	xv? ( x11-libs/libXv )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-qt/qttools:6[linguist]
-"
-
-src_prepare() {
-	# disable compress man pages
-	sed -r \
-		-e 's/if\(GZIP\)/if\(TRUE\)/' \
-		-e 's/(install.+QMPlay2\.1)\.gz/\1/' \
-		-i src/gui/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_WITH_QT6=ON
-		# core
-		-DUSE_UPDATES=OFF
-		-DUSE_ALSA=$(usex alsa)
-		-DUSE_AUDIOCD=$(usex cdio)
-		-DUSE_DBUS_PM=ON
-		-DUSE_FREEDESKTOP_NOTIFICATIONS=ON
-		-DUSE_LIBASS=$(usex libass)
-		-DUSE_NOTIFY=$(usex notifications)
-		-DUSE_OPENGL=$(usex opengl)
-		-DUSE_VULKAN=$(usex vulkan)
-		-DUSE_GLSLC=$(usex shaders)
-		-DUSE_XVIDEO=$(usex xv)
-
-		# ffmpeg
-		-DUSE_FFMPEG_AVDEVICE=$(usex avdevice)
-		-DUSE_FFMPEG_VAAPI=$(usex vaapi)
-
-		# chiptune
-		-DUSE_CHIPTUNE_GME=$(usex gme)
-		-DUSE_CHIPTUNE_SID=$(usex sid)
-
-		# modules
-		-DUSE_AUDIOFILTERS=$(usex audiofilters)
-		-DUSE_CUVID=$(usex cuvid)
-		-DUSE_INPUTS=$(usex inputs)
-		-DUSE_MODPLUG=$(usex modplug)
-		-DUSE_PIPEWIRE=$(usex pipewire)
-		-DUSE_PORTAUDIO=$(usex portaudio)
-		-DUSE_PULSEAUDIO=$(usex pulseaudio)
-		-DUSE_TAGLIB=$(usex taglib)
-		-DUSE_VIDEOFILTERS=$(usex videofilters)
-		-DUSE_VISUALIZATIONS=$(usex visualizations)
-
-		# extensions
-		-DUSE_EXTENSIONS=$(usex extensions)
-	)
-
-	if use extensions; then
-		# Move inside an if, to remove unused option warning
-		mycmakeargs+=(
-			-DUSE_LASTFM=ON
-			-DUSE_LYRICS=ON
-			-DUSE_MEDIABROWSER=ON
-			-DUSE_MPRIS2=ON
-		)
-	fi
-
-	if [[ ${PV} == *9999 ]]; then
-		mycmakeargs+=( -DUSE_GIT_VERSION=true )
-	else
-		mycmakeargs+=( -DUSE_GIT_VERSION=false )
-	fi
-
-	cmake_src_configure
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2025-09-05  8:10 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-06-28  6:24 [gentoo-commits] repo/gentoo:master commit in: media-video/qmplay2/files/, media-video/qmplay2/ Arthur Zamarin
  -- strict thread matches above, loose matches on Subject: below --
2025-09-05  8:10 Arthur Zamarin
2023-06-28 18:30 Arthur Zamarin
2023-05-30 19:39 Andreas Sturmlechner
2022-10-23 18:37 Arthur Zamarin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox