| Message ID | 20240703045324.70160-1-robert.mader@collabora.com |
|---|---|
| State | Accepted |
| Commit | d890a7e48e0813a28193f06d44167e17b0b02d15 |
| Headers | show |
| Series |
|
| Related | show |
Or should we maybe just unconditionally install all *.yaml files in this folder? On 03.07.24 06:52, Robert Mader wrote: > We have all these neat tuning files. Unfortunately we forgot to install > many of them. > > Signed-off-by: Robert Mader<robert.mader@collabora.com> > --- > src/ipa/rkisp1/data/meson.build | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/src/ipa/rkisp1/data/meson.build b/src/ipa/rkisp1/data/meson.build > index 7150e155..1e3522b2 100644 > --- a/src/ipa/rkisp1/data/meson.build > +++ b/src/ipa/rkisp1/data/meson.build > @@ -2,8 +2,12 @@ > > conf_files = files([ > 'imx219.yaml', > + 'imx258.yaml', > + 'ov2685.yaml', > 'ov4689.yaml', > 'ov5640.yaml', > + 'ov5695.yaml', > + 'ov8858.yaml', > 'uncalibrated.yaml', > ]) >
Hi Robert On Wed, Jul 03, 2024 at 09:13:45AM GMT, Robert Mader wrote: > Or should we maybe just unconditionally install all *.yaml files in this > folder? > I would be suprised if meson allows usage of wildcards when listing files. In facts, from a very quick test, I get ../src/ipa/rkisp1/data/meson.build:3:13: ERROR: File *.yaml does not exist.) It's also specified in the FAQ https://mesonbuild.com/FAQ.html#why-cant-i-specify-target-files-with-a-wildcard And as suggested in the same webpage, if we really want to, we should add a tiny scripts that lists all the .yaml file and call it from the meson build file ? Is it worth it ? > On 03.07.24 06:52, Robert Mader wrote: > > We have all these neat tuning files. Unfortunately we forgot to install > > many of them. > > > > Signed-off-by: Robert Mader<robert.mader@collabora.com> > > --- > > src/ipa/rkisp1/data/meson.build | 4 ++++ > > 1 file changed, 4 insertions(+) > > > > diff --git a/src/ipa/rkisp1/data/meson.build b/src/ipa/rkisp1/data/meson.build > > index 7150e155..1e3522b2 100644 > > --- a/src/ipa/rkisp1/data/meson.build > > +++ b/src/ipa/rkisp1/data/meson.build > > @@ -2,8 +2,12 @@ > > conf_files = files([ > > 'imx219.yaml', > > + 'imx258.yaml', > > + 'ov2685.yaml', > > 'ov4689.yaml', > > 'ov5640.yaml', > > + 'ov5695.yaml', > > + 'ov8858.yaml', > > 'uncalibrated.yaml', > > ]) > > -- > Robert Mader > Consultant Software Developer > > Collabora Ltd. > Platinum Building, St John's Innovation Park, Cambridge CB4 0DS, UK > Registered in England & Wales, no. 5513718
On Wed, Jul 03, 2024 at 09:58:44AM +0200, Jacopo Mondi wrote: > Hi Robert > > On Wed, Jul 03, 2024 at 09:13:45AM GMT, Robert Mader wrote: > > Or should we maybe just unconditionally install all *.yaml files in this > > folder? > > I would be suprised if meson allows usage of wildcards when listing > files. In facts, from a very quick test, I get > > ../src/ipa/rkisp1/data/meson.build:3:13: ERROR: File *.yaml does not exist.) > > It's also specified in the FAQ > https://mesonbuild.com/FAQ.html#why-cant-i-specify-target-files-with-a-wildcard > > And as suggested in the same webpage, if we really want to, we should > add a tiny scripts that lists all the .yaml file and call it from the > meson build file ? Is it worth it ? Another option would be to extend checkstyle.py to catch this kind of issues. We already have a checker than warns if a header file is added to libcamera without a corresponding addition to meson.build. > > On 03.07.24 06:52, Robert Mader wrote: > > > We have all these neat tuning files. Unfortunately we forgot to install > > > many of them. > > > > > > Signed-off-by: Robert Mader<robert.mader@collabora.com> > > > --- > > > src/ipa/rkisp1/data/meson.build | 4 ++++ > > > 1 file changed, 4 insertions(+) > > > > > > diff --git a/src/ipa/rkisp1/data/meson.build b/src/ipa/rkisp1/data/meson.build > > > index 7150e155..1e3522b2 100644 > > > --- a/src/ipa/rkisp1/data/meson.build > > > +++ b/src/ipa/rkisp1/data/meson.build > > > @@ -2,8 +2,12 @@ > > > conf_files = files([ > > > 'imx219.yaml', > > > + 'imx258.yaml', > > > + 'ov2685.yaml', > > > 'ov4689.yaml', > > > 'ov5640.yaml', > > > + 'ov5695.yaml', > > > + 'ov8858.yaml', > > > 'uncalibrated.yaml', > > > ])
Quoting Laurent Pinchart (2024-07-03 09:04:54) > On Wed, Jul 03, 2024 at 09:58:44AM +0200, Jacopo Mondi wrote: > > Hi Robert > > > > On Wed, Jul 03, 2024 at 09:13:45AM GMT, Robert Mader wrote: > > > Or should we maybe just unconditionally install all *.yaml files in this > > > folder? > > > > I would be suprised if meson allows usage of wildcards when listing > > files. In facts, from a very quick test, I get > > > > ../src/ipa/rkisp1/data/meson.build:3:13: ERROR: File *.yaml does not exist.) > > > > It's also specified in the FAQ > > https://mesonbuild.com/FAQ.html#why-cant-i-specify-target-files-with-a-wildcard > > > > And as suggested in the same webpage, if we really want to, we should > > add a tiny scripts that lists all the .yaml file and call it from the > > meson build file ? Is it worth it ? > > Another option would be to extend checkstyle.py to catch this kind of > issues. We already have a checker than warns if a header file is added > to libcamera without a corresponding addition to meson.build. Indeed, but none of that changes the fact that we should probably install the files we currently 'have'. In the future I wonder if the tuning files would be separated out to a separate repository or platform specific packages - or ... otherwise - but for now I think if we have these files as part of libcamera, they're installable... Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> > > > > On 03.07.24 06:52, Robert Mader wrote: > > > > We have all these neat tuning files. Unfortunately we forgot to install > > > > many of them. > > > > > > > > Signed-off-by: Robert Mader<robert.mader@collabora.com> > > > > --- > > > > src/ipa/rkisp1/data/meson.build | 4 ++++ > > > > 1 file changed, 4 insertions(+) > > > > > > > > diff --git a/src/ipa/rkisp1/data/meson.build b/src/ipa/rkisp1/data/meson.build > > > > index 7150e155..1e3522b2 100644 > > > > --- a/src/ipa/rkisp1/data/meson.build > > > > +++ b/src/ipa/rkisp1/data/meson.build > > > > @@ -2,8 +2,12 @@ > > > > conf_files = files([ > > > > 'imx219.yaml', > > > > + 'imx258.yaml', > > > > + 'ov2685.yaml', > > > > 'ov4689.yaml', > > > > 'ov5640.yaml', > > > > + 'ov5695.yaml', > > > > + 'ov8858.yaml', > > > > 'uncalibrated.yaml', > > > > ]) > > -- > Regards, > > Laurent Pinchart
Quoting Kieran Bingham (2024-07-03 13:27:36) > Quoting Laurent Pinchart (2024-07-03 09:04:54) > > On Wed, Jul 03, 2024 at 09:58:44AM +0200, Jacopo Mondi wrote: > > > Hi Robert > > > > > > On Wed, Jul 03, 2024 at 09:13:45AM GMT, Robert Mader wrote: > > > > Or should we maybe just unconditionally install all *.yaml files in this > > > > folder? > > > > > > I would be suprised if meson allows usage of wildcards when listing > > > files. In facts, from a very quick test, I get > > > > > > ../src/ipa/rkisp1/data/meson.build:3:13: ERROR: File *.yaml does not exist.) > > > > > > It's also specified in the FAQ > > > https://mesonbuild.com/FAQ.html#why-cant-i-specify-target-files-with-a-wildcard > > > > > > And as suggested in the same webpage, if we really want to, we should > > > add a tiny scripts that lists all the .yaml file and call it from the > > > meson build file ? Is it worth it ? > > > > Another option would be to extend checkstyle.py to catch this kind of > > issues. We already have a checker than warns if a header file is added > > to libcamera without a corresponding addition to meson.build. > > Indeed, but none of that changes the fact that we should probably > install the files we currently 'have'. > > In the future I wonder if the tuning files would be separated out to a > separate repository or platform specific packages - or ... otherwise - > but for now I think if we have these files as part of libcamera, they're > installable... > In the case of the IMX258 for instance, which is expected to be supported on the PinePhone Pro - installing this means that device will now have lens shading and black level correction enabled (once Stefan's series is merged). > > Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> > > > > > > > On 03.07.24 06:52, Robert Mader wrote: > > > > > We have all these neat tuning files. Unfortunately we forgot to install > > > > > many of them. > > > > > > > > > > Signed-off-by: Robert Mader<robert.mader@collabora.com> > > > > > --- > > > > > src/ipa/rkisp1/data/meson.build | 4 ++++ > > > > > 1 file changed, 4 insertions(+) > > > > > > > > > > diff --git a/src/ipa/rkisp1/data/meson.build b/src/ipa/rkisp1/data/meson.build > > > > > index 7150e155..1e3522b2 100644 > > > > > --- a/src/ipa/rkisp1/data/meson.build > > > > > +++ b/src/ipa/rkisp1/data/meson.build > > > > > @@ -2,8 +2,12 @@ > > > > > conf_files = files([ > > > > > 'imx219.yaml', > > > > > + 'imx258.yaml', > > > > > + 'ov2685.yaml', > > > > > 'ov4689.yaml', > > > > > 'ov5640.yaml', > > > > > + 'ov5695.yaml', > > > > > + 'ov8858.yaml', > > > > > 'uncalibrated.yaml', > > > > > ]) > > > > -- > > Regards, > > > > Laurent Pinchart
On Wed, Jul 03, 2024 at 01:27:36PM +0100, Kieran Bingham wrote: > Quoting Laurent Pinchart (2024-07-03 09:04:54) > > On Wed, Jul 03, 2024 at 09:58:44AM +0200, Jacopo Mondi wrote: > > > Hi Robert > > > > > > On Wed, Jul 03, 2024 at 09:13:45AM GMT, Robert Mader wrote: > > > > Or should we maybe just unconditionally install all *.yaml files in this > > > > folder? > > > > > > I would be suprised if meson allows usage of wildcards when listing > > > files. In facts, from a very quick test, I get > > > > > > ../src/ipa/rkisp1/data/meson.build:3:13: ERROR: File *.yaml does not exist.) > > > > > > It's also specified in the FAQ > > > https://mesonbuild.com/FAQ.html#why-cant-i-specify-target-files-with-a-wildcard > > > > > > And as suggested in the same webpage, if we really want to, we should > > > add a tiny scripts that lists all the .yaml file and call it from the > > > meson build file ? Is it worth it ? > > > > Another option would be to extend checkstyle.py to catch this kind of > > issues. We already have a checker than warns if a header file is added > > to libcamera without a corresponding addition to meson.build. > > Indeed, but none of that changes the fact that we should probably > install the files we currently 'have'. Oh, absolutely. Sorry, I should have made that clearer: Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > In the future I wonder if the tuning files would be separated out to a > separate repository or platform specific packages - or ... otherwise - > but for now I think if we have these files as part of libcamera, they're > installable... > > Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> > > > > > On 03.07.24 06:52, Robert Mader wrote: > > > > > We have all these neat tuning files. Unfortunately we forgot to install > > > > > many of them. > > > > > > > > > > Signed-off-by: Robert Mader<robert.mader@collabora.com> > > > > > --- > > > > > src/ipa/rkisp1/data/meson.build | 4 ++++ > > > > > 1 file changed, 4 insertions(+) > > > > > > > > > > diff --git a/src/ipa/rkisp1/data/meson.build b/src/ipa/rkisp1/data/meson.build > > > > > index 7150e155..1e3522b2 100644 > > > > > --- a/src/ipa/rkisp1/data/meson.build > > > > > +++ b/src/ipa/rkisp1/data/meson.build > > > > > @@ -2,8 +2,12 @@ > > > > > conf_files = files([ > > > > > 'imx219.yaml', > > > > > + 'imx258.yaml', > > > > > + 'ov2685.yaml', > > > > > 'ov4689.yaml', > > > > > 'ov5640.yaml', > > > > > + 'ov5695.yaml', > > > > > + 'ov8858.yaml', > > > > > 'uncalibrated.yaml', > > > > > ])
diff --git a/src/ipa/rkisp1/data/meson.build b/src/ipa/rkisp1/data/meson.build index 7150e155..1e3522b2 100644 --- a/src/ipa/rkisp1/data/meson.build +++ b/src/ipa/rkisp1/data/meson.build @@ -2,8 +2,12 @@ conf_files = files([ 'imx219.yaml', + 'imx258.yaml', + 'ov2685.yaml', 'ov4689.yaml', 'ov5640.yaml', + 'ov5695.yaml', + 'ov8858.yaml', 'uncalibrated.yaml', ])
We have all these neat tuning files. Unfortunately we forgot to install many of them. Signed-off-by: Robert Mader <robert.mader@collabora.com> --- src/ipa/rkisp1/data/meson.build | 4 ++++ 1 file changed, 4 insertions(+)