Skip to contentSkip to conversation

Add support for meson building

PATCH In review Ariel D'Alessandro 7 participants 25 messages May 12, 2021 – Dec 15, 2021

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

v5 cover Add support for meson building

Hi all,

Another attempt to support meson build, addressing comments/fixes from reviewers.

This patchset was developed on top of v4l-utils current master branch:

commit f0c7e3d71eaf4182bae7eb3ee0e43b4eeb047ea9
Author: Hans Verkuil <[email protected]>

v4l2-ctl: add '--set-edid type=list' support

You can find the patchset pushed to the following branch:

https://gitlab.collabora.com/adalessandro/v4l-utils/-/tree/v4l-utils-meson-v5

Feedback appreciated as always :-)

Changes from v4:

* Dropped install_subdir() work-around to install empty dir. Supported

    now in meson v0.57.

* Bump to meson v0.57. Replaced deprecated methods.
* Added override_dependency() calls on libraries.
* Properly check for bpf and SDL2 dependencies.
* Removed libraries_private field from libv4lconvert pkgconfig.
* Documented meson static builds support.
* Set default compiler standard options.
* Added bpf check in keytable.

Changes from v3:

* Split Doxygen support patch.
* Properly generate config.h configuration file.

Changes from v2:

* Updated to current master branch.
* Moved README to markdown syntax.
* Documented meson build.
* Set PACKAGE_VERSION config macro as quoted.

Changes from v1:

* Updated project version to 1.21.0.
* Fixed clang includes in keytable bpf compilation.
* Improved variable reutilization in meson scripts.
* Set libraries version and soversion.
* Control symbol visibility.
* Install empty 'protocols' directory in keytable user dir.
* Fixed svg filenames in qv4l2 and qvidcap.
* Added support for Doxygen documentation (html and man).
* Updated required meson version to v0.53 (for fs module).
* Added new files to EXTRA_DIST in each Makefile.am.

Regards,

Ariel D'Alessandro (5):
Move README to markdown syntax
Add support for meson building
Copy Doxygen configuration file to doc/
meson: Add support for doxygen documentation
Makefile.am: Distribute meson related files

 .gitignore                                    |    1 +
 INSTALL.meson.md                              |  142 +
 Makefile.am                                   |    5 +-
 README                                        |  274 --
 README.md                                     |  332 +++
 contrib/Makefile.am                           |    3 +-
 contrib/cobalt-ctl/Makefile.am                |    2 +
 contrib/cobalt-ctl/meson.build                |    8 +
 contrib/decode_tm6000/Makefile.am             |    2 +
 contrib/decode_tm6000/meson.build             |   14 +
 contrib/gconv/Makefile.am                     |    2 +-
 contrib/gconv/meson.build                     |   44 +
 contrib/meson.build                           |   13 +
 contrib/rds-saa6588/Makefile.am               |    2 +
 contrib/rds-saa6588/meson.build               |    7 +
 contrib/test/Makefile.am                      |    3 +-
 contrib/test/meson.build                      |  143 +
 contrib/xc3028-firmware/Makefile.am           |    2 +-
 contrib/xc3028-firmware/meson.build           |   11 +
 doc/Doxyfile.in                               | 2352 +++++++++++++++++
 doc/meson.build                               |   34 +
 lib/Makefile.am                               |    2 +-
 lib/libdvbv5/Makefile.am                      |    2 +-
 lib/libdvbv5/meson.build                      |  159 ++
 lib/libv4l-mplane/Makefile.am                 |    2 +
 lib/libv4l-mplane/meson.build                 |   23 +
 lib/libv4l1/Makefile.am                       |    2 +-
 lib/libv4l1/meson.build                       |   62 +
 lib/libv4l2/Makefile.am                       |    2 +-
 lib/libv4l2/meson.build                       |   71 +
 lib/libv4l2rds/Makefile.am                    |    2 +
 lib/libv4l2rds/meson.build                    |   37 +
 lib/libv4lconvert/Makefile.am                 |    2 +-
 lib/libv4lconvert/meson.build                 |  117 +
 lib/meson.build                               |   11 +
 libdvbv5-po/meson.build                       |    3 +
 meson.build                                   |  334 +++
 meson_options.txt                             |   50 +
 utils/Makefile.am                             |    2 +-
 utils/cec-compliance/Makefile.am              |    2 +-
 utils/cec-compliance/meson.build              |   22 +
 utils/cec-ctl/Makefile.am                     |    2 +-
 utils/cec-ctl/meson.build                     |   18 +
 utils/cec-follower/Makefile.am                |    2 +-
 utils/cec-follower/meson.build                |   19 +
 utils/cx18-ctl/Makefile.am                    |    2 +
 utils/cx18-ctl/meson.build                    |    8 +
 utils/dvb/Makefile.am                         |    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/Makefile.am                      |    2 +
 utils/ir-ctl/meson.build                      |   23 +
 utils/ivtv-ctl/Makefile.am                    |    2 +
 utils/ivtv-ctl/meson.build                    |   13 +
 utils/keytable/Makefile.am                    |    3 +-
 utils/keytable/bpf_protocols/Makefile.am      |    3 +-
 .../bpf_protocols/clang_sys_includes.sh       |    9 +
 utils/keytable/bpf_protocols/meson.build      |   31 +
 utils/keytable/meson.build                    |   81 +
 utils/keytable/rc_keymaps/meson.build         |  151 ++
 utils/libcecutil/Makefile.am                  |    2 +-
 utils/libcecutil/meson.build                  |   45 +
 utils/libmedia_dev/Makefile.am                |    2 +-
 utils/libmedia_dev/meson.build                |   14 +
 utils/libv4l2util/Makefile.am                 |    2 +-
 utils/libv4l2util/meson.build                 |   16 +
 utils/media-ctl/Makefile.am                   |    2 +
 utils/media-ctl/meson.build                   |   43 +
 utils/meson.build                             |   46 +
 utils/qv4l2/Makefile.am                       |    3 +-
 utils/qv4l2/meson.build                       |   80 +
 utils/qvidcap/Makefile.am                     |    3 +-
 utils/qvidcap/meson.build                     |   82 +
 utils/rds-ctl/Makefile.am                     |    1 +
 utils/rds-ctl/meson.build                     |   13 +
 utils/v4l2-compliance/Makefile.am             |    2 +-
 utils/v4l2-compliance/meson.build             |   58 +
 utils/v4l2-ctl/Makefile.am                    |    2 +-
 utils/v4l2-ctl/meson.build                    |   75 +
 utils/v4l2-dbg/Makefile.am                    |    2 +-
 utils/v4l2-dbg/meson.build                    |   16 +
 utils/v4l2-sysfs-path/Makefile.am             |    2 +
 utils/v4l2-sysfs-path/meson.build             |   14 +
 v4l-utils-po/meson.build                      |    3 +
 85 files changed, 4987 insertions(+), 299 deletions(-)
 create mode 100644 INSTALL.meson.md
 delete mode 100644 README
 create mode 100644 README.md
 create mode 100644 contrib/cobalt-ctl/meson.build
 create mode 100644 contrib/decode_tm6000/meson.build
 create mode 100644 contrib/gconv/meson.build
 create mode 100644 contrib/meson.build
 create mode 100644 contrib/rds-saa6588/meson.build
 create mode 100644 contrib/test/meson.build
 create mode 100644 contrib/xc3028-firmware/meson.build
 create mode 100644 doc/Doxyfile.in
 create mode 100644 doc/meson.build
 create mode 100644 lib/libdvbv5/meson.build
 create mode 100644 lib/libv4l-mplane/meson.build
 create mode 100644 lib/libv4l1/meson.build
 create mode 100644 lib/libv4l2/meson.build
 create mode 100644 lib/libv4l2rds/meson.build
 create mode 100644 lib/libv4lconvert/meson.build
 create mode 100644 lib/meson.build
 create mode 100644 libdvbv5-po/meson.build
 create mode 100644 meson.build
 create mode 100644 meson_options.txt
 create mode 100644 utils/cec-compliance/meson.build
 create mode 100644 utils/cec-ctl/meson.build
 create mode 100644 utils/cec-follower/meson.build
 create mode 100644 utils/cx18-ctl/meson.build
 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
 create mode 100644 utils/ir-ctl/meson.build
 create mode 100644 utils/ivtv-ctl/meson.build
 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
 create mode 100644 utils/libcecutil/meson.build
 create mode 100644 utils/libmedia_dev/meson.build
 create mode 100644 utils/libv4l2util/meson.build
 create mode 100644 utils/media-ctl/meson.build
 create mode 100644 utils/meson.build
 create mode 100644 utils/qv4l2/meson.build
 create mode 100644 utils/qvidcap/meson.build
 create mode 100644 utils/rds-ctl/meson.build
 create mode 100644 utils/v4l2-compliance/meson.build
 create mode 100644 utils/v4l2-ctl/meson.build
 create mode 100644 utils/v4l2-dbg/meson.build
 create mode 100644 utils/v4l2-sysfs-path/meson.build
 create mode 100644 v4l-utils-po/meson.build
Signature · 1 line
2.30.2
#1 lore raw

PATCH v5 1/5 Move README to markdown syntax

This commit just rewrites (and renames) the README file to use markdown syntax. Note that no further changes are added, keeping content unmodified as much as possible.

---
 README    | 274 -----------------------------------------------------
 README.md | 278 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 278 insertions(+), 274 deletions(-)
 delete mode 100644 README
 create mode 100644 README.md
README deleted +0 -274
deleted file mode 100644
index a7759171..00000000
@@ -1,274 +0,0 @@
-v4l-utils
----------
-
-Linux utilities and libraries to handle media devices (TV devices,
-capture devices, radio devices, remote controllers).
-
-You can always find the latest development v4l-utils in the git repo:
-	http://git.linuxtv.org/v4l-utils.git
-
-Those utilities follow the latest Linux Kernel media API, as documented
-at:
-	http://linuxtv.org/downloads/v4l-dvb-apis/
-
-Any questions/remarks/patches can be sent to the linux-media mailinglist.
-See https://linuxtv.org/lists.php for more information about the mailinglist.
-
-There is also a wiki page for the v4l-utils:
-
-	https://linuxtv.org/wiki/index.php/V4l-utils
-
-
---------
-Building
---------
-
-A number of packages is required to fully build v4l-utils. The first
-step is to install those packages. The package names are different on
-each distro.
-
-On Debian and derivated distributions, you need to install the following
-packages with apt-get or aptitude:
-    debhelper dh-autoreconf autotools-dev autoconf-archive doxygen graphviz
-    libasound2-dev libtool libjpeg-dev qtbase5-dev qt5-default
-    libqt5opengl5-dev libudev-dev libx11-dev pkg-config udev make gcc git
-
-
-On Fedora, the package list for a minimal install with dnf or yum is:
-	git automake autoconf libtool make gcc gcc-c++ which perl gettext-devel
-
-(git is only requiried if you're cloning from the main git repository at
- linuxtv.org).
-
-And, to be able to compile it with all usual functionality with qt5,
-you'll need also:
-	alsa-lib-devel doxygen libjpeg-turbo-devel qt5-qtbase-devel
-	libudev-devel mesa-libGLU-devel
-
-
-After downloading and installing the needed packages, you should run:
-
-	./bootstrap.sh
-	./configure
-	make
-
-If ./configure exit with some errors try:
-
-	autoreconf -i --force
-	./configure
-
-And, to install on your system:
-	sudo make install
-
-Optional features
-^^^^^^^^^^^^^^^^^
-
-Please notice that there's an extra feature to add an extra table to
-decode Japanese DVB tables via iconv. This is meant to be used when
-the iconv itself doesn't come with the ARIB-STD-B24 and EN300-468-TAB00
-tables.
-
-That requires not only the gconv package, but it also needs to be manually
-enabled with:
-	--enable-gconv
-
-----------
-versioning
-----------
-
-The v4l-utils doesn't quite follow the release versioning defined
-at semver.org.
-
-Instead, since version 1.0, it uses:
-
-	MAJOR.MINOR.PATCH
-
-Where:
-
-	MINOR - an odd number means a development version. When
-		the development is closed, we release an even
-		numbered version and start a newer odd version;
-
-	MAJOR - It is incremented when MINOR number starts to be
-		too big. The last change occurred from 0.9.x to 1.0.
-
-	All numbers start with 0.
-
-All versions have their own tags, except for the current
-deveopment version (with uses the master branch at the git tree).
-
-The PATCH meaning actually depends if the version is stable
-or developent.
-
-For even MAJOR.MINOR versions (1.0, 1.2, 1.4, 1.6, ...)
-
-	PATCH is incremented when just bug fixes are added;
-
-For odd MAJOR.MINOR versions (1.1, 1.3, 1.5, 1.7, ...)
-	PATCH is incremented for release candidate versions.
-
-API/ABI stability:
------------------
-
-There should not have any API/ABI changes when PATCH is incremented.
-
-When MAJOR and/or MINOR are incremented, the API/ABI for the
-libraries might change, although we do all the efforts for not
-doing it, except when inevitable.
-
-The TODO files should specify the events that will generate
-API/ABI breaks.
-
----------------
-media libraries
----------------
-
-There are currently three media libraries defined at /lib directory,
-meant to be used internally and by other applications.
-
-libv4l
-------
-
-This library is meant to be used by applications that need to
-talk with V4L2 devices (webcams, analog TV, stream grabbers).
-
-It can be found on the following directories:
-	lib/libv4l1
-	lib/libv4l2
-	lib/libv4l-mplane
-	lib/libv4lconvert
-
-See README.libv4l for more information on libv4l.
-
-The libv4l is released under the GNU Lesser General Public License.
-
-libdvbv5
---------
-
-This library is meant to be used by digital TV applications that
-need to talk with media hardware.
-
-Full documentation is provided via Doxygen. It can be built,
-after configuring the package, with:
-	$ make doxygen-run
-
-It is possible to generate documentation in html, man pages and pdf
-formats.
-
-The documentation is also available via web, at:
-	http://linuxtv.org/docs/libdvbv5/
-
-It can be found on the following directory:
-	lib/libdvbv5
-
-The libdvbv5 is released under GPL version 2.
-
-
-libv4l2rds
-----------
-
-This library provides support for RDS radio applications.
-
-It can be found on the following directory:
-	lib/libv4l2rds
-
-The libv4l is released under the GNU Lesser General Public License.
-
----------
-Utilities
----------
-
-The utilities are stored under /util directory.
-
-The (for now for v4l-utils private use only) libv4l2util library is
-released under the GNU Lesser General Public License, all other code is
-released under the GNU General Public License.
-
-v4l-utils includes the following utilities:
-
-decode_tm6000:
-Decodes tm6000 proprietary format streams.
-Installed by make install under <prefix>/bin.
-
-ir-keytable:
-Dump, Load or Modify ir receiver input tables.
-The ir tables for remotes which are known by the kernel
-(and loaded by default depending on dvb card type) can be found
-under utils/keytable/keycodes.
-v4l-keytable does not get installed by make install.
-
-ir-ctl:
-A swiss-knife tool to handle raw IR and to set lirc options
-
-qv4l2:
-QT v4l2 control panel application.
-Installed by make install under <prefix>/bin.
-
-rds-saa6588:
-Poll i2c RDS receiver [Philips saa6588].
-rds-saa6588 does not get installed by make install.
-
-v4l2-compliance:
-Tool to test v4l2 API compliance of drivers.
-Installed by make install under <prefix>/bin.
-
-v4l2-ctl:
-Tool to control v4l2 controls from the cmdline.
-Installed by make install under <prefix>/bin.
-
-v4l2-dbg:
-Tool to directly get and set registers of v4l2 devices,
-this requires a kernel >= 2.6.29 with the ADV_DEBUG option
-enabled. This tool can only be used by root and is meant
-for development purposes only!
-Installed by make install under <prefix>/sbin.
-
-v4l2-sysfs-path:
-FIXME add description.
-Installed by make install under <prefix>/bin.
-
-xc3028-firmware:
-Xceive XC2028/3028 tuner module firmware manipulation tool.
-xc3028-firmware does not get installed by make install.
-
--------------------
-Syncing with Kernel
--------------------
-
-There are a number of files on this package that depends on the Linux Kernel.
-
-In order to make easier to keep it in sync, there's a target on this
-package to do the synchronism.
-
-For the sync to work, you need to run it on with 64 bits userspace and
-be sure that glibc has the development package for 32 bits.
-
-For Fedora, this is provided via this package: glibc-devel.i686
-
-There are some steps required:
-
-step 1) at the Kernel git tree:
-
-We need to sanitize the headers to be installed. To do that, you should
-run
-
-	$ make headers_install INSTALL_HDR_PATH=usr/
-
-This will create the dir "usr/" inside the Kernel tree.
-
-step 2)
-
-Be sure that you have installed both glibc development packages for
-32 and 64 bits, as otherwise the next step will fail.
-
-step 3) at v4l-utils tree:
-
-	$ ./sync-with-kernel.sh location/of/the/kernel/tree
-
-Alternatively, steps 1 to 3 can be replaced with:
-
-KERNEL_DIR=location/of/the/kernel/tree && (cd $KERNEL_DIR && make headers_install INSTALL_HDR_PATH=usr/) && ./sync-with-kernel.sh $KERNEL_DIR
-
-step 4)
-
-Remove the usr/ from the Kernel tree.
README.md new file +278 -0

278 lines not on this page · raw message

Signature · 1 line
2.30.2
#2 lore raw

PATCH v5 2/5 Add support for meson building

In reply to Ariel D'Alessandro

Supports building libraries and tools found in contrib/, lib/ and utils/ directories, along with the implemented gettext translations.

---
 .gitignore                                    |   1 +
 INSTALL.meson.md                              | 142 ++++++++
 README.md                                     |  83 ++++-
 contrib/cobalt-ctl/meson.build                |   8 +
 contrib/decode_tm6000/meson.build             |  14 +
 contrib/gconv/meson.build                     |  44 +++
 contrib/meson.build                           |  13 +
 contrib/rds-saa6588/meson.build               |   7 +
 contrib/test/meson.build                      | 143 ++++++++
 contrib/xc3028-firmware/meson.build           |  11 +
 lib/libdvbv5/meson.build                      | 159 +++++++++
 lib/libv4l-mplane/meson.build                 |  23 ++
 lib/libv4l1/meson.build                       |  62 ++++
 lib/libv4l2/meson.build                       |  71 ++++
 lib/libv4l2rds/meson.build                    |  37 ++
 lib/libv4lconvert/meson.build                 | 117 +++++++
 lib/meson.build                               |  11 +
 libdvbv5-po/meson.build                       |   3 +
 meson.build                                   | 331 ++++++++++++++++++
 meson_options.txt                             |  42 +++
 utils/cec-compliance/meson.build              |  22 ++
 utils/cec-ctl/meson.build                     |  18 +
 utils/cec-follower/meson.build                |  19 +
 utils/cx18-ctl/meson.build                    |   8 +
 utils/dvb/meson.build                         |  70 ++++
 utils/gen_media_bus_format_codes.sh           |   7 +
 utils/gen_media_bus_format_names.sh           |   7 +
 utils/ir-ctl/meson.build                      |  23 ++
 utils/ivtv-ctl/meson.build                    |  13 +
 .../bpf_protocols/clang_sys_includes.sh       |   9 +
 utils/keytable/bpf_protocols/meson.build      |  31 ++
 utils/keytable/meson.build                    |  81 +++++
 utils/keytable/rc_keymaps/meson.build         | 151 ++++++++
 utils/libcecutil/meson.build                  |  45 +++
 utils/libmedia_dev/meson.build                |  14 +
 utils/libv4l2util/meson.build                 |  16 +
 utils/media-ctl/meson.build                   |  43 +++
 utils/meson.build                             |  46 +++
 utils/qv4l2/meson.build                       |  80 +++++
 utils/qvidcap/meson.build                     |  82 +++++
 utils/rds-ctl/meson.build                     |  13 +
 utils/v4l2-compliance/meson.build             |  58 +++
 utils/v4l2-ctl/meson.build                    |  75 ++++
 utils/v4l2-dbg/meson.build                    |  16 +
 utils/v4l2-sysfs-path/meson.build             |  14 +
 v4l-utils-po/meson.build                      |   3 +
 46 files changed, 2270 insertions(+), 16 deletions(-)
 create mode 100644 INSTALL.meson.md
 create mode 100644 contrib/cobalt-ctl/meson.build
 create mode 100644 contrib/decode_tm6000/meson.build
 create mode 100644 contrib/gconv/meson.build
 create mode 100644 contrib/meson.build
 create mode 100644 contrib/rds-saa6588/meson.build
 create mode 100644 contrib/test/meson.build
 create mode 100644 contrib/xc3028-firmware/meson.build
 create mode 100644 lib/libdvbv5/meson.build
 create mode 100644 lib/libv4l-mplane/meson.build
 create mode 100644 lib/libv4l1/meson.build
 create mode 100644 lib/libv4l2/meson.build
 create mode 100644 lib/libv4l2rds/meson.build
 create mode 100644 lib/libv4lconvert/meson.build
 create mode 100644 lib/meson.build
 create mode 100644 libdvbv5-po/meson.build
 create mode 100644 meson.build
 create mode 100644 meson_options.txt
 create mode 100644 utils/cec-compliance/meson.build
 create mode 100644 utils/cec-ctl/meson.build
 create mode 100644 utils/cec-follower/meson.build
 create mode 100644 utils/cx18-ctl/meson.build
 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
 create mode 100644 utils/ir-ctl/meson.build
 create mode 100644 utils/ivtv-ctl/meson.build
 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
 create mode 100644 utils/libcecutil/meson.build
 create mode 100644 utils/libmedia_dev/meson.build
 create mode 100644 utils/libv4l2util/meson.build
 create mode 100644 utils/media-ctl/meson.build
 create mode 100644 utils/meson.build
 create mode 100644 utils/qv4l2/meson.build
 create mode 100644 utils/qvidcap/meson.build
 create mode 100644 utils/rds-ctl/meson.build
 create mode 100644 utils/v4l2-compliance/meson.build
 create mode 100644 utils/v4l2-ctl/meson.build
 create mode 100644 utils/v4l2-dbg/meson.build
 create mode 100644 utils/v4l2-sysfs-path/meson.build
 create mode 100644 v4l-utils-po/meson.build
