From patchwork Thu May 7 14:58:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Beno=C3=AEt_Th=C3=A9baudeau?= X-Patchwork-Id: 469710 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 9A9FD140213 for ; Fri, 8 May 2015 01:07:25 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id DFB8A31D7F; Thu, 7 May 2015 15:07: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 HRB7iYyRdIN2; Thu, 7 May 2015 15:07:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 0A69F314B3; Thu, 7 May 2015 15:07:08 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 5BCE11C20CE for ; Thu, 7 May 2015 15:07:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 58FCA8BD03 for ; Thu, 7 May 2015 15:07:06 +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 DZ7YO0UuVPdX for ; Thu, 7 May 2015 15:07:02 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from authsmtp.register.it (authsmtp93.register.it [195.110.122.178]) by fraxinus.osuosl.org (Postfix) with ESMTP id D2915A16EA for ; Thu, 7 May 2015 15:07:01 +0000 (UTC) Received: from localhost.localdomain ([2.0.59.144]) by paganini34 with id R2yZ1q00Y36iiiA012ydVd; Thu, 07 May 2015 16:58:37 +0200 X-Rid: benoit@wsystem.com@2.0.59.144 From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?= To: buildroot@buildroot.org Date: Thu, 7 May 2015 16:58:19 +0200 Message-Id: <1431010700-3356-1-git-send-email-benoit@wsystem.com> X-Mailer: git-send-email 2.1.0 MIME-Version: 1.0 Cc: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?= Subject: [Buildroot] [PATCH 1/2] gst1-plugins-bad: remove obsolete make rules X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Commit 83e29f2656a237e2c300d523776868837d3bc646 "gst1-plugins-bad: bump version" (from 1.2.4 to 1.4.1) removed the configuration options for the cdaudio and eglglessink plugins as a consequence of their removal in 1.3.1. However, that commit did not remove the corresponding make rules, so remove them now. Signed-off-by: Benoît Thébaudeau --- .../gst1-plugins-bad/gst1-plugins-bad.mk | 24 ---------------------- 1 file changed, 24 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index 6280fd9..0e00ffd 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -544,13 +544,6 @@ else GST1_PLUGINS_BAD_CONF_OPTS += --disable-bz2 endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CDAUDIO),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-cdaudio -GST1_PLUGINS_BAD_DEPENDENCIES += libcdaudio -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-cdaudio -endif - ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CURL),y) GST1_PLUGINS_BAD_CONF_OPTS += --enable-curl GST1_PLUGINS_BAD_DEPENDENCIES += libcurl @@ -663,23 +656,6 @@ else GST1_PLUGINS_BAD_CONF_OPTS += --disable-rsvg endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_EGLGLES),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-eglgles -GST1_PLUGINS_BAD_DEPENDENCIES += libegl libgles - -ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) -# RPI has odd locations for several required headers. -GST1_PLUGINS_BAD_CONF_OPTS += --with-egl-window-system=rpi -GST1_PLUGINS_BAD_CONF_ENV += \ - CFLAGS="$(TARGET_CFLAGS) \ - -I$(STAGING_DIR)/usr/include/IL \ - -I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \ - -I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux" -endif -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-eglgles -endif - ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDL),y) GST1_PLUGINS_BAD_CONF_ENV += ac_cv_path_SDL_CONFIG=$(STAGING_DIR)/usr/bin/sdl-config GST1_PLUGINS_BAD_CONF_OPTS += --enable-sdl