فهرست منبع

package/gstreamer1/gstreamer1-mm: drop package

gstreamer1-mm is not compatible with glibmm-2.68 API and not actively
maintained anymore (one commit during the last 3 years):
https://gitlab.gnome.org/GNOME/gstreamermm/-/issues/17
https://gitlab.gnome.org/GNOME/gstreamermm/-/commits/master

As this is the only package that doesn't support glibmm-2.68 and because
it can't be easily patched, drop it to avoid the following build failure
raised since commit dddb65efbdf2c7952f22a1e51009f17f1676db4a:

Package 'giomm-2.4', required by 'virtual:world', not found

Fixes:
 - http://autobuild.buildroot.org/results/3479688334765fbbe4cb9620f4d3596f7d710404

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Fabrice Fontaine 3 سال پیش
والد
کامیت
bdb8cbb15c

+ 7 - 0
Config.in.legacy

@@ -146,6 +146,13 @@ endif
 
 comment "Legacy options removed in 2022.02"
 
+config BR2_PACKAGE_GSTREAMER1_MM
+	bool "gstreamer1-mm package removed"
+	select BR2_LEGACY
+	help
+	  This package has been removed as it is not actively
+	  maintained anymore and does not support glibmm-2.68 API.
+
 config BR2_KERNEL_HEADERS_5_14
 	bool "kernel headers version 5.14.x are no longer supported"
 	select BR2_LEGACY

+ 0 - 1
package/gstreamer1/Config.in

@@ -2,7 +2,6 @@
 source "package/gstreamer1/gstreamer1/Config.in"
 
 if BR2_PACKAGE_GSTREAMER1
-source "package/gstreamer1/gstreamer1-mm/Config.in"
 source "package/gstreamer1/gst1-plugins-base/Config.in"
 source "package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in"
 source "package/gstreamer1/gst1-plugins-good/Config.in"

+ 0 - 44
package/gstreamer1/gstreamer1-mm/0001-Fix-build-against-glib-2-68.patch

@@ -1,44 +0,0 @@
-From 0c0b5f8cef3b1f0a06f56c34340e210e0f23d1b0 Mon Sep 17 00:00:00 2001
-From: Dominique Leuenberger <dimstar@opensuse.org>
-Date: Tue, 13 Jul 2021 10:32:30 +0000
-Subject: [PATCH] Fix build against glib 2.68
-
-volatile has been misused in the past
-
-[Retrieved from:
-https://gitlab.gnome.org/GNOME/gstreamermm/-/merge_requests/4]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- gstreamer/gstreamermm/register.h                    | 2 +-
- tests/integration/test-integration-seekonstartup.cc | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gstreamer/gstreamermm/register.h b/gstreamer/gstreamermm/register.h
-index db66d172..a7ab3a63 100644
---- a/gstreamer/gstreamermm/register.h
-+++ b/gstreamer/gstreamermm/register.h
-@@ -110,7 +110,7 @@ register_mm_type(const gchar * type_name)
-     /* The typedef for GType may be gulong or gsize, depending on the
-      * system and whether the compiler is c++ or not. The g_once_init_*
-      * functions always take a gsize * though ... */
--    static volatile gsize gonce_data = 0;
-+    static gsize gonce_data = 0;
-     if (g_once_init_enter (&gonce_data)) {
-         GTypeInfo info;
- 
-diff --git a/tests/integration/test-integration-seekonstartup.cc b/tests/integration/test-integration-seekonstartup.cc
-index 247ac499..cd43a125 100644
---- a/tests/integration/test-integration-seekonstartup.cc
-+++ b/tests/integration/test-integration-seekonstartup.cc
-@@ -18,7 +18,7 @@ RefPtr<Glib::MainLoop> mainloop;
- RefPtr<Bus> bus;
- RefPtr<Pipeline> pipeline;
- RefPtr<Pad> sink_pad;
--static volatile gint counter;
-+static gint counter;
- bool prerolled = false;
- gboolean was_check = 0;
- 
--- 
-GitLab
-

+ 0 - 29
package/gstreamer1/gstreamer1-mm/Config.in

@@ -1,29 +0,0 @@
-config BR2_PACKAGE_GSTREAMER1_MM
-	bool "gstreamer1-mm"
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # glibmm -> libsigc
-	depends on BR2_INSTALL_LIBSTDCPP # glibmm
-	depends on BR2_USE_WCHAR # glibmm -> libglib2
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
-	depends on BR2_USE_MMU # glibmm -> libglib2
-	select BR2_PACKAGE_GLIBMM
-	select BR2_PACKAGE_GSTREAMER1_CHECK
-	select BR2_PACKAGE_GST1_PLUGINS_BASE
-	help
-	  gstreamermm provides C++ bindings for the GStreamer streaming
-	  multimedia library (http://gstreamer.freedesktop.org). With
-	  gstreamermm it is possible to	develop applications that work
-	  with multimedia in C++.
-
-	  gstreamermm is developed over glibmm, libsigc++ and libxml++
-	  and the functionalities they provide. This means that, among
-	  other things, referencing and unreferencing of GObjects is
-	  handled automatically via glibmm's automatic pointer class,
-	  Glib::RefPtr, and libsigc++'s slots are used for callbacks and
-	  signals.
-
-	  https://gstreamer.freedesktop.org/bindings/cplusplus.html
-
-comment "gstreamer1-mm needs a toolchain w/ C++, wchar, threads, gcc >= 7"
-	depends on BR2_USE_MMU
-	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || !BR2_USE_WCHAR \
-		|| !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS

+ 0 - 6
package/gstreamer1/gstreamer1-mm/gstreamer1-mm.hash

@@ -1,6 +0,0 @@
-# From http://ftp.gnome.org/pub/gnome/sources/gstreamermm/1.10/gstreamermm-1.10.0.sha256sum
-sha256 be58fe9ef7d7e392568ec85e80a84f4730adbf91fb0355ff7d7c616675ea8d60 gstreamermm-1.10.0.tar.xz
-
-# Locally computed
-sha256 7c78a8d7fc6781d51402d5a6036bedda9cffb0e5d28757e25d54d6eacbb1949f  COPYING
-sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING.examples

+ 0 - 24
package/gstreamer1/gstreamer1-mm/gstreamer1-mm.mk

@@ -1,24 +0,0 @@
-################################################################################
-#
-# gstreamer1-mm
-#
-################################################################################
-
-GSTREAMER1_MM_VERSION_MAJOR = 1.10
-GSTREAMER1_MM_VERSION = $(GSTREAMER1_MM_VERSION_MAJOR).0
-GSTREAMER1_MM_SITE = http://ftp.gnome.org/pub/gnome/sources/gstreamermm/$(GSTREAMER1_MM_VERSION_MAJOR)
-GSTREAMER1_MM_SOURCE = gstreamermm-$(GSTREAMER1_MM_VERSION).tar.xz
-GSTREAMER1_MM_LICENSE = LGPL-2.1+ (library), GPL-2.0 (examples)
-GSTREAMER1_MM_LICENSE_FILES = COPYING COPYING.examples
-GSTREAMER1_MM_INSTALL_STAGING = YES
-GSTREAMER1_MM_DEPENDENCIES += \
-	glibmm \
-	gstreamer1 \
-	gst1-plugins-base
-
-GSTREAMER1_MM_CONF_OPTS += \
-	--disable-gl \
-	--enable-unittests=no \
-	--disable-deprecated-api
-
-$(eval $(autotools-package))