.gitignore +1 -0
index f899ecfc..7c900fe5 100644
@@ -61,3 +61,4 @@ v4l-utils-po/[email protected]
 v4l-utils-po/insert-header.sin
 v4l-utils-po/quot.sed
 v4l-utils-po/remove-potcdate.sin
+build/
INSTALL.meson.md new file +142 -0

142 lines not on this page · raw message

README.md +67 -16

167 lines not on this page · raw message

contrib/cobalt-ctl/meson.build new file +8 -0
new file mode 100644
index 00000000..f76fcba3
@@ -0,0 +1,8 @@
+cobalt_ctl_sources = files(
+    'cobalt-ctl.c',
+    's-record.c',
+)
+
+cobalt_ctl = executable('cobalt-ctl',
+                        cobalt_ctl_sources,
+                        include_directories : v4l2_utils_incdir)
contrib/decode_tm6000/meson.build new file +14 -0
new file mode 100644
index 00000000..5147278b
@@ -0,0 +1,14 @@
+decode_tm6000_sources = files(
+    'decode_tm6000.c',
+)
+
+decode_tm6000_deps = [
+    dep_argp,
+    dep_libv4l2util,
+]
+
+decode_tm6000 = executable('decode_tm6000',
+                           decode_tm6000_sources,
+                           install : true,
+                           dependencies: decode_tm6000_deps,
+                           include_directories : v4l2_utils_incdir)
contrib/gconv/meson.build new file +44 -0

44 lines not on this page · raw message

contrib/meson.build new file +13 -0
new file mode 100644
index 00000000..e3aa05ac
@@ -0,0 +1,13 @@
+if host_machine.system() == 'linux'
+    subdir('test')
+    subdir('xc3028-firmware')
+    if have_i2c_dev
+        subdir('rds-saa6588')
+    endif
+endif
+
+subdir('decode_tm6000')
+
+if have_gconv
+    subdir('gconv', if_found : [dep_jis, dep_jisx0213])
+endif
contrib/rds-saa6588/meson.build new file +7 -0
new file mode 100644
index 00000000..037d2e20
@@ -0,0 +1,7 @@
+rds_saa6588_sources = files(
+    'rds-saa6588.c',
+)
+
+rds_saa6588 = executable('rds-saa6588',
+                         rds_saa6588_sources,
+                         include_directories : v4l2_utils_incdir)
contrib/test/meson.build new file +143 -0

143 lines not on this page · raw message

contrib/xc3028-firmware/meson.build new file +11 -0
new file mode 100644
index 00000000..a86e02d4
@@ -0,0 +1,11 @@
+xc3028_firmware_sources = files(
+    'extract_head.h',
+    'firmware-tool.c',
+    'standards.c',
+    'standards.h',
+    'tuner-xc2028-types.h',
+)
+
+xc3028_firmware = executable('xc3028-firmware',
+                             xc3028_firmware_sources,
+                             include_directories : v4l2_utils_incdir)
lib/libdvbv5/meson.build new file +159 -0

159 lines not on this page · raw message

lib/libv4l-mplane/meson.build new file +23 -0
new file mode 100644
index 00000000..0e0e558b
@@ -0,0 +1,23 @@
+libv4l_mplane_sources = files(
+    'libv4l-mplane.c',
+)
+
+libv4l_mplane_deps = [
+    dep_threads,
+]
+
+libv4l_mplane_c_args = []
+
+if have_visibility
+    libv4l_mplane_c_args += ['-fvisibility=hidden']
+endif
+
+libv4l_mplane = shared_module('v4l-mplane',
+                              libv4l_mplane_sources,
+                              install : true,
+                              install_dir : libv4l2plugindir,
+                              dependencies : libv4l_mplane_deps,
+                              c_args : libv4l_mplane_c_args,
+                              include_directories : v4l2_utils_incdir)
+
+dep_libv4l_mplane = declare_dependency(link_with : libv4l_mplane)
lib/libv4l1/meson.build new file +62 -0

62 lines not on this page · raw message

lib/libv4l2/meson.build new file +71 -0

71 lines not on this page · raw message

lib/libv4l2rds/meson.build new file +37 -0
new file mode 100644
index 00000000..338a97f8
@@ -0,0 +1,37 @@
+libv4l2rds_sources = files(
+    'libv4l2rds.c',
+)
+
+libv4l2rds_api = files(
+    '../include/libv4l2rds.h',
+)
+
+install_headers(libv4l2rds_api)
+
+libv4l2rds_deps = [
+    dep_threads,
+]
+
+libv4l2rds_c_args = []
+
+if have_visibility
+    libv4l2rds_c_args += ['-fvisibility=hidden']
+endif
+
+libv4l2rds = library('v4l2rds',
+                     libv4l2rds_sources,
+                     soversion: '0',
+                     version: '0.0.0',
+                     install : true,
+                     dependencies : libv4l2rds_deps,
+                     c_args : libv4l2rds_c_args,
+                     include_directories : v4l2_utils_incdir)
+
+dep_libv4l2rds = declare_dependency(link_with : libv4l2rds)
+meson.override_dependency('libv4l2rds', dep_libv4l2rds)
+
+pkg.generate(
+    libv4l2rds,
+    name : 'libv4l2rds',
+    version : meson.project_version(),
+    description : 'v4l2 RDS decode library')
lib/libv4lconvert/meson.build new file +117 -0

117 lines not on this page · raw message

lib/meson.build new file +11 -0
new file mode 100644
index 00000000..47cee16d
@@ -0,0 +1,11 @@
+libv4l2plugindir = get_option('prefix') / get_option('libdir') / get_option('libv4l2subdir') / 'plugins'
+
+subdir('libdvbv5')
+subdir('libv4lconvert')
+subdir('libv4l2')
+subdir('libv4l1')
+subdir('libv4l2rds')
+
+if get_option('v4l-plugins')
+    subdir('libv4l-mplane')
+endif
libdvbv5-po/meson.build new file +3 -0
new file mode 100644
index 00000000..e382651e
@@ -0,0 +1,3 @@
+i18n.gettext('libdvbv5',
+    args : i18n_gettext_arguments,
+)
meson.build new file +331 -0

331 lines not on this page · raw message

meson_options.txt new file +42 -0

42 lines not on this page · raw message

utils/cec-compliance/meson.build new file +22 -0
new file mode 100644
index 00000000..6e15fcfd
@@ -0,0 +1,22 @@
+cec_compliance_sources = files(
+    'cec-compliance.cpp',
+    'cec-compliance.h',
+    'cec-test-adapter.cpp',
+    'cec-test-audio.cpp',
+    'cec-test-fuzzing.cpp',
+    'cec-test-power.cpp',
+    'cec-test.cpp',
+)
+
+cec_compliance_deps = [
+    dep_libcecutil,
+    dep_librt,
+]
+
+cec_compliance = executable('cec-compliance',
+                            cec_compliance_sources,
+                            install : true,
+                            dependencies : cec_compliance_deps,
+                            include_directories : v4l2_utils_incdir)
+
+man_pages += [[ meson.current_source_dir(), 'cec-compliance', 1 ]]
utils/cec-ctl/meson.build new file +18 -0
new file mode 100644
index 00000000..059ca206
@@ -0,0 +1,18 @@
+cec_ctl_sources = files(
+    'cec-ctl.cpp',
+    'cec-ctl.h',
+    'cec-pin.cpp',
+)
+
+cec_ctl_deps = [
+    dep_libcecutil,
+    dep_librt,
+]
+
+cec_ctl = executable('cec-ctl',
+                     cec_ctl_sources,
+                     install : true,
+                     dependencies : cec_ctl_deps,
+                     include_directories : v4l2_utils_incdir)
+
+man_pages += [[ meson.current_source_dir(), 'cec-ctl', 1 ]]
utils/cec-follower/meson.build new file +19 -0
new file mode 100644
index 00000000..2d58fac4
@@ -0,0 +1,19 @@
+cec_follower_sources = files(
+    'cec-follower.cpp',
+    'cec-follower.h',
+    'cec-processing.cpp',
+    'cec-tuner.cpp',
+)
+
+cec_follower_deps = [
+    dep_libcecutil,
+    dep_librt,
+]
+
+cec_follower = executable('cec-follower',
+                          cec_follower_sources,
+                          install : true,
+                          dependencies : cec_follower_deps,
+                          include_directories : v4l2_utils_incdir)
+
+man_pages += [[ meson.current_source_dir(), 'cec-follower', 1 ]]
utils/cx18-ctl/meson.build new file +8 -0
new file mode 100644
index 00000000..161b91c9
@@ -0,0 +1,8 @@
+cx18_ctl_sources = files(
+    'cx18-ctl.c',
+)
+
+cx18_ctl = executable('cx18-ctl',
+                      cx18_ctl_sources,
+                      install : true,
+                      include_directories : v4l2_utils_incdir)
utils/dvb/meson.build new file +70 -0

70 lines not on this page · raw message

utils/gen_media_bus_format_codes.sh new file +7 -0
new file mode 100755
index 00000000..4bdcc3b7
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+src="$1"
+
+sed -e \
+'/#define MEDIA_BUS_FMT/ ! d; s/.*#define //; /FIXED/ d; s/\t.*//; s/.*/ &,/;' \
+${src}
utils/gen_media_bus_format_names.sh new file +7 -0
new file mode 100755
index 00000000..3fdc830d
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+src="$1"
+
+sed -e \
+'/#define MEDIA_BUS_FMT/ ! d; s/.*FMT_//; /FIXED/ d; s/\t.*//; s/.*/{ \"&\", MEDIA_BUS_FMT_& },/;' \
+${src}
utils/ir-ctl/meson.build new file +23 -0
new file mode 100644
index 00000000..24d73a15
@@ -0,0 +1,23 @@
+ir_ctl_sources = files(
+    'bpf_encoder.c',
+    'bpf_encoder.h',
+    'ir-ctl.c',
+    'ir-encode.c',
+    'ir-encode.h',
+    'keymap.c',
+    'keymap.h',
+    'toml.c',
+    'toml.h',
+)
+
+ir_ctl_deps =  [
+    dep_argp,
+]
+
+ir_ctl = executable('ir-ctl',
+                    ir_ctl_sources,
+                    install : true,
+                    dependencies : ir_ctl_deps,
+                    include_directories : v4l2_utils_incdir)
+
+man_pages += [[ meson.current_source_dir(), 'ir-ctl', 1 ]]
utils/ivtv-ctl/meson.build new file +13 -0
new file mode 100644
index 00000000..410a8439
@@ -0,0 +1,13 @@
+ivtv_ctl_sources = files(
+    'ivtv-ctl.c',
+)
+
+ivtv_ctl_deps = [
+    dep_libm,
+]
+
+ivtv_ctl = executable('ivtv-ctl',
+                      ivtv_ctl_sources,
+                      install : true,
+                      dependencies : ivtv_ctl_deps,
+                      include_directories : v4l2_utils_incdir)
utils/keytable/bpf_protocols/clang_sys_includes.sh new file +9 -0
new file mode 100755
index 00000000..9dc4af12
@@ -0,0 +1,9 @@
+#!/bin/sh
+# Get Clang's default includes on this system, as opposed to those seen by
+# '-target bpf'. This fixes "missing" files on some architectures/distros,
+# such as asm/byteorder.h, asm/socket.h, asm/sockios.h, sys/cdefs.h etc.
+#
+# Use '-idirafter': Don't interfere with include mechanics except where the
+# build would have failed anyways.
+$CLANG -v -E - </dev/null 2>&1 \
+	| sed -n '/<...> search starts here:/,/End of search list./{ s| \(/.*\)|-idirafter \1|p }'
utils/keytable/bpf_protocols/meson.build new file +31 -0
new file mode 100644
index 00000000..b079df8e
@@ -0,0 +1,31 @@
+bpf_protocols_files = [
+    'grundig',
+    'imon_rsc',
+    'manchester',
+    'pulse_distance',
+    'pulse_length',
+    'raw',
+    'rc_mm',
+    'samsung36',
+    'xbox-dvd',
+]
+
+clang_sys_includes = run_command('clang_sys_includes.sh',
+                                 check : true,
+                                 env : ['CLANG=' + prog_clang.full_path()])
+
+foreach file : bpf_protocols_files
+    output = file + '.o'
+    input = file + '.c'
+    custom_target(output,
+                  output : output,
+                  input : input,
+                  command : [
+                      prog_clang.full_path(),
+                      clang_sys_includes.stdout().split(),
+                      '-D__linux__', '-target', 'bpf', '-O2',
+                      '-c', '@INPUT@', '-o', '@OUTPUT@',
+                  ],
+                  install : true,
+                  install_dir : ir_keytable_system_dir / 'rc_keymaps' / 'protocols')
+endforeach
utils/keytable/meson.build new file +81 -0

81 lines not on this page · raw message

utils/keytable/rc_keymaps/meson.build new file +151 -0

151 lines not on this page · raw message

utils/libcecutil/meson.build new file +45 -0

45 lines not on this page · raw message

utils/libmedia_dev/meson.build new file +14 -0
new file mode 100644
index 00000000..f97238e6
@@ -0,0 +1,14 @@
+libmedia_dev_sources = files(
+    'get_media_devices.c',
+    'get_media_devices.h',
+)
+
+libmedia_dev = static_library('media_dev',
+                              libmedia_dev_sources,
+                              install : false,
+                              include_directories : v4l2_utils_incdir)
+
+dep_libmedia_dev = declare_dependency(
+    link_with : libmedia_dev,
+    include_directories : '.',
+)
utils/libv4l2util/meson.build new file +16 -0
new file mode 100644
index 00000000..9d1c6e12
@@ -0,0 +1,16 @@
+libv4l2util_sources = files(
+    'frequencies.c',
+    'libv4l2util.h',
+    'v4l2_driver.c',
+    'v4l2_driver.h',
+)
+
+libv4l2util = static_library('v4l2util',
+                             libv4l2util_sources,
+                             install : false,
+                             include_directories : v4l2_utils_incdir)
+
+dep_libv4l2util = declare_dependency(
+    link_with : libv4l2util,
+    include_directories : '.',
+)
utils/media-ctl/meson.build new file +43 -0

43 lines not on this page · raw message

utils/meson.build new file +46 -0

46 lines not on this page · raw message

utils/qv4l2/meson.build new file +80 -0

80 lines not on this page · raw message

utils/qvidcap/meson.build new file +82 -0

82 lines not on this page · raw message

utils/rds-ctl/meson.build new file +13 -0
new file mode 100644
index 00000000..be797035
@@ -0,0 +1,13 @@
+rds_ctl_sources = files(
+    'rds-ctl.cpp',
+)
+
+rds_ctl_deps = [
+    dep_libv4l2rds,
+]
+
+rds_ctl = executable('rds-ctl',
+                     rds_ctl_sources,
+                     install : true,
+                     dependencies : rds_ctl_deps,
+                     include_directories : v4l2_utils_incdir)
utils/v4l2-compliance/meson.build new file +58 -0

58 lines not on this page · raw message

utils/v4l2-ctl/meson.build new file +75 -0

75 lines not on this page · raw message

utils/v4l2-dbg/meson.build new file +16 -0
new file mode 100644
index 00000000..5c721592
@@ -0,0 +1,16 @@
+v4l2_dbg_sources = files(
+    'v4l2-dbg-ac97.h',
+    'v4l2-dbg-bttv.h',
+    'v4l2-dbg-em28xx.h',
+    'v4l2-dbg-micron.h',
+    'v4l2-dbg-saa7134.h',
+    'v4l2-dbg-tvp5150.h',
+    'v4l2-dbg.cpp',
+    'v4l2-dbg.h',
+)
+
+v4l2_dbg = executable('v4l2-dbg',
+                      v4l2_dbg_sources,
+                      install : true,
+                      install_dir : 'sbin',
+                      include_directories : v4l2_utils_incdir)
utils/v4l2-sysfs-path/meson.build new file +14 -0
new file mode 100644
index 00000000..5a74af12
@@ -0,0 +1,14 @@
+v4l2_sysfs_path_sources = files(
+    'v4l2-sysfs-path.c',
+)
+
+v4l2_sysfs_path_deps = [
+    dep_argp,
+    dep_libmedia_dev,
+]
+
+v4l2_sysfs_path = executable('v4l2-sysfs-path',
+                             v4l2_sysfs_path_sources,
+                             install : true,
+                             dependencies : v4l2_sysfs_path_deps,
+                             include_directories : v4l2_utils_incdir)
v4l-utils-po/meson.build new file +3 -0
new file mode 100644
index 00000000..4fad42eb
@@ -0,0 +1,3 @@
+i18n.gettext('v4l-utils',
+    args : i18n_gettext_arguments,
+)
Signature · 1 line
2.30.2
#3 lore raw

PATCH v5 3/5 Copy Doxygen configuration file to doc/

In reply to Ariel D'Alessandro

Autotools m4 scripts are using the following Doxygen template file:
doxygen_libdvbv5.cfg. In order to support Doxygen documentation in meson a different template file is needed, as the syntax for variable substitution is not shared between the two build systems. While m4 uses $(variable), meson supports ${variable} and @variable@, see [0].

Let's create a copy of the Doxygen documentation configuration file doxygen_libdvbv5.cfg, so it can be customized for meson.

[0] https://mesonbuild.com/Reference-manual.html#configure_file

---
 doc/Doxyfile.in | 2352 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 2352 insertions(+)
 create mode 100644 doc/Doxyfile.in
doc/Doxyfile.in new file +2352 -0
new file mode 100644
index 00000000..b25301a0
@@ -0,0 +1,2352 @@
+# Doxyfile 1.8.6
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
+# for the list of possible encodings.
+# The default value is: UTF-8.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
+
+PROJECT_NAME           = libdvbv5
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
+
+PROJECT_NUMBER         = $(VERSION)
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          = "Library to work with Digital TV devices on Linux"
+
+# With the PROJECT_LOGO tag one can specify an logo or icon that is included in
+# the documentation. The maximum height of the logo should not exceed 55 pixels
+# and the maximum width should not exceed 200 pixels. Doxygen will copy the logo
+# to the output directory.
+
+PROJECT_LOGO           =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = $(DOCDIR)
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
+
+CREATE_SUBDIRS         = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+# The default value is: YES.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
+
+ABBREVIATE_BRIEF       =
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# doxygen will generate a detailed section even if there is only a brief
+# description.
+# The default value is: NO.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+# The default value is: NO.
+
+INLINE_INHERITED_MEMB  = YES
+
+# If the FULL_PATH_NAMES tag is set to YES doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
+
+FULL_PATH_NAMES        = YES
+
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
+
+STRIP_FROM_PATH        = $(SRCDIR)
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
+
+STRIP_FROM_INC_PATH    =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
+
+JAVADOC_AUTOBRIEF      = YES
+
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce a
+# new page for each member. If set to NO, the documentation of a member will be
+# part of the file/class/namespace that contains it.
+# The default value is: NO.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
+
+TAB_SIZE               = 8
+
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines.
+
+ALIASES                =
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
+
+TCL_SUBST              =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_FOR_C  = YES
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL. For instance to make
+# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C
+# (default is Fortran), use: inc=Fortran f=C.
+#
+# Note For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen.
+
+EXTENSION_MAPPING      =
+
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT       = YES
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by by putting a % sign in front of the word
+# or globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+# The default value is: NO.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+# The default value is: NO.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
+
+SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
+
+LOOKUP_CACHE_SIZE      = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
+
+EXTRACT_ALL            = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIVATE        = YES
+
+# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
+
+EXTRACT_STATIC         = YES
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. When set to YES local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO only methods in the interface are
+# included.
+# The default value is: NO.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO these classes will be included in the various overviews. This option has
+# no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# (class|struct|union) declarations. If set to NO these declarations will be
+# included in the documentation.
+# The default value is: NO.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+# The default value is: system dependent.
+
+CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES the
+# scope will be hidden.
+# The default value is: NO.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO the members will appear in declaration order.
+# The default value is: YES.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable ( YES) or disable ( NO) the
+# todo list. This list is created by putting \todo commands in the
+# documentation.
+# The default value is: YES.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable ( YES) or disable ( NO) the
+# test list. This list is created by putting \test commands in the
+# documentation.
+# The default value is: YES.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable ( YES) or disable ( NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable ( YES) or disable ( NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
+
+ENABLED_SECTIONS       =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
+
+MAX_INITIALIZER_LINES  = 0
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES the list
+# will mention the files that were used to generate the documentation.
+# The default value is: YES.
+
+SHOW_USED_FILES        = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
+
+FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
+
+LAYOUT_FILE            =
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. Do not use file names with spaces, bibtex cannot handle them. See
+# also \cite for info how to create references.
+
+CITE_BIB_FILES         =
+
+#---------------------------------------------------------------------------
+# Configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
+
+QUIET                  = YES
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
+
+WARNINGS               = YES
+
+# If the WARN_IF_UNDOCUMENTED tag is set to YES, then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO doxygen will only warn about wrong or incomplete parameter
+# documentation, but not about the absence of documentation.
+# The default value is: NO.
+
+WARN_NO_PARAMDOC       = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
+
+WARN_LOGFILE           =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces.
+# Note: If this tag is empty the current directory is searched.
+
+INPUT                  = $(SRCDIR)/doc/libdvbv5-index.doc \
+			 $(SRCDIR)/lib/include/libdvbv5/dvb-demux.h \
+			 $(SRCDIR)/lib/include/libdvbv5/dvb-dev.h \
+			 $(SRCDIR)/lib/include/libdvbv5/dvb-fe.h \
+			 $(SRCDIR)/lib/include/libdvbv5/dvb-file.h \
+			 $(SRCDIR)/lib/include/libdvbv5/dvb-log.h \
+			 $(SRCDIR)/lib/include/libdvbv5/dvb-sat.h \
+			 $(SRCDIR)/lib/include/libdvbv5/dvb-scan.h \
+			 $(SRCDIR)/lib/include/libdvbv5/dvb-v5-std.h \
+			 $(SRCDIR)/lib/include/libdvbv5/descriptors.h \
+			 $(SRCDIR)/lib/include/libdvbv5/header.h \
+			 $(SRCDIR)/lib/include/libdvbv5/atsc_header.h \
+			 $(SRCDIR)/lib/include/libdvbv5/atsc_eit.h \
+			 $(SRCDIR)/lib/include/libdvbv5/cat.h \
+			 $(SRCDIR)/lib/include/libdvbv5/eit.h \
+			 $(SRCDIR)/lib/include/libdvbv5/mgt.h \
+			 $(SRCDIR)/lib/include/libdvbv5/nit.h \
+			 $(SRCDIR)/lib/include/libdvbv5/pat.h \
+			 $(SRCDIR)/lib/include/libdvbv5/pmt.h \
+			 $(SRCDIR)/lib/include/libdvbv5/sdt.h \
+			 $(SRCDIR)/lib/include/libdvbv5/vct.h \
+			 $(SRCDIR)/lib/include/libdvbv5/crc32.h \
+			 $(SRCDIR)/lib/include/libdvbv5/countries.h \
+			 $(SRCDIR)/lib/include/libdvbv5/mpeg_es.h \
+			 $(SRCDIR)/lib/include/libdvbv5/mpeg_pes.h \
+			 $(SRCDIR)/lib/include/libdvbv5/mpeg_ts.h \
+			 $(SRCDIR)/lib/include/libdvbv5/desc_atsc_service_location.h \
+			 $(SRCDIR)/lib/include/libdvbv5/desc_ca.h \
+			 $(SRCDIR)/lib/include/libdvbv5/desc_ca_identifier.h \
+			 $(SRCDIR)/lib/include/libdvbv5/desc_cable_delivery.h \
+			 $(SRCDIR)/lib/include/libdvbv5/desc_event_extended.h \
+			 $(SRCDIR)/lib/include/libdvbv5/desc_event_short.h \
+			 $(SRCDIR)/lib/include/libdvbv5/desc_extension.h \
+			 $(SRCDIR)/lib/include/libdvbv5/desc_descriptor_id.h \
+			 $(SRCDIR)/lib/include/libdvbv5/desc_frequency_list.h \
+			 $(SRCDIR)/lib/include/libdvbv5/desc_hierarchy.h \
+			 $(SRCDIR)/lib/include/libdvbv5/desc_isdbt_delivery.h \
+			 $(SRCDIR)/lib/include/libdvbv5/desc_language.h \
+			 $(SRCDIR)/lib/include/libdvbv5/desc_logical_channel.h \
+			 $(SRCDIR)/lib/include/libdvbv5/desc_network_name.h \
+			 $(SRCDIR)/lib/include/libdvbv5/desc_partial_reception.h \
+			 $(SRCDIR)/lib/include/libdvbv5/desc_sat.h \
+			 $(SRCDIR)/lib/include/libdvbv5/desc_service.h \
+			 $(SRCDIR)/lib/include/libdvbv5/desc_t2_delivery.h \
+			 $(SRCDIR)/lib/include/libdvbv5/desc_terrestrial_delivery.h \
+			 $(SRCDIR)/lib/include/libdvbv5/desc_ts_info.h \
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see: http://www.gnu.org/software/libiconv) for the list of
+# possible encodings.
+# The default value is: UTF-8.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank the
+# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii,
+# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp,
+# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown,
+# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
+# *.qsf, *.as and *.js.
+
+FILE_PATTERNS          =
+
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
+
+RECURSIVE              = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
+EXCLUDE                =
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+# The default value is: NO.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       =
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
+
+EXCLUDE_SYMBOLS        =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
+
+EXAMPLE_PATH           = $(SRCDIR)/utils/dvb/
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
+
+EXAMPLE_PATTERNS       =
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
+
+IMAGE_PATH             =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
+
+INPUT_FILTER           =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
+
+FILTER_PATTERNS        =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER ) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
+
+FILTER_SOURCE_FILES    = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
+
+FILTER_SOURCE_PATTERNS =
+
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE =
+
+#---------------------------------------------------------------------------
+# Configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
+
+SOURCE_BROWSER         = YES
+
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# function all documented functions referencing it will be listed.
+# The default value is: NO.
+
+REFERENCED_BY_RELATION = YES
+
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
+
+REFERENCES_RELATION    = YES
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES, then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see http://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
+
+VERBATIM_HEADERS       = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
+
+ALPHABETICAL_INDEX     = YES
+
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
+# which the alphabetical index list will be split.
+# Minimum value: 1, maximum value: 20, default value: 5.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+IGNORE_PREFIX          =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES doxygen will generate HTML output
+# The default value is: YES.
+
+GENERATE_HTML          = $(GENERATE_HTML)
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_HEADER            =
+
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FOOTER            =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_STYLESHEET        =
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional user-
+# defined cascading style sheet that is included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefor more robust against future updates.
+# Doxygen will copy the style sheet file to the output directory. For an example
+# see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET  =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_FILES       =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the stylesheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_TIMESTAMP         = NO
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see: http://developer.apple.com/tools/xcode/), introduced with
+# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_DOCSET        = NO
+
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_HTMLHELP      = $(GENERATE_HTMLHELP)
+
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
+# written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_FILE               = ../$(PROJECT).chm
+
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler ( hhc.exe). If non-empty
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+HHC_LOCATION           = $(HHC_PATH)
+
+# The GENERATE_CHI flag controls if a separate .chi index file is generated (
+# YES) or that it should be included in the master .chm file ( NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+GENERATE_CHI           = $(GENERATE_CHI)
+
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index ( hhk), content ( hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_INDEX_ENCODING     =
+
+# The BINARY_TOC flag controls whether a binary table of contents is generated (
+# YES) or a normal table of contents ( NO) in the .chm file.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+TOC_EXPAND             = YES
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QCH_FILE               =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
+# folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_NAME   =
+
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_ATTRS  =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_SECT_FILTER_ATTRS  =
+
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHG_LOCATION           =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+DISABLE_INDEX          = NO
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom stylesheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_TREEVIEW      = YES
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+TREEVIEW_WIDTH         = 250
+
+# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# http://www.mathjax.org) which uses client side Javascript for the rendering
+# instead of using prerendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. See the MathJax site (see:
+# http://docs.mathjax.org/en/latest/output.html) for more details.
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility), NativeMML (i.e. MathML) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from http://www.mathjax.org before deployment.
+# The default value is: http://cdn.mathjax.org/mathjax/latest.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_EXTENSIONS     =
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE       =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SEARCHENGINE           = NO
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using Javascript. There
+# are two flavours of web server based searching depending on the
+# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for
+# searching and an index file used by the script. When EXTERNAL_SEARCH is
+# enabled the indexing and searching needs to be provided by external tools. See
+# the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SERVER_BASED_SEARCH    = NO
+
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer ( doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer ( doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/). See the section "External Indexing and
+# Searching" for details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL       =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID     =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS  =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES doxygen will generate LaTeX output.
+# The default value is: YES.
+
+GENERATE_LATEX         = $(GENERATE_LATEX)
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked.
+#
+# Note that when enabling USE_PDFLATEX this option is only used for generating
+# bitmaps for formulas in the HTML output, but not in the Makefile that is
+# written to the output directory.
+# The default file is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_CMD_NAME         =
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+MAKEINDEX_CMD_NAME     =
+
+# If the COMPACT_LATEX tag is set to YES doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+COMPACT_LATEX          = YES
+
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PAPER_TYPE             = $(PAPER_SIZE)
+
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. To get the times font for
+# instance you can specify
+# EXTRA_PACKAGES=times
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber. Doxygen will
+# replace them by respectively the title of the page, the current date and time,
+# only the current date, the version number of doxygen, the project name (see
+# PROJECT_NAME), or the project number (see PROJECT_NUMBER).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HEADER           =
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_FOOTER           =
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_FILES      =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PDF_HYPERLINKS         = YES
+
+# If the LATEX_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES to get a
+# higher quality PDF documentation.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+USE_PDFLATEX           = $(GENERATE_PDF)
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BATCHMODE        = YES
+
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HIDE_INDICES     = NO
+
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_SOURCE_CODE      = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BIB_STYLE        = plain
+
+#---------------------------------------------------------------------------
+# Configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
+
+GENERATE_RTF           = $(GENERATE_RTF)
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+COMPACT_RTF            = YES
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's config
+# file, i.e. a series of assignments. You only have to provide replacements,
+# missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_STYLESHEET_FILE    =
+
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's config file. A template extensions file can be generated
+# using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_EXTENSIONS_FILE    =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
+
+GENERATE_MAN           = $(GENERATE_MAN)
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_EXTENSION          = .3
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
+
+GENERATE_XML           = $(GENERATE_XML)
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_OUTPUT             = xml
+
+# The XML_SCHEMA tag can be used to specify a XML schema, which can be used by a
+# validating XML parser to check the syntax of the XML files.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_SCHEMA             =
+
+# The XML_DTD tag can be used to specify a XML DTD, which can be used by a
+# validating XML parser to check the syntax of the XML files.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_DTD                =
+
+# If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_DOCBOOK tag is set to YES doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
+GENERATE_DOCBOOK       = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT         = docbook
+
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES doxygen will generate an AutoGen
+# Definitions (see http://autogen.sf.net) file that captures the structure of
+# the code including all documentation. Note that this feature is still
+# experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES doxygen will expand all macro names
+# in the source code. If set to NO only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+MACRO_EXPANSION        = YES
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_ONLY_PREDEF     = YES
+
+# If the SEARCH_INCLUDES tag is set to YES the includes files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
+
+INCLUDE_PATH           = .
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+INCLUDE_FILE_PATTERNS  =
+
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+PREDEFINED             = _DOXYGEN \
+			 __attribute__(x)= \
+			 __cdecl=
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_AS_DEFINED      = EASY_TYPE \
+                         EASY_DESTRUCTOR \
+                         EASY_METHOD
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all refrences to function-like macros that are alone on a line, have an
+# all uppercase name, and do not end with a semicolon. Such function macros are
+# typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have an unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
+
+TAGFILES               =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
+
+GENERATE_TAGFILE       = $(DOCDIR)/$(PROJECT).tag
+
+# If the ALLEXTERNALS tag is set to YES all external class will be listed in the
+# class index. If set to NO only the inherited external classes will be listed.
+# The default value is: NO.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed in
+# the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
+
+EXTERNAL_GROUPS        = YES
+
+# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES         = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of 'which perl').
+# The default file (with absolute path) is: /usr/bin/perl.
+
+PERL_PATH              = /usr/bin/false
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
+# powerful graphs.
+# The default value is: YES.
+
+CLASS_DIAGRAMS         = YES
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see:
+# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH            =
+
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH               =
+
+# If set to YES, the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: NO.
+
+HAVE_DOT               = $(HAVE_DOT)
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NUM_THREADS        = 0
+
+# When you want a differently looking font n the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTNAME           = Helvetica
+
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTPATH           =
+
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LOOK               = NO
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+TEMPLATE_RELATIONS     = YES
+
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDE_GRAPH          = YES
+
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot.
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, jpg, gif and svg.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_IMAGE_FORMAT       = png
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INTERACTIVE_SVG        = NO
+
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_PATH               = $(DOT_PATH)
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOTFILE_DIRS           =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS           =
+
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS           =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_MULTI_TARGETS      = NO
+
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES doxygen will remove the intermediate dot
+# files that are used to generate the various graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_CLEANUP            = YES
Signature · 1 line
2.30.2
#4 lore raw

PATCH v5 4/5 meson: Add support for doxygen documentation

In reply to Ariel D'Alessandro

Supports generating plain HTML documentation and manual pages using Doxygen.

Note that Doxygen configuration template was a copy from the one used by autotools. This commit updates variables to match meson variable substitution format, while keeping only options required for HTML and man pages.

---
 README.md         |   3 ++
 doc/Doxyfile.in   | 128 +++++++++++++++++++++++-----------------------
 doc/meson.build   |  34 ++++++++++++
 meson.build       |   3 ++
 meson_options.txt |   8 +++
 5 files changed, 112 insertions(+), 64 deletions(-)
 create mode 100644 doc/meson.build
README.md +3 -0
index a4ff7511..9cb316c8 100644
@@ -198,6 +198,9 @@ the package with autotools, running:
 make doxygen-run
 ```
 
+In meson, Doxygen documentation is enabled by the auto feature: `doxygen-doc`.
+If enabled, it will be built within the project.
+
 It is possible to generate documentation in html, man pages and pdf formats.
 
 The documentation is also available via web, at:
doc/Doxyfile.in +64 -64

242 lines not on this page · raw message

doc/meson.build new file +34 -0
new file mode 100644
index 00000000..fef3e83f
@@ -0,0 +1,34 @@
+doxygen_doc_option = get_option('doxygen-doc')
+if doxygen_doc_option.disabled() or not prog_doxygen.found()
+    subdir_done()
+endif
+
+cdata = configuration_data()
+cdata.set('DOCDIR', 'doc')
+cdata.set('GENERATE_HTML', get_option('doxygen-html'))
+cdata.set('GENERATE_MAN', get_option('doxygen-man'))
+cdata.set('PROJECT', meson.project_name())
+cdata.set('SRCDIR', meson.project_source_root())
+cdata.set('VERSION', as_version)
+
+doxyfile = configure_file(input : 'Doxyfile.in',
+                          output : 'Doxyfile',
+                          configuration : cdata)
+
+doxygen_install_dir = join_paths(get_option('datadir'), 'doc',
+                                 '@0@'.format(meson.project_name()))
+
+doxygen_output = []
+if get_option('doxygen-html')
+    doxygen_output += 'html'
+endif
+if get_option('doxygen-man')
+    doxygen_output += 'man'
+endif
+
+custom_target('doxygen',
+              input : doxyfile,
+              output : doxygen_output,
+              command : [prog_doxygen, doxyfile],
+              install : true,
+              install_dir : doxygen_install_dir)
meson.build +3 -0
index bad3ce00..bba8e030 100644
@@ -56,6 +56,7 @@ v4l2_utils_incdir = include_directories(v4l2_utils_incdir_arr)
 
 prog_bash = find_program('bash')
 prog_clang = find_program('clang', required : get_option('bpf'))
+prog_doxygen = find_program('doxygen', required : get_option('doxygen-doc'))
 prog_git = find_program('git')
 prog_grep = find_program('grep')
 prog_perl = find_program('perl')
@@ -321,6 +322,8 @@ if get_option('v4l-utils')
     subdir('contrib')
 endif
 
+subdir('doc')
+
 configure_file(output : 'config.h', configuration : conf)
 
 foreach m : man_pages
meson_options.txt +8 -0
index d1119990..2c86bfbb 100644
@@ -40,3 +40,11 @@ option('systemdsystemunitdir', type : 'string',
        description : 'Set systemd system unit directory')
 option('udevdir', type : 'string',
        description : 'Set udev directory')
+
+# Doxygen options
+option('doxygen-doc', type : 'feature', value : 'auto',
+       description : 'Generate doxygen project documentation')
+option('doxygen-html', type : 'boolean',
+       description : 'Generate doxygen plain HTML documentation')
+option('doxygen-man', type : 'boolean', value : false,
+       description : 'Generate doxygen manual pages')
Signature · 1 line
2.30.2
#5 lore raw

PATCH v5 5/5 Makefile.am: Distribute meson related files

In reply to Ariel D'Alessandro

Several files have been introduced by meson support. Add these files to be distributed by autotools.

---
 Makefile.am                              | 5 ++++-
 contrib/Makefile.am                      | 3 ++-
 contrib/cobalt-ctl/Makefile.am           | 2 ++
 contrib/decode_tm6000/Makefile.am        | 2 ++
 contrib/gconv/Makefile.am                | 2 +-
 contrib/rds-saa6588/Makefile.am          | 2 ++
 contrib/test/Makefile.am                 | 3 ++-
 contrib/xc3028-firmware/Makefile.am      | 2 +-
 lib/Makefile.am                          | 2 +-
 lib/libdvbv5/Makefile.am                 | 2 +-
 lib/libv4l-mplane/Makefile.am            | 2 ++
 lib/libv4l1/Makefile.am                  | 2 +-
 lib/libv4l2/Makefile.am                  | 2 +-
 lib/libv4l2rds/Makefile.am               | 2 ++
 lib/libv4lconvert/Makefile.am            | 2 +-
 utils/Makefile.am                        | 2 +-
 utils/cec-compliance/Makefile.am         | 2 +-
 utils/cec-ctl/Makefile.am                | 2 +-
 utils/cec-follower/Makefile.am           | 2 +-
 utils/cx18-ctl/Makefile.am               | 2 ++
 utils/dvb/Makefile.am                    | 2 +-
 utils/ir-ctl/Makefile.am                 | 2 ++
 utils/ivtv-ctl/Makefile.am               | 2 ++
 utils/keytable/Makefile.am               | 3 ++-
 utils/keytable/bpf_protocols/Makefile.am | 3 ++-
 utils/libcecutil/Makefile.am             | 2 +-
 utils/libmedia_dev/Makefile.am           | 2 +-
 utils/libv4l2util/Makefile.am            | 2 +-
 utils/media-ctl/Makefile.am              | 2 ++
 utils/qv4l2/Makefile.am                  | 3 ++-
 utils/qvidcap/Makefile.am                | 3 ++-
 utils/rds-ctl/Makefile.am                | 1 +
 utils/v4l2-compliance/Makefile.am        | 2 +-
 utils/v4l2-ctl/Makefile.am               | 2 +-
 utils/v4l2-dbg/Makefile.am               | 2 +-
 utils/v4l2-sysfs-path/Makefile.am        | 2 ++
 36 files changed, 55 insertions(+), 25 deletions(-)
Makefile.am +4 -1
index 7fb443ab..4b4bac09 100644
@@ -11,6 +11,9 @@ endif
 EXTRA_DIST = android-config.h sync-with-kernel.sh bootstrap.sh \
 	doxygen_libdvbv5.cfg include COPYING.libv4l \
 	COPYING.libdvbv5 README.libv4l README.lib-multi-threading \
-	TODO.libdvbv5 doc/libdvbv5-index.doc
+	TODO.libdvbv5 doc/libdvbv5-index.doc \
+	doc/Doxyfile.in doc/meson.build \
+	meson.build meson_options.txt \
+	libdvbv5-po/meson.build v4l-utils-po/meson.build
 
 include $(top_srcdir)/aminclude.am
contrib/Makefile.am +2 -1
index b418b518..1d7299d0 100644
@@ -22,4 +22,5 @@ EXTRA_DIST = \
 	parsers \
 	pci_traffic \
 	v4l_rec.pl \
-	lircd2toml.py
+	lircd2toml.py \
+	meson.build
contrib/cobalt-ctl/Makefile.am +2 -0
index 2cc69000..168873e4 100644
@@ -1,3 +1,5 @@
 bin_PROGRAMS = cobalt-ctl
 
 cobalt_ctl_SOURCES = cobalt-ctl.c s-record.c
+
+EXTRA_DIST = meson.build
contrib/decode_tm6000/Makefile.am +2 -0
index 863933cc..e9bb5fef 100644
@@ -2,3 +2,5 @@ bin_PROGRAMS = decode_tm6000
 decode_tm6000_SOURCES = decode_tm6000.c
 decode_tm6000_LDADD = ../../utils/libv4l2util/libv4l2util.la
 decode_tm6000_LDFLAGS = $(ARGP_LIBS)
+
+EXTRA_DIST = meson.build
contrib/gconv/Makefile.am +1 -1
index 68b5bd5f..9c822b8b 100644
@@ -14,4 +14,4 @@ ARIB_STD_B24_la_LDFLAGS = $(gconv_ldflags) -L@gconvsysdir@ -R@gconvsysdir@ -lJIS
 EN300_468_TAB00_la_SOURCES = en300-468-tab00.c
 EN300_468_TAB00_la_LDFLAGS = $(gconv_ldflags)
 
-EXTRA_DIST = $(gconv_base_sources) $(gconv_DATA) gconv.map
+EXTRA_DIST = $(gconv_base_sources) $(gconv_DATA) gconv.map meson.build
contrib/rds-saa6588/Makefile.am +2 -0
index a551d9fb..8bda60a2 100644
@@ -1,3 +1,5 @@
 noinst_PROGRAMS = rds-saa6588
 
 rds_saa6588_SOURCES = rds-saa6588.c
+
+EXTRA_DIST = meson.build
contrib/test/Makefile.am +2 -1
index 5771ee4d..56203fb3 100644
@@ -62,4 +62,5 @@ EXTRA_DIST = \
 	test-media \
 	test-media-unload.pl \
 	vim2m_test_with_gstreamer.sh \
-	vim2m_test_with_qvidcap.sh
+	vim2m_test_with_qvidcap.sh \
+	meson.build
contrib/xc3028-firmware/Makefile.am +1 -1
index 8b23d1e1..0ea17885 100644
@@ -2,4 +2,4 @@ noinst_PROGRAMS = firmware-tool
 
 firmware_tool_SOURCES = firmware-tool.c standards.c extract_head.h standards.h tuner-xc2028-types.h
 
-EXTRA_DIST = README
+EXTRA_DIST = README meson.build
lib/Makefile.am +1 -1
index a105c95a..8fc99339 100644
@@ -10,4 +10,4 @@ SUBDIRS += \
 	libdvbv5
 endif
 
-EXTRA_DIST = Android.mk
+EXTRA_DIST = Android.mk meson.build
lib/libdvbv5/Makefile.am +1 -1
index 683ae3fb..3b5a28db 100644
@@ -123,4 +123,4 @@ libdvbv5_la_CPPFLAGS = -I../.. $(ENFORCE_LIBDVBV5_STATIC) $(LIBUDEV_CFLAGS) $(PT
 libdvbv5_la_LDFLAGS = $(LIBDVBV5_VERSION) $(ENFORCE_LIBDVBV5_STATIC) $(LIBUDEV_LIBS) -lm -lrt
 libdvbv5_la_LIBADD = $(LTLIBICONV)
 
-EXTRA_DIST = README gen_dvb_structs.pl
+EXTRA_DIST = README gen_dvb_structs.pl meson.build
lib/libv4l-mplane/Makefile.am +2 -0
index 5264ecf2..fb858e54 100644
@@ -5,3 +5,5 @@ endif
 libv4l_mplane_la_SOURCES = libv4l-mplane.c
 libv4l_mplane_la_CPPFLAGS = $(CFLAG_VISIBILITY)
 libv4l_mplane_la_LDFLAGS = -avoid-version -module -shared -export-dynamic -lpthread
+
+EXTRA_DIST = meson.build
lib/libv4l1/Makefile.am +1 -1
index 42cb3dbb..a9e60fb4 100644
@@ -26,4 +26,4 @@ v4l1compat_la_LIBADD = libv4l1.la
 v4l1compat_la_LDFLAGS = -avoid-version -module -shared -export-dynamic
 v4l1compat_la_LIBTOOLFLAGS = --tag=disable-static
 
-EXTRA_DIST = libv4l1-kernelcode-license.txt
+EXTRA_DIST = libv4l1-kernelcode-license.txt meson.build
lib/libv4l2/Makefile.am +1 -1
index 3a1bb901..0b473782 100644
@@ -29,4 +29,4 @@ v4l2convert_la_LIBADD = libv4l2.la
 v4l2convert_la_LDFLAGS = -avoid-version -module -shared -export-dynamic
 v4l2convert_la_LIBTOOLFLAGS = --tag=disable-static
 
-EXTRA_DIST = Android.mk v4l2-plugin-android.c
+EXTRA_DIST = Android.mk v4l2-plugin-android.c meson.build
lib/libv4l2rds/Makefile.am +2 -0
index 73fdd3e2..3ee535f0 100644
@@ -10,3 +10,5 @@ endif
 libv4l2rds_la_SOURCES = libv4l2rds.c
 libv4l2rds_la_CPPFLAGS = $(CFLAG_VISIBILITY) $(ENFORCE_LIBV4L_STATIC)
 libv4l2rds_la_LDFLAGS = $(LIBV4L2RDS_VERSION) -lpthread $(ENFORCE_LIBV4L_STATIC)
+
+EXTRA_DIST = meson.build
lib/libv4lconvert/Makefile.am +1 -1
index f266f3e7..e769d2fd 100644
@@ -33,4 +33,4 @@ ov511_decomp_SOURCES = ov511-decomp.c
 
 ov518_decomp_SOURCES = ov518-decomp.c
 
-EXTRA_DIST = Android.mk
+EXTRA_DIST = Android.mk meson.build
utils/Makefile.am +1 -1
index 0e68a612..5dc55671 100644
@@ -33,4 +33,4 @@ if WITH_QVIDCAP
 SUBDIRS += qvidcap
 endif
 
-EXTRA_DIST = common
+EXTRA_DIST = common meson.build gen_media_bus_format_codes.sh gen_media_bus_format_names.sh
utils/cec-compliance/Makefile.am +1 -1
index 93c1b568..8f0a50e5 100644
@@ -5,4 +5,4 @@ cec_compliance_SOURCES = cec-compliance.cpp cec-compliance.h cec-test.cpp cec-te
 cec_compliance_CPPFLAGS = -I$(top_srcdir)/utils/libcecutil $(GIT_SHA) $(GIT_COMMIT_CNT) $(GIT_COMMIT_DATE)
 cec_compliance_LDADD = -lrt ../libcecutil/libcecutil.la
 
-EXTRA_DIST = cec-compliance.1
+EXTRA_DIST = cec-compliance.1 meson.build
utils/cec-ctl/Makefile.am +1 -1
index 27e69494..e42046a4 100644
@@ -5,4 +5,4 @@ cec_ctl_SOURCES = cec-ctl.cpp cec-pin.cpp cec-ctl.h
 cec_ctl_CPPFLAGS = -I$(top_srcdir)/utils/libcecutil $(GIT_SHA) $(GIT_COMMIT_CNT) $(GIT_COMMIT_DATE)
 cec_ctl_LDADD = -lrt -lpthread ../libcecutil/libcecutil.la
 
-EXTRA_DIST = cec-ctl.1
+EXTRA_DIST = cec-ctl.1 meson.build
utils/cec-follower/Makefile.am +1 -1
index 903d3715..e0df03c4 100644
@@ -5,4 +5,4 @@ cec_follower_SOURCES = cec-follower.cpp cec-follower.h cec-processing.cpp cec-tu
 cec_follower_CPPFLAGS = -I$(top_srcdir)/utils/libcecutil $(GIT_SHA) $(GIT_COMMIT_CNT) $(GIT_COMMIT_DATE)
 cec_follower_LDADD = -lrt ../libcecutil/libcecutil.la
 
-EXTRA_DIST = cec-follower.1
+EXTRA_DIST = cec-follower.1 meson.build
utils/cx18-ctl/Makefile.am +2 -0
index 94fce36d..4d2a159a 100644
@@ -1,3 +1,5 @@
 bin_PROGRAMS = cx18-ctl
 
 cx18_ctl_SOURCES = cx18-ctl.c
+
+EXTRA_DIST = meson.build
utils/dvb/Makefile.am +1 -1
index 1895018a..5f99e7be 100644
@@ -32,4 +32,4 @@ dvbv5_daemon_LDADD = ../../lib/libdvbv5/libdvbv5.la @LIBINTL@ $(LIBUDEV_LIBS) $(
 dvbv5_daemon_LDFLAGS = $(ARGP_LIBS) -lm $(XMLRPC_LDFLAGS) $(PTHREAD_LDFLAGS)
 dvbv5_daemon_CFLAGS =  $(XMLRPC_CFLAGS) $(LIBUDEV_CFLAGS) $(PTHREAD_CFLAGS)
 
-EXTRA_DIST = README
+EXTRA_DIST = README meson.build
utils/ir-ctl/Makefile.am +2 -0
index ad90b84e..0e3c178a 100644
@@ -4,3 +4,5 @@ man_MANS = ir-ctl.1
 ir_ctl_SOURCES = ir-ctl.c ir-encode.c ir-encode.h toml.c toml.h keymap.c keymap.h bpf_encoder.c bpf_encoder.h
 ir_ctl_LDADD = @LIBINTL@
 ir_ctl_LDFLAGS = $(ARGP_LIBS)
+
+EXTRA_DIST = meson.build
utils/ivtv-ctl/Makefile.am +2 -0
index c1196673..a8ddc9d2 100644
@@ -2,3 +2,5 @@ bin_PROGRAMS = ivtv-ctl
 
 ivtv_ctl_SOURCES = ivtv-ctl.c
 ivtv_ctl_LDFLAGS = -lm
+
+EXTRA_DIST = meson.build
utils/keytable/Makefile.am +2 -1
index eee61f0e..d3edcf77 100644
@@ -26,7 +26,8 @@ ir_keytable_CFLAGS = $(LIBBPF_CFLAGS)
 SUBDIRS = bpf_protocols
 endif
 
-EXTRA_DIST = 70-infrared.rules 50-rc_keymap.conf rc_keymaps rc_keymaps_userspace gen_input_events.pl gen_keytables.pl ir-keytable.1 rc_maps.cfg rc_keymap.5
+EXTRA_DIST = 70-infrared.rules 50-rc_keymap.conf rc_keymaps rc_keymaps_userspace gen_input_events.pl gen_keytables.pl ir-keytable.1 rc_maps.cfg rc_keymap.5 \
+	     meson.build
 
 check:
 	@$(foreach keymap,$(wildcard $(keytablesystem_DATA)),./ir-keytable --test-keymap=$(keymap);)
utils/keytable/bpf_protocols/Makefile.am +2 -1
index 13be2794..eac27f15 100644
@@ -15,7 +15,8 @@ PROTOCOLS = grundig.o pulse_distance.o pulse_length.o rc_mm.o manchester.o xbox-
 all: $(PROTOCOLS)
 
 CLEANFILES = $(PROTOCOLS)
-EXTRA_DIST = $(PROTOCOLS:%.o=%.c) bitmap.h bpf_helpers.h
+EXTRA_DIST = $(PROTOCOLS:%.o=%.c) bitmap.h bpf_helpers.h clang_sys_includes.sh \
+	meson.build
 
 # custom target
 install-data-local:
utils/libcecutil/Makefile.am +1 -1
index d2c7ddcc..03635e57 100644
@@ -21,4 +21,4 @@ gen.intermediate: cec-gen.pl $(CEC_GEN_PREREQS)
 clean-local:
 	-rm -vf $(CEC_GEN_HDRS)
 
-EXTRA_DIST = cec-gen.pl
+EXTRA_DIST = cec-gen.pl meson.build
utils/libmedia_dev/Makefile.am +1 -1
index 3796efbd..f4e4a3f4 100644
@@ -4,4 +4,4 @@ libmedia_dev_la_SOURCES = get_media_devices.c get_media_devices.h
 libmedia_dev_la_CPPFLAGS = -static
 libmedia_dev_la_LDFLAGS = -static
 
-EXTRA_DIST = README
+EXTRA_DIST = README meson.build
utils/libv4l2util/Makefile.am +1 -1
index eb11017a..fb25c3b6 100644
@@ -4,4 +4,4 @@ libv4l2util_la_SOURCES = frequencies.c v4l2_driver.c v4l2_driver.h libv4l2util.h
 libv4l2util_la_CPPFLAGS = -static
 libv4l2util_la_LDFLAGS = -static
 
-EXTRA_DIST = TODO
+EXTRA_DIST = TODO meson.build
utils/media-ctl/Makefile.am +2 -0
index c48c8d62..075274d6 100644
@@ -28,3 +28,5 @@ bin_PROGRAMS = media-ctl
 media_ctl_SOURCES = media-ctl.c options.c options.h tools.h
 media_ctl_LDADD = libmediactl.la libv4l2subdev.la
 media_ctl_CFLAGS = $(GIT_COMMIT_CNT)
+
+EXTRA_DIST = meson.build
utils/qv4l2/Makefile.am +2 -1
index bef699c0..977ae243 100644
@@ -23,7 +23,8 @@ qv4l2_LDFLAGS += $(ALSA_LIBS) -pthread
 
 EXTRA_DIST = enterbutt.png exit.png fileopen.png qv4l2_24x24.png qv4l2_64x64.png qv4l2.png qv4l2.svg \
   snapshot.png video-television.png fileclose.png qv4l2_16x16.png qv4l2_32x32.png qv4l2.desktop \
-  qv4l2.qrc saveraw.png qv4l2.pro qv4l2.1 fullscreenexit.png fullscreen.png start.png step.png
+  qv4l2.qrc saveraw.png qv4l2.pro qv4l2.1 fullscreenexit.png fullscreen.png start.png step.png \
+  meson.build
 
 clean-local:
 	-rm -vf moc_*.cpp qrc_*.cpp qrc_*.o ui_*.h
utils/qvidcap/Makefile.am +2 -1
index 9e873ca1..c8e0c570 100644
@@ -16,7 +16,8 @@ qvidcap_LDFLAGS += $(ALSA_LIBS) -pthread
 
 EXTRA_DIST = qvidcap_24x24.png qvidcap_64x64.png qvidcap.png qvidcap.svg \
   qvidcap_16x16.png qvidcap_32x32.png qvidcap.desktop \
-  qvidcap.qrc qvidcap.pro qvidcap.1 v4l2-convert.glsl v4l2-convert.pl
+  qvidcap.qrc qvidcap.pro qvidcap.1 v4l2-convert.glsl v4l2-convert.pl \
+  meson.build
 
 clean-local:
 	-rm -vf moc_*.cpp qrc_*.cpp qrc_*.o ui_*.h v4l2-convert.h formats.h
utils/rds-ctl/Makefile.am +1 -0
index 1afdf808..f9685f48 100644
@@ -3,3 +3,4 @@ bin_PROGRAMS = rds-ctl
 rds_ctl_SOURCES = rds-ctl.cpp
 rds_ctl_LDADD = ../../lib/libv4l2rds/libv4l2rds.la
 
+EXTRA_DIST = meson.build
utils/v4l2-compliance/Makefile.am +1 -1
index 6baf1f5c..1172433d 100644
@@ -23,7 +23,7 @@ v4l2_compliance_LDADD = -lrt -lpthread
 DEFS += -DNO_LIBV4L2
 endif
 
-EXTRA_DIST = Android.mk fixme.txt v4l2-compliance.1
+EXTRA_DIST = Android.mk fixme.txt v4l2-compliance.1 meson.build
 
 nodist_v4l2_compliance_32_SOURCES = v4l2-compliance-32.c
 
utils/v4l2-ctl/Makefile.am +1 -1
index 55d234cf..ad8a5a6d 100644
@@ -41,4 +41,4 @@ v4l2-ctl-32$(EXEEXT): $(addprefix $(top_srcdir)/utils/v4l2-ctl/,$(v4l2_ctl_SOURC
 	$(CXXCOMPILE) -static -m32 -DNO_LIBV4L2 -o $@ -I$(top_srcdir) -I$(top_srcdir)/include $(v4l2_ctl_CPPFLAGS) $(addprefix $(top_srcdir)/utils/v4l2-ctl/,$(filter %.cpp,$(v4l2_ctl_SOURCES))) [email protected]
 	rm -f [email protected] [email protected]
 
-EXTRA_DIST = Android.mk v4l2-ctl.1
+EXTRA_DIST = Android.mk v4l2-ctl.1 meson.build
utils/v4l2-dbg/Makefile.am +1 -1
index 94a5fb53..0b3dcfaa 100644
@@ -1,4 +1,4 @@
 sbin_PROGRAMS = v4l2-dbg
 v4l2_dbg_SOURCES = v4l2-dbg.cpp v4l2-dbg-ac97.h  v4l2-dbg-bttv.h  v4l2-dbg-em28xx.h  v4l2-dbg.h  v4l2-dbg-micron.h  v4l2-dbg-saa7134.h	v4l2-dbg-tvp5150.h
 
-EXTRA_DIST = Android.mk
+EXTRA_DIST = Android.mk meson.build
utils/v4l2-sysfs-path/Makefile.am +2 -0
index 6ef4228e..4ab84dd9 100644
@@ -2,3 +2,5 @@ bin_PROGRAMS = v4l2-sysfs-path
 v4l2_sysfs_path_SOURCES = v4l2-sysfs-path.c
 v4l2_sysfs_path_LDADD = ../libmedia_dev/libmedia_dev.la
 v4l2_sysfs_path_LDFLAGS = $(ARGP_LIBS)
+
+EXTRA_DIST = meson.build
Signature · 1 line
2.30.2
#6 lore raw
In reply to Ariel D'Alessandro

Hi Ariel,

I'm still very much looking forward to this update!

I still think meson could be used in parallel for some cross over period while these issues are worked out, which would encourage and support wider testing before any consideration to swap altogether occurred.

Furthermore, the performance improvement on this is really nice (intel i7 8th gen 4 core/8threads)

/usr/bin/time -v ./make-meson.sh

	User time (seconds): 99.38
	System time (seconds): 10.69
	Percent of CPU this job got: 577%
	Elapsed (wall clock) time (h:mm:ss or m:ss): 0:19.05

/usr/bin/time -v ./make-autoconf.sh

	User time (seconds): 218.19
	System time (seconds): 21.46
	Percent of CPU this job got: 360%
	Elapsed (wall clock) time (h:mm:ss or m:ss): 1:06.54

however the build output directories are not comparable so I suspect that perhaps meson isn't (yet?) building all the same things?

du -sh build-autoconf build-meson/
129M build-autoconf
69M build-meson/

I've just tried testing it locally and found a smallish issue:

Quoted 18 lines · Ariel D'Alessandro

Hi all,

Another attempt to support meson build, addressing comments/fixes from reviewers.

This patchset was developed on top of v4l-utils current master branch:

commit f0c7e3d71eaf4182bae7eb3ee0e43b4eeb047ea9
Author: Hans Verkuil <[email protected]>

v4l2-ctl: add '--set-edid type=list' support

You can find the patchset pushed to the following branch:

https://gitlab.collabora.com/adalessandro/v4l-utils/-/tree/v4l-utils-meson-v5

Feedback appreciated as always :-)

Quoted 7 lines

Changes from v4:

* Dropped install_subdir() work-around to install empty dir. Supported

    now in meson v0.57.

* Bump to meson v0.57. Replaced deprecated methods.
* Added override_dependency() calls on libraries.
* Properly check for bpf and SDL2 dependencies.

The SDL2 dependency is optional when I run ./bootstrap.sh; ./configure which gives the following output:

compile time options summary
============================

    Host OS                    : linux-gnu
    X11                        : yes
    GL                         : yes
    glu                        : yes

libelf : yes
libjpeg : yes
libudev : yes
pthread : yes
QT version : v5.4 with QtGL
ALSA support : yes
SDL support : no

build dynamic libs : yes
build static libs : yes

gconv : no

dynamic libv4l : yes
v4l_plugins : yes
v4l_wrappers : yes
libdvbv5 : yes
dvbv5-daemon : yes
v4lutils : yes
qv4l2 : yes
qvidcap : yes
v4l2-ctl uses libv4l : yes
v4l2-ctl-32 : no
v4l2-compliance : yes
v4l2-compliance uses libv4l: yes
v4l2-compliance-32 : no
BPF IR Decoders: : no

However running meson build gives:

Has header "bpf/bpf.h" : NO
Run-time dependency sdl2 found: YES 2.0.10
Run-time dependency sdl2_image found: NO (tried pkgconfig and cmake)

meson.build:90:4: ERROR: C header 'SDL2/SDL_image.h' not found

Now I bet that's a corner case because SDL was found but SDL Image wasn't, but perhaps it needs updating so that both are optional, and the SDL support is only enabled when all SDL dependencies are met.

Of course I was able to 'solve/workaround' this locally with
sudo apt install libsdl2-image-dev

Note that the time measurements reported above were after installing SDL image so that both meson and autoconf should have been building the

Quoted 174 lines

* Removed libraries_private field from libv4lconvert pkgconfig.
* Documented meson static builds support.
* Set default compiler standard options.
* Added bpf check in keytable.

Changes from v3:

* Split Doxygen support patch.
* Properly generate config.h configuration file.

Changes from v2:

* Updated to current master branch.
* Moved README to markdown syntax.
* Documented meson build.
* Set PACKAGE_VERSION config macro as quoted.

Changes from v1:

* Updated project version to 1.21.0.
* Fixed clang includes in keytable bpf compilation.
* Improved variable reutilization in meson scripts.
* Set libraries version and soversion.
* Control symbol visibility.
* Install empty 'protocols' directory in keytable user dir.
* Fixed svg filenames in qv4l2 and qvidcap.
* Added support for Doxygen documentation (html and man).
* Updated required meson version to v0.53 (for fs module).
* Added new files to EXTRA_DIST in each Makefile.am.

Regards,

Ariel D'Alessandro (5):
Move README to markdown syntax
Add support for meson building
Copy Doxygen configuration file to doc/
meson: Add support for doxygen documentation
Makefile.am: Distribute meson related files

 .gitignore                                    |    1 +
 INSTALL.meson.md                              |  142 +
 Makefile.am                                   |    5 +-
 README                                        |  274 --
 README.md                                     |  332 +++
 contrib/Makefile.am                           |    3 +-
 contrib/cobalt-ctl/Makefile.am                |    2 +
 contrib/cobalt-ctl/meson.build                |    8 +
 contrib/decode_tm6000/Makefile.am             |    2 +
 contrib/decode_tm6000/meson.build             |   14 +
 contrib/gconv/Makefile.am                     |    2 +-
 contrib/gconv/meson.build                     |   44 +
 contrib/meson.build                           |   13 +
 contrib/rds-saa6588/Makefile.am               |    2 +
 contrib/rds-saa6588/meson.build               |    7 +
 contrib/test/Makefile.am                      |    3 +-
 contrib/test/meson.build                      |  143 +
 contrib/xc3028-firmware/Makefile.am           |    2 +-
 contrib/xc3028-firmware/meson.build           |   11 +
 doc/Doxyfile.in                               | 2352 +++++++++++++++++
 doc/meson.build                               |   34 +
 lib/Makefile.am                               |    2 +-
 lib/libdvbv5/Makefile.am                      |    2 +-
 lib/libdvbv5/meson.build                      |  159 ++
 lib/libv4l-mplane/Makefile.am                 |    2 +
 lib/libv4l-mplane/meson.build                 |   23 +
 lib/libv4l1/Makefile.am                       |    2 +-
 lib/libv4l1/meson.build                       |   62 +
 lib/libv4l2/Makefile.am                       |    2 +-
 lib/libv4l2/meson.build                       |   71 +
 lib/libv4l2rds/Makefile.am                    |    2 +
 lib/libv4l2rds/meson.build                    |   37 +
 lib/libv4lconvert/Makefile.am                 |    2 +-
 lib/libv4lconvert/meson.build                 |  117 +
 lib/meson.build                               |   11 +
 libdvbv5-po/meson.build                       |    3 +
 meson.build                                   |  334 +++
 meson_options.txt                             |   50 +
 utils/Makefile.am                             |    2 +-
 utils/cec-compliance/Makefile.am              |    2 +-
 utils/cec-compliance/meson.build              |   22 +
 utils/cec-ctl/Makefile.am                     |    2 +-
 utils/cec-ctl/meson.build                     |   18 +
 utils/cec-follower/Makefile.am                |    2 +-
 utils/cec-follower/meson.build                |   19 +
 utils/cx18-ctl/Makefile.am                    |    2 +
 utils/cx18-ctl/meson.build                    |    8 +
 utils/dvb/Makefile.am                         |    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/Makefile.am                      |    2 +
 utils/ir-ctl/meson.build                      |   23 +
 utils/ivtv-ctl/Makefile.am                    |    2 +
 utils/ivtv-ctl/meson.build                    |   13 +
 utils/keytable/Makefile.am                    |    3 +-
 utils/keytable/bpf_protocols/Makefile.am      |    3 +-
 .../bpf_protocols/clang_sys_includes.sh       |    9 +
 utils/keytable/bpf_protocols/meson.build      |   31 +
 utils/keytable/meson.build                    |   81 +
 utils/keytable/rc_keymaps/meson.build         |  151 ++
 utils/libcecutil/Makefile.am                  |    2 +-
 utils/libcecutil/meson.build                  |   45 +
 utils/libmedia_dev/Makefile.am                |    2 +-
 utils/libmedia_dev/meson.build                |   14 +
 utils/libv4l2util/Makefile.am                 |    2 +-
 utils/libv4l2util/meson.build                 |   16 +
 utils/media-ctl/Makefile.am                   |    2 +
 utils/media-ctl/meson.build                   |   43 +
 utils/meson.build                             |   46 +
 utils/qv4l2/Makefile.am                       |    3 +-
 utils/qv4l2/meson.build                       |   80 +
 utils/qvidcap/Makefile.am                     |    3 +-
 utils/qvidcap/meson.build                     |   82 +
 utils/rds-ctl/Makefile.am                     |    1 +
 utils/rds-ctl/meson.build                     |   13 +
 utils/v4l2-compliance/Makefile.am             |    2 +-
 utils/v4l2-compliance/meson.build             |   58 +
 utils/v4l2-ctl/Makefile.am                    |    2 +-
 utils/v4l2-ctl/meson.build                    |   75 +
 utils/v4l2-dbg/Makefile.am                    |    2 +-
 utils/v4l2-dbg/meson.build                    |   16 +
 utils/v4l2-sysfs-path/Makefile.am             |    2 +
 utils/v4l2-sysfs-path/meson.build             |   14 +
 v4l-utils-po/meson.build                      |    3 +
 85 files changed, 4987 insertions(+), 299 deletions(-)
 create mode 100644 INSTALL.meson.md
 delete mode 100644 README
 create mode 100644 README.md
 create mode 100644 contrib/cobalt-ctl/meson.build
 create mode 100644 contrib/decode_tm6000/meson.build
 create mode 100644 contrib/gconv/meson.build
 create mode 100644 contrib/meson.build
 create mode 100644 contrib/rds-saa6588/meson.build
 create mode 100644 contrib/test/meson.build
 create mode 100644 contrib/xc3028-firmware/meson.build
 create mode 100644 doc/Doxyfile.in
 create mode 100644 doc/meson.build
 create mode 100644 lib/libdvbv5/meson.build
 create mode 100644 lib/libv4l-mplane/meson.build
 create mode 100644 lib/libv4l1/meson.build
 create mode 100644 lib/libv4l2/meson.build
 create mode 100644 lib/libv4l2rds/meson.build
 create mode 100644 lib/libv4lconvert/meson.build
 create mode 100644 lib/meson.build
 create mode 100644 libdvbv5-po/meson.build
 create mode 100644 meson.build
 create mode 100644 meson_options.txt
 create mode 100644 utils/cec-compliance/meson.build
 create mode 100644 utils/cec-ctl/meson.build
 create mode 100644 utils/cec-follower/meson.build
 create mode 100644 utils/cx18-ctl/meson.build
 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
 create mode 100644 utils/ir-ctl/meson.build
 create mode 100644 utils/ivtv-ctl/meson.build
 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
 create mode 100644 utils/libcecutil/meson.build
 create mode 100644 utils/libmedia_dev/meson.build
 create mode 100644 utils/libv4l2util/meson.build
 create mode 100644 utils/media-ctl/meson.build
 create mode 100644 utils/meson.build
 create mode 100644 utils/qv4l2/meson.build
 create mode 100644 utils/qvidcap/meson.build
 create mode 100644 utils/rds-ctl/meson.build
 create mode 100644 utils/v4l2-compliance/meson.build
 create mode 100644 utils/v4l2-ctl/meson.build
 create mode 100644 utils/v4l2-dbg/meson.build
 create mode 100644 utils/v4l2-sysfs-path/meson.build
 create mode 100644 v4l-utils-po/meson.build
Signature · 3 lines
Regards
--
Kieran
#7 lore raw

Hi Kieran!

Thanks a lot for the feedback.

Quoted 19 lines · Kieran Bingham

Hi Ariel,

I'm still very much looking forward to this update!

I still think meson could be used in parallel for some cross over period while these issues are worked out, which would encourage and support wider testing before any consideration to swap altogether occurred.

Furthermore, the performance improvement on this is really nice (intel i7 8th gen 4 core/8threads)

/usr/bin/time -v ./make-meson.sh

	User time (seconds): 99.38
	System time (seconds): 10.69
	Percent of CPU this job got: 577%
	Elapsed (wall clock) time (h:mm:ss or m:ss): 0:19.05
Quoted 8 lines

/usr/bin/time -v ./make-autoconf.sh

	User time (seconds): 218.19
	System time (seconds): 21.46
	Percent of CPU this job got: 360%
	Elapsed (wall clock) time (h:mm:ss or m:ss): 1:06.54

however the build output directories are not comparable so I suspect that perhaps meson isn't (yet?) building all the same things?

Not sure what your scripts are doing, but the default autotools behaviour should be equivalent to:

  $ meson configure build/ -Ddefault_library=both -Ddoxygen-doc=disabled
Quoted 10 lines

du -sh build-autoconf build-meson/
129M build-autoconf
69M build-meson/

I've just tried testing it locally and found a smallish issue:

On 12/05/2021 19:49, Ariel D'Alessandro wrote:

<snip>

Quoted 61 lines
Quoted 7 lines

Changes from v4:

* Dropped install_subdir() work-around to install empty dir. Supported

    now in meson v0.57.

* Bump to meson v0.57. Replaced deprecated methods.
* Added override_dependency() calls on libraries.
* Properly check for bpf and SDL2 dependencies.

The SDL2 dependency is optional when I run ./bootstrap.sh; ./configure which gives the following output:

compile time options summary
============================

    Host OS                    : linux-gnu
    X11                        : yes
    GL                         : yes
    glu                        : yes

libelf : yes
libjpeg : yes
libudev : yes
pthread : yes
QT version : v5.4 with QtGL
ALSA support : yes
SDL support : no

build dynamic libs : yes
build static libs : yes

gconv : no

dynamic libv4l : yes
v4l_plugins : yes
v4l_wrappers : yes
libdvbv5 : yes
dvbv5-daemon : yes
v4lutils : yes
qv4l2 : yes
qvidcap : yes
v4l2-ctl uses libv4l : yes
v4l2-ctl-32 : no
v4l2-compliance : yes
v4l2-compliance uses libv4l: yes
v4l2-compliance-32 : no
BPF IR Decoders: : no

However running meson build gives:

Has header "bpf/bpf.h" : NO
Run-time dependency sdl2 found: YES 2.0.10
Run-time dependency sdl2_image found: NO (tried pkgconfig and cmake)

meson.build:90:4: ERROR: C header 'SDL2/SDL_image.h' not found

Now I bet that's a corner case because SDL was found but SDL Image wasn't, but perhaps it needs updating so that both are optional, and the SDL support is only enabled when all SDL dependencies are met.

Quoted 5 lines

Of course I was able to 'solve/workaround' this locally with
sudo apt install libsdl2-image-dev

Note that the time measurements reported above were after installing SDL image so that both meson and autoconf should have been building the

That's a bug introducen in the latest v5 patchset, while addressing comment [0] from Xavier. This will fix it:

$ git diff
meson.build +1 -1
index bba8e030..f062856c 100644
@@ -82,12 +82,12 @@ endif
 
 dep_sdl = dependency('SDL2', required: false)
 if not dep_sdl.found()
-    dep_sdl = cc.find_library('SDL2', has_headers: 'SDL2/SDL.h')
+    dep_sdl = cc.find_library('SDL2', has_headers: 'SDL2/SDL.h',

required: false)
endif

dep_sdl_image = dependency('SDL2_image', required: false) if not dep_sdl_image.found()
- dep_sdl_image = cc.find_library('SDL2_image', has_headers:
'SDL2/SDL_image.h')
+ dep_sdl_image = cc.find_library('SDL2_image', has_headers:
'SDL2/SDL_image.h', required: false)
endif

dep_threads = dependency('threads')

[0]
https://gitlab.collabora.com/adalessandro/v4l-utils/-/commit/d6fc25fdd28227e88d5517342f045d5bda632272#note_82115

Thanks again!
Ariel

#8 lore raw

Hi Ariel,

Quoted 3 lines · Ariel D'Alessandro

Hi Kieran!

Thanks a lot for the feedback.

No worries, somehow this is almost fun to test out (mostly because of watching how crazy fast it is building in meson in comparison).

Quoted 26 lines · Kieran Bingham
Quoted 25 lines

Hi Ariel,

I'm still very much looking forward to this update!

I still think meson could be used in parallel for some cross over period while these issues are worked out, which would encourage and support wider testing before any consideration to swap altogether occurred.

Furthermore, the performance improvement on this is really nice (intel i7 8th gen 4 core/8threads)

/usr/bin/time -v ./make-meson.sh

	User time (seconds): 99.38
	System time (seconds): 10.69
	Percent of CPU this job got: 577%
	Elapsed (wall clock) time (h:mm:ss or m:ss): 0:19.05

/usr/bin/time -v ./make-autoconf.sh

	User time (seconds): 218.19
	System time (seconds): 21.46
	Percent of CPU this job got: 360%
	Elapsed (wall clock) time (h:mm:ss or m:ss): 1:06.54
Quoted 4 lines
Quoted 2 lines

however the build output directories are not comparable so I suspect that perhaps meson isn't (yet?) building all the same things?

Not sure what your scripts are doing, but the default autotools

Ah, yes I should have been clearer there - but they don't do 'anything' except the bare minimum for both:

----------

kbingham@Q:/opt/projects/media/v4l-utils$ cat make-autoconf.sh
#!/bin/sh

export CCACHE_DISABLE=true

rm -rf build-autoconf
mkdir -p build-autoconf
cd build-autoconf
../configure
make -j8

----------

kbingham@Q:/opt/projects/media/v4l-utils$ cat make-meson.sh
#!/bin/sh

export CCACHE_DISABLE=true

rm -rf build-meson
meson build-meson
ninja -C build-meson
----------

Quoted 3 lines

behaviour should be equivalent to:

  $ meson configure build/ -Ddefault_library=both -Ddoxygen-doc=disabled

Ok, updated script to run that:

meson -Ddefault_library=both -Ddoxygen-doc=disabled build-meson

and still the same fast results.

	Command being timed: "./make-meson.sh"
	User time (seconds): 96.65
	System time (seconds): 10.42
	Percent of CPU this job got: 526%
	Elapsed (wall clock) time (h:mm:ss or m:ss): 0:20.34

(i.e. really fast ;D)

Quoted 3 lines
Quoted 3 lines

du -sh build-autoconf build-meson/
129M build-autoconf
69M build-meson/

Still a comparable output size as well, but the main difference from size is a lot of extra build files in the -autoconf directory.

A lot of these are things like .Po files. Does this series already handle internationalisation?

The next step was to install both versions, as that will compare what's actually built and results in the package, and in fact they do look quite similar.

There are a few small changes, that might be worth looking into - but I don't think there's any major difference in what is or isn't built. (unless the Internationalisation stuff really is the major factor)

- Spurious meson.build file is being installed at /lib/udev/rc_keymaps/meson.build

- Meson decided to default libdir to

     /usr/local/lib/x86_64-linux-gnu

while autoconf used
/usr/local/lib
(it's likely handled by the package managers anyway)

- /usr/local/etc/rc_keymaps/protocols
was installed though autoconf didn't ?

- Autoconf seemed to install v4l1compat.so and v4l2convert.so (possibly in duplicate) in the libdir, as well as in libdir/libv4l/ I'm not sure if that's a bug or a feature in autoconf

Ah, and again - size of those installs looks quite different suggesting (probably that localisation) has differed between the two builds quite drastically

(after DESTDIR=/tmp/v4l2-$BUILDSYSTEM {make, ninja} install)

du -sh /tmp/v4l2-autoconf/ /tmp/v4l2-meson/
39M /tmp/v4l2-autoconf/
22M /tmp/v4l2-meson/

Quoted 31 lines
Quoted 4 lines

I've just tried testing it locally and found a smallish issue:

On 12/05/2021 19:49, Ariel D'Alessandro wrote:

<snip>

Quoted 26 lines
Quoted 7 lines

Changes from v4:

* Dropped install_subdir() work-around to install empty dir. Supported

    now in meson v0.57.

* Bump to meson v0.57. Replaced deprecated methods.
* Added override_dependency() calls on libraries.
* Properly check for bpf and SDL2 dependencies.

The SDL2 dependency is optional when I run ./bootstrap.sh; ./configure which gives the following output:

compile time options summary
============================

    Host OS                    : linux-gnu
    X11                        : yes
    GL                         : yes
    glu                        : yes

libelf : yes
libjpeg : yes
libudev : yes
pthread : yes
QT version : v5.4 with QtGL
ALSA support : yes
SDL support : no

Quoted 4 lines
Quoted 4 lines

build dynamic libs : yes
build static libs : yes

gconv : no

Interesting, it looks like on my system autoconf defaults gconv to no, but meson built it I think.

I'd call that a feature not a bug at the moment though?

Quoted 69 lines
Quoted 31 lines
    dynamic libv4l             : yes
    v4l_plugins                : yes
    v4l_wrappers               : yes
    libdvbv5                   : yes
    dvbv5-daemon               : yes
    v4lutils                   : yes
    qv4l2                      : yes
    qvidcap                    : yes
    v4l2-ctl uses libv4l       : yes
    v4l2-ctl-32                : no
    v4l2-compliance            : yes

v4l2-compliance uses libv4l: yes
v4l2-compliance-32 : no
BPF IR Decoders: : no

However running meson build gives:

Has header "bpf/bpf.h" : NO
Run-time dependency sdl2 found: YES 2.0.10
Run-time dependency sdl2_image found: NO (tried pkgconfig and cmake)

meson.build:90:4: ERROR: C header 'SDL2/SDL_image.h' not found

Now I bet that's a corner case because SDL was found but SDL Image wasn't, but perhaps it needs updating so that both are optional, and the SDL support is only enabled when all SDL dependencies are met.

Quoted 5 lines

Of course I was able to 'solve/workaround' this locally with
sudo apt install libsdl2-image-dev

Note that the time measurements reported above were after installing SDL image so that both meson and autoconf should have been building the

That's a bug introducen in the latest v5 patchset, while addressing comment [0] from Xavier. This will fix it:

$ git diff
meson.build +2 -2
index bba8e030..f062856c 100644
@@ -82,12 +82,12 @@ endif
 
 dep_sdl = dependency('SDL2', required: false)
 if not dep_sdl.found()
-    dep_sdl = cc.find_library('SDL2', has_headers: 'SDL2/SDL.h')
+    dep_sdl = cc.find_library('SDL2', has_headers: 'SDL2/SDL.h',
 required: false)
 endif
 
 dep_sdl_image = dependency('SDL2_image', required: false)
 if not dep_sdl_image.found()
-    dep_sdl_image = cc.find_library('SDL2_image', has_headers:
 'SDL2/SDL_image.h')
+    dep_sdl_image = cc.find_library('SDL2_image', has_headers:
 'SDL2/SDL_image.h', required: false)

endif

dep_threads = dependency('threads')

[0]
https://gitlab.collabora.com/adalessandro/v4l-utils/-/commit/d6fc25fdd28227e88d5517342f045d5bda632272#note_82115

Thanks again!
Ariel

Signature · 3 lines
Regards
--
Kieran
tmp/v4l2-install-meson.list renamed from tmp/v4l2-install-autoconf.list +39 -44
@@ -86,7 +86,6 @@
 ./lib/udev/rc_keymaps/medion_x10_or2x.toml
 ./lib/udev/rc_keymaps/medion_x10.toml
 ./lib/udev/rc_keymaps/megasky.toml
-./lib/udev/rc_keymaps/meson.build
 ./lib/udev/rc_keymaps/minix_neo.toml
 ./lib/udev/rc_keymaps/msi_digivox_iii.toml
 ./lib/udev/rc_keymaps/msi_digivox_ii.toml
@@ -179,6 +178,7 @@
 ./usr/local/bin/v4l2-sysfs-path
 ./usr/local/etc
 ./usr/local/etc/rc_keymaps
+./usr/local/etc/rc_keymaps/protocols
 ./usr/local/etc/rc_maps.cfg
 ./usr/local/include
 ./usr/local/include/libdvbv5
@@ -236,49 +236,44 @@
 ./usr/local/include/libv4lconvert.h
 ./usr/local/include/libv4l-plugin.h
 ./usr/local/lib
-./usr/local/lib/libdvbv5.a
-./usr/local/lib/libdvbv5.la
-./usr/local/lib/libdvbv5.so
-./usr/local/lib/libdvbv5.so.0
-./usr/local/lib/libdvbv5.so.0.0.0
-./usr/local/lib/libv4l
-./usr/local/lib/libv4l1.a
-./usr/local/lib/libv4l1.la
-./usr/local/lib/libv4l1.so
-./usr/local/lib/libv4l1.so.0
-./usr/local/lib/libv4l1.so.0.0.0
-./usr/local/lib/libv4l2.a
-./usr/local/lib/libv4l2.la
-./usr/local/lib/libv4l2rds.a
-./usr/local/lib/libv4l2rds.la
-./usr/local/lib/libv4l2rds.so
-./usr/local/lib/libv4l2rds.so.0
-./usr/local/lib/libv4l2rds.so.0.0.0
-./usr/local/lib/libv4l2.so
-./usr/local/lib/libv4l2.so.0
-./usr/local/lib/libv4l2.so.0.0.0
-./usr/local/lib/libv4lconvert.a
-./usr/local/lib/libv4lconvert.la
-./usr/local/lib/libv4lconvert.so
-./usr/local/lib/libv4lconvert.so.0
-./usr/local/lib/libv4lconvert.so.0.0.0
-./usr/local/lib/libv4l/ov511-decomp
-./usr/local/lib/libv4l/ov518-decomp
-./usr/local/lib/libv4l/plugins
-./usr/local/lib/libv4l/plugins/libv4l-mplane.la
-./usr/local/lib/libv4l/plugins/libv4l-mplane.so
-./usr/local/lib/libv4l/v4l1compat.la
-./usr/local/lib/libv4l/v4l1compat.so
-./usr/local/lib/libv4l/v4l2convert.la
-./usr/local/lib/libv4l/v4l2convert.so
-./usr/local/lib/pkgconfig
-./usr/local/lib/pkgconfig/libdvbv5.pc
-./usr/local/lib/pkgconfig/libv4l1.pc
-./usr/local/lib/pkgconfig/libv4l2.pc
-./usr/local/lib/pkgconfig/libv4l2rds.pc
-./usr/local/lib/pkgconfig/libv4lconvert.pc
-./usr/local/lib/v4l1compat.so
-./usr/local/lib/v4l2convert.so
+./usr/local/lib/x86_64-linux-gnu
+./usr/local/lib/x86_64-linux-gnu/gconv
+./usr/local/lib/x86_64-linux-gnu/gconv/ARIB-STD-B24.so
+./usr/local/lib/x86_64-linux-gnu/gconv/EN300-468-TAB00.so
+./usr/local/lib/x86_64-linux-gnu/gconv/gconv-modules
+./usr/local/lib/x86_64-linux-gnu/libdvbv5.a
+./usr/local/lib/x86_64-linux-gnu/libdvbv5.so
+./usr/local/lib/x86_64-linux-gnu/libdvbv5.so.0
+./usr/local/lib/x86_64-linux-gnu/libdvbv5.so.0.0.0
+./usr/local/lib/x86_64-linux-gnu/libv4l
+./usr/local/lib/x86_64-linux-gnu/libv4l1.a
+./usr/local/lib/x86_64-linux-gnu/libv4l1.so
+./usr/local/lib/x86_64-linux-gnu/libv4l1.so.0
+./usr/local/lib/x86_64-linux-gnu/libv4l1.so.0.0.0
+./usr/local/lib/x86_64-linux-gnu/libv4l2.a
+./usr/local/lib/x86_64-linux-gnu/libv4l2rds.a
+./usr/local/lib/x86_64-linux-gnu/libv4l2rds.so
+./usr/local/lib/x86_64-linux-gnu/libv4l2rds.so.0
+./usr/local/lib/x86_64-linux-gnu/libv4l2rds.so.0.0.0
+./usr/local/lib/x86_64-linux-gnu/libv4l2.so
+./usr/local/lib/x86_64-linux-gnu/libv4l2.so.0
+./usr/local/lib/x86_64-linux-gnu/libv4l2.so.0.0.0
+./usr/local/lib/x86_64-linux-gnu/libv4lconvert.a
+./usr/local/lib/x86_64-linux-gnu/libv4lconvert.so
+./usr/local/lib/x86_64-linux-gnu/libv4lconvert.so.0
+./usr/local/lib/x86_64-linux-gnu/libv4lconvert.so.0.0.0
+./usr/local/lib/x86_64-linux-gnu/libv4l/ov511-decomp
+./usr/local/lib/x86_64-linux-gnu/libv4l/ov518-decomp
+./usr/local/lib/x86_64-linux-gnu/libv4l/plugins
+./usr/local/lib/x86_64-linux-gnu/libv4l/plugins/libv4l-mplane.so
+./usr/local/lib/x86_64-linux-gnu/libv4l/v4l1compat.so
+./usr/local/lib/x86_64-linux-gnu/libv4l/v4l2convert.so
+./usr/local/lib/x86_64-linux-gnu/pkgconfig
+./usr/local/lib/x86_64-linux-gnu/pkgconfig/libdvbv5.pc
+./usr/local/lib/x86_64-linux-gnu/pkgconfig/libv4l1.pc
+./usr/local/lib/x86_64-linux-gnu/pkgconfig/libv4l2.pc
+./usr/local/lib/x86_64-linux-gnu/pkgconfig/libv4l2rds.pc
+./usr/local/lib/x86_64-linux-gnu/pkgconfig/libv4lconvert.pc
 ./usr/local/sbin
 ./usr/local/sbin/v4l2-dbg
 ./usr/local/share
#9 lore raw

Em Mon, 17 May 2021 23:13:45 +0100
Kieran Bingham <[email protected]> escreveu:

Quoted 7 lines

Ah, yes I should have been clearer there - but they don't do 'anything' except the bare minimum for both:

----------

kbingham@Q:/opt/projects/media/v4l-utils$ cat make-autoconf.sh
#!/bin/sh
Quoted 6 lines

export CCACHE_DISABLE=true

rm -rf build-autoconf
mkdir -p build-autoconf
cd build-autoconf
../configure

This is not the bare minimum. It is just the opposite: the way we intentionally implemented configure.ac is to auto-detect as much as possible what tools are supported and to build the maximum number of features as possible.

See, when one calls:

	$ ./configure

It will display at the end the optional features that were enabled that we found important enough to report:

compile time options summary
============================

    Host OS                    : linux-gnu
    X11                        : yes
    GL                         : yes
    glu                        : yes

libelf : yes
libjpeg : yes
libudev : yes
pthread : yes
QT version : v5.4 with QtGL
ALSA support : yes
SDL support : yes

build dynamic libs : yes
build static libs : yes

gconv : no

dynamic libv4l : yes
v4l_plugins : yes
v4l_wrappers : yes
libdvbv5 : yes
dvbv5-daemon : yes
v4lutils : yes
qv4l2 : yes
qvidcap : yes
v4l2-ctl uses libv4l : yes
v4l2-ctl-32 : no
v4l2-compliance : yes
v4l2-compliance uses libv4l: yes
v4l2-compliance-32 : no
BPF IR Decoders: : no

a bare minimum setting would print most (if not all) above features as "no".

See, we never treated internationalization or documentation as features. So, it won't display anything about that. It will just build docs and .po files by default, if the needed tools and libraries are present at the building system.

Yet, autotools have some options that could disable building them. ./configure --help is your friend[1], if you want a bare minimum build.

[1] You can see most of the options that can be enabled/disabled with:

	./configure --help|grep -E '(enable|disable|with)'

    The command would be similar to: 

	./configure --disable-nls --disable-libdvbv5 --disable-dyn-libv4l --disable-v4l-utils --disable-v4l2-compliance-libv4l --disable-v4l2-ctl-libv4l --disable-qv4l2 --disable-qvidcap --disable-bpf --without-jpeg --without-libudev --disable-gconv --disable-doxygen-doc --disable-doxygen-dot --disable-doxygen-html --disable-doxygen-ps --disable-doxygen-pdf

	here, after running the above, building with autoconf was very fast.

		$ make clean
		$ time CCACHE_DISABLE=true make -j8
		real	0m4,594s
		user	0m14,050s
		sys	0m1,613s
Quoted 2 lines

meson build-meson
ninja -C build-meson

I would be expecting that the above would do the same, but it sounds it is lacking a lot of things...

Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

du -sh build-autoconf build-meson/
129M build-autoconf
69M build-meson/

as otherwise the difference won't be so huge.

See, you're comparing very different things, as autotools is clearly doing a lot more than meson. If they were building the same thing, I would expect a difference at the order of tens of KB at most, due to temporary/cache files, build logs and, in the case of autotools, m4 files. Neither of those are huge.

Assuming that both builds used the same compilers, a difference at the order of (tens of) MB can only be explained if Meson build was very incomplete, and/or the output files don't carry the same debug info.

Thanks,
Mauro

#10 lore raw

Hi Mauro,

Quoted 10 lines · Mauro Carvalho Chehab

Em Mon, 17 May 2021 23:13:45 +0100
Kieran Bingham <[email protected]> escreveu:

Quoted 7 lines

Ah, yes I should have been clearer there - but they don't do 'anything' except the bare minimum for both:

----------

kbingham@Q:/opt/projects/media/v4l-utils$ cat make-autoconf.sh
#!/bin/sh
Quoted 8 lines
Quoted 6 lines

export CCACHE_DISABLE=true

rm -rf build-autoconf
mkdir -p build-autoconf
cd build-autoconf
../configure

This is not the bare minimum. It is just the opposite: the way we

Ok, I'm sorry - I need to be clearer about my being clearer.

My *scripts* don't do anything except the bare minimum to build.

I pulled out the simplest commands to build both versions so that the times could be compared.

- Autoconf
mkdir; ../configure; make

- Meson
meson build; ninja

I expected no parameters to be passed

(Yes, I played with these in the last reply to see the effects suggested by Ariel, but I shouldn't have to)

Quoted 3 lines

intentionally implemented configure.ac is to auto-detect as much as possible what tools are supported and to build the maximum number of features as possible.

Agreed, I expect both sides to auto-detect the most features that are possible to build on a given configuration by default, *and* I expect both versions to detect the same.

Quoted 42 lines

See, when one calls:

	$ ./configure

It will display at the end the optional features that were enabled that we found important enough to report:

compile time options summary
============================

    Host OS                    : linux-gnu
    X11                        : yes
    GL                         : yes
    glu                        : yes

libelf : yes
libjpeg : yes
libudev : yes
pthread : yes
QT version : v5.4 with QtGL
ALSA support : yes
SDL support : yes

build dynamic libs : yes
build static libs : yes

gconv : no

dynamic libv4l : yes
v4l_plugins : yes
v4l_wrappers : yes
libdvbv5 : yes
dvbv5-daemon : yes
v4lutils : yes
qv4l2 : yes
qvidcap : yes
v4l2-ctl uses libv4l : yes
v4l2-ctl-32 : no
v4l2-compliance : yes
v4l2-compliance uses libv4l: yes
v4l2-compliance-32 : no
BPF IR Decoders: : no

Quoted 2 lines

a bare minimum setting would print most (if not all) above features as "no".

This is a mis-communication. I said (or intended to say?) my scripts do the bare minimum.

I agree, if we want to compare both build systems; building the bare minimum - then that list would be full of no's - but why would we want to compare two build systems doing nothing.

ok, so that might be one data point, but not one I'm interested in comparing. I want to see what differences occur between both build systems building everything, and ensure that both produce the same result.

It would likely be useful to get a summary() of what is and isn't built from the meson to produce a comparable output summary.

Quoted 4 lines

See, we never treated internationalization or documentation as features. So, it won't display anything about that. It will just build docs and .po files by default, if the needed tools and libraries are present at the building system.

I think that's fine (building when possible).

I think the meson build (in my system configuration) didn't do this, lets call that a bug in the current meson version. I've tried to highlight that in the previous e-mail.

We need to do testing of different cases to make sure that the features are comparable across both systems.

That's what I was trying to do.

Quoted 3 lines

Yet, autotools have some options that could disable building them. ./configure --help is your friend[1], if you want a bare minimum build.

Yes, I'm aware of these options. A 'bare minimum build' was not my goal.

Quoted 15 lines

[1] You can see most of the options that can be enabled/disabled with:

	./configure --help|grep -E '(enable|disable|with)'

    The command would be similar to: 

	./configure --disable-nls --disable-libdvbv5 --disable-dyn-libv4l --disable-v4l-utils --disable-v4l2-compliance-libv4l --disable-v4l2-ctl-libv4l --disable-qv4l2 --disable-qvidcap --disable-bpf --without-jpeg --without-libudev --disable-gconv --disable-doxygen-doc --disable-doxygen-dot --disable-doxygen-html --disable-doxygen-ps --disable-doxygen-pdf

	here, after running the above, building with autoconf was very fast.

		$ make clean
		$ time CCACHE_DISABLE=true make -j8
		real	0m4,594s
		user	0m14,050s
		sys	0m1,613s

This isn't what I've been comparing.

I have been trying to (or I want to) compare the performance differences of two *full* builds on the same system. I'm sorry that my language on the previous e-mail caused confusion there.

To clarify, I expect a
minimal build script (*no parameters passed*)

to provide a
maximal build configuration (everything that could be built).

And I would expect both sides to produce the same feature set. If they don't - then it should be fixed.

Quoted 5 lines
Quoted 2 lines

meson build-meson
ninja -C build-meson

I would be expecting that the above would do the same, but it sounds it is lacking a lot of things...

meson build-meson; ninja -C build-meson should be building a maximal configuration. (if it isn't, that's something to look at)

As identified, I think there are things missing, or not yet the same which is why I've been highlighting the size of the build directories.

In particular I'm highlighting the fact that I have observed internationalisation files are missing.

Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

du -sh build-autoconf build-meson/
129M build-autoconf
69M build-meson/

However I do not think that difference alone can account for a 60MB difference.

Quoted 2 lines

as otherwise the difference won't be so huge.

Agreed.

Quoted 5 lines

See, you're comparing very different things, as autotools is clearly doing a lot more than meson. If they were building the same thing, I would expect a difference at the order of tens of KB at most, due to temporary/cache files, build logs and, in the case of autotools, m4 files. Neither of those are huge.

Agreed.

Something is missing, that's to be investigated. That's why I've been highlighting the difference in build output size specifically. But I do not know what the difference is. I just built them together.

Re-reading my mail from last night - it looks like I was being overly enthusiastic on the speed differences. I'm sorry - it was late, and I was giddy watching it fly by. (The things people do for fun hey)

I was reporting that they are not building the same output, so I shouldn't have made any comment on comparing speeds until they are producing identical outputs.

Quoted 4 lines

Assuming that both builds used the same compilers, a difference at the order of (tens of) MB can only be explained if Meson build was very incomplete, and/or the output files don't carry the same debug info.

Indeed - compiler debug info level changes could be another thing to check. That could account for a larger build output difference, but there's certainly a large discrepancy to solve.

Signature · 3 lines
Regards
--
Kieran
#11 lore raw

Em Tue, 18 May 2021 11:18:02 +0100
Kieran Bingham <[email protected]> escreveu:

Quoted 20 lines

Hi Mauro,

Quoted 17 lines · Mauro Carvalho Chehab

Em Mon, 17 May 2021 23:13:45 +0100
Kieran Bingham <[email protected]> escreveu:

Quoted 13 lines

Ah, yes I should have been clearer there - but they don't do 'anything' except the bare minimum for both:

----------

kbingham@Q:/opt/projects/media/v4l-utils$ cat make-autoconf.sh
#!/bin/sh

export CCACHE_DISABLE=true

rm -rf build-autoconf
mkdir -p build-autoconf
cd build-autoconf
../configure

Quoted 5 lines
Quoted 1 line

This is not the bare minimum. It is just the opposite: the way we

Ok, I'm sorry - I need to be clearer about my being clearer.

My *scripts* don't do anything except the bare minimum to build.

Ah, ok.

Quoted 43 lines
Quoted 27 lines

See, when one calls:

	$ ./configure

It will display at the end the optional features that were enabled that we found important enough to report:

compile time options summary
============================

    Host OS                    : linux-gnu
    X11                        : yes
    GL                         : yes
    glu                        : yes

libelf : yes
libjpeg : yes
libudev : yes
pthread : yes
QT version : v5.4 with QtGL
ALSA support : yes
SDL support : yes

build dynamic libs : yes
build static libs : yes

gconv : no

Quoted 15 lines

dynamic libv4l : yes
v4l_plugins : yes
v4l_wrappers : yes
libdvbv5 : yes
dvbv5-daemon : yes
v4lutils : yes
qv4l2 : yes
qvidcap : yes
v4l2-ctl uses libv4l : yes
v4l2-ctl-32 : no
v4l2-compliance : yes
v4l2-compliance uses libv4l: yes
v4l2-compliance-32 : no
BPF IR Decoders: : no

Quoted 2 lines

It would likely be useful to get a summary() of what is and isn't built from the meson to produce a comparable output summary.

Agreed. The best is to summarize at the end what optional features were disabled.

Quoted 8 lines
Quoted 5 lines
Quoted 2 lines

meson build-meson
ninja -C build-meson

I would be expecting that the above would do the same, but it sounds it is lacking a lot of things...

meson build-meson; ninja -C build-meson should be building a maximal configuration. (if it isn't, that's something to look at)

Yes. If meson is not building the same stuff at the same system, there's a bug somewhere, as all the build dependencies should be the same ;-)

Quoted 7 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

du -sh build-autoconf build-meson/
129M build-autoconf
69M build-meson/

However I do not think that difference alone can account for a 60MB difference.

It is probably some cpp files that weren't built. Those usually produce larger execs and takes a lot more time to build than c files.

Quoted 3 lines

Re-reading my mail from last night - it looks like I was being overly enthusiastic on the speed differences. I'm sorry - it was late, and I was giddy watching it fly by. (The things people do for fun hey)

Yes, that was the impression I had. FYI, I don't care at all for the building speed. Machine time is a lot cheaper than developers and maintainers time ;-)

We never did (nor I think it makes sense to do) any changes at the autoconf to make it run faster (there are some things that could probably be done there to speed up some things).

So, what really concerns the amount of work to maintain, like how much time was spent to fix building bugs not related to newly added code, and how much efforts it takes to maintain the CI instances at builder.linuxtv.org.

Right now, at builder, we have 1 project there hosted with meson, 1 project with cmake and the other non-kernel ones with autotools.

I never had to do anything at the server due to cmake/autotools build issues on the project(s) that use them, but the only one that uses meson requires constant interventions from my side to fix the build, as it has been requiring from time to time upgrades at the building tool(*). So, it is a lot more expensive to maintain, as it consumes *my* time ;-)

(*) Our server use the latest Debian version. Breakages there due to
the lack of support of the cmake/autotools/meson version that it is there basically means that people using LTS distros won't be able to (easily) build the tool, as the distro-provided toolset is not enough.
It is a bad idea to require that toolchain versions that aren't already provided by the major distros that aren't at EOL.

Quoted 8 lines
Quoted 4 lines

Assuming that both builds used the same compilers, a difference at the order of (tens of) MB can only be explained if Meson build was very incomplete, and/or the output files don't carry the same debug info.

Indeed - compiler debug info level changes could be another thing to check. That could account for a larger build output difference, but there's certainly a large discrepancy to solve.

Yes. In order to do any sort of comparison, both should use exactly the same flags (and compilers) when generating debug data. So, the build size should be (about) same (**).

(**) It will never be the same, as each build toolchain produces
different cache and temporary files and may eventually write a log file to help debugging issues (like autoconf does).

Thanks,
Mauro

#12 lore raw
In reply to Kieran Bingham

Hi Kieran, Mauro,

Thanks for all the feedback, I'll try to review and address all the comments you've posted. Just a quick comment related to the output size and debug level.

Quoted 6 lines · Kieran Bingham

Hi Mauro,

Quoted 3 lines · Mauro Carvalho Chehab

Em Mon, 17 May 2021 23:13:45 +0100
Kieran Bingham <[email protected]> escreveu:

[snip]

Quoted 8 lines
Quoted 4 lines

Assuming that both builds used the same compilers, a difference at the order of (tens of) MB can only be explained if Meson build was very incomplete, and/or the output files don't carry the same debug info.

Indeed - compiler debug info level changes could be another thing to check. That could account for a larger build output difference, but there's certainly a large discrepancy to solve.

I've just checked and autotools is building by default with -g -O2, so meson should be built with --buildtype=debugoptimized to get the same results.

I'll dig deeper and post more soon.

Regards,
Ariel

#13 lore raw
In reply to Kieran Bingham

Kieran,

Quoted 13 lines · Kieran Bingham

Hi Ariel,

Quoted 3 lines · Ariel D'Alessandro

Hi Kieran!

Thanks a lot for the feedback.

No worries, somehow this is almost fun to test out (mostly because of watching how crazy fast it is building in meson in comparison).

Quoted 2 lines · Kieran Bingham
Quoted 1 line

Hi Ariel,

[Omitting as there's further discussion in other mail responses from this same thread.]

Quoted 11 lines

The next step was to install both versions, as that will compare what's actually built and results in the package, and in fact they do look quite similar.

There are a few small changes, that might be worth looking into - but I don't think there's any major difference in what is or isn't built. (unless the Internationalisation stuff really is the major factor)

- Spurious meson.build file is being installed at /lib/udev/rc_keymaps/meson.build

Will be fixed by:

utils/keytable/Makefile.am +1 -1
index d3edcf77..deb13934 100644
@@ -1,7 +1,7 @@
 bin_PROGRAMS = ir-keytable
 man_MANS = ir-keytable.1 rc_keymap.5
 sysconf_DATA = rc_maps.cfg
-keytablesystem_DATA = $(srcdir)/rc_keymaps/*
+keytablesystem_DATA = $(srcdir)/rc_keymaps/*.toml
 udevrules_DATA = 70-infrared.rules
 if WITH_BPF
 if HAVE_SYSTEMD
Quoted 6 lines

- Meson decided to default libdir to

     /usr/local/lib/x86_64-linux-gnu

while autoconf used
/usr/local/lib
(it's likely handled by the package managers anyway)

  $ meson configure ../build-meson/ | grep libdir
    libdir    lib/x86_64-linux-gnu    Library directory

Package manager should run meson with configuration option -Dlibdir=lib. Will document this.

Quoted 3 lines

- /usr/local/etc/rc_keymaps/protocols
was installed though autoconf didn't ?

I don't get that difference. Maybe it's related to a different set of features detected by the two build systems?

Quoted 4 lines

- Autoconf seemed to install v4l1compat.so and v4l2convert.so (possibly in duplicate) in the libdir, as well as in libdir/libv4l/ I'm not sure if that's a bug or a feature in autoconf

Right, an extra symlink is being added to those libs. Is this really needed?

Quoted 11 lines

Ah, and again - size of those installs looks quite different suggesting (probably that localisation) has differed between the two builds quite drastically

(after DESTDIR=/tmp/v4l2-$BUILDSYSTEM {make, ninja} install)

du -sh /tmp/v4l2-autoconf/ /tmp/v4l2-meson/
39M /tmp/v4l2-autoconf/
22M /tmp/v4l2-meson/

As mentioned in another response. Autotools is building with -g -O2 by default, that'd the equivalent meson configuration option --buildtype=debugoptimized. With this configuration the installtion sizes are not that different:

  $ du -s installation_m*
  37068	installation_make
  37848	installation_meson

In this case the difference is related to libtool .la files not being generated by meson and gconv/ only installed by meson. The latest is probably a feature being only detected by meson in this case, will check that out.

~/dev/v4l$ diff -r files_make files_meson
233a234,236

Quoted 3 lines

./usr/local/lib/gconv/ARIB-STD-B24.so
./usr/local/lib/gconv/EN300-468-TAB00.so
./usr/local/lib/gconv/gconv-modules

235d237
< ./usr/local/lib/libdvbv5.la
238d239
< ./usr/local/lib/libv4l1.la
241d241
< ./usr/local/lib/libv4l2.la
243d242
< ./usr/local/lib/libv4l2rds.la
247d245
< ./usr/local/lib/libv4lconvert.la
251d248
< ./usr/local/lib/libv4l/plugins/libv4l-mplane.la
253d249
< ./usr/local/lib/libv4l/v4l1compat.la
255d250
< ./usr/local/lib/libv4l/v4l2convert.la

More soon,
Ariel

#14 lore raw

Em Wed, 16 Jun 2021 11:26:10 -0300
Ariel D'Alessandro <[email protected]> escreveu:

Quoted 11 lines

Kieran,

Quoted 5 lines

- Meson decided to default libdir to

     /usr/local/lib/x86_64-linux-gnu

while autoconf used
/usr/local/lib
(it's likely handled by the package managers anyway)

  $ meson configure ../build-meson/ | grep libdir
    libdir    lib/x86_64-linux-gnu    Library directory

The default isn't nice, and will likely cause troubles for the users, as /usr/local/lib/x86_64-linux-gnu would hardly be at the ld.so.conf list of paths for most people. So, when one would try to run a program, it will fail.

Quoted 3 lines

As mentioned in another response. Autotools is building with -g -O2 by default, that'd the equivalent meson configuration option --buildtype=debugoptimized.

I can't understand the Meson's default... no optimization and no debug! Basically something that it is useless for both developers and for production. I wonder why they chose a crap default like that...

Quoted 6 lines

With this configuration the installtion
sizes are not that different:

  $ du -s installation_m*
  37068	installation_make
  37848	installation_meson

It sounds a lot more coherent.

Quoted 4 lines

In this case the difference is related to libtool .la files not being generated by meson and gconv/ only installed by meson. The latest is probably a feature being only detected by meson in this case, will check that out.

It was opted to not enable gconv by default, as similar patchset - needed to support ARIB STD B-24 charset used by Japanese digital TV - was sent to gconv upstream (not sure if it was merged or not). On other words, the contrib/gconv stuff is independent of v4l-utils itself: it basically adds an extra charset to be used by gconv upstream.

The only reason why it is present at v4l2-utils is that this charset is present on ISDB tables on TV broadcasts in Japan. The gconv library needs to support it, in order to convert characters from MPEG tables to the system's charset.

Btw, that's basically one of the reasons why we print a summary of the options when ./configure runs.

Thanks,
Mauro

#15 lore raw
Quoted 9 lines · Mauro Carvalho Chehab

As mentioned in another response. Autotools is building with `-g

Quoted 3 lines

-O2` by
default, that'd the equivalent meson configuration option --buildtype=debugoptimized.

I can't understand the Meson's default... no optimization and no debug!
Basically something that it is useless for both developers and for production. I wonder why they chose a crap default like that...

Most project make it the default with:
project(..., default_options : ['buildtype=debugoptimized'])

I _think_ it is not the default because it is often less debugable when it's optimized.

Regards,
Xavier Claessens.

#16 lore raw
In reply to Mauro Carvalho Chehab

Le mercredi 16 juin 2021 à 16:59 +0200, Mauro Carvalho Chehab a écrit :

Quoted 12 lines

Em Wed, 16 Jun 2021 11:26:10 -0300
Ariel D'Alessandro <[email protected]> escreveu:

Quoted 9 lines

Kieran,

Quoted 5 lines

- Meson decided to default libdir to

     /usr/local/lib/x86_64-linux-gnu

while autoconf used
/usr/local/lib
(it's likely handled by the package managers anyway)

Quoted 7 lines
Quoted 2 lines
  $ meson configure ../build-meson/ | grep libdir
    libdir    lib/x86_64-linux-gnu    Library directory

The default isn't nice, and will likely cause troubles for the users, as /usr/local/lib/x86_64-linux-gnu would hardly be at the ld.so.conf list of paths for most people. So, when one would try to run a program, it will fail.

It is the other way around, meson default to what ld.so.conf (your distribution) is configured to. In this case you are running a debian/unbutu system, and this is the proper path for multi-arch library placement.

If you try this on Fedora with a 64bit CPU, it would have picked /usr/local/lib64. Which is also the proper path for that Linux distribution. Debian has a more complex way, but it covers more use cases.

Quoted 8 lines
Quoted 4 lines

As mentioned in another response. Autotools is building with -g -O2 by default, that'd the equivalent meson configuration option --buildtype=debugoptimized.

I can't understand the Meson's default... no optimization and no debug! Basically something that it is useless for both developers and for production. I wonder why they chose a crap default like that...

Each projects have their own opinion on this. I believe debugoptimize is the right default. Here's how GStreamer project is setup (very first line of the meson code):

project('gstreamer', 'c',
version : '1.19.1.1',
meson_version : '>= 0.54', default_options : [ 'warning_level=1',
'buildtype=debugoptimized' ])

This is trivially straightforward and I understood Ariel will fix it in next version. Thanks for spotting.

Quoted 21 lines
Quoted 7 lines

With this configuration the installtion
sizes are not that different:

  $ du -s installation_m*
  37068	installation_make
  37848	installation_meson

It sounds a lot more coherent.

Quoted 4 lines

In this case the difference is related to libtool .la files not being generated by meson and gconv/ only installed by meson. The latest is probably a feature being only detected by meson in this case, will check that out.

It was opted to not enable gconv by default, as similar patchset - needed to support ARIB STD B-24 charset used by Japanese digital TV - was sent to gconv upstream (not sure if it was merged or not). On other words, the contrib/gconv stuff is independent of v4l-utils itself: it basically adds an extra charset to be used by gconv upstream.

Quoted 7 lines

The only reason why it is present at v4l2-utils is that this charset is present on ISDB tables on TV broadcasts in Japan. The gconv library needs to support it, in order to convert characters from MPEG tables to the system's charset.

Btw, that's basically one of the reasons why we print a summary of the options when ./configure runs.

We can and should definitely do that same.

Quoted 3 lines

Thanks,
Mauro

#17 lore raw
In reply to Mauro Carvalho Chehab
Quoted 11 lines · Mauro Carvalho Chehab

Em Wed, 16 Jun 2021 11:26:10 -0300 Ariel D'Alessandro escreveu:

Quoted 9 lines

Kieran,

Quoted 5 lines

- Meson decided to default libdir to

     /usr/local/lib/x86_64-linux-gnu

while autoconf used
/usr/local/lib
(it's likely handled by the package managers anyway)

Quoted 7 lines
Quoted 2 lines
  $ meson configure ../build-meson/ | grep libdir
    libdir    lib/x86_64-linux-gnu    Library directory

The default isn't nice, and will likely cause troubles for the users, as /usr/local/lib/x86_64-linux-gnu would hardly be at the ld.so.conf list of paths for most people. So, when one would try to run a program, it will fail.

This depends on the distribution. On Debian-like distributions, to enable multi-arch support, an arch-specific directory is used. Debian adds it to ld.so.conf (for both /usr/lib and /usr/local/lib). On other distributions, /usr/lib or /usr/lib64 will be used by meson.

Quoted 7 lines
Quoted 3 lines

As mentioned in another response. Autotools is building with -g -O2 by default, that'd the equivalent meson configuration option --buildtype=debugoptimized.

I can't understand the Meson's default... no optimization and no debug! Basically something that it is useless for both developers and for production. I wonder why they chose a crap default like that...

The default is debug, so it includes debug (and no optimization). This can be overridden at the project level with

default_options : ['buildtype=debugoptimized']

in the project() function.

Quoted 27 lines
Quoted 6 lines

With this configuration the installtion
sizes are not that different:

  $ du -s installation_m*
  37068	installation_make
  37848	installation_meson

It sounds a lot more coherent.

Quoted 4 lines

In this case the difference is related to libtool .la files not being generated by meson and gconv/ only installed by meson. The latest is probably a feature being only detected by meson in this case, will check that out.

It was opted to not enable gconv by default, as similar patchset - needed to support ARIB STD B-24 charset used by Japanese digital TV - was sent to gconv upstream (not sure if it was merged or not). On other words, the contrib/gconv stuff is independent of v4l-utils itself: it basically adds an extra charset to be used by gconv upstream.

The only reason why it is present at v4l2-utils is that this charset is present on ISDB tables on TV broadcasts in Japan. The gconv library needs to support it, in order to convert characters from MPEG tables to the system's charset.

Btw, that's basically one of the reasons why we print a summary of the options when ./configure runs.

Signature · 3 lines
Regards,

Laurent Pinchart
#18 lore raw
In reply to Ariel D'Alessandro

Hello,

Quoted 10 lines · Ariel D'Alessandro

Hi all,

Another attempt to support meson build, addressing comments/fixes from reviewers.

This patchset was developed on top of v4l-utils current master branch:

commit f0c7e3d71eaf4182bae7eb3ee0e43b4eeb047ea9
Author: Hans Verkuil <[email protected]>

Quoted 7 lines

v4l2-ctl: add '--set-edid type=list' support

You can find the patchset pushed to the following branch:

https://gitlab.collabora.com/adalessandro/v4l-utils/-/tree/v4l-utils-meson-v5

Feedback appreciated as always :-)

Reviving a bit of an old thread, I'd like to know what is blocking the merge of this series. In particular, Gregor, as you maintain v4l-utils, are you happy with this series, or do you have a list of features you want to see implemented (or of bugs that needs to be fixed) before you will consider merging it ?

Quoted 180 lines

Changes from v4:

* Dropped install_subdir() work-around to install empty dir. Supported

    now in meson v0.57.

* Bump to meson v0.57. Replaced deprecated methods.
* Added override_dependency() calls on libraries.
* Properly check for bpf and SDL2 dependencies.
* Removed libraries_private field from libv4lconvert pkgconfig.
* Documented meson static builds support.
* Set default compiler standard options.
* Added bpf check in keytable.

Changes from v3:

* Split Doxygen support patch.
* Properly generate config.h configuration file.

Changes from v2:

* Updated to current master branch.
* Moved README to markdown syntax.
* Documented meson build.
* Set PACKAGE_VERSION config macro as quoted.

Changes from v1:

* Updated project version to 1.21.0.
* Fixed clang includes in keytable bpf compilation.
* Improved variable reutilization in meson scripts.
* Set libraries version and soversion.
* Control symbol visibility.
* Install empty 'protocols' directory in keytable user dir.
* Fixed svg filenames in qv4l2 and qvidcap.
* Added support for Doxygen documentation (html and man).
* Updated required meson version to v0.53 (for fs module).
* Added new files to EXTRA_DIST in each Makefile.am.

Regards,

Ariel D'Alessandro (5):
Move README to markdown syntax
Add support for meson building
Copy Doxygen configuration file to doc/
meson: Add support for doxygen documentation
Makefile.am: Distribute meson related files

 .gitignore                                    |    1 +
 INSTALL.meson.md                              |  142 +
 Makefile.am                                   |    5 +-
 README                                        |  274 --
 README.md                                     |  332 +++
 contrib/Makefile.am                           |    3 +-
 contrib/cobalt-ctl/Makefile.am                |    2 +
 contrib/cobalt-ctl/meson.build                |    8 +
 contrib/decode_tm6000/Makefile.am             |    2 +
 contrib/decode_tm6000/meson.build             |   14 +
 contrib/gconv/Makefile.am                     |    2 +-
 contrib/gconv/meson.build                     |   44 +
 contrib/meson.build                           |   13 +
 contrib/rds-saa6588/Makefile.am               |    2 +
 contrib/rds-saa6588/meson.build               |    7 +
 contrib/test/Makefile.am                      |    3 +-
 contrib/test/meson.build                      |  143 +
 contrib/xc3028-firmware/Makefile.am           |    2 +-
 contrib/xc3028-firmware/meson.build           |   11 +
 doc/Doxyfile.in                               | 2352 +++++++++++++++++
 doc/meson.build                               |   34 +
 lib/Makefile.am                               |    2 +-
 lib/libdvbv5/Makefile.am                      |    2 +-
 lib/libdvbv5/meson.build                      |  159 ++
 lib/libv4l-mplane/Makefile.am                 |    2 +
 lib/libv4l-mplane/meson.build                 |   23 +
 lib/libv4l1/Makefile.am                       |    2 +-
 lib/libv4l1/meson.build                       |   62 +
 lib/libv4l2/Makefile.am                       |    2 +-
 lib/libv4l2/meson.build                       |   71 +
 lib/libv4l2rds/Makefile.am                    |    2 +
 lib/libv4l2rds/meson.build                    |   37 +
 lib/libv4lconvert/Makefile.am                 |    2 +-
 lib/libv4lconvert/meson.build                 |  117 +
 lib/meson.build                               |   11 +
 libdvbv5-po/meson.build                       |    3 +
 meson.build                                   |  334 +++
 meson_options.txt                             |   50 +
 utils/Makefile.am                             |    2 +-
 utils/cec-compliance/Makefile.am              |    2 +-
 utils/cec-compliance/meson.build              |   22 +
 utils/cec-ctl/Makefile.am                     |    2 +-
 utils/cec-ctl/meson.build                     |   18 +
 utils/cec-follower/Makefile.am                |    2 +-
 utils/cec-follower/meson.build                |   19 +
 utils/cx18-ctl/Makefile.am                    |    2 +
 utils/cx18-ctl/meson.build                    |    8 +
 utils/dvb/Makefile.am                         |    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/Makefile.am                      |    2 +
 utils/ir-ctl/meson.build                      |   23 +
 utils/ivtv-ctl/Makefile.am                    |    2 +
 utils/ivtv-ctl/meson.build                    |   13 +
 utils/keytable/Makefile.am                    |    3 +-
 utils/keytable/bpf_protocols/Makefile.am      |    3 +-
 .../bpf_protocols/clang_sys_includes.sh       |    9 +
 utils/keytable/bpf_protocols/meson.build      |   31 +
 utils/keytable/meson.build                    |   81 +
 utils/keytable/rc_keymaps/meson.build         |  151 ++
 utils/libcecutil/Makefile.am                  |    2 +-
 utils/libcecutil/meson.build                  |   45 +
 utils/libmedia_dev/Makefile.am                |    2 +-
 utils/libmedia_dev/meson.build                |   14 +
 utils/libv4l2util/Makefile.am                 |    2 +-
 utils/libv4l2util/meson.build                 |   16 +
 utils/media-ctl/Makefile.am                   |    2 +
 utils/media-ctl/meson.build                   |   43 +
 utils/meson.build                             |   46 +
 utils/qv4l2/Makefile.am                       |    3 +-
 utils/qv4l2/meson.build                       |   80 +
 utils/qvidcap/Makefile.am                     |    3 +-
 utils/qvidcap/meson.build                     |   82 +
 utils/rds-ctl/Makefile.am                     |    1 +
 utils/rds-ctl/meson.build                     |   13 +
 utils/v4l2-compliance/Makefile.am             |    2 +-
 utils/v4l2-compliance/meson.build             |   58 +
 utils/v4l2-ctl/Makefile.am                    |    2 +-
 utils/v4l2-ctl/meson.build                    |   75 +
 utils/v4l2-dbg/Makefile.am                    |    2 +-
 utils/v4l2-dbg/meson.build                    |   16 +
 utils/v4l2-sysfs-path/Makefile.am             |    2 +
 utils/v4l2-sysfs-path/meson.build             |   14 +
 v4l-utils-po/meson.build                      |    3 +
 85 files changed, 4987 insertions(+), 299 deletions(-)
 create mode 100644 INSTALL.meson.md
 delete mode 100644 README
 create mode 100644 README.md
 create mode 100644 contrib/cobalt-ctl/meson.build
 create mode 100644 contrib/decode_tm6000/meson.build
 create mode 100644 contrib/gconv/meson.build
 create mode 100644 contrib/meson.build
 create mode 100644 contrib/rds-saa6588/meson.build
 create mode 100644 contrib/test/meson.build
 create mode 100644 contrib/xc3028-firmware/meson.build
 create mode 100644 doc/Doxyfile.in
 create mode 100644 doc/meson.build
 create mode 100644 lib/libdvbv5/meson.build
 create mode 100644 lib/libv4l-mplane/meson.build
 create mode 100644 lib/libv4l1/meson.build
 create mode 100644 lib/libv4l2/meson.build
 create mode 100644 lib/libv4l2rds/meson.build
 create mode 100644 lib/libv4lconvert/meson.build
 create mode 100644 lib/meson.build
 create mode 100644 libdvbv5-po/meson.build
 create mode 100644 meson.build
 create mode 100644 meson_options.txt
 create mode 100644 utils/cec-compliance/meson.build
 create mode 100644 utils/cec-ctl/meson.build
 create mode 100644 utils/cec-follower/meson.build
 create mode 100644 utils/cx18-ctl/meson.build
 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
 create mode 100644 utils/ir-ctl/meson.build
 create mode 100644 utils/ivtv-ctl/meson.build
 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
 create mode 100644 utils/libcecutil/meson.build
 create mode 100644 utils/libmedia_dev/meson.build
 create mode 100644 utils/libv4l2util/meson.build
 create mode 100644 utils/media-ctl/meson.build
 create mode 100644 utils/meson.build
 create mode 100644 utils/qv4l2/meson.build
 create mode 100644 utils/qvidcap/meson.build
 create mode 100644 utils/rds-ctl/meson.build
 create mode 100644 utils/v4l2-compliance/meson.build
 create mode 100644 utils/v4l2-ctl/meson.build
 create mode 100644 utils/v4l2-dbg/meson.build
 create mode 100644 utils/v4l2-sysfs-path/meson.build
 create mode 100644 v4l-utils-po/meson.build
Signature · 3 lines
Regards,

Laurent Pinchart
#19 lore raw

Hi Gregor,

Quoted 17 lines · Laurent Pinchart
Quoted 16 lines · Ariel D'Alessandro

Hi all,

Another attempt to support meson build, addressing comments/fixes from reviewers.

This patchset was developed on top of v4l-utils current master branch:

commit f0c7e3d71eaf4182bae7eb3ee0e43b4eeb047ea9
Author: Hans Verkuil <[email protected]>

v4l2-ctl: add '--set-edid type=list' support

You can find the patchset pushed to the following branch:

https://gitlab.collabora.com/adalessandro/v4l-utils/-/tree/v4l-utils-meson-v5

Quoted 7 lines
Quoted 1 line

Feedback appreciated as always :-)

Reviving a bit of an old thread, I'd like to know what is blocking the merge of this series. In particular, Gregor, as you maintain v4l-utils, are you happy with this series, or do you have a list of features you want to see implemented (or of bugs that needs to be fixed) before you will consider merging it ?

Ping if I may.

Ariel, in case it can be useful, I've pushed

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

with two fixups.

Quoted 180 lines
Quoted 180 lines

Changes from v4:

* Dropped install_subdir() work-around to install empty dir. Supported

    now in meson v0.57.

* Bump to meson v0.57. Replaced deprecated methods.
* Added override_dependency() calls on libraries.
* Properly check for bpf and SDL2 dependencies.
* Removed libraries_private field from libv4lconvert pkgconfig.
* Documented meson static builds support.
* Set default compiler standard options.
* Added bpf check in keytable.

Changes from v3:

* Split Doxygen support patch.
* Properly generate config.h configuration file.

Changes from v2:

* Updated to current master branch.
* Moved README to markdown syntax.
* Documented meson build.
* Set PACKAGE_VERSION config macro as quoted.

Changes from v1:

* Updated project version to 1.21.0.
* Fixed clang includes in keytable bpf compilation.
* Improved variable reutilization in meson scripts.
* Set libraries version and soversion.
* Control symbol visibility.
* Install empty 'protocols' directory in keytable user dir.
* Fixed svg filenames in qv4l2 and qvidcap.
* Added support for Doxygen documentation (html and man).
* Updated required meson version to v0.53 (for fs module).
* Added new files to EXTRA_DIST in each Makefile.am.

Regards,

Ariel D'Alessandro (5):
Move README to markdown syntax
Add support for meson building
Copy Doxygen configuration file to doc/
meson: Add support for doxygen documentation
Makefile.am: Distribute meson related files

 .gitignore                                    |    1 +
 INSTALL.meson.md                              |  142 +
 Makefile.am                                   |    5 +-
 README                                        |  274 --
 README.md                                     |  332 +++
 contrib/Makefile.am                           |    3 +-
 contrib/cobalt-ctl/Makefile.am                |    2 +
 contrib/cobalt-ctl/meson.build                |    8 +
 contrib/decode_tm6000/Makefile.am             |    2 +
 contrib/decode_tm6000/meson.build             |   14 +
 contrib/gconv/Makefile.am                     |    2 +-
 contrib/gconv/meson.build                     |   44 +
 contrib/meson.build                           |   13 +
 contrib/rds-saa6588/Makefile.am               |    2 +
 contrib/rds-saa6588/meson.build               |    7 +
 contrib/test/Makefile.am                      |    3 +-
 contrib/test/meson.build                      |  143 +
 contrib/xc3028-firmware/Makefile.am           |    2 +-
 contrib/xc3028-firmware/meson.build           |   11 +
 doc/Doxyfile.in                               | 2352 +++++++++++++++++
 doc/meson.build                               |   34 +
 lib/Makefile.am                               |    2 +-
 lib/libdvbv5/Makefile.am                      |    2 +-
 lib/libdvbv5/meson.build                      |  159 ++
 lib/libv4l-mplane/Makefile.am                 |    2 +
 lib/libv4l-mplane/meson.build                 |   23 +
 lib/libv4l1/Makefile.am                       |    2 +-
 lib/libv4l1/meson.build                       |   62 +
 lib/libv4l2/Makefile.am                       |    2 +-
 lib/libv4l2/meson.build                       |   71 +
 lib/libv4l2rds/Makefile.am                    |    2 +
 lib/libv4l2rds/meson.build                    |   37 +
 lib/libv4lconvert/Makefile.am                 |    2 +-
 lib/libv4lconvert/meson.build                 |  117 +
 lib/meson.build                               |   11 +
 libdvbv5-po/meson.build                       |    3 +
 meson.build                                   |  334 +++
 meson_options.txt                             |   50 +
 utils/Makefile.am                             |    2 +-
 utils/cec-compliance/Makefile.am              |    2 +-
 utils/cec-compliance/meson.build              |   22 +
 utils/cec-ctl/Makefile.am                     |    2 +-
 utils/cec-ctl/meson.build                     |   18 +
 utils/cec-follower/Makefile.am                |    2 +-
 utils/cec-follower/meson.build                |   19 +
 utils/cx18-ctl/Makefile.am                    |    2 +
 utils/cx18-ctl/meson.build                    |    8 +
 utils/dvb/Makefile.am                         |    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/Makefile.am                      |    2 +
 utils/ir-ctl/meson.build                      |   23 +
 utils/ivtv-ctl/Makefile.am                    |    2 +
 utils/ivtv-ctl/meson.build                    |   13 +
 utils/keytable/Makefile.am                    |    3 +-
 utils/keytable/bpf_protocols/Makefile.am      |    3 +-
 .../bpf_protocols/clang_sys_includes.sh       |    9 +
 utils/keytable/bpf_protocols/meson.build      |   31 +
 utils/keytable/meson.build                    |   81 +
 utils/keytable/rc_keymaps/meson.build         |  151 ++
 utils/libcecutil/Makefile.am                  |    2 +-
 utils/libcecutil/meson.build                  |   45 +
 utils/libmedia_dev/Makefile.am                |    2 +-
 utils/libmedia_dev/meson.build                |   14 +
 utils/libv4l2util/Makefile.am                 |    2 +-
 utils/libv4l2util/meson.build                 |   16 +
 utils/media-ctl/Makefile.am                   |    2 +
 utils/media-ctl/meson.build                   |   43 +
 utils/meson.build                             |   46 +
 utils/qv4l2/Makefile.am                       |    3 +-
 utils/qv4l2/meson.build                       |   80 +
 utils/qvidcap/Makefile.am                     |    3 +-
 utils/qvidcap/meson.build                     |   82 +
 utils/rds-ctl/Makefile.am                     |    1 +
 utils/rds-ctl/meson.build                     |   13 +
 utils/v4l2-compliance/Makefile.am             |    2 +-
 utils/v4l2-compliance/meson.build             |   58 +
 utils/v4l2-ctl/Makefile.am                    |    2 +-
 utils/v4l2-ctl/meson.build                    |   75 +
 utils/v4l2-dbg/Makefile.am                    |    2 +-
 utils/v4l2-dbg/meson.build                    |   16 +
 utils/v4l2-sysfs-path/Makefile.am             |    2 +
 utils/v4l2-sysfs-path/meson.build             |   14 +
 v4l-utils-po/meson.build                      |    3 +
 85 files changed, 4987 insertions(+), 299 deletions(-)
 create mode 100644 INSTALL.meson.md
 delete mode 100644 README
 create mode 100644 README.md
 create mode 100644 contrib/cobalt-ctl/meson.build
 create mode 100644 contrib/decode_tm6000/meson.build
 create mode 100644 contrib/gconv/meson.build
 create mode 100644 contrib/meson.build
 create mode 100644 contrib/rds-saa6588/meson.build
 create mode 100644 contrib/test/meson.build
 create mode 100644 contrib/xc3028-firmware/meson.build
 create mode 100644 doc/Doxyfile.in
 create mode 100644 doc/meson.build
 create mode 100644 lib/libdvbv5/meson.build
 create mode 100644 lib/libv4l-mplane/meson.build
 create mode 100644 lib/libv4l1/meson.build
 create mode 100644 lib/libv4l2/meson.build
 create mode 100644 lib/libv4l2rds/meson.build
 create mode 100644 lib/libv4lconvert/meson.build
 create mode 100644 lib/meson.build
 create mode 100644 libdvbv5-po/meson.build
 create mode 100644 meson.build
 create mode 100644 meson_options.txt
 create mode 100644 utils/cec-compliance/meson.build
 create mode 100644 utils/cec-ctl/meson.build
 create mode 100644 utils/cec-follower/meson.build
 create mode 100644 utils/cx18-ctl/meson.build
 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
 create mode 100644 utils/ir-ctl/meson.build
 create mode 100644 utils/ivtv-ctl/meson.build
 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
 create mode 100644 utils/libcecutil/meson.build
 create mode 100644 utils/libmedia_dev/meson.build
 create mode 100644 utils/libv4l2util/meson.build
 create mode 100644 utils/media-ctl/meson.build
 create mode 100644 utils/meson.build
 create mode 100644 utils/qv4l2/meson.build
 create mode 100644 utils/qvidcap/meson.build
 create mode 100644 utils/rds-ctl/meson.build
 create mode 100644 utils/v4l2-compliance/meson.build
 create mode 100644 utils/v4l2-ctl/meson.build
 create mode 100644 utils/v4l2-dbg/meson.build
 create mode 100644 utils/v4l2-sysfs-path/meson.build
 create mode 100644 v4l-utils-po/meson.build
Signature · 3 lines
Regards,

Laurent Pinchart
#20 lore raw
In reply to Ariel D'Alessandro

Hi,

Quoted 10 lines · Ariel D'Alessandro

Hi all,

Another attempt to support meson build, addressing comments/fixes from reviewers.

This patchset was developed on top of v4l-utils current master branch:

commit f0c7e3d71eaf4182bae7eb3ee0e43b4eeb047ea9
Author: Hans Verkuil <[email protected]>

Quoted 7 lines

v4l2-ctl: add '--set-edid type=list' support

You can find the patchset pushed to the following branch:

https://gitlab.collabora.com/adalessandro/v4l-utils/-/tree/v4l-utils-meson-v5

Feedback appreciated as always :-)

I was testing this (well, I'm using it, as I can't get the autoconf work with cross-compilation..), and I see this problem if gconv is enabled when cross-compiling for arm (buildroot system):

[1/2] Linking target contrib/gconv/EN300-468-TAB00.so
FAILED: contrib/gconv/EN300-468-TAB00.so
/home/tomba/work/buildroot/output32/host/bin/arm-buildroot-linux-gnueabihf-gcc -o contrib/gconv/EN300-468-TAB00.so contrib/gconv/EN300-468-TAB00.so.p/en300-468-tab00.c.o -Wl,--as-needed -Wl,--allow-shlib-undefined -shared -fPIC -Wl,-rpath,/usr/lib/x86_64-linux-gnu/gconv -Wl,-rpath-link,/usr/lib/x86_64-linux-gnu/gconv -Wl,--start-group /usr/lib/x86_64-linux-gnu/gconv/libJIS.so /usr/lib/x86_64-linux-gnu/gconv/libJISX0213.so -Wl,--end-group /usr/lib/x86_64-linux-gnu/gconv/libJIS.so: file not recognized: file format not recognized
collect2: error: ld returned 1 exit status
[2/2] Linking target contrib/gconv/ARIB-STD-B24.so
FAILED: contrib/gconv/ARIB-STD-B24.so
/home/tomba/work/buildroot/output32/host/bin/arm-buildroot-linux-gnueabihf-gcc -o contrib/gconv/ARIB-STD-B24.so contrib/gconv/ARIB-STD-B24.so.p/arib-std-b24.c.o -Wl,--as-needed -Wl,--allow-shlib-undefined -shared -fPIC -Wl,-rpath,/usr/lib/x86_64-linux-gnu/gconv -Wl,-rpath-link,/usr/lib/x86_64-linux-gnu/gconv -Wl,--start-group /usr/lib/x86_64-linux-gnu/gconv/libJIS.so /usr/lib/x86_64-linux-gnu/gconv/libJISX0213.so -Wl,--end-group /usr/lib/x86_64-linux-gnu/gconv/libJIS.so: file not recognized: file format not recognized

Also, would this be better, to be a bit more explicit:

- '-I.', # Needed for config.h
+ '-I' + meson.global_build_root(), # Needed for config.h

I would do the same to other ".." paths too, but maybe that's just a personal preference:

-Icontrib/test/v4l2gl.p -Icontrib/test -I../contrib/test -I../lib/include -I../include -I.

I also wonder what the "-Icontrib/test" is for.

I also see a problem when cross-compiling where a wrong config.h is included. When compiling with buildroot env, valgrind include dir is in the include paths. And valgrind has a "config.h" there...

It would be safer to have the "-I." common flag before all the rest of the parameters, instead of being after all the others, but I didn't immediately find out how to do that with meson.

Tomi

#21 lore raw
Quoted 23 lines · Tomi Valkeinen

I was testing this (well, I'm using it, as I can't get the autoconf work with cross-compilation..), and I see this problem if gconv is enabled when cross-compiling for arm (buildroot system):

[1/2] Linking target contrib/gconv/EN300-468-TAB00.so
FAILED: contrib/gconv/EN300-468-TAB00.so /home/tomba/work/buildroot/output32/host/bin/arm-buildroot-linux-gnueabihf-gcc -o contrib/gconv/EN300-468-TAB00.so contrib/gconv/EN300-468-TAB00.so.p/en300-468-tab00.c.o -Wl,--as-needed

(quoted diff) +0 -3
-Wl,--allow-shlib-undefined -shared -fPIC 
-Wl,-rpath,/usr/lib/x86_64-linux-gnu/gconv 
-Wl,-rpath-link,/usr/lib/x86_64-linux-gnu/gconv -Wl,--start-group 

/usr/lib/x86_64-linux-gnu/gconv/libJIS.so /usr/lib/x86_64-linux-gnu/gconv/libJISX0213.so -Wl,--end-group /usr/lib/x86_64-linux-gnu/gconv/libJIS.so: file not recognized: file format not recognized
collect2: error: ld returned 1 exit status
[2/2] Linking target contrib/gconv/ARIB-STD-B24.so
FAILED: contrib/gconv/ARIB-STD-B24.so /home/tomba/work/buildroot/output32/host/bin/arm-buildroot-linux-gnueabihf-gcc
-o contrib/gconv/ARIB-STD-B24.so
contrib/gconv/ARIB-STD-B24.so.p/arib-std-b24.c.o -Wl,--as-needed

(quoted diff) +0 -3
-Wl,--allow-shlib-undefined -shared -fPIC 
-Wl,-rpath,/usr/lib/x86_64-linux-gnu/gconv 
-Wl,-rpath-link,/usr/lib/x86_64-linux-gnu/gconv -Wl,--start-group 
Quoted 2 lines

/usr/lib/x86_64-linux-gnu/gconv/libJIS.so /usr/lib/x86_64-linux-gnu/gconv/libJISX0213.so -Wl,--end-group /usr/lib/x86_64-linux-gnu/gconv/libJIS.so: file not recognized: file format not recognized

You can ignore the above, I think it was an error in my meson cross file.

Tomi

#22 lore raw
Quoted 26 lines · Tomi Valkeinen
Quoted 24 lines · Tomi Valkeinen

I was testing this (well, I'm using it, as I can't get the autoconf work with
cross-compilation..), and I see this problem if gconv is enabled when cross-compiling for arm (buildroot system):

[1/2] Linking target contrib/gconv/EN300-468-TAB00.so
FAILED: contrib/gconv/EN300-468-TAB00.so /home/tomba/work/buildroot/output32/host/bin/arm-buildroot-linux-gnueabihf-gcc -o contrib/gconv/EN300-468-TAB00.so contrib/gconv/EN300-468-TAB00.so.p/en300-468-tab00.c.o -Wl,--as-needed

(quoted diff) +0 -3
-Wl,--allow-shlib-undefined -shared -fPIC 
-Wl,-rpath,/usr/lib/x86_64-linux-gnu/gconv 
-Wl,-rpath-link,/usr/lib/x86_64-linux-gnu/gconv -Wl,--start-group 

/usr/lib/x86_64-linux-gnu/gconv/libJIS.so /usr/lib/x86_64-linux-gnu/gconv/libJISX0213.so -Wl,--end-group /usr/lib/x86_64-linux-gnu/gconv/libJIS.so: file not recognized: file format not recognized
collect2: error: ld returned 1 exit status
[2/2] Linking target contrib/gconv/ARIB-STD-B24.so
FAILED: contrib/gconv/ARIB-STD-B24.so /home/tomba/work/buildroot/output32/host/bin/arm-buildroot-linux-gnueabihf-gcc -o contrib/gconv/ARIB-STD-B24.so contrib/gconv/ARIB-STD-B24.so.p/arib-std-b24.c.o -Wl,--as-needed -Wl,--allow-shlib-undefined -shared -fPIC

Quoted 8 lines
Quoted 6 lines
(quoted diff) +0 -2
-Wl,-rpath,/usr/lib/x86_64-linux-gnu/gconv 
-Wl,-rpath-link,/usr/lib/x86_64-linux-gnu/gconv -Wl,--start-group 

/usr/lib/x86_64-linux-gnu/gconv/libJIS.so /usr/lib/x86_64-linux-gnu/gconv/libJISX0213.so -Wl,--end-group /usr/lib/x86_64-linux-gnu/gconv/libJIS.so: file not recognized: file format not recognized

You can ignore the above, I think it was an error in my meson cross file.

If anyone runs into the same issue, it's likely caused by a missing sys_root option in the cross file.

Signature · 3 lines
Regards,

Laurent Pinchart
#23 lore raw
In reply to Tomi Valkeinen
Quoted 47 lines · Tomi Valkeinen

Hi,

Quoted 10 lines · Ariel D'Alessandro

Hi all,

Another attempt to support meson build, addressing comments/fixes from reviewers.

This patchset was developed on top of v4l-utils current master branch:

commit f0c7e3d71eaf4182bae7eb3ee0e43b4eeb047ea9
Author: Hans Verkuil <[email protected]>

Quoted 7 lines

v4l2-ctl: add '--set-edid type=list' support

You can find the patchset pushed to the following branch:

https://gitlab.collabora.com/adalessandro/v4l-utils/-/tree/v4l-utils-meson-v5

Feedback appreciated as always :-)

I was testing this (well, I'm using it, as I can't get the autoconf work with cross-compilation..), and I see this problem if gconv is enabled when cross-compiling for arm (buildroot system):

[1/2] Linking target contrib/gconv/EN300-468-TAB00.so
FAILED: contrib/gconv/EN300-468-TAB00.so
/home/tomba/work/buildroot/output32/host/bin/arm-buildroot-linux-gnueabihf-gcc -o contrib/gconv/EN300-468-TAB00.so contrib/gconv/EN300-468-TAB00.so.p/en300-468-tab00.c.o -Wl,--as-needed -Wl,--allow-shlib-undefined -shared -fPIC -Wl,-rpath,/usr/lib/x86_64-linux-gnu/gconv -Wl,-rpath-link,/usr/lib/x86_64-linux-gnu/gconv -Wl,--start-group /usr/lib/x86_64-linux-gnu/gconv/libJIS.so /usr/lib/x86_64-linux-gnu/gconv/libJISX0213.so -Wl,--end-group /usr/lib/x86_64-linux-gnu/gconv/libJIS.so: file not recognized: file format not recognized
collect2: error: ld returned 1 exit status
[2/2] Linking target contrib/gconv/ARIB-STD-B24.so
FAILED: contrib/gconv/ARIB-STD-B24.so
/home/tomba/work/buildroot/output32/host/bin/arm-buildroot-linux-gnueabihf-gcc -o contrib/gconv/ARIB-STD-B24.so contrib/gconv/ARIB-STD-B24.so.p/arib-std-b24.c.o -Wl,--as-needed -Wl,--allow-shlib-undefined -shared -fPIC -Wl,-rpath,/usr/lib/x86_64-linux-gnu/gconv -Wl,-rpath-link,/usr/lib/x86_64-linux-gnu/gconv -Wl,--start-group /usr/lib/x86_64-linux-gnu/gconv/libJIS.so /usr/lib/x86_64-linux-gnu/gconv/libJISX0213.so -Wl,--end-group /usr/lib/x86_64-linux-gnu/gconv/libJIS.so: file not recognized: file format not recognized

Also, would this be better, to be a bit more explicit:

(quoted diff) +1 -1
-    '-I.', # Needed for config.h
+    '-I' + meson.global_build_root(), # Needed for config.h

I would do the same to other ".." paths too, but maybe that's just a personal preference:

-Icontrib/test/v4l2gl.p -Icontrib/test -I../contrib/test -I../lib/include -I../include -I.

I also wonder what the "-Icontrib/test" is for.

Quoted 7 lines

I also see a problem when cross-compiling where a wrong config.h is included. When compiling with buildroot env, valgrind include dir is in the include paths. And valgrind has a "config.h" there...

It would be safer to have the "-I." common flag before all the rest of the parameters, instead of being after all the others, but I didn't immediately find out how to do that with meson.

I think '-include config.h' would be safer, but it requires dropping the manual include in all source files.

Signature · 3 lines
Regards,

Laurent Pinchart
#24 lore raw
In reply to Ariel D'Alessandro

Hi Mauro,

As I still haven't given up on getting this merged, I'd like to know what you would consider to be missing. Could you share a checklist of features that are needed and/or issues to be fixed for you to accept this series ?

Quoted 198 lines · Ariel D'Alessandro

Hi all,

Another attempt to support meson build, addressing comments/fixes from reviewers.

This patchset was developed on top of v4l-utils current master branch:

commit f0c7e3d71eaf4182bae7eb3ee0e43b4eeb047ea9
Author: Hans Verkuil <[email protected]>

v4l2-ctl: add '--set-edid type=list' support

You can find the patchset pushed to the following branch:

https://gitlab.collabora.com/adalessandro/v4l-utils/-/tree/v4l-utils-meson-v5

Feedback appreciated as always :-)

Changes from v4:

* Dropped install_subdir() work-around to install empty dir. Supported

    now in meson v0.57.

* Bump to meson v0.57. Replaced deprecated methods.
* Added override_dependency() calls on libraries.
* Properly check for bpf and SDL2 dependencies.
* Removed libraries_private field from libv4lconvert pkgconfig.
* Documented meson static builds support.
* Set default compiler standard options.
* Added bpf check in keytable.

Changes from v3:

* Split Doxygen support patch.
* Properly generate config.h configuration file.

Changes from v2:

* Updated to current master branch.
* Moved README to markdown syntax.
* Documented meson build.
* Set PACKAGE_VERSION config macro as quoted.

Changes from v1:

* Updated project version to 1.21.0.
* Fixed clang includes in keytable bpf compilation.
* Improved variable reutilization in meson scripts.
* Set libraries version and soversion.
* Control symbol visibility.
* Install empty 'protocols' directory in keytable user dir.
* Fixed svg filenames in qv4l2 and qvidcap.
* Added support for Doxygen documentation (html and man).
* Updated required meson version to v0.53 (for fs module).
* Added new files to EXTRA_DIST in each Makefile.am.

Regards,

Ariel D'Alessandro (5):
Move README to markdown syntax
Add support for meson building
Copy Doxygen configuration file to doc/
meson: Add support for doxygen documentation
Makefile.am: Distribute meson related files

 .gitignore                                    |    1 +
 INSTALL.meson.md                              |  142 +
 Makefile.am                                   |    5 +-
 README                                        |  274 --
 README.md                                     |  332 +++
 contrib/Makefile.am                           |    3 +-
 contrib/cobalt-ctl/Makefile.am                |    2 +
 contrib/cobalt-ctl/meson.build                |    8 +
 contrib/decode_tm6000/Makefile.am             |    2 +
 contrib/decode_tm6000/meson.build             |   14 +
 contrib/gconv/Makefile.am                     |    2 +-
 contrib/gconv/meson.build                     |   44 +
 contrib/meson.build                           |   13 +
 contrib/rds-saa6588/Makefile.am               |    2 +
 contrib/rds-saa6588/meson.build               |    7 +
 contrib/test/Makefile.am                      |    3 +-
 contrib/test/meson.build                      |  143 +
 contrib/xc3028-firmware/Makefile.am           |    2 +-
 contrib/xc3028-firmware/meson.build           |   11 +
 doc/Doxyfile.in                               | 2352 +++++++++++++++++
 doc/meson.build                               |   34 +
 lib/Makefile.am                               |    2 +-
 lib/libdvbv5/Makefile.am                      |    2 +-
 lib/libdvbv5/meson.build                      |  159 ++
 lib/libv4l-mplane/Makefile.am                 |    2 +
 lib/libv4l-mplane/meson.build                 |   23 +
 lib/libv4l1/Makefile.am                       |    2 +-
 lib/libv4l1/meson.build                       |   62 +
 lib/libv4l2/Makefile.am                       |    2 +-
 lib/libv4l2/meson.build                       |   71 +
 lib/libv4l2rds/Makefile.am                    |    2 +
 lib/libv4l2rds/meson.build                    |   37 +
 lib/libv4lconvert/Makefile.am                 |    2 +-
 lib/libv4lconvert/meson.build                 |  117 +
 lib/meson.build                               |   11 +
 libdvbv5-po/meson.build                       |    3 +
 meson.build                                   |  334 +++
 meson_options.txt                             |   50 +
 utils/Makefile.am                             |    2 +-
 utils/cec-compliance/Makefile.am              |    2 +-
 utils/cec-compliance/meson.build              |   22 +
 utils/cec-ctl/Makefile.am                     |    2 +-
 utils/cec-ctl/meson.build                     |   18 +
 utils/cec-follower/Makefile.am                |    2 +-
 utils/cec-follower/meson.build                |   19 +
 utils/cx18-ctl/Makefile.am                    |    2 +
 utils/cx18-ctl/meson.build                    |    8 +
 utils/dvb/Makefile.am                         |    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/Makefile.am                      |    2 +
 utils/ir-ctl/meson.build                      |   23 +
 utils/ivtv-ctl/Makefile.am                    |    2 +
 utils/ivtv-ctl/meson.build                    |   13 +
 utils/keytable/Makefile.am                    |    3 +-
 utils/keytable/bpf_protocols/Makefile.am      |    3 +-
 .../bpf_protocols/clang_sys_includes.sh       |    9 +
 utils/keytable/bpf_protocols/meson.build      |   31 +
 utils/keytable/meson.build                    |   81 +
 utils/keytable/rc_keymaps/meson.build         |  151 ++
 utils/libcecutil/Makefile.am                  |    2 +-
 utils/libcecutil/meson.build                  |   45 +
 utils/libmedia_dev/Makefile.am                |    2 +-
 utils/libmedia_dev/meson.build                |   14 +
 utils/libv4l2util/Makefile.am                 |    2 +-
 utils/libv4l2util/meson.build                 |   16 +
 utils/media-ctl/Makefile.am                   |    2 +
 utils/media-ctl/meson.build                   |   43 +
 utils/meson.build                             |   46 +
 utils/qv4l2/Makefile.am                       |    3 +-
 utils/qv4l2/meson.build                       |   80 +
 utils/qvidcap/Makefile.am                     |    3 +-
 utils/qvidcap/meson.build                     |   82 +
 utils/rds-ctl/Makefile.am                     |    1 +
 utils/rds-ctl/meson.build                     |   13 +
 utils/v4l2-compliance/Makefile.am             |    2 +-
 utils/v4l2-compliance/meson.build             |   58 +
 utils/v4l2-ctl/Makefile.am                    |    2 +-
 utils/v4l2-ctl/meson.build                    |   75 +
 utils/v4l2-dbg/Makefile.am                    |    2 +-
 utils/v4l2-dbg/meson.build                    |   16 +
 utils/v4l2-sysfs-path/Makefile.am             |    2 +
 utils/v4l2-sysfs-path/meson.build             |   14 +
 v4l-utils-po/meson.build                      |    3 +
 85 files changed, 4987 insertions(+), 299 deletions(-)
 create mode 100644 INSTALL.meson.md
 delete mode 100644 README
 create mode 100644 README.md
 create mode 100644 contrib/cobalt-ctl/meson.build
 create mode 100644 contrib/decode_tm6000/meson.build
 create mode 100644 contrib/gconv/meson.build
 create mode 100644 contrib/meson.build
 create mode 100644 contrib/rds-saa6588/meson.build
 create mode 100644 contrib/test/meson.build
 create mode 100644 contrib/xc3028-firmware/meson.build
 create mode 100644 doc/Doxyfile.in
 create mode 100644 doc/meson.build
 create mode 100644 lib/libdvbv5/meson.build
 create mode 100644 lib/libv4l-mplane/meson.build
 create mode 100644 lib/libv4l1/meson.build
 create mode 100644 lib/libv4l2/meson.build
 create mode 100644 lib/libv4l2rds/meson.build
 create mode 100644 lib/libv4lconvert/meson.build
 create mode 100644 lib/meson.build
 create mode 100644 libdvbv5-po/meson.build
 create mode 100644 meson.build
 create mode 100644 meson_options.txt
 create mode 100644 utils/cec-compliance/meson.build
 create mode 100644 utils/cec-ctl/meson.build
 create mode 100644 utils/cec-follower/meson.build
 create mode 100644 utils/cx18-ctl/meson.build
 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
 create mode 100644 utils/ir-ctl/meson.build
 create mode 100644 utils/ivtv-ctl/meson.build
 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
 create mode 100644 utils/libcecutil/meson.build
 create mode 100644 utils/libmedia_dev/meson.build
 create mode 100644 utils/libv4l2util/meson.build
 create mode 100644 utils/media-ctl/meson.build
 create mode 100644 utils/meson.build
 create mode 100644 utils/qv4l2/meson.build
 create mode 100644 utils/qvidcap/meson.build
 create mode 100644 utils/rds-ctl/meson.build
 create mode 100644 utils/v4l2-compliance/meson.build
 create mode 100644 utils/v4l2-ctl/meson.build
 create mode 100644 utils/v4l2-dbg/meson.build
 create mode 100644 utils/v4l2-sysfs-path/meson.build
 create mode 100644 v4l-utils-po/meson.build
Signature · 3 lines
Regards,

Laurent Pinchart