* [gentoo-commits] repo/gentoo:master commit in: media-video/qmplay2/, media-video/qmplay2/files/
@ 2023-05-04 15:48 Arthur Zamarin
0 siblings, 0 replies; 2+ messages in thread
From: Arthur Zamarin @ 2023-05-04 15:48 UTC (permalink / raw
To: gentoo-commits
commit: e6cc0a2583c4a5172e47df809363389512937463
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu May 4 15:46:22 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu May 4 15:48:32 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6cc0a25
media-video/qmplay2: fix dependency on libva-glx
This is used as one of the fallback backends. Already built
installations continue to work (one of the reasons we missed this
bug for ~3 month since an action), so no need to revbump to rebuild.
Closes: https://bugs.gentoo.org/905453
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
.../qmplay2/files/qmplay2-23.02.05-fix-libva-glx.patch | 13 +++++++++++++
media-video/qmplay2/qmplay2-23.02.05.ebuild | 4 ++++
2 files changed, 17 insertions(+)
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
new file mode 100644
index 000000000000..e47aacf22a5f
--- /dev/null
+++ b/media-video/qmplay2/files/qmplay2-23.02.05-fix-libva-glx.patch
@@ -0,0 +1,13 @@
+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.ebuild b/media-video/qmplay2/qmplay2-23.02.05.ebuild
index 83acd1b1df36..04d454c891d3 100644
--- a/media-video/qmplay2/qmplay2-23.02.05.ebuild
+++ b/media-video/qmplay2/qmplay2-23.02.05.ebuild
@@ -66,6 +66,10 @@ RDEPEND="
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 \
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/qmplay2/, media-video/qmplay2/files/
@ 2025-06-20 14:14 Arthur Zamarin
0 siblings, 0 replies; 2+ messages in thread
From: Arthur Zamarin @ 2025-06-20 14:14 UTC (permalink / raw
To: gentoo-commits
commit: d63525b25b9672e0d6faf1a9212b728d6095cd39
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 20 14:14:08 2025 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 20 14:14:08 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d63525b2
media-video/qmplay2: fix qmvk compilation
Closes: https://bugs.gentoo.org/958275
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
.../qmplay2/files/qmplay2-25.06.11-fix-qmvk.patch | 74 ++++++++++++++++++++++
media-video/qmplay2/qmplay2-25.06.11.ebuild | 4 ++
2 files changed, 78 insertions(+)
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
new file mode 100644
index 000000000000..d82f032ba271
--- /dev/null
+++ b/media-video/qmplay2/files/qmplay2-25.06.11-fix-qmvk.patch
@@ -0,0 +1,74 @@
+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.06.11.ebuild b/media-video/qmplay2/qmplay2-25.06.11.ebuild
index 48f5ea773888..f37263b7feae 100644
--- a/media-video/qmplay2/qmplay2-25.06.11.ebuild
+++ b/media-video/qmplay2/qmplay2-25.06.11.ebuild
@@ -55,6 +55,10 @@ BDEPEND="
dev-qt/qttools:6[linguist]
"
+PATCHES=(
+ "${FILESDIR}/${P}-fix-qmvk.patch" # merged upstream, bug #958275
+)
+
src_prepare() {
# disable compress man pages
sed -i src/gui/CMakeLists.txt -r \
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-06-20 14:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-06-20 14:14 [gentoo-commits] repo/gentoo:master commit in: media-video/qmplay2/, media-video/qmplay2/files/ Arthur Zamarin
-- strict thread matches above, loose matches on Subject: below --
2023-05-04 15:48 Arthur Zamarin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox