[ptxdist] [PATCH 1/2] orc: Version bump. 0.4.41 -> 0.4.42

[ptxdist] [PATCH 1/2] orc: Version bump. 0.4.41 -> 0.4.42

[Christian Melki]

https://discourse.gstreamer.org/t/orc-0-4-42-release/5592

* Rearrange options slightly. Disabled doc function was
replaced with something else.

* Backend option has been renamed to target.

* Orcc in tools has been default enabled, but we weren't using
orcc on target. So just disable tools and stop removing it as we
previously did. Should work out fine.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 rules/orc.make | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/rules/orc.make b/rules/orc.make
index 5db14898d..7c4c7e85a 100644
--- a/rules/orc.make
+++ b/rules/orc.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_ORC) += orc
 #
 # Paths and names
 #
-ORC_VERSION	:= 0.4.41
-ORC_MD5		:= 16f82f66d1c3988d01c945278bf01fde
+ORC_VERSION	:= 0.4.42
+ORC_MD5		:= b8b4e43d46a62b32150ed5e9833f1d55
 ORC		:= orc-$(ORC_VERSION)
 ORC_SUFFIX	:= tar.xz
 ORC_URL		:= https://gstreamer.freedesktop.org/data/src/orc/$(ORC).$(ORC_SUFFIX)
@@ -29,22 +29,19 @@ ORC_LICENSE_FILES := \
 # Prepare
 # ----------------------------------------------------------------------------
 
-ORC_BACKEND := all
+ORC_TARGET := all
 ifdef PTXCONF_ARCH_ARM_NEON
-ORC_BACKEND := neon
+ORC_TARGET := neon
 endif
 
-#
-# autoconf
-#
 ORC_CONF_TOOL	:= meson
 ORC_CONF_OPT	:= \
 	$(CROSS_MESON_USR) \
+	-Dorc-target=$(ORC_TARGET) \
+	-Dorc-test=$(call ptx/endis,PTXCONF_ORC_TEST)d \
 	-Dbenchmarks=disabled \
 	-Dexamples=disabled \
-	-Dgtk_doc=disabled \
-	-Dorc-backend=$(ORC_BACKEND) \
-	-Dorc-test=$(call ptx/endis,PTXCONF_ORC_TEST)d
+	-Dhotdoc=disabled \
 	-Dtests=disabled \
 	-Dtools=disabled
 
@@ -52,12 +49,11 @@ ORC_CONF_OPT	:= \
 # Install
 # ----------------------------------------------------------------------------
 
-# don't install orcc it's for the target and should not be used
 $(STATEDIR)/orc.install:
 	@$(call targetinfo)
 	@$(call world/install, ORC)
-	@rm $(ORC_PKGDIR)/usr/bin/orcc
 	@$(call touch)
+
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
-- 
2.43.0

[ptxdist] [PATCH 2/2] host-orc: Follow target orc bump. 0.4.41 -> 0.4.42

[Christian Melki]

* Adjust build options.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 rules/host-orc.make | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rules/host-orc.make b/rules/host-orc.make
index 02a818658..b17723a24 100644
--- a/rules/host-orc.make
+++ b/rules/host-orc.make
@@ -21,11 +21,11 @@ HOST_PACKAGES-$(PTXCONF_HOST_ORC) += host-orc
 HOST_ORC_CONF_TOOL	:= meson
 HOST_ORC_CONF_OPT	:= \
 	$(HOST_MESON_OPT) \
+	-Dorc-target=all \
+	-Dorc-test=disabled \
 	-Dbenchmarks=disabled \
 	-Dexamples=disabled \
-	-Dgtk_doc=disabled \
-	-Dorc-backend=all \
-	-Dorc-test=disabled \
+	-Dhotdoc=disabled \
 	-Dtests=disabled \
 	-Dtools=enabled
 
-- 
2.43.0