public inbox for linux-media@vger.kernel.org
 help / color / mirror / Atom feed
* [v4l-utils] [PATCH v9 0/7] Switch build system to meson
@ 2023-02-21 14:31 Laurent Pinchart
  2023-02-21 14:31 ` [v4l-utils] [PATCH v9 1/7] utils: Allow choosing v4l2-tracer-gen.pl output Laurent Pinchart
                   ` (10 more replies)
  0 siblings, 11 replies; 28+ messages in thread
From: Laurent Pinchart @ 2023-02-21 14:31 UTC (permalink / raw)
  To: linux-media
  Cc: gjasny, hverkuil, kieran.bingham, mchehab, nicolas, p.zabel,
	rosenp, sakari.ailus, sean, user.vdr, xavier.claessens,
	deborah.brouwer, ariel, ezequiel, tomi.valkeinen

Hello everybody,

This series is the latest (and greatest) attempt to switch v4l-utils
from autotools to meson.

Compared to v8, minor review comments have been taken into account (see
the detailed changelog in patch 3/7 for more information), and a build
breakage when cross-compiling due to incorrect handling of config.h has
been fixed. Better handling of config.h is also included in patch 7/7,
on top of the removal of autotools support.

As far as I can tell, meson support is now ready. I can address review
comments in a v10 if there are any, but I'd like to merge it soon to
avoid another painful rebase. I'll be available to fix issues on top if
any problem is encountered later.

A tag that includes this series can be found at

        git://linuxtv.org/pinchartl/v4l-utils.git tags/meson-v9

Ariel D'Alessandro (4):
  Move README to markdown syntax
  Add support for meson building
  Copy Doxygen configuration file to doc/
  meson: Add support for doxygen documentation

Laurent Pinchart (1):
  Drop autoconf/automake support

Sakari Ailus (1):
  utils: Allow choosing v4l2-tracer-gen.pl output

