Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(215)

Side by Side Diff: chromium/scripts/build_ffmpeg.sh

Issue 9370003: Remove pthreads patch, roll in new patches, disable unchecked bit readers. (Closed) Base URL: ssh://gerrit.chromium.org:29418/chromium/third_party/ffmpeg.git@master
Patch Set: gyp fix. Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 #!/bin/bash -e 1 #!/bin/bash -e
2 2
3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
4 # Use of this source code is governed by a BSD-style license that can be 4 # Use of this source code is governed by a BSD-style license that can be
5 # found in the LICENSE file. 5 # found in the LICENSE file.
6 6
7 # Builds Chromium, Google Chrome and *OS FFmpeg binaries. 7 # Builds Chromium, Google Chrome and *OS FFmpeg binaries.
8 # 8 #
9 # For Windows it assumes being run from a MinGW shell with Visual Studio 9 # For Windows it assumes being run from a MinGW shell with Visual Studio
10 # environment (i.e., lib.exe and editbin.exe are in $PATH). 10 # environment (i.e., lib.exe and editbin.exe are in $PATH).
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 add_flag_common --disable-everything 227 add_flag_common --disable-everything
228 add_flag_common --enable-fft 228 add_flag_common --enable-fft
229 add_flag_common --enable-rdft 229 add_flag_common --enable-rdft
230 add_flag_common --disable-network 230 add_flag_common --disable-network
231 add_flag_common --disable-bzlib 231 add_flag_common --disable-bzlib
232 add_flag_common --disable-zlib 232 add_flag_common --disable-zlib
233 add_flag_common --disable-swscale 233 add_flag_common --disable-swscale
234 add_flag_common --disable-amd3dnow 234 add_flag_common --disable-amd3dnow
235 add_flag_common --disable-amd3dnowext 235 add_flag_common --disable-amd3dnowext
236 add_flag_common --enable-shared 236 add_flag_common --enable-shared
237 add_flag_common --optflags=-O2
scherkus (not reviewing) 2012/02/09 00:40:49 this change isn't mentioned in CL description doe
DaleCurtis 2012/02/09 04:37:39 The static pthreads patch included the -O2 patch,
237 238
238 # Common codecs. 239 # Common codecs.
239 add_flag_common --enable-decoder=theora,vorbis,vp8 240 add_flag_common --enable-decoder=theora,vorbis,vp8
240 add_flag_common --enable-decoder=pcm_u8,pcm_s16le,pcm_f32le 241 add_flag_common --enable-decoder=pcm_u8,pcm_s16le,pcm_f32le
241 add_flag_common --enable-demuxer=ogg,matroska,wav 242 add_flag_common --enable-demuxer=ogg,matroska,wav
242 add_flag_common --enable-parser=vp8 243 add_flag_common --enable-parser=vp8
243 244
244 # Linux only. 245 # Linux only.
245 if [ "$TARGET_OS" = "linux" ]; then 246 if [ "$TARGET_OS" = "linux" ]; then
246 if [ "$TARGET_ARCH" = "x64" ]; then 247 if [ "$TARGET_ARCH" = "x64" ]; then
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 else 302 else
302 echo "Error: Unknown TARGET_ARCH=$TARGET_ARCH for TARGET_OS=$TARGET_OS!" 303 echo "Error: Unknown TARGET_ARCH=$TARGET_ARCH for TARGET_OS=$TARGET_OS!"
303 exit 304 exit
304 fi 305 fi
305 fi 306 fi
306 307
307 # Should be run on Windows. 308 # Should be run on Windows.
308 if [ "$TARGET_OS" = "win" ]; then 309 if [ "$TARGET_OS" = "win" ]; then
309 if [ "$HOST_OS" = "win" ]; then 310 if [ "$HOST_OS" = "win" ]; then
310 if [ "$TARGET_ARCH" = "ia32" ]; then 311 if [ "$TARGET_ARCH" = "ia32" ]; then
311 add_flag_common --enable-filter=buffer 312 add_flag_common --enable-filter=buffer
scherkus (not reviewing) 2012/02/09 00:40:49 did we already do the w32threads switch?
rbultje1 2012/02/09 00:44:18 That's a new upstream feature, automatically enabl
DaleCurtis 2012/02/09 04:37:39 The w32threads switch was automatic, the only diff
312 add_flag_common --enable-memalign-hack 313 add_flag_common --enable-memalign-hack
313 add_flag_common --cc=mingw32-gcc 314 add_flag_common --cc=mingw32-gcc
314 add_flag_common --extra-cflags=-mtune=atom 315 add_flag_common --extra-cflags=-mtune=atom
315 add_flag_common --extra-cflags=-U__STRICT_ANSI__ 316 add_flag_common --extra-cflags=-U__STRICT_ANSI__
316 add_flag_common --extra-cflags=-I/usr/local/include 317 add_flag_common --extra-cflags=-I/usr/local/include
317 add_flag_common --extra-ldflags=-L/usr/local/lib 318 add_flag_common --extra-ldflags=-L/usr/local/lib
318 add_flag_common --extra-ldflags=-Wl,--enable-auto-import 319 add_flag_common --extra-ldflags=-Wl,--enable-auto-import
319 add_flag_common --extra-ldflags=-Wl,--no-seh 320 add_flag_common --extra-ldflags=-Wl,--no-seh
320 else 321 else
321 echo "Error: Unknown TARGET_ARCH=$TARGET_ARCH for TARGET_OS=$TARGET_OS!" 322 echo "Error: Unknown TARGET_ARCH=$TARGET_ARCH for TARGET_OS=$TARGET_OS!"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 build Chrome $FLAGS_COMMON $FLAGS_CHROME 386 build Chrome $FLAGS_COMMON $FLAGS_CHROME
386 387
387 if [ "$TARGET_OS" = "linux" ]; then 388 if [ "$TARGET_OS" = "linux" ]; then
388 echo "ChromiumOS configure/build:" 389 echo "ChromiumOS configure/build:"
389 build ChromiumOS $FLAGS_COMMON $FLAGS_CHROMIUM $FLAGS_CHROMIUMOS 390 build ChromiumOS $FLAGS_COMMON $FLAGS_CHROMIUM $FLAGS_CHROMIUMOS
390 echo "ChromeOS configure/build:" 391 echo "ChromeOS configure/build:"
391 build ChromeOS $FLAGS_COMMON $FLAGS_CHROME $FLAGS_CHROMEOS 392 build ChromeOS $FLAGS_COMMON $FLAGS_CHROME $FLAGS_CHROMEOS
392 fi 393 fi
393 394
394 echo "Done. If desired you may copy config.h/config.asm into the source/config t ree using copy_config.sh." 395 echo "Done. If desired you may copy config.h/config.asm into the source/config t ree using copy_config.sh."
OLDNEW
« no previous file with comments | « chromium/patches/to_upstream/55_h264_nal.patch ('k') | configure » ('j') | configure » ('J')

Powered by Google App Engine
This is Rietveld 408576698