gentoo auto-resync : 24:07:2022 - 14:53:22

3 files changed, 82 insertions, 3 deletions

diff --git a/kde-apps/kamoso/Manifest b/kde-apps/kamoso/Manifest
index 99ac5a409ece..8da01f977c14 100644
--- a/kde-apps/kamoso/Manifest
+++ b/kde-apps/kamoso/Manifest
@@ -1,5 +1,6 @@
+AUX kamoso-22.04.3-tests-optional.patch 2526 BLAKE2B 8ff3d77722f422e042df5ab0bff8218efa96907b428096bbc09288ac10d1cd81b135a2eac351bc906d99766ac486065aafe05732181e649c8a74d7ae1b25c679 SHA512 bcba6833be25d32559fdec91e9cafa443b8dc203747427610e96b487db01fc2c482b384d0858d77e9eb3af0fa7bf8240c5618e9caa5361c1752916a7fe8bb936
 DIST kamoso-21.12.3.tar.xz 216088 BLAKE2B 2b89537f085e8cfad4d3755745b79f657411cd6de3be1c006cccf4c8d3d190baeb2724e38a292521fb88d1ba150c159bedb42a54a5e0f7c2bd898e5ddd6da4b6 SHA512 2e6a387dc2ad445ad29c686959736bae7f406e869607ccc61bd888c72a710f72de33afbdd114d6a91b7f12101c359174108b0a1ad786fea068e11332929b7974
 DIST kamoso-22.04.3.tar.xz 227264 BLAKE2B 137e24291d84d8d98f8f1aaed332b2cfb4130d53051431d94bd54ef669189f7feeb6b69bb11eda81c79b18d1743e456f85c110dea78560ac22df3b56df3d26a9 SHA512 379ec6050c273aed255c004e9c3a8463f6a1349d96cf83cd25b3172b1b4e45841d26a03ffb6c041ece85593e276593e65cf385643391615c9695e1a92010d3f1
 EBUILD kamoso-21.12.3.ebuild 1123 BLAKE2B 51fe3d94e4850151c6239fda108fd442e6278ef3c036c14057d23b99a451ff11d40bb50fb882c902959d77bdac4fcceeaaa9473b6a26baaaa800ff5ed5e2b0aa SHA512 78aa05d12de8f7627b167bbd8287ab4333faf6317011211c9dd0f27e13e6abf2805c5e760d7ecc4fbd8087d15e21c847dc42c940273f1076c20f1e8979190769
