gentoo auto-resync : 09:08:2023 - 21:30:54

3 files changed, 170 insertions, 14 deletions

diff --git a/media-video/qmplay2/Manifest b/media-video/qmplay2/Manifest
index dc951abd07dd..8bd0a29fc652 100644
--- a/media-video/qmplay2/Manifest
+++ b/media-video/qmplay2/Manifest
@@ -1,4 +1,6 @@
 DIST QMPlay2-src-23.06.17.tar.xz 1432852 BLAKE2B 50512d89f443218bf89f1b54276ece0983d31cc1e563ef829396ed1fb4e5f0437cd25e5ccb3c426ecd668c334477024de8658594c59ae2781a0e54ff83653357 SHA512 62122533a9cfc7aebdbe28166d60816eea21e9c38df5f381817d01aac25a6f10bf806b5a6ccd24cb8fe4b6c7391138226c7a967fab019ad2dcd605797d8d6a28
+DIST QMPlay2-src-23.08.08.tar.xz 1441212 BLAKE2B 11ec2cf0562da375194d03ee91ee7be44feb1360b4d99d165fd54d1bad00f73aea25765f60593b8468236c66ea75d05311c53d3667e4e6fa770a88ee88c5d251 SHA512 c341e38b5dbb63721a4cd600ee8b881aec5fff10976367ab1b41993c3cdc50fb9fd2ad6bf8f71490818e0cfa5e5497f158360eb254762f9e529a96c799d680f4
 EBUILD qmplay2-23.06.17-r1.ebuild 3220 BLAKE2B fa027c0b95bfa918485f454dca0ddd7cd9a30df9d0a8403387ff225bb0a4dec57af7e260151af72b68a8d98d6c3872a787b36960feef50760bb66ab12f5cf783 SHA512 3bcecb7ca00ccc4d3295d32cf215ba83d8edb43d7c336c032c87c147704bb73a8ea9661dc1511b5d1ce17335ac388d43a26fc2fea862d038529f0d71b8d9b802
-EBUILD qmplay2-9999.ebuild 3220 BLAKE2B fa027c0b95bfa918485f454dca0ddd7cd9a30df9d0a8403387ff225bb0a4dec57af7e260151af72b68a8d98d6c3872a787b36960feef50760bb66ab12f5cf783 SHA512 3bcecb7ca00ccc4d3295d32cf215ba83d8edb43d7c336c032c87c147704bb73a8ea9661dc1511b5d1ce17335ac388d43a26fc2fea862d038529f0d71b8d9b802
+EBUILD qmplay2-23.08.08.ebuild 3487 BLAKE2B ad6d134d559ec5572a51df99e05cd24698e556e75fde6e8829acbdca711e9e1f3f3f09c1e2671209bd2328614b7075f84dc62d889095a2be46df9676c91d1d10 SHA512 8e0b0a948c43ff02aea0e5aeacfaf4c2d30f7c5c095bf7fd05f79ce61b9ff52a89610f9cc9b563d167410d6c3e004efd57dd53c130347494ea4d130ca15542b2
+EBUILD qmplay2-9999.ebuild 3487 BLAKE2B ad6d134d559ec5572a51df99e05cd24698e556e75fde6e8829acbdca711e9e1f3f3f09c1e2671209bd2328614b7075f84dc62d889095a2be46df9676c91d1d10 SHA512 8e0b0a948c43ff02aea0e5aeacfaf4c2d30f7c5c095bf7fd05f79ce61b9ff52a89610f9cc9b563d167410d6c3e004efd57dd53c130347494ea4d130ca15542b2
 MISC metadata.xml 1287 BLAKE2B f04c4032dd3f32f10e33c551d364a9914d7663448b293ab9161da4741f53e65438749c1cd14b2ab0f5dd6a231109763642e53932d2705170a7e063e594acae36 SHA512 3f480f4d3cff62300e8eed043f16fe2a0f5cb8572be5fa00710b86036b93650b852168b7e01c2611c95755205d1a33883d67dfb8fd187d87c459d923e77c9fbd
