CVS commit: pkgsrc/graphics/darktable

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Apr 23 22:12:05 UTC 2024

Modified Files:
        pkgsrc/graphics/darktable: distinfo hacks.mk
Added Files:
        pkgsrc/graphics/darktable/patches:
            patch-src_external_rawspeed_data_cameras.xsd

Log Message:
darktable: add build fix from upstream

Via Dave Tyson on pkgsrc-users.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/graphics/darktable/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/darktable/hacks.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/darktable/patches/patch-src_external_rawspeed_data_cameras.xsd

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/distinfo
diff -u pkgsrc/graphics/darktable/distinfo:1.40 pkgsrc/graphics/darktable/distinfo:1.41
--- pkgsrc/graphics/darktable/distinfo:1.40     Wed Sep  6 21:04:20 2023
+++ pkgsrc/graphics/darktable/distinfo  Tue Apr 23 22:12:04 2024
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.40 2023/09/06 21:04:20 nia Exp $
+$NetBSD: distinfo,v 1.41 2024/04/23 22:12:04 wiz Exp $
 
 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
 SHA1 (patch-src_external_rawspeed_cmake_src-dependencies.cmake) = 41733d3ad6d440782fb5c8f790668ab18a53f934
+SHA1 (patch-src_external_rawspeed_data_cameras.xsd) = 3b1f8b432847841e270fd4aada54e898895e4806

Index: pkgsrc/graphics/darktable/hacks.mk
diff -u pkgsrc/graphics/darktable/hacks.mk:1.3 pkgsrc/graphics/darktable/hacks.mk:1.4
--- pkgsrc/graphics/darktable/hacks.mk:1.3      Fri Sep  1 16:23:09 2023
+++ pkgsrc/graphics/darktable/hacks.mk  Tue Apr 23 22:12:04 2024
@@ -1,10 +1,10 @@
-# $NetBSD: hacks.mk,v 1.3 2023/09/01 16:23:09 nia Exp $
+# $NetBSD: hacks.mk,v 1.4 2024/04/23 22:12:04 wiz Exp $
 
 .if !defined(DARKTABLE_HACKS_MK)
 DARKTABLE_HACKS_MK:=
 
-.  include "../../mk/bsd.fast.prefs.mk"
-.  if ${OPSYS} == "NetBSD" && !empty(PKGSRC_COMPILER:M*gcc*)
+.include "../../mk/bsd.fast.prefs.mk"
+.if ${OPSYS} == "NetBSD" && !empty(PKGSRC_COMPILER:M*gcc*)
 PKG_HACKS+=            disable-graphite-opt
 # Disable some of the more ridiculous compiler flags being used, that are
 # creating build failures with the system compiler on NetBSD due to the
@@ -12,12 +12,12 @@ PKG_HACKS+=         disable-graphite-opt
 CFLAGS+=               -Wno-unknown-pragmas
 SUBST_CLASSES+=                opt
 SUBST_MESSAGE.opt=     Disabling excessive forced optimizations.
-SUBST_STAGE.opt+=      pre-configure
+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/demosaicing/*.c
 SUBST_FILES.opt+=      src/develop/blends/*.c
 SUBST_FILES.opt+=      src/common/*.c
 SUBST_FILES.opt+=      src/common/*.h
-.  endif
+.endif
 .endif

Added files:

Index: pkgsrc/graphics/darktable/patches/patch-src_external_rawspeed_data_cameras.xsd
diff -u /dev/null pkgsrc/graphics/darktable/patches/patch-src_external_rawspeed_data_cameras.xsd:1.1
--- /dev/null   Tue Apr 23 22:12:05 2024
+++ pkgsrc/graphics/darktable/patches/patch-src_external_rawspeed_data_cameras.xsd      Tue Apr 23 22:12:04 2024
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_external_rawspeed_data_cameras.xsd,v 1.1 2024/04/23 22:12:04 wiz Exp $
+
+Fix build.
+Similar patch applied upstream.
+
+--- src/external/rawspeed/data/cameras.xsd.orig        2024-04-23 22:07:42.514349158 +0000
++++ src/external/rawspeed/data/cameras.xsd
+@@ -194,8 +194,7 @@
+   <xs:complexType name="CFA2Type">
+     <xs:sequence>
+       <xs:choice>
+-        <xs:element type="ColorRowType" name="ColorRow" minOccurs="2" maxOccurs="2"/>
+-        <xs:element type="ColorRowType" name="ColorRow" minOccurs="6" maxOccurs="6"/>
++        <xs:element type="ColorRowType" name="ColorRow" minOccurs="2" maxOccurs="6"/>
+       </xs:choice>
+     </xs:sequence>
+     <xs:attribute type="CFA2TypeWidthType" name="width" use="required"/>