chromium/scripts/build_ffmpeg.sh - Issue 9325049: Fixup chromium specific bits after merge.

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

Issue 9325049: Fixup chromium specific bits after merge. (Closed) Base URL: ssh://gerrit.chromium.org:29418/chromium/third_party/ffmpeg.git@master

Patch Set: Add windows, mac configs, binaries. 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

OLD	NEW
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 36 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
47 echo "Valid target OSes are: linux, mac, win"	47 echo "Valid target OSes are: linux, mac, win"

48 exit 1	48 exit 1

49 fi	49 fi

50	50

51 # Check FFMPEG_PATH to contain this script.	51 # Check FFMPEG_PATH to contain this script.

52 if [ ! -f "$FFMPEG_PATH/chromium/scripts/$(basename $0)" ]; then	52 if [ ! -f "$FFMPEG_PATH/chromium/scripts/$(basename $0)" ]; then

53 echo "$FFMPEG_PATH doesn't appear to contain FFmpeg"	53 echo "$FFMPEG_PATH doesn't appear to contain FFmpeg"

54 exit 1	54 exit 1

55 fi	55 fi

56	56

57 # If configure & make works but this script doesn't, make sure to grep for these .	57 # If configure & make works but this script doesn't, make sure to grep for these .
	scherkus (not reviewing) 2012/02/06 17:57:55 rietveld could be messing up on me but want to fix rietveld could be messing up on me but want to fix this line if its >80 chars? DaleCurtis 2012/02/06 19:35:03 Done. Show quoted text On 2012/02/06 17:57:55, scherkus wrote: > rietveld could be messing up on me but want to fix this line if its >80 chars? Done.
58 LIBAVCODEC_VERSION_MAJOR=53	58 LIBAVCODEC_VERSION_MAJOR=54

59 LIBAVFORMAT_VERSION_MAJOR=53	59 LIBAVFORMAT_VERSION_MAJOR=54

60 LIBAVUTIL_VERSION_MAJOR=51	60 LIBAVUTIL_VERSION_MAJOR=51

61	61

62 case $(uname -sm) in	62 case $(uname -sm) in

63 Linux\ i386)	63 Linux\ i386)

64 HOST_OS=linux	64 HOST_OS=linux

65 HOST_ARCH=ia32	65 HOST_ARCH=ia32

66 JOBS=$(grep processor /proc/cpuinfo \| wc -l)	66 JOBS=$(grep processor /proc/cpuinfo \| wc -l)

67 ;;	67 ;;

68 Linux\ x86_64)	68 Linux\ x86_64)

69 HOST_OS=linux	69 HOST_OS=linux

(...skipping 315 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
385 build Chrome $FLAGS_COMMON $FLAGS_CHROME	385 build Chrome $FLAGS_COMMON $FLAGS_CHROME

386	386

387 if [ "$TARGET_OS" = "linux" ]; then	387 if [ "$TARGET_OS" = "linux" ]; then

388 echo "ChromiumOS configure/build:"	388 echo "ChromiumOS configure/build:"

389 build ChromiumOS $FLAGS_COMMON $FLAGS_CHROMIUM $FLAGS_CHROMIUMOS	389 build ChromiumOS $FLAGS_COMMON $FLAGS_CHROMIUM $FLAGS_CHROMIUMOS

390 echo "ChromeOS configure/build:"	390 echo "ChromeOS configure/build:"

391 build ChromeOS $FLAGS_COMMON $FLAGS_CHROME $FLAGS_CHROMEOS	391 build ChromeOS $FLAGS_COMMON $FLAGS_CHROME $FLAGS_CHROMEOS

392 fi	392 fi

393	393

394 echo "Done. If desired you may copy config.h/config.asm into the source/config t ree using copy_config.sh."	394 echo "Done. If desired you may copy config.h/config.asm into the source/config t ree using copy_config.sh."

OLD	NEW

« chromium/config/Chrome/win/ia32/config.h ('K') | « chromium/ffmpeg_stub_headers.fragment ('k') | chromium/scripts/copy_config.sh » ('j') | chromium/scripts/copy_config.sh » ('J')