From patchwork Fri Jan 2 21:51:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kenton, Stephen M." X-Patchwork-Id: 425052 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 5D16714007D for ; Sat, 3 Jan 2015 08:51:38 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 2EAF18AD68; Fri, 2 Jan 2015 21:51:37 +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 Z3ok8KzJ6q1V; Fri, 2 Jan 2015 21:51:35 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 2E76288A38; Fri, 2 Jan 2015 21:51:35 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 4ACE31C24B7 for ; Fri, 2 Jan 2015 21:51:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4638C89C62 for ; Fri, 2 Jan 2015 21:51:33 +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 0Ae9NM7inA19 for ; Fri, 2 Jan 2015 21:51:32 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from eastrmfepo102.cox.net (eastrmfepo102.cox.net [68.230.241.214]) by whitealder.osuosl.org (Postfix) with ESMTP id 5B84E89C36 for ; Fri, 2 Jan 2015 21:51:32 +0000 (UTC) Received: from eastrmimpo109 ([68.230.241.222]) by eastrmfepo102.cox.net (InterMail vM.8.01.05.15 201-2260-151-145-20131218) with ESMTP id <20150102215131.MQPH13649.eastrmfepo102.cox.net@eastrmimpo109> for ; Fri, 2 Jan 2015 16:51:31 -0500 Received: from [192.168.1.2] ([68.97.2.10]) by eastrmimpo109 with cox id b9rW1p00L0CxSiC019rXy3; Fri, 02 Jan 2015 16:51:31 -0500 X-CT-Class: Clean X-CT-Score: 0.00 X-CT-RefID: str=0001.0A020205.54A712E9.00B3,ss=1,re=0.001,fgs=0 X-CT-Spam: 0 X-Authority-Analysis: v=2.0 cv=Y70mRGiN c=1 sm=1 a=nr99965rMXYxaIVTx7+86Q==:17 a=rU1Mj_XmeIgA:10 a=IkcTkHD0fZMA:10 a=0OZ3Co0HViNnF882KYUA:9 a=QEXdDO2ut3YA:10 a=nr99965rMXYxaIVTx7+86Q==:117 X-CM-Score: 0.00 Authentication-Results: cox.net; none Message-ID: <54A712E2.8080506@ou.edu> Date: Fri, 02 Jan 2015 15:51:30 -0600 From: Steve Kenton User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 MIME-Version: 1.0 To: buildroot@busybox.net References: <5494F00B.4080107@ou.edu> In-Reply-To: <5494F00B.4080107@ou.edu> Subject: [Buildroot] [PATCH][Resend] ffmpeg: enable freetype support 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" If libfreetype has been select configure ffmpeg to use it if possible Since this requires fenv.h it won't happen when using uClibc except for x86 targets Signed-off-by Stephen M. Kenton --- Noticed the stray line at the bottom of the last version Updated against last nights snapshot diff -pruN buildroot.orig/package/ffmpeg/ffmpeg.mk buildroot/package/ffmpeg/ffmpeg.mk --- buildroot.orig/package/ffmpeg/ffmpeg.mk 2015-01-01 17:02:23.000000000 -0600 +++ buildroot/package/ffmpeg/ffmpeg.mk 2015-01-02 15:25:30.649237010 -0600 @@ -49,7 +49,6 @@ FFMPEG_CONF_OPTS = \ --disable-libopencv \ --disable-libdc1394 \ --disable-libfaac \ - --disable-libfreetype \ --disable-libgsm \ --disable-libmp3lame \ --disable-libnut \ @@ -234,6 +233,22 @@ else FFMPEG_CONF_OPTS += --disable-libvpx endif +# ffmpeg freetype support require fenv.h +# which is not available in uClibc +ifneq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) +ffmpeg_environment_has_fenv ?= y +endif +# except for uClibc on x86 +ifeq ($(BR2_i386)$(BR2_x86_64),y) +ffmpeg_environment_has_fenv ?= y +endif +ifeq ($(BR2_PACKAGE_FREETYPE)$(ffmpeg_environment_has_fenv),yy) +FFMPEG_CONF_OPTS += --enable-libfreetype +FFMPEG_DEPENDENCIES += freetype +else +FFMPEG_CONF_OPTS += --disable-libfreetype +endif + ifeq ($(BR2_PACKAGE_X264)$(BR2_PACKAGE_FFMPEG_GPL),yy) FFMPEG_CONF_OPTS += --enable-libx264 FFMPEG_DEPENDENCIES += x264