Tomi Valkeinen (1):
  meson: Use -include to include config.h instead of -I.

 .gitignore                                    |  62 +-
 INSTALL                                       | 105 ---
 INSTALL.md                                    | 142 ++++
 Makefile.am                                   |  20 -
 README                                        | 282 -------
 README.md                                     | 285 +++++++
 aminclude.am                                  | 186 -----
 bootstrap.sh                                  |  28 -
 configure.ac                                  | 694 ------------------
 contrib/Makefile.am                           |  25 -
 contrib/cobalt-ctl/.gitignore                 |   1 -
 contrib/cobalt-ctl/Makefile.am                |   3 -
 contrib/cobalt-ctl/meson.build                |   8 +
 contrib/decode_tm6000/.gitignore              |   1 -
 contrib/decode_tm6000/Makefile.am             |   4 -
 contrib/decode_tm6000/meson.build             |  14 +
 contrib/freebsd/Makefile.am                   |   3 -
 contrib/gconv/Makefile.am                     |  17 -
 contrib/gconv/meson.build                     |  44 ++
 contrib/meson.build                           |  13 +
 contrib/rds-saa6588/.gitignore                |   1 -
 contrib/rds-saa6588/Makefile.am               |   3 -
 contrib/rds-saa6588/meson.build               |   7 +
 contrib/test/.gitignore                       |  11 -
 contrib/test/Makefile.am                      |  65 --
 contrib/test/mc_nextgen_test.c                |   2 -
 contrib/test/meson.build                      | 143 ++++
 contrib/test/pixfmt-test.c                    |   2 -
 contrib/test/v4l2gl.c                         |   1 -
 contrib/test/v4l2grab.c                       |   1 -
 contrib/xc3028-firmware/.gitignore            |   1 -
 contrib/xc3028-firmware/Makefile.am           |   5 -
 contrib/xc3028-firmware/meson.build           |  11 +
 doxygen_libdvbv5.cfg => doc/Doxyfile.in       | 128 ++--
 doc/meson.build                               |  34 +
 lib/Makefile.am                               |  13 -
 lib/libdvbv5/Makefile.am                      | 126 ----
 lib/libdvbv5/countries.c                      |   1 -
 lib/libdvbv5/dvb-dev-local.c                  |   2 -
 lib/libdvbv5/dvb-dev-remote.c                 |   3 -
 lib/libdvbv5/dvb-dev.c                        |   2 -
 lib/libdvbv5/dvb-fe.c                         |   2 -
 lib/libdvbv5/dvb-file.c                       |   2 -
 lib/libdvbv5/dvb-log.c                        |   2 -
 lib/libdvbv5/dvb-sat.c                        |   2 -
 lib/libdvbv5/dvb-scan.c                       |   2 -
 lib/libdvbv5/dvb-vdr-format.c                 |   2 -
 lib/libdvbv5/libdvbv5.pc.in                   |  11 -
 lib/libdvbv5/meson.build                      | 156 ++++
 lib/libdvbv5/parse_string.c                   |   1 -
 lib/libv4l-mplane/Makefile.am                 |   7 -
 lib/libv4l-mplane/libv4l-mplane.c             |   1 -
 lib/libv4l-mplane/meson.build                 |  23 +
 lib/libv4l1/Makefile.am                       |  29 -
 lib/libv4l1/libv4l1.c                         |   1 -
 lib/libv4l1/libv4l1.pc.in                     |  12 -
 lib/libv4l1/meson.build                       |  64 ++
 lib/libv4l1/v4l1compat.c                      |   1 -
 lib/libv4l2/Android.mk                        |   1 +
 lib/libv4l2/Makefile.am                       |  32 -
 lib/libv4l2/libv4l2.c                         |   5 -
 lib/libv4l2/libv4l2.pc.in                     |  12 -
 lib/libv4l2/log.c                             |   5 -
 lib/libv4l2/meson.build                       |  73 ++
 lib/libv4l2/v4l2-plugin-android.c             |   5 -
 lib/libv4l2/v4l2-plugin.c                     |   1 -
 lib/libv4l2/v4l2convert.c                     |   5 -
 lib/libv4l2rds/Makefile.am                    |  12 -
 lib/libv4l2rds/libv4l2rds.c                   |   1 -
 lib/libv4l2rds/libv4l2rds.pc.in               |  11 -
 lib/libv4l2rds/meson.build                    |  37 +
 lib/libv4lconvert/.gitignore                  |   3 -
 lib/libv4lconvert/Android.mk                  |   1 +
 lib/libv4lconvert/Makefile.am                 |  36 -
 lib/libv4lconvert/jl2005bcd.c                 |   5 -
 lib/libv4lconvert/jpeg.c                      |   5 -
 lib/libv4lconvert/jpeg_memsrcdest.c           |   5 -
 lib/libv4lconvert/libv4lconvert-priv.h        |   5 -
 lib/libv4lconvert/libv4lconvert.c             |   5 -
 lib/libv4lconvert/libv4lconvert.pc.in         |  11 -
 lib/libv4lconvert/meson.build                 | 117 +++
 lib/meson.build                               |  11 +
 libdvbv5-po/Makevars                          |  72 --
 libdvbv5-po/meson.build                       |   3 +
 m4/ac_define_dir.m4                           |  34 -
 m4/ax_prog_doxygen.m4                         | 532 --------------
 m4/ax_pthread.m4                              | 522 -------------
 m4/mode_t.m4                                  |  26 -
 m4/visibility.m4                              |  82 ---
 meson.build                                   | 399 ++++++++++
 meson_options.txt                             |  54 ++
 utils/Makefile.am                             |  41 --
 utils/cec-compliance/.gitignore               |   2 -
 utils/cec-compliance/Makefile.am              |   8 -
 utils/cec-compliance/cec-compliance.h         |   6 -
 utils/cec-compliance/meson.build              |  23 +
 utils/cec-ctl/.gitignore                      |   2 -
 utils/cec-ctl/Makefile.am                     |   8 -
 utils/cec-ctl/cec-ctl.cpp                     |   6 -
 utils/cec-ctl/cec-pin.cpp                     |   6 -
 utils/cec-ctl/meson.build                     |  18 +
 utils/cec-follower/.gitignore                 |   2 -
 utils/cec-follower/Makefile.am                |   8 -
 utils/cec-follower/cec-follower.h             |   6 -
 utils/cec-follower/meson.build                |  19 +
 utils/cx18-ctl/.gitignore                     |   1 -
 utils/cx18-ctl/Makefile.am                    |   3 -
 utils/cx18-ctl/cx18-ctl.c                     |   1 -
 utils/cx18-ctl/meson.build                    |   8 +
 utils/dvb/.gitignore                          |   9 -
 utils/dvb/Makefile.am                         |  35 -
 utils/dvb/dvb-fe-tool.c                       |   1 -
 utils/dvb/dvb-format-convert.c                |   2 -
 utils/dvb/dvbv5-daemon.c                      |   3 -
 utils/dvb/dvbv5-scan.c                        |   2 -
 utils/dvb/dvbv5-zap.c                         |   2 -
 utils/dvb/meson.build                         |  70 ++
 utils/gen_media_bus_format_codes.sh           |   7 +
 utils/gen_media_bus_format_names.sh           |   7 +
 utils/ir-ctl/.gitignore                       |   2 -
 utils/ir-ctl/Makefile.am                      |   6 -
 utils/ir-ctl/ir-ctl.c                         |   2 -
 utils/ir-ctl/meson.build                      |  23 +
 utils/ivtv-ctl/.gitignore                     |   1 -
 utils/ivtv-ctl/Makefile.am                    |   4 -
 utils/ivtv-ctl/meson.build                    |  13 +
 utils/keytable/.gitignore                     |   3 -
 utils/keytable/Makefile.am                    |  36 -
 utils/keytable/bpf_protocols/Makefile.am      |  24 -
 .../bpf_protocols/clang_sys_includes.sh       |   9 +
 utils/keytable/bpf_protocols/meson.build      |  31 +
 utils/keytable/keytable.c                     |   1 -
 utils/keytable/meson.build                    |  85 +++
 utils/keytable/rc_keymaps/meson.build         | 150 ++++
 utils/libcecutil/.gitignore                   |   4 -
 utils/libcecutil/Makefile.am                  |  24 -
 utils/libcecutil/meson.build                  |  45 ++
 utils/libmedia_dev/Makefile.am                |   7 -
 utils/libmedia_dev/meson.build                |  14 +
 utils/libv4l2util/Makefile.am                 |   7 -
 utils/libv4l2util/meson.build                 |  16 +
 utils/media-ctl/.gitignore                    |   3 -
 utils/media-ctl/Makefile.am                   |  30 -
 utils/media-ctl/libmediactl.c                 |   2 -
 utils/media-ctl/libmediactl.pc.in             |  10 -
 utils/media-ctl/libv4l2subdev.pc.in           |  11 -
 utils/media-ctl/meson.build                   |  43 ++
 utils/media-ctl/options.h                     |   2 -
 utils/meson.build                             |  43 ++
 utils/qv4l2/.gitignore                        |   9 -
 utils/qv4l2/Makefile.am                       |  54 --
 utils/qv4l2/alsa_stream.c                     |   2 -
 utils/qv4l2/capture-win-gl.h                  |   2 -
 utils/qv4l2/general-tab.h                     |   2 -
 utils/qv4l2/meson.build                       |  79 ++
 utils/qv4l2/qv4l2.h                           |   2 -
 utils/qvidcap/.gitignore                      |   6 -
 utils/qvidcap/Makefile.am                     |  42 --
 utils/qvidcap/meson.build                     |  87 +++
 utils/qvidcap/qvidcap.h                       |   2 -
 utils/rds-ctl/.gitignore                      |   2 -
 utils/rds-ctl/Makefile.am                     |   6 -
 utils/rds-ctl/meson.build                     |  17 +
 utils/v4l2-compliance/.gitignore              |   3 -
 utils/v4l2-compliance/Android.mk              |   1 +
 utils/v4l2-compliance/Makefile.am             |  31 -
 utils/v4l2-compliance/meson.build             |  63 ++
 utils/v4l2-compliance/v4l2-compliance.h       |   6 -
 utils/v4l2-ctl/.gitignore                     |   4 -
 utils/v4l2-ctl/Android.mk                     |   1 +
 utils/v4l2-ctl/Makefile.am                    |  44 --
 utils/v4l2-ctl/meson.build                    |  75 ++
 utils/v4l2-ctl/v4l2-ctl.h                     |   6 -
 utils/v4l2-dbg/.gitignore                     |   1 -
 utils/v4l2-dbg/Android.mk                     |   2 +
 utils/v4l2-dbg/Makefile.am                    |   6 -
 utils/v4l2-dbg/meson.build                    |  20 +
 utils/v4l2-dbg/v4l2-dbg.cpp                   |   6 -
 utils/v4l2-sysfs-path/.gitignore              |   1 -
 utils/v4l2-sysfs-path/Makefile.am             |   4 -
 utils/v4l2-sysfs-path/meson.build             |  14 +
 utils/v4l2-sysfs-path/v4l2-sysfs-path.c       |   1 -
 utils/v4l2-tracer/.gitignore                  |   7 -
 utils/v4l2-tracer/Makefile.am                 |  36 -
 utils/v4l2-tracer/libv4l2tracer.cpp           |   1 -
 utils/v4l2-tracer/media-info.cpp              |   1 +
 utils/v4l2-tracer/meson.build                 | 133 ++++
 utils/v4l2-tracer/v4l2-info.cpp               |   1 +
 utils/v4l2-tracer/v4l2-tracer-common.h        |   1 -
 utils/v4l2-tracer/v4l2-tracer-gen.pl          |  36 +-
 v4l-utils-po/Makevars                         |  72 --
 v4l-utils-po/meson.build                      |   3 +
 v4l-utils.spec.in                             |   6 +-
 193 files changed, 2860 insertions(+), 3940 deletions(-)
 delete mode 100644 INSTALL
 create mode 100644 INSTALL.md
 delete mode 100644 Makefile.am
 delete mode 100644 README
 create mode 100644 README.md
 delete mode 100644 aminclude.am
 delete mode 100755 bootstrap.sh
 delete mode 100644 configure.ac
 delete mode 100644 contrib/Makefile.am
 delete mode 100644 contrib/cobalt-ctl/.gitignore
 delete mode 100644 contrib/cobalt-ctl/Makefile.am
 create mode 100644 contrib/cobalt-ctl/meson.build
 delete mode 100644 contrib/decode_tm6000/.gitignore
 delete mode 100644 contrib/decode_tm6000/Makefile.am
 create mode 100644 contrib/decode_tm6000/meson.build
 delete mode 100644 contrib/freebsd/Makefile.am
 delete mode 100644 contrib/gconv/Makefile.am
 create mode 100644 contrib/gconv/meson.build
 create mode 100644 contrib/meson.build
 delete mode 100644 contrib/rds-saa6588/.gitignore
 delete mode 100644 contrib/rds-saa6588/Makefile.am
 create mode 100644 contrib/rds-saa6588/meson.build
 delete mode 100644 contrib/test/.gitignore
 delete mode 100644 contrib/test/Makefile.am
 create mode 100644 contrib/test/meson.build
 delete mode 100644 contrib/xc3028-firmware/.gitignore
 delete mode 100644 contrib/xc3028-firmware/Makefile.am
 create mode 100644 contrib/xc3028-firmware/meson.build
 rename doxygen_libdvbv5.cfg => doc/Doxyfile.in (96%)
 create mode 100644 doc/meson.build
 delete mode 100644 lib/Makefile.am
 delete mode 100644 lib/libdvbv5/Makefile.am
 delete mode 100644 lib/libdvbv5/libdvbv5.pc.in
 create mode 100644 lib/libdvbv5/meson.build
 delete mode 100644 lib/libv4l-mplane/Makefile.am
 create mode 100644 lib/libv4l-mplane/meson.build
 delete mode 100644 lib/libv4l1/Makefile.am
 delete mode 100644 lib/libv4l1/libv4l1.pc.in
 create mode 100644 lib/libv4l1/meson.build
 delete mode 100644 lib/libv4l2/Makefile.am
 delete mode 100644 lib/libv4l2/libv4l2.pc.in
 create mode 100644 lib/libv4l2/meson.build
 delete mode 100644 lib/libv4l2rds/Makefile.am
 delete mode 100644 lib/libv4l2rds/libv4l2rds.pc.in
 create mode 100644 lib/libv4l2rds/meson.build
 delete mode 100644 lib/libv4lconvert/.gitignore
 delete mode 100644 lib/libv4lconvert/Makefile.am
 delete mode 100644 lib/libv4lconvert/libv4lconvert.pc.in
 create mode 100644 lib/libv4lconvert/meson.build
 create mode 100644 lib/meson.build
 delete mode 100644 libdvbv5-po/Makevars
 create mode 100644 libdvbv5-po/meson.build
 delete mode 100644 m4/ac_define_dir.m4
 delete mode 100644 m4/ax_prog_doxygen.m4
 delete mode 100644 m4/ax_pthread.m4
 delete mode 100644 m4/mode_t.m4
 delete mode 100644 m4/visibility.m4
 create mode 100644 meson.build
 create mode 100644 meson_options.txt
 delete mode 100644 utils/Makefile.am
 delete mode 100644 utils/cec-compliance/.gitignore
 delete mode 100644 utils/cec-compliance/Makefile.am
 create mode 100644 utils/cec-compliance/meson.build
 delete mode 100644 utils/cec-ctl/.gitignore
 delete mode 100644 utils/cec-ctl/Makefile.am
 create mode 100644 utils/cec-ctl/meson.build
 delete mode 100644 utils/cec-follower/.gitignore
 delete mode 100644 utils/cec-follower/Makefile.am
 create mode 100644 utils/cec-follower/meson.build
 delete mode 100644 utils/cx18-ctl/.gitignore
 delete mode 100644 utils/cx18-ctl/Makefile.am
 create mode 100644 utils/cx18-ctl/meson.build
 delete mode 100644 utils/dvb/.gitignore
 delete mode 100644 utils/dvb/Makefile.am
 create mode 100644 utils/dvb/meson.build
 create mode 100755 utils/gen_media_bus_format_codes.sh
 create mode 100755 utils/gen_media_bus_format_names.sh
 delete mode 100644 utils/ir-ctl/.gitignore
 delete mode 100644 utils/ir-ctl/Makefile.am
 create mode 100644 utils/ir-ctl/meson.build
 delete mode 100644 utils/ivtv-ctl/.gitignore
 delete mode 100644 utils/ivtv-ctl/Makefile.am
 create mode 100644 utils/ivtv-ctl/meson.build
 delete mode 100644 utils/keytable/.gitignore
 delete mode 100644 utils/keytable/Makefile.am
 delete mode 100644 utils/keytable/bpf_protocols/Makefile.am
 create mode 100755 utils/keytable/bpf_protocols/clang_sys_includes.sh
 create mode 100644 utils/keytable/bpf_protocols/meson.build
 create mode 100644 utils/keytable/meson.build
 create mode 100644 utils/keytable/rc_keymaps/meson.build
 delete mode 100644 utils/libcecutil/.gitignore
 delete mode 100644 utils/libcecutil/Makefile.am
 create mode 100644 utils/libcecutil/meson.build
 delete mode 100644 utils/libmedia_dev/Makefile.am
 create mode 100644 utils/libmedia_dev/meson.build
 delete mode 100644 utils/libv4l2util/Makefile.am
 create mode 100644 utils/libv4l2util/meson.build
 delete mode 100644 utils/media-ctl/.gitignore
 delete mode 100644 utils/media-ctl/Makefile.am
 delete mode 100644 utils/media-ctl/libmediactl.pc.in
 delete mode 100644 utils/media-ctl/libv4l2subdev.pc.in
 create mode 100644 utils/media-ctl/meson.build
 create mode 100644 utils/meson.build
 delete mode 100644 utils/qv4l2/.gitignore
 delete mode 100644 utils/qv4l2/Makefile.am
 create mode 100644 utils/qv4l2/meson.build
 delete mode 100644 utils/qvidcap/.gitignore
 delete mode 100644 utils/qvidcap/Makefile.am
 create mode 100644 utils/qvidcap/meson.build
 delete mode 100644 utils/rds-ctl/.gitignore
 delete mode 100644 utils/rds-ctl/Makefile.am
 create mode 100644 utils/rds-ctl/meson.build
 delete mode 100644 utils/v4l2-compliance/.gitignore
 delete mode 100644 utils/v4l2-compliance/Makefile.am
 create mode 100644 utils/v4l2-compliance/meson.build
 delete mode 100644 utils/v4l2-ctl/.gitignore
 delete mode 100644 utils/v4l2-ctl/Makefile.am
 create mode 100644 utils/v4l2-ctl/meson.build
 delete mode 100644 utils/v4l2-dbg/.gitignore
 delete mode 100644 utils/v4l2-dbg/Makefile.am
 create mode 100644 utils/v4l2-dbg/meson.build
 delete mode 100644 utils/v4l2-sysfs-path/.gitignore
 delete mode 100644 utils/v4l2-sysfs-path/Makefile.am
 create mode 100644 utils/v4l2-sysfs-path/meson.build
 delete mode 100644 utils/v4l2-tracer/.gitignore
 delete mode 100644 utils/v4l2-tracer/Makefile.am
 create mode 120000 utils/v4l2-tracer/media-info.cpp
 create mode 100644 utils/v4l2-tracer/meson.build
 create mode 120000 utils/v4l2-tracer/v4l2-info.cpp
 delete mode 100644 v4l-utils-po/Makevars
 create mode 100644 v4l-utils-po/meson.build


