From nobody Thu Nov 14 20:38:03 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XqBmq4x2Sz5d7Fb; Thu, 14 Nov 2024 20:38:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XqBmq36FPz461N; Thu, 14 Nov 2024 20:38:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731616683; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b5+F50YPaB+I6W8g0Qx6l5p+yYeV2RVCFvLLoSa59CU=; b=XWcHfn0XgzK4KlW95nObcBlPtirMcp4C1y8AUab3ETKNIIBUuiWLRZMeJKdjFP8+DnGzIw 8rUQMt7m8h3NiR6OFlw+/cepOlEuVj6V4rGI2gJttx+6dY2Xs+mK7xV3mu23PqsDJPTL0n ecj+iqCbyoNWVv0BSexhpE4njNkA9I/KyTnkGXBmoxLRTPZ8ulDwB0mYxfLtwRTIxFke89 zOq4PKBSZVGD+Dco3OTck8/n1L5DoWdeNykrLjNAqkZ9SxLPsNIacoOZwY7SvGx3LdiDqV KkZ8UfgntqMT4pN0cik5DrCGEFY1lEa7i3SdgoPyfJl2CHpkQE1cCCeYNELlYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731616683; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b5+F50YPaB+I6W8g0Qx6l5p+yYeV2RVCFvLLoSa59CU=; b=R055+nhy6LALGVD9YaVDq2v0grU6faf7QJOYZkh6MSPgLYxMXwbCvL1pJ5JIYhSpdpklFN h3zPBTl0TJKngNc9eavODugLlwSLc75XgWWU9hNkg4eqq0+TO9vTfuZTX3sqMQfgwdumFt ubiMkbkBW+Eu9+aW4v5df/5cMB9Q2/CB3N2dORlW1Evk8EW+jmVr03NkPmN9MwQ1zkDT4b oXHeIGVLVwIA/ObbIavYGSStH5vfwsFMK88tn7URnYwAKAK94wJ8jzI4HSW/kzgzGvEhby 5y64vnrkNRqo6VGNbJxOpsaQqHYeabTROw5nh8TswoZI/KSXr9jT4aTa80VnbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731616683; a=rsa-sha256; cv=none; b=v7cnCxSHLTrM6Ss5BnjwzbZEXKXPOfToePerZu75JhQYM7lFzaOBplySYGgvH+1AJjQ3pv u6Kp8d/xuiFqbG3tTPARMyOI113oRR3Tbw7piUqyS7vaUy1clflmd3DYtSv4Yhm2HD1S9Y OVad2yaYDsiYUe/O2NOqdKxdi7eL3u6dSHmeSMKbCBWfenqIPqZAZRmQy+zHaRIXGT/j+h aBEOoZEe36BifI37s8W0+dSUr8nQCmLYsgpEn/AYG1p6IkRO8MTx83JUivfzQ1T1CGe7vi AXppU9ggWF4MXNyxa2CTNl/yugJtXcz/l4sF1UHiSywya2jS6oHtn6VHG8hQJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XqBmq2kcjzsXx; Thu, 14 Nov 2024 20:38:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AEKc3La037673; Thu, 14 Nov 2024 20:38:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AEKc31Y037670; Thu, 14 Nov 2024 20:38:03 GMT (envelope-from git) Date: Thu, 14 Nov 2024 20:38:03 GMT Message-Id: <202411142038.4AEKc31Y037670@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: ed2fb20283e9 - main - graphics/digikam: make Marble integration optional List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ed2fb20283e97e18da5b8cdf74a3f6587a21e355 Auto-Submitted: auto-generated The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=ed2fb20283e97e18da5b8cdf74a3f6587a21e355 commit ed2fb20283e97e18da5b8cdf74a3f6587a21e355 Author: Dima Panov AuthorDate: 2024-11-14 20:34:46 +0000 Commit: Dima Panov CommitDate: 2024-11-14 20:37:48 +0000 graphics/digikam: make Marble integration optional Sponsored by: Future Crew, LLC --- graphics/digikam/Makefile | 9 +++++++-- graphics/digikam/pkg-plist | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile index 5bf87738461b..759fac5ea78c 100644 --- a/graphics/digikam/Makefile +++ b/graphics/digikam/Makefile @@ -66,12 +66,13 @@ PLIST_SUB= SHLIB_VER=${DISTVERSION} WITH_CCACHE_BUILD= yes -OPTIONS_DEFINE= AUTOTAGS FACEDETECT KDEPIM MEDIAPLAYER NLS +OPTIONS_DEFINE= AUTOTAGS FACEDETECT KDEPIM MARBLE MEDIAPLAYER NLS OPTIONS_MULTI= DB DB_DESC= Database options OPTIONS_MULTI_DB= MYSQL MYSQL_INTERNAL SQLITE3 OPTIONS_DEFAULT= ${OPTIONS_DEFINE:NAUTOTAGS:NFACEDETECT} \ - ${OPTIONS_MULTI_DB:NMYSQL_INTERNAL} + ${OPTIONS_MULTI_DB:NMYSQL_INTERNAL} \ + MARBLE OPTIONS_SUB= yes AUTOTAGS_DESC= Install data required for autotagging (~436 MiB) @@ -95,6 +96,10 @@ KDEPIM_USES= grantlee:5 KDEPIM_USE= KDE=akonadi,akonadicontacts,contacts,grantleetheme,itemmodels KDEPIM_CMAKE_BOOL= ENABLE_AKONADICONTACTSUPPORT +MARBLE_DESC= Virtual globe and world atlas +MARBLE_USE= kde=marble +MARBLE_CMAKE_OFF= -DMarble_FOUND:BOOL=OFF + MEDIAPLAYER_DESC= Enable media player MEDIAPLAYER_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libvdpau.so:multimedia/libvdpau diff --git a/graphics/digikam/pkg-plist b/graphics/digikam/pkg-plist index 382e0c11fce4..052d77919d67 100644 --- a/graphics/digikam/pkg-plist +++ b/graphics/digikam/pkg-plist @@ -245,7 +245,7 @@ lib/libdigikamgui.so.%%SHLIB_VER%% %%QT_PLUGINDIR%%/digikam/generic/Generic_FileTransfer_Plugin.so %%QT_PLUGINDIR%%/digikam/generic/Generic_Flickr_Plugin.so %%QT_PLUGINDIR%%/digikam/generic/Generic_GLViewer_Plugin.so -%%QT_PLUGINDIR%%/digikam/generic/Generic_GeolocationEdit_Plugin.so +%%MARBLE%%%%QT_PLUGINDIR%%/digikam/generic/Generic_GeolocationEdit_Plugin.so %%QT_PLUGINDIR%%/digikam/generic/Generic_Google_Plugin.so %%QT_PLUGINDIR%%/digikam/generic/Generic_HtmlGallery_Plugin.so %%QT_PLUGINDIR%%/digikam/generic/Generic_ImageShack_Plugin.so