libv4l: bump version to 1.8.0

PATCH Superseded Peter Seiderer 2 participants 4 messages Oct 12, 2015 – Oct 13, 2015

lore

Share & tools

lore

Peter Seiderer

author

2015-10-12 19:28 UTC #0 lore raw

PATCH v3 1/1 libv4l: bump version to 1.8.0

- add qt, qt5base/qt5gui/qt5widgets dependency for qv4l2 (qt dependency was missing, qt5 support was added since 1.8.0)

- fix fix moc/rcc/uic detection in case host versions of moc-qt5, rcc-qt5 or uic-qt5 are present

Signed-off-by Peter Seiderer <[email protected]>

---
Changes v2 -> v3:
- fix qt/qt5 enable/disable/dependency logic (suggested by Thomas Petazzoni)
- fix moc/rcc/uic detection (protect against host version selection)

Changes v1 -> v2:
- fix typo in commit comment (depndency vs. dependency)

---
 package/libv4l/libv4l.hash |  2 +-
 package/libv4l/libv4l.mk   | 21 ++++++++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

package/libv4l/libv4l.hash +1 -1

index 3371d34..1395eda 100644
@@ -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 +20 -1

index edb2a36..66902c6 100644
@@ -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

@@ -43,6 +43,25 @@ ifeq ($(BR2_PACKAGE_LIBV4L_UTILS),y)
 LIBV4L_CONF_OPTS += --enable-v4l-utils
 # clock_gettime is used, which is provided by librt for glibc < 2.17
 LIBV4L_LIBS += -lrt
+ifeq ($(BR2_PACKAGE_QT5),y)
+ifeq ($(BR2_PACKAGE_QT5BASE)$(BR2_PACKAGE_QT5BASE_GUI)$(BR2_PACKAGE_QT5BASE_WIDGETS),yyy)
+LIBV4L_CONF_OPTS += --enable-qv4l2
+LIBV4L_DEPENDENCIES += qt5base
+# protect against host version detection of moc-qt5/rcc-qt5/uic-qt5
+LIBV4L_CONF_ENV += ac_cv_prog_MOC=$(HOST_DIR)/usr/bin/moc
+LIBV4L_CONF_ENV += ac_cv_prog_RCC=$(HOST_DIR)/usr/bin/rcc
+LIBV4L_CONF_ENV += ac_cv_prog_UIC=$(HOST_DIR)/usr/bin/uic
+else
+LIBV4L_CONF_OPTS += --disable-qv4l2
+endif
+else ifeq ($(BR2_PACKAGE_QT),y)
+ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y)
+LIBV4L_CONF_OPTS += --enable-qv4l2
+LIBV4L_DEPENDENCIES += qt
+else
+LIBV4L_CONF_OPTS += --disable-qv4l2
+endif
+endif
 else
 LIBV4L_CONF_OPTS += --disable-v4l-utils
 endif

Signature · 1 line

2.1.4

ifeq ($(BR2_PACKAGE_QT5BASE)$(BR2_PACKAGE_QT5BASE_GUI)$(BR2_PACKAGE_QT5BASE_WIDGETS),yyy) LIBV4L_CONF_OPTS += --enable-qv4l2
... stuff for qt5 support ..
else ifeq ($(BR2_PACKAGE_QT)$(BR2_PACKAGE_QT_GUI_MODULE),yy) LIBV4L_CONF_OPTS += --enable-qv4l2
... stuff for qt4 support ..
else
LIBV4L_CONF_OPTS += --disable-qv4l2
endif

I believe this is simpler and clearer.

Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Peter Seiderer

author

2015-10-13 19:25 UTC #2 lore raw

PATCH v3 1/1 libv4l: bump version to 1.8.0

Hello Thomas,

Quoted 6 lines · Thomas Petazzoni

Dear Peter Seiderer,
Quoted 3 lines · Peter Seiderer
- add qt, qt5base/qt5gui/qt5widgets dependency for qv4l2 (qt dependency was missing, qt5 support was added since 1.8.0)

Quoted 6 lines

Quoted 4 lines
- fix fix moc/rcc/uic detection in case host versions of moc-qt5, rcc-qt5 or uic-qt5 are present
Signed-off-by Peter Seiderer <[email protected]>
Thanks, this is better, but it could still be improved. See below.

Thanks from my side for your review patience...

Quoted 13 lines

package/libv4l/libv4l.mk ifeq ($(BR2_PACKAGE_LIBV4L_UTILS),y) · line 47
Quoted 10 lines
LIBV4L_SOURCE = v4l-utils-$(LIBV4L_VERSION).tar.bz2 LIBV4L_SITE = http://linuxtv.org/downloads/v4l-utils
LIBV4L_INSTALL_STAGING = YES
package/libv4l/libv4l.mk +2 -0
@@ -43,6 +43,25 @@ ifeq ($(BR2_PACKAGE_LIBV4L_UTILS),y)
 LIBV4L_CONF_OPTS += --enable-v4l-utils
 # clock_gettime is used, which is provided by librt for glibc < 2.17
 LIBV4L_LIBS += -lrt
