v4l-utils: merge with edid-decode

Make PKG_NAME and folder name consistent (v4l-utils) and build
edid-decode as subpackage. Unfortunately LTO breaks build of some
of the utils, so disable it.

Signed-off-by: Daniel Golle <redacted>

diff --git a/libs/libv4l/patches/010-intl.patch b/libs/libv4l/patches/010-intl.patch
deleted file mode 100644 (file)
index b541f46..0000000
--- a/libs/libv4l/patches/010-intl.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/lib/libdvbv5/meson.build
-+++ b/lib/libdvbv5/meson.build
-@@ -124,6 +124,7 @@ install_headers(libdvbv5_api, subdir: 'l
- 
- libdvbv5_deps = [
-     dep_iconv,
-+    dep_intl,
-     dep_libm,
-     dep_librt,
-     dep_libudev,
---- a/meson.build
-+++ b/meson.build
-@@ -202,6 +202,8 @@ size_t iconv (iconv_t cd, char * *inbuf,
-     endif
- endif
- 
-+dep_intl = dependency('intl')
-+
- have_gconv = cc.has_header('gconv.h', required : get_option('gconv'))
- 
- # Detect system gconv directory
---- a/utils/dvb/meson.build
-+++ b/utils/dvb/meson.build
-@@ -1,5 +1,6 @@
- dvb_common_deps =  [
-     dep_argp,
-+    dep_intl,
-     dep_libdvbv5,
-     dep_libudev,
-     dep_threads,
---- a/utils/ir-ctl/meson.build
-+++ b/utils/ir-ctl/meson.build
-@@ -12,6 +12,7 @@ ir_ctl_sources = files(
- 
- ir_ctl_deps =  [
-     dep_argp,
-+    dep_intl,
- ]
- 
- ir_ctl = executable('ir-ctl',
---- a/utils/keytable/meson.build
-+++ b/utils/keytable/meson.build
-@@ -11,6 +11,7 @@ ir_keytable_sources = files(
- 
- ir_keytable_deps = [
-     dep_argp,
-+    dep_intl,
- ]
- 
- ir_keytable_system_dir = udevdir

diff --git a/libs/libv4l/Makefile b/libs/v4l-utils/Makefile
similarity index 85%
rename from libs/libv4l/Makefile
rename to libs/v4l-utils/Makefile
index 7f23f4de00b1d98f2aa0a30e5a9d9a931897e3a2..3e4d091aee8af2f19fed9d187d5cb6b159db1aa9 100644 (file)
--- a/libs/libv4l/Makefile
+++ b/libs/v4l-utils/Makefile
@@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=v4l-utils
-PKG_VERSION:=1.28.0
+PKG_VERSION:=1.30.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://www.linuxtv.org/downloads/v4l-utils
-PKG_HASH:=fcb1ac1f22c1673e932b1779384f61cd6b7dd76e0e500bfb57e7a598588980b4
+PKG_HASH:=c1cf549c2ec3cf39eb5ec7bf15731349e61b26a21b5e963922db422333bae197
 
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
 
@@ -75,8 +75,20 @@ define Package/v4l-utils/description
   This package contains the video4linux utilities.
 endef
 
+define Package/edid-decode
+  $(call Package/libv4l/Default)
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=EDID decode
+  DEPENDS:=+libstdcpp
+endef
+
+define Package/edid-decode/description
+ Display EDID decoder application
+endef
+
 MESON_ARGS += \
-       -Db_lto=true \
+       -Db_lto=false \
        -Ddefault_library=both \
        -Dbpf=disabled \
        -Dgconv=disabled \
@@ -84,7 +96,7 @@ MESON_ARGS += \
        -Dlibdvbv5=disabled \
        -Dqv4l2=disabled \
        -Dqvidcap=disabled \
-       -Dv4l-utils=$(if $(CONFIG_PACKAGE_v4l-utils),true,false) \
+       -Dv4l-utils=$(if $(CONFIG_PACKAGE_v4l-utils)$(CONFIG_PACKAGE_edid-decode),true,false) \
        -Ddoxygen-doc=disabled
 
 TARGET_LDFLAGS += -Wl,--gc-sections
@@ -117,5 +129,11 @@ define Package/v4l-utils/install
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/cec-{compliance,ctl,follower} $(1)/usr/bin/
 endef
 
+define Package/edid-decode/install
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/edid-decode $(1)/usr/bin/
+endef
+
 $(eval $(call BuildPackage,libv4l))
 $(eval $(call BuildPackage,v4l-utils))
+$(eval $(call BuildPackage,edid-decode))

diff --git a/libs/libv4l/patches/020-musl.patch b/libs/v4l-utils/patches/020-musl.patch
similarity index 100%
rename from libs/libv4l/patches/020-musl.patch
rename to libs/v4l-utils/patches/020-musl.patch