-EBUILD kamoso-22.04.3.ebuild 1129 BLAKE2B d4609988e637d1972dc7ef118f94d4af617c86be5767329e0e0832ae1f5a230d0295e9df96e1a4555ca9a0cf1f457bfa4d28581fe496bef00e95c09372c03f93 SHA512 b9b5c5612a95dfefb865cc31aa620127f408e2e974c1a9688ed3ee4b96e3501fe00bcfbca3d30614629ce09da21cdbff83df9a728993ad642204498c9efeea71
+EBUILD kamoso-22.04.3.ebuild 1279 BLAKE2B 63b55f04f2d04b5e0c8ff99d0b7676282b321d6a56095c57cdfa729269e3603644dd7351757ac71e235ce6d827191a1d5e1fe6f21ad63bd771403dce778d868c SHA512 c344c3b6379cf0dd38f641ce29a75eedbdec437eb7eebb5d9bea8d50ec7b37d5194e0f953ef94cdcc632bd918b3c84d161b5f240be8e81e6a0dabb150a7ebb22
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kamoso/files/kamoso-22.04.3-tests-optional.patch b/kde-apps/kamoso/files/kamoso-22.04.3-tests-optional.patch
new file mode 100644
index 000000000000..2d90e18a79eb
--- /dev/null
+++ b/kde-apps/kamoso/files/kamoso-22.04.3-tests-optional.patch
@@ -0,0 +1,72 @@
+From d868caa001d134cf70ad08185511c1dfc81476db Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 24 Jul 2022 13:46:19 +0200
+Subject: [PATCH] Make tests optional with standard BUILD_TESTING switch
+
+Qt5OpenGL is only needed for tests.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt                             |  2 +-
+ src/elements/gstqtvideosink/CMakeLists.txt | 35 ++++++++++++----------
+ 2 files changed, 20 insertions(+), 17 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e2b1e40..3c04631 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -13,7 +13,7 @@ set(KF5_MIN_VERSION 5.70.0)
+ find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}  ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+ 
+-find_package(Qt5 NO_MODULE REQUIRED COMPONENTS Core Gui Widgets Quick Test OpenGL)
++find_package(Qt5 NO_MODULE REQUIRED COMPONENTS Core Gui Widgets Quick)
+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Config DocTools KIO I18n Purpose Notifications)
+ 
+ find_package(PkgConfig REQUIRED)
+diff --git a/src/elements/gstqtvideosink/CMakeLists.txt b/src/elements/gstqtvideosink/CMakeLists.txt
+index a9f371d..37c3774 100644
+--- a/src/elements/gstqtvideosink/CMakeLists.txt
++++ b/src/elements/gstqtvideosink/CMakeLists.txt
+@@ -59,19 +59,22 @@ target_link_libraries(gst${QTVIDEOSINK_NAME}
+ 
+ install(TARGETS gst${QTVIDEOSINK_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/gstreamer-${GSTREAMER_ABI_VERSION})
+ 
+-ecm_add_test(
+-        autotest.cpp
+-        utils/utils.cpp
+-        utils/bufferformat.cpp
+-        painters/genericsurfacepainter.cpp
+-        painters/openglsurfacepainter.cpp
+-        ${GstQtVideoSink_test_GL_SRCS}
+-    LINK_LIBRARIES
+-        PkgConfig::GStreamerVideo
+-        ${GstQtVideoSink_GL_LIBS}
+-        Qt5::Test
+-        Qt5::OpenGL
+-        Qt5::Quick
+-    TEST_NAME qtvideosink_autotest
+-)
+-
++if(BUILD_TESTING)
++    find_package(Qt5 NO_MODULE REQUIRED COMPONENTS OpenGL Widgets)
++    ecm_add_test(
++            autotest.cpp
++            utils/utils.cpp
++            utils/bufferformat.cpp
++            painters/genericsurfacepainter.cpp
++            painters/openglsurfacepainter.cpp
++            ${GstQtVideoSink_test_GL_SRCS}
++        LINK_LIBRARIES
++            PkgConfig::GStreamerVideo
++            ${GstQtVideoSink_GL_LIBS}
++            Qt5::Test
++            Qt5::OpenGL
++            Qt5::Quick
++            Qt5::Widgets
++        TEST_NAME qtvideosink_autotest
++    )
++endif()
+-- 
+2.35.1
+
diff --git a/kde-apps/kamoso/kamoso-22.04.3.ebuild b/kde-apps/kamoso/kamoso-22.04.3.ebuild
index ac23613f2d5e..d6ff62df372a 100644
--- a/kde-apps/kamoso/kamoso-22.04.3.ebuild
+++ b/kde-apps/kamoso/kamoso-22.04.3.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+ECM_TEST="true"
 ECM_HANDBOOK="forceoptional"
 KFMIN=5.92.0
 QTMIN=5.15.4
@@ -19,7 +20,7 @@ IUSE=""
 
 RESTRICT="test" # bug 653674
 
-DEPEND="
+COMMON_DEPEND="
 	dev-libs/glib:2
 	>=dev-qt/qtdeclarative-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -33,7 +34,10 @@ DEPEND="
 	media-libs/gst-plugins-base:1.0
 	virtual/opengl
 "
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+	test? ( >=dev-qt/qtopengl-${QTMIN}:5 )
+"
+RDEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 	>=kde-frameworks/kirigami-${KFMIN}:5
 	media-plugins/gst-plugins-jpeg:1.0
@@ -41,3 +45,5 @@ RDEPEND="${DEPEND}
 	media-plugins/gst-plugins-meta:1.0[alsa,theora,vorbis,v4l]
 "
 BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${P}-tests-optional.patch" )