libv4l: update v4l-utils help text (add more listed tools)
PATCH v2 1/4 libv4l: update v4l-utils help text (add more listed tools)
---
Changes v1 -> v2:
- no changes
--- package/libv4l/Config.in | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
package/libv4l/Config.in +10 -2
@@ -26,8 +26,16 @@ config BR2_PACKAGE_LIBV4L_UTILS help v4l-utils is a collection of various video4linux and DVB utilities. Enable this if you want to build the following tools: - cx18-ctl, ir-keytable, ivtv-ctl, v4l2-ctl, v4l2-sysfs-path and - others. + - cx18-ctl + - dvb-fe-tool, dvbv5-zap, dvbv5-scan, dvb-format-convert + - decode_tm6000 + - ir-keytable + - media-ctl + - v4l2-compliance + - v4l2-ctl, cx18-ctl, ivtv-ctl + - v4l2-sysfs-path + - rds-ctl + - qv4l2 (if Qt is enabled) endif
Signature · 1 line
2.1.4
PATCH v2 2/4 media-ctl: remove package
Package media-ctl is out-dated, source (and developement) have been moved to v4l-utils since June 2014. Up-to-date version is available in the libv4l package (BR2_PACKAGE_LIBV4L/BR2_PACKAGE_LIBV4L_UTILS).
---
Changes v1 -> v2:
- fix legacy entry: select BR2_LEGACY, BR2_PACKAGE_LIBV4L and BR2_PACKAGE_LIBV4L_UTILS (suggested by Arnout Vandecappelle)
--- Config.in.legacy | 10 + package/Config.in | 1 - ...ers-for-compatibility-with-old-toolchains.patch | 303 --------------------- package/media-ctl/Config.in | 9 - package/media-ctl/media-ctl.mk | 17 -- 5 files changed, 10 insertions(+), 330 deletions(-) delete mode 100644 package/media-ctl/0001-add-kernel-headers-for-compatibility-with-old-toolchains.patch delete mode 100644 package/media-ctl/Config.in delete mode 100644 package/media-ctl/media-ctl.mk
Config.in.legacy +10 -0
@@ -107,6 +107,16 @@ endif ############################################################################### comment "Legacy options removed in 2015.11" +config BR2_PACKAGE_MEDIA_CTL + bool "media-ctl package has been removed" + select BR2_LEGACY + select BR2_PACKAGE_LIBV4L + select BR2_PACKAGE_LIBV4L_UTILS + help + media-ctl source and developement have been moved to + v4l-utils since June 2014. For an up-to-date media-ctl + version select BR2_PACKAGE_LIBV4L and BR2_PACKAGE_LIBV4L_UTILS. + config BR2_PACKAGE_SCHIFRA bool "schifra package has been removed" help
package/Config.in +0 -1
@@ -376,7 +376,6 @@ endif source "package/lsuio/Config.in" source "package/lvm2/Config.in" source "package/mdadm/Config.in" - source "package/media-ctl/Config.in" source "package/memtest86/Config.in" source "package/memtester/Config.in" source "package/minicom/Config.in"
package/media-ctl/0001-add-kernel-headers-for-compatibility-with-old-toolchains.patch deleted +0 -303
303 lines not on this page · raw message
package/media-ctl/Config.in deleted +0 -9
@@ -1,9 +0,0 @@ -config BR2_PACKAGE_MEDIA_CTL - bool "media-ctl" - help - Media controller control application - - Useful mostly with ARM OMAP processors to configure and - control the image subsystem - - http://git.ideasonboard.org/media-ctl.git
package/media-ctl/media-ctl.mk deleted +0 -17
@@ -1,17 +0,0 @@ -################################################################################ -# -# media-ctl -# -################################################################################ - -MEDIA_CTL_VERSION = 87f58c2ed885d636229f7209fde883058433a1ce -MEDIA_CTL_SITE = git://git.ideasonboard.org/media-ctl.git -MEDIA_CTL_INSTALL_STAGING = YES -MEDIA_CTL_LICENSE = LGPLv2.1+ -MEDIA_CTL_LICENSE_FILES = COPYING.LIB - -MEDIA_CTL_AUTORECONF = YES -MEDIA_CTL_CONF_OPTS = --with-kernel-headers=$(STAGING_DIR)/usr/include -MEDIA_CTL_DEPENDENCIES = host-pkgconf - -$(eval $(autotools-package))
Signature · 1 line
2.1.4
Thomas Petazzoni
AppliedPATCH v2 2/4 media-ctl: remove package
Dear Peter Seiderer,
Quoted 9 lines · Peter Seiderer
Package media-ctl is out-dated, source (and developement) have been moved to v4l-utils since June 2014. Up-to-date version is available in the libv4l package (BR2_PACKAGE_LIBV4L/BR2_PACKAGE_LIBV4L_UTILS).
Signed-off-by Peter Seiderer <[email protected]>---
Changes v1 -> v2:
- fix legacy entry: selectBR2_LEGACY,BR2_PACKAGE_LIBV4LandBR2_PACKAGE_LIBV4L_UTILS(suggested by Arnout Vandecappelle)
Quoted 10 lines
--- Config.in.legacy | 10 + package/Config.in | 1 - ...ers-for-compatibility-with-old-toolchains.patch | 303 --------------------- package/media-ctl/Config.in | 9 - package/media-ctl/media-ctl.mk | 17 -- 5 files changed, 10 insertions(+), 330 deletions(-) delete mode 100644 package/media-ctl/0001-add-kernel-headers-for-compatibility-with-old-toolchains.patch delete mode 100644 package/media-ctl/Config.in delete mode 100644 package/media-ctl/media-ctl.mk
Applied, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v2 3/4 Config.in.legacy: add missing select BR2_LEGACY
In reply to Peter Seiderer---
Changes v1 -> v2:
- new patch to fix missing select BR2_LEGACY (suggested by Arnout Vandecappelle)
--- Config.in.legacy | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+)
Config.in.legacy +40 -0
@@ -119,6 +119,7 @@ config BR2_PACKAGE_MEDIA_CTL config BR2_PACKAGE_SCHIFRA bool "schifra package has been removed" + select BR2_LEGACY help Schifra package has been maked broken since 2014.11 release and haven't been fixed since then.
@@ -136,6 +137,7 @@ config BR2_PACKAGE_ZXING config BR2_PACKAGE_FREERDP_CLIENT bool "freerdp client option renamed" depends on BR2_PACKAGE_FREERDP + select BR2_LEGACY select BR2_PACKAGE_FREERDP_CLIENT_X11 config BR2_PACKAGE_BLACKBOX
@@ -187,6 +189,7 @@ config BR2_KERNEL_HEADERS_3_15 config BR2_PACKAGE_DIRECTFB_EXAMPLES_ANDI bool "DirectFB example df_andi has been removed" + select BR2_LEGACY select BR2_PACKAGE_DIRECTFB_EXAMPLES help The per-DirectFB example options have been removed. The
@@ -195,6 +198,7 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES_ANDI config BR2_PACKAGE_DIRECTFB_EXAMPLES_BLTLOAD bool "DirectFB example df_bltload has been removed" + select BR2_LEGACY select BR2_PACKAGE_DIRECTFB_EXAMPLES help The per-DirectFB example options have been removed. The
@@ -203,6 +207,7 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES_BLTLOAD config BR2_PACKAGE_DIRECTFB_EXAMPLES_CPULOAD bool "DirectFB example df_cpuload has been removed" + select BR2_LEGACY select BR2_PACKAGE_DIRECTFB_EXAMPLES help The per-DirectFB example options have been removed. The
@@ -211,6 +216,7 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES_CPULOAD config BR2_PACKAGE_DIRECTFB_EXAMPLES_DATABUFFER bool "DirectFB example df_databuffer has been removed" + select BR2_LEGACY select BR2_PACKAGE_DIRECTFB_EXAMPLES help The per-DirectFB example options have been removed. The
@@ -219,6 +225,7 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES_DATABUFFER config BR2_PACKAGE_DIRECTFB_EXAMPLES_DIOLOAD bool "DirectFB example df_dioload has been removed" + select BR2_LEGACY select BR2_PACKAGE_DIRECTFB_EXAMPLES help The per-DirectFB example options have been removed. The
@@ -227,6 +234,7 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES_DIOLOAD config BR2_PACKAGE_DIRECTFB_EXAMPLES_DOK bool "DirectFB example df_dok has been removed" + select BR2_LEGACY select BR2_PACKAGE_DIRECTFB_EXAMPLES help The per-DirectFB example options have been removed. The
@@ -235,6 +243,7 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES_DOK config BR2_PACKAGE_DIRECTFB_EXAMPLES_DRIVERTEST bool "DirectFB example df_drivertest has been removed" + select BR2_LEGACY select BR2_PACKAGE_DIRECTFB_EXAMPLES help The per-DirectFB example options have been removed. The
@@ -244,6 +253,7 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES_DRIVERTEST config BR2_PACKAGE_DIRECTFB_EXAMPLES_FIRE bool "DirectFB example df_fire has been removed" + select BR2_LEGACY select BR2_PACKAGE_DIRECTFB_EXAMPLES help The per-DirectFB example options have been removed. The
@@ -252,6 +262,7 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES_FIRE config BR2_PACKAGE_DIRECTFB_EXAMPLES_FLIP bool "DirectFB example df_flip has been removed" + select BR2_LEGACY select BR2_PACKAGE_DIRECTFB_EXAMPLES help The per-DirectFB example options have been removed. The
@@ -260,6 +271,7 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES_FLIP config BR2_PACKAGE_DIRECTFB_EXAMPLES_FONTS bool "DirectFB example df_fonts has been removed" + select BR2_LEGACY select BR2_PACKAGE_DIRECTFB_EXAMPLES help The per-DirectFB example options have been removed. The
@@ -268,6 +280,7 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES_FONTS config BR2_PACKAGE_DIRECTFB_EXAMPLES_INPUT bool "DirectFB example df_input has been removed" + select BR2_LEGACY select BR2_PACKAGE_DIRECTFB_EXAMPLES help The per-DirectFB example options have been removed. The
@@ -276,6 +289,7 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES_INPUT config BR2_PACKAGE_DIRECTFB_EXAMPLES_JOYSTICK bool "DirectFB example df_joystick has been removed" + select BR2_LEGACY select BR2_PACKAGE_DIRECTFB_EXAMPLES help The per-DirectFB example options have been removed. The
@@ -284,6 +298,7 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES_JOYSTICK config BR2_PACKAGE_DIRECTFB_EXAMPLES_KNUCKLES bool "DirectFB example df_knuckles has been removed" + select BR2_LEGACY select BR2_PACKAGE_DIRECTFB_EXAMPLES help The per-DirectFB example options have been removed. The
@@ -292,6 +307,7 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES_KNUCKLES config BR2_PACKAGE_DIRECTFB_EXAMPLES_LAYER bool "DirectFB example df_layer has been removed" + select BR2_LEGACY select BR2_PACKAGE_DIRECTFB_EXAMPLES help The per-DirectFB example options have been removed. The
@@ -300,6 +316,7 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES_LAYER config BR2_PACKAGE_DIRECTFB_EXAMPLES_MATRIX bool "DirectFB example df_matrix has been removed" + select BR2_LEGACY select BR2_PACKAGE_DIRECTFB_EXAMPLES help The per-DirectFB example options have been removed. The
@@ -308,6 +325,7 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES_MATRIX config BR2_PACKAGE_DIRECTFB_EXAMPLES_MATRIX_WATER bool "DirectFB example df_matrix_water has been removed" + select BR2_LEGACY select BR2_PACKAGE_DIRECTFB_EXAMPLES help The per-DirectFB example options have been removed. The
@@ -316,6 +334,7 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES_MATRIX_WATER config BR2_PACKAGE_DIRECTFB_EXAMPLES_NEO bool "DirectFB example df_neo has been removed" + select BR2_LEGACY select BR2_PACKAGE_DIRECTFB_EXAMPLES help The per-DirectFB example options have been removed. The
@@ -324,6 +343,7 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES_NEO config BR2_PACKAGE_DIRECTFB_EXAMPLES_NETLOAD bool "DirectFB example df_netload has been removed" + select BR2_LEGACY select BR2_PACKAGE_DIRECTFB_EXAMPLES help The per-DirectFB example options have been removed. The
@@ -340,6 +360,7 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES_PALETTE config BR2_PACKAGE_DIRECTFB_EXAMPLES_PARTICLE bool "DirectFB example df_particle has been removed" + select BR2_LEGACY select BR2_PACKAGE_DIRECTFB_EXAMPLES help The per-DirectFB example options have been removed. The
@@ -348,6 +369,7 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES_PARTICLE config BR2_PACKAGE_DIRECTFB_EXAMPLES_PORTER bool "DirectFB example df_porter has been removed" + select BR2_LEGACY select BR2_PACKAGE_DIRECTFB_EXAMPLES help The per-DirectFB example options have been removed. The
@@ -364,6 +386,7 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES_STRESS config BR2_PACKAGE_DIRECTFB_EXAMPLES_TEXTURE bool "DirectFB example df_texture has been removed" + select BR2_LEGACY select BR2_PACKAGE_DIRECTFB_EXAMPLES help The per-DirectFB example options have been removed. The
@@ -372,6 +395,7 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES_TEXTURE config BR2_PACKAGE_DIRECTFB_EXAMPLES_VIDEO bool "DirectFB example df_video has been removed" + select BR2_LEGACY select BR2_PACKAGE_DIRECTFB_EXAMPLES help The per-DirectFB example options have been removed. The
@@ -380,6 +404,7 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES_VIDEO config BR2_PACKAGE_DIRECTFB_EXAMPLES_VIDEO_PARTICLE bool "DirectFB example df_video_particle has been removed" + select BR2_LEGACY select BR2_PACKAGE_DIRECTFB_EXAMPLES help The per-DirectFB example options have been removed. The
@@ -388,6 +413,7 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES_VIDEO_PARTICLE config BR2_PACKAGE_DIRECTFB_EXAMPLES_WINDOW bool "DirectFB example df_window has been removed" + select BR2_LEGACY select BR2_PACKAGE_DIRECTFB_EXAMPLES help The per-DirectFB example options have been removed. The
@@ -502,6 +528,7 @@ config BR2_PACKAGE_GPU_VIV_BIN_MX6Q config BR2_PACKAGE_LIBSEMANAGE_PYTHON_BINDINGS depends on BR2_PACKAGE_PYTHON bool "libsemanage python bindings removed" + select BR2_LEGACY help This option has been removed, since the libsemanage Python bindings on the target were not useful.
@@ -579,6 +606,7 @@ config BR2_PACKAGE_TIFF_TIFFCP config BR2_LINUX_KERNEL_EXT_RTAI_PATCH bool "RTAI patch file path has been removed" + select BR2_LEGACY help This option has never worked, so it has been removed.
@@ -913,6 +941,7 @@ config BR2_PACKAGE_XLIB_LIBPCIACCESS config BR2_PACKAGE_LINUX_FIRMWARE_XC5000 bool "Xceive xc5000 option has been renamed" + select BR2_LEGACY select BR2_PACKAGE_LINUX_FIRMWARE_XCx000 help The Xceive xc5000 option now also handles older firmwares from
@@ -921,6 +950,7 @@ config BR2_PACKAGE_LINUX_FIRMWARE_XC5000 config BR2_PACKAGE_LINUX_FIRMWARE_CXGB4 bool "Chelsio T4 option has been renamed" + select BR2_LEGACY select BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4 help The Chelsio T4 option BR2_PACKAGE_LINUX_FIRMWARE_CXGB4
@@ -929,6 +959,7 @@ config BR2_PACKAGE_LINUX_FIRMWARE_CXGB4 config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_7 bool "BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_7 has been renamed" + select BR2_LEGACY help The option BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_7 was renamed to BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV_7. You must
@@ -939,6 +970,7 @@ config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_7 config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_8 bool "BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_8 has been renamed" + select BR2_LEGACY help The option BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_8 was renamed to BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV_8. You must
@@ -1150,6 +1182,7 @@ config BR2_TARGET_TZ_ZONELIST config BR2_PACKAGE_TZDATA_ZONELIST string "tzdata: the timezone list option has been renamed" + select BR2_LEGACY help The option BR2_PACKAGE_TZDATA_ZONELIST has been renamed to BR2_TARGET_TZ_ZONELIST, and moved to the "System configuration"
@@ -1276,18 +1309,21 @@ comment "Legacy options removed in 2014.02" config BR2_sh2 bool "sh2 support removed" + select BR2_LEGACY help Due to an inexistent user base and generally poor Linux support, the support for the SH2 architecture was removed. config BR2_sh3 bool "sh3 support removed" + select BR2_LEGACY help Due to an inexistent user base and generally poor Linux support, the support for the SH3 architecture was removed. config BR2_sh3eb bool "sh3eb support removed" + select BR2_LEGACY help Due to an inexistent user base and generally poor Linux support, the support for the SH3eb architecture was removed.
@@ -1501,6 +1537,7 @@ config BR2_PACKAGE_MODULE_INIT_TOOLS config BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL string "u-boot: the git repository URL option has been renamed" + select BR2_LEGACY help The option BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL has been renamed to BR2_TARGET_UBOOT_CUSTOM_REPO_URL.
@@ -1515,6 +1552,7 @@ config BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL_WRAP config BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION string "u-boot: the git repository version option has been renamed" + select BR2_LEGACY help The option BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION has been renamed to BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION.
@@ -1529,6 +1567,7 @@ config BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION_WRAP config BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL string "linux: the git repository URL option has been renamed" + select BR2_LEGACY help The option BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL has been renamed to
@@ -1544,6 +1583,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL_WRAP config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION string "linux: the git repository version option has been renamed" + select BR2_LEGACY help The option BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION has been renamed to
Signature · 1 line
2.1.4
PATCH v2 3/4 Config.in.legacy: add missing select BR2_LEGACY
Quoted 1 line · Peter Seiderer
Signed-off-by Peter Seiderer <[email protected]>
Thomas Petazzoni
AppliedPATCH v2 3/4 Config.in.legacy: add missing select BR2_LEGACY
In reply to Peter SeidererDear Peter Seiderer,
Quoted 7 lines · Peter Seiderer
Signed-off-by Peter Seiderer <[email protected]>---
Changes v1 -> v2:
- new patch to fix missing selectBR2_LEGACY(suggested by Arnout Vandecappelle)--- Config.in.legacy | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+)
Applied, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v2 3/4 Config.in.legacy: add missing select BR2_LEGACY
In reply to Peter SeidererDear Peter Seiderer,
Quoted 1 line · Peter Seiderer
Signed-off-by Peter Seiderer <[email protected]>
This patch was actually wrong: doing a "select BR2_LEGACY" on string options is not correct. This was causing a number of warnings when running menuconfig:
Config.in.legacy:1175:warning: config symbol 'BR2_PACKAGE_TZDATA_ZONELIST' uses select, but is not boolean or tristate Config.in.legacy:1530:warning: config symbol 'BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL' uses select, but is not boolean or tristate Config.in.legacy:1545:warning: config symbol 'BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION' uses select, but is not boolean or tristate Config.in.legacy:1560:warning: config symbol 'BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL' uses select, but is not boolean or tristate Config.in.legacy:1576:warning: config symbol 'BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION' uses select, but is not boolean or tristate
I've fixed that up in commit http://git.buildroot.net/buildroot/commit/?id=37ad0f8d7000c0be5ea47c4b968241311cc27560.
Please at least test such patches by doing a "make menuconfig" :-)
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v2 3/4 Config.in.legacy: add missing select BR2_LEGACY
Hello Thomas,
Quoted 15 lines · Thomas Petazzoni
Dear Peter Seiderer,
Quoted 1 line · Peter Seiderer
Signed-off-by Peter Seiderer <[email protected]>This patch was actually wrong: doing a "select
BR2_LEGACY" on string options is not correct. This was causing a number of warnings when running menuconfig:Config.in.legacy:1175:warning: config symbol '
BR2_PACKAGE_TZDATA_ZONELIST' uses select, but is not boolean or tristate Config.in.legacy:1530:warning: config symbol 'BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL' uses select, but is not boolean or tristate Config.in.legacy:1545:warning: config symbol 'BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION' uses select, but is not boolean or tristate Config.in.legacy:1560:warning: config symbol 'BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL' uses select, but is not boolean or tristate Config.in.legacy:1576:warning: config symbol 'BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION' uses select, but is not boolean or tristate
Quoted 3 lines
I've fixed that up in commit http://git.buildroot.net/buildroot/commit/?id=37ad0f8d7000c0be5ea47c4b968241311cc27560.
Please at least test such patches by doing a "make menuconfig" :-)
Sorry for this one, will do better next time...
Regards,
Peter
Quoted 2 lines
Thomas
PATCH v2 4/4 libv4l: bump version to 1.8.0
In reply to Peter SeidererAnd add proper qt5base/qt dependency (needed for qv4l2, qt5 support added since 1.8.0).
---
Changes v1 -> v2:
- fix typo in commit comment (depndency vs. dependency)
--- package/libv4l/libv4l.hash | 2 +- package/libv4l/libv4l.mk | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-)
package/libv4l/libv4l.hash +1 -1
@@ -1,2 +1,2 @@ # Locally calculated -sha256 164abf5c1befcd27e8e6ef824a82d4015bdfb5d99ae82daa00e77d895ff9864c v4l-utils-1.6.3.tar.bz2 +sha256 50c7be033636d878e902dad0a207fc9f6d831bec27f1b410f1102acddaa5565e v4l-utils-1.8.0.tar.bz2
package/libv4l/libv4l.mk +4 -1
@@ -4,7 +4,7 @@ # ################################################################################ -LIBV4L_VERSION = 1.6.3 +LIBV4L_VERSION = 1.8.0 LIBV4L_SOURCE = v4l-utils-$(LIBV4L_VERSION).tar.bz2 LIBV4L_SITE = http://linuxtv.org/downloads/v4l-utils LIBV4L_INSTALL_STAGING = YES
@@ -40,6 +40,9 @@ LIBV4L_CONF_OPTS += --without-libudev endif ifeq ($(BR2_PACKAGE_LIBV4L_UTILS),y) +ifneq ($(BR2_PACKAGE_QT5BASE)$(BR2_PACKAGE_QT),) +LIBV4L_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE),qt5base,qt) +endif LIBV4L_CONF_OPTS += --enable-v4l-utils # clock_gettime is used, which is provided by librt for glibc < 2.17 LIBV4L_LIBS += -lrt
Signature · 1 line
2.1.4
PATCH v2 4/4 libv4l: bump version to 1.8.0
Dear Peter Seiderer,
package/libv4l/libv4l.mk LIBV4L_CONF_OPTS += --without-libudev · line 44
Quoted 3 lines · Peter Seiderer
ifeq ($(BR2_PACKAGE_LIBV4L_UTILS),y)
package/libv4l/libv4l.mk +2
-0+ifneq ($(BR2_PACKAGE_QT5BASE)$(BR2_PACKAGE_QT),) +LIBV4L_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE),qt5base,qt)
This doesn't seem quite right for Qt5. According to the configure.ac, much more than qt5base is needed:
PKG_CHECK_MODULES(QT5, [Qt5Core >= 5.0 Qt5Gui >= 5.0 Qt5Widgets >= 5.0], [qt_pkgconfig=true], [qt_pkgconfig=false])
So it looks like that for Qt5, we need to depend on qt5base, qt5gui and qt5widgets. Note that it can also depend on Qt5OpenGL:
PKG_CHECK_MODULES(QT5GL, [Qt5OpenGL >= 5.0 gl], [qt_pkgconfig_gl=true], [qt_pkgconfig_gl=false])
So maybe we need an explicit option to enable Qt support in libv4l, sometihng like (I haven't checked all Config.in options, so do not copy/paste the below) :
config BR2_PACKAGE_LIBV4L_UTILS_QT
bool "qt-based tools"
depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5 select BR2_PACKAGE_QT5BASE if BR2_PACKAGE_QT5 select BR2_PACKAGE_QT5GUI if BR2_PACKAGE_QT5 select BR2_PACKAGE_QT5WIDGETS if BR2_PACKAGE_QT5 select BR2_PACKAGE_QT_<something> if BR2_PACKAGE_QT
and then, in the .mk file:
ifeq ($(BR2_PACKAGE_LIBV4L_UTILS_QT),y)
ifeq ($(BR2_PACKAGE_QT),y)LIBV4L_DEPENDENCIES += qt
else ifeq ($(BR2_PACKAGE_QT5),y)LIBV4L_DEPENDENCIES += qt5base qt5gui qt5widgets
ifeq ($(BR2_PACKAGE_QT5OPENGL),y)LIBV4L_DEPENDENCIES += qt5opengl
endif
endif
Or, alternatively, if you don't want to add a new Config.in option, then you should improve the .mk file logic with all the proper dependencies.
Best regards,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v2 4/4 libv4l: bump version to 1.8.0
Hello Thomas,
Quoted 11 lines · Thomas Petazzoni
Dear Peter Seiderer,
package/libv4l/libv4l.mk LIBV4L_CONF_OPTS += --without-libudev · line 44
Quoted 3 lines · Peter Seiderer
ifeq ($(BR2_PACKAGE_LIBV4L_UTILS),y)
package/libv4l/libv4l.mk +2
-0+ifneq ($(BR2_PACKAGE_QT5BASE)$(BR2_PACKAGE_QT),) +LIBV4L_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE),qt5base,qt)This doesn't seem quite right for Qt5. According to the configure.ac, much more than qt5base is needed:
Quoted 7 lines
PKG_CHECK_MODULES(QT5, [Qt5Core >= 5.0 Qt5Gui >= 5.0 Qt5Widgets >= 5.0], [qt_pkgconfig=true], [qt_pkgconfig=false])So it looks like that for Qt5, we need to depend on qt5base, qt5gui and qt5widgets. Note that it can also depend on Qt5OpenGL:
PKG_CHECK_MODULES(QT5GL, [Qt5OpenGL >= 5.0 gl], [qt_pkgconfig_gl=true], [qt_pkgconfig_gl=false])
Yes, you are right...
Quoted 24 lines
So maybe we need an explicit option to enable Qt support in libv4l, sometihng like (I haven't checked all Config.in options, so do not copy/paste the below) :
config
BR2_PACKAGE_LIBV4L_UTILS_QT
bool "qt-based tools"
depends onBR2_PACKAGE_QT||BR2_PACKAGE_QT5selectBR2_PACKAGE_QT5BASEifBR2_PACKAGE_QT5selectBR2_PACKAGE_QT5GUIifBR2_PACKAGE_QT5selectBR2_PACKAGE_QT5WIDGETSifBR2_PACKAGE_QT5select BR2_PACKAGE_QT_<something> ifBR2_PACKAGE_QTand then, in the .mk file:
ifeq ($(BR2_PACKAGE_LIBV4L_UTILS_QT),y)
ifeq ($(BR2_PACKAGE_QT),y)LIBV4L_DEPENDENCIES+= qt
else ifeq ($(BR2_PACKAGE_QT5),y)LIBV4L_DEPENDENCIES+= qt5base qt5gui qt5widgets
ifeq ($(BR2_PACKAGE_QT5OPENGL),y)LIBV4L_DEPENDENCIES+= qt5opengl
endif
endif
Quoted 4 lines
Or, alternatively, if you don't want to add a new Config.in option, then you should improve the .mk file logic with all the proper dependencies.
O.k. will cook up a follow up patch...
Regards,
Peter
Quoted 3 lines
Best regards,
Thomas
Thomas Petazzoni
AppliedPATCH v2 1/4 libv4l: update v4l-utils help text (add more listed tools)
In reply to Peter SeidererDear Peter Seiderer,
Quoted 7 lines · Peter Seiderer
Signed-off-by Peter Seiderer <[email protected]>---
Changes v1 -> v2:
- no changes--- package/libv4l/Config.in | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
Applied, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com