Date: Sun, 27 Mar 2011 18:36:43 +0300 From: "Y. A." <nexther0@gmail.com> To: George Liaskos <geo.liaskos@gmail.com> Cc: freebsd-chromium@freebsd.org Subject: Re: fixes for Makefile pkg-plist and build-in ffmpeg Message-ID: <AANLkTikoBu5GEKSRNQPjVofrZ5WOj=nR%2BcTkA26mrLNF@mail.gmail.com> In-Reply-To: <BANLkTimn8joDX%2Bv3Zz%2BJ04p0SPQCKPeLOw@mail.gmail.com> References: <AANLkTik5FbEcH8nB2SUtHNZYiLnaSVF1x1HmjcW0baO2@mail.gmail.com> <AANLkTimrOiK=e01-doqC8jJuOaXyZ6dni8Ngk8b1AmYK@mail.gmail.com> <BANLkTimn8joDX%2Bv3Zz%2BJ04p0SPQCKPeLOw@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <stdlib.h>
- #include <string.h>
- #if HAVE_MALLOC_H
--#include <malloc.h>
-+#include <stdlib.h>
- #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 <geo.liaskos@gmail.com>
> On Sun, Mar 27, 2011 at 11:28 AM, Evan Martin <evan@chromium.org> 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.
>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?AANLkTikoBu5GEKSRNQPjVofrZ5WOj=nR%2BcTkA26mrLNF>