From patchwork Sat Dec 15 23:35:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1014014 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ropmgkI0"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43HP235hVlz9s47 for ; Sun, 16 Dec 2018 10:36:27 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 3ED502516D; Sat, 15 Dec 2018 23:36:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LGcGMwMI+gmO; Sat, 15 Dec 2018 23:36:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 114E123600; Sat, 15 Dec 2018 23:36:20 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 4F6561BF3B9 for ; Sat, 15 Dec 2018 23:36:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4D0848566F for ; Sat, 15 Dec 2018 23:36:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wm0gUVmwNYp8 for ; Sat, 15 Dec 2018 23:36:17 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-io1-f65.google.com (mail-io1-f65.google.com [209.85.166.65]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 9564C855EF for ; Sat, 15 Dec 2018 23:36:17 +0000 (UTC) Received: by mail-io1-f65.google.com with SMTP id r200so7302136iod.11 for ; Sat, 15 Dec 2018 15:36:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Y7Ox35jDPLP/Nn5PHv8uEKBPqFAD9Uej/LCsklmYUms=; b=ropmgkI07jOyvOhbfRkJ8uE2zrA1vkVeB9cQ6+Tic6Lr86kND7dmeTCF+tpnAB6G/7 dciHN1I069o2bB4nsp741dZ4RykvEqARcCQT5eTqRGCMXC3MjPBWTWLcZyJN79UGFwxj Rld09dMPZ6Zr4lEujsKJyrXA7jDHNxluAf8my8w3bIx+sT3xRzCSzbP33tE9wGZ4FFOa tXrh7za6eIMOy8JGgvsjxONOEHVxwYlHLneYicRL62L8FjNsxf9aqGphp0z88gt6guik PGjA5J3GiwsIoVkDqPU1Eii0iCKR/c1TG//XZNCIjDUIEahZA9sGBrPyyq4alMsNasOr yPQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Y7Ox35jDPLP/Nn5PHv8uEKBPqFAD9Uej/LCsklmYUms=; b=OJN/nMv1XeyzaATQX0Sj+Si/l4cTAHJApsYKAYUQ3zViuzdvYSVb0oohtRGlhCb2bT oYqgPEk8TceVuMBD3vx7B5r1vqPNlmxKNe/UGHq5XgYes/icTcijLRgkFHrHdmVchMXS atV+4M6/LmT4xKUHs9ETBQp8Wi56lTZLjD3YQv8vI5daLEQvFFhcY5IalaMhYQIWnQIw YqNeZ5XSPWMIinZ3RRfcGvtU3bd78Y8zkDLGiLWEWdjksh3Ztu0sD3JWDZD8m3cCvK8R vnGA5wbX3PFAsixnM0S1lRH2e3r47c/XUCg7hsA+M7UL1HVDl+Uk1zAgZE+2+OAAC6cI YVMQ== X-Gm-Message-State: AA+aEWZVWcGJl0FIooxCXPN60XtUARi7qMRwxmd4LqbM9IXSJUk2Jlqs FHPg+Imgu7GMAxKYJArop/guoIuuV3Q= X-Google-Smtp-Source: AFSGD/UFKJCZmQTqDNV2AAejacRtvNvPpEKlf4MGIi7aNUY6bxyQQEljC3DP9L+NIcvVaxa3UN7lFw== X-Received: by 2002:a6b:398b:: with SMTP id g133mr7016617ioa.67.1544916976636; Sat, 15 Dec 2018 15:36:16 -0800 (PST) Received: from localhost.localdomain (68-188-149-81.dhcp.aldl.mi.charter.com. [68.188.149.81]) by smtp.gmail.com with ESMTPSA id r139sm4167098ior.53.2018.12.15.15.36.15 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 15 Dec 2018 15:36:16 -0800 (PST) From: aduskett@gmail.com To: buildroot@buildroot.org Date: Sat, 15 Dec 2018 18:35:55 -0500 Message-Id: <20181215233555.98482-4-aduskett@gmail.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181215233555.98482-1-aduskett@gmail.com> References: <20181215233555.98482-1-aduskett@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v9 4/4] gstreamer1 packages: add support for introspection X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adam Duskett Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Adam Duskett Now that there is support for gobject-introspection, we can add the appropriate configuration options to support compiling against gobject-introspection. In addition: gst1-plugins-base requires a patch to drop a incorrect reference to sdp when compiling the rtsp gir file. Signed-off-by: Adam Duskett --- Changes v1 -> v4: - Add patch to series. Changes v4 -> v5: - Changed --enable-introspection=yes to --enable-introspection (Yann) - Changed += GIR_EXTRA_LIBS_PATH="$(@D)/gst/.libs:$(@D)/libs/gst/base/.libs" to GSTREAMER1_GIR_EXTRA_LIBS_PATH=$(@D)/gst/.libs:$(@D)/libs/gst/base/.libs Chagnes v5 -> v6: - None Changes v6 -> v7: - Refresh for changes since v6. Changes v7 -> v9: - None .../gst1-plugins-bad/gst1-plugins-bad.mk | 5 ++++ ...ect-reference-to-gstreamer-sdp-in-Ma.patch | 26 +++++++++++++++++++ .../gst1-plugins-base/gst1-plugins-base.mk | 5 ++++ package/gstreamer1/gstreamer1/gstreamer1.mk | 6 +++++ 4 files changed, 42 insertions(+) create mode 100644 package/gstreamer1/gst1-plugins-base/0001-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index ac39f1e5ce..77795d8c69 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -63,6 +63,11 @@ GST1_PLUGINS_BAD_CONF_OPTS += \ GST1_PLUGINS_BAD_DEPENDENCIES = gst1-plugins-base gstreamer1 +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +GST1_PLUGINS_BAD_CONF_OPTS += --enable-introspection +GST1_PLUGINS_BAD_GIR_EXTRA_LIBS_PATH=$(@D)/gst-libs/gst/allocators/.libs +endif + ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) # RPI has odd locations for several required headers. GST1_PLUGINS_BAD_CONF_ENV += \ diff --git a/package/gstreamer1/gst1-plugins-base/0001-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch b/package/gstreamer1/gst1-plugins-base/0001-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch new file mode 100644 index 0000000000..07d4d8c476 --- /dev/null +++ b/package/gstreamer1/gst1-plugins-base/0001-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch @@ -0,0 +1,26 @@ +From 4330915d88dc4dd46eb4c28d756482b767c2747f Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Mon, 26 Oct 2015 17:30:14 +0200 +Subject: [PATCH] rtsp: drop incorrect reference to gstreamer-sdp in Makefile.am + +Upstream-Status: Pending [review on oe-core maillist] +Signed-off-by: Alexander Kanavin +Signed-off-by: Adam Duskett +--- + gst-libs/gst/rtsp/Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am +index 4f6d9f8..0afa370 100644 +--- a/gst-libs/gst/rtsp/Makefile.am ++++ b/gst-libs/gst/rtsp/Makefile.am +@@ -79,7 +79,6 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS + --libtool="$(LIBTOOL)" \ + --pkg gio-2.0 \ + --pkg gstreamer-@GST_API_VERSION@ \ +- --pkg gstreamer-sdp-@GST_API_VERSION@ \ + --pkg-export gstreamer-rtsp-@GST_API_VERSION@ \ + --add-init-section="$(INTROSPECTION_INIT)" \ + --output $@ \ +-- +2.6.2 diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index fb976f9a94..d788d65495 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -25,6 +25,11 @@ GST1_PLUGINS_BASE_CONF_OPTS += \ GST1_PLUGINS_BASE_DEPENDENCIES = gstreamer1 +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +GST1_PLUGINS_BASE_CONF_OPTS += --enable-introspection +GST1_PLUGINS_BASE_GIR_EXTRA_LIBS_PATH=$(@D)/gst-libs/gst/tag/.libs:$(@D)/gst-libs/gst/video/.libs:$(@D)/gst-libs/gst/audio/.libs:$(@D)/gst-libs/gst/rtp/.libs +endif + # These plugins are listed in the order from ./configure --help ifeq ($(BR2_PACKAGE_ORC),y) GST1_PLUGINS_BASE_DEPENDENCIES += orc diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 76a74a0806..ae22a1985a 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -32,4 +32,10 @@ GSTREAMER1_DEPENDENCIES = \ libglib2 \ $(if $(BR2_PACKAGE_LIBUNWIND),libunwind) +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +GSTREAMER1_DEPENDENCIES += gobject-introspection +GSTREAMER1_CONF_OPTS += --enable-introspection +GSTREAMER1_GIR_EXTRA_LIBS_PATH=$(@D)/gst/.libs:$(@D)/libs/gst/base/.libs +endif + $(eval $(autotools-package))