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?= <[email protected]> -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?= <[email protected]> -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 -}