diff --git a/media-video/qmplay2/qmplay2-23.08.08.ebuild b/media-video/qmplay2/qmplay2-23.08.08.ebuild
new file mode 100644
index 000000000000..4c9184782dc4
--- /dev/null
+++ b/media-video/qmplay2/qmplay2-23.08.08.ebuild
@@ -0,0 +1,141 @@
+# 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 +qt5 qt6 sid
+	shaders +taglib vaapi vdpau videofilters visualizations vulkan xv"
+
+REQUIRED_USE="
+	audiofilters? ( || ( alsa pipewire portaudio pulseaudio ) )
+	shaders? ( vulkan )
+	^^ ( qt5 qt6 )
+"
+
+RDEPEND="
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5[X(-),vulkan?]
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		extensions? ( dev-qt/qtdeclarative:5 )
+		videofilters? ( dev-qt/qtconcurrent:5 )
+	)
+	qt6? (
+		dev-qt/qtbase:6[concurrent,dbus,gui,network,opengl?,ssl,vulkan?,widgets]
+		dev-qt/qt5compat:6
+		dev-qt/qtsvg:6
+		extensions? ( dev-qt/qtdeclarative:6 )
+	)
+	media-video/ffmpeg:=[vaapi?,vdpau?]
+	alsa? ( media-libs/alsa-lib )
+	cdio? ( dev-libs/libcdio[cddb] )
+	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="
+	qt5? ( dev-qt/linguist-tools:5 )
+	qt6? ( 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=$(usex qt6)
+		# 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-9999.ebuild b/media-video/qmplay2/qmplay2-9999.ebuild
index 9c898d587e0e..4c9184782dc4 100644
--- a/media-video/qmplay2/qmplay2-9999.ebuild
+++ b/media-video/qmplay2/qmplay2-9999.ebuild
@@ -21,24 +21,35 @@ 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"
+	modplug notifications opengl pipewire portaudio pulseaudio +qt5 qt6 sid
+	shaders +taglib vaapi vdpau videofilters visualizations vulkan xv"
 
 REQUIRED_USE="
 	audiofilters? ( || ( alsa pipewire portaudio pulseaudio ) )
-	shaders? ( vulkan )"
+	shaders? ( vulkan )
+	^^ ( qt5 qt6 )
+"
 
 RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5[X(-),vulkan?]
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5[X(-),vulkan?]
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		extensions? ( dev-qt/qtdeclarative:5 )
+		videofilters? ( dev-qt/qtconcurrent:5 )
+	)
+	qt6? (
+		dev-qt/qtbase:6[concurrent,dbus,gui,network,opengl?,ssl,vulkan?,widgets]
+		dev-qt/qt5compat:6
+		dev-qt/qtsvg:6
+		extensions? ( dev-qt/qtdeclarative:6 )
+	)
 	media-video/ffmpeg:=[vaapi?,vdpau?]
 	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 )
@@ -49,12 +60,14 @@ RDEPEND="
 	shaders? ( >=media-libs/shaderc-2020.1 )
 	taglib? ( media-libs/taglib	)
 	vaapi? ( media-libs/libva[X] )
-	videofilters? ( dev-qt/qtconcurrent:5 )
 	vulkan? ( >=media-libs/vulkan-loader-1.2.133 )
 	xv? ( x11-libs/libXv )
 "
 DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
+BDEPEND="
+	qt5? ( dev-qt/linguist-tools:5 )
+	qt6? ( dev-qt/qttools:6[linguist] )
+"
 
 src_prepare() {
 	# disable compress man pages
@@ -68,7 +81,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DBUILD_WITH_QT6=Off
+		-DBUILD_WITH_QT6=$(usex qt6)
 		# core
 		-DUSE_LINK_TIME_OPTIMIZATION=false
 		-DUSE_UPDATES=OFF