+ifeq ($(BR2_PACKAGE_QT5),y)
+ifeq ($(BR2_PACKAGE_QT5BASE)$(BR2_PACKAGE_QT5BASE_GUI)$(BR2_PACKAGE_QT5BASE_WIDGETS),yyy)
The two conditions are not needed, just do:

O.k.

Quoted 11 lines

ifeq ($(BR2_PACKAGE_QT5BASE)$(BR2_PACKAGE_QT5BASE_GUI)$(BR2_PACKAGE_QT5BASE_WIDGETS),yyy)
package/libv4l/libv4l.mk ifeq ($(BR2_PACKAGE_LIBV4L_UTILS),y) · line 53
Quoted 6 lines
package/libv4l/libv4l.mk +6 -0
+LIBV4L_CONF_OPTS += --enable-qv4l2
+LIBV4L_DEPENDENCIES += qt5base
+# protect against host version detection of moc-qt5/rcc-qt5/uic-qt5
+LIBV4L_CONF_ENV += ac_cv_prog_MOC=$(HOST_DIR)/usr/bin/moc
+LIBV4L_CONF_ENV += ac_cv_prog_RCC=$(HOST_DIR)/usr/bin/rcc
+LIBV4L_CONF_ENV += ac_cv_prog_UIC=$(HOST_DIR)/usr/bin/uic
Only one assignment needed:

Quoted 5 lines

LIBV4L_CONF_ENV += \
	ac_cv_prog_MOC=$(HOST_DIR)/usr/bin/moc \
	ac_cv_prog_RCC=$(HOST_DIR)/usr/bin/rcc \
	ac_cv_prog_UIC=$(HOST_DIR)/usr/bin/uic

O.k.

Quoted 10 lines

Review ifeq ($(BR2_PACKAGE_LIBV4L_UTILS),y) · line 55
Quoted 2 lines
(quoted diff) +2 -0
+else
+LIBV4L_CONF_OPTS += --disable-qv4l2
This is not needed here (see below).
package/libv4l/libv4l.mk ifeq ($(BR2_PACKAGE_LIBV4L_UTILS),y) · line 58
Quoted 3 lines
package/libv4l/libv4l.mk +3 -0
+endif
+else ifeq ($(BR2_PACKAGE_QT),y)
+ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y)
You could combine this into one condition.

O.k.

Quoted 10 lines

package/libv4l/libv4l.mk ifeq ($(BR2_PACKAGE_LIBV4L_UTILS),y) · line 64
Quoted 7 lines
package/libv4l/libv4l.mk +6 -0
+LIBV4L_CONF_OPTS += --enable-qv4l2
+LIBV4L_DEPENDENCIES += qt
+else
+LIBV4L_CONF_OPTS += --disable-qv4l2
+endif
+endif
Here is what I'd like to see:

Quoted 4 lines

ifeq ($(BR2_PACKAGE_QT5BASE)$(BR2_PACKAGE_QT5BASE_GUI)$(BR2_PACKAGE_QT5BASE_WIDGETS),yyy) LIBV4L_CONF_OPTS += --enable-qv4l2
... stuff for qt5 support ..
else ifeq ($(BR2_PACKAGE_QT)$(BR2_PACKAGE_QT_GUI_MODULE),yy)

If 'ifeq ($(BR2_PACKAGE_QT5BASE)$(BR2_PACKAGE_QT5BASE_GUI)$(BR2_PACKAGE_QT5BASE_WIDGETS),yyy)' is enough this line could be shorten to 'else ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y)' or is it better/clearer to add '$(BR2_PACKAGE_QT5)' to the first one ( I think both options will work)?

Quoted 7 lines

LIBV4L_CONF_OPTS += --enable-qv4l2
... stuff for qt4 support ..
else
LIBV4L_CONF_OPTS += --disable-qv4l2
endif
I believe this is simpler and clearer.

Yes, will send an updated patch...

Regards,
Peter

Quoted 4 lines

Thanks!
Thomas

Thomas Petazzoni

2015-10-13 21:04 UTC #3 lore raw

PATCH v3 1/1 libv4l: bump version to 1.8.0

Dear Peter Seiderer,

Quoted 4 lines · Peter Seiderer

If 'ifeq ($(BR2_PACKAGE_QT5BASE)$(BR2_PACKAGE_QT5BASE_GUI)$(BR2_PACKAGE_QT5BASE_WIDGETS),yyy)' is enough this line could be shorten to 'else ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y)' or is it better/clearer to add '$(BR2_PACKAGE_QT5)' to the first one ( I think both options will work)?

Yeah, indeed the Qt4 test can be limited to BR2_PACKAGE_QT_GUI_MODULE, since if this symbol is enabled, surely BR2_PACKAGE_QT is as well. Though I found it more explicit to also indicate BR2_PACKAGE_QT, even if not strictly necessary.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com