Date: Sat, 6 Jan 2024 17:54:28 GMT From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: bf1a1bec3c18 - main - graphics/libkdcraw: flavorize for Qt5 and Qt6 Message-ID: <202401061754.406HsS1S012281@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=bf1a1bec3c18eaae2c54ec86570b9fe62b7a0aa8 commit bf1a1bec3c18eaae2c54ec86570b9fe62b7a0aa8 Author: Tobias C. Berner <tcberner@FreeBSD.org> AuthorDate: 2024-01-06 16:46:32 +0000 Commit: Tobias C. Berner <tcberner@FreeBSD.org> CommitDate: 2024-01-06 17:53:52 +0000 graphics/libkdcraw: flavorize for Qt5 and Qt6 --- Mk/Uses/kde.mk | 2 +- graphics/gwenview/Makefile | 1 + graphics/kdegraphics-thumbnailers/Makefile | 1 + graphics/kphotoalbum/Makefile | 6 +++--- graphics/krita/Makefile | 2 +- graphics/libkdcraw/Makefile | 24 +++++++++++++++++------- graphics/libkdcraw/{pkg-plist => pkg-plist.qt5} | 0 graphics/libkdcraw/pkg-plist.qt6 | 18 ++++++++++++++++++ graphics/libkipi/Makefile | 1 + 9 files changed, 43 insertions(+), 12 deletions(-) diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk index a055ee30b3b6..c53095a1f8c0 100644 --- a/Mk/Uses/kde.mk +++ b/Mk/Uses/kde.mk @@ -967,7 +967,7 @@ kde-libkcddb5_LIB= libKF${_KDE_VERSION}Cddb.so kde-libkcompactdisc5_PORT= audio/libkcompactdisc kde-libkcompactdisc5_LIB= libKF${_KDE_VERSION}CompactDisc.so -kde-libkdcraw5_PORT= graphics/libkdcraw +kde-libkdcraw5_PORT= graphics/libkdcraw@qt${_KDE_VERSION} kde-libkdcraw5_LIB= libKF${_KDE_VERSION}KDcraw.so kde-libkdegames5_PORT= games/libkdegames diff --git a/graphics/gwenview/Makefile b/graphics/gwenview/Makefile index ca5ec748dcfd..d01620c6cb85 100644 --- a/graphics/gwenview/Makefile +++ b/graphics/gwenview/Makefile @@ -1,5 +1,6 @@ PORTNAME= gwenview DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= graphics kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/graphics/kdegraphics-thumbnailers/Makefile b/graphics/kdegraphics-thumbnailers/Makefile index ce5e893e5a8d..a737a3d4abf5 100644 --- a/graphics/kdegraphics-thumbnailers/Makefile +++ b/graphics/kdegraphics-thumbnailers/Makefile @@ -1,5 +1,6 @@ PORTNAME= kdegraphics-thumbnailers DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= graphics kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/graphics/kphotoalbum/Makefile b/graphics/kphotoalbum/Makefile index 1ab2e724574c..06693bbfd644 100644 --- a/graphics/kphotoalbum/Makefile +++ b/graphics/kphotoalbum/Makefile @@ -1,5 +1,6 @@ PORTNAME= kphotoalbum DISTVERSION= 5.12.0 +PORTREVISION= 1 CATEGORIES= graphics kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/ DIST_SUBDIR= KDE @@ -11,13 +12,12 @@ WWW= https://www.kphotoalbum.org/ LICENSE= GPLv2+ LIB_DEPENDS= libexiv2.so:graphics/exiv2 \ - libvlc.so:multimedia/vlc \ - libKF5KDcraw.so:graphics/libkdcraw + libvlc.so:multimedia/vlc USES= cmake compiler:c++11-lang desktop-file-utils jpeg kde:5 \ pkgconfig qt:5 shebangfix tar:xz xorg USE_KDE= archive auth codecs completion config configwidgets coreaddons \ - i18n iconthemes jobwidgets kio marble phonon purpose service solid \ + i18n iconthemes jobwidgets kio libkdcraw marble phonon purpose service solid \ sonnet textwidgets widgetsaddons windowsystem xmlgui \ ecm:build USE_QT= concurrent core dbus declarative gui location network \ diff --git a/graphics/krita/Makefile b/graphics/krita/Makefile index a16b1880ce2a..4f041ceca289 100644 --- a/graphics/krita/Makefile +++ b/graphics/krita/Makefile @@ -1,6 +1,6 @@ PORTNAME= krita DISTVERSION= 5.2.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics kde MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION} DIST_SUBDIR= KDE/${PORTNAME} diff --git a/graphics/libkdcraw/Makefile b/graphics/libkdcraw/Makefile index c123bc9b868b..7084841b22fb 100644 --- a/graphics/libkdcraw/Makefile +++ b/graphics/libkdcraw/Makefile @@ -1,6 +1,8 @@ PORTNAME= libkdcraw DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= graphics kde kde-applications +PKGNAMESUFFIX?= -${FLAVOR} MAINTAINER= kde@FreeBSD.org COMMENT= LibRaw interface for KDE @@ -10,15 +12,23 @@ LICENSE= GPLv2+ LIB_DEPENDS= libjasper.so:graphics/jasper \ liblcms.so:graphics/lcms \ - libxml2.so:textproc/libxml2 \ - libraw.so:graphics/libraw + libraw.so:graphics/libraw \ + libxml2.so:textproc/libxml2 -USES= cmake compiler:c++11-lang jpeg kde:5 pkgconfig qt:5 tar:xz +FLAVORS= qt5 qt6 +FLAVOR?= qt5 + +USES= cmake compiler:c++11-lang jpeg kde:${FLAVOR:S/qt//} pkgconfig \ + qt:${FLAVOR:S/qt//} tar:xz USE_KDE= ecm:build -USE_QT= core gui \ - buildtools:build qmake:build USE_LDCONFIG= yes -CMAKE_ARGS= -DWITH_OpenMP:BOOL=False \ - -DENABLE_RAWSPEED=True +_USE_QT_qt5= core gui buildtools:build qmake:build +_USE_QT_qt6= base +USE_QT= ${_USE_QT_${FLAVOR}} +CMAKE_ARGS= -DENABLE_RAWSPEED=True \ + -DQT_MAJOR_VERSION="${FLAVOR:S/qt//}" \ + -DWITH_OpenMP:BOOL=False + +PLIST= pkg-plist.${FLAVOR} .include <bsd.port.mk> diff --git a/graphics/libkdcraw/pkg-plist b/graphics/libkdcraw/pkg-plist.qt5 similarity index 100% rename from graphics/libkdcraw/pkg-plist rename to graphics/libkdcraw/pkg-plist.qt5 diff --git a/graphics/libkdcraw/pkg-plist.qt6 b/graphics/libkdcraw/pkg-plist.qt6 new file mode 100644 index 000000000000..4f29876c4444 --- /dev/null +++ b/graphics/libkdcraw/pkg-plist.qt6 @@ -0,0 +1,18 @@ +include/KF6/KDCRAW/KDCRAW/DcrawInfoContainer +include/KF6/KDCRAW/KDCRAW/KDcraw +include/KF6/KDCRAW/KDCRAW/RawDecodingSettings +include/KF6/KDCRAW/KDCRAW/RawFiles +include/KF6/KDCRAW/kdcraw/dcrawinfocontainer.h +include/KF6/KDCRAW/kdcraw/kdcraw.h +include/KF6/KDCRAW/kdcraw/libkdcraw_export.h +include/KF6/KDCRAW/kdcraw/rawdecodingsettings.h +include/KF6/KDCRAW/kdcraw/rawfiles.h +include/KF6/KDCRAW/libkdcraw_version.h +lib/cmake/KF6KDcraw/KF6KDcrawConfig.cmake +lib/cmake/KF6KDcraw/KF6KDcrawConfigVersion.cmake +lib/cmake/KF6KDcraw/KF6KDcrawTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/KF6KDcraw/KF6KDcrawTargets.cmake +lib/libKF6KDcraw.so +lib/libKF6KDcraw.so.5 +lib/libKF6KDcraw.so.5.0.0 +share/qlogging-categories6/libkdcraw.categories diff --git a/graphics/libkipi/Makefile b/graphics/libkipi/Makefile index 5d06d5023f1b..779345400b92 100644 --- a/graphics/libkipi/Makefile +++ b/graphics/libkipi/Makefile @@ -1,5 +1,6 @@ PORTNAME= libkipi DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= graphics kde kde-applications MAINTAINER= kde@FreeBSD.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401061754.406HsS1S012281>