base-commit: 9431e4b26b4842d1401e80ada9f14593dca3a94c
-- 
Regards,

Laurent Pinchart


^ permalink raw reply	[flat|nested] 28+ messages in thread

end of thread, other threads:[~2023-02-23  7:57 UTC | newest]

Thread overview: 28+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-21 14:31 [v4l-utils] [PATCH v9 0/7] Switch build system to meson Laurent Pinchart
2023-02-21 14:31 ` [v4l-utils] [PATCH v9 1/7] utils: Allow choosing v4l2-tracer-gen.pl output Laurent Pinchart
2023-02-21 15:00   ` Hans Verkuil
2023-02-21 15:04     ` Sakari Ailus
2023-02-21 14:31 ` [v4l-utils] [PATCH v9 2/7] Move README to markdown syntax Laurent Pinchart
2023-02-21 14:32 ` [v4l-utils] [PATCH v9 3/7] Add support for meson building Laurent Pinchart
2023-02-21 14:43   ` Hans Verkuil
2023-02-21 14:51     ` Laurent Pinchart
2023-02-22 10:41       ` Gregor Jasny
2023-02-22 11:12         ` Laurent Pinchart
2023-02-22 17:50         ` Deborah Brouwer
2023-02-22 19:46           ` Hans Verkuil
2023-02-22 19:50         ` Hans Verkuil
2023-02-22 21:12           ` Gregor Jasny
2023-02-22 22:03             ` Hans Verkuil
2023-02-21 14:32 ` [v4l-utils] [PATCH v9 4/7] Copy Doxygen configuration file to doc/ Laurent Pinchart
2023-02-21 14:32 ` [v4l-utils] [PATCH v9 5/7] meson: Add support for doxygen documentation Laurent Pinchart
2023-02-21 14:32 ` [v4l-utils] [PATCH v9 6/7] Drop autoconf/automake support Laurent Pinchart
2023-02-21 14:32 ` [v4l-utils] [PATCH v9 7/7] meson: Use -include to include config.h instead of -I Laurent Pinchart
2023-02-21 14:36 ` [v4l-utils] [PATCH v9 0/7] Switch build system to meson Sakari Ailus
2023-02-21 16:06 ` Sean Young
2023-02-21 16:08 ` [PATCH 1/1] utils: Add help text for v4l2-tracer-gen.pl Sakari Ailus
2023-02-21 16:17   ` Laurent Pinchart
2023-02-21 16:18   ` Hans Verkuil
2023-02-21 18:45     ` Deborah Brouwer
2023-02-22  7:11   ` Sakari Ailus
2023-02-22  8:42     ` Laurent Pinchart
2023-02-23  7:57 ` [v4l-utils] [PATCH v9 0/7] Switch build system to meson Tomi Valkeinen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox