Bug#1050366: patch NMU ongoing

Gianfranco Costamagna locutusofborg at debian.org
Sat Aug 26 13:49:44 BST 2023


control: tags -1 patch pending

Hello, attached debdiff uploaded to sid.
-------------- next part --------------
diff -Nru opencolorio-2.1.2+dfsg1/debian/changelog opencolorio-2.1.2+dfsg1/debian/changelog
--- opencolorio-2.1.2+dfsg1/debian/changelog	2022-08-20 23:39:40.000000000 +0200
+++ opencolorio-2.1.2+dfsg1/debian/changelog	2023-08-26 13:55:36.000000000 +0200
@@ -1,3 +1,18 @@
+opencolorio (2.1.2+dfsg1-4.1) unstable; urgency=medium
+
+  [ Gianfranco Costamagna ]
+  * Non-maintainer upload.
+  * Fix FTBFS with newer yaml-cpp (Closes: #1050366)
+  * Update manpages (Closes: #1017111)
+
+  [ Olivier Gayot ]
+  * Include header file in binary package (change in d/rules and
+    d/python3-pyopencolorio.install) (Closes: #1050570)
+  * d/patches/0002-fix-documentation-cmake-syntax.patch Fix generation of
+    documentation.
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Sat, 26 Aug 2023 13:55:36 +0200
+
 opencolorio (2.1.2+dfsg1-4) unstable; urgency=medium
 
   [ Pino Toscano ]
diff -Nru opencolorio-2.1.2+dfsg1/debian/manpages/ociobakelut.1 opencolorio-2.1.2+dfsg1/debian/manpages/ociobakelut.1
--- opencolorio-2.1.2+dfsg1/debian/manpages/ociobakelut.1	2022-08-11 23:25:53.000000000 +0200
+++ opencolorio-2.1.2+dfsg1/debian/manpages/ociobakelut.1	2023-08-26 13:55:36.000000000 +0200
@@ -1,4 +1,4 @@
-.TH OCIOBAKELUT "1" "August 2022" "create a new LUT or ICC profile from an OCIO config or LUT file(s)" "User Commands"
+.TH OCIOBAKELUT "26" "August 2023" "create a new LUT or ICC profile from an OCIO config or LUT file(s)" "User Commands"
 .SH NAME
 ociobakelut \- create a new LUT or ICC profile from an OCIO config or LUT file(s)
 .PP
@@ -73,89 +73,3 @@
 .TP
 \fB\-\-copyright\fR %s
 a copyright field added in the file (default: "No copyright. Use freely.")
-.PP
-ociobakelut \fB\-\-\fR create a new LUT or ICC profile from an OCIO config or LUT file(s)
-.PP
-usage:  ociobakelut [options] <OUTPUTFILE.LUT>
-.PP
-example:  ociobakelut \fB\-\-inputspace\fR lg10 \fB\-\-outputspace\fR srgb8 \fB\-\-format\fR flame lg_to_srgb.3dl
-example:  ociobakelut \fB\-\-lut\fR filmlut.3dl \fB\-\-lut\fR calibration.3dl \fB\-\-format\fR flame display.3dl
-example:  ociobakelut \fB\-\-cccid\fR 0 \fB\-\-lut\fR cdlgrade.ccc \fB\-\-lut\fR calibration.3dl \fB\-\-format\fR flame graded_display.3dl
-example:  ociobakelut \fB\-\-lut\fR look.3dl \fB\-\-offset\fR 0.01 \fB\-0\fR.02 0.03 \fB\-\-lut\fR display.3dl \fB\-\-format\fR flame display_with_look.3dl
-example:  ociobakelut \fB\-\-inputspace\fR lg10 \fB\-\-outputspace\fR srgb8 \fB\-\-format\fR icc \fI\,~/Library/ColorSync/Profiles/test.icc\/\fP
-example:  ociobakelut \fB\-\-lut\fR filmlut.3dl \fB\-\-lut\fR calibration.3dl \fB\-\-format\fR icc \fI\,~/Library/ColorSync/Profiles/test.icc\/\fP
-.PP
-Using Existing OCIO Configurations
-.TP
-\fB\-\-inputspace\fR %s
-Input OCIO ColorSpace (or Role)
-.TP
-\fB\-\-outputspace\fR %s
-Output OCIO ColorSpace (or Role)
-.TP
-\fB\-\-shaperspace\fR %s
-the OCIO ColorSpace or Role, for the shaper
-.TP
-\fB\-\-looks\fR %s
-the OCIO looks to apply
-.TP
-\fB\-\-iconfig\fR %s
-Input .ocio configuration file (default: $OCIO)
-.PP
-Config\-Free LUT Baking
-.IP
-(all options can be specified multiple times, each is applied in order)
-\fB\-\-cccid\fR %s           Specify a CCCId for any following LUTs
-\fB\-\-lut\fR %s             Specify a LUT (forward direction)
-\fB\-\-invlut\fR %s          Specify a LUT (inverse direction)
-\fB\-\-slope\fR %f %f %f     slope
-\fB\-\-offset\fR %f %f %f    offset (float)
-\fB\-\-offset10\fR %f %f %f  offset (10\-bit)
-\fB\-\-power\fR %f %f %f     power
-\fB\-\-sat\fR %f             saturation (ASC\-CDL luma coefficients)
-.PP
-Baking Options
-.TP
-\fB\-\-format\fR %s
-the LUT format to bake: flame (.3dl), lustre (.3dl), Academy/ASC Common LUT Format (.clf), Color Transform Format (.ctf), cinespace (.csp), houdini (.lut), iridas_cube (.cube), iridas_itx (.itx), resolve_cube (.cube), truelight (.cub), icc (.icc)
-.TP
-\fB\-\-shapersize\fR %d
-size of the shaper (default: format specific)
-.TP
-\fB\-\-cubesize\fR %d
-size of the cube (default: format specific)
-.TP
-\fB\-\-stdout\fR
-Write to stdout (rather than file)
-.TP
-\fB\-\-v\fR
-Verbose
-.TP
-\fB\-\-help\fR
-Print help message
-.PP
-ICC Options
-.TP
-\fB\-\-whitepoint\fR %d
-whitepoint for the profile (default: 6505)
-.TP
-\fB\-\-displayicc\fR %s
-an ICC profile which matches the OCIO profiles target display
-.TP
-\fB\-\-description\fR %s
-a meaningful description, this will show up in UI like photoshop (defaults to "filename.icc")
-.TP
-\fB\-\-copyright\fR %s
-a copyright field added in the file (default: "No copyright. Use freely.")
-.SH "SEE ALSO"
-The full documentation for
-.B Invalid
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B Invalid
-programs are properly installed at your site, the command
-.IP
-.B info Invalid
-.PP
-should give you access to the complete manual.
diff -Nru opencolorio-2.1.2+dfsg1/debian/manpages/ociocheck.1 opencolorio-2.1.2+dfsg1/debian/manpages/ociocheck.1
--- opencolorio-2.1.2+dfsg1/debian/manpages/ociocheck.1	2022-08-11 23:23:46.000000000 +0200
+++ opencolorio-2.1.2+dfsg1/debian/manpages/ociocheck.1	2023-08-26 13:55:36.000000000 +0200
@@ -1,4 +1,4 @@
-.TH OCIOCHECK "1" "August 2022" "ociocheck -- validate an OpenColorIO configuration" "User Commands"
+.TH OCIOCHECK "26" "August 2023" "ociocheck -- validate an OpenColorIO configuration" "User Commands"
 .SH NAME
 ociocheck \- validate an OpenColorIO configuration
 .PP
@@ -20,36 +20,3 @@
 .PP
 ociocheck can also be used to clean up formatting on an existing profile
 that has been manually edited, using the '\-o' option.
-.PP
-ociocheck \fB\-\-\fR validate an OpenColorIO configuration
-.PP
-usage:  ociocheck [options]
-.TP
-\fB\-\-help\fR
-Print help message
-.TP
-\fB\-\-iconfig\fR %s
-Input .ocio configuration file (default: $OCIO)
-.TP
-\fB\-\-oconfig\fR %s
-Output .ocio file
-.PP
-ociocheck is useful to validate that the specified OCIO configuration
-is valid, and that all the color transforms are defined.
-For example, it is possible that the configuration may reference
-lookup tables that do not exist. ociocheck will find these cases.
-.PP
-ociocheck can also be used to clean up formatting on an existing profile
-that has been manually edited, using the '\-o' option.
-.SH "SEE ALSO"
-The full documentation for
-.B Invalid
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B Invalid
-programs are properly installed at your site, the command
-.IP
-.B info Invalid
-.PP
-should give you access to the complete manual.
diff -Nru opencolorio-2.1.2+dfsg1/debian/manpages/ociochecklut.1 opencolorio-2.1.2+dfsg1/debian/manpages/ociochecklut.1
--- opencolorio-2.1.2+dfsg1/debian/manpages/ociochecklut.1	2022-08-11 23:23:11.000000000 +0200
+++ opencolorio-2.1.2+dfsg1/debian/manpages/ociochecklut.1	2023-08-26 13:55:36.000000000 +0200
@@ -1,4 +1,4 @@
-.TH OCIOCHECKLUT "1" "August 2022" "ociochecklut -- check any LUT file and optionally convert a pixel" "User Commands"
+.TH OCIOCHECKLUT "26" "August 2023" "ociochecklut -- check any LUT file and optionally convert a pixel" "User Commands"
 .SH NAME
 ociochecklut \- check any LUT file and optionally convert a pixel
 .PP
@@ -57,46 +57,3 @@
 spimtx (.spimtx)
 truelight (.cub)
 nukevf (.vf)
-.PP
-ociochecklut \fB\-\-\fR check any LUT file and optionally convert a pixel
-.PP
-usage:  ociochecklut <INPUTFILE> <R G B> or <R G B A>
-.TP
-\fB\-t\fR
-Test a set a predefined RGB values
-.TP
-\fB\-v\fR
-Verbose
-.TP
-\fB\-\-help\fR
-Print help message
-.TP
-\fB\-\-inv\fR
-Apply LUT in inverse direction
-.TP
-\fB\-\-gpu\fR
-Use GPU instead of CPU
-.TP
-\fB\-\-gpulegacy\fR
-Use the legacy (i.e. baked) GPU color processing instead of the CPU one (\fB\-\-gpu\fR is ignored)
-.TP
-\fB\-\-gpuinfo\fR
-Output the OCIO shader program
-.PP
-OCIOCHECKLUT loads any LUT type supported by OCIO and prints any errors
-encountered.  Provide a normalized RGB or RGBA value to send that through
-the LUT.  Alternatively use the \fB\-t\fR option to evaluate a set of test values.
-Otherwise, if no RGB value is provided, a list of the operators in the LUT is printed.
-Use \fB\-v\fR to print warnings while parsing the LUT.
-.SH "SEE ALSO"
-The full documentation for
-.B Invalid
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B Invalid
-programs are properly installed at your site, the command
-.IP
-.B info Invalid
-.PP
-should give you access to the complete manual.
diff -Nru opencolorio-2.1.2+dfsg1/debian/manpages/ocioconvert.1 opencolorio-2.1.2+dfsg1/debian/manpages/ocioconvert.1
--- opencolorio-2.1.2+dfsg1/debian/manpages/ocioconvert.1	2022-08-11 23:27:46.000000000 +0200
+++ opencolorio-2.1.2+dfsg1/debian/manpages/ocioconvert.1	2023-08-26 13:55:36.000000000 +0200
@@ -1,4 +1,4 @@
-.TH OCIOCONVERT "1" "August 2022" "ocioconvert -- apply colorspace transform to an image" "User Commands"
+.TH OCIOCONVERT "26" "August 2023" "ocioconvert -- apply colorspace transform to an image" "User Commands"
 .SH NAME
 ocioconvert \- apply colorspace transform to an image
 .SH DESCRIPTION
@@ -46,57 +46,3 @@
 .TP
 \fB\-\-ch\fR %s
 Select channels (e.g., "2,3,4")
-.PP
-usage: ocioconvert [options]  inputimage inputcolorspace outputimage outputcolorspace
-.IP
-or: ocioconvert [options] \fB\-\-lut\fR lutfile inputimage outputimage
-or: ocioconvert [options] \fB\-\-view\fR inputimage inputcolorspace outputimage displayname viewname
-.TP
-\fB\-\-lut\fR
-Convert using a LUT rather than a config file
-.TP
-\fB\-\-view\fR
-Convert to a (display,view) pair rather than to an output color space
-.TP
-\fB\-\-gpu\fR
-Use GPU color processing instead of CPU (CPU is the default)
-.TP
-\fB\-\-gpulegacy\fR
-Use the legacy (i.e. baked) GPU color processing instead of the CPU one (\fB\-\-gpu\fR is ignored)
-.TP
-\fB\-\-gpuinfo\fR
-Output the OCIO shader program
-.TP
-\fB\-\-help\fR
-Print help message
-.TP
-\fB\-v\fR
-Display general information
-.SS "OpenImageIO options:"
-.TP
-\fB\-\-float\-attribute\fR %L
-"name=float" pair defining OIIO float attribute for outputimage
-.TP
-\fB\-\-int\-attribute\fR %L
-"name=int" pair defining OIIO int attribute for outputimage
-.TP
-\fB\-\-string\-attribute\fR %L
-"name=string" pair defining OIIO string attribute for outputimage
-.TP
-\fB\-\-croptofull\fR
-Crop or pad to make pixel data region match the "full" region
-.TP
-\fB\-\-ch\fR %s
-Select channels (e.g., "2,3,4")
-.SH "SEE ALSO"
-The full documentation for
-.B ocioconvert
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B ocioconvert
-programs are properly installed at your site, the command
-.IP
-.B info ocioconvert
-.PP
-should give you access to the complete manual.
diff -Nru opencolorio-2.1.2+dfsg1/debian/manpages/ociodisplay.1 opencolorio-2.1.2+dfsg1/debian/manpages/ociodisplay.1
--- opencolorio-2.1.2+dfsg1/debian/manpages/ociodisplay.1	2022-08-11 23:45:18.000000000 +0200
+++ opencolorio-2.1.2+dfsg1/debian/manpages/ociodisplay.1	2023-08-26 13:55:36.000000000 +0200
@@ -1,4 +1,4 @@
-.TH OCIODISPLAY "1" "August 2022" "ociodisplay " "User Commands"
+.TH OCIODISPLAY "26" "August 2023" "ociodisplay " "User Commands"
 .SH NAME
 ociodisplay \- apply a colorspace conversion to an image sequence
 .SH DESCRIPTION
@@ -41,58 +41,3 @@
 Configure Display / Transform / ColorSpace / Looks / Optimization
 .IP
 Esc: Quit
-.PP
-loading: \fB\-\-help\fR
-.SS "Keys:"
-.TP
-Ctrl+Up:
-Exposure +1/4 stop (in scene linear)
-.IP
-Ctrl+Down: Exposure \fB\-1\fR/4 stop (in scene linear)
-Ctrl+Home: Reset Exposure + Gamma
-.TP
-Alt+Up:
-Gamma up (post display transform)
-.TP
-Alt+Down:
-Gamma down (post display transform)
-.TP
-Alt+Home:
-Reset Exposure + Gamma
-.TP
-C:
-View Color
-.TP
-R:
-View Red
-.TP
-G:
-View Green
-.TP
-B:
-View Blue
-.TP
-A:
-View Alpha
-.TP
-L:
-View Luma
-.TP
-Right\-Mouse Button:
-Configure Display / Transform / ColorSpace / Looks / Optimization
-.IP
-Esc: Quit
-.PP
-loading: \fB\-\-version\fR
-.SH "SEE ALSO"
-The full documentation for
-.B ociodisplay
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B ociodisplay
-programs are properly installed at your site, the command
-.IP
-.B info ociodisplay
-.PP
-should give you access to the complete manual.
diff -Nru opencolorio-2.1.2+dfsg1/debian/manpages/ociolutimage.1 opencolorio-2.1.2+dfsg1/debian/manpages/ociolutimage.1
--- opencolorio-2.1.2+dfsg1/debian/manpages/ociolutimage.1	2022-08-11 23:27:31.000000000 +0200
+++ opencolorio-2.1.2+dfsg1/debian/manpages/ociolutimage.1	2023-08-26 13:55:36.000000000 +0200
@@ -1,4 +1,4 @@
-.TH OCIOLUTIMAGE "1" "August 2022" "ociolutimage -- Convert a 3D LUT to or from an image" "User Commands"
+.TH OCIOLUTIMAGE "26" "August 2023" "ociolutimage -- Convert a 3D LUT to or from an image" "User Commands"
 .SH NAME
 ociolutimage \- convert a 3D LUT to or from an image
 .SH DESCRIPTION
@@ -32,46 +32,3 @@
 .TP
 \fB\-\-colorconvert\fR %s %s
 Apply a color space conversion to the image.
-.PP
-ociolutimage \fB\-\-\fR Convert a 3D LUT to or from an image
-.PP
-usage:  ociolutimage [options] <OUTPUTFILE.LUT>
-.PP
-example:  ociolutimage \fB\-\-generate\fR \fB\-\-output\fR lut.exr
-example:  ociolutimage \fB\-\-extract\fR \fB\-\-input\fR lut.exr \fB\-\-output\fR output.spi3d
-.TP
-\fB\-\-generate\fR
-Generate a lattice image
-.TP
-\fB\-\-extract\fR
-Extract a 3D LUT from an input image
-.TP
-\fB\-\-cubesize\fR %d
-Size of the cube (default: 32)
-.TP
-\fB\-\-maxwidth\fR %d
-Specify maximum width of the image (default: 2048)
-.TP
-\fB\-\-input\fR %s
-Specify the input filename
-.TP
-\fB\-\-output\fR %s
-Specify the output filename
-.TP
-\fB\-\-config\fR %s
-\&.ocio configuration file (default: $OCIO)
-.TP
-\fB\-\-colorconvert\fR %s %s
-Apply a color space conversion to the image.
-.SH "SEE ALSO"
-The full documentation for
-.B Invalid
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B Invalid
-programs are properly installed at your site, the command
-.IP
-.B info Invalid
-.PP
-should give you access to the complete manual.
diff -Nru opencolorio-2.1.2+dfsg1/debian/manpages/ociomakeclf.1 opencolorio-2.1.2+dfsg1/debian/manpages/ociomakeclf.1
--- opencolorio-2.1.2+dfsg1/debian/manpages/ociomakeclf.1	2022-08-11 23:24:59.000000000 +0200
+++ opencolorio-2.1.2+dfsg1/debian/manpages/ociomakeclf.1	2023-08-26 13:55:36.000000000 +0200
@@ -1,4 +1,4 @@
-.TH OCIOMAKECLF "1" "August 2022" "ociomakeclf -- Convert a LUT into CLF format and optionally add conversions from/to ACES2065-1 to make it an LMT." "User Commands"
+.TH OCIOMAKECLF "26" "August 2023" "ociomakeclf -- Convert a LUT into CLF format and optionally add conversions from/to ACES2065-1 to make it an LMT." "User Commands"
 .SH NAME
 ociomakeclf \- convert a LUT into CLF format and optionally add conversions from/to ACES2065-1 to make it an LMT.
 .SH DESCRIPTION
@@ -30,41 +30,3 @@
 .TP
 \fB\-\-csc\fR %s
 The color space that the input LUT expects and produces
-.IP
-If the csc argument is used, the CLF will contain the transforms:
-[ACES2065\-1 to CSC space] [the LUT] [CSC space to ACES2065\-1].
-.PP
-usage: ociomakeclf inLutFilepath outLutFilepath \fB\-\-csc\fR cscColorSpace
-.TP
-or
-ociomakeclf inLutFilepath outLutFilepath
-.TP
-or
-ociomakeclf \fB\-\-list\fR
-.TP
-\fB\-\-help\fR
-Print help message
-.TP
-\fB\-\-verbose\fR
-Display general information
-.TP
-\fB\-\-measure\fR
-Measure (in ms) the CLF write
-.TP
-\fB\-\-list\fR
-List of the supported CSC color spaces
-.TP
-\fB\-\-csc\fR %s
-The color space that the input LUT expects and produces
-.SH "SEE ALSO"
-The full documentation for
-.B ociomakeclf
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B ociomakeclf
-programs are properly installed at your site, the command
-.IP
-.B info ociomakeclf
-.PP
-should give you access to the complete manual.
diff -Nru opencolorio-2.1.2+dfsg1/debian/manpages/ocioperf.1 opencolorio-2.1.2+dfsg1/debian/manpages/ocioperf.1
--- opencolorio-2.1.2+dfsg1/debian/manpages/ocioperf.1	2022-08-11 23:25:30.000000000 +0200
+++ opencolorio-2.1.2+dfsg1/debian/manpages/ocioperf.1	2023-08-26 13:55:36.000000000 +0200
@@ -1,4 +1,4 @@
-.TH OCIOPERF "1" "August 2022" "ocioperf -- apply and measure a color transformation processing" "User Commands"
+.TH OCIOPERF "26" "August 2023" "ocioperf -- apply and measure a color transformation processing" "User Commands"
 .SH NAME
 ocioperf \- apply and measure a color transformation processing
 .SH DESCRIPTION
@@ -35,47 +35,3 @@
 .TP
 \fB\-\-nocache\fR
 Bypass all caches
-.PP
-usage: ocioperf [options] \fB\-\-image\fR inputimage
-.TP
-\fB\-\-help\fR
-Display the help and exit
-.TP
-\fB\-\-verbose\fR
-Display some general information
-.TP
-\fB\-\-test\fR %d
-Define the type of processing to measure: 0 means on the complete image (the default), 1 is line\-by\-line, 2 is pixel\-per\-pixel and \fB\-1\fR performs all the test types
-.TP
-\fB\-\-transform\fR %s
-Provide the transform file to apply on the image
-.TP
-\fB\-\-colorspaces\fR %s %s
-Provide the input and output color spaces to apply on the image
-.TP
-\fB\-\-displayview\fR %s %s %s
-Provide the input and (display, view) pair to apply on the image
-.TP
-\fB\-\-image\fR %s
-Provide the filepath of the image to process
-.TP
-\fB\-\-iter\fR %d
-Provide the number of iterations on the processing. Default is 10
-.TP
-\fB\-\-out\fR %s
-Provide an output bit\-depth (auto, ui16, f32) where auto preserves the input bit\-depth
-.TP
-\fB\-\-nocache\fR
-Bypass all caches
-.SH "SEE ALSO"
-The full documentation for
-.B ocioperf
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B ocioperf
-programs are properly installed at your site, the command
-.IP
-.B info ocioperf
-.PP
-should give you access to the complete manual.
diff -Nru opencolorio-2.1.2+dfsg1/debian/manpages/ociowrite.1 opencolorio-2.1.2+dfsg1/debian/manpages/ociowrite.1
--- opencolorio-2.1.2+dfsg1/debian/manpages/ociowrite.1	2022-08-11 23:25:38.000000000 +0200
+++ opencolorio-2.1.2+dfsg1/debian/manpages/ociowrite.1	2023-08-26 13:55:36.000000000 +0200
@@ -1,4 +1,4 @@
-.TH OCIOWRITE "1" "August 2022" "ociowrite -- write a color transformation to a file" "User Commands"
+.TH OCIOWRITE "26" "August 2023" "ociowrite -- write a color transformation to a file" "User Commands"
 .SH NAME
 ociowrite \- write a color transformation to a file
 .SH DESCRIPTION
@@ -20,32 +20,3 @@
 .TP
 \fB\-\-file\fR %s
 Transform file path. Format is implied by extension. Formats to write to: ColorCorrection (.cc), ColorCorrectionCollection (.ccc), ColorDecisionList (.cdl), Academy/ASC Common LUT Format (.clf), Color Transform Format (.ctf)
-.PP
-usage: ociowrite [options] \fB\-\-file\fR outputfile
-.TP
-\fB\-\-h\fR
-Display the help and exit
-.TP
-\fB\-\-v\fR
-Display some general information
-.TP
-\fB\-\-colorspaces\fR %s %s
-Provide the input and output color spaces
-.TP
-\fB\-\-displayview\fR %s %s %s
-Provide the input and (display, view) pair
-.TP
-\fB\-\-file\fR %s
-Transform file path. Format is implied by extension. Formats to write to: ColorCorrection (.cc), ColorCorrectionCollection (.ccc), ColorDecisionList (.cdl), Academy/ASC Common LUT Format (.clf), Color Transform Format (.ctf)
-.SH "SEE ALSO"
-The full documentation for
-.B ociowrite
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B ociowrite
-programs are properly installed at your site, the command
-.IP
-.B info ociowrite
-.PP
-should give you access to the complete manual.
diff -Nru opencolorio-2.1.2+dfsg1/debian/patches/0002-fix-documentation-cmake-syntax.patch opencolorio-2.1.2+dfsg1/debian/patches/0002-fix-documentation-cmake-syntax.patch
--- opencolorio-2.1.2+dfsg1/debian/patches/0002-fix-documentation-cmake-syntax.patch	1970-01-01 01:00:00.000000000 +0100
+++ opencolorio-2.1.2+dfsg1/debian/patches/0002-fix-documentation-cmake-syntax.patch	2022-08-05 20:12:53.000000000 +0200
@@ -0,0 +1,37 @@
+Description: Correct usage of PYTHONPATH in cmake files
+ When using the PYTHONPATH auto-generated by the cmake files in
+ this package, quotation marks were being added around it that
+ were causing the package build to try to run PYTHONPATH as an
+ executable rather than setting an environment variable.
+Author: William 'jawn-smith' Wilson <jawn-smith at ubuntu.com>
+Last-Update: 2022-08-05
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: OpenColorIO/src/bindings/python/CMakeLists.txt
+===================================================================
+--- OpenColorIO.orig/src/bindings/python/CMakeLists.txt
++++ OpenColorIO/src/bindings/python/CMakeLists.txt
+@@ -22,7 +22,7 @@
+ 	# Run docstring extraction if docstrings.h is behind doxygen XML
+ 	add_custom_command(OUTPUT ${PYOCIO_DOCSTRINGS_H}
+ 		COMMAND
+-			${Python_PRE_CMD} "${Python_EXECUTABLE}" "${EXTRACT_DOCSTRINGS_PY}" xml docstrings.h
++			export PYTHONPATH="${CMAKE_SOURCE_DIR}/share/docs:${CMAKE_CURRENT_BINARY_DIR}/src/bindings/python" && "${Python_EXECUTABLE}" "${EXTRACT_DOCSTRINGS_PY}" xml docstrings.h
+ 		WORKING_DIRECTORY
+ 			${PYOCIO_DOCSTRINGS_DIR}
+ 		DEPENDS
+Index: OpenColorIO/docs/CMakeLists.txt
+===================================================================
+--- OpenColorIO.orig/docs/CMakeLists.txt
++++ OpenColorIO/docs/CMakeLists.txt
+@@ -145,8 +145,8 @@
+ 
+     # Run Sphinx
+     add_custom_target(docs ALL
+-        COMMAND
+-            ${Python_PRE_CMD} "${Sphinx_EXECUTABLE}" -b html . "${CMAKE_CURRENT_BINARY_DIR}/build-html"
++	COMMAND
++	export PYTHONPATH="${CMAKE_SOURCE_DIR}/share/docs:${CMAKE_CURRENT_BINARY_DIR}/src/bindings/python" && "${Sphinx_EXECUTABLE}" -b html . "${CMAKE_CURRENT_BINARY_DIR}/build-html"
+         DEPENDS
+             ${CMAKE_BINARY_DIR}/docs/conf.py
+             ${SPHINX_EXTENSIONS}
diff -Nru opencolorio-2.1.2+dfsg1/debian/patches/series opencolorio-2.1.2+dfsg1/debian/patches/series
--- opencolorio-2.1.2+dfsg1/debian/patches/series	2022-08-07 20:08:01.000000000 +0200
+++ opencolorio-2.1.2+dfsg1/debian/patches/series	2023-08-26 13:55:36.000000000 +0200
@@ -1 +1,2 @@
 0001-Fix_cstring_issue.patch
+0002-fix-documentation-cmake-syntax.patch
diff -Nru opencolorio-2.1.2+dfsg1/debian/python3-pyopencolorio.install opencolorio-2.1.2+dfsg1/debian/python3-pyopencolorio.install
--- opencolorio-2.1.2+dfsg1/debian/python3-pyopencolorio.install	2022-08-11 00:01:10.000000000 +0200
+++ opencolorio-2.1.2+dfsg1/debian/python3-pyopencolorio.install	2023-08-26 13:55:36.000000000 +0200
@@ -1 +1,2 @@
+usr/include/PyOpenColorIO
 usr/lib/*/python3*/site-packages/*.so usr/lib/python3/dist-packages/
diff -Nru opencolorio-2.1.2+dfsg1/debian/rules opencolorio-2.1.2+dfsg1/debian/rules
--- opencolorio-2.1.2+dfsg1/debian/rules	2022-08-17 23:29:57.000000000 +0200
+++ opencolorio-2.1.2+dfsg1/debian/rules	2023-08-26 13:55:36.000000000 +0200
@@ -12,6 +12,12 @@
 %:
 	dh $@ -Scmake -B$(BLDDIR) --with python3
 
+override_dh_auto_clean:
+	dh_auto_clean
+	# temporary hack until the Findyaml-cpp.cmake is patched by upstream to work with newer yaml-cpp.
+	# in any case, the one provided by libyaml-cpp-dev works correctly
+	rm -f share/cmake/modules/Findyaml-cpp.cmake
+
 override_dh_auto_configure:
 	dh_auto_configure -- \
 		-DCMAKE_BUILD_TYPE=Release \
@@ -31,4 +37,9 @@
 	rm -f $(INSTDIR)/usr/share/ocio/setup_ocio.sh
 	rm -f $(INSTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/lib*.a
 
+override_dh_install:
+	mkdir -p debian/tmp/usr/include/PyOpenColorIO
+	cp src/bindings/python/PyOpenColorIO.h debian/tmp/usr/include/PyOpenColorIO/
+	dh_install
+
 override_dh_auto_test:
-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature
Type: application/pgp-signature
Size: 840 bytes
Desc: OpenPGP digital signature
URL: <http://alioth-lists.debian.net/pipermail/pkg-phototools-devel/attachments/20230826/1059d6d0/attachment-0005.sig>


More information about the Pkg-phototools-devel mailing list