pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/graphics/darktable



Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Sep  1 16:23:09 UTC 2023

Modified Files:
        pkgsrc/graphics/darktable: Makefile PLIST distinfo hacks.mk
Removed Files:
        pkgsrc/graphics/darktable/patches: patch-cmake_compiler-warnings.cmake
            patch-src_CMakeLists.txt
            patch-src_common_system__signal__handling.c
            patch-tools_noise_benchmark.sh

Log Message:
darktable: Update to 4.4.2

Among many other changes, this now builds again with the latest exiv2.


To generate a diff of this commit:
cvs rdiff -u -r1.144 -r1.145 pkgsrc/graphics/darktable/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/graphics/darktable/PLIST
cvs rdiff -u -r1.38 -r1.39 pkgsrc/graphics/darktable/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/darktable/hacks.mk
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/graphics/darktable/patches/patch-cmake_compiler-warnings.cmake \
    pkgsrc/graphics/darktable/patches/patch-src_common_system__signal__handling.c
cvs rdiff -u -r1.11 -r0 \
    pkgsrc/graphics/darktable/patches/patch-src_CMakeLists.txt
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/graphics/darktable/patches/patch-tools_noise_benchmark.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/darktable/Makefile
diff -u pkgsrc/graphics/darktable/Makefile:1.144 pkgsrc/graphics/darktable/Makefile:1.145
--- pkgsrc/graphics/darktable/Makefile:1.144    Sat Jul  1 22:16:34 2023
+++ pkgsrc/graphics/darktable/Makefile  Fri Sep  1 16:23:09 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.144 2023/07/01 22:16:34 wiz Exp $
+# $NetBSD: Makefile,v 1.145 2023/09/01 16:23:09 nia Exp $
 
-DISTNAME=      darktable-3.6.1
-PKGREVISION=   17
+DISTNAME=      darktable-4.4.2
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=darktable-org/}
 GITHUB_PROJECT=        darktable
@@ -13,15 +12,18 @@ HOMEPAGE=   https://www.darktable.org/
 COMMENT=       Photography workflow application
 LICENSE=       gnu-gpl-v3
 
-USE_CMAKE=             yes
 USE_LANGUAGES=         c c++
 USE_PKGLOCALEDIR=      yes
-USE_TOOLS+=            gmake intltool msgfmt pkg-config bash:run
+USE_TOOLS+=            intltool msgfmt pkg-config bash:run
+
+# "GNU C++ compiler version 10.4.0 is too old and is unsupported.  Version 12+
+# is required"
+GCC_REQD+=     12
 
 REPLACE_BASH+= tools/common.sh
 REPLACE_BASH+= tools/extract_wb_from_images.sh
-REPLACE_BASH+= tools/purge_from_cache.sh          
-REPLACE_BASH+= tools/purge_non_existing_images.sh 
+REPLACE_BASH+= tools/purge_from_cache.sh
+REPLACE_BASH+= tools/purge_non_existing_images.sh
 REPLACE_BASH+= tools/purge_unused_tags.sh
 
 CFLAGS+=       -Wno-reserved-id-macro
