From patchwork Sat Jul 13 21:43:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1131659 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="eFb3+URW"; 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 45mNZv33ktz9sDQ for ; Sun, 14 Jul 2019 07:43:35 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 835D5203EB; Sat, 13 Jul 2019 21:43:32 +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 HMSn+0n9lR+M; Sat, 13 Jul 2019 21:43:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id E56DA20420; Sat, 13 Jul 2019 21:43:29 +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 71CF61BF2F0 for ; Sat, 13 Jul 2019 21:43:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6F5A28545B for ; Sat, 13 Jul 2019 21:43:27 +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 4XrvVWs-p8z3 for ; Sat, 13 Jul 2019 21:43:26 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-io1-f67.google.com (mail-io1-f67.google.com [209.85.166.67]) by fraxinus.osuosl.org (Postfix) with ESMTPS id A710B84E5E for ; Sat, 13 Jul 2019 21:43:26 +0000 (UTC) Received: by mail-io1-f67.google.com with SMTP id j5so23667180ioj.8 for ; Sat, 13 Jul 2019 14:43:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EWOVjJj5Msp1mS++uMNT2l+fNgXl5yRukinUJ1X400M=; b=eFb3+URWvFyt6BPFzsGNYg2CAoqODFiZJUBkx+EZNVXvDL46ruOKnzjMEQIcQ7WuPo QrFF7+q5DefDMW6TKnl3HcT7GtdhMzU74zk29WBMzejgO8+bJ+gj1faJFN+wW3qU2Rzf 6X/8oFpSEcM/uByytrSf2URQdVZsco/iYQ6qdtuCWtTx+WP5XYkB7lRmbZKSalZMQce5 xw5Ui+X2Mn9vcrig6sieWAJYAC44sa6ijpfxhmeNBkXODjQcHWDDfnpnYjMXPS774WCr H4kW/Tf0RDLlGpBPqOD/T/mlBkNp+BOkj3i6Fvu4+MfMp/MycOMh5B2hmW37u1LfUJ5S tkfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EWOVjJj5Msp1mS++uMNT2l+fNgXl5yRukinUJ1X400M=; b=f1aCE2FWMWBp8TefHIcke5h1st8wU6X0aJco2Xv8Na9pTW6w685BK11D6O02BXTOyS zvR741AYJippXWmYNttzQ4f6nKo1U8NIU5vFT3iPCuZkP4xke2SDoVsuXoqrkvqdnSe7 ZdAaRbyI3+e4x3vtV63prU4cv+XD8UlXEgrOwiQeuMlaO7uYF66+R5BIipZ3dRtipjYZ qNejCA7xlkOAOIIn9wWU7kaenrcwbnYG6yI1FHeeM4b0freziUOsGH0AmXfTQodS4kTa dC1Yi1vUMNOkY7we8WtESnMpIZnN9Ss3r1kiuux1h5dFuDw4h5J7tQGQv+fIfJ4DviO1 xIdg== X-Gm-Message-State: APjAAAV+F+xIIQdUsRss8i6KjnjtGAX8iadIa7CSl9LBJrGhhMiq9MHL RqTBMuHI25mZHvN6a5Pt5fAt9Qj/Jes= X-Google-Smtp-Source: APXvYqxtH/yWTDjvfKudQa6dUeVybfEi1sHYR/ZdDmtSIL05x6kDuGwYL388OLRgGfQ5AcOlsLxMgg== X-Received: by 2002:a6b:8f0d:: with SMTP id r13mr17283899iod.121.1563054205750; Sat, 13 Jul 2019 14:43:25 -0700 (PDT) Received: from localhost.localdomain (68-188-149-81.dhcp.aldl.mi.charter.com. [68.188.149.81]) by smtp.gmail.com with ESMTPSA id q22sm10260930ioj.56.2019.07.13.14.43.25 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sat, 13 Jul 2019 14:43:25 -0700 (PDT) From: aduskett@gmail.com To: buildroot@buildroot.org Date: Sat, 13 Jul 2019 17:43:20 -0400 Message-Id: <20190713214321.119654-3-aduskett@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190713214321.119654-1-aduskett@gmail.com> References: <20190713214321.119654-1-aduskett@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v4 3/4] package/gstreamer1/gst1-plugins-ugly: convert package type to meson X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adam Duskett Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Adam Duskett Other changes: - Remove --disable-twolame as this plugin is now in gst1-plugins-good. Signed-off-by: Adam Duskett --- Changes v1 -> v3: - revert the flipped order of tests and examples. (Peter) - Add missing gobject-cast-checks, glib-asserts, and glib-checks in gst1-plugins-bad.mk (Peter) - Add a line in the commit message explaining the removal of disable-twolame. Changes v3 -> v4: - Add GST1_PLUGINS_UGLY_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) (Arnout) .../gst1-plugins-ugly/gst1-plugins-ugly.mk | 57 ++++++++++--------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index f3ac2f79d3..b41c837e93 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -11,79 +11,84 @@ GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING # GPL licensed plugins will append to GST1_PLUGINS_UGLY_LICENSE if enabled. GST1_PLUGINS_UGLY_LICENSE = LGPL-2.1+ -GST1_PLUGINS_UGLY_CONF_OPTS = --disable-examples --disable-valgrind +GST1_PLUGINS_UGLY_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) GST1_PLUGINS_UGLY_CONF_OPTS += \ - --disable-a52dec \ - --disable-amrnb \ - --disable-amrwb \ - --disable-cdio \ - --disable-sidplay \ - --disable-twolame + -Dexamples=disabled \ + -Dtests=disabled + +GST1_PLUGINS_UGLY_CONF_OPTS += \ + -Da52dec=disabled \ + -Damrnb=disabled \ + -Damrwbdec=disabled \ + -Dcdio=disabled \ + -Dsidplay=disabled GST1_PLUGINS_UGLY_DEPENDENCIES = gstreamer1 gst1-plugins-base ifeq ($(BR2_PACKAGE_ORC),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-orc +GST1_PLUGINS_UGLY_CONF_OPTS += -Dorc=enabled GST1_PLUGINS_UGLY_DEPENDENCIES += orc +else +GST1_PLUGINS_UGLY_CONF_OPTS += -Dorc=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_ASFDEMUX),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-asfdemux +GST1_PLUGINS_UGLY_CONF_OPTS += -Dasfdemux=enabled else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-asfdemux +GST1_PLUGINS_UGLY_CONF_OPTS += -Dasfdemux=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDLPCMDEC),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-dvdlpcmdec +GST1_PLUGINS_UGLY_CONF_OPTS += -Ddvdlpcmdec=enabled else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-dvdlpcmdec +GST1_PLUGINS_UGLY_CONF_OPTS += -Ddvdlpcmdec=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDSUB),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-dvdsub +GST1_PLUGINS_UGLY_CONF_OPTS += -Ddvdsub=enabled else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-dvdsub +GST1_PLUGINS_UGLY_CONF_OPTS += -Ddvdsub=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_XINGMUX),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-xingmux +GST1_PLUGINS_UGLY_CONF_OPTS += -Dxingmux=enabled else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-xingmux +GST1_PLUGINS_UGLY_CONF_OPTS += -Dxingmux=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_REALMEDIA),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-realmedia +GST1_PLUGINS_UGLY_CONF_OPTS += -Drealmedia=enabled else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-realmedia +GST1_PLUGINS_UGLY_CONF_OPTS += -Drealmedia=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDREAD),y) # configure does not use pkg-config to detect libdvdread ifeq ($(BR2_PACKAGE_LIBDVDCSS)$(BR2_STATIC_LIBS),yy) -GST1_PLUGINS_UGLY_CONF_ENV += LIBS="-ldvdcss" +GST1_PLUGINS_UGLY_LDFLAGS += "-ldvdcss" endif -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-dvdread +GST1_PLUGINS_UGLY_CONF_OPTS += -Ddvdread=enabled GST1_PLUGINS_UGLY_DEPENDENCIES += libdvdread GST1_PLUGINS_UGLY_HAS_GPL_LICENSE = y else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-dvdread +GST1_PLUGINS_UGLY_CONF_OPTS += -Ddvdread=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MPEG2DEC),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-mpeg2dec +GST1_PLUGINS_UGLY_CONF_OPTS += -Dmpeg2dec=enabled GST1_PLUGINS_UGLY_DEPENDENCIES += libmpeg2 GST1_PLUGINS_UGLY_HAS_GPL_LICENSE = y else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-mpeg2dec +GST1_PLUGINS_UGLY_CONF_OPTS += -Dmpeg2dec=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_X264),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-x264 +GST1_PLUGINS_UGLY_CONF_OPTS += -Dx264=enabled GST1_PLUGINS_UGLY_DEPENDENCIES += x264 GST1_PLUGINS_UGLY_HAS_GPL_LICENSE = y else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-x264 +GST1_PLUGINS_UGLY_CONF_OPTS += -Dx264=disabled endif # Add GPL license if GPL plugins enabled. @@ -94,4 +99,4 @@ endif # Use the following command to extract license info for plugins. # # find . -name 'plugin-*.xml' | xargs grep license -$(eval $(autotools-package)) +$(eval $(meson-package))