Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 915EF7A321 for ; Fri, 23 Dec 2016 03:53:18 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 3A6A58565C; Fri, 23 Dec 2016 03:53:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id BED4E8565A for ; Fri, 23 Dec 2016 03:53:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id gC_y8u3-gWZh for ; Fri, 23 Dec 2016 03:53:16 +0000 (UTC) Received: from cvs.NetBSD.org (unknown [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id CE06884CFB for ; Fri, 23 Dec 2016 03:53:16 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id C3BD2FBA6; Fri, 23 Dec 2016 03:53:16 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_148246519692080" MIME-Version: 1.0 Date: Fri, 23 Dec 2016 03:53:16 +0000 From: "Ryo ONODERA" Subject: CVS commit: pkgsrc/graphics/darktable To: pkgsrc-changes@NetBSD.org Reply-To: ryoon@netbsd.org X-Mailer: log_accum Message-Id: <20161223035316.C3BD2FBA6@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_148246519692080 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: ryoon Date: Fri Dec 23 03:53:16 UTC 2016 Modified Files: pkgsrc/graphics/darktable: Makefile PLIST distinfo pkgsrc/graphics/darktable/patches: patch-src_develop_blend.c Removed Files: pkgsrc/graphics/darktable/patches: patch-aa patch-cmake_modules_FindFreetype.cmake patch-cmake_modules_FindGTK2.cmake patch-src_LibRaw_libraw_libraw__alloc.h patch-src_common_imageio__exr.hh patch-src_common_imageio__rgbe.c patch-src_iop_invert.c patch-src_iop_lens.c patch-tools_noise_benchmark.sh Log Message: Back to 2.0.7 really. Previsous 2.2.0rc3 commit is my mistake To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 pkgsrc/graphics/darktable/Makefile cvs rdiff -u -r1.11 -r1.12 pkgsrc/graphics/darktable/PLIST cvs rdiff -u -r1.25 -r1.26 pkgsrc/graphics/darktable/distinfo cvs rdiff -u -r1.3 -r0 pkgsrc/graphics/darktable/patches/patch-aa \ pkgsrc/graphics/darktable/patches/patch-cmake_modules_FindGTK2.cmake \ pkgsrc/graphics/darktable/patches/patch-src_LibRaw_libraw_libraw__alloc.h \ pkgsrc/graphics/darktable/patches/patch-src_common_imageio__exr.hh cvs rdiff -u -r1.1 -r0 \ pkgsrc/graphics/darktable/patches/patch-cmake_modules_FindFreetype.cmake \ pkgsrc/graphics/darktable/patches/patch-src_iop_invert.c \ pkgsrc/graphics/darktable/patches/patch-tools_noise_benchmark.sh cvs rdiff -u -r1.2 -r0 \ pkgsrc/graphics/darktable/patches/patch-src_common_imageio__rgbe.c \ pkgsrc/graphics/darktable/patches/patch-src_iop_lens.c cvs rdiff -u -r1.4 -r1.5 \ pkgsrc/graphics/darktable/patches/patch-src_develop_blend.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_148246519692080 Content-Disposition: inline Content-Length: 10768 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/darktable/Makefile diff -u pkgsrc/graphics/darktable/Makefile:1.66 pkgsrc/graphics/darktable/Makefile:1.67 --- pkgsrc/graphics/darktable/Makefile:1.66 Fri Dec 23 03:38:24 2016 +++ pkgsrc/graphics/darktable/Makefile Fri Dec 23 03:53:16 2016 @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.66 2016/12/23 03:38:24 ryoon Exp $ +# $NetBSD: Makefile,v 1.67 2016/12/23 03:53:16 ryoon Exp $ -DISTNAME= darktable-2.2.0.rc3 -PKGNAME= ${DISTNAME:S/.rc/rc/} +DISTNAME= darktable-2.0.7 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GITHUB:=darktable-org/} GITHUB_PROJECT= darktable -GITHUB_RELEASE= release-${PKGVERSION_NOREV} +GITHUB_RELEASE= release-${PKGVERSION_NOREV} EXTRACT_SUFX= .tar.xz MAINTAINER= pkgsrc-users@NetBSD.org @@ -13,8 +12,6 @@ HOMEPAGE= http://www.darktable.org/ COMMENT= Photography workflow application LICENSE= gnu-gpl-v3 -WRKSRC= ${WRKDIR}/${DISTNAME:S/.rc/~rc/} - USE_CMAKE= yes USE_LANGUAGES= c c++ USE_PKGLOCALEDIR= yes Index: pkgsrc/graphics/darktable/PLIST diff -u pkgsrc/graphics/darktable/PLIST:1.11 pkgsrc/graphics/darktable/PLIST:1.12 --- pkgsrc/graphics/darktable/PLIST:1.11 Fri Dec 23 03:38:24 2016 +++ pkgsrc/graphics/darktable/PLIST Fri Dec 23 03:53:16 2016 @@ -1,10 +1,9 @@ -@comment $NetBSD: PLIST,v 1.11 2016/12/23 03:38:24 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.12 2016/12/23 03:53:16 ryoon Exp $ bin/darktable -bin/darktable-chart bin/darktable-cli bin/darktable-cmstest bin/darktable-generate-cache -bin/darktable-rs-identify +bin/darktable-viewer lib/darktable/libdarktable.so lib/darktable/plugins/imageio/format/libcopy.so lib/darktable/plugins/imageio/format/libexr.so @@ -21,7 +20,6 @@ lib/darktable/plugins/imageio/storage/li lib/darktable/plugins/imageio/storage/libgallery.so lib/darktable/plugins/imageio/storage/liblatex.so lib/darktable/plugins/imageio/storage/libpicasa.so -lib/darktable/plugins/libashift.so lib/darktable/plugins/libatrous.so lib/darktable/plugins/libbasecurve.so lib/darktable/plugins/libbilat.so @@ -34,7 +32,6 @@ lib/darktable/plugins/libclahe.so lib/darktable/plugins/libclipping.so lib/darktable/plugins/libcolisa.so lib/darktable/plugins/libcolorbalance.so -lib/darktable/plugins/libcolorchecker.so lib/darktable/plugins/libcolorcontrast.so lib/darktable/plugins/libcolorcorrection.so lib/darktable/plugins/libcolorin.so @@ -62,7 +59,6 @@ lib/darktable/plugins/libhotpixels.so lib/darktable/plugins/libinvert.so lib/darktable/plugins/liblens.so lib/darktable/plugins/liblevels.so -lib/darktable/plugins/libliquify.so lib/darktable/plugins/liblowlight.so lib/darktable/plugins/liblowpass.so lib/darktable/plugins/libmonochrome.so @@ -70,7 +66,6 @@ lib/darktable/plugins/libnlmeans.so lib/darktable/plugins/liboverexposed.so lib/darktable/plugins/libprofile_gamma.so lib/darktable/plugins/librawdenoise.so -lib/darktable/plugins/librawoverexposed.so lib/darktable/plugins/librawprepare.so lib/darktable/plugins/librelight.so lib/darktable/plugins/librotatepixels.so @@ -98,7 +93,6 @@ lib/darktable/plugins/lighttable/libdark lib/darktable/plugins/lighttable/libexport.so lib/darktable/plugins/lighttable/libfilmstrip.so lib/darktable/plugins/lighttable/libfilter.so -lib/darktable/plugins/lighttable/libgeotagging.so lib/darktable/plugins/lighttable/libglobal_toolbox.so lib/darktable/plugins/lighttable/libhinter.so lib/darktable/plugins/lighttable/libhistogram.so @@ -134,12 +128,19 @@ man/man1/darktable-cli.1 man/man1/darktable-cltest.1 man/man1/darktable-cmstest.1 man/man1/darktable-generate-cache.1 +man/man1/darktable-viewer.1 man/man1/darktable.1 share/appdata/darktable.appdata.xml share/applications/darktable.desktop share/darktable/darktable.css share/darktable/darktablerc share/darktable/gdb_commands +share/darktable/js/builder.js +share/darktable/js/effects.js +share/darktable/js/lightbox-web.js +share/darktable/js/lightbox.js +share/darktable/js/prototype.js +share/darktable/js/scriptaculous.js share/darktable/latex/photobook.cls share/darktable/lua/darktable/debug.lua share/darktable/lua/darktable/external/pygy_require/.gitignore @@ -168,8 +169,6 @@ share/darktable/pixmaps/idbutton-3.png share/darktable/pixmaps/idbutton-3.svg share/darktable/pixmaps/idbutton.png share/darktable/pixmaps/idbutton.svg -share/darktable/pixmaps/plugins/darkroom/ashift.png -share/darktable/pixmaps/plugins/darkroom/ashift.svg share/darktable/pixmaps/plugins/darkroom/atrous.png share/darktable/pixmaps/plugins/darkroom/atrous.svg share/darktable/pixmaps/plugins/darkroom/basecurve.png @@ -228,8 +227,6 @@ share/darktable/pixmaps/plugins/darkroom share/darktable/pixmaps/plugins/darkroom/lens.svg share/darktable/pixmaps/plugins/darkroom/levels.png share/darktable/pixmaps/plugins/darkroom/levels.svg -share/darktable/pixmaps/plugins/darkroom/liquify.png -share/darktable/pixmaps/plugins/darkroom/liquify.svg share/darktable/pixmaps/plugins/darkroom/lowlight.png share/darktable/pixmaps/plugins/darkroom/lowlight.svg share/darktable/pixmaps/plugins/darkroom/lowpass.png @@ -276,16 +273,6 @@ share/darktable/pixmaps/plugins/darkroom share/darktable/pixmaps/plugins/darkroom/watermark.svg share/darktable/pixmaps/plugins/darkroom/zonesystem.png share/darktable/pixmaps/plugins/darkroom/zonesystem.svg -share/darktable/pswp/LICENSE -share/darktable/pswp/default-skin/default-skin.css -share/darktable/pswp/default-skin/default-skin.png -share/darktable/pswp/default-skin/default-skin.svg -share/darktable/pswp/default-skin/preloader.gif -share/darktable/pswp/photoswipe-ui-default.js -share/darktable/pswp/photoswipe-ui-default.min.js -share/darktable/pswp/photoswipe.css -share/darktable/pswp/photoswipe.js -share/darktable/pswp/photoswipe.min.js share/darktable/rawspeed/cameras.xml share/darktable/rawspeed/showcameras.xsl share/darktable/style/bullet.gif @@ -321,16 +308,13 @@ 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/ca/LC_MESSAGES/darktable.mo share/locale/cs/LC_MESSAGES/darktable.mo share/locale/da/LC_MESSAGES/darktable.mo share/locale/de/LC_MESSAGES/darktable.mo share/locale/el/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/gl/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 @@ -339,12 +323,9 @@ share/locale/nl/LC_MESSAGES/darktable.mo share/locale/pl/LC_MESSAGES/darktable.mo share/locale/pt_BR/LC_MESSAGES/darktable.mo share/locale/pt_PT/LC_MESSAGES/darktable.mo -share/locale/ro/LC_MESSAGES/darktable.mo share/locale/ru/LC_MESSAGES/darktable.mo share/locale/sk/LC_MESSAGES/darktable.mo share/locale/sl/LC_MESSAGES/darktable.mo share/locale/sq/LC_MESSAGES/darktable.mo share/locale/sv/LC_MESSAGES/darktable.mo -share/locale/th/LC_MESSAGES/darktable.mo share/locale/uk/LC_MESSAGES/darktable.mo -share/locale/zh_CN/LC_MESSAGES/darktable.mo Index: pkgsrc/graphics/darktable/distinfo diff -u pkgsrc/graphics/darktable/distinfo:1.25 pkgsrc/graphics/darktable/distinfo:1.26 --- pkgsrc/graphics/darktable/distinfo:1.25 Fri Dec 23 03:38:24 2016 +++ pkgsrc/graphics/darktable/distinfo Fri Dec 23 03:53:16 2016 @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.25 2016/12/23 03:38:24 ryoon Exp $ +$NetBSD: distinfo,v 1.26 2016/12/23 03:53:16 ryoon Exp $ -SHA1 (darktable-2.2.0.rc3.tar.xz) = cd03d0287eda42f69ee946ab123ab4c2d469090c -RMD160 (darktable-2.2.0.rc3.tar.xz) = 3f98692b30a678b0dbed66ddf013a4de4e495b6f -SHA512 (darktable-2.2.0.rc3.tar.xz) = 8565c142e8d44dd7627c94b556a6a491269ae26f3a239e4c24372e3d8e149a9ad95099fb5ac1f7bfd331102094db6ea0f5db8a96463ccf8a2749d502dfdfc6fb -Size (darktable-2.2.0.rc3.tar.xz) = 3262016 bytes -SHA1 (patch-tools_noise_benchmark.sh) = 204e8348570703ea1356f9ecce641116ee40905b +SHA1 (darktable-2.0.7.tar.xz) = c9392af5df0045b36b89c6548b9ff552f34b7e15 +RMD160 (darktable-2.0.7.tar.xz) = 6d9e7bf1507e2e25a3359bc0b853fb62e4078b26 +SHA512 (darktable-2.0.7.tar.xz) = 568db128bdf1d639d387f32a65ea40e0a706f16b6ec0915c9580255c0385033e3d80c3ddf5c15c3f8adccd1f23530f430c9eb28f9d2771f61ae5a5c479726928 +Size (darktable-2.0.7.tar.xz) = 2960436 bytes +SHA1 (patch-src_develop_blend.c) = d8b5d72fac9544b37e856c57d511423483c14a9b Index: pkgsrc/graphics/darktable/patches/patch-src_develop_blend.c diff -u pkgsrc/graphics/darktable/patches/patch-src_develop_blend.c:1.4 pkgsrc/graphics/darktable/patches/patch-src_develop_blend.c:1.5 --- pkgsrc/graphics/darktable/patches/patch-src_develop_blend.c:1.4 Wed Dec 4 13:02:08 2013 +++ pkgsrc/graphics/darktable/patches/patch-src_develop_blend.c Fri Dec 23 03:53:16 2016 @@ -1,22 +1,22 @@ -$NetBSD: patch-src_develop_blend.c,v 1.4 2013/12/04 13:02:08 drochner Exp $ +$NetBSD: patch-src_develop_blend.c,v 1.5 2016/12/23 03:53:16 ryoon Exp $ ---- src/develop/blend.c.orig 2013-06-24 18:35:28.000000000 +0000 +--- src/develop/blend.c.orig 2016-10-23 15:18:57.000000000 +0000 +++ src/develop/blend.c -@@ -1758,7 +1758,7 @@ void dt_develop_blend_process (struct dt - if(self->suppress_mask && self->dev->gui_attached && self == self->dev->gui_module && piece->pipe == self->dev->pipe && (d->blendif & (1<<31))) +@@ -2695,7 +2695,7 @@ void dt_develop_blend_process(struct dt_ + && (piece->pipe == self->dev->pipe) && (mask_mode & DEVELOP_MASK_BOTH)) { #ifdef _OPENMP --#if !defined(__SUNOS__) -+#if !defined(__SUNOS__) && !defined(__NetBSD__) - #pragma omp parallel for default(none) shared(roi_out,mask,stderr) +-#if !defined(__SUNOS__) && !defined(__WIN32__) ++#if !defined(__SUNOS__) && !defined(__WIN32__) && !defined(__NetBSD__) + #pragma omp parallel for default(none) shared(roi_out, mask, stderr) #else - #pragma omp parallel for shared(roi_out,mask) -@@ -1773,7 +1773,7 @@ void dt_develop_blend_process (struct dt - + #pragma omp parallel for shared(roi_out, mask) +@@ -2710,7 +2710,7 @@ void dt_develop_blend_process(struct dt_ + /* now apply blending with per-pixel opacity value as defined in mask */ #ifdef _OPENMP --#if !defined(__SUNOS__) -+#if !defined(__SUNOS__) && !defined(__NetBSD__) - #pragma omp parallel for default(none) shared(i,roi_out,o,mask,blend,stderr,ch) +-#if !defined(__SUNOS__) && !defined(__WIN32__) ++#if !defined(__SUNOS__) && !defined(__WIN32__) && !defined(__NetBSD__) + #pragma omp parallel for default(none) shared(i, roi_out, o, mask, blend, stderr) #else - #pragma omp parallel for shared(i,roi_out,o,mask,blend,ch) + #pragma omp parallel for shared(i, roi_out, o, mask, blend) --_----------=_148246519692080--