@@ -48,7 +50,6 @@ LDFLAGS+=     ${COMPILER_RPATH_FLAG}${PREFIX
 .include "../../mk/bsd.fast.prefs.mk"
 .if ${MACHINE_ARCH} == "i386"
 # SSE alignment issues
-GCC_REQD+=     4.2
 CFLAGS+=       -mstackrealign -msse2 -march=i686
 .elif ${MACHINE_ARCH} == "x86_64"
 CFLAGS+=       -msse2
@@ -59,6 +60,8 @@ CMAKE_ARGS+=  -DBUILD_SSE2_CODEPATHS=OFF
 CFLAGS.NetBSD+=        -D_NETBSD_SOURCE
 CFLAGS.SunOS+= -D__SUNOS__=1
 
+BUILDLINK_TRANSFORM+=  rm:-Werror
+
 CHECK_PORTABILITY_SKIP+=       packaging/macosx/start
 
 pre-configure:
@@ -70,39 +73,34 @@ pre-configure:
 DEPENDS+=      p5-Image-ExifTool-[0-9]*:../../graphics/p5-Image-ExifTool
 
 BUILDLINK_API_DEPENDS.sqlite3+=        sqlite3>=3.7.14.1nb1
-
 .include "../../databases/sqlite3/buildlink3.mk"
-.include "../../devel/GConf/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.if ${OPSYS} != "SunOS" && ${OPSYS} != "Linux"
-.include "../../devel/libinotify/buildlink3.mk"
-.endif
+.include "../../devel/cmake/build.mk"
+.include "../../devel/SDL2/buildlink3.mk"
 .include "../../devel/libgphoto2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.zlib+=   zlib>=1.2.11
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/GraphicsMagick/buildlink3.mk"
 .include "../../graphics/exiv2/buildlink3.mk"
-.include "../../graphics/gegl/buildlink3.mk"
-.include "../../graphics/librsvg/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/lensfun/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
+.include "../../graphics/libheif/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
+.include "../../graphics/libwebp/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/openjpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../lang/lua53/buildlink3.mk"
-.include "../../net/flickcurl/buildlink3.mk"
-.include "../../net/libsoup/buildlink3.mk"
-.include "../../print/cups-base/buildlink3.mk"
+.include "../../lang/lua54/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../print/libcups/buildlink3.mk"
 .include "../../security/libsecret/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../textproc/icu/buildlink3.mk"
 .include "../../textproc/iso-codes/buildlink3.mk"
-.include "../../textproc/pugixml/buildlink3.mk"
 .include "../../textproc/json-glib/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../textproc/pugixml/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../x11/libICE/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/darktable/PLIST
diff -u pkgsrc/graphics/darktable/PLIST:1.17 pkgsrc/graphics/darktable/PLIST:1.18
--- pkgsrc/graphics/darktable/PLIST:1.17        Thu Jun 23 20:05:11 2022
+++ pkgsrc/graphics/darktable/PLIST     Fri Sep  1 16:23:09 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2022/06/23 20:05:11 gdt Exp $
+@comment $NetBSD: PLIST,v 1.18 2023/09/01 16:23:09 nia Exp $
 bin/darktable
 bin/darktable-chart
 bin/darktable-cli
@@ -15,6 +15,7 @@ lib/darktable/plugins/imageio/format/lib
 lib/darktable/plugins/imageio/format/libpng.so
 lib/darktable/plugins/imageio/format/libppm.so
 lib/darktable/plugins/imageio/format/libtiff.so
+lib/darktable/plugins/imageio/format/libwebp.so
 lib/darktable/plugins/imageio/format/libxcf.so
 lib/darktable/plugins/imageio/storage/libdisk.so
 lib/darktable/plugins/imageio/storage/libemail.so
@@ -28,6 +29,7 @@ lib/darktable/plugins/libbasicadj.so
 lib/darktable/plugins/libbilat.so
 lib/darktable/plugins/libbilateral.so
 lib/darktable/plugins/libbloom.so
+lib/darktable/plugins/libblurs.so
 lib/darktable/plugins/libborders.so
 lib/darktable/plugins/libcacorrect.so
 lib/darktable/plugins/libcacorrectrgb.so
@@ -53,6 +55,7 @@ lib/darktable/plugins/libcrop.so
 lib/darktable/plugins/libdefringe.so
 lib/darktable/plugins/libdemosaic.so
 lib/darktable/plugins/libdenoiseprofile.so
+lib/darktable/plugins/libdiffuse.so
 lib/darktable/plugins/libdither.so
 lib/darktable/plugins/libequalizer.so
 lib/darktable/plugins/libexposure.so
@@ -92,6 +95,7 @@ lib/darktable/plugins/librotatepixels.so
 lib/darktable/plugins/libscalepixels.so
 lib/darktable/plugins/libshadhi.so
 lib/darktable/plugins/libsharpen.so
+lib/darktable/plugins/libsigmoid.so
 lib/darktable/plugins/libsoften.so
 lib/darktable/plugins/libsplittoning.so
 lib/darktable/plugins/libspots.so
@@ -115,6 +119,8 @@ lib/darktable/plugins/lighttable/libdupl
 lib/darktable/plugins/lighttable/libexport.so
 lib/darktable/plugins/lighttable/libfilmstrip.so
 lib/darktable/plugins/lighttable/libfilter.so
+lib/darktable/plugins/lighttable/libfiltering.so
+lib/darktable/plugins/lighttable/libgamepad.so
 lib/darktable/plugins/lighttable/libgeotagging.so
 lib/darktable/plugins/lighttable/libglobal_toolbox.so
 lib/darktable/plugins/lighttable/libhinter.so
@@ -154,7 +160,7 @@ man/man1/darktable-cltest.1
 man/man1/darktable-cmstest.1
 man/man1/darktable-generate-cache.1
 man/man1/darktable.1
-share/applications/darktable.desktop
+share/applications/org.darktable.darktable.desktop
 share/darktable/darktable.bash
 share/darktable/darktablerc
 share/darktable/gdb_commands
@@ -322,14 +328,17 @@ share/darktable/tools/purge_from_cache.s
 share/darktable/tools/purge_non_existing_images.sh
 share/darktable/tools/purge_unused_tags.sh
 share/darktable/watermarks/darktable.svg
+share/darktable/watermarks/fixed-size-text.svg
 share/darktable/watermarks/hasselblad.svg
+share/darktable/watermarks/metadata-template.svg
 share/darktable/watermarks/promo.svg
+share/darktable/watermarks/simple-text-shadow.svg
 share/darktable/watermarks/simple-text.svg
+share/darktable/wb_presets.json
 share/doc/darktable/AUTHORS
 share/doc/darktable/LICENSE
 share/doc/darktable/README.md
 share/doc/darktable/TRANSLATORS.md
-share/doc/darktable/darktablerc.html
 share/icons/hicolor/16x16/apps/darktable.png
 share/icons/hicolor/22x22/apps/darktable.png
 share/icons/hicolor/24x24/apps/darktable.png
@@ -341,17 +350,21 @@ share/icons/hicolor/scalable/apps/darkta
 share/icons/hicolor/scalable/apps/darktable-2.svg
 share/icons/hicolor/scalable/apps/darktable-3.svg
 share/icons/hicolor/scalable/apps/darktable.svg
-share/locale/af/LC_MESSAGES/darktable.mo
 share/locale/de/LC_MESSAGES/darktable.mo
-share/locale/eo/LC_MESSAGES/darktable.mo
+share/locale/en@truecase/LC_MESSAGES/darktable.mo
 share/locale/es/LC_MESSAGES/darktable.mo
+share/locale/fi/LC_MESSAGES/darktable.mo
 share/locale/fr/LC_MESSAGES/darktable.mo
 share/locale/he/LC_MESSAGES/darktable.mo
 share/locale/hu/LC_MESSAGES/darktable.mo
-share/locale/it/LC_MESSAGES/darktable.mo
-share/locale/nl/LC_MESSAGES/darktable.mo
+share/locale/ja/LC_MESSAGES/darktable.mo
+share/locale/pl/LC_MESSAGES/darktable.mo
 share/locale/pt_BR/LC_MESSAGES/darktable.mo
 share/locale/ru/LC_MESSAGES/darktable.mo
 share/locale/sl/LC_MESSAGES/darktable.mo
+share/locale/sq/LC_MESSAGES/darktable.mo
+share/locale/tr/LC_MESSAGES/darktable.mo
 share/locale/uk/LC_MESSAGES/darktable.mo
-share/metainfo/darktable.appdata.xml
+share/locale/zh_CN/LC_MESSAGES/darktable.mo
+share/locale/zh_TW/LC_MESSAGES/darktable.mo
+share/metainfo/org.darktable.darktable.appdata.xml

Index: pkgsrc/graphics/darktable/distinfo
diff -u pkgsrc/graphics/darktable/distinfo:1.38 pkgsrc/graphics/darktable/distinfo:1.39
--- pkgsrc/graphics/darktable/distinfo:1.38     Mon Dec 20 20:59:42 2021
+++ pkgsrc/graphics/darktable/distinfo  Fri Sep  1 16:23:09 2023
@@ -1,9 +1,5 @@
-$NetBSD: distinfo,v 1.38 2021/12/20 20:59:42 nia Exp $
+$NetBSD: distinfo,v 1.39 2023/09/01 16:23:09 nia Exp $
 
-BLAKE2s (darktable-3.6.1.tar.xz) = 932127244f3046004ebec7d1f89c1f9b7391a8aa5e4d7c3475c1ee6a453efa7b
-SHA512 (darktable-3.6.1.tar.xz) = d53eb8472531c62ceebe97769c6e53f7c9ed6efb404905295f00b5bf547fd0f0c395b8b926ccafc78d6cf9fed0745da655a77eeb84d92fce5d6a7a576f277416
-Size (darktable-3.6.1.tar.xz) = 4685928 bytes
-SHA1 (patch-cmake_compiler-warnings.cmake) = b65fbb5222cca791088137e823402df6b9423121
-SHA1 (patch-src_CMakeLists.txt) = d433361d7196c42100212dc087a3baa8fb6ba931
-SHA1 (patch-src_common_system__signal__handling.c) = 296f5618c618a9b16af2ca5a1d9ff408c437c220
-SHA1 (patch-tools_noise_benchmark.sh) = 1e26ebbbc73e44ec41c092297d681f33fb55155d
+BLAKE2s (darktable-4.4.2.tar.xz) = 83f500f5a2c0d83bcfa03a1f91b556a78b547862911f3c673a42e1896fb2abaa
+SHA512 (darktable-4.4.2.tar.xz) = 7b87879e865001491bbeaa12b9ac42b006bfa3fbcb50e73384c76cce0ee5d87200be3ce9b11f56d669d5eaf9b1add0a018ec5a021653bb84dfb6a0b379cb5594
+Size (darktable-4.4.2.tar.xz) = 6033932 bytes

Index: pkgsrc/graphics/darktable/hacks.mk
diff -u pkgsrc/graphics/darktable/hacks.mk:1.2 pkgsrc/graphics/darktable/hacks.mk:1.3
--- pkgsrc/graphics/darktable/hacks.mk:1.2      Thu Jun 23 09:32:57 2022
+++ pkgsrc/graphics/darktable/hacks.mk  Fri Sep  1 16:23:09 2023
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.2 2022/06/23 09:32:57 nia Exp $
+# $NetBSD: hacks.mk,v 1.3 2023/09/01 16:23:09 nia Exp $
 
 .if !defined(DARKTABLE_HACKS_MK)
 DARKTABLE_HACKS_MK:=
@@ -15,7 +15,7 @@ SUBST_MESSAGE.opt=    Disabling excessive f
 SUBST_STAGE.opt+=      pre-configure
 SUBST_SED.opt+=                -e "s,pragma GCC optimize,pragma GCC nooptimize,g"
 SUBST_FILES.opt+=      src/iop/*.c
-SUBST_FILES.opt+=      src/iop/*.h
+SUBST_FILES.opt+=      src/iop/demosaicing/*.c
 SUBST_FILES.opt+=      src/develop/blends/*.c
 SUBST_FILES.opt+=      src/common/*.c
 SUBST_FILES.opt+=      src/common/*.h



Home | Main Index | Thread Index | Old Index