From 8e6169a19238538cbff18e1a16fdd3a2533b82fa Mon Sep 17 00:00:00 2001 From: Marcel Telka Date: Wed, 13 Nov 2024 18:26:42 +0100 Subject: [PATCH] gst-rtsp-server1: update to 1.24.9 --- components/encumbered/gst-rtsp-server1/Makefile | 31 +++++++++++----------- .../{gst-rtsp-server1.p5m => gst-rtsp-server.p5m} | 4 +-- .../gst-rtsp-server1/manifests/sample-manifest.p5m | 4 +-- components/encumbered/gst-rtsp-server1/pkg5 | 2 +- .../gst-rtsp-server1/test/results-all.master | 18 +++++++++++++ 5 files changed, 38 insertions(+), 21 deletions(-) rename components/encumbered/gst-rtsp-server1/{gst-rtsp-server1.p5m => gst-rtsp-server.p5m} (96%) diff --git a/components/encumbered/gst-rtsp-server1/Makefile b/components/encumbered/gst-rtsp-server1/Makefile index e49034b6a1..620f01f5c0 100644 --- a/components/encumbered/gst-rtsp-server1/Makefile +++ b/components/encumbered/gst-rtsp-server1/Makefile @@ -13,37 +13,36 @@ # Copyright 2022-2023 Niklas Poslovski # -BUILD_BITS= 64 BUILD_STYLE= meson +USE_DEFAULT_TEST_TRANSFORMS = yes + include ../../../make-rules/shared-macros.mk -COMPONENT_NAME= gst-rtsp-server1 -COMPONENT_VERSION= 1.22.10 +COMPONENT_NAME= gst-rtsp-server +COMPONENT_VERSION= 1.24.9 COMPONENT_SUMMARY= Multimedia graph framework - rtsp server -COMPONENT_SRC_NAME= gst-rtsp-server -COMPONENT_SRC= $(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION) +COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz -COMPONENT_ARCHIVE_HASH= sha256:60eb4f80b5a7ca929c21a61d50be9813a3413787959a5875de56a8ad5ca25f35 +COMPONENT_ARCHIVE_HASH= sha256:299c9aafac3c91bbebe4cd481ed4e4ade8cb2b0677097bc4a8dcf6d4364c9804 COMPONENT_PROJECT_URL= https://gstreamer.freedesktop.org -COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)/src/$(COMPONENT_SRC_NAME)/$(COMPONENT_ARCHIVE) +COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)/src/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE) COMPONENT_FMRI= library/audio/gstreamer1/rtsp-server COMPONENT_CLASSIFICATION= System/Multimedia Libraries -COMPONENT_LICENSE= LGPLv2.1 +COMPONENT_LICENSE= LGPL-2.1-only COMPONENT_LICENSE_FILE= COPYING include $(WS_MAKE_RULES)/encumbered.mk include $(WS_MAKE_RULES)/common.mk -PATH = $(PATH.gnu) +# Dynamic library version number +SOVER := 0.$(shell printf '%02s%02s' $(wordlist 2,3,$(subst ., ,$(COMPONENT_VERSION)))).0 +SOVER_RE = $(subst .,\.,$(SOVER)) -# gobject-introspection -COMPONENT_BUILD_ENV += CC="$(CC)" -COMPONENT_BUILD_ENV += CFLAGS="$(CFLAGS)" +# Replace library version number by SOVER +GENERATE_EXTRA_CMD += | $(GSED) -e 's/$(SOVER_RE)/$$(SOVER)/' -# As test results keep only everything between the lines containing Ok: and Timeout: -COMPONENT_TEST_TRANSFORMS += \ - '-n ' \ - '-e "/^Ok:/,/^Timeout:/p" ' +# SOVER is needed for manifest processing +PKG_MACROS += SOVER=$(SOVER) # build dependency not detected by REQUIRED_PACKAGES REQUIRED_PACKAGES += system/header/header-audio diff --git a/components/encumbered/gst-rtsp-server1/gst-rtsp-server1.p5m b/components/encumbered/gst-rtsp-server1/gst-rtsp-server.p5m similarity index 96% rename from components/encumbered/gst-rtsp-server1/gst-rtsp-server1.p5m rename to components/encumbered/gst-rtsp-server1/gst-rtsp-server.p5m index 49e77ed864..b6306b5bf5 100644 --- a/components/encumbered/gst-rtsp-server1/gst-rtsp-server1.p5m +++ b/components/encumbered/gst-rtsp-server1/gst-rtsp-server.p5m @@ -53,7 +53,7 @@ file path=usr/lib/$(MACH64)/gstreamer-1.0/libgstrtspclientsink.so link path=usr/lib/$(MACH64)/libgstrtspserver-1.0.so \ target=libgstrtspserver-1.0.so.0 link path=usr/lib/$(MACH64)/libgstrtspserver-1.0.so.0 \ - target=libgstrtspserver-1.0.so.0.2210.0 -file path=usr/lib/$(MACH64)/libgstrtspserver-1.0.so.0.2210.0 + target=libgstrtspserver-1.0.so.$(SOVER) +file path=usr/lib/$(MACH64)/libgstrtspserver-1.0.so.$(SOVER) file path=usr/lib/$(MACH64)/pkgconfig/gstreamer-rtsp-server-1.0.pc file path=usr/share/gir-1.0/GstRtspServer-1.0.gir diff --git a/components/encumbered/gst-rtsp-server1/manifests/sample-manifest.p5m b/components/encumbered/gst-rtsp-server1/manifests/sample-manifest.p5m index 8fe83116ba..6ee7f546e9 100644 --- a/components/encumbered/gst-rtsp-server1/manifests/sample-manifest.p5m +++ b/components/encumbered/gst-rtsp-server1/manifests/sample-manifest.p5m @@ -53,7 +53,7 @@ file path=usr/lib/$(MACH64)/gstreamer-1.0/libgstrtspclientsink.so link path=usr/lib/$(MACH64)/libgstrtspserver-1.0.so \ target=libgstrtspserver-1.0.so.0 link path=usr/lib/$(MACH64)/libgstrtspserver-1.0.so.0 \ - target=libgstrtspserver-1.0.so.0.2210.0 -file path=usr/lib/$(MACH64)/libgstrtspserver-1.0.so.0.2210.0 + target=libgstrtspserver-1.0.so.$(SOVER) +file path=usr/lib/$(MACH64)/libgstrtspserver-1.0.so.$(SOVER) file path=usr/lib/$(MACH64)/pkgconfig/gstreamer-rtsp-server-1.0.pc file path=usr/share/gir-1.0/GstRtspServer-1.0.gir diff --git a/components/encumbered/gst-rtsp-server1/pkg5 b/components/encumbered/gst-rtsp-server1/pkg5 index f643187314..d5baec3f0d 100644 --- a/components/encumbered/gst-rtsp-server1/pkg5 +++ b/components/encumbered/gst-rtsp-server1/pkg5 @@ -10,5 +10,5 @@ "fmris": [ "library/audio/gstreamer1/rtsp-server" ], - "name": "gst-rtsp-server1" + "name": "gst-rtsp-server" } diff --git a/components/encumbered/gst-rtsp-server1/test/results-all.master b/components/encumbered/gst-rtsp-server1/test/results-all.master index bffb70f223..8488f1e662 100644 --- a/components/encumbered/gst-rtsp-server1/test/results-all.master +++ b/components/encumbered/gst-rtsp-server1/test/results-all.master @@ -1,6 +1,24 @@ +gst_addresspool OK +gst_client OK +gst_media OK +gst_mediafactory OK +gst_mountpoints OK +gst_onvif OK +gst_permissions OK +gst_rtspclientsink OK +gst_rtspserver FAIL exit status 1 +gst_sessionmedia OK +gst_sessionpool OK +gst_stream OK +gst_threadpool OK +gst_token OK +test-cleanup OK +test-reuse OK + Ok: 15 Expected Fail: 0 Fail: 1 Unexpected Pass: 0 Skipped: 0 Timeout: 0 + -- 2.11.4.GIT