From owner-freebsd-chromium@FreeBSD.ORG Sun Mar 27 15:36:44 2011 Return-Path: Delivered-To: freebsd-chromium@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4BD5E106564A for ; Sun, 27 Mar 2011 15:36:44 +0000 (UTC) (envelope-from nexther0@gmail.com) Received: from mail-iy0-f182.google.com (mail-iy0-f182.google.com [209.85.210.182]) by mx1.freebsd.org (Postfix) with ESMTP id 0E04E8FC18 for ; Sun, 27 Mar 2011 15:36:43 +0000 (UTC) Received: by iyj12 with SMTP id 12so3474715iyj.13 for ; Sun, 27 Mar 2011 08:36:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=z1AOPS+FH1biDIgt39rSCWN3rf2rmvTK1BgBtEvI9bA=; b=hWGvH+hAtHImSNQMtoXJC9kz87i/ZFatKI71VCefPVqD+PitWDhz0vKsoUTOYWBTB8 N/6W+KxlRbIWH+nJB78V1jq+MtmbolCzll3An0dnQJXujCjCyYTw8ZEa4WUXv5yGOAJ+ h1TwsSl0+pMcaJg+nhRzzVU3BHrOyY1jlDo+s= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=woWYFy8FrUEDnV7KJaLLxq6/bAfK2hgKnpaiKEvnd9vMXNjbo+AMADrWBWLBrKXGHe rygvX6CaPHNFRmpojMY96bsdP7fZoYjI7MPbeB7sAsvsV08VdH+0tg/IXurepWQfAloa ne/EpslLaIZS2b3vtDt195jsLFgJ+BGoN6Few= MIME-Version: 1.0 Received: by 10.43.47.201 with SMTP id ut9mr4953343icb.186.1301240203209; Sun, 27 Mar 2011 08:36:43 -0700 (PDT) Received: by 10.43.44.69 with HTTP; Sun, 27 Mar 2011 08:36:43 -0700 (PDT) In-Reply-To: References: Date: Sun, 27 Mar 2011 18:36:43 +0300 Message-ID: From: "Y. A." To: George Liaskos Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: freebsd-chromium@freebsd.org Subject: Re: fixes for Makefile pkg-plist and build-in ffmpeg X-BeenThere: freebsd-chromium@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: FreeBSD-specific Chromium issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Mar 2011 15:36:44 -0000 hi! ok. i look thru source and found more right way to have build with buit-in ffmpeg. your'e right we don't need 'patch-third_party__ffmpeg__patched-ffmpeg-mt__libavutil_mem.c.txt' attached svn diff against r125. that patch try to fix ffmpeg.gyp for including freebsd specific config.h === begin === Index: files/patch-third_party__ffmpeg__patched-ffmpeg-mt__libavutil_mem.c.txt =================================================================== --- files/patch-third_party__ffmpeg__patched-ffmpeg-mt__libavutil_mem.c.txt (revision 125) +++ files/patch-third_party__ffmpeg__patched-ffmpeg-mt__libavutil_mem.c.txt (working copy) @@ -1,11 +0,0 @@ ---- third_party/ffmpeg/patched-ffmpeg-mt/libavutil/mem.c.orig 2011-03-25 14:43:09.000000000 +0200 -+++ third_party/ffmpeg/patched-ffmpeg-mt/libavutil/mem.c 2011-03-25 14:43:21.000000000 +0200 -@@ -30,7 +30,7 @@ - #include - #include - #if HAVE_MALLOC_H --#include -+#include - #endif - - #include "avutil.h" Index: files/patch-third_party__ffmpeg__ffmpeg.gyp =================================================================== --- files/patch-third_party__ffmpeg__ffmpeg.gyp (revision 125) +++ files/patch-third_party__ffmpeg__ffmpeg.gyp (working copy) @@ -1,12 +1,19 @@ ---- ./third_party/ffmpeg/ffmpeg.gyp.orig 2010-12-16 02:13:18.000000000 +0100 -+++ ./third_party/ffmpeg/ffmpeg.gyp 2010-12-20 20:15:08.000000000 +0100 -@@ -81,8 +81,8 @@ - 'ffmpeg_branding%': '<(branding)', +--- third_party/ffmpeg/ffmpeg.gyp.orig 2011-03-23 10:02:47.000000000 +0200 ++++ third_party/ffmpeg/ffmpeg.gyp 2011-03-27 15:07:20.000000000 +0300 +@@ -56,7 +56,7 @@ + ['target_arch=="arm"', { + 'ffmpeg_asm_lib': 0, + }], +- ['OS=="mac" or OS=="win"', { ++ ['OS=="mac" or OS=="win" or OS=="freebsd"', { + 'os_config%': '<(OS)', + }, { # all other Unix OS's use the linux config + 'os_config%': 'linux', +@@ -82,7 +82,7 @@ 'ffmpeg_variant%': '<(target_arch)', -- 'use_system_ffmpeg%': 0, + 'use_system_ffmpeg%': 0, - 'use_system_yasm%': 0, -+ 'use_system_ffmpeg%': 1, + 'use_system_yasm%': 1, 'build_ffmpegsumo%': 1, 'use_system_vpx%': 0, Index: Makefile =================================================================== --- Makefile (revision 125) +++ Makefile (working copy) @@ -63,11 +63,11 @@ #GYP_DEFINES+= use_system_libjpeg=1 #GYP_DEFINES+= use_system_libpng=1 GYP_DEFINES+= use_system_libxml=1 -GYP_DEFINES+= use_system_ffmpeg=0 #GYP_DEFINES+= use_system_sqlite=0 #GYP_DEFINES+= use_system_zlib=1 GYP_DEFINES+= python_ver=${PYTHON_VER} + OPTIONS= CODECS "Compile and enable patented codecs like H.264" off \ GCONF "Use gconf2 for preferences" on \ SSE2 "Use SSE2, disable this for PIII or older" on \ === end === 2011/3/27 George Liaskos > On Sun, Mar 27, 2011 at 11:28 AM, Evan Martin wrote: > > Can you send the ffmpeg patch upstream? > > > > (Does ffmpeg/libavutil as upstream from Chrome build on FreeBSD?) > > There's an #if HAVE_MALLOC_H, malloc.h shouldn't be included. > > Do we really need the following patches? I compiled chrome without > them, they include #define HAVE_MALLOC_H 0 which obviously doesn't > affect anything. > patch-third_party__ffmpeg__config__Chrome__freebsd__ia32__config.h > patch-third_party__ffmpeg__config__Chrome__freebsd__x64__config.h > patch-third_party__ffmpeg__config__Chromium__freebsd__ia32__config.h > patch-third_party__ffmpeg__config__Chromium__freebsd__x64__config.h > > patch-third_party__ffmpeg__ffmpeg.gyp > This should probably go and just add use_system_yasm=1 at GYP_DEFINES. >