From patchwork Sat Dec 6 01:58:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kenton, Stephen M." X-Patchwork-Id: 418336 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id E0C65140129 for ; Sat, 6 Dec 2014 12:58:31 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id E18D692A77; Sat, 6 Dec 2014 01:58:30 +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 Yt-SI-iNGXjl; Sat, 6 Dec 2014 01:58:28 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 9DCD992A4E; Sat, 6 Dec 2014 01:58:28 +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 825E01BFA18 for ; Sat, 6 Dec 2014 01:58:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 79F8F92A4E for ; Sat, 6 Dec 2014 01:58:27 +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 gnkR-LgOiBrx for ; Sat, 6 Dec 2014 01:58:26 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from eastrmfepo202.cox.net (eastrmfepo202.cox.net [68.230.241.217]) by whitealder.osuosl.org (Postfix) with ESMTP id 60F9192588 for ; Sat, 6 Dec 2014 01:58:26 +0000 (UTC) Received: from eastrmimpo305 ([68.230.241.237]) by eastrmfepo202.cox.net (InterMail vM.8.01.05.15 201-2260-151-145-20131218) with ESMTP id <20141206015825.SUEJ26047.eastrmfepo202.cox.net@eastrmimpo305> for ; Fri, 5 Dec 2014 20:58:25 -0500 Received: from [192.168.1.2] ([68.97.2.10]) by eastrmimpo305 with cox id Q1yR1p0050CxSiC011yRxZ; Fri, 05 Dec 2014 20:58:25 -0500 X-CT-Class: Clean X-CT-Score: 0.00 X-CT-RefID: str=0001.0A020206.548262C1.0107,ss=1,re=0.001,fgs=0 X-CT-Spam: 0 X-Authority-Analysis: v=2.0 cv=L9jDtZv8 c=1 sm=1 a=nr99965rMXYxaIVTx7+86Q==:17 a=rU1Mj_XmeIgA:10 a=IkcTkHD0fZMA:10 a=kRNVA7xQE2txcMMgDtoA:9 a=QEXdDO2ut3YA:10 a=nr99965rMXYxaIVTx7+86Q==:117 X-CM-Score: 0.00 Authentication-Results: cox.net; none Message-ID: <548262C1.7080000@ou.edu> Date: Fri, 05 Dec 2014 19:58:25 -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 Subject: [Buildroot] [PATCH] ffmpeg: V1.0 configure ffmpeg with --enable-libfreetype if libfreetype package is enabled 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" [Buildroot][PATCH] ffmpeg: V1.0 configure ffmpeg with --enable-libfreetype if libfreetype package is enabled I needed ffmpeg on the target configured using --enable-libfreetype and using "Additional parameters for ./configure" missed the dependency. Modeled on the blocks above and below it in ffmpeg.mk - let me know if the order is important and I need to move it somewhere else. Signed-off-by Stephen M. Kenton diff -ru buildroot-2014.11.clean/package/ffmpeg/ffmpeg.mk buildroot-2014.11/package/ffmpeg/ffmpeg.mk --- buildroot-2014.11.clean/package/ffmpeg/ffmpeg.mk +++ buildroot-2014.11/package/ffmpeg/ffmpeg.mk @@ -50,7 +50,6 @@ --disable-libopencv \ --disable-libdc1394 \ --disable-libfaac \ - --disable-libfreetype \ --disable-libgsm \ --disable-libmp3lame \ --disable-libnut \ @@ -229,6 +228,13 @@ FFMPEG_CONF_OPTS += --disable-libvpx endif +ifeq ($(BR2_PACKAGE_FREETYPE),y) +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