On Tue, Oct 01, 2024 at 09:23:34AM +0200, Michael Tretter wrote:
On Fri, 27 Sep 2024 16:28:45 +0200, Michael Grzeschik wrote:Since libusbgx was released to version 0.3.0 we update the rule.This release also includes the support to build with meson so we also change the build system in the rule file. Signed-off-by: Michael Grzeschik <[email protected]> --- ...1-Fix-39-Compilation-fails-on-gcc-v8.patch | 20 - ...ld-with-glibc-2.28-since-sys-sysmacr.patch | 90 --- ...vid-pid-remove-add-dynamic-vid-pid-s.patch | 67 -- .../0004-libusbgx-Add-UVC-support.patch | 737 ------------------ patches/libusbgx-0.2.0/autogen.sh | 16 - patches/libusbgx-0.2.0/series | 7 - rules/libusbgx.in | 1 + rules/libusbgx.make | 26 +- 8 files changed, 13 insertions(+), 951 deletions(-) delete mode 100644 patches/libusbgx-0.2.0/0001-Fix-39-Compilation-fails-on-gcc-v8.patch delete mode 100644 patches/libusbgx-0.2.0/0002-libusbgx-fix-build-with-glibc-2.28-since-sys-sysmacr.patch delete mode 100644 patches/libusbgx-0.2.0/0003-examples-gadget-vid-pid-remove-add-dynamic-vid-pid-s.patch delete mode 100644 patches/libusbgx-0.2.0/0004-libusbgx-Add-UVC-support.patch delete mode 100755 patches/libusbgx-0.2.0/autogen.sh delete mode 100644 patches/libusbgx-0.2.0/series[...]diff --git a/rules/libusbgx.in b/rules/libusbgx.in index e576f842e..95e92a04c 100644 --- a/rules/libusbgx.in +++ b/rules/libusbgx.in @@ -2,6 +2,7 @@ menuconfig LIBUSBGX bool + select HOST_MESON select LIBCONFIG if LIBUSBGX_SCHEMES prompt "libusbgx " help diff --git a/rules/libusbgx.make b/rules/libusbgx.make index f6ccb6e9b..3de7f19f6 100644 --- a/rules/libusbgx.make +++ b/rules/libusbgx.make @@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_LIBUSBGX) += libusbgx # # Paths and names # -LIBUSBGX_VERSION := 0.2.0 -LIBUSBGX_MD5 := a8ea2234c6355ac8ad2ca86c453297bd -LIBUSBGX := libusbgx-$(LIBUSBGX_VERSION) -LIBUSBGX_SUFFIX := zip -LIBUSBGX_URL := https://github.com/libusbgx/libusbgx/archive/refs/tags/libusbgx-v$(LIBUSBGX_VERSION).zip +LIBUSBGX_VERSION := 0.3.0 +LIBUSBGX_MD5 := f2ca9c639e6fc6ee9dbecb545fa61637 +LIBUSBGX := libusbgx-v$(LIBUSBGX_VERSION)Is the additional v intentional?
Yes, I wanted to be consistent with the source package which is located
at ..refs/tags/libusbgx-v$(LIBUSGX_VERSION).
^
I will update the comment in the description to docuemnt this.
mgr
+LIBUSBGX_SUFFIX := tar.gz +LIBUSBGX_URL := https://github.com/linux-usb-gadgets/libusbgx/archive/refs/tags/libusbgx-v$(LIBUSBGX_VERSION).$(LIBUSBGX_SUFFIX) LIBUSBGX_SOURCE := $(SRCDIR)/$(LIBUSBGX).$(LIBUSBGX_SUFFIX) LIBUSBGX_DIR := $(BUILDDIR)/$(LIBUSBGX) LIBUSBGX_LICENSE := GPL-2.0-or-later AND LGPL-2.1-or-later @@ -32,18 +32,16 @@ LIBUSBGX_LICENSE_FILES := \ # Prepare # ---------------------------------------------------------------------------- -LIBUSBGX_CONF_ENV := $(CROSS_ENV) - # -# autoconf +# meson # -LIBUSBGX_CONF_TOOL := autoconf +LIBUSBGX_CONF_TOOL := meson LIBUSBGX_CONF_OPT := \ - $(CROSS_AUTOCONF_USR) \ - --$(call ptx/wwo, PTXCONF_LIBUSBGX_SCHEMES)-libconfig \ - --enable-examples \ - --$(call ptx/endis, PTXCONF_LIBUSBGX_SCHEMES)-gadget-schemes \ - --disable-doxygen-doc + $(CROSS_MESON_USR) \ + -Dexamples=true \ + -Dtests=disabled \ + -Dgadget-schemes=$(call ptx/endis, PTXCONF_LIBUSBGX_SCHEMES)d \ + -Ddoxygen=disabled # ---------------------------------------------------------------------------- # Target-Install -- 2.39.5
-- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
signature.asc
Description: PGP signature
