tuning: Handle macbeth_ref.pgm license through REUSE.toml
diff mbox series

Message ID 20260421150754.2463828-1-laurent.pinchart@ideasonboard.com
State New
Headers show
Series
  • tuning: Handle macbeth_ref.pgm license through REUSE.toml
Related show

Commit Message

Laurent Pinchart April 21, 2026, 3:07 p.m. UTC 
Despite the file starting with a text header, the reuse tool considers
macbeth_ref.pgm as a binary, and doesn't parse it to look for SPDX tags.
Handle it through REUSE.toml instead.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 REUSE.toml                             | 8 ++++++++
 utils/tuning/libtuning/macbeth_ref.pgm | 1 -
 2 files changed, 8 insertions(+), 1 deletion(-)


base-commit: 3ca844bd94b25181d910b963942be04785b2de11

Comments

Barnabás Pőcze April 21, 2026, 3:15 p.m. UTC | #1 
2026. 04. 21. 17:07 keltezéssel, Laurent Pinchart írta:
> Despite the file starting with a text header, the reuse tool considers
> macbeth_ref.pgm as a binary, and doesn't parse it to look for SPDX tags.
> Handle it through REUSE.toml instead.

I think it might be worth creating an issue for ascii netbpm files since even
wikipedia suggests that comments like that are valid.


> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
>   REUSE.toml                             | 8 ++++++++
>   utils/tuning/libtuning/macbeth_ref.pgm | 1 -
>   2 files changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/REUSE.toml b/REUSE.toml
> index 4c1ce58f6b89..e7509ac41532 100644
> --- a/REUSE.toml
> +++ b/REUSE.toml
> @@ -39,3 +39,11 @@ path = [
>   precedence = "aggregate"
>   SPDX-FileCopyrightText = "Copyright 2013-2020 The Chromium Authors. All rights reserved."
>   SPDX-License-Identifier = "BSD-3-Clause"
> +
> +[[annotations]]
> +path = [
> +	"utils/tuning/libtuning/macbeth_ref.pgm",
> +]
> +precedence = "aggregate"
> +SPDX-FileCopyrightText = "2019-2020 Raspberry Pi Ltd"
> +SPDX-License-Identifier = "BSD-2-Clause"

Is this not a duplicate of the earlier block with the tuning files?
Can it not be added to the `path` of that?

Reviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>


> diff --git a/utils/tuning/libtuning/macbeth_ref.pgm b/utils/tuning/libtuning/macbeth_ref.pgm
> index 089ea91f7f12..9b9f4920629c 100644
> --- a/utils/tuning/libtuning/macbeth_ref.pgm
> +++ b/utils/tuning/libtuning/macbeth_ref.pgm
> @@ -1,5 +1,4 @@
>   P5
> -# SPDX-License-Identifier: BSD-2-Clause
>   # Reference macbeth chart
>   120 80
>   255
> 
> base-commit: 3ca844bd94b25181d910b963942be04785b2de11
Barnabás Pőcze April 21, 2026, 3:25 p.m. UTC | #2 
2026. 04. 21. 17:15 keltezéssel, Barnabás Pőcze írta:
> 2026. 04. 21. 17:07 keltezéssel, Laurent Pinchart írta:
>> Despite the file starting with a text header, the reuse tool considers
>> macbeth_ref.pgm as a binary, and doesn't parse it to look for SPDX tags.
>> Handle it through REUSE.toml instead.
> 
> I think it might be worth creating an issue for ascii netbpm files since even
> wikipedia suggests that comments like that are valid.

netbpm -> netpbm

And I decided to create one quickly: https://codeberg.org/fsfe/reuse-tool/issues/1356


> 
> 
>>
>> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>> ---
>>   REUSE.toml                             | 8 ++++++++
>>   utils/tuning/libtuning/macbeth_ref.pgm | 1 -
>>   2 files changed, 8 insertions(+), 1 deletion(-)
>>
>> diff --git a/REUSE.toml b/REUSE.toml
>> index 4c1ce58f6b89..e7509ac41532 100644
>> --- a/REUSE.toml
>> +++ b/REUSE.toml
>> @@ -39,3 +39,11 @@ path = [
>>   precedence = "aggregate"
>>   SPDX-FileCopyrightText = "Copyright 2013-2020 The Chromium Authors. All rights reserved."
>>   SPDX-License-Identifier = "BSD-3-Clause"
>> +
>> +[[annotations]]
>> +path = [
>> +    "utils/tuning/libtuning/macbeth_ref.pgm",
>> +]
>> +precedence = "aggregate"
>> +SPDX-FileCopyrightText = "2019-2020 Raspberry Pi Ltd"
>> +SPDX-License-Identifier = "BSD-2-Clause"
> 
> Is this not a duplicate of the earlier block with the tuning files?
> Can it not be added to the `path` of that?
> 
> Reviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
> 
> 
>> diff --git a/utils/tuning/libtuning/macbeth_ref.pgm b/utils/tuning/libtuning/macbeth_ref.pgm
>> index 089ea91f7f12..9b9f4920629c 100644
>> --- a/utils/tuning/libtuning/macbeth_ref.pgm
>> +++ b/utils/tuning/libtuning/macbeth_ref.pgm
>> @@ -1,5 +1,4 @@
>>   P5
>> -# SPDX-License-Identifier: BSD-2-Clause
>>   # Reference macbeth chart
>>   120 80
>>   255
>>
>> base-commit: 3ca844bd94b25181d910b963942be04785b2de11
>
Laurent Pinchart April 21, 2026, 4:21 p.m. UTC | #3 
On Tue, Apr 21, 2026 at 05:15:45PM +0200, Barnabás Pőcze wrote:
> 2026. 04. 21. 17:07 keltezéssel, Laurent Pinchart írta:
> > Despite the file starting with a text header, the reuse tool considers
> > macbeth_ref.pgm as a binary, and doesn't parse it to look for SPDX tags.
> > Handle it through REUSE.toml instead.
> 
> I think it might be worth creating an issue for ascii netbpm files since even
> wikipedia suggests that comments like that are valid.

I see you've done that already :-)

https://codeberg.org/fsfe/reuse-tool/issues/1356

The example doesn't seem quite right though. P2 is an ascii file, and I
think that will be processed correctly. It's the P4, P5 and P6 files
that cause problems. They start with a text header, but follow with
binary data.

> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > ---
> >   REUSE.toml                             | 8 ++++++++
> >   utils/tuning/libtuning/macbeth_ref.pgm | 1 -
> >   2 files changed, 8 insertions(+), 1 deletion(-)
> > 
> > diff --git a/REUSE.toml b/REUSE.toml
> > index 4c1ce58f6b89..e7509ac41532 100644
> > --- a/REUSE.toml
> > +++ b/REUSE.toml
> > @@ -39,3 +39,11 @@ path = [
> >   precedence = "aggregate"
> >   SPDX-FileCopyrightText = "Copyright 2013-2020 The Chromium Authors. All rights reserved."
> >   SPDX-License-Identifier = "BSD-3-Clause"
> > +
> > +[[annotations]]
> > +path = [
> > +	"utils/tuning/libtuning/macbeth_ref.pgm",
> > +]
> > +precedence = "aggregate"
> > +SPDX-FileCopyrightText = "2019-2020 Raspberry Pi Ltd"
> > +SPDX-License-Identifier = "BSD-2-Clause"
> 
> Is this not a duplicate of the earlier block with the tuning files?

I don't see another block with tuning files.

> Can it not be added to the `path` of that?
> 
> Reviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
> 
> > diff --git a/utils/tuning/libtuning/macbeth_ref.pgm b/utils/tuning/libtuning/macbeth_ref.pgm
> > index 089ea91f7f12..9b9f4920629c 100644
> > --- a/utils/tuning/libtuning/macbeth_ref.pgm
> > +++ b/utils/tuning/libtuning/macbeth_ref.pgm
> > @@ -1,5 +1,4 @@
> >   P5
> > -# SPDX-License-Identifier: BSD-2-Clause
> >   # Reference macbeth chart
> >   120 80
> >   255
> > 
> > base-commit: 3ca844bd94b25181d910b963942be04785b2de11
Barnabás Pőcze April 21, 2026, 4:30 p.m. UTC | #4 
2026. 04. 21. 18:21 keltezéssel, Laurent Pinchart írta:
> On Tue, Apr 21, 2026 at 05:15:45PM +0200, Barnabás Pőcze wrote:
>> 2026. 04. 21. 17:07 keltezéssel, Laurent Pinchart írta:
>>> Despite the file starting with a text header, the reuse tool considers
>>> macbeth_ref.pgm as a binary, and doesn't parse it to look for SPDX tags.
>>> Handle it through REUSE.toml instead.
>>
>> I think it might be worth creating an issue for ascii netbpm files since even
>> wikipedia suggests that comments like that are valid.
> 
> I see you've done that already :-)
> 
> https://codeberg.org/fsfe/reuse-tool/issues/1356
> 
> The example doesn't seem quite right though. P2 is an ascii file, and I
> think that will be processed correctly. It's the P4, P5 and P6 files
> that cause problems. They start with a text header, but follow with
> binary data.

Ahh, I have completely misunderstood the problem. I have changed the description.


> 
>>> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>>> ---
>>>    REUSE.toml                             | 8 ++++++++
>>>    utils/tuning/libtuning/macbeth_ref.pgm | 1 -
>>>    2 files changed, 8 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/REUSE.toml b/REUSE.toml
>>> index 4c1ce58f6b89..e7509ac41532 100644
>>> --- a/REUSE.toml
>>> +++ b/REUSE.toml
>>> @@ -39,3 +39,11 @@ path = [
>>>    precedence = "aggregate"
>>>    SPDX-FileCopyrightText = "Copyright 2013-2020 The Chromium Authors. All rights reserved."
>>>    SPDX-License-Identifier = "BSD-3-Clause"
>>> +
>>> +[[annotations]]
>>> +path = [
>>> +	"utils/tuning/libtuning/macbeth_ref.pgm",
>>> +]
>>> +precedence = "aggregate"
>>> +SPDX-FileCopyrightText = "2019-2020 Raspberry Pi Ltd"
>>> +SPDX-License-Identifier = "BSD-2-Clause"
>>
>> Is this not a duplicate of the earlier block with the tuning files?
> 
> I don't see another block with tuning files.

Maybe I'm looking at the wrong revision, but I meant this part:
https://gitlab.freedesktop.org/camera/libcamera/-/blob/3ca844bd94b25181d910b963942be04785b2de11/REUSE.toml#L18-25

```toml
[[annotations]]
path = [
	"src/ipa/rpi/pisp/data/*.json",
	"src/ipa/rpi/vc4/data/*.json",
]
precedence = "aggregate"
SPDX-FileCopyrightText = "2019-2020 Raspberry Pi Ltd"
SPDX-License-Identifier = "BSD-2-Clause"
```


> 
>> Can it not be added to the `path` of that?
>>
>> Reviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
>>
>>> diff --git a/utils/tuning/libtuning/macbeth_ref.pgm b/utils/tuning/libtuning/macbeth_ref.pgm
>>> index 089ea91f7f12..9b9f4920629c 100644
>>> --- a/utils/tuning/libtuning/macbeth_ref.pgm
>>> +++ b/utils/tuning/libtuning/macbeth_ref.pgm
>>> @@ -1,5 +1,4 @@
>>>    P5
>>> -# SPDX-License-Identifier: BSD-2-Clause
>>>    # Reference macbeth chart
>>>    120 80
>>>    255
>>>
>>> base-commit: 3ca844bd94b25181d910b963942be04785b2de11
>
Laurent Pinchart April 21, 2026, 4:39 p.m. UTC | #5 
On Tue, Apr 21, 2026 at 06:30:02PM +0200, Barnabás Pőcze wrote:
> 2026. 04. 21. 18:21 keltezéssel, Laurent Pinchart írta:
> > On Tue, Apr 21, 2026 at 05:15:45PM +0200, Barnabás Pőcze wrote:
> >> 2026. 04. 21. 17:07 keltezéssel, Laurent Pinchart írta:
> >>> Despite the file starting with a text header, the reuse tool considers
> >>> macbeth_ref.pgm as a binary, and doesn't parse it to look for SPDX tags.
> >>> Handle it through REUSE.toml instead.
> >>
> >> I think it might be worth creating an issue for ascii netbpm files since even
> >> wikipedia suggests that comments like that are valid.
> > 
> > I see you've done that already :-)
> > 
> > https://codeberg.org/fsfe/reuse-tool/issues/1356
> > 
> > The example doesn't seem quite right though. P2 is an ascii file, and I
> > think that will be processed correctly. It's the P4, P5 and P6 files
> > that cause problems. They start with a text header, but follow with
> > binary data.
> 
> Ahh, I have completely misunderstood the problem. I have changed the
> description.

Thanks.

> >>> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> >>> ---
> >>>    REUSE.toml                             | 8 ++++++++
> >>>    utils/tuning/libtuning/macbeth_ref.pgm | 1 -
> >>>    2 files changed, 8 insertions(+), 1 deletion(-)
> >>>
> >>> diff --git a/REUSE.toml b/REUSE.toml
> >>> index 4c1ce58f6b89..e7509ac41532 100644
> >>> --- a/REUSE.toml
> >>> +++ b/REUSE.toml
> >>> @@ -39,3 +39,11 @@ path = [
> >>>    precedence = "aggregate"
> >>>    SPDX-FileCopyrightText = "Copyright 2013-2020 The Chromium Authors. All rights reserved."
> >>>    SPDX-License-Identifier = "BSD-3-Clause"
> >>> +
> >>> +[[annotations]]
> >>> +path = [
> >>> +	"utils/tuning/libtuning/macbeth_ref.pgm",
> >>> +]
> >>> +precedence = "aggregate"
> >>> +SPDX-FileCopyrightText = "2019-2020 Raspberry Pi Ltd"
> >>> +SPDX-License-Identifier = "BSD-2-Clause"
> >>
> >> Is this not a duplicate of the earlier block with the tuning files?
> > 
> > I don't see another block with tuning files.
> 
> Maybe I'm looking at the wrong revision, but I meant this part:
> https://gitlab.freedesktop.org/camera/libcamera/-/blob/3ca844bd94b25181d910b963942be04785b2de11/REUSE.toml#L18-25
> 
> ```toml
> [[annotations]]
> path = [
> 	"src/ipa/rpi/pisp/data/*.json",
> 	"src/ipa/rpi/vc4/data/*.json",
> ]
> precedence = "aggregate"
> SPDX-FileCopyrightText = "2019-2020 Raspberry Pi Ltd"
> SPDX-License-Identifier = "BSD-2-Clause"
> ```

Ah sorry I read "tuning files" as files part of the tuning tools.

It happens to be the same license, but I kept the two separate as
they're related to entirely different parts of libcamera. It's quite
subjective though, we could also group by license (and copyright).

> >> Can it not be added to the `path` of that?
> >>
> >> Reviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
> >>
> >>> diff --git a/utils/tuning/libtuning/macbeth_ref.pgm b/utils/tuning/libtuning/macbeth_ref.pgm
> >>> index 089ea91f7f12..9b9f4920629c 100644
> >>> --- a/utils/tuning/libtuning/macbeth_ref.pgm
> >>> +++ b/utils/tuning/libtuning/macbeth_ref.pgm
> >>> @@ -1,5 +1,4 @@
> >>>    P5
> >>> -# SPDX-License-Identifier: BSD-2-Clause
> >>>    # Reference macbeth chart
> >>>    120 80
> >>>    255
> >>>
> >>> base-commit: 3ca844bd94b25181d910b963942be04785b2de11

Patch
diff mbox series 

diff --git a/REUSE.toml b/REUSE.toml
index 4c1ce58f6b89..e7509ac41532 100644
--- a/REUSE.toml
+++ b/REUSE.toml
@@ -39,3 +39,11 @@  path = [
 precedence = "aggregate"
 SPDX-FileCopyrightText = "Copyright 2013-2020 The Chromium Authors. All rights reserved."
 SPDX-License-Identifier = "BSD-3-Clause"
+
+[[annotations]]
+path = [
+	"utils/tuning/libtuning/macbeth_ref.pgm",
+]
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2019-2020 Raspberry Pi Ltd"
+SPDX-License-Identifier = "BSD-2-Clause"
diff --git a/utils/tuning/libtuning/macbeth_ref.pgm b/utils/tuning/libtuning/macbeth_ref.pgm
index 089ea91f7f12..9b9f4920629c 100644
--- a/utils/tuning/libtuning/macbeth_ref.pgm
+++ b/utils/tuning/libtuning/macbeth_ref.pgm
@@ -1,5 +1,4 @@ 
 P5
-# SPDX-License-Identifier: BSD-2-Clause
 # Reference macbeth chart
 120 80
 255