| Message ID | 20260626074100.272963-2-robert.mader@collabora.com |
|---|---|
| State | New |
| Headers | show |
| Series |
|
| Related | show |
2026. 06. 26. 9:40 keltezéssel, Robert Mader írta: > It doesn't seem to be used. I guess it might have been added because there was plans to do something or because libyuv itself has a dependency on libjpeg (but of course that shouldn't be needed)? > > Signed-off-by: Robert Mader <robert.mader@collabora.com> > --- Reviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com> > src/libcamera/pipeline/virtual/meson.build | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/src/libcamera/pipeline/virtual/meson.build b/src/libcamera/pipeline/virtual/meson.build > index c84345936..19fde9cf8 100644 > --- a/src/libcamera/pipeline/virtual/meson.build > +++ b/src/libcamera/pipeline/virtual/meson.build > @@ -7,9 +7,6 @@ libcamera_internal_sources += files([ > 'virtual.cpp', > ]) > > -libjpeg = dependency('libjpeg', required : true) > - > libcamera_deps += [libyuv_dep] > -libcamera_deps += [libjpeg] > > subdir('data') > -- > 2.54.0 >
Quoting Robert Mader (2026-06-26 08:40:59) > It doesn't seem to be used. > > Signed-off-by: Robert Mader <robert.mader@collabora.com> > --- > src/libcamera/pipeline/virtual/meson.build | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/src/libcamera/pipeline/virtual/meson.build b/src/libcamera/pipeline/virtual/meson.build > index c84345936..19fde9cf8 100644 > --- a/src/libcamera/pipeline/virtual/meson.build > +++ b/src/libcamera/pipeline/virtual/meson.build > @@ -7,9 +7,6 @@ libcamera_internal_sources += files([ > 'virtual.cpp', > ]) > > -libjpeg = dependency('libjpeg', required : true) > - Aha, now I hear that we do support jpegs, but through libyuv which can depend on libjpeg (or whatever jpeg support it desires) so we don't need to be explicit here. Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> > libcamera_deps += [libyuv_dep] > -libcamera_deps += [libjpeg] > > subdir('data') > -- > 2.54.0 >
2026. 06. 26. 9:48 keltezéssel, Barnabás Pőcze írta: > 2026. 06. 26. 9:40 keltezéssel, Robert Mader írta: >> It doesn't seem to be used. > > I guess it might have been added because there was plans to do something > or because libyuv itself has a dependency on libjpeg (but of course > that shouldn't be needed)? > > >> >> Signed-off-by: Robert Mader <robert.mader@collabora.com> >> --- > > Reviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com> Nevermind. When libyuv is not available, meson falls back to using the upstream CMakeLists.txt, but as far as I can see that does not set the libjpeg dependency up, leading to linker errors: https://gitlab.freedesktop.org/camera/libcamera/-/jobs/103332638#L1014 So as far as I can tell, this cannot be merged as is. > > >> src/libcamera/pipeline/virtual/meson.build | 3 --- >> 1 file changed, 3 deletions(-) >> >> diff --git a/src/libcamera/pipeline/virtual/meson.build b/src/libcamera/pipeline/virtual/meson.build >> index c84345936..19fde9cf8 100644 >> --- a/src/libcamera/pipeline/virtual/meson.build >> +++ b/src/libcamera/pipeline/virtual/meson.build >> @@ -7,9 +7,6 @@ libcamera_internal_sources += files([ >> 'virtual.cpp', >> ]) >> >> -libjpeg = dependency('libjpeg', required : true) >> - >> libcamera_deps += [libyuv_dep] >> -libcamera_deps += [libjpeg] >> >> subdir('data') >> -- >> 2.54.0 >> >
On Fri, Jun 26, 2026 at 10:48:04AM +0200, Barnabás Pőcze wrote: > 2026. 06. 26. 9:48 keltezéssel, Barnabás Pőcze írta: > > 2026. 06. 26. 9:40 keltezéssel, Robert Mader írta: > >> It doesn't seem to be used. > > > > I guess it might have been added because there was plans to do something > > or because libyuv itself has a dependency on libjpeg (but of course > > that shouldn't be needed)? > > > >> Signed-off-by: Robert Mader <robert.mader@collabora.com> > >> --- > > > > Reviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com> > > Nevermind. When libyuv is not available, meson falls back to using > the upstream CMakeLists.txt, but as far as I can see that does not > set the libjpeg dependency up, leading to linker errors: > https://gitlab.freedesktop.org/camera/libcamera/-/jobs/103332638#L1014 > > So as far as I can tell, this cannot be merged as is. Explaining this in a comment in meson.build will help avoiding a similar patch in the future when everybody will have forgotten. > >> src/libcamera/pipeline/virtual/meson.build | 3 --- > >> 1 file changed, 3 deletions(-) > >> > >> diff --git a/src/libcamera/pipeline/virtual/meson.build b/src/libcamera/pipeline/virtual/meson.build > >> index c84345936..19fde9cf8 100644 > >> --- a/src/libcamera/pipeline/virtual/meson.build > >> +++ b/src/libcamera/pipeline/virtual/meson.build > >> @@ -7,9 +7,6 @@ libcamera_internal_sources += files([ > >> 'virtual.cpp', > >> ]) > >> > >> -libjpeg = dependency('libjpeg', required : true) > >> - > >> libcamera_deps += [libyuv_dep] > >> -libcamera_deps += [libjpeg] > >> > >> subdir('data')
On 26.06.26 11:37, Laurent Pinchart wrote: >> Nevermind. When libyuv is not available, meson falls back to using >> the upstream CMakeLists.txt, but as far as I can see that does not >> set the libjpeg dependency up, leading to linker errors: >> https://gitlab.freedesktop.org/camera/libcamera/-/jobs/103332638#L1014 >> >> So as far as I can tell, this cannot be merged as is. > Explaining this in a comment in meson.build will help avoiding a similar > patch in the future when everybody will have forgotten. I think the solution in v2 makes that obvious by moving libjpeg = dependency('libjpeg', required : true) close to the libyuv_vars.append_link_args('-ljpeg') that is the reason for the dependency.
diff --git a/src/libcamera/pipeline/virtual/meson.build b/src/libcamera/pipeline/virtual/meson.build index c84345936..19fde9cf8 100644 --- a/src/libcamera/pipeline/virtual/meson.build +++ b/src/libcamera/pipeline/virtual/meson.build @@ -7,9 +7,6 @@ libcamera_internal_sources += files([ 'virtual.cpp', ]) -libjpeg = dependency('libjpeg', required : true) - libcamera_deps += [libyuv_dep] -libcamera_deps += [libjpeg] subdir('data')
It doesn't seem to be used. Signed-off-by: Robert Mader <robert.mader@collabora.com> --- src/libcamera/pipeline/virtual/meson.build | 3 --- 1 file changed, 3 deletions(-)