From patchwork Sun Oct 19 20:07:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 400857 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id BE7511400A8 for ; Mon, 20 Oct 2014 07:08:47 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id CDE2B95323; Sun, 19 Oct 2014 20:08:45 +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 HwEEra3mcgaK; Sun, 19 Oct 2014 20:08:44 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 6C0BD95357; Sun, 19 Oct 2014 20:08:44 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 9F8F31C1E6B for ; Sun, 19 Oct 2014 20:08:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 9D0CF952C3 for ; Sun, 19 Oct 2014 20:08:36 +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 nUzTIgC-ALeU for ; Sun, 19 Oct 2014 20:08:35 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (top.free-electrons.com [176.31.233.9]) by hemlock.osuosl.org (Postfix) with ESMTP id B1DA194F46 for ; Sun, 19 Oct 2014 20:08:35 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id A478F2EEF; Sun, 19 Oct 2014 22:08:38 +0200 (CEST) Received: from localhost (AToulouse-657-1-1059-39.w83-193.abo.wanadoo.fr [83.193.173.39]) by mail.free-electrons.com (Postfix) with ESMTPSA id 0E767751; Sun, 19 Oct 2014 22:08:21 +0200 (CEST) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Sun, 19 Oct 2014 22:07:39 +0200 Message-Id: <1413749285-1108-6-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 2.0.0 In-Reply-To: <1413749285-1108-1-git-send-email-thomas.petazzoni@free-electrons.com> References: <1413749285-1108-1-git-send-email-thomas.petazzoni@free-electrons.com> Cc: Thomas Petazzoni Subject: [Buildroot] [PATCH 05/31] gst-ffmpeg: use the new BR2_ARM_CPU_ARM* options 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: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Instead of using the Config.in options for each individual ARM core, use the newly introduced BR2_ARM_CPU_ARM* options, which exist per ARM architecture. Signed-off-by: Thomas Petazzoni --- package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk index b94fb0f..df10c33 100644 --- a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk +++ b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk @@ -51,10 +51,10 @@ 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_arm920t)$(BR2_arm922t)$(BR2_strongarm)$(BR2_fa526),y) +ifeq ($(BR2_ARM_CPU_ARMV4)$(BR2_ARM_CPU_ARMV4T),y) GST_FFMPEG_CONF_EXTRA_OPTS += --disable-armv5te endif -ifeq ($(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf_s),y) +ifeq ($(BR2_ARM_CPU_ARMV6J)$(BR2_ARM_CPU_ARMV6ZK),y) GST_FFMPEG_CONF_EXTRA_OPTS += --enable-armv6 else GST_FFMPEG_CONF_EXTRA_OPTS += --disable-armv6 --disable-armv6t2