From patchwork Fri Feb 7 14:50:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 1235006 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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=none (p=none dis=none) header.from=korsgaard.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=EIK2fNUz; 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 48DdX50ShXz9s3x for ; Sat, 8 Feb 2020 01:50:44 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id C5825221B2; Fri, 7 Feb 2020 14:50:41 +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 SNCmiIw2J9Hu; Fri, 7 Feb 2020 14:50:38 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id F3BBE2039E; Fri, 7 Feb 2020 14:50:37 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 96AB11BF364 for ; Fri, 7 Feb 2020 14:50:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id B80421FF11 for ; Fri, 7 Feb 2020 14:50:35 +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 CpKOPZE4BlyB for ; Fri, 7 Feb 2020 14:50:31 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by silver.osuosl.org (Postfix) with ESMTPS id 3BF782039E for ; Fri, 7 Feb 2020 14:50:31 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id t14so3048816wmi.5 for ; Fri, 07 Feb 2020 06:50:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jnt02bbaCrxI0rGv4kbWsbqlSnZ74CdSJdIZdKmZiC4=; b=EIK2fNUzcweKxSU77p5q1Vv1K0ex4n49jZv0KPbnwQwmj//6HvpGsySCyb9Apb7Nnm MxgEuYLLmDYgq1wyt2RLIWTShxRrr1jQAugifWRxU71iyRuLuUwPOkFJM5aIhREEgngL K5cZdpxsAKkrpb7CrsUwXHMgafAcAXccavaIoeoJzCfsgvudBKD/7+xZHGJKRqzjAwtu p3F5o/aFNpBHt88JnHDPdi/Oor32YKpSwurr7et461l5trrRYZdCHJlNgKEo2UUWFpL0 vR0i4+XLvQ3lT1JXMzBVSweVThaYYwqksyGLJJzC3j2y//Rce1HJ9F0wUeo0Hq8Q7/5L EdyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=jnt02bbaCrxI0rGv4kbWsbqlSnZ74CdSJdIZdKmZiC4=; b=UBPB43n2Puiaj2z5AC8yyXLYrUp88ykGY7vSiiU9UCUte9U5gfaJyBJnKFJdPG7lgr FSth8BzeKkqtK79Q8LRT4KZTE4hAnrISrIXtf0rXRidD00+yfLU71m0mqip+INWL3i2J yuHb7o7k8UbBE4RsGz6ZNgimUEb798/BaSU4c199PLmvzoF0ha43ziBK5U+wHrZRfsBl iUyOZmFhK7LbcZFfQRB+g69/wyOphVZWVX4v0ZiKZV+h3dWezmeTMOjjB/uc5SmJNJeB V4crglrqVg/5qoVDLmy5c3WOX/xjc1/UTU5zqC87+IBLkiyes9n2gtYu/PP8EzU279hb 0Ogw== X-Gm-Message-State: APjAAAVIplxBx0INO8Xum0juOdCEnINhF4XRIzVrh3bLxiGNeElfMYq2 B4o6lLbDqgEoPi3+8u+mJYX6Gv8H X-Google-Smtp-Source: APXvYqwwoNjN8axsJFEGAXxN+IJu74ka+a+OjVX9nvB2BwY/juDUMlJyTplHn2tPHfFN6ypGlgnUpg== X-Received: by 2002:a1c:e007:: with SMTP id x7mr4669238wmg.3.1581087029265; Fri, 07 Feb 2020 06:50:29 -0800 (PST) Received: from dell.be.48ers.dk (d51A5BC31.access.telenet.be. [81.165.188.49]) by smtp.gmail.com with ESMTPSA id t10sm3662326wmi.40.2020.02.07.06.50.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2020 06:50:28 -0800 (PST) Received: from peko by dell.be.48ers.dk with local (Exim 4.92) (envelope-from ) id 1j04xf-0007Or-GV; Fri, 07 Feb 2020 15:50:27 +0100 From: Peter Korsgaard To: buildroot@buildroot.org Date: Fri, 7 Feb 2020 15:50:16 +0100 Message-Id: <20200207145026.28384-2-peter@korsgaard.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200207145026.28384-1-peter@korsgaard.com> References: <20200207145026.28384-1-peter@korsgaard.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 01/10] package/classpath: drop gstreamer 0.10.x support 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: Peter Korsgaard Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" With the upcoming removal of gstreamer 0.10, the logic for building classpath with support for it must go as well. Signed-off-by: Peter Korsgaard --- package/classpath/classpath.mk | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/package/classpath/classpath.mk b/package/classpath/classpath.mk index 6bba6948c5..7177bbfe06 100644 --- a/package/classpath/classpath.mk +++ b/package/classpath/classpath.mk @@ -12,6 +12,7 @@ CLASSPATH_CONF_OPTS = \ --disable-Werror \ --disable-gconf-peer \ --disable-gjdoc \ + --disable-gstreamer-peer \ --enable-tools # classpath assumes qt runs on top of X11, but we @@ -40,16 +41,8 @@ endif ifeq ($(BR2_PACKAGE_LIBGTK2)$(BR2_PACKAGE_XORG7),yy) CLASSPATH_CONF_OPTS += --enable-gtk-peer CLASSPATH_DEPENDENCIES += libgtk2 - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE),y) -CLASSPATH_CONF_OPTS += --enable-gstreamer-peer -CLASSPATH_DEPENDENCIES += gst-plugins-base -else -CLASSPATH_CONF_OPTS += --disable-gstreamer-peer -endif - else -CLASSPATH_CONF_OPTS += --disable-gtk-peer --disable-gstreamer-peer +CLASSPATH_CONF_OPTS += --disable-gtk-peer endif ifeq ($(BR2_PACKAGE_LIBXML2)$(BR2_PACKAGE_LIBXSLT)$(BR2_TOOLCHAIN_HAS_THREADS),yyy) From patchwork Fri Feb 7 14:50:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 1235010 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=korsgaard.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=Z8Loo2ap; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48DdXV69Xxz9sSD for ; Sat, 8 Feb 2020 01:51:06 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 6D56687E8F; Fri, 7 Feb 2020 14:51:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Hn1VyFrRUZSi; Fri, 7 Feb 2020 14:51:03 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id A929D87E7B; Fri, 7 Feb 2020 14:51:02 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id C4EF41BF364 for ; Fri, 7 Feb 2020 14:50:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id BD66A86C80 for ; Fri, 7 Feb 2020 14:50:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id W9qp5OxKyXDI for ; Fri, 7 Feb 2020 14:50:36 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by whitealder.osuosl.org (Postfix) with ESMTPS id 8641C8648E for ; Fri, 7 Feb 2020 14:50:31 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id t2so3040951wrr.1 for ; Fri, 07 Feb 2020 06:50:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QBJxLeEBQVEPhFWZ9D3tQr3E11YT+LR52lQUr3K8m6w=; b=Z8Loo2apzSPQYgfQGp+d/HMmm/BnLYSaPdTcLBkbTijDsjuHrXy75JL1xUyRwDSR9A Bumfvu+k6kvvmHEVszSap4PNuNgyOd54wxAkjHmipHp1/VHUwIZpHEqOvR29cIVKplnZ QDc5n+Ao2wZbkgHHeGLJV693m2Asb1n8Ff7CzSWgZ84oqt+JjNYvDOP+EoZ12KRZbjah vBP8qNsytmblKv35aQ8fxH9Bibe6Bc0mMPuMpnlCoxOyXQKC0F3VtjuWryHLcvJ3SqHB RJPUpYRNAXr1tYHj/XAQDalgm+ZepLYRKUGG8QopkuTynK/3w7FnnYS4aXQaGJhU72wW 4/lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=QBJxLeEBQVEPhFWZ9D3tQr3E11YT+LR52lQUr3K8m6w=; b=BUt1+ezpI2ddhylDgBFKen/Flnwvapx72nq2yC5AIUWIFBPQEECvhY1JT2g0D1XecL VKFtzvbw8pTMhRpAnJL7CP4OetZ3yis7nHt/UIP+9700VkVeh7nK4NamdZ0PMceAUVwY GO8Kw6hwA/vPlKGqZBFSbsxL3TlAz368R5P+sHrGDBiejxnMSN636zLSHSy51qfQwU3j xq0mgcvv0oLUJ75bwEwbU3wdtU+UvRssXbeOLavpeMiSZoGAoOg/KmZRz8pd/CK7nXXP B6TQxo3+KZMWt4/qJ5conbGOQPGkFxRgaEa3BPMJ3SNUt6cqpp+J71Vve5EwsNFTcGub A6cw== X-Gm-Message-State: APjAAAWdBQoTYcKNnPPw77lrw37kUmVO+wZrzIxm2QmLeHS1A2mIjT4u VvYEVWr6bzdn5uofYUNu6CC7Xa40 X-Google-Smtp-Source: APXvYqwQEA/pTl2PjXjsRZ6TRmiuIJQwhRmFP3VZ9FywjattxWv9+RG1HR9nt3zR4+CIvANOGoSMew== X-Received: by 2002:a05:6000:1289:: with SMTP id f9mr4837880wrx.381.1581087029720; Fri, 07 Feb 2020 06:50:29 -0800 (PST) Received: from dell.be.48ers.dk (d51A5BC31.access.telenet.be. [81.165.188.49]) by smtp.gmail.com with ESMTPSA id z133sm3853066wmb.7.2020.02.07.06.50.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2020 06:50:28 -0800 (PST) Received: from peko by dell.be.48ers.dk with local (Exim 4.92) (envelope-from ) id 1j04xf-0007Ow-Ta; Fri, 07 Feb 2020 15:50:27 +0100 From: Peter Korsgaard To: buildroot@buildroot.org Date: Fri, 7 Feb 2020 15:50:17 +0100 Message-Id: <20200207145026.28384-3-peter@korsgaard.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200207145026.28384-1-peter@korsgaard.com> References: <20200207145026.28384-1-peter@korsgaard.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 02/10] package/gupnp-dlna: drop gstreamer 0.10.x support 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: Peter Korsgaard , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" With the upcoming removal of gstreamer 0.10, the logic for building gupnp-dlna with support for it must go as well. Signed-off-by: Peter Korsgaard --- package/gupnp-dlna/gupnp-dlna.mk | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/package/gupnp-dlna/gupnp-dlna.mk b/package/gupnp-dlna/gupnp-dlna.mk index 304f86a55c..6f9ff8a58c 100644 --- a/package/gupnp-dlna/gupnp-dlna.mk +++ b/package/gupnp-dlna/gupnp-dlna.mk @@ -15,12 +15,7 @@ GUPNP_DLNA_LICENSE_FILES = COPYING GUPNP_DLNA_INSTALL_STAGING = YES GUPNP_DLNA_DEPENDENCIES = host-pkgconf libglib2 libxml2 -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE),y) -GUPNP_DLNA_CONF_OPTS += --enable-legacy-gstreamer-metadata-backend -GUPNP_DLNA_DEPENDENCIES += gstreamer gst-plugins-base -else -GUPNP_DLNA_CONF_OPTS += --disable-legacy-gstreamer-metadata-backend -endif +GUPNP_DLNA_CONF_OPTS = --disable-legacy-gstreamer-metadata-backend ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y) GUPNP_DLNA_CONF_OPTS += --enable-gstreamer-metadata-backend From patchwork Fri Feb 7 14:50:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 1235016 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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=none (p=none dis=none) header.from=korsgaard.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=eA7YRgLG; 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 48DdXt5l46z9s3x for ; Sat, 8 Feb 2020 01:51:26 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id C6146220FB; Fri, 7 Feb 2020 14:51:24 +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 sLeXf0PdlyHw; Fri, 7 Feb 2020 14:51:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id E48BA22264; Fri, 7 Feb 2020 14:51:11 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id C967A1BF364 for ; Fri, 7 Feb 2020 14:51:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 933D38250B for ; Fri, 7 Feb 2020 14:51:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LN7+2LeKLjS4 for ; Fri, 7 Feb 2020 14:51:02 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by hemlock.osuosl.org (Postfix) with ESMTPS id 351D787E97 for ; Fri, 7 Feb 2020 14:50:33 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id q9so2831852wmj.5 for ; Fri, 07 Feb 2020 06:50:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=amwGPFNpfuzD8OsIvTXCsxzEMAomZMPhyYQVykYb604=; b=eA7YRgLG+RTTsaGvlOLuz55A2GosBT2dLyCAd3q2vskc0OWtz4Q3zWVifNGotPPUcm nvlVyDPG+Nxtu7S/hQ8bxaeSDTAx7cSExp+hN6dlS4EKr9SRIeDoupf2aU1bCdX94PmO kTDNCDankGx/i7AmAyD/GGlkLCXCommctQLTNBH5AK3eL649jhKOswabf+CxVLpfx7jQ TxnAsc56UQbD7HOZIvf0b3J9STMpAWEkbU2qGqqDCh4aOLXQ3Si7VOt8ABimB7HXUMG3 2oFbXwaPJnuKAXmQ8CiCKFHaZCzpVmSHJ26qPaiWwPss5kdX+e2GlW6yMUfA9VJvJeHO DoKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=amwGPFNpfuzD8OsIvTXCsxzEMAomZMPhyYQVykYb604=; b=NyNynBCHApMqe4i7trehR8IKspZTzRTMsrpmGw7rAddyu7hOpx8sBotGldT39MBtYW A3skiaiIeN3ASp9PNRmIffEbPe540+iEzQ70Ko9ezw3BJppAyuROgosJCzdFod0w2CBp q5A9zb4bJZS67Rl4+KIueWRVnWthW/GGcDE+s+pIj+tgLQr8tkhuuscMQFfwlZrkks8T dYl38pFWJ64gbd4vbhjxuxbuX6KMQgxUtbl3UomQwHFoorc9lxYWgriETzSzDfajPLFe 8UCP5Az3fO7w/GZYno4yIpFIzElnX6qvkcRi3jfZTyL5D+Y3pHf9sc4+GOXqygRsiSMt 1r3A== X-Gm-Message-State: APjAAAUiKXlOdCpcuUKE+CLBHEFyGyS79nCczJX62RMr5NfPSU9HEjvm kiROlukBveMM4E3actx2ij8dAPN6 X-Google-Smtp-Source: APXvYqwfeK5tp72w+MnF27yvtWGyMKsjvJJeurkD0FXcELxClxRM1NouA0zWgpYiLz7Ve/InGRU0Ag== X-Received: by 2002:a7b:ce98:: with SMTP id q24mr4636302wmj.41.1581087031262; Fri, 07 Feb 2020 06:50:31 -0800 (PST) Received: from dell.be.48ers.dk (d51A5BC31.access.telenet.be. [81.165.188.49]) by smtp.gmail.com with ESMTPSA id y8sm3571641wma.10.2020.02.07.06.50.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2020 06:50:29 -0800 (PST) Received: from peko by dell.be.48ers.dk with local (Exim 4.92) (envelope-from ) id 1j04xg-0007P1-9a; Fri, 07 Feb 2020 15:50:28 +0100 From: Peter Korsgaard To: buildroot@buildroot.org Date: Fri, 7 Feb 2020 15:50:18 +0100 Message-Id: <20200207145026.28384-4-peter@korsgaard.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200207145026.28384-1-peter@korsgaard.com> References: <20200207145026.28384-1-peter@korsgaard.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 03/10] package/libnice: drop gstreamer 0.10.x support 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: Peter Korsgaard , Gregory Dymarek Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" With the upcoming removal of gstreamer 0.10, the logic for building libnice with support for it must go as well. Signed-off-by: Peter Korsgaard --- package/libnice/libnice.mk | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/package/libnice/libnice.mk b/package/libnice/libnice.mk index b5168f83ed..8cbf003529 100644 --- a/package/libnice/libnice.mk +++ b/package/libnice/libnice.mk @@ -10,6 +10,7 @@ LIBNICE_LICENSE = MPL-1.1 or LGPL-2.1 LIBNICE_LICENSE_FILES = COPYING COPYING.MPL COPYING.LGPL LIBNICE_DEPENDENCIES = libglib2 host-pkgconf LIBNICE_INSTALL_STAGING = YES +LIBNICE_CONF_OPTS = --without-gstreamer-0.10 ifeq ($(BR2_PACKAGE_GNUTLS),y) LIBNICE_CONF_OPTS += --with-crypto-library=gnutls @@ -21,13 +22,6 @@ LIBNICE_CONF_OPTS += \ LIBNICE_DEPENDENCIES += openssl endif -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE),y) -LIBNICE_CONF_OPTS += --with-gstreamer-0.10 -LIBNICE_DEPENDENCIES += gst-plugins-base -else -LIBNICE_CONF_OPTS += --without-gstreamer-0.10 -endif - ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y) LIBNICE_CONF_OPTS += --with-gstreamer LIBNICE_DEPENDENCIES += gst1-plugins-base From patchwork Fri Feb 7 14:50:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 1235013 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=korsgaard.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=U1DI9f91; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48DdXf72DMz9sSD for ; Sat, 8 Feb 2020 01:51:14 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 41C3686594; Fri, 7 Feb 2020 14:51:11 +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 tRdNaep1gMWN; Fri, 7 Feb 2020 14:51:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id B1AA58659E; Fri, 7 Feb 2020 14:51:10 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 3539F1BF364 for ; Fri, 7 Feb 2020 14:51:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 176D187E8B for ; Fri, 7 Feb 2020 14:51:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 26p7uhgYy4OI for ; Fri, 7 Feb 2020 14:51:02 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by hemlock.osuosl.org (Postfix) with ESMTPS id A345787E94 for ; Fri, 7 Feb 2020 14:50:32 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id a5so2892210wmb.0 for ; Fri, 07 Feb 2020 06:50:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pFq7uMU1mc8ohQaIhD6sFJ3MijKwu0Qbjwqt0geCETs=; b=U1DI9f91WxWqizPbtNSVyBN+BzzAsaIe1O9beOLSBE/B30lWjrAo17ugJ6wiVgNUGN wGTIJIOmDpja4Q7P1zku9mUVQILj4MOEtjMLj14Yfu0p4RyXT1FkBxWxFcvd5272ruH1 yHHx/Py7FylHly2JBh3+8iiIGBgxEnGRYml+rLMscXq4wbEIIxTrqi/XQCsILciHwDu+ 3dImzNqi6cng9xszg3smBG+mNP3J6Q+8xPuWOUjjq8gprqtYImo+4Dn4GCi8aNVhJNwe JFlqhYJ4O1s1bvXKe83v6mTT4Mn8YPKX4OLWA8MbGB4ZspPutZq/tL745sgAPZzEpDxv 9n2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=pFq7uMU1mc8ohQaIhD6sFJ3MijKwu0Qbjwqt0geCETs=; b=jU9bNvN2ZjsfcSu/HdlwN+jZtrYxxsBP7J/Ncqi2gk45ClgQs2QLJQXZNzawfltTn5 haZLxQ80DRVmbSMX+M/0lxOj/prygO4/PClOF71sKm2R4R3Afp45tmFf+Lv5caBjL1Ag TnQlTVp3vwp/URtpAnnOeY4MwxXcTAbtx60/1XiQHeUDoyBxfIkQwe9HaRRN9TU42IAN Z42hasxcBOsvMAI6G2yWUTrIQJDEOvjTdPgddnFCeHPWf3XBREr2KabfJCwrmwcPofmX E+kw25rq3O6Vh0Wvw9rW2h0pPAoLlVsZCYHXUJf9uUTr0SlL6FANsFb6B5uctRFtNg8V y4Pg== X-Gm-Message-State: APjAAAXMAtdNyjb7hIH/MIELCmsouhg7lZaPNM4q0/z9gTBoRhnY0XAV gqg8ihgZQuqA/MBa/05qtCVZoZsJ X-Google-Smtp-Source: APXvYqyG5nSgJgn2EANJN+9N7nDIca+VCP0yk4WtAihfxxeS/Cee1m+ddXgmkEEdJy+Q/BeZYi7TsA== X-Received: by 2002:a05:600c:2944:: with SMTP id n4mr4710972wmd.22.1581087030833; Fri, 07 Feb 2020 06:50:30 -0800 (PST) Received: from dell.be.48ers.dk (d51A5BC31.access.telenet.be. [81.165.188.49]) by smtp.gmail.com with ESMTPSA id b21sm3839494wmd.37.2020.02.07.06.50.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2020 06:50:29 -0800 (PST) Received: from peko by dell.be.48ers.dk with local (Exim 4.92) (envelope-from ) id 1j04xg-0007P6-M7; Fri, 07 Feb 2020 15:50:28 +0100 From: Peter Korsgaard To: buildroot@buildroot.org Date: Fri, 7 Feb 2020 15:50:19 +0100 Message-Id: <20200207145026.28384-5-peter@korsgaard.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200207145026.28384-1-peter@korsgaard.com> References: <20200207145026.28384-1-peter@korsgaard.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 04/10] package/qt5multimedia: drop gstreamer 0.10.x support 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: Peter Korsgaard , Peter Seiderer , Julien Corjon Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" With the upcoming removal of gstreamer 0.10, the logic for building qt5multimeda with support for it must go as well. Signed-off-by: Peter Korsgaard --- package/qt5/qt5multimedia/qt5multimedia.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk index 611b41a8c7..e598140a9a 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -18,10 +18,6 @@ QT5MULTIMEDIA_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL endif -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE),y) -QT5MULTIMEDIA_DEPENDENCIES += gst-plugins-base -endif - ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y) QT5MULTIMEDIA_DEPENDENCIES += gst1-plugins-base endif From patchwork Fri Feb 7 14:50:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 1235015 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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=none (p=none dis=none) header.from=korsgaard.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=Hpz1/O28; 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 48DdXr4chPz9s3x for ; Sat, 8 Feb 2020 01:51:24 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id DCD0222621; Fri, 7 Feb 2020 14:51:22 +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 Q1G7agNz+hXI; Fri, 7 Feb 2020 14:51:15 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id AC45D2266C; Fri, 7 Feb 2020 14:51:09 +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 1F3DE1BF364 for ; Fri, 7 Feb 2020 14:51:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 19BEB85775 for ; Fri, 7 Feb 2020 14:51:04 +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 UUxncud3prxX for ; Fri, 7 Feb 2020 14:51:01 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by fraxinus.osuosl.org (Postfix) with ESMTPS id B6314864EC for ; Fri, 7 Feb 2020 14:50:33 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id t3so3007021wru.7 for ; Fri, 07 Feb 2020 06:50:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MQ/hLOVROdKa9NBnhJ59emYsTUT3KBSl93t5Nwsccoc=; b=Hpz1/O28VYnoTFZr3fpHp0jk7Vw2TmuxnhZGpsCray1L7vkPNTdDZyPFf608rmC1WL G3rWSlRETReHH4bWCcNH//FsgGNswMY4wdKbgYZR8w738TWZxWE0HfYVqnajAmnzg6fA zAG84KgPfc5Dpbtwj12GdonZuZ+oPrayXoSE3UYtxZPJZ5IyWPJBIdbmnD4ydVSK9dIg CmEvvX05Hc3v3WeKpz3e/OyimVsIMBvOw9Zbf3TtiGqrERM8z7iIejVJNfLBaxelmCyM hmwmJOlYGboZWYnZn0FaNPwNBA/87YJui9tzrfP9wIionhz4orZlYNgznMwIgXSgWjgH gc+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=MQ/hLOVROdKa9NBnhJ59emYsTUT3KBSl93t5Nwsccoc=; b=SsH69a2GjrLBl78bKAyUEsEjpC5q+Kz/oxTUS4qcf/XcXKwul1IXn6EMMzL/ahKdnm B55ObG4J6KkQJodPKoQ/SfE6Vh9sTUPLOpRPDXCfXVRh2oVEjPQ9Qk2nCYpbp1HyuJDk aBQ04sIHm1TEv0H5DEdmCkVtxKczO4hTOTxN2mLdOwpXdXPH2pKgoSJs2ZGj2OKvd1xt GXsRmFSUVSDxgt/metufdGoEKpZi6Gz4eT1TzPSCPoVuLB0Uyv6eT3qwqxXoRPRp/8bI mfzXz6ozWIizorsmNmsnGJroua7IohoGYA30TdF4iJ1Wa8DrcwSshXh9jTiiK4nJqnHx fdMg== X-Gm-Message-State: APjAAAVVuwTY20Gh0XTqLo602YmUByj2IQCCW3k3tew2ex9BbHHDKtwt nRHBgOuAIIo1PfIZqzz7Izru699E X-Google-Smtp-Source: APXvYqxPDsUfhbB16KYPEIxyYd+UOyoRvwvzh/ibRek1wLKr152G58zIMfVhTWedeVMRVh+MNq4HoA== X-Received: by 2002:adf:a41c:: with SMTP id d28mr5335608wra.410.1581087031795; Fri, 07 Feb 2020 06:50:31 -0800 (PST) Received: from dell.be.48ers.dk (d51A5BC31.access.telenet.be. [81.165.188.49]) by smtp.gmail.com with ESMTPSA id k8sm3613263wrq.67.2020.02.07.06.50.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2020 06:50:29 -0800 (PST) Received: from peko by dell.be.48ers.dk with local (Exim 4.92) (envelope-from ) id 1j04xh-0007PC-2d; Fri, 07 Feb 2020 15:50:29 +0100 From: Peter Korsgaard To: buildroot@buildroot.org Date: Fri, 7 Feb 2020 15:50:20 +0100 Message-Id: <20200207145026.28384-6-peter@korsgaard.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200207145026.28384-1-peter@korsgaard.com> References: <20200207145026.28384-1-peter@korsgaard.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 05/10] package/libplayer: remove package 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: Thomas Petazzoni , Peter Korsgaard Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Libplayer is dead upstream. The mercurial repo is no longer online, it hasn't seen any releases since 2010 and the mplayer backend was removed from Buildroot in 2018. With the upcoming removal of gstreamer 0.10, there is no longer any backends available in Buildroot, so remove the package. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 8 ++++ package/Config.in | 1 - package/libplayer/0001-add-fpic.patch | 18 -------- .../libplayer/0002-fix-configure-cflags.patch | 41 ------------------- package/libplayer/Config.in | 28 ------------- package/libplayer/libplayer.hash | 3 -- package/libplayer/libplayer.mk | 36 ---------------- 7 files changed, 8 insertions(+), 127 deletions(-) delete mode 100644 package/libplayer/0001-add-fpic.patch delete mode 100644 package/libplayer/0002-fix-configure-cflags.patch delete mode 100644 package/libplayer/Config.in delete mode 100644 package/libplayer/libplayer.hash delete mode 100644 package/libplayer/libplayer.mk diff --git a/Config.in.legacy b/Config.in.legacy index 3c6984d886..4d81a2a09a 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2020.02" +config BR2_PACKAGE_LIBPLAYER + bool "libplayer package was removed" + select BR2_LEGACY + help + The libplayer package was removed. The latest release is + from 2010 and none of the backends are available in + Buildroot any more. + config BR2_GCC_VERSION_OR1K bool "gcc 5.x fork for or1k has been removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index bad4f9cba6..72630d4ee9 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1601,7 +1601,6 @@ menu "Multimedia" source "package/libogg/Config.in" source "package/libopenh264/Config.in" source "package/libopusenc/Config.in" - source "package/libplayer/Config.in" source "package/libtheora/Config.in" source "package/libvpx/Config.in" source "package/libyuv/Config.in" diff --git a/package/libplayer/0001-add-fpic.patch b/package/libplayer/0001-add-fpic.patch deleted file mode 100644 index e4b227f911..0000000000 --- a/package/libplayer/0001-add-fpic.patch +++ /dev/null @@ -1,18 +0,0 @@ -Add -fPIC to CFLAGS - --fPIC is needed to build shared library code. - -Signed-off-by: Thomas Petazzoni - -Index: b/src/Makefile -=================================================================== ---- a/src/Makefile -+++ b/src/Makefile -@@ -9,6 +9,7 @@ - SHARED_LIBNAME_VERSION = $(SHARED_LIBNAME).$(VERSION) - SHARED_LIBNAME_MAJOR = $(SHARED_LIBNAME).$(shell echo $(VERSION) | cut -f1 -d.) - SHARED_LIBNAME_FLAGS = -shared -Wl,-soname,$(SHARED_LIBNAME_MAJOR) -+CFLAGS = -fPIC - - ifeq ($(BUILD_STATIC),yes) - BUILD_RULES += lib_static diff --git a/package/libplayer/0002-fix-configure-cflags.patch b/package/libplayer/0002-fix-configure-cflags.patch deleted file mode 100644 index 186afd562e..0000000000 --- a/package/libplayer/0002-fix-configure-cflags.patch +++ /dev/null @@ -1,41 +0,0 @@ -From: Arnout Vandecappelle (Essensium/Mind) -Subject: [PATCH] libplayer: Fix handling of cflags in configure. - -The cflags returned by pkg-config or another config script may consist -of several arguments for the compiler. These should not be quoted together -into a single argument. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- -Sent upstream to devel@geexbox.org on July 11, 2012. ---- -diff -rup libplayer-2.0.1.orig/configure libplayer-2.0.1/configure ---- libplayer-2.0.1.orig/configure 2010-10-03 19:26:11.000000000 +0200 -+++ libplayer-2.0.1/configure 2012-07-10 23:33:02.783701852 +0200 -@@ -342,7 +342,7 @@ check_libconfig(){ - err=1 - if `which "$config" 1>/dev/null 2>&1`; then - cflags=`$config $ccflags` -- [ -n "$cflags" ] && check_cflags "$cflags" -+ [ -n "$cflags" ] && check_cflags $cflags - libs=`$config $clibs` - if [ -n "$libs" ]; then - temp_extralibs "$libs" -@@ -364,7 +364,7 @@ check_libconfig_exists(){ - err=1 - if `which "$config" 1>/dev/null 2>&1`; then - cflags=`$config $ccflags` -- [ -n "$cflags" ] && temp_cflags "$cflags" -+ [ -n "$cflags" ] && temp_cflags $cflags - libs=`$config $clibs` - if [ -n "$libs" ]; then - temp_extralibs "$libs" -@@ -386,7 +386,7 @@ check_pkgconfig(){ - err=1 - if `which pkg-config 1>/dev/null 2>&1`; then - cflags=`pkg-config $pkg $ccflags` -- [ -n "$cflags" ] && check_cflags "$cflags" -+ [ -n "$cflags" ] && check_cflags $cflags - libs=`pkg-config $pkg $clibs` - if [ -n "$libs" ]; then - temp_extralibs "$libs" diff --git a/package/libplayer/Config.in b/package/libplayer/Config.in deleted file mode 100644 index 3cad683248..0000000000 --- a/package/libplayer/Config.in +++ /dev/null @@ -1,28 +0,0 @@ -config BR2_PACKAGE_LIBPLAYER - bool "libplayer" - depends on BR2_TOOLCHAIN_HAS_THREADS - help - libplayer provides a generic A/V API that relies on various - multimedia player for Linux systems. It currently supports - MPlayer, xine VLC and GStreamer only - - http://libplayer.geexbox.org/ - -if BR2_PACKAGE_LIBPLAYER - -config BR2_PACKAGE_LIBPLAYER_GSTREAMER - bool "gstreamer backend" - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - depends on !BR2_STATIC_LIBS # gstreamer - select BR2_PACKAGE_GSTREAMER - -comment "gstreamer backend needs a toolchain w/ wchar, threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS -endif - -comment "libplayer needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libplayer/libplayer.hash b/package/libplayer/libplayer.hash deleted file mode 100644 index 62041e5737..0000000000 --- a/package/libplayer/libplayer.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 aa5eeb54f773bc9cad2733e4a0b5870208fc7f75024515ea87e55f64653e9d65 libplayer-2.0.1.tar.bz2 -sha256 29bc1d97c09654ba9a9f490e3b69d1bba84938ebb21ac87b2af4d190b082e2ca COPYING diff --git a/package/libplayer/libplayer.mk b/package/libplayer/libplayer.mk deleted file mode 100644 index 8d139cea0e..0000000000 --- a/package/libplayer/libplayer.mk +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# -# libplayer -# -################################################################################ - -LIBPLAYER_VERSION = 2.0.1 -LIBPLAYER_SITE = http://libplayer.geexbox.org/releases -LIBPLAYER_SOURCE = libplayer-$(LIBPLAYER_VERSION).tar.bz2 -LIBPLAYER_LICENSE = LGPL-2.1+ -LIBPLAYER_LICENSE_FILES = COPYING - -# When passing the standard buildroot configure arguments, the configure script -# breaks on --target and --host options. Thus we need to define a configure cmd -# ourselves. -define LIBPLAYER_CONFIGURE_CMDS - (cd $(@D) && rm -rf config.cache && \ - $(TARGET_CONFIGURE_OPTS) \ - $(TARGET_CONFIGURE_ARGS) \ - ./configure \ - --prefix=/usr \ - --cross-compile \ - --disable-mplayer \ - $(SHARED_STATIC_LIBS_OPTS) \ - $(LIBPLAYER_CONF_OPTS) \ - ) -endef - -ifeq ($(BR2_PACKAGE_LIBPLAYER_GSTREAMER),y) -LIBPLAYER_DEPENDENCIES += gstreamer -LIBPLAYER_CONF_OPTS += --enable-gstreamer -else -LIBPLAYER_CONF_OPTS += --disable-gstreamer -endif - -$(eval $(autotools-package)) From patchwork Fri Feb 7 14:50:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 1235011 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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=none (p=none dis=none) header.from=korsgaard.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=VgNMmuCB; 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 48DdXW53KFz9sSJ for ; Sat, 8 Feb 2020 01:51:07 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E10FC2221C; Fri, 7 Feb 2020 14:51:05 +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 bApniQtbH3cl; Fri, 7 Feb 2020 14:51:04 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id DF27420489; Fri, 7 Feb 2020 14:51:03 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id E1B5C1BF9BD for ; Fri, 7 Feb 2020 14:50:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id DED568648E for ; Fri, 7 Feb 2020 14:50:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9Bjv6zL0De99 for ; Fri, 7 Feb 2020 14:50:36 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by whitealder.osuosl.org (Postfix) with ESMTPS id 6305986C5C for ; Fri, 7 Feb 2020 14:50:36 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id s10so2861643wmh.3 for ; Fri, 07 Feb 2020 06:50:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hrHAPFslBCqH7bP7w100n+YvYNi7eeF2jZSjhpnbxTA=; b=VgNMmuCB8eE7umFdTbzjMkyDcNLpD3TlnFjxGk1K33UtskMEv6jAFY+aOxLey44k9M x3ElhaPT4cd5PWqt2Ha7BFhTYdRJNO4Lo0rUxfx3+b+ur40/iR2of4gK6EkL563pfCJ7 dCAWLTM2oOcN9TuHocyHBZUVkL4t3JPrG1t1H/6M/E/2PTCipFnZoBNErKVii85wf6Ra SYSJA/VS+prN5J6+G+mehkTHNmrOhkOBhoi+s/9GICSZxwuZByfwdYrQvr7bzyR8T+eb H93lQRCEHWSrMZWSnVpXbO/c+SDML+512NNpq6VGCK9EaL8u49RZBxUzoWknWWen8pMP Nq2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=hrHAPFslBCqH7bP7w100n+YvYNi7eeF2jZSjhpnbxTA=; b=YK/D1GrfLi7eKlf6lpaAyFs1lea4rN2ztXlhczRdxGIgXwrwSUVLibB2XAyTbXJa56 EOe10UpE09SXMgaf+t9XOF8N3+KVivaJGaxQYZ6JsTO/zMKUQsO5oA4SY13aO5I8XIlU 30XKfJkCyIUjUhgUEpFv1t12Cz6y6ELea1bjSq2tVGjPLRGOrcn5zjS0HOXx/M/xSwOL RB8J6xMb6yvYOJBVYv7B6Bb7MN9g2uV6VqegPiaIDmVcLgVGHOIIxyyzBkxb6MRraLQk OAfQySzxHmNBEh7MRFLO1bqkCI3wX7+hGvaHlLrQPS+/NTJ5rnCaytJAUzuSd4Df8wjD bLPQ== X-Gm-Message-State: APjAAAWIaU1i2CPQIKZbWOZ/oRTOnD434gUePm4ujnTnW3nLsv6ucwfT Df/tK1ArVmvsb2FdRfZmWMet4LNK X-Google-Smtp-Source: APXvYqwjPrdo70hF43WwGP9NqsEUHvz07fEZvB3ToSpPgC3Gm45Fdoc3jGhF0gAFWu++R2TdQBDJJg== X-Received: by 2002:a7b:c209:: with SMTP id x9mr604862wmi.0.1581087033053; Fri, 07 Feb 2020 06:50:33 -0800 (PST) Received: from dell.be.48ers.dk (d51A5BC31.access.telenet.be. [81.165.188.49]) by smtp.gmail.com with ESMTPSA id c74sm3802285wmd.26.2020.02.07.06.50.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2020 06:50:31 -0800 (PST) Received: from peko by dell.be.48ers.dk with local (Exim 4.92) (envelope-from ) id 1j04xh-0007PH-FG; Fri, 07 Feb 2020 15:50:29 +0100 From: Peter Korsgaard To: buildroot@buildroot.org Date: Fri, 7 Feb 2020 15:50:21 +0100 Message-Id: <20200207145026.28384-7-peter@korsgaard.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200207145026.28384-1-peter@korsgaard.com> References: <20200207145026.28384-1-peter@korsgaard.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 06/10] package/opencv: drop gstreamer 0.10.x support 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: Peter Korsgaard , Samuel Martin Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" With the upcoming removal of gstreamer 0.10, the logic for building opencv with support for it must go as well. As there is now a single option for gstreamer (1.x) support, convert the gstreamer support choice to a normal option for simplicity. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 +++++++ package/opencv/Config.in | 31 ++++--------------------------- package/opencv/opencv.mk | 8 +------- 3 files changed, 12 insertions(+), 34 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 4d81a2a09a..20cf568be9 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2020.02" +config BR2_PACKAGE_OPENCV_WITH_GSTREAMER + bool "opencv gstreamer 0.10.x support removed" + select BR2_LEGACY + help + Gstreamer 0.10.x is no longer available in Buildroot, so + neither is the support in opencv. + config BR2_PACKAGE_LIBPLAYER bool "libplayer package was removed" select BR2_LEGACY diff --git a/package/opencv/Config.in b/package/opencv/Config.in index c74dfd9572..836f5c96e8 100644 --- a/package/opencv/Config.in +++ b/package/opencv/Config.in @@ -195,44 +195,21 @@ config BR2_PACKAGE_OPENCV_WITH_FFMPEG help Use ffmpeg from the target system. -choice - prompt "gstreamer support" - help - OpenCV prefers gstreamer-1 over gstreamer-0.10. - -config BR2_PACKAGE_OPENCV_WITHOUT_GSTREAMER - bool "none" - -config BR2_PACKAGE_OPENCV_WITH_GSTREAMER - bool "gstreamer-0.10" - depends on BR2_USE_MMU # gstreamer -> libglib2 - depends on BR2_USE_WCHAR # gstreamer -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # gstreamer -> libglib2 - depends on !BR2_STATIC_LIBS # gstreamer - select BR2_PACKAGE_GSTREAMER - select BR2_PACKAGE_GST_PLUGINS_BASE - select BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_APP - -comment "gstreamer-0.10 support needs a toolchain w/ wchar, threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS - config BR2_PACKAGE_OPENCV_WITH_GSTREAMER1 - bool "gstreamer-1.x" + bool "gstreamer support" depends on BR2_USE_MMU # gstreamer1 -> libglib2 depends on BR2_USE_WCHAR # gstreamer1 -> libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # gstreamer1 -> libglib2 select BR2_PACKAGE_GSTREAMER1 select BR2_PACKAGE_GST1_PLUGINS_BASE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP + help + Enable gstreamer support. -comment "gstreamer-1.x support needs a toolchain w/ wchar, threads" +comment "gstreamer support needs a toolchain w/ wchar, threads" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS -endchoice - config BR2_PACKAGE_OPENCV_WITH_GTK bool "gtk support" depends on BR2_PACKAGE_XORG7 diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk index 4c15075fe0..939058e4ed 100644 --- a/package/opencv/opencv.mk +++ b/package/opencv/opencv.mk @@ -155,6 +155,7 @@ OPENCV_CONF_OPTS += \ OPENCV_CONF_OPTS += \ -DWITH_1394=OFF \ -DWITH_EIGEN=OFF \ + -DWITH_GSTREAMER_0_10=OFF \ -DWITH_IMAGEIO=OFF \ -DWITH_OPENCL=OFF \ -DWITH_OPENEXR=OFF \ @@ -178,13 +179,6 @@ else OPENCV_CONF_OPTS += -DWITH_FFMPEG=OFF endif -ifeq ($(BR2_PACKAGE_OPENCV_WITH_GSTREAMER),y) -OPENCV_CONF_OPTS += -DWITH_GSTREAMER_0_10=ON -OPENCV_DEPENDENCIES += gstreamer gst-plugins-base -else -OPENCV_CONF_OPTS += -DWITH_GSTREAMER_0_10=OFF -endif - ifeq ($(BR2_PACKAGE_OPENCV_WITH_GSTREAMER1),y) OPENCV_CONF_OPTS += -DWITH_GSTREAMER=ON OPENCV_DEPENDENCIES += gstreamer1 gst1-plugins-base From patchwork Fri Feb 7 14:50:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 1235014 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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=none (p=none dis=none) header.from=korsgaard.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=V3Gw15EF; 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 48DdXj1S4jz9sSD for ; Sat, 8 Feb 2020 01:51:17 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 6DE33221AF; Fri, 7 Feb 2020 14:51:15 +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 WL-GyYH071s5; Fri, 7 Feb 2020 14:51:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id F1EDF22246; Fri, 7 Feb 2020 14:51:05 +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 853C61BF364 for ; Fri, 7 Feb 2020 14:51:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7F52585775 for ; Fri, 7 Feb 2020 14:51:02 +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 xEKNRo8gPsJq for ; Fri, 7 Feb 2020 14:51:01 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 97C3886508 for ; Fri, 7 Feb 2020 14:50:35 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id a9so3075725wmj.3 for ; Fri, 07 Feb 2020 06:50:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ngB3HZ3FVCOZV4otlaOgC7KYLqnq1GQnqG+YtzTDBgQ=; b=V3Gw15EFS4ogLhDIUqEqbK+E70HMCpQHfEWzJ7fkx/p4NSyzd29/s5XKZkAuKJPcA/ 8XBFLMUbummZ/1WjBAH24iatNOWGNbcHdkVHR37GWe8lOLt0x2w1WKy5vZaKYDj10UUk ttNUleH/qn5SihUJj84h5oqzTHeAW6OhNrVomszTz0zZmZ5NsPj8etliRufP5NPTqYl3 Zr2Ywnz2AiDUtjbJFogdZ3q6SpXcn0l7tRdB0dpYT3EqgK4KtW1+JhUSYCoAh+Org6fp mJ3tDRhviaGDifKs3ux+WKxS5kDojE1d6mSRCJc/9EY/KrdzicIn2Lnv/3rxU3ePLQmz HEYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ngB3HZ3FVCOZV4otlaOgC7KYLqnq1GQnqG+YtzTDBgQ=; b=KLrXfg5RAvC4kr5EYMC1unR4qPNGY8NG9vUokVTHRq0qWBrnccdJhHXOYS3lFYh1Jt QJA33xOP+GWpaTYeU7i4Td5tCsaor/1EvqaqR5LvN3eJy62wnZg3vhQNf1x7tB8U9Wf3 PdvVQ8OvqvefP38W0MMoLoZBWMbTcJGdWqLC8Yw9Y7R0WG9wIizX53SrKWCI4QDj1xNS 8k9SnXUE19aZT/8hyvG5N1D/nqD8HmTk0YczY9qInnHkBxIyUuJWb2ecxuWOI3riOI9U n3O47Mp3bpbjgyrJhblERQi/QPnvwedhpony+UlZHDe2kYGfvy6IEssMFouZC6vng287 4Z0A== X-Gm-Message-State: APjAAAUtiiBxLpsaOLbHAUyrnj8wTP21gHDln1TF1vUBatp0JVfYcUux MKVl9SSzCgwSo9WQ+aPxKG5gNocz X-Google-Smtp-Source: APXvYqycNRqvpAsvca0NrJxsW3qwWs2Rp7jBGxaJ2L+Xa32pmBU0TEBxuybLeoDvAL3sxdJBH587tA== X-Received: by 2002:a7b:cb86:: with SMTP id m6mr4954587wmi.51.1581087033709; Fri, 07 Feb 2020 06:50:33 -0800 (PST) Received: from dell.be.48ers.dk (d51A5BC31.access.telenet.be. [81.165.188.49]) by smtp.gmail.com with ESMTPSA id e18sm3574250wrw.70.2020.02.07.06.50.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2020 06:50:31 -0800 (PST) Received: from peko by dell.be.48ers.dk with local (Exim 4.92) (envelope-from ) id 1j04xh-0007PM-Rg; Fri, 07 Feb 2020 15:50:29 +0100 From: Peter Korsgaard To: buildroot@buildroot.org Date: Fri, 7 Feb 2020 15:50:22 +0100 Message-Id: <20200207145026.28384-8-peter@korsgaard.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200207145026.28384-1-peter@korsgaard.com> References: <20200207145026.28384-1-peter@korsgaard.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 07/10] package/opencv3: drop gstreamer 0.10.x support 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: Peter Korsgaard , Samuel Martin Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" With the upcoming removal of gstreamer 0.10, the logic for building opencv3 with support for it must go as well. As there is now a single option for gstreamer (1.x) support, convert the gstreamer support choice to a normal option for simplicity. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 +++++++ package/opencv3/Config.in | 27 +++------------------------ package/opencv3/opencv3.mk | 8 +------- 3 files changed, 11 insertions(+), 31 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 20cf568be9..34f99b54de 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2020.02" +config BR2_PACKAGE_OPENCV3_WITH_GSTREAMER + bool "opencv3 gstreamer 0.10.x support removed" + select BR2_LEGACY + help + Gstreamer 0.10.x is no longer available in Buildroot, so + neither is the support in opencv3. + config BR2_PACKAGE_OPENCV_WITH_GSTREAMER bool "opencv gstreamer 0.10.x support removed" select BR2_LEGACY diff --git a/package/opencv3/Config.in b/package/opencv3/Config.in index fdd7152ee6..d4b17b6acf 100644 --- a/package/opencv3/Config.in +++ b/package/opencv3/Config.in @@ -249,27 +249,6 @@ config BR2_PACKAGE_OPENCV3_WITH_FFMPEG help Use ffmpeg from the target system. -choice - prompt "gstreamer support" - help - OpenCV prefers gstreamer-1 over gstreamer-0.10. - -config BR2_PACKAGE_OPENCV3_WITHOUT_GSTREAMER - bool "none" - -config BR2_PACKAGE_OPENCV3_WITH_GSTREAMER - bool "gstreamer-0.10" - depends on BR2_USE_MMU # gstreamer -> libglib2 - depends on BR2_USE_WCHAR # gstreamer -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # gstreamer -> libglib2 - select BR2_PACKAGE_GSTREAMER - select BR2_PACKAGE_GST_PLUGINS_BASE - select BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_APP - -comment "gstreamer-0.10 support needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - config BR2_PACKAGE_OPENCV3_WITH_GSTREAMER1 bool "gstreamer-1.x" depends on BR2_USE_MMU # gstreamer1 -> libglib2 @@ -278,13 +257,13 @@ config BR2_PACKAGE_OPENCV3_WITH_GSTREAMER1 select BR2_PACKAGE_GSTREAMER1 select BR2_PACKAGE_GST1_PLUGINS_BASE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP + help + Enable gstreamer support. -comment "gstreamer-1.x support needs a toolchain w/ wchar, threads" +comment "gstreamer support needs a toolchain w/ wchar, threads" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS -endchoice - config BR2_PACKAGE_OPENCV3_WITH_JASPER bool "jpeg2000 support" select BR2_PACKAGE_JASPER diff --git a/package/opencv3/opencv3.mk b/package/opencv3/opencv3.mk index c99e84a29f..2c5d6b041d 100644 --- a/package/opencv3/opencv3.mk +++ b/package/opencv3/opencv3.mk @@ -206,6 +206,7 @@ OPENCV3_CONF_OPTS += \ -DWITH_EIGEN=OFF \ -DWITH_GDAL=OFF \ -DWITH_GPHOTO2=OFF \ + -DWITH_GSTREAMER_0_10=OFF \ -DWITH_LAPACK=OFF \ -DWITH_MATLAB=OFF \ -DWITH_OPENCL=OFF \ @@ -229,13 +230,6 @@ else OPENCV3_CONF_OPTS += -DWITH_FFMPEG=OFF endif -ifeq ($(BR2_PACKAGE_OPENCV3_WITH_GSTREAMER),y) -OPENCV3_CONF_OPTS += -DWITH_GSTREAMER_0_10=ON -OPENCV3_DEPENDENCIES += gstreamer gst-plugins-base -else -OPENCV3_CONF_OPTS += -DWITH_GSTREAMER_0_10=OFF -endif - ifeq ($(BR2_PACKAGE_OPENCV3_WITH_GSTREAMER1),y) OPENCV3_CONF_OPTS += -DWITH_GSTREAMER=ON OPENCV3_DEPENDENCIES += gstreamer1 gst1-plugins-base From patchwork Fri Feb 7 14:50:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 1235005 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=korsgaard.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=JSAR2ffA; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48DdX13dztz9s3x for ; Sat, 8 Feb 2020 01:50:41 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C8DB086CD7; Fri, 7 Feb 2020 14:50:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id M8VbFggIW9LZ; Fri, 7 Feb 2020 14:50:38 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id C7F2786C5C; Fri, 7 Feb 2020 14:50:38 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 19C0E1BF364 for ; Fri, 7 Feb 2020 14:50:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 16E271FF11 for ; Fri, 7 Feb 2020 14:50:37 +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 0TRiaposFzID for ; Fri, 7 Feb 2020 14:50:36 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by silver.osuosl.org (Postfix) with ESMTPS id 0404820031 for ; Fri, 7 Feb 2020 14:50:35 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id a9so3075749wmj.3 for ; Fri, 07 Feb 2020 06:50:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RL4ulaPSVdbB2zd4TlOf6smQFGGSFUXmgjNpU2len1E=; b=JSAR2ffAi2bws06hC3sYmn8Qy9CBovLQUvpujDLG5Qze/oxcCooMKxnEEVhuG9IIiE R3sxgJR5uBFDAH3lfMmApqUjlDLdMNHhD/fU8CIigEkX0PEm2nV5dS+tzYOVh3bhhogF uuvM0MUQ08svYjuAlNZUQrkAaFQkH5CA4cSGT9ypiX5ew+HnniL2Tz5xpCCpUYRV3/bG +ww9r1bYcMnSVHPjDAbdAAiFGlBNzJJeRikfOt74/v3CMv1wji4+qW+oO/7zXumkZPYR iXUC6WM6Vi7V/2SEpqozgKgA0evSPDVZlvqAUeen0u6Ab4cglvLVO3wkZaMSd6a2e3Nj qkHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=RL4ulaPSVdbB2zd4TlOf6smQFGGSFUXmgjNpU2len1E=; b=hYf9ORcJh6etXNALFzIQmtgI+YFpQNIpVnaKFjZuXd2oFr8/79jH3haRzI6kpz+wH1 BuYhXDCeIzzZUbKVg2cD164Q+1R/D39O9bv9PTg3EtRcpVCLHJNMknfmUbmI4OPcgwRB hO/PvtMh2Zk5vP37HhQI4wlr25QJAtRpzixKzvUr/WCVS3n38Nbdz3x7ldu7tzTCmwgT hCFRwuPHTY2XDvwI6d1iQnA/efN6XhC+XSr2Gq0zLHux7F1EG7ivvtQ3uORxS3TGG1F/ X0DXGPFyl1ZPwFx+hbiZxWEtkA4VFanXe9sMjZr/X7M+cdjvc9j+7PuKx8lQuw9JqJgp AUfg== X-Gm-Message-State: APjAAAWirgziBWEdhJ+82ExvQ/5+uQiy0sHg94FU5dXu4xlfY9DZEzbg A5YBiueocBxiQTP9wA1hnJ4HHPDi X-Google-Smtp-Source: APXvYqzYFnGc22k0XCXYiIEaDaOmzu7gHfSL7H7OGO0DT3WODoiPnE1VibGh0sX1Mvv2d0aOCgr0DA== X-Received: by 2002:a1c:6a06:: with SMTP id f6mr4868457wmc.137.1581087034074; Fri, 07 Feb 2020 06:50:34 -0800 (PST) Received: from dell.be.48ers.dk (d51A5BC31.access.telenet.be. [81.165.188.49]) by smtp.gmail.com with ESMTPSA id x7sm3697496wrq.41.2020.02.07.06.50.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2020 06:50:31 -0800 (PST) Received: from peko by dell.be.48ers.dk with local (Exim 4.92) (envelope-from ) id 1j04xi-0007PR-8M; Fri, 07 Feb 2020 15:50:30 +0100 From: Peter Korsgaard To: buildroot@buildroot.org Date: Fri, 7 Feb 2020 15:50:23 +0100 Message-Id: <20200207145026.28384-9-peter@korsgaard.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200207145026.28384-1-peter@korsgaard.com> References: <20200207145026.28384-1-peter@korsgaard.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 08/10] package/freerdp: drop gstreamer 0.10.x support 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: Peter Korsgaard , "Yann E. MORIN" Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" With the upcoming removal of gstreamer 0.10, the logic for building freerdp with support for it must go as well. As there is now a single option for gstreamer (1.x) support, convert the gstreamer support choice to a normal option for simplicity. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 +++++++ package/freerdp/Config.in | 24 +++--------------------- package/freerdp/freerdp.mk | 9 +-------- 3 files changed, 11 insertions(+), 29 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 34f99b54de..96848f7f06 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2020.02" +config BR2_PACKAGE_FREERDP_GSTREAMER + bool "freerdp gstreamer 0.10.x support removed" + select BR2_LEGACY + help + Gstreamer 0.10.x is no longer available in Buildroot, so + neither is the support in freerdp. + config BR2_PACKAGE_OPENCV3_WITH_GSTREAMER bool "opencv3 gstreamer 0.10.x support removed" select BR2_LEGACY diff --git a/package/freerdp/Config.in b/package/freerdp/Config.in index 59bc18b672..5705ce0e0c 100644 --- a/package/freerdp/Config.in +++ b/package/freerdp/Config.in @@ -28,36 +28,18 @@ config BR2_PACKAGE_FREERDP if BR2_PACKAGE_FREERDP -choice - bool "gstreamer support" - depends on BR2_PACKAGE_XORG7 # xlib-libxrandr - depends on BR2_PACKAGE_GSTREAMER || BR2_PACKAGE_GSTREAMER1 - config BR2_PACKAGE_FREERDP_GSTREAMER1 - bool "gstreamer-1.x" + bool "gstreamer support" depends on BR2_PACKAGE_GSTREAMER1 + depends on BR2_PACKAGE_XORG7 # xlib-libxrandr # gstreamer-1.x dependencies already dependencies of FreeRDP select BR2_PACKAGE_GST1_PLUGINS_BASE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP select BR2_PACKAGE_XLIB_LIBXRANDR -config BR2_PACKAGE_FREERDP_GSTREAMER - bool "gstreamer-0.x" - depends on BR2_PACKAGE_GSTREAMER - # gstreamer-0.x dependencies already dependencies of FreeRDP - select BR2_PACKAGE_GST_PLUGINS_BASE - select BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_APP - select BR2_PACKAGE_XLIB_LIBXRANDR - select BR2_PACKAGE_LIBXML2 - -config BR2_PACKAGE_FREERDP_GSTREAMER_NO - bool "none" - -endchoice - comment "gstreamer support needs X.Org" depends on !BR2_PACKAGE_XORG7 - depends on BR2_PACKAGE_GSTREAMER || BR2_PACKAGE_GSTREAMER1 + depends on BR2_PACKAGE_GSTREAMER1 config BR2_PACKAGE_FREERDP_SERVER bool "server" diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index 293b6b5c01..a477e74cb7 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -12,14 +12,7 @@ FREERDP_LICENSE_FILES = LICENSE FREERDP_INSTALL_STAGING = YES -FREERDP_CONF_OPTS = -DWITH_MANPAGES=OFF -Wno-dev - -ifeq ($(BR2_PACKAGE_FREERDP_GSTREAMER),y) -FREERDP_CONF_OPTS += -DWITH_GSTREAMER_0_10=ON -FREERDP_DEPENDENCIES += gstreamer gst-plugins-base libxml2 -else -FREERDP_CONF_OPTS += -DWITH_GSTREAMER_0_10=OFF -endif +FREERDP_CONF_OPTS = -DWITH_MANPAGES=OFF -Wno-dev -DWITH_GSTREAMER_0_10=OFF ifeq ($(BR2_PACKAGE_FREERDP_GSTREAMER1),y) FREERDP_CONF_OPTS += -DWITH_GSTREAMER_1_0=ON From patchwork Fri Feb 7 14:50:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 1235009 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=korsgaard.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=OcUodLcl; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48DdXX1YQ2z9sSK for ; Sat, 8 Feb 2020 01:51:08 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A77E486D6F; Fri, 7 Feb 2020 14:51:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ggkjMCbrvOuq; Fri, 7 Feb 2020 14:51:05 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id E6BC786CC0; Fri, 7 Feb 2020 14:51:04 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 691331BF364 for ; Fri, 7 Feb 2020 14:50:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 662452049C for ; Fri, 7 Feb 2020 14:50:39 +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 zRGix21qTIqQ for ; Fri, 7 Feb 2020 14:50:37 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by silver.osuosl.org (Postfix) with ESMTPS id 7319C1FF11 for ; Fri, 7 Feb 2020 14:50:37 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id a9so3075822wmj.3 for ; Fri, 07 Feb 2020 06:50:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HbYJEtv0cLSh3uPfylPcXl7iTFAtdaUVOSq+Op16SJQ=; b=OcUodLclj7FHYl1399nwqDbBig/qS7dY82GTXXCrJpZ/KojAaDhYxlf5mPFZg07bx4 eel4SUCFsGvgHj2TJ4BSGEHr0YGLZNbxGVvFSG74ILEk4rP0uD5uhT47CRUSSzXQtEhY 53ACwMZAyGZFsekmWb/LsRV9aKNydUheHbZwfn3PDJGGRJMxiibM6K8rHnlBusSudiv3 9MrnNmaLJ6jNR5ZvwodKY70IKkykKIB+8wILXUD/XzkZPqF59NbfFTsp6zL0I13QV7fb cXt5p59rTFgwooIxSHKnunMtge0W/6/MIgJiUV3Y+CaQ2m5mvXqyalCUzpmlZTreOWAG RTkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=HbYJEtv0cLSh3uPfylPcXl7iTFAtdaUVOSq+Op16SJQ=; b=ffL6QkThDe6J3d2uZ0M2HWTvFjcmCrTozilFt0jZ5EOwIt4HyNUdMgYOKLl/GSeO0x loKFzWX8VvgoCx/rIuUdQDU3Mq9ArVt99sBFgJ2FRwwFVfyzJbaSov38EwIqxEdWHnMm 5cLkwqdo6+kESBMW/5waJsoXvvrEXVWjG2XF1e2oI/xs8mLIkJBs3ibFD2UH0pAlRQTe V6m9OlIhdxaNdTTQao+YtRB41YgyxOHOydE8AVeM3GdPbbfqHda6gC7s9bsHc1j6wp4b UHkdEpVQpMhy8kNnfYAaURGU2WpX1Ri+9n/1HLGLc4lsQiPRgh4aeMs6JnQK6PzZZNNm VvBA== X-Gm-Message-State: APjAAAXjohBu9YE7c93u8vNqDHT1xO7S9l9QbWpdP1YzmNAoQbrUjHmP /mpRJUD8vfrLAN0JOje4KyiHHssd X-Google-Smtp-Source: APXvYqzw+t7kMOT7yNH0Mq0PGXvKy0LSBsTYqDZRd5muet44jRystDw5W0Cf/V30dOyuj9Q95T2CQA== X-Received: by 2002:a1c:bc08:: with SMTP id m8mr4968694wmf.189.1581087035551; Fri, 07 Feb 2020 06:50:35 -0800 (PST) Received: from dell.be.48ers.dk (d51A5BC31.access.telenet.be. [81.165.188.49]) by smtp.gmail.com with ESMTPSA id y17sm3610189wrs.82.2020.02.07.06.50.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2020 06:50:31 -0800 (PST) Received: from peko by dell.be.48ers.dk with local (Exim 4.92) (envelope-from ) id 1j04xi-0007PW-Kr; Fri, 07 Feb 2020 15:50:30 +0100 From: Peter Korsgaard To: buildroot@buildroot.org Date: Fri, 7 Feb 2020 15:50:24 +0100 Message-Id: <20200207145026.28384-10-peter@korsgaard.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200207145026.28384-1-peter@korsgaard.com> References: <20200207145026.28384-1-peter@korsgaard.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 09/10] package/nvidia-tegra23-binaries: drop gstreamer 0.10.x support 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: Peter Korsgaard Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" With the upcoming removal of gstreamer 0.10, the logic for installing binaries using gstreamer 0.10.x in nvidia-tegra23-binaries must go as well. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 14 +++++++++ .../nvidia-tegra23-binaries/Config.in | 16 ---------- .../nvidia-tegra23-binaries.mk | 31 ------------------- 3 files changed, 14 insertions(+), 47 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 96848f7f06..e9725d30b3 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,20 @@ endif comment "Legacy options removed in 2020.02" +config BR2_PACKAGE_NVIDIA_TEGRA23_BINARIES_GSTREAMER_PLUGINS + bool "nvidia-tegra23 binaries gstreamer 0.10.x support removed" + select BR2_LEGACY + help + Gstreamer 0.10.x is no longer available in Buildroot, so + neither is the support in nvidia-tegra23 binaries. + +config BR2_PACKAGE_NVIDIA_TEGRA23_BINARIES_NV_SAMPLE_APPS + bool "nvidia-tegra23 binaries sample apps removed" + select BR2_LEGACY + help + Gstreamer 0.10.x is no longer available in Buildroot, so + neither is the support in nvidia-tegra23 binaries. + config BR2_PACKAGE_FREERDP_GSTREAMER bool "freerdp gstreamer 0.10.x support removed" select BR2_LEGACY diff --git a/package/nvidia-tegra23/nvidia-tegra23-binaries/Config.in b/package/nvidia-tegra23/nvidia-tegra23-binaries/Config.in index 3494c5b9a8..0c09051b6a 100644 --- a/package/nvidia-tegra23/nvidia-tegra23-binaries/Config.in +++ b/package/nvidia-tegra23/nvidia-tegra23-binaries/Config.in @@ -23,20 +23,4 @@ config BR2_PACKAGE_PROVIDES_LIBGLES config BR2_PACKAGE_PROVIDES_LIBOPENMAX default "nvidia-tegra23-binaries" -config BR2_PACKAGE_NVIDIA_TEGRA23_BINARIES_GSTREAMER_PLUGINS - bool "GStreamer 0.10.x plugins" - depends on BR2_PACKAGE_GSTREAMER # Run-time only - select BR2_PACKAGE_XLIB_LIBXV - help - GStreamer 0.10.x plugins - -config BR2_PACKAGE_NVIDIA_TEGRA23_BINARIES_NV_SAMPLE_APPS - bool "NVIDIA multimedia sample apps" - depends on BR2_PACKAGE_NVIDIA_TEGRA23_BINARIES_GSTREAMER_PLUGINS - help - nvgstplayer and nvgstcapture multimedia test applications. - -comment "GStreamer 0.10.x plugins need GStreamer 0.10" - depends on !BR2_PACKAGE_GSTREAMER - endif diff --git a/package/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.mk b/package/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.mk index 9b153b0250..ed3c5a78b4 100644 --- a/package/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.mk +++ b/package/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.mk @@ -10,10 +10,6 @@ NVIDIA_TEGRA23_BINARIES_SOURCE = $(NVIDIA_TEGRA23_BASE)_R$(NVIDIA_TEGRA23_BINARI NVIDIA_TEGRA23_BINARIES_LICENSE = License For Customer Use of NVIDIA Software NVIDIA_TEGRA23_BINARIES_LICENSE_FILES = nv_tegra/LICENSE -ifeq ($(BR2_PACKAGE_NVIDIA_TEGRA23_BINARIES_GSTREAMER_PLUGINS),y) -NVIDIA_TEGRA23_BINARIES_LICENSE += LGPL-2.1 -NVIDIA_TEGRA23_BINARIES_LICENSE_FILES += nv_tegra/nv_sample_apps/LICENSE.gst-openmax -endif NVIDIA_TEGRA23_BINARIES_INSTALL_STAGING = YES @@ -24,10 +20,6 @@ NVIDIA_TEGRA23_BINARIES_INSTALL_STAGING = YES NVIDIA_TEGRA23_BINARIES_DEPENDENCIES = mesa3d-headers \ xlib_libX11 xlib_libXext -ifeq ($(BR2_PACKAGE_NVIDIA_TEGRA23_BINARIES_GSTREAMER_PLUGINS),y) -NVIDIA_TEGRA23_BINARIES_DEPENDENCIES += xlib_libXv -endif - NVIDIA_TEGRA23_BINARIES_PROVIDES = libegl libgles libopenmax NVIDIA_TEGRA23_BINARIES_DRV = \ @@ -38,10 +30,6 @@ define NVIDIA_TEGRA23_BINARIES_EXTRACT_FURTHER $(call suitable-extractor,$(@D)/nv_tegra/nvidia_drivers.tbz2) \ $(@D)/nv_tegra/nvidia_drivers.tbz2 | \ $(TAR) --strip-components=0 -C $(@D)/nv_tegra/nvidia_drivers/ $(TAR_OPTIONS) - - $(INSTALL) -d $(@D)/nv_tegra/nv_sample_apps/nvgstapps - $(call suitable-extractor,$(@D)/nv_tegra/nv_sample_apps/nvgstapps.tbz2) \ - $(@D)/nv_tegra/nv_sample_apps/nvgstapps.tbz2 | \ - $(TAR) --strip-components=0 -C $(@D)/nv_tegra/nv_sample_apps/nvgstapps/ $(TAR_OPTIONS) - endef NVIDIA_TEGRA23_BINARIES_POST_EXTRACT_HOOKS += NVIDIA_TEGRA23_BINARIES_EXTRACT_FURTHER @@ -55,28 +43,11 @@ define NVIDIA_TEGRA23_BINARIES_INSTALL_LIBS ) endef -ifeq ($(BR2_PACKAGE_NVIDIA_TEGRA23_BINARIES_GSTREAMER_PLUGINS),y) -define NVIDIA_TEGRA23_BINARIES_INSTALL_GST_PLUGINS - mkdir -p $(1)/usr/lib/gstreamer-0.10/ - cp -dpfr $(@D)/nv_tegra/nv_sample_apps/nvgstapps/usr/lib/gstreamer-0.10/*.so \ - $(1)/usr/lib/gstreamer-0.10/ -endef -endif - -ifeq ($(BR2_PACKAGE_NVIDIA_TEGRA23_BINARIES_NV_SAMPLE_APPS),y) -define NVIDIA_TEGRA23_BINARIES_INSTALL_APPS - mkdir -p $(TARGET_DIR)/usr/bin/ - cp -dpfr $(@D)/nv_tegra/nv_sample_apps/nvgstapps/usr/bin/* \ - $(TARGET_DIR)/usr/bin/ -endef -endif - define NVIDIA_TEGRA23_BINARIES_INSTALL_STAGING_CMDS $(call NVIDIA_TEGRA23_BINARIES_INSTALL_LIBS,$(STAGING_DIR)) mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig/ cp -dpfr package/nvidia-tegra23/nvidia-tegra23-binaries/*.pc \ $(STAGING_DIR)/usr/lib/pkgconfig/ - $(call NVIDIA_TEGRA23_BINARIES_INSTALL_GST_PLUGINS,$(STAGING_DIR)) endef define NVIDIA_TEGRA23_BINARIES_INSTALL_TARGET_CMDS @@ -88,8 +59,6 @@ define NVIDIA_TEGRA23_BINARIES_INSTALL_TARGET_CMDS $(TARGET_DIR)/etc/nv_tegra_release $(INSTALL) -D -m 0644 $(@D)/$(NVIDIA_TEGRA23_BINARIES_DRV) \ $(TARGET_DIR)/usr/lib/xorg/modules/drivers/tegra_drv.so - $(call NVIDIA_TEGRA23_BINARIES_INSTALL_GST_PLUGINS,$(TARGET_DIR)) - $(NVIDIA_TEGRA23_BINARIES_INSTALL_APPS) endef $(eval $(generic-package)) From patchwork Fri Feb 7 14:50:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 1235017 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=korsgaard.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=CZYmeS4L; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48DdY10h83z9sSD for ; Sat, 8 Feb 2020 01:51:33 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A26AD87EA6; Fri, 7 Feb 2020 14:51:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XArgobg423G0; Fri, 7 Feb 2020 14:51:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id EF7F987E7B; Fri, 7 Feb 2020 14:51:18 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id E642E1BF364 for ; Fri, 7 Feb 2020 14:51:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id DDAC187E76 for ; Fri, 7 Feb 2020 14:51:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Qm2kQ2MI4tr1 for ; Fri, 7 Feb 2020 14:51:02 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by hemlock.osuosl.org (Postfix) with ESMTPS id 163E987E98 for ; Fri, 7 Feb 2020 14:50:40 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id z3so3041540wru.3 for ; Fri, 07 Feb 2020 06:50:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=N+14vbhMuOvjZfRMf4vvHS/qWYbPf1CunYyIPbvtVOw=; b=CZYmeS4L8PqKW3yRaRDjqwXTxEaaJOjC2Ti3RdCQe3udvGDwzTatJQpd9qaOr24w9T u09F0Cu2pdVVg6TCptEcQeo6ls+Ccphz8y22WZ1v+DwMBWIuwyW+iba2HZgwdGaxesW2 Rv9uPRpOCzVFKaQH7QGZnDGGCnIYDwwYWaJyLdoeYrj7M7NhjVSiiFhjChQB2Se22+1F sW3n1DWaF5GyX635C0ZLBnBnfF2uf/ZBxIlc9ES+Y0lDWg+w4ISRhimSDg7hM/Oc0Mb0 U30MxgDK8pG2TOidbqPQ2tKAQLlv6dmJoBASoAfkKB5dEiw2mXFFH8fcZp79rRrBw9jE SI1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=N+14vbhMuOvjZfRMf4vvHS/qWYbPf1CunYyIPbvtVOw=; b=FZlCEhlQpHip4bpsvPlUF8vICAVew5x8DCm2tQGD1BIzaebAPNQmlbDWQvNvGBmVDp d3It+/tFbBmfd5805OtreS9FTyt3Yo76xOZp/J3BwhsVW+woC+LH/8UITPtlGp7ci+LF Or9zTdIZVkoxqly4rAWI+b4B4o2Saq1qLEwxSCkKLWlJWTFuCw1pHpwva7kqrBMzLW0j 18Kbh5E9lZGUMtJeRMsRp69mOBj8xan4YUkXxtNg6PNSOflrwMNYwvuxyCs4yr2RuO9g DgFrm1qYb/1kjTWlOgEPMFIPRRF1KjUaNMI+qaAsh/MqUJCNogVzAnYdHVb/IegzJtbS 01vA== X-Gm-Message-State: APjAAAX7twhcaaPCWIMFOUZC7DkLzUeU6MNDukX5fb11Ww3Zn1Wh9Ps+ VLZ7o18II0Nh2Z/LU9tgJY0UO2bh X-Google-Smtp-Source: APXvYqyXKm2mUfTHzYawFKDUs1wPgMjvGfwWaPjbaRFDsstKsbseRi2YHXryQnSAz6Fx6qGmAKMqOg== X-Received: by 2002:adf:f58c:: with SMTP id f12mr4914884wro.22.1581087036199; Fri, 07 Feb 2020 06:50:36 -0800 (PST) Received: from dell.be.48ers.dk (d51A5BC31.access.telenet.be. [81.165.188.49]) by smtp.gmail.com with ESMTPSA id f14sm3648049wrt.7.2020.02.07.06.50.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2020 06:50:32 -0800 (PST) Received: from peko by dell.be.48ers.dk with local (Exim 4.92) (envelope-from ) id 1j04xj-0007Pb-1V; Fri, 07 Feb 2020 15:50:31 +0100 From: Peter Korsgaard To: buildroot@buildroot.org Date: Fri, 7 Feb 2020 15:50:25 +0100 Message-Id: <20200207145026.28384-11-peter@korsgaard.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200207145026.28384-1-peter@korsgaard.com> References: <20200207145026.28384-1-peter@korsgaard.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 10/10] package/gstreamer/*: remove packages 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: Gary Bisson , Peter Korsgaard , Bernd Kuhls , =?utf-8?q?Martin_Storsj=C3=B6?= , Peter Seiderer , Alexandre Belloni , Markos Chandras , Peter Korsgaard Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Gstreamer 0.10 has been deprecated upstream since 2012 and is missing a lot of features and (security) fixes compared to gstreamer1, so remove it. All gstreamer-0.10 sub packages depends on gstreamer, so we only need to add a legacy entry for that. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 8 + DEVELOPERS | 1 - package/gstreamer/Config.in | 13 - package/gstreamer/gst-ffmpeg/0001-gcc47.patch | 65 -- ...arm-avoid-using-the-movw-instruction.patch | 41 -- package/gstreamer/gst-ffmpeg/Config.in | 30 - package/gstreamer/gst-ffmpeg/gst-ffmpeg.hash | 6 - package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk | 103 --- .../0001-gplay-add-missing-include.patch | 23 - ...0002-Fix-bashism-in-configure-script.patch | 48 -- .../0003-Use-proper-objdump.patch | 36 -- ...nkage-add-lrt-for-shared-memory-func.patch | 46 -- ...-of-obsolete-VIDIOC_DBG_G_CHIP_IDENT.patch | 69 -- package/gstreamer/gst-fsl-plugins/Config.in | 105 ---- .../gst-fsl-plugins/gst-fsl-plugins.hash | 4 - .../gst-fsl-plugins/gst-fsl-plugins.mk | 40 -- package/gstreamer/gst-omapfb/Config.in | 7 - package/gstreamer/gst-omapfb/gst-omapfb.hash | 2 - package/gstreamer/gst-omapfb/gst-omapfb.mk | 20 - .../gst-plugin-x170/0001-correct-CFLAGS.patch | 28 - package/gstreamer/gst-plugin-x170/Config.in | 16 - .../gst-plugin-x170/gst-plugin-x170.hash | 2 - .../gst-plugin-x170/gst-plugin-x170.mk | 18 - ...s-jpegformat-unbreak-non-debug-build.patch | 78 --- .../0002-fix-dfb-example.patch | 22 - ...03-drop-buggy-libvpx-legacy-handling.patch | 44 -- package/gstreamer/gst-plugins-bad/Config.in | 334 ---------- .../gst-plugins-bad/gst-plugins-bad.hash | 5 - .../gst-plugins-bad/gst-plugins-bad.mk | 593 ------------------ .../gst-plugins-base/0001-tremor.patch | 139 ---- ...x-build-on-x86-if-emmintrin.h-is-ava.patch | 38 -- ...-s-HAVE_EMMINTRIN_H-not-HAVE_XMMINTR.patch | 27 - package/gstreamer/gst-plugins-base/Config.in | 110 ---- .../gst-plugins-base/gst-plugins-base.hash | 5 - .../gst-plugins-base/gst-plugins-base.mk | 196 ------ .../gst-plugins-good/0001-linux36.patch | 37 -- ...ilation-against-newer-kernel-headers.patch | 30 - package/gstreamer/gst-plugins-good/Config.in | 234 ------- .../gst-plugins-good/gst-plugins-good.hash | 4 - .../gst-plugins-good/gst-plugins-good.mk | 394 ------------ package/gstreamer/gst-plugins-ugly/Config.in | 53 -- .../gst-plugins-ugly/gst-plugins-ugly.hash | 6 - .../gst-plugins-ugly/gst-plugins-ugly.mk | 90 --- package/gstreamer/gstreamer.mk | 1 - package/gstreamer/gstreamer/0001-bison3.patch | 24 - package/gstreamer/gstreamer/Config.in | 38 -- package/gstreamer/gstreamer/gstreamer.hash | 5 - package/gstreamer/gstreamer/gstreamer.mk | 36 -- 48 files changed, 8 insertions(+), 3266 deletions(-) delete mode 100644 package/gstreamer/Config.in delete mode 100644 package/gstreamer/gst-ffmpeg/0001-gcc47.patch delete mode 100644 package/gstreamer/gst-ffmpeg/0002-arm-avoid-using-the-movw-instruction.patch delete mode 100644 package/gstreamer/gst-ffmpeg/Config.in delete mode 100644 package/gstreamer/gst-ffmpeg/gst-ffmpeg.hash delete mode 100644 package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk delete mode 100644 package/gstreamer/gst-fsl-plugins/0001-gplay-add-missing-include.patch delete mode 100644 package/gstreamer/gst-fsl-plugins/0002-Fix-bashism-in-configure-script.patch delete mode 100644 package/gstreamer/gst-fsl-plugins/0003-Use-proper-objdump.patch delete mode 100644 package/gstreamer/gst-fsl-plugins/0004-Fix-libgstfsl-linkage-add-lrt-for-shared-memory-func.patch delete mode 100644 package/gstreamer/gst-fsl-plugins/0005-Remove-use-of-obsolete-VIDIOC_DBG_G_CHIP_IDENT.patch delete mode 100644 package/gstreamer/gst-fsl-plugins/Config.in delete mode 100644 package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.hash delete mode 100644 package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk delete mode 100644 package/gstreamer/gst-omapfb/Config.in delete mode 100644 package/gstreamer/gst-omapfb/gst-omapfb.hash delete mode 100644 package/gstreamer/gst-omapfb/gst-omapfb.mk delete mode 100644 package/gstreamer/gst-plugin-x170/0001-correct-CFLAGS.patch delete mode 100644 package/gstreamer/gst-plugin-x170/Config.in delete mode 100644 package/gstreamer/gst-plugin-x170/gst-plugin-x170.hash delete mode 100644 package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk delete mode 100644 package/gstreamer/gst-plugins-bad/0001-opus-jpegformat-unbreak-non-debug-build.patch delete mode 100644 package/gstreamer/gst-plugins-bad/0002-fix-dfb-example.patch delete mode 100644 package/gstreamer/gst-plugins-bad/0003-drop-buggy-libvpx-legacy-handling.patch delete mode 100644 package/gstreamer/gst-plugins-bad/Config.in delete mode 100644 package/gstreamer/gst-plugins-bad/gst-plugins-bad.hash delete mode 100644 package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk delete mode 100644 package/gstreamer/gst-plugins-base/0001-tremor.patch delete mode 100644 package/gstreamer/gst-plugins-base/0002-audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch delete mode 100644 package/gstreamer/gst-plugins-base/0003-audioresample-It-s-HAVE_EMMINTRIN_H-not-HAVE_XMMINTR.patch delete mode 100644 package/gstreamer/gst-plugins-base/Config.in delete mode 100644 package/gstreamer/gst-plugins-base/gst-plugins-base.hash delete mode 100644 package/gstreamer/gst-plugins-base/gst-plugins-base.mk delete mode 100644 package/gstreamer/gst-plugins-good/0001-linux36.patch delete mode 100644 package/gstreamer/gst-plugins-good/0002-v4l2-fix-compilation-against-newer-kernel-headers.patch delete mode 100644 package/gstreamer/gst-plugins-good/Config.in delete mode 100644 package/gstreamer/gst-plugins-good/gst-plugins-good.hash delete mode 100644 package/gstreamer/gst-plugins-good/gst-plugins-good.mk delete mode 100644 package/gstreamer/gst-plugins-ugly/Config.in delete mode 100644 package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.hash delete mode 100644 package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk delete mode 100644 package/gstreamer/gstreamer.mk delete mode 100644 package/gstreamer/gstreamer/0001-bison3.patch delete mode 100644 package/gstreamer/gstreamer/Config.in delete mode 100644 package/gstreamer/gstreamer/gstreamer.hash delete mode 100644 package/gstreamer/gstreamer/gstreamer.mk diff --git a/Config.in.legacy b/Config.in.legacy index e9725d30b3..563f6d39e3 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2020.02" +config BR2_PACKAGE_GSTREAMER + bool "gstreamer-0.10 removed" + select BR2_LEGACY + help + Gstreamer-0.10 package was removed. It has been deprecated + upstream since 2012, and is missing a lot of features and + fixes compared to gstreamer-1.x. + config BR2_PACKAGE_NVIDIA_TEGRA23_BINARIES_GSTREAMER_PLUGINS bool "nvidia-tegra23 binaries gstreamer 0.10.x support removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 3520072034..cb13035bc4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -237,7 +237,6 @@ F: package/arp-scan/ F: package/dehydrated/ F: package/freescale-imx/firmware-imx/ F: package/freescale-imx/imx-lib/ -F: package/gstreamer/gst-fsl-plugins/ F: package/libpagekite/ F: package/lua-bit32/ F: package/owfs/ diff --git a/package/gstreamer/Config.in b/package/gstreamer/Config.in deleted file mode 100644 index e922437f22..0000000000 --- a/package/gstreamer/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -# Gstreamer 0.10.x & Plugins -source "package/gstreamer/gstreamer/Config.in" - -if BR2_PACKAGE_GSTREAMER -source "package/gstreamer/gst-plugins-base/Config.in" -source "package/gstreamer/gst-plugins-good/Config.in" -source "package/gstreamer/gst-plugins-bad/Config.in" -source "package/gstreamer/gst-plugins-ugly/Config.in" -source "package/gstreamer/gst-ffmpeg/Config.in" -source "package/gstreamer/gst-fsl-plugins/Config.in" -source "package/gstreamer/gst-omapfb/Config.in" -source "package/gstreamer/gst-plugin-x170/Config.in" -endif diff --git a/package/gstreamer/gst-ffmpeg/0001-gcc47.patch b/package/gstreamer/gst-ffmpeg/0001-gcc47.patch deleted file mode 100644 index 16744abae3..0000000000 --- a/package/gstreamer/gst-ffmpeg/0001-gcc47.patch +++ /dev/null @@ -1,65 +0,0 @@ -gst-ffmpeg libav: Fixes compiling gst-ffmpeg with gcc-4.7 - -Fetch from: http://www.slackware.com/~alien/slackbuilds/gst-plugins-ffmpeg/build/gst-ffmpeg-0.10.13_gcc47.patch - -Signed-off-by: Bernd Kuhls ---- -Submitted By: Andrew Benton -Date: 2012-06-15 -Initial Package Version: 0.10.13 -Upstream Status: From upstream -Origin: -http://git.videolan.org/?p=ffmpeg.git;a=patch;h=5f654897e325349dacf2546674e0510bb72ecb50 - -Description: Fixes compiling gst-ffmpeg with gcc-4.7 - -libavcodec/x86/h264_qpel_mmx.c: Assembler messages: -libavcodec/x86/h264_qpel_mmx.c:1294: Error: operand type mismatch for `cmp' -libavcodec/x86/h264_qpel_mmx.c:1294: Error: operand type mismatch for `cmp' -libavcodec/x86/h264_qpel_mmx.c:1298: Error: operand type mismatch for `cmp' -libavcodec/x86/h264_qpel_mmx.c:1298: Error: operand type mismatch for `cmp' -libavcodec/x86/h264_qpel_mmx.c:964: Error: operand type mismatch for `cmp' -libavcodec/x86/h264_qpel_mmx.c:964: Error: operand type mismatch for `cmp' -libavcodec/x86/h264_qpel_mmx.c:964: Error: operand type mismatch for `cmp' -make[5]: *** [libavcodec/x86/dsputil_mmx.o] Error 1 - -Index: gst-ffmpeg-0.10.13/gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c -=================================================================== ---- gst-ffmpeg-0.10.13.orig/gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c 2012-03-30 11:39:41.324522051 -0700 -+++ gst-ffmpeg-0.10.13/gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c 2012-03-30 11:54:08.152564075 -0700 -@@ -398,7 +398,7 @@ - "2: \n\t"\ - \ - : "+a"(src), "+c"(dst)\ -- : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\ -+ : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\ - : "memory"\ - );\ - src += 4-(h+5)*srcStride;\ -@@ -446,7 +446,7 @@ - QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\ - "2: \n\t"\ - : "+a"(src)\ -- : "c"(tmp), "S"((x86_reg)srcStride), "g"(size)\ -+ : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)\ - : "memory"\ - );\ - tmp += 4;\ -@@ -823,7 +823,7 @@ - "2: \n\t"\ - \ - : "+a"(src), "+c"(dst)\ -- : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\ -+ : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\ - : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \ - "%xmm4", "%xmm5", "%xmm6", "%xmm7",)\ - "memory"\ -@@ -878,7 +878,7 @@ - QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48) - "2: \n\t" - : "+a"(src) -- : "c"(tmp), "S"((x86_reg)srcStride), "g"(size) -+ : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size) - : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", - "%xmm4", "%xmm5", "%xmm6", "%xmm7",) - "memory" diff --git a/package/gstreamer/gst-ffmpeg/0002-arm-avoid-using-the-movw-instruction.patch b/package/gstreamer/gst-ffmpeg/0002-arm-avoid-using-the-movw-instruction.patch deleted file mode 100644 index 288dc3d6e8..0000000000 --- a/package/gstreamer/gst-ffmpeg/0002-arm-avoid-using-the-movw-instruction.patch +++ /dev/null @@ -1,41 +0,0 @@ -Date: Mon, 1 Aug 2011 20:21:04 +0300 -Subject: [libavcodec] arm: Avoid using the movw instruction needlessly -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -This fixes building for ARM11 without Thumb2. - -Signed-off-by: Martin Storsjö - -[Arnout: backported to gst-ffmpeg, from ffmpeg 9a83adaf3] -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - gst-libs/ext/libav/libavcodec/arm/ac3dsp_armv6.S | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gst-libs/ext/libav/libavcodec/arm/ac3dsp_armv6.S b/gst-libs/ext/libav/libavcodec/arm/ac3dsp_armv6.S -index d3058ff..b6aee86 100644 ---- a/gst-libs/ext/libav/libavcodec/arm/ac3dsp_armv6.S -+++ b/gst-libs/ext/libav/libavcodec/arm/ac3dsp_armv6.S -@@ -37,7 +37,7 @@ function ff_ac3_bit_alloc_calc_bap_armv6, export=1 - ldrb r10, [r4], #1 - 1: - ldrsh r9, [r0], #2 @ mask[band] -- movw r8, #0x1fe0 -+ mov r8, #0xff0 - sub r9, r9, r12 @ - snr_offset - mov r11, r10 - ldrb r10, [r4], #1 @ band_start_tab[band++] -@@ -44,7 +44,7 @@ function ff_ac3_bit_alloc_calc_bap_armv6, export=1 - subs r9, r9, r5 @ - floor - movlt r9, #0 - cmp r10, r3 @ - end -- and r9, r9, r8 @ & 0x1fe0 -+ and r9, r9, r8, lsl #1 @ & 0x1fe0 - subgt r8, r3, r11 - suble r8, r10, r11 - add r9, r9, r5 @ + floor => m --- -1.7.10.4 - diff --git a/package/gstreamer/gst-ffmpeg/Config.in b/package/gstreamer/gst-ffmpeg/Config.in deleted file mode 100644 index 32bfdd53c6..0000000000 --- a/package/gstreamer/gst-ffmpeg/Config.in +++ /dev/null @@ -1,30 +0,0 @@ -config BR2_PACKAGE_GST_FFMPEG - bool "gst-ffmpeg" - # Unsupported for MIPS R6. It bundles a version of libav which - # doesn't have support for MIPS R6. - depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 - # triggers https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65151 on sh - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 || !BR2_sh - select BR2_PACKAGE_GST_PLUGINS_BASE - help - GStreamer plugin containing one plugin with a set of - elements using the Libav library. It contains most popular - decoders as well as colorspace conversion elements. - - This package is configured to use an internal copy of the - Libav library. - - http://gstreamer.freedesktop.org/modules/gst-ffmpeg.html - -if BR2_PACKAGE_GST_FFMPEG - -config BR2_PACKAGE_GST_FFMPEG_GPL - bool "Enable GPL code" - help - Allow use of GPL code. The resulting libs and binaries will - be under GPL. - -endif - -comment "gst-ffmpeg needs a toolchain w/ gcc >= 5" - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_5 && BR2_sh diff --git a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.hash b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.hash deleted file mode 100644 index c83c051b48..0000000000 --- a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.hash +++ /dev/null @@ -1,6 +0,0 @@ -# From http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.10.13.tar.bz2.md5 -md5 7f5beacaf1312db2db30a026b36888c4 gst-ffmpeg-0.10.13.tar.bz2 -# Locally computed -sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 COPYING.LIB -sha256 03fe7ca91cc28e99b4003d5b3bd4ce3b084d4c475fdf9975cf0e7fdf4dc739cd gst-libs/ext/libav/COPYING.LGPLv2.1 -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 gst-libs/ext/libav/COPYING.LGPLv3 diff --git a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk deleted file mode 100644 index 0d584a15b1..0000000000 --- a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk +++ /dev/null @@ -1,103 +0,0 @@ -################################################################################ -# -# gst-ffmpeg -# -################################################################################ - -GST_FFMPEG_VERSION = 0.10.13 -GST_FFMPEG_SOURCE = gst-ffmpeg-$(GST_FFMPEG_VERSION).tar.bz2 -GST_FFMPEG_SITE = http://gstreamer.freedesktop.org/src/gst-ffmpeg -GST_FFMPEG_INSTALL_STAGING = YES -GST_FFMPEG_DEPENDENCIES = host-pkgconf gstreamer gst-plugins-base - -ifeq ($(BR2_PACKAGE_GST_FFMPEG_GPL),y) -GST_FFMPEG_CONF_OPTS += --disable-lgpl -GST_FFMPEG_LICENSE = GPL-2.0+ (gst-ffmpeg), GPL-2.0+/GPL-3.0+ (libav) -GST_FFMPEG_LICENSE_FILES = COPYING gst-libs/ext/libav/COPYING.GPLv2 gst-libs/ext/libav/COPYING.GPLv3 -else -GST_FFMPEG_CONF_OPTS += --enable-lgpl -GST_FFMPEG_LICENSE = LGPL-2.0+ (gst-ffmpeg), LGPL-2.1+/LGPL-3.0+ (libav) -GST_FFMPEG_LICENSE_FILES = COPYING.LIB gst-libs/ext/libav/COPYING.LGPLv2.1 gst-libs/ext/libav/COPYING.LGPLv3 -endif - -GST_FFMPEG_CONF_EXTRA_OPTS = \ - --cross-prefix=$(TARGET_CROSS) \ - --target-os=linux \ - --pkg-config='$(PKG_CONFIG_HOST_BINARY)' - -ifeq ($(BR2_PACKAGE_ZLIB),y) -GST_FFMPEG_CONF_EXTRA_OPTS += --enable-zlib -GST_FFMPEG_DEPENDENCIES += zlib -else -GST_FFMPEG_CONF_EXTRA_OPTS += --disable-zlib -endif - -ifeq ($(BR2_PACKAGE_BZIP2),y) -GST_FFMPEG_CONF_EXTRA_OPTS += --enable-bzlib -GST_FFMPEG_DEPENDENCIES += bzip2 -else -GST_FFMPEG_CONF_EXTRA_OPTS += --disable-bzlib -endif - -ifeq ($(BR2_X86_CPU_HAS_MMX),y) -GST_FFMPEG_CONF_EXTRA_OPTS += --enable-yasm -GST_FFMPEG_DEPENDENCIES += host-yasm -else -GST_FFMPEG_CONF_EXTRA_OPTS += --disable-yasm -GST_FFMPEG_CONF_EXTRA_OPTS += --disable-mmx -endif - -ifeq ($(BR2_X86_CPU_HAS_SSE),y) -GST_FFMPEG_CONF_EXTRA_OPTS += --enable-sse -else -GST_FFMPEG_CONF_EXTRA_OPTS += --disable-sse -endif - -ifeq ($(BR2_X86_CPU_HAS_SSSE3),y) -GST_FFMPEG_CONF_EXTRA_OPTS += --enable-ssse3 -else -GST_FFMPEG_CONF_EXTRA_OPTS += --disable-ssse3 -endif - -# Explicitly disable everything that doesn't match for ARM -# FFMPEG "autodetects" by compiling an extended instruction via AS -# This works on compilers that aren't built for generic by default -ifeq ($(BR2_ARM_CPU_ARMV4),y) -GST_FFMPEG_CONF_EXTRA_OPTS += --disable-armv5te -endif -ifeq ($(BR2_ARM_CPU_ARMV6)$(BR2_ARM_CPU_ARMV7A),y) -GST_FFMPEG_CONF_EXTRA_OPTS += --enable-armv6 -else -GST_FFMPEG_CONF_EXTRA_OPTS += --disable-armv6 --disable-armv6t2 -endif -ifeq ($(BR2_ARM_CPU_HAS_NEON),y) -GST_FFMPEG_CONF_EXTRA_OPTS += --enable-neon -endif - -ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y) -GST_FFMPEG_CONF_EXTRA_OPTS += --enable-altivec -else -GST_FFMPEG_CONF_EXTRA_OPTS += --disable-altivec -endif - -# libav configure script misdetects the VIS optimizations as being -# available, so forcefully disable them. -ifeq ($(BR2_sparc_v8)$(BR2_sparc_leon3),y) -GST_FFMPEG_CONF_EXTRA_OPTS += --disable-vis -endif - -ifeq ($(BR2_STATIC_LIBS),) -GST_FFMPEG_CONF_EXTRA_OPTS += --enable-pic -endif - -GST_FFMPEG_CFLAGS = $(TARGET_CFLAGS) - -ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) -GST_FFMPEG_CONF_EXTRA_OPTS += --disable-optimizations -GST_FFMPEG_CFLAGS += -O0 -endif - -GST_FFMPEG_CONF_ENV += CFLAGS="$(GST_FFMPEG_CFLAGS)" -GST_FFMPEG_CONF_OPTS += --with-ffmpeg-extra-configure="$(GST_FFMPEG_CONF_EXTRA_OPTS)" - -$(eval $(autotools-package)) diff --git a/package/gstreamer/gst-fsl-plugins/0001-gplay-add-missing-include.patch b/package/gstreamer/gst-fsl-plugins/0001-gplay-add-missing-include.patch deleted file mode 100644 index 19753bc787..0000000000 --- a/package/gstreamer/gst-fsl-plugins/0001-gplay-add-missing-include.patch +++ /dev/null @@ -1,23 +0,0 @@ -From ed649ccb8ddc724546172d329fca39b23c49b804 Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" -Date: Mon, 17 Dec 2012 17:58:28 +0100 -Subject: [PATCH] gplay: add missing include - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - tools/gplay/gst_snapshot.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tools/gplay/gst_snapshot.c b/tools/gplay/gst_snapshot.c -index 40dbb6f..596f399 100755 ---- a/tools/gplay/gst_snapshot.c -+++ b/tools/gplay/gst_snapshot.c -@@ -22,6 +22,7 @@ - - #include - #include -+#include - #include "gst_snapshot.h" - - static void --- diff --git a/package/gstreamer/gst-fsl-plugins/0002-Fix-bashism-in-configure-script.patch b/package/gstreamer/gst-fsl-plugins/0002-Fix-bashism-in-configure-script.patch deleted file mode 100644 index 471c48364d..0000000000 --- a/package/gstreamer/gst-fsl-plugins/0002-Fix-bashism-in-configure-script.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 83b4f84b1c490b9bb816e1ecbc743d80d48cc06d Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" -Date: Tue, 18 Dec 2012 12:05:22 +0100 -Subject: [PATCH] Fix bashism in configure script. - -The configure script uses +=, which is not POSIX. Debians that -have the default dash as /bin/sh define a variable ending with -+ instead of appending to it. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - configure.ac | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 5968eb6..1a31a06 100755 ---- a/configure.ac -+++ b/configure.ac -@@ -152,7 +152,7 @@ AC_SUBST(GST_PLUGINS_BASE_LIBS) - AC_CHECK_HEADERS([vpu_lib.h], [HAVE_VPU_LIB=yes], [HAVE_VPU_LIB=no]) - if test "x$HAVE_VPU_LIB" = "xyes"; then - VPU_LIBS=`$PKG_CONFIG --libs libfslvpuwrap 2>/dev/null` -- VPU_LIBS+=" -lvpu" -+ VPU_LIBS="$VPU_LIBS -lvpu" - fi - AC_SUBST(VPU_LIBS) - -@@ -176,14 +176,14 @@ AC_SUBST(RT_CFLAGS) - AC_SUBST(RT_LIBS) - - FSL_MM_CORE_CFLAGS=`$PKG_CONFIG --cflags libfslaudiocodec 2>/dev/null` --FSL_MM_CORE_CFLAGS+=`$PKG_CONFIG --cflags libfslvideocodec 2>/dev/null` --FSL_MM_CORE_CFLAGS+=`$PKG_CONFIG --cflags libfslparser 2>/dev/null` --FSL_MM_CORE_CFLAGS+=`$PKG_CONFIG --cflags libfslvpuwrap 2>/dev/null` -+FSL_MM_CORE_CFLAGS="$FSL_MM_CORE_CFLAGS `$PKG_CONFIG --cflags libfslvideocodec 2>/dev/null`" -+FSL_MM_CORE_CFLAGS="$FSL_MM_CORE_CFLAGS `$PKG_CONFIG --cflags libfslparser 2>/dev/null`" -+FSL_MM_CORE_CFLAGS="$FSL_MM_CORE_CFLAGS `$PKG_CONFIG --cflags libfslvpuwrap 2>/dev/null`" - AC_SUBST(FSL_MM_CORE_CFLAGS) - - FSL_MM_CORE_LIBS=`$PKG_CONFIG --libs libfslaudiocodec 2>/dev/null` --FSL_MM_CORE_LIBS+=`$PKG_CONFIG --libs libfslvideocodec 2>/dev/null` --FSL_MM_CORE_LIBS+=`$PKG_CONFIG --libs libfslparser 2>/dev/null` -+FSL_MM_CORE_LIBS="$FSL_MM_CORE_LIBS `$PKG_CONFIG --libs libfslvideocodec 2>/dev/null`" -+FSL_MM_CORE_LIBS="$FSL_MM_CORE_LIBS `$PKG_CONFIG --libs libfslparser 2>/dev/null`" - AC_SUBST(FSL_MM_CORE_LIBS) - - EXTRAPLATFORMCFLAGS="-DARM -D_GNUC_" --- diff --git a/package/gstreamer/gst-fsl-plugins/0003-Use-proper-objdump.patch b/package/gstreamer/gst-fsl-plugins/0003-Use-proper-objdump.patch deleted file mode 100644 index b7b8c9f740..0000000000 --- a/package/gstreamer/gst-fsl-plugins/0003-Use-proper-objdump.patch +++ /dev/null @@ -1,36 +0,0 @@ -From c58b658a93b1b6d6e94ba0306d58de845012cef6 Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" -Date: Tue, 18 Dec 2012 12:22:52 +0100 -Subject: [PATCH] Use proper objdump - -If the OBJDUMP environment variable is set, that should be used rather -than the objdump in PATH. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 1a31a06..cc7557d 100755 ---- a/configure.ac -+++ b/configure.ac -@@ -17,7 +17,7 @@ AC_DEFUN([FIND_PARSER_SONAME], - AC_MSG_CHECKING([for lib_$1_parser_$2_elinux.3.0.so soname]) - path=`$PKG_CONFIG --variable=libdir libfslparser` - SONAME=$( $CC -print-file-name=$PKG_CONFIG_SYSROOT_DIR$path/lib_$1_parser_$2_elinux.so | \ -- while read output; do objdump -p $output | \ -+ while read output; do $OBJDUMP -p $output | \ - grep "SONAME" | \ - sed -e 's/ \+SONAME \+//'; done 2> /dev/null ) - if [[ -z "$SONAME" ]]; then -@@ -36,7 +36,7 @@ AC_DEFUN([FIND_ACODEC_SONAME], - AC_MSG_CHECKING([for lib_$1_wrap_$2_elinux.so soname]) - path=`$PKG_CONFIG --variable=libdir libfslaudiocodec` - SONAME=$( $CC -print-file-name=$PKG_CONFIG_SYSROOT_DIR$path/wrap/lib_$1_wrap_$2_elinux.so | \ -- while read output; do objdump -p $output | \ -+ while read output; do $OBJDUMP -p $output | \ - grep "SONAME" | \ - sed -e 's/ \+SONAME \+//'; done 2> /dev/null ) - if [[ -z "$SONAME" ]]; then --- diff --git a/package/gstreamer/gst-fsl-plugins/0004-Fix-libgstfsl-linkage-add-lrt-for-shared-memory-func.patch b/package/gstreamer/gst-fsl-plugins/0004-Fix-libgstfsl-linkage-add-lrt-for-shared-memory-func.patch deleted file mode 100644 index 763703c27c..0000000000 --- a/package/gstreamer/gst-fsl-plugins/0004-Fix-libgstfsl-linkage-add-lrt-for-shared-memory-func.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 1ca4251d1284f2cb56e31aaec4d369809e2139c9 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Mon, 24 Feb 2014 16:30:39 +0100 -Subject: [PATCH] Fix libgstfsl linkage (add -lrt for shared memory functions). - -Fixes runtime failure of gst-fsl-plugins, e.g.: -(gst-plugin-scanner:1700): GStreamer-WARNING **: Failed to load - plugin '/usr/lib/gstreamer-0.10/libmfw_vpu.so': - /usr/lib/libgstfsl-0.10.so.0: undefined symbol: shm_open) - -Signed-off-by: Peter Seiderer ---- - configure.ac | 3 +++ - libs/Makefile.am | 2 +- - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index a5d1655..7b5a7a6 100755 ---- a/configure.ac -+++ b/configure.ac -@@ -170,6 +170,9 @@ AC_CHECK_LIB(ipu, mxc_ipu_lib_task_init, [IPU_LIBS=-lipu], [echo "No libipu arou - AC_SUBST(IPU_CFLAGS) - AC_SUBST(IPU_LIBS) - -+AC_SEARCH_LIBS([shm_open], [rt], [SHM_LIBS="-lrt"]) -+AC_SUBST(SHM_LIBS) -+ - dnl of the POSIX Real-Time Extensions. - AC_CHECK_LIB(rt, clock_gettime) - AC_SUBST(RT_CFLAGS) -diff --git a/libs/Makefile.am b/libs/Makefile.am -index 2f56bba..5b30657 100755 ---- a/libs/Makefile.am -+++ b/libs/Makefile.am -@@ -42,7 +42,7 @@ libgstfsl_@GST_MAJORMINOR@_la_CFLAGS += -DIPULIB - endif - - libgstfsl_@GST_MAJORMINOR@_la_LDFLAGS = -version-info @GSTMXLIBS_VERSION@ --libgstfsl_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ -lgstinterfaces-$(GST_MAJORMINOR) $(IPU_LIBS) $(RT_LIBS) -+libgstfsl_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ -lgstinterfaces-$(GST_MAJORMINOR) $(IPU_LIBS) $(RT_LIBS) $(SHM_LIBS) - - libgstfsl_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/imx-mm - libgstfsl_@GST_MAJORMINOR@include_HEADERS = \ --- -1.8.1.4 - diff --git a/package/gstreamer/gst-fsl-plugins/0005-Remove-use-of-obsolete-VIDIOC_DBG_G_CHIP_IDENT.patch b/package/gstreamer/gst-fsl-plugins/0005-Remove-use-of-obsolete-VIDIOC_DBG_G_CHIP_IDENT.patch deleted file mode 100644 index 56352753a0..0000000000 --- a/package/gstreamer/gst-fsl-plugins/0005-Remove-use-of-obsolete-VIDIOC_DBG_G_CHIP_IDENT.patch +++ /dev/null @@ -1,69 +0,0 @@ -From ce90794a3458af0aed43b8570cf44cd87900185d Mon Sep 17 00:00:00 2001 -From: Gary Bisson -Date: Fri, 25 Jul 2014 16:44:53 -0700 -Subject: [PATCH] Remove use of obsolete VIDIOC_DBG_G_CHIP_IDENT - -This ioctl should never be used in application as -stated in videodev2.h header. -Moreover, its use in this plugin was very limited. - -Signed-off-by: Gary Bisson ---- - src/misc/tvsrc/src/mfw_gst_tvsrc.c | 8 -------- - src/misc/v4l_source/src/mfw_gst_v4lsrc.c | 7 ------- - 2 files changed, 15 deletions(-) - -diff --git a/src/misc/tvsrc/src/mfw_gst_tvsrc.c b/src/misc/tvsrc/src/mfw_gst_tvsrc.c -index 67e0cd2..f495b6f 100755 ---- a/src/misc/tvsrc/src/mfw_gst_tvsrc.c -+++ b/src/misc/tvsrc/src/mfw_gst_tvsrc.c -@@ -450,7 +450,6 @@ mfw_gst_tvsrc_capture_setup (MFWGstTVSRC * v4l_src) - struct v4l2_format fmt; - struct v4l2_control ctrl; - struct v4l2_streamparm parm; -- struct v4l2_dbg_chip_ident chip; - gint fd_v4l = 0; - struct v4l2_mxc_offset off; - gint in_width = 0, in_height = 0; -@@ -461,13 +460,6 @@ mfw_gst_tvsrc_capture_setup (MFWGstTVSRC * v4l_src) - return 0; - } - -- if (ioctl (fd_v4l, VIDIOC_DBG_G_CHIP_IDENT, &chip)) { -- g_print ("VIDIOC_DBG_G_CHIP_IDENT failed.\n"); -- } else -- g_print ("sensor chip is %s\n", chip.match.name); -- -- -- - if (ioctl (fd_v4l, VIDIOC_G_STD, &id) < 0) { - g_print ("VIDIOC_G_STD failed\n"); - close (fd_v4l); -diff --git a/src/misc/v4l_source/src/mfw_gst_v4lsrc.c b/src/misc/v4l_source/src/mfw_gst_v4lsrc.c -index 2c2e838..85e7ff0 100755 ---- a/src/misc/v4l_source/src/mfw_gst_v4lsrc.c -+++ b/src/misc/v4l_source/src/mfw_gst_v4lsrc.c -@@ -464,7 +464,6 @@ mfw_gst_v4lsrc_capture_setup (MFWGstV4LSrc * v4l_src) - struct v4l2_format fmt = {0}; - struct v4l2_control ctrl = {0}; - struct v4l2_streamparm parm = {0}; -- struct v4l2_dbg_chip_ident chip = {0}; - struct v4l2_frmsizeenum fszenum = {0}; - gint input; - gint fd_v4l = 0; -@@ -476,12 +475,6 @@ mfw_gst_v4lsrc_capture_setup (MFWGstV4LSrc * v4l_src) - return 0; - } - -- if (ioctl (fd_v4l, VIDIOC_DBG_G_CHIP_IDENT, &chip)) { -- GST_ERROR ("VIDIOC_DBG_G_CHIP_IDENT failed."); -- } else -- GST_INFO ("sensor chip is %s", chip.match.name); -- -- - if (v4l_src->crop_pixel) { - in_width = v4l_src->capture_width - (2 * v4l_src->crop_pixel); - in_height = v4l_src->capture_height - (2 * v4l_src->crop_pixel); --- -2.0.1 - diff --git a/package/gstreamer/gst-fsl-plugins/Config.in b/package/gstreamer/gst-fsl-plugins/Config.in deleted file mode 100644 index a2ff11ec3e..0000000000 --- a/package/gstreamer/gst-fsl-plugins/Config.in +++ /dev/null @@ -1,105 +0,0 @@ -comment "gst-fsl-plugins needs an imx-specific Linux kernel to be built" - depends on BR2_arm && !BR2_LINUX_KERNEL - -comment "gst-fsl-plugins needs a glibc toolchain" - depends on BR2_arm - depends on !BR2_TOOLCHAIN_USES_GLIBC - -config BR2_PACKAGE_GST_FSL_PLUGINS - bool "gst-fsl-plugins" - depends on BR2_LINUX_KERNEL - depends on BR2_arm # Only relevant for i.MX - depends on BR2_TOOLCHAIN_USES_GLIBC # imx-codec - select BR2_PACKAGE_GST_PLUGINS_BASE - select BR2_PACKAGE_IMX_VPUWRAP if BR2_PACKAGE_FREESCALE_IMX_HAS_VPU - select BR2_PACKAGE_IMX_LIB - select BR2_PACKAGE_IMX_PARSER - select BR2_PACKAGE_IMX_CODEC - select BR2_PACKAGE_FREESCALE_IMX - help - GStreamer plugins for hardware-accelerated audio and video - parsers and codecs on i.MX platforms. It requires a kernel - that includes the i.MX specific headers to be built. - - To use the VPU, its firmware blob must be installed as - well. This can be found in the firmware-imx package in the - "Hardware handling" menu. - - This library is provided by Freescale as-is and doesn't have - an upstream. Pengutronix maintains gst-fsl-plugins at - git://git.pengutronix.de/git/imx/gst-plugins-fsl-vpu.git but - it diverges heavily from Freescale's original - implementation. - -if BR2_PACKAGE_GST_FSL_PLUGINS -choice - prompt "i.MX platform" - default BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX25 if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX25_3STACK - default BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX27 if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX27ADS - default BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX37 if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX37_3STACK - default BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX50 if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX50 - default BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX51 if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX51 - default BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX53 if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53 - default BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX6 if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q - -config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX233 - bool "imx233" - -config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX25 - bool "imx25" - select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX25_3STACK - -config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX27 - bool "imx27" - select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX27ADS - -config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX28 - bool "imx28" - -config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX31 - bool "imx31" - -config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX35 - bool "imx35" - -config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX37 - bool "imx37" - select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX37_3STACK - -config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX50 - bool "imx50" - select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX50 - -config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX51 - bool "imx51" - select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX51 - -config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX53 - bool "imx53" - select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX53 - -config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX5X - bool "imx5X" - select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX5X - -config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX6 - bool "imx6" - select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX6Q - -endchoice - -config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM - string - default "MX233" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX233 - default "MX25" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX25 - default "MX27" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX27 - default "MX28" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX28 - default "MX31" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX31 - default "MX35" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX35 - default "MX37" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX37 - default "MX50" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX50 - default "MX51" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX51 - default "MX53" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX53 - default "MX5X" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX5X - default "MX6" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX6 -endif diff --git a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.hash b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.hash deleted file mode 100644 index 338ef33fe7..0000000000 --- a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.hash +++ /dev/null @@ -1,4 +0,0 @@ -# locally computed -sha256 568883b2a1d8d32e4004cb3f123790d0b4286c91c1fac38c9dc8e20bd1250764 gst-fsl-plugins-4.0.3.tar.gz -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING-LGPL-2.1 -sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING-LGPL-2 diff --git a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk deleted file mode 100644 index 5933efa533..0000000000 --- a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk +++ /dev/null @@ -1,40 +0,0 @@ -################################################################################ -# -# gst-fsl-plugins -# -################################################################################ - -GST_FSL_PLUGINS_VERSION = 4.0.3 -GST_FSL_PLUGINS_SITE = $(FREESCALE_IMX_SITE) - -# Most is LGPL-2.0+, but some sources are copied from upstream and are -# LGPL-2.1+, which essentially makes it LGPL-2.1+ -GST_FSL_PLUGINS_LICENSE = LGPL-2.0+, LGPL-2.1+, PROPRIETARY (asf.h) -GST_FSL_PLUGINS_LICENSE_FILES = COPYING-LGPL-2.1 COPYING-LGPL-2 - -GST_FSL_PLUGINS_INSTALL_STAGING = YES -GST_FSL_PLUGINS_AUTORECONF = YES - -GST_FSL_PLUGINS_DEPENDENCIES += host-pkgconf gstreamer gst-plugins-base \ - imx-lib imx-parser imx-codec - -ifeq ($(BR2_PACKAGE_FREESCALE_IMX_HAS_VPU),y) -GST_FSL_PLUGINS_DEPENDENCIES += imx-vpuwrap -endif - -GST_FSL_PLUGINS_CONF_ENV = \ - PLATFORM=$(BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM) \ - CROSS_ROOT="$(STAGING_DIR)" - -# needs access to imx-specific kernel headers -GST_FSL_PLUGINS_DEPENDENCIES += linux -GST_FSL_PLUGINS_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -idirafter $(LINUX_DIR)/include/uapi" - -ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) -GST_FSL_PLUGINS_DEPENDENCIES += xlib_libX11 -GST_FSL_PLUGINS_CONF_OPTS += --enable-x11 -else -GST_FSL_PLUGINS_CONF_OPTS += --disable-x11 -endif - -$(eval $(autotools-package)) diff --git a/package/gstreamer/gst-omapfb/Config.in b/package/gstreamer/gst-omapfb/Config.in deleted file mode 100644 index cfe5bba6bc..0000000000 --- a/package/gstreamer/gst-omapfb/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_GST_OMAPFB - bool "gst-omapfb" - depends on BR2_cortex_a8 - help - GStreamer plug-in to use OMAP framebuffer. - - http://github.com/felipec/gst-omapfb diff --git a/package/gstreamer/gst-omapfb/gst-omapfb.hash b/package/gstreamer/gst-omapfb/gst-omapfb.hash deleted file mode 100644 index 89a3ada696..0000000000 --- a/package/gstreamer/gst-omapfb/gst-omapfb.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 56c719584d7a7ede5fc2053e8d1060f623b226a60672de0faba46fad646658a4 gst-omapfb-1.0.tar.gz diff --git a/package/gstreamer/gst-omapfb/gst-omapfb.mk b/package/gstreamer/gst-omapfb/gst-omapfb.mk deleted file mode 100644 index d37e77577e..0000000000 --- a/package/gstreamer/gst-omapfb/gst-omapfb.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# gst-omapfb -# -################################################################################ - -GST_OMAPFB_VERSION = 1.0 -GST_OMAPFB_SITE = $(call github,felipec,gst-omapfb,v$(GST_OMAPFB_VERSION)) - -define GST_OMAPFB_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -e -endef - -define GST_OMAPFB_INSTALL_TARGET_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -e DESTDIR=$(TARGET_DIR) install -endef - -GST_OMAPFB_DEPENDENCIES = gstreamer - -$(eval $(generic-package)) diff --git a/package/gstreamer/gst-plugin-x170/0001-correct-CFLAGS.patch b/package/gstreamer/gst-plugin-x170/0001-correct-CFLAGS.patch deleted file mode 100644 index 9c32e46cce..0000000000 --- a/package/gstreamer/gst-plugin-x170/0001-correct-CFLAGS.patch +++ /dev/null @@ -1,28 +0,0 @@ -The configure script is correctly getting the CFLAGS needed to compile a plugin -for gstreamer and storing them in GST_BASE_CFLAGS but the Makefiles are never -making use of those. - -We actually have to use AM_CPPFLAGS as AM_CFLAGS is used everywhere but on the -real compiling rule... - -Signed-off-by: Alexandre Belloni ---- - src/Makefile.am | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 8cb51d1..6af5d91 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -5,6 +5,8 @@ - ############################################################################## - plugin_LTLIBRARIES = libgstx170.la - -+AM_CPPFLAGS = @GST_BASE_CFLAGS@ -+ - ############################################################################## - # for the next set of variables, rename the prefix if you renamed the .la, # - # e.g. libgstplugin_la_SOURCES => libmysomething_la_SOURCES # --- -1.8.1.2 - diff --git a/package/gstreamer/gst-plugin-x170/Config.in b/package/gstreamer/gst-plugin-x170/Config.in deleted file mode 100644 index d0ba763a22..0000000000 --- a/package/gstreamer/gst-plugin-x170/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_GST_PLUGIN_X170 - bool "gst-plugin-x170" - depends on BR2_arm926t - # glibc toolchain includes WCHAR and threading for libglib2 - depends on BR2_TOOLCHAIN_USES_GLIBC # on2-8170-libs - depends on BR2_LINUX_KERNEL # on2-8170-libs - select BR2_PACKAGE_ON2_8170_LIBS - help - GStreamer plug-in to use the Hantro X170 video decoder - present on ATMEL AT91SAM9M10 SoC. - - http://www.at91.com/linux4sam/bin/view/Linux4SAM/SAM9M10Gstreamer - -comment "gst-plugin-x170 needs a glibc toolchain and a Linux kernel to be built" - depends on BR2_arm926t - depends on !BR2_LINUX_KERNEL || !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package/gstreamer/gst-plugin-x170/gst-plugin-x170.hash b/package/gstreamer/gst-plugin-x170/gst-plugin-x170.hash deleted file mode 100644 index 527c461656..0000000000 --- a/package/gstreamer/gst-plugin-x170/gst-plugin-x170.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 734ded3618246d946b53c2c8c7ab5a0961287485aaef5fb9bf874f93e3caa342 gst-plugin-x170-1.0.tar.gz diff --git a/package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk b/package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk deleted file mode 100644 index 378cd7a817..0000000000 --- a/package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# gst-plugin-x170 -# -################################################################################ - -GST_PLUGIN_X170_VERSION = 1.0 -GST_PLUGIN_X170_SITE = ftp://ftp.linux4sam.org/pub/demo/linux4sam_1.9/codec - -GST_PLUGIN_X170_LICENSE = BSD-1c -#A license file is included but it is just a placeholder - -# There is no generated configure script in the tarball. -GST_PLUGIN_X170_AUTORECONF = YES -GST_PLUGIN_X170_AUTORECONF_OPTS = -Im4/ -GST_PLUGIN_X170_DEPENDENCIES = gstreamer libglib2 on2-8170-libs - -$(eval $(autotools-package)) diff --git a/package/gstreamer/gst-plugins-bad/0001-opus-jpegformat-unbreak-non-debug-build.patch b/package/gstreamer/gst-plugins-bad/0001-opus-jpegformat-unbreak-non-debug-build.patch deleted file mode 100644 index 2c98c3e102..0000000000 --- a/package/gstreamer/gst-plugins-bad/0001-opus-jpegformat-unbreak-non-debug-build.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 1725e702a3622cb45c8142622dd419fa0c410ac9 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Wed, 12 Sep 2012 09:10:35 +0200 -Subject: [PATCH] gst-plugins-bad: opus + jpegformat: unbreak non-debug build - -opus + jpegformat plugin builds fail when gstreamer is configured with ---disable-gst-debug as they are checking the GST_DISABLE_DEBUG symbol -instead of GST_DISABLE_GST_DEBUG. - -Submitted upstream as https://bugzilla.gnome.org/show_bug.cgi?id=683850 - -Signed-off-by: Peter Korsgaard ---- - ext/opus/gstopusdec.c | 2 +- - ext/opus/gstopusenc.c | 4 ++-- - gst/jpegformat/gstjpegparse.c | 4 ++-- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/ext/opus/gstopusdec.c b/ext/opus/gstopusdec.c -index 0e2805c..ab7221d 100644 ---- a/ext/opus/gstopusdec.c -+++ b/ext/opus/gstopusdec.c -@@ -357,7 +357,7 @@ opus_dec_chain_parse_data (GstOpusDec * dec, GstBuffer * buffer) - - GST_DEBUG_OBJECT (dec, "Creating decoder with %d channels, %d Hz", - dec->n_channels, dec->sample_rate); --#ifndef GST_DISABLE_DEBUG -+#ifndef GST_DISABLE_GST_DEBUG - gst_opus_common_log_channel_mapping_table (GST_ELEMENT (dec), opusdec_debug, - "Mapping table", dec->n_channels, dec->channel_mapping); - #endif -diff --git a/ext/opus/gstopusenc.c b/ext/opus/gstopusenc.c -index 240a2cb..d991795 100644 ---- a/ext/opus/gstopusenc.c -+++ b/ext/opus/gstopusenc.c -@@ -589,7 +589,7 @@ gst_opus_enc_setup_channel_mappings (GstOpusEnc * enc, - } - } - --#ifndef GST_DISABLE_DEBUG -+#ifndef GST_DISABLE_GST_DEBUG - GST_INFO_OBJECT (enc, - "Mapping tables built: %d channels, %d stereo streams", enc->n_channels, - enc->n_stereo_streams); -@@ -654,7 +654,7 @@ gst_opus_enc_setup (GstOpusEnc * enc) - { - int error = OPUS_OK; - --#ifndef GST_DISABLE_DEBUG -+#ifndef GST_DISABLE_GST_DEBUG - GST_DEBUG_OBJECT (enc, - "setup: %d Hz, %d channels, %d stereo streams, family %d", - enc->sample_rate, enc->n_channels, enc->n_stereo_streams, -diff --git a/gst/jpegformat/gstjpegparse.c b/gst/jpegformat/gstjpegparse.c -index f984a52..b4af9ed 100644 ---- a/gst/jpegformat/gstjpegparse.c -+++ b/gst/jpegformat/gstjpegparse.c -@@ -545,7 +545,7 @@ gst_jpeg_parse_skip_marker (GstJpegParse * parse, - if (!gst_byte_reader_get_uint16_be (reader, &size)) - return FALSE; - --#ifndef GST_DISABLE_DEBUG -+#ifndef GST_DISABLE_GST_DEBUG - /* We'd pry the id of the skipped application segment */ - if (marker >= APP0 && marker <= APP15) { - const gchar *id_str = NULL; -@@ -561,7 +561,7 @@ gst_jpeg_parse_skip_marker (GstJpegParse * parse, - #else - GST_DEBUG_OBJECT (parse, "unhandled marker %x skiping %u bytes", marker, - size); --#endif // GST_DISABLE_DEBUG -+#endif // GST_DISABLE_GST_DEBUG - - if (!gst_byte_reader_skip (reader, size - 2)) - return FALSE; --- -1.7.10 - diff --git a/package/gstreamer/gst-plugins-bad/0002-fix-dfb-example.patch b/package/gstreamer/gst-plugins-bad/0002-fix-dfb-example.patch deleted file mode 100644 index b2057484cd..0000000000 --- a/package/gstreamer/gst-plugins-bad/0002-fix-dfb-example.patch +++ /dev/null @@ -1,22 +0,0 @@ -Fix dfb-example - -Order of inclusion gives a strange effect on the definition of -gst_debug_log. Swapping the include statements solve it. - -Not upstreamed since there will be no more updates to this version -of gst-plugins-bad. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- -diff -rup gst-plugins-bad-0.10.23/ext/directfb/dfb-example.c gst-plugins-bad-0.10.23.fixed/ext/directfb/dfb-example.c ---- gst-plugins-bad-0.10.23/ext/directfb/dfb-example.c 2011-12-11 19:49:11.000000000 +0100 -+++ gst-plugins-bad-0.10.23.fixed/ext/directfb/dfb-example.c 2013-05-13 00:32:00.507469138 +0200 -@@ -1,7 +1,7 @@ - --#include - #include - #include -+#include - - static IDirectFB *dfb = NULL; - static IDirectFBSurface *primary = NULL; diff --git a/package/gstreamer/gst-plugins-bad/0003-drop-buggy-libvpx-legacy-handling.patch b/package/gstreamer/gst-plugins-bad/0003-drop-buggy-libvpx-legacy-handling.patch deleted file mode 100644 index 780b5e38e6..0000000000 --- a/package/gstreamer/gst-plugins-bad/0003-drop-buggy-libvpx-legacy-handling.patch +++ /dev/null @@ -1,44 +0,0 @@ -[PATCH] vp8: drop buggy libvpx legacy handling - -Legacy handling for older libvpx versions were added back in 2010, but this -was unfortunately buggy as these symbols are enums and not defines - So they -are never defined and the legacy symbols always used. - -Now that the legacy symbols are completely removed from libvpx from v1.4.0 -onwards this breaks. Fix it by simply dropping the legacy handling, nobody -should be using libvpx versions from before 2010 (or gstreamer 0.10 for that -matter) any more. - -Signed-off-by: Peter Korsgaard ---- - ext/vp8/gstvp8utils.h | 17 ----------------- - 1 file changed, 17 deletions(-) - -Index: gst-plugins-bad-0.10.23/ext/vp8/gstvp8utils.h -=================================================================== ---- gst-plugins-bad-0.10.23.orig/ext/vp8/gstvp8utils.h -+++ gst-plugins-bad-0.10.23/ext/vp8/gstvp8utils.h -@@ -25,23 +25,6 @@ - - G_BEGIN_DECLS - --/* Some compatibility defines for older libvpx versions */ --#ifndef VPX_IMG_FMT_I420 --#define VPX_IMG_FMT_I420 IMG_FMT_I420 --#endif -- --#ifndef VPX_PLANE_Y --#define VPX_PLANE_Y PLANE_Y --#endif -- --#ifndef VPX_PLANE_U --#define VPX_PLANE_U PLANE_U --#endif -- --#ifndef VPX_PLANE_V --#define VPX_PLANE_V PLANE_V --#endif -- - const char * gst_vpx_error_name (vpx_codec_err_t status); - - G_END_DECLS diff --git a/package/gstreamer/gst-plugins-bad/Config.in b/package/gstreamer/gst-plugins-bad/Config.in deleted file mode 100644 index c96ceb69c4..0000000000 --- a/package/gstreamer/gst-plugins-bad/Config.in +++ /dev/null @@ -1,334 +0,0 @@ -menuconfig BR2_PACKAGE_GST_PLUGINS_BAD - bool "gst-plugins-bad" - select BR2_PACKAGE_GST_PLUGINS_BASE - help - A set of plug-ins for GStreamer that may be of poor quality or - lacking some features. - - http://gstreamer.freedesktop.org/ - -if BR2_PACKAGE_GST_PLUGINS_BAD - -comment "dependency-less plugins" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ADPCMDEC - bool "adpcmdec" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ADPCMENC - bool "adpcmenc" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AIFF - bool "aiff" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ASFMUX - bool "asfmux" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AUTOCONVERT - bool "autoconvert" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AUDIOVISUALIZERS - bool "audiovisualizers" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_BAYER - bool "bayer" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CAMERABIN - bool "camerabin" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CAMERABIN2 - bool "camerabin2" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CDXAPARSE - bool "cdxaparse" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_COLOREFFECTS - bool "coloreffects" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_COLORSPACE - bool "colorspace" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DATAURISRC - bool "dataurisrc" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DCCP - bool "dccp" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DEBUGUTILS - bool "debugutils" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DECKLINK - bool "decklink" - depends on BR2_INSTALL_LIBSTDCPP - -comment "decklink needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DTMF - bool "dtmf" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVBSUBOVERLAY - bool "dvdsuboverlay" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVDSPU - bool "dvdspu" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FACEOVERLAY - bool "faceoverlay" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FESTIVAL - bool "festival" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FIELDANALYSIS - bool "fieldanalysis" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREEVERB - bool "freeverb" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREEZE - bool "freeze" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREI0R - bool "frei0r" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_GAUDIEFFECTS - bool "gaudieffects" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_GEOMETRICTRANSFORM - bool "geometrictransform" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_GSETTINGS - bool "gsettings" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_H264PARSE - bool "h264parse" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_HDVPARSE - bool "hdvparse" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_HLS - bool "hls" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ID3TAG - bool "id3tag" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_INTER - bool "inter" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_INTERLACE - bool "interlace" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_IVFPARSE - bool "ivfparse" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_JP2KDECIMATOR - bool "jp2kdecimator" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_JPEGFORMAT - bool "jpegformat" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LEGACYRESAMPLE - bool "legacyresample" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIBRFB - bool "librfb" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LINSYS - bool "linsys" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIVEADDER - bool "liveadder" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGDEMUX - bool "mpegdemux" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGPSMUX - bool "mpegpsmux" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX - bool "mpegtsdemux" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGTSMUX - bool "mpegtsmux" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGVIDEOPARSE - bool "mpegvideoparse" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MVE - bool "mve" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MXF - bool "mxf" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_NSF - bool "nsf" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_NUVDEMUX - bool "nuvdemux" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_PATCHDETECT - bool "patchdetect" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_PCAPPARSE - bool "pcapparse" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_PNM - bool "pnm" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RAWPARSE - bool "rawparse" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_REAL - bool "real" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_REMOVESILENCE - bool "removesilence" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RTPMUX - bool "rtpmux" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RTPVP8 - bool "rtpvp8" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SCALETEMPO - bool "scaletempo" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDI - bool "sdi" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDP - bool "sdp" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SEGMENTCLIP - bool "segmentclip" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SIREN - bool "siren" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SMOOTH - bool "smooth" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SPEED - bool "speed" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_STEREO - bool "stereo" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SUBENC - bool "subenc" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_TTA - bool "tta" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOFILTERS - bool "videofilters" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOMAXRATE - bool "videomaxrate" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOMEASURE - bool "videomeasure" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOPARSERS - bool "videoparsers" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOSIGNAL - bool "videosignal" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VMNC - bool "vmnc" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_Y4M - bool "y4m" - -comment "plugins with external dependencies (there may be more available)" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_BZ2 - bool "bz2" - select BR2_PACKAGE_BZIP2 - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CDAUDIO - bool "cdaudio" - depends on !BR2_nios2 # libcdaudio - select BR2_PACKAGE_LIBCDAUDIO - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CURL - bool "curl" - select BR2_PACKAGE_LIBCURL - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DIRECTFB - bool "directfb" - default y - depends on BR2_PACKAGE_DIRECTFB - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVB - bool "dvb" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FBDEV - bool "fbdev" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FAAD - bool "faad" - select BR2_PACKAGE_FAAD2 - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIBMMS - bool "libmms" - depends on BR2_USE_WCHAR # libmms -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libmms -> libglib2 - select BR2_PACKAGE_LIBMMS - -comment "libmms needs a toolchain w/ wchar, threads" - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MUSEPACK - bool "musepack" - select BR2_PACKAGE_MUSEPACK - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_NEON - bool "neon" - select BR2_PACKAGE_NEON - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_OPUS - bool "opus" - select BR2_PACKAGE_OPUS - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RSVG - bool "rsvg" - depends on BR2_INSTALL_LIBSTDCPP # librsvg -> pango - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # librsvg -> pango -> harfbuzz - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # librsvg -> pango -> harfbuzz - select BR2_PACKAGE_LIBRSVG - -comment "rsvg plugin needs a toolchain w/ C++, gcc >= 4.8" - depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDL - bool "sdl" - select BR2_PACKAGE_SDL - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SNDFILE - bool "sndfile" - select BR2_PACKAGE_LIBSNDFILE - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VCD - bool "vcd" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VP8 - bool "vp8" - select BR2_PACKAGE_LIBVPX - -config BR2_PACKAGE_GST_PLUGINS_BAD_ZBAR - bool "zbar" - depends on BR2_TOOLCHAIN_HAS_THREADS # zbar-> libv4l - depends on BR2_USE_MMU # zbar-> libv4l - depends on BR2_INSTALL_LIBSTDCPP # zbar-> libv4l - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # zbar -> libv4l - select BR2_PACKAGE_ZBAR - -comment "zbar plugin needs a toolchain w/ threads, C++ and headers >= 3.0" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS \ - || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 - -endif diff --git a/package/gstreamer/gst-plugins-bad/gst-plugins-bad.hash b/package/gstreamer/gst-plugins-bad/gst-plugins-bad.hash deleted file mode 100644 index 6448acc4cc..0000000000 --- a/package/gstreamer/gst-plugins-bad/gst-plugins-bad.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.tar.xz.md5 -md5 e4822fa2cc933768e2998311a1565979 gst-plugins-bad-0.10.23.tar.xz -# Locally computed -sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 COPYING.LIB -sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING diff --git a/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk b/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk deleted file mode 100644 index a98eac4235..0000000000 --- a/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk +++ /dev/null @@ -1,593 +0,0 @@ -################################################################################ -# -# gst-plugins-bad -# -################################################################################ - -GST_PLUGINS_BAD_VERSION = 0.10.23 -GST_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST_PLUGINS_BAD_VERSION).tar.xz -GST_PLUGINS_BAD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-bad -# COPYING.LIB is in fact v2, but most of the code is v2.1+ -GST_PLUGINS_BAD_LICENSE = LGPL-2.1+, GPL-2.0+ -GST_PLUGINS_BAD_LICENSE_FILES = COPYING.LIB COPYING - -GST_PLUGINS_BAD_CONF_OPTS = \ - --disable-apexsink \ - --disable-examples \ - --disable-spandsp - -GST_PLUGINS_BAD_DEPENDENCIES = gst-plugins-base gstreamer - -ifeq ($(BR2_PACKAGE_ORC),y) -GST_PLUGINS_BAD_DEPENDENCIES += orc -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ADPCMDEC),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-adpcmdec -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-adpcmdec -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ADPCMENC),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-adpcmenc -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-adpcmenc -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AIFF),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-aiff -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-aiff -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ASFMUX),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-asfmux -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-asfmux -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AUDIOVISUALIZERS),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-audiovisualizers -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-audiovisualizers -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AUTOCONVERT),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-autoconvert -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-autoconvert -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_BAYER),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-bayer -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-bayer -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CAMERABIN),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-camerabin -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-camerabin -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CAMERABIN2),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-camerabin2 -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-camerabin2 -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CDXAPARSE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-cdxaparse -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-cdxaparse -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_COLOREFFECTS),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-coloreffects -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-coloreffects -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_COLORSPACE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-colorspace -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-colorspace -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DATAURISRC),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-dataurisrc -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-dataurisrc -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DCCP),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-dccp -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-dccp -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DEBUGUTILS),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-debugutils -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-debugutils -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DECKLINK),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-decklink -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-decklink -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DTMF),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-dtmf -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-dtmf -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVBSUBOVERLAY),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-dvbsuboverlay -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-dvbsuboverlay -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVDSPU),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-dvdspu -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-dvdspu -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FACEOVERLAY),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-faceoverlay -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-faceoverlay -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FESTIVAL),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-festival -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-festival -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FIELDANALYSIS),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-fieldanalysis -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-fieldanalysis -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREEZE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-freeze -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-freeze -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREEVERB),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-freeverb -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-freeverb -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREI0R),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-frei0r -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-frei0r -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_GAUDIEFFECTS),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-gaudieffects -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-gaudieffects -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_GEOMETRICTRANSFORM),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-geometrictransform -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-geometrictransform -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_GSETTINGS),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-gsettings -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-gsettings -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_H264PARSE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-h264parse -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-h264parse -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_HDVPARSE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-hdvparse -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-hdvparse -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_HLS),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-hls -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-hls -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ID3TAG),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-id3tag -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-id3tag -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_INTER),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-inter -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-inter -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_INTERLACE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-interlace -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-interlace -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_IVFPARSE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-ivfparse -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-ivfparse -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_JP2KDECIMATOR),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-jp2kdecimator -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-jp2kdecimator -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_JPEGFORMAT),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-jpegformat -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-jpegformat -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LEGACYRESAMPLE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-legacyresample -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-legacyresample -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIBRFB),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-librfb -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-librfb -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LINSYS),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-linsys -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-linsys -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIVEADDER),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-liveadder -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-liveadder -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGDEMUX),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-mpegdemux -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-mpegdemux -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGPSMUX),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-mpegpsmux -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-mpegpsmux -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-mpegtsdemux -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-mpegtsdemux -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGTSMUX),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-mpegtsmux -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-mpegtsmux -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGVIDEOPARSE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-mpegvideoparse -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-mpegvideoparse -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MVE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-mve -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-mve -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MXF),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-mxf -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-mxf -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_NSF),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-nsf -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-nsf -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_NUVDEMUX),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-nuvdemux -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-nuvdemux -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_PATCHDETECT),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-patchdetect -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-patchdetect -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_PCAPPARSE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-pcapparse -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-pcapparse -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_PNM),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-pnm -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-pnm -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RAWPARSE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-rawparse -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-rawparse -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_REAL),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-real -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-real -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_REMOVESILENCE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-removesilence -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-removesilence -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RTPMUX),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-rtpmux -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-rtpmux -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RTPVP8),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-rtpvp8 -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-rtpvp8 -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SCALETEMPO),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-scaletempo -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-scaletempo -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDI),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-sdi -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-sdi -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDP),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-sdp -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-sdp -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SEGMENTCLIP),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-segmentclip -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-segmentclip -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SIREN),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-siren -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-siren -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SMOOTH),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-smooth -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-smooth -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SPEED),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-speed -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-speed -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SUBENC),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-subenc -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-subenc -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_STEREO),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-stereo -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-stereo -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_TTA),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-tta -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-tta -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOFILTERS),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-videofilters -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-videofilters -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOMAXRATE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-videomaxrate -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-videomaxrate -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOMEASURE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-videomeasure -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-videomeasure -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOPARSERS),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-videoparsers -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-videoparsers -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOSIGNAL),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-videosignal -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-videosignal -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VMNC),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-vmnc -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-vmnc -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_Y4M),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-y4m -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-y4m -endif - -# plugins with deps -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_BZ2),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-bz2 -GST_PLUGINS_BAD_DEPENDENCIES += bzip2 -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-bz2 -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CDAUDIO),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-cdaudio -GST_PLUGINS_BAD_DEPENDENCIES += libcdaudio -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-cdaudio -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CURL),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-curl -GST_PLUGINS_BAD_DEPENDENCIES += libcurl -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-curl -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DIRECTFB),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-directfb -GST_PLUGINS_BAD_DEPENDENCIES += directfb -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-directfb -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVB),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-dvb -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-dvb -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FAAD),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-faad -GST_PLUGINS_BAD_DEPENDENCIES += faad2 -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-faad -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FBDEV),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-fbdev -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-fbdev -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIBMMS),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-libmms -GST_PLUGINS_BAD_DEPENDENCIES += libmms -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-libmms -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MUSEPACK),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-musepack -GST_PLUGINS_BAD_DEPENDENCIES += musepack -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-musepack -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_NEON),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-neon -GST_PLUGINS_BAD_DEPENDENCIES += neon -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-neon -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_OPUS),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-opus -GST_PLUGINS_BAD_DEPENDENCIES += opus -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-opus -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RSVG),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-rsvg -GST_PLUGINS_BAD_DEPENDENCIES += librsvg -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-rsvg -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDL),y) -GST_PLUGINS_BAD_CONF_ENV += ac_cv_path_SDL_CONFIG=$(STAGING_DIR)/usr/bin/sdl-config -GST_PLUGINS_BAD_CONF_OPTS += --enable-sdl -GST_PLUGINS_BAD_DEPENDENCIES += sdl -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-sdl -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SNDFILE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-sndfile -GST_PLUGINS_BAD_DEPENDENCIES += libsndfile -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-sndfile -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VCD),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-vcd -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-vcd -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VP8),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-vp8 -GST_PLUGINS_BAD_DEPENDENCIES += libvpx -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-vp8 -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_ZBAR),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-zbar -GST_PLUGINS_BAD_DEPENDENCIES += zbar -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-zbar -endif - -$(eval $(autotools-package)) diff --git a/package/gstreamer/gst-plugins-base/0001-tremor.patch b/package/gstreamer/gst-plugins-base/0001-tremor.patch deleted file mode 100644 index fa8785bed4..0000000000 --- a/package/gstreamer/gst-plugins-base/0001-tremor.patch +++ /dev/null @@ -1,139 +0,0 @@ -From 0088753651350de3060ece22c1be4153b6009515 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Wed, 25 Jan 2012 23:53:04 +0100 -Subject: [PATCH] base: vorbisdeclib: support modern Tremor versions - -Reported upstream as https://bugzilla.gnome.org/show_bug.cgi?id=668726 - -Tremor changed to use standard libogg rather than its own incompatible -copy back in Aug 2010 (r17375), causing gst-plugin-base build to fail. - -Tremolo so far unfortunately hasn't been updated. Restructure -vorbisdeclib.h so the legacy _ogg_packet_wrapper code is only used for -Tremolo. - -Signed-off-by: Peter Korsgaard ---- - ext/vorbis/gstvorbisdeclib.h | 77 ++++++++++++++++++++++------------------- - 1 files changed, 41 insertions(+), 36 deletions(-) - -diff --git a/ext/vorbis/gstvorbisdeclib.h b/ext/vorbis/gstvorbisdeclib.h -index ca00af9..e147591 100644 ---- a/ext/vorbis/gstvorbisdeclib.h -+++ b/ext/vorbis/gstvorbisdeclib.h -@@ -29,11 +29,6 @@ - - #ifndef TREMOR - --#include -- --typedef float vorbis_sample_t; --typedef ogg_packet ogg_packet_wrapper; -- - #define GST_VORBIS_DEC_DESCRIPTION "decode raw vorbis streams to float audio" - - #define GST_VORBIS_DEC_SRC_CAPS \ -@@ -47,6 +42,42 @@ typedef ogg_packet ogg_packet_wrapper; - - #define GST_VORBIS_DEC_GLIB_TYPE_NAME GstVorbisDec - -+#else /* TREMOR */ -+ -+#define GST_VORBIS_DEC_DESCRIPTION "decode raw vorbis streams to integer audio" -+ -+#define GST_VORBIS_DEC_SRC_CAPS \ -+ GST_STATIC_CAPS ("audio/x-raw-int, " \ -+ "rate = (int) [ 1, MAX ], " \ -+ "channels = (int) [ 1, 6 ], " \ -+ "endianness = (int) BYTE_ORDER, " \ -+ "width = (int) { 16, 32 }, " \ -+ "depth = (int) 16, " \ -+ "signed = (boolean) true") -+ -+#define GST_VORBIS_DEC_DEFAULT_SAMPLE_WIDTH (16) -+ -+/* we need a different type name here */ -+#define GST_VORBIS_DEC_GLIB_TYPE_NAME GstIVorbisDec -+ -+/* and still have it compile */ -+typedef struct _GstVorbisDec GstIVorbisDec; -+typedef struct _GstVorbisDecClass GstIVorbisDecClass; -+ -+#endif /* TREMOR */ -+ -+#ifndef USE_TREMOLO -+ -+#ifdef TREMOR -+ #include -+ typedef ogg_int32_t vorbis_sample_t; -+#else -+ #include -+ typedef float vorbis_sample_t; -+#endif -+ -+typedef ogg_packet ogg_packet_wrapper; -+ - static inline guint8 * - gst_ogg_packet_data (ogg_packet * p) - { -@@ -72,17 +103,11 @@ gst_ogg_packet_from_wrapper (ogg_packet_wrapper * packet) - return packet; - } - --#else -- --#ifdef USE_TREMOLO -- #include -- #include -- typedef ogg_int16_t vorbis_sample_t; --#else -- #include -- typedef ogg_int32_t vorbis_sample_t; --#endif -+#else /* USE_TREMOLO */ - -+#include -+#include -+typedef ogg_int16_t vorbis_sample_t; - typedef struct _ogg_packet_wrapper ogg_packet_wrapper; - - struct _ogg_packet_wrapper { -@@ -91,26 +116,6 @@ struct _ogg_packet_wrapper { - ogg_buffer buf; - }; - --#define GST_VORBIS_DEC_DESCRIPTION "decode raw vorbis streams to integer audio" -- --#define GST_VORBIS_DEC_SRC_CAPS \ -- GST_STATIC_CAPS ("audio/x-raw-int, " \ -- "rate = (int) [ 1, MAX ], " \ -- "channels = (int) [ 1, 6 ], " \ -- "endianness = (int) BYTE_ORDER, " \ -- "width = (int) { 16, 32 }, " \ -- "depth = (int) 16, " \ -- "signed = (boolean) true") -- --#define GST_VORBIS_DEC_DEFAULT_SAMPLE_WIDTH (16) -- --/* we need a different type name here */ --#define GST_VORBIS_DEC_GLIB_TYPE_NAME GstIVorbisDec -- --/* and still have it compile */ --typedef struct _GstVorbisDec GstIVorbisDec; --typedef struct _GstVorbisDecClass GstIVorbisDecClass; -- - /* compensate minor variation */ - #define vorbis_synthesis(a, b) vorbis_synthesis (a, b, 1) - -@@ -154,7 +159,7 @@ gst_ogg_packet_from_wrapper (ogg_packet_wrapper * packet) - return &(packet->packet); - } - --#endif -+#endif /* USE_TREMOLO */ - - typedef void (*CopySampleFunc)(vorbis_sample_t *out, vorbis_sample_t **in, - guint samples, gint channels, gint width); --- -1.7.8.3 - diff --git a/package/gstreamer/gst-plugins-base/0002-audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch b/package/gstreamer/gst-plugins-base/0002-audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch deleted file mode 100644 index eabea4f8ca..0000000000 --- a/package/gstreamer/gst-plugins-base/0002-audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch +++ /dev/null @@ -1,38 +0,0 @@ -From daa194b71ea6f9e8ee522ab02e8c56150b7e62b3 Mon Sep 17 00:00:00 2001 -From: Antoine Jacoutot -Date: Mon, 20 Jan 2014 15:44:09 +0100 -Subject: [PATCH] audioresample: Fix build on x86 if emmintrin.h is available - but can't be used - -On i386, EMMINTRIN is defined but not usable without SSE so check for -__SSE__ and __SSE2__ as well. - -https://bugzilla.gnome.org/show_bug.cgi?id=670690 -Signed-off-by: Peter Korsgaard ---- - gst/audioresample/resample.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gst/audioresample/resample.c b/gst/audioresample/resample.c -index 98d006c..481fa01 100644 ---- a/gst/audioresample/resample.c -+++ b/gst/audioresample/resample.c -@@ -77,13 +77,13 @@ - #define EXPORT G_GNUC_INTERNAL - - #ifdef _USE_SSE --#ifndef HAVE_XMMINTRIN_H -+#if !defined(__SSE__) || !defined(HAVE_XMMINTRIN_H) - #undef _USE_SSE - #endif - #endif - - #ifdef _USE_SSE2 --#ifndef HAVE_EMMINTRIN_H -+#if !defined(__SSE2__) || !defined(HAVE_XMMINTRIN_H) - #undef _USE_SSE2 - #endif - #endif --- -2.1.4 - diff --git a/package/gstreamer/gst-plugins-base/0003-audioresample-It-s-HAVE_EMMINTRIN_H-not-HAVE_XMMINTR.patch b/package/gstreamer/gst-plugins-base/0003-audioresample-It-s-HAVE_EMMINTRIN_H-not-HAVE_XMMINTR.patch deleted file mode 100644 index e67531d2f7..0000000000 --- a/package/gstreamer/gst-plugins-base/0003-audioresample-It-s-HAVE_EMMINTRIN_H-not-HAVE_XMMINTR.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 4e3d101aa854cfee633a9689efeb75e5001baa5e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= -Date: Mon, 20 Jan 2014 16:11:04 +0100 -Subject: [PATCH] audioresample: It's HAVE_EMMINTRIN_H, not HAVE_XMMINTRIN_H - for SSE2 - -Signed-off-by: Peter Korsgaard ---- - gst/audioresample/resample.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gst/audioresample/resample.c b/gst/audioresample/resample.c -index 481fa01..4410bdd 100644 ---- a/gst/audioresample/resample.c -+++ b/gst/audioresample/resample.c -@@ -83,7 +83,7 @@ - #endif - - #ifdef _USE_SSE2 --#if !defined(__SSE2__) || !defined(HAVE_XMMINTRIN_H) -+#if !defined(__SSE2__) || !defined(HAVE_EMMINTRIN_H) - #undef _USE_SSE2 - #endif - #endif --- -2.1.4 - diff --git a/package/gstreamer/gst-plugins-base/Config.in b/package/gstreamer/gst-plugins-base/Config.in deleted file mode 100644 index d784bcdd39..0000000000 --- a/package/gstreamer/gst-plugins-base/Config.in +++ /dev/null @@ -1,110 +0,0 @@ -menuconfig BR2_PACKAGE_GST_PLUGINS_BASE - bool "gst-plugins-base" - select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBXV if BR2_PACKAGE_XORG7 - help - A basic set of well-supported plug-ins for GStreamer. - - http://gstreamer.freedesktop.org/ - -if BR2_PACKAGE_GST_PLUGINS_BASE - -comment "dependency-less plugins" - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ADDER - bool "adder" - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_APP - bool "app" - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIOCONVERT - bool "audioconvert (mandatory for audio playback)" - default y - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIORATE - bool "audiorate" - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE - bool "audioresample (mandatory for audio playback)" - default y - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIOTESTSRC - bool "audiotestsrc" - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ENCODING - bool "encoding" - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_FFMPEGCOLORSPACE - bool "ffmpegcolorspace (mandatory for video playback)" - default y - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_GDP - bool "gdp" - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_PLAYBACK - bool "playback (mandatory)" - default y - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_TCP - bool "tcp" - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_TYPEFIND - bool "typefind (mandatory)" - default y - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC - bool "videotestsrc" - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEORATE - bool "videorate" - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEOSCALE - bool "videoscale (mandatory for video playback)" - default y - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VOLUME - bool "volume (mandatory for audio playback)" - default y - -comment "plugins with external dependencies (there may be more available)" - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ALSA - bool "alsa (mandatory for audio playback)" - select BR2_PACKAGE_ALSA_LIB - select BR2_PACKAGE_ALSA_LIB_MIXER - select BR2_PACKAGE_ALSA_LIB_PCM - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_OGG - bool "ogg (*.ogg audio/video)" - select BR2_PACKAGE_LIBOGG - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_PANGO - bool "pango font renderer" - depends on BR2_INSTALL_LIBSTDCPP # pango -> freetype - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # pango -> harfbuzz - select BR2_PACKAGE_PANGO - -comment "pango plugin needs a toolchain w/ C++, gcc => 4.8" - depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_SUBPARSE - bool "subparse" - select BR2_PACKAGE_LIBXML2 - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_THEORA - bool "theora (*.ogg video)" - select BR2_PACKAGE_LIBTHEORA - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_TREMOR - bool "tremor" - select BR2_PACKAGE_TREMOR - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VORBIS - bool "vorbis (*.ogg audio)" - select BR2_PACKAGE_LIBVORBIS - -endif diff --git a/package/gstreamer/gst-plugins-base/gst-plugins-base.hash b/package/gstreamer/gst-plugins-base/gst-plugins-base.hash deleted file mode 100644 index f71f8dfb2b..0000000000 --- a/package/gstreamer/gst-plugins-base/gst-plugins-base.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.tar.xz.md5 -md5 3d2337841b132fe996e5eb2396ac9438 gst-plugins-base-0.10.36.tar.xz -# Locally computed -sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING -sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 COPYING.LIB diff --git a/package/gstreamer/gst-plugins-base/gst-plugins-base.mk b/package/gstreamer/gst-plugins-base/gst-plugins-base.mk deleted file mode 100644 index 735314365d..0000000000 --- a/package/gstreamer/gst-plugins-base/gst-plugins-base.mk +++ /dev/null @@ -1,196 +0,0 @@ -################################################################################ -# -# gst-plugins-base -# -################################################################################ - -GST_PLUGINS_BASE_VERSION = 0.10.36 -GST_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST_PLUGINS_BASE_VERSION).tar.xz -GST_PLUGINS_BASE_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-base -GST_PLUGINS_BASE_INSTALL_STAGING = YES -GST_PLUGINS_BASE_LICENSE = GPL-2.0+, LGPL-2.0+ -GST_PLUGINS_BASE_LICENSE_FILES = COPYING COPYING.LIB - -# freetype is only used by examples, but if it is not found -# and the host has a freetype-config script, then the host -# include dirs are added to the search path causing trouble -GST_PLUGINS_BASE_CONF_ENV = \ - FT2_CONFIG=/bin/false \ - ac_cv_header_stdint_t="stdint.h" - -GST_PLUGINS_BASE_CONF_OPTS = \ - --disable-examples \ - --disable-oggtest \ - --disable-vorbistest \ - --disable-freetypetest - -GST_PLUGINS_BASE_DEPENDENCIES = gstreamer - -ifeq ($(BR2_PACKAGE_XORG7),y) -GST_PLUGINS_BASE_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXv -GST_PLUGINS_BASE_CONF_OPTS += \ - --enable-x \ - --enable-xshm \ - --enable-xvideo -else -GST_PLUGINS_BASE_CONF_OPTS += \ - --disable-x \ - --disable-xshm \ - --disable-xvideo -endif - -ifeq ($(BR2_PACKAGE_ORC),y) -GST_PLUGINS_BASE_DEPENDENCIES += orc -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ALSA),y) -GST_PLUGINS_BASE_DEPENDENCIES += alsa-lib -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-alsa -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ADDER),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-adder -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-adder -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_APP),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-app -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-app -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIOCONVERT),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-audioconvert -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-audioconvert -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIORATE),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-audiorate -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-audiorate -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-audioresample -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-audioresample -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIOTESTSRC),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-audiotestsrc -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-audiotestsrc -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ENCODING),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-encoding -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-encoding -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_FFMPEGCOLORSPACE),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-ffmpegcolorspace -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-ffmpegcolorspace -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_GDP),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-gdp -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-gdp -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_PLAYBACK),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-playback -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-playback -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_SUBPARSE),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-subparse -GST_PLUGINS_BASE_DEPENDENCIES += libxml2 -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-subparse -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_TCP),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-tcp -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-tcp -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_TYPEFIND),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-typefind -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-typefind -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-videotestsrc -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-videotestsrc -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEORATE),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-videorate -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-videorate -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEOSCALE),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-videoscale -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-videoscale -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VOLUME),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-volume -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-volume -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_OGG),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-ogg -GST_PLUGINS_BASE_DEPENDENCIES += libogg -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-ogg -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_PANGO),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-pango -GST_PLUGINS_BASE_DEPENDENCIES += pango -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-pango -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_THEORA),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-theora -GST_PLUGINS_BASE_DEPENDENCIES += libtheora -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-theora -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_TREMOR),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-ivorbis -GST_PLUGINS_BASE_DEPENDENCIES += tremor -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-ivorbis -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VORBIS),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-vorbis -GST_PLUGINS_BASE_DEPENDENCIES += libvorbis -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-vorbis -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -GST_PLUGINS_BASE_DEPENDENCIES += zlib -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-zlib -endif - -$(eval $(autotools-package)) diff --git a/package/gstreamer/gst-plugins-good/0001-linux36.patch b/package/gstreamer/gst-plugins-good/0001-linux36.patch deleted file mode 100644 index 5d7cd932ed..0000000000 --- a/package/gstreamer/gst-plugins-good/0001-linux36.patch +++ /dev/null @@ -1,37 +0,0 @@ -Fix building with Linux headers 3.6 - -Signed-off-by: Markos Chandras - -From bfb1ac952b4c3caaba0297bbe7dc73ea92f9b292 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen -Date: Thu, 09 Aug 2012 07:35:23 +0000 -Subject: v4l2: fix build with recent kernels, the v4l2_buffer input field was removed - -This was unused apparently and removed in the kernel in commit: - - From 2b719d7baf490e24ce7d817c6337b7c87fda84c1 Mon Sep 17 00:00:00 2001 - From: Sakari Ailus - Date: Wed, 2 May 2012 09:40:03 -0300 - Subject: [PATCH] [media] v4l: drop v4l2_buffer.input and V4L2_BUF_FLAG_INPUT - - Remove input field in struct v4l2_buffer and flag V4L2_BUF_FLAG_INPUT which - tells the former is valid. The flag is used by no driver currently. - -https://bugzilla.gnome.org/show_bug.cgi?id=681491 ---- -(limited to 'sys/v4l2/gstv4l2bufferpool.c') - -diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c -index 2e3a563..5aaed5a 100644 ---- a/sys/v4l2/gstv4l2bufferpool.c -+++ b/sys/v4l2/gstv4l2bufferpool.c -@@ -182,7 +182,6 @@ gst_v4l2_buffer_new (GstV4l2BufferPool * pool, guint index, GstCaps * caps) - GST_LOG_OBJECT (pool->v4l2elem, " MMAP offset: %u", - ret->vbuffer.m.offset); - GST_LOG_OBJECT (pool->v4l2elem, " length: %u", ret->vbuffer.length); -- GST_LOG_OBJECT (pool->v4l2elem, " input: %u", ret->vbuffer.input); - - ret->mmap_length = ret->vbuffer.length; - data = (guint8 *) v4l2_mmap (0, ret->vbuffer.length, --- -cgit v0.9.0.2-2-gbebe diff --git a/package/gstreamer/gst-plugins-good/0002-v4l2-fix-compilation-against-newer-kernel-headers.patch b/package/gstreamer/gst-plugins-good/0002-v4l2-fix-compilation-against-newer-kernel-headers.patch deleted file mode 100644 index 62c3bb24e6..0000000000 --- a/package/gstreamer/gst-plugins-good/0002-v4l2-fix-compilation-against-newer-kernel-headers.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 8e633d2059cb835448021cf79becb487aff10975 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Mon, 18 Mar 2013 14:59:35 +0000 -Subject: [PATCH] v4l2: fix compilation against newer kernel headers as on - FC19 - ---- - sys/v4l2/v4l2_calls.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c -index 07d390a..4c10f4f 100644 ---- a/sys/v4l2/v4l2_calls.c -+++ b/sys/v4l2/v4l2_calls.c -@@ -291,8 +291,12 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object) - break; - case V4L2_CID_HFLIP: - case V4L2_CID_VFLIP: -+#ifndef V4L2_CID_PAN_RESET - case V4L2_CID_HCENTER: -+#endif -+#ifndef V4L2_CID_TILT_RESET - case V4L2_CID_VCENTER: -+#endif - #ifdef V4L2_CID_PAN_RESET - case V4L2_CID_PAN_RESET: - #endif --- -1.7.10.4 - diff --git a/package/gstreamer/gst-plugins-good/Config.in b/package/gstreamer/gst-plugins-good/Config.in deleted file mode 100644 index 3b2a99f5b4..0000000000 --- a/package/gstreamer/gst-plugins-good/Config.in +++ /dev/null @@ -1,234 +0,0 @@ -menuconfig BR2_PACKAGE_GST_PLUGINS_GOOD - bool "gst-plugins-good" - select BR2_PACKAGE_GST_PLUGINS_BASE - help - A set of well-supported plug-ins for GStreamer under the - preferred license. - - http://gstreamer.freedesktop.org/ - -if BR2_PACKAGE_GST_PLUGINS_GOOD - -config BR2_PACKAGE_GST_PLUGINS_GOOD_JPEG - bool "jpeg (JPEG support)" - select BR2_PACKAGE_JPEG - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PNG - bool "png (PNG support)" - select BR2_PACKAGE_LIBPNG - -config BR2_PACKAGE_GST_PLUGINS_GOOD_BZ2 - bool "bz2 support" - depends on BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MATROSKA - select BR2_PACKAGE_BZIP2 - help - Enable bz2 support for the following plugins: - matroska - -config BR2_PACKAGE_GST_PLUGINS_GOOD_ZLIB - bool "zlib support" - depends on BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ISOMP4 || BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ID3DEMUX || BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MATROSKA - select BR2_PACKAGE_ZLIB - help - Enable zlib support for the following plugins: - id3demux, isomp4, matroska - -comment "dependency-less plugins" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ALPHA - bool "alpha" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_APETAG - bool "apetag" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AUDIOFX - bool "audiofx" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AUDIOPARSERS - bool "audioparsers" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AUPARSE - bool "auparse" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AUTODETECT - bool "autodetect" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AVI - bool "avi (*.avi video)" - default y - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_CUTTER - bool "cutter" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_DEBUGUTILS - bool "debugutils" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_DEINTERLACE - bool "deinterlace" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_EFFECTV - bool "effectv" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_EQUALIZER - bool "equalizer" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLV - bool "flv" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLX - bool "flx" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GOOM - bool "goom" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GOOM2K1 - bool "goom2k1" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ID3DEMUX - bool "id3demux (*.mp3 audio)" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ICYDEMUX - bool "icydemux" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_IMAGEFREEZE - bool "imagefreeze" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_INTERLEAVE - bool "interleave" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ISOMP4 - bool "isomp4" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_LAW - bool "law" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_LEVEL - bool "level" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MATROSKA - bool "matroska" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MONOSCOPE - bool "monoscope" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MULTIFILE - bool "multifile" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MULTIPART - bool "multipart" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_REPLAYGAIN - bool "replaygain" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_RTP - bool "rtp" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_RTPMANAGER - bool "rtpmanager" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_RTSP - bool "rtsp" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SHAPEWIPE - bool "shapewipe" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SMPTE - bool "smpte" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SPECTRUM - bool "spectrum" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_UDP - bool "udp" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOBOX - bool "videobox" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOCROP - bool "videocrop" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOFILTER - bool "videofilter" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOMIXER - bool "videomixer" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_WAVENC - bool "wavenc" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_WAVPARSE - bool "wavparse (*.wav audio)" - default y - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_Y4M - bool "y4m" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_V4L2 - bool "v4l2" - -comment "plugins with external dependencies" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ANNODEX - bool "annodex (XML Library)" - select BR2_PACKAGE_LIBXML2 - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_CAIRO - bool "cairo" - select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_PNG - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLAC - bool "flac (libFLAC)" - depends on BR2_USE_WCHAR # flac - select BR2_PACKAGE_FLAC - -comment "flac needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GDKPIXBUF - bool "gdkpixbuf" - depends on BR2_USE_WCHAR # gdk-pixbuf -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # gdk-pixbuf -> libglib2 - select BR2_PACKAGE_GDK_PIXBUF - -comment "gdkpixbuf needs a toolchain w/ wchar, threads" - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_OSS - bool "ossaudio (OSS audio)" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_OSS4 - bool "oss4 (Open Sound System 4)" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_PULSE - bool "pulseaudio" - depends on BR2_TOOLCHAIN_HAS_THREADS # pulseaudio - depends on BR2_USE_MMU # pulseaudio - depends on !BR2_STATIC_LIBS # pulseaudio - depends on BR2_USE_WCHAR # pulseaudio - depends on BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC # pulseaudio - select BR2_PACKAGE_PULSEAUDIO - -comment "pulseaudio support needs a toolchain w/ threads, wchar, dynamic library" - depends on BR2_USE_MMU - depends on BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || !BR2_USE_WCHAR - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC - bool "souphttpsrc (http client)" - depends on BR2_USE_WCHAR # libsoup -> glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libsoup -> glib2 - select BR2_PACKAGE_LIBSOUP - -comment "souphttpsrc needs a toolchain w/ wchar, threads" - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SPEEX - bool "speex" - select BR2_PACKAGE_SPEEX - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_WAVPACK - bool "wavpack (*.wv audio)" - select BR2_PACKAGE_WAVPACK - -endif diff --git a/package/gstreamer/gst-plugins-good/gst-plugins-good.hash b/package/gstreamer/gst-plugins-good/gst-plugins-good.hash deleted file mode 100644 index 1b8b474207..0000000000 --- a/package/gstreamer/gst-plugins-good/gst-plugins-good.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.tar.xz.md5 -md5 555845ceab722e517040bab57f9ace95 gst-plugins-good-0.10.31.tar.xz -# Locally computed -sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer/gst-plugins-good/gst-plugins-good.mk b/package/gstreamer/gst-plugins-good/gst-plugins-good.mk deleted file mode 100644 index 791b41351b..0000000000 --- a/package/gstreamer/gst-plugins-good/gst-plugins-good.mk +++ /dev/null @@ -1,394 +0,0 @@ -################################################################################ -# -# gst-plugins-good -# -################################################################################ - -GST_PLUGINS_GOOD_VERSION = 0.10.31 -GST_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST_PLUGINS_GOOD_VERSION).tar.xz -GST_PLUGINS_GOOD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-good -GST_PLUGINS_GOOD_LICENSE = LGPL-2.1+ -GST_PLUGINS_GOOD_LICENSE_FILES = COPYING - -GST_PLUGINS_GOOD_CONF_OPTS = \ - --disable-examples \ - --disable-directsound \ - --disable-sunaudio \ - --disable-osx_audio \ - --disable-osx_video \ - --disable-aalib \ - --disable-aalibtest \ - --disable-esd \ - --disable-esdtest \ - --disable-shout2 - -GST_PLUGINS_GOOD_DEPENDENCIES = gstreamer gst-plugins-base - -ifeq ($(BR2_PACKAGE_XORG7),y) -GST_PLUGINS_GOOD_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXv -GST_PLUGINS_GOOD_CONF_OPTS += \ - --enable-x \ - --enable-xshm \ - --enable-xvideo -else -GST_PLUGINS_GOOD_CONF_OPTS += \ - --disable-x \ - --disable-xshm \ - --disable-xvideo -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_JPEG),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-jpeg -GST_PLUGINS_GOOD_DEPENDENCIES += jpeg -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-jpeg -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PNG),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-libpng -GST_PLUGINS_GOOD_DEPENDENCIES += libpng -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-libpng -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_BZ2),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-bz2 -GST_PLUGINS_GOOD_DEPENDENCIES += bzip2 -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-bz2 -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_ZLIB),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-zlib -GST_PLUGINS_GOOD_DEPENDENCIES += zlib -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-zlib -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ALPHA),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-alpha -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-alpha -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_APETAG),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-apetag -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-apetag -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AUDIOFX),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-audiofx -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-audiofx -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AUDIOPARSERS),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-audioparsers -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-audioparsers -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AUPARSE),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-auparse -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-auparse -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AUTODETECT),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-autodetect -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-autodetect -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AVI),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-avi -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-avi -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_CUTTER),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-cutter -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-cutter -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_DEBUGUTILS),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-debugutils -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-debugutils -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_DEINTERLACE),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-deinterlace -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-deinterlace -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_EFFECTV),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-effectv -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-effectv -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_EQUALIZER),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-equalizer -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-equalizer -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLV),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-flv -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-flv -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLX),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-flx -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-flx -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GOOM),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-goom -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-goom -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GOOM2K1),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-goom2k1 -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-goom2k1 -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ID3DEMUX),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-id3demux -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-id3demux -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ICYDEMUX),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-icydemux -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-icydemux -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_IMAGEFREEZE),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-imagefreeze -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-imagefreeze -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_INTERLEAVE),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-interleave -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-interleave -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ISOMP4),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-isomp4 -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-isomp4 -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_LAW),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-law -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-law -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_LEVEL),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-level -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-level -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MATROSKA),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-matroska -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-matroska -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MONOSCOPE),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-monoscope -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-monoscope -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MULTIFILE),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-multifile -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-multifile -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MULTIPART),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-multipart -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-multipart -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_REPLAYGAIN),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-replaygain -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-replaygain -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_RTP),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-rtp -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-rtp -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_RTPMANAGER),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-rtpmanager -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-rtpmanager -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_RTSP),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-rtsp -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-rtsp -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SHAPEWIPE),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-shapewipe -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-shapewipe -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SMPTE),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-smpte -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-smpte -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SPECTRUM),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-spectrum -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-spectrum -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_UDP),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-udp -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-udp -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOBOX),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-videobox -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-videobox -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOCROP),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-videocrop -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-videocrop -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOFILTER),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-videofilter -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-videofilter -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOMIXER),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-videomixer -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-videomixer -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_WAVENC),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-wavenc -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-wavenc -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_WAVPARSE),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-wavparse -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-wavparse -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_Y4M),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-y4m -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-y4m -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_V4L2),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-gst_v4l2 -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-gst_v4l2 -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ANNODEX),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-annodex -GST_PLUGINS_GOOD_DEPENDENCIES += libxml2 -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-annodex -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_CAIRO),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-cairo -GST_PLUGINS_GOOD_DEPENDENCIES += cairo -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-cairo -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLAC),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-flac -GST_PLUGINS_GOOD_DEPENDENCIES += flac -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-flac -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GDKPIXBUF),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-gdk_pixbuf -GST_PLUGINS_GOOD_DEPENDENCIES += gdk-pixbuf -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-gdk_pixbuf -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_OSS),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-oss -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-oss -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_OSS4),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-oss4 -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-oss4 -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_PULSE),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-pulse -GST_PLUGINS_GOOD_DEPENDENCIES += pulseaudio -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-pulse -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-soup -GST_PLUGINS_GOOD_DEPENDENCIES += libsoup -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-soup -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SPEEX),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-speex -GST_PLUGINS_GOOD_DEPENDENCIES += speex -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-speex -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_WAVPACK),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-wavpack -GST_PLUGINS_GOOD_DEPENDENCIES += wavpack -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-wavpack -endif - -$(eval $(autotools-package)) diff --git a/package/gstreamer/gst-plugins-ugly/Config.in b/package/gstreamer/gst-plugins-ugly/Config.in deleted file mode 100644 index 3d133cf3f1..0000000000 --- a/package/gstreamer/gst-plugins-ugly/Config.in +++ /dev/null @@ -1,53 +0,0 @@ -menuconfig BR2_PACKAGE_GST_PLUGINS_UGLY - bool "gst-plugins-ugly" - select BR2_PACKAGE_GST_PLUGINS_BASE - help - A set of well-supported plug-ins for GStreamer, but might pose - problems for distributors. - - http://gstreamer.freedesktop.org/ - -if BR2_PACKAGE_GST_PLUGINS_UGLY - -comment "dependency-less plugins" - -config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_ASFDEMUX - bool "asfdemux" - -config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_DVDLPCMDEC - bool "dvdlpcmdec" - -config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_DVDSUB - bool "dvdsub" - -config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_IEC958 - bool "iec958" - -config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MPEGAUDIOPARSE - bool "mpegaudioparse" - -config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MPEGSTREAM - bool "mpegstream" - -config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_REALMEDIA - bool "realmedia" - -config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_SYNAESTHESIA - bool "synaesthesia" - -comment "plugins with external dependencies (there may be more available)" - -config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_LAME - bool "lame (*.mp3 audio encoder)" - select BR2_PACKAGE_LAME - -config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MAD - bool "mad (*.mp3 audio)" - select BR2_PACKAGE_LIBID3TAG - select BR2_PACKAGE_LIBMAD - -config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MPEG2DEC - bool "mpeg2dec" - select BR2_PACKAGE_LIBMPEG2 - -endif diff --git a/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.hash b/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.hash deleted file mode 100644 index 8e103676e4..0000000000 --- a/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.hash +++ /dev/null @@ -1,6 +0,0 @@ -# From http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.19.tar.xz.md5 -md5 ba26045c8c8c91f0d48d327ccf53ac0c gst-plugins-ugly-0.10.19.tar.xz -# Locally computed -sha256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 gst-plugins-ugly-0.10.19.tar.xz -sha256 2a8aa4cd019fab333f1f8377bf7afa426d3038a033361d90fab70c335e9a53e7 cdio-cd-text-api.patch -sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk b/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk deleted file mode 100644 index 1a1e2a11ba..0000000000 --- a/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk +++ /dev/null @@ -1,90 +0,0 @@ -################################################################################ -# -# gst-plugins-ugly -# -################################################################################ - -GST_PLUGINS_UGLY_VERSION = 0.10.19 -GST_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST_PLUGINS_UGLY_VERSION).tar.xz -GST_PLUGINS_UGLY_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-ugly -GST_PLUGINS_UGLY_PATCH = http://git.alpinelinux.org/cgit/aports/plain/main/gst-plugins-ugly0.10/cdio-cd-text-api.patch -# COPYING is in fact LGPL-2.1, but all of the code is LGPL-2.0+ -# (except for one test, xingmux) -GST_PLUGINS_UGLY_LICENSE = LGPL-2.0+, GPL-2.0+ (synaesthesia) -GST_PLUGINS_UGLY_LICENSE_FILES = COPYING - -GST_PLUGINS_UGLY_CONF_OPTS = \ - --disable-examples - -GST_PLUGINS_UGLY_DEPENDENCIES = gstreamer gst-plugins-base - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_ASFDEMUX),y) -GST_PLUGINS_UGLY_CONF_OPTS += --enable-asfdemux -else -GST_PLUGINS_UGLY_CONF_OPTS += --disable-asfdemux -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_DVDLPCMDEC),y) -GST_PLUGINS_UGLY_CONF_OPTS += --enable-dvdlpcmdec -else -GST_PLUGINS_UGLY_CONF_OPTS += --disable-dvdlpcmdec -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_DVDSUB),y) -GST_PLUGINS_UGLY_CONF_OPTS += --enable-dvdsub -else -GST_PLUGINS_UGLY_CONF_OPTS += --disable-dvdsub -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_IEC958),y) -GST_PLUGINS_UGLY_CONF_OPTS += --enable-iec958 -else -GST_PLUGINS_UGLY_CONF_OPTS += --disable-iec958 -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MPEGAUDIOPARSE),y) -GST_PLUGINS_UGLY_CONF_OPTS += --enable-mpegaudioparse -else -GST_PLUGINS_UGLY_CONF_OPTS += --disable-mpegaudioparse -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MPEGSTREAM),y) -GST_PLUGINS_UGLY_CONF_OPTS += --enable-mpegstream -else -GST_PLUGINS_UGLY_CONF_OPTS += --disable-mpegstream -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_REALMEDIA),y) -GST_PLUGINS_UGLY_CONF_OPTS += --enable-realmedia -else -GST_PLUGINS_UGLY_CONF_OPTS += --disable-realmedia -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_SYNAESTHESIA),y) -GST_PLUGINS_UGLY_CONF_OPTS += --enable-synaesthesia -else -GST_PLUGINS_UGLY_CONF_OPTS += --disable-synaesthesia -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_LAME),y) -GST_PLUGINS_UGLY_CONF_OPTS += --enable-lame -GST_PLUGINS_UGLY_DEPENDENCIES += lame -else -GST_PLUGINS_UGLY_CONF_OPTS += --disable-lame -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MAD),y) -GST_PLUGINS_UGLY_CONF_OPTS += --enable-mad -GST_PLUGINS_UGLY_DEPENDENCIES += libid3tag libmad -else -GST_PLUGINS_UGLY_CONF_OPTS += --disable-mad -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MPEG2DEC),y) -GST_PLUGINS_UGLY_CONF_OPTS += --enable-mpeg2dec -GST_PLUGINS_UGLY_DEPENDENCIES += libmpeg2 -else -GST_PLUGINS_UGLY_CONF_OPTS += --disable-mpeg2dec -endif - -$(eval $(autotools-package)) diff --git a/package/gstreamer/gstreamer.mk b/package/gstreamer/gstreamer.mk deleted file mode 100644 index 22240bceea..0000000000 --- a/package/gstreamer/gstreamer.mk +++ /dev/null @@ -1 +0,0 @@ -include $(sort $(wildcard package/gstreamer/*/*.mk)) diff --git a/package/gstreamer/gstreamer/0001-bison3.patch b/package/gstreamer/gstreamer/0001-bison3.patch deleted file mode 100644 index f9ec52d95a..0000000000 --- a/package/gstreamer/gstreamer/0001-bison3.patch +++ /dev/null @@ -1,24 +0,0 @@ -Fix deprecation from bison 3.0+ -From http://comments.gmane.org/gmane.linux.lfs.beyond.devel/24620 - -Signed-off-by: Gustavo Zacarias - -diff -Nura gstreamer-0.10.36.orig/gst/parse/grammar.y gstreamer-0.10.36/gst/parse/grammar.y ---- gstreamer-0.10.36.orig/gst/parse/grammar.y 2013-10-04 09:52:21.685282055 -0300 -+++ gstreamer-0.10.36/gst/parse/grammar.y 2013-10-04 10:21:54.800211238 -0300 -@@ -26,7 +26,6 @@ - */ - - #define YYERROR_VERBOSE 1 --#define YYLEX_PARAM scanner - - #define YYENABLE_NLS 0 - -@@ -648,6 +647,7 @@ - %right '.' - %left '!' '=' - -+%lex-param { void *scanner } - %parse-param { void *scanner } - %parse-param { graph_t *graph } - %pure-parser diff --git a/package/gstreamer/gstreamer/Config.in b/package/gstreamer/gstreamer/Config.in deleted file mode 100644 index b1334abfcc..0000000000 --- a/package/gstreamer/gstreamer/Config.in +++ /dev/null @@ -1,38 +0,0 @@ -comment "gstreamer 0.10 needs a toolchain w/ wchar, threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS - -config BR2_PACKAGE_GSTREAMER - bool "gstreamer 0.10" - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_LIBGLIB2 - help - GStreamer is an open source multimedia framework. - - This 0.10.x version of GStreamer is incompatible with - GStreamer 1.X. - - http://gstreamer.freedesktop.org/ - -if BR2_PACKAGE_GSTREAMER - -config BR2_PACKAGE_GSTREAMER_GST_DEBUG - bool "enable gst-debug trace support" - default y - help - Enable support for the gst-debug tracing functionality in - gstreamer. This has limited CPU overhead, but does increase - the rootfs size somewhat. - -config BR2_PACKAGE_GSTREAMER_PLUGIN_REGISTRY - bool "enable plugin registry" - default y - help - Enable support for the GStreamer plugin registry. This may - increase the launch-time for a GStreamer application. - -endif diff --git a/package/gstreamer/gstreamer/gstreamer.hash b/package/gstreamer/gstreamer/gstreamer.hash deleted file mode 100644 index 9b3c42b44a..0000000000 --- a/package/gstreamer/gstreamer/gstreamer.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.36.tar.xz.md5 -md5 15389c73e091b1dda915279c388b9cb2 gstreamer-0.10.36.tar.xz -# locally computed -sha256 9151aa108c177054387885763fa0e433e76780f7c5655c70a5390f2a6c6871da gstreamer-0.10.36.tar.xz -sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 COPYING diff --git a/package/gstreamer/gstreamer/gstreamer.mk b/package/gstreamer/gstreamer/gstreamer.mk deleted file mode 100644 index 2ec360c94d..0000000000 --- a/package/gstreamer/gstreamer/gstreamer.mk +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# -# gstreamer -# -################################################################################ - -GSTREAMER_VERSION = 0.10.36 -GSTREAMER_SOURCE = gstreamer-$(GSTREAMER_VERSION).tar.xz -GSTREAMER_SITE = http://gstreamer.freedesktop.org/src/gstreamer -GSTREAMER_INSTALL_STAGING = YES -# COPYING is in fact v2, but most of the code is v2.1+ -GSTREAMER_LICENSE = LGPL-2.1+ -GSTREAMER_LICENSE_FILES = COPYING - -# Checking if unaligned memory access works correctly cannot be done when cross -# compiling. For the following architectures there is no information available -# in the configure script. -ifeq ($(BR2_arc)$(BR2_xtensa)$(BR2_microblaze)$(BR2_nios2)$(BR2_or1k)$(BR2_riscv),y) -GSTREAMER_CONF_ENV = as_cv_unaligned_access=no -endif -ifeq ($(BR2_aarch64)$(BR2_aarch64_be),y) -GSTREAMER_CONF_ENV = as_cv_unaligned_access=yes -endif - -GSTREAMER_CONF_OPTS = \ - --disable-examples \ - --disable-tests \ - --disable-failing-tests \ - --disable-loadsave \ - $(if $(BR2_PACKAGE_GSTREAMER_GST_DEBUG),,--disable-gst-debug) \ - $(if $(BR2_PACKAGE_GSTREAMER_PLUGIN_REGISTRY),,--disable-registry) - -GSTREAMER_DEPENDENCIES = libglib2 host-pkgconf host-bison host-flex \ - $(if $(BR2_PACKAGE_LIBXML2),libxml2) - -$(eval $(autotools-package))