fix libjpeg turbo os x

rdp · rdp · commit d44af7f449b9 · 2014-12-29T10:58:08.000-07:00
diff --git a/cross_compile_ffmpeg.sh b/cross_compile_ffmpeg.sh
@@ -693,7 +693,11 @@ build_libdlfcn() {
 }
 
 build_libjpeg_turbo() {
-  generic_download_and_install http://sourceforge.net/projects/libjpeg-turbo/files/1.3.1/libjpeg-turbo-1.3.1.tar.gz/download libjpeg-turbo-1.3.1
+  download_and_unpack_file http://sourceforge.net/projects/libjpeg-turbo/files/1.3.1/libjpeg-turbo-1.3.1.tar.gz/download libjpeg-turbo-1.3.1
+  cd libjpeg-turbo-1.3.1
+    sed -i.bak 's/nasm nasmw yasm/yasm nasm nasmw/' configure # tell it to prefer yasm, since nasm on OS X is old and broken for 64 bit builds
+    generic_configure_make_install
+  cd ..
 }
 
 build_libogg() {

Original file line number	Diff line number	Diff line change
`@@ -693,7 +693,11 @@ build_libdlfcn() {`
`693`	`693`	`}`
`694`	`694`
`695`	`695`	`build_libjpeg_turbo() {`
`696`		`- generic_download_and_install http://sourceforge.net/projects/libjpeg-turbo/files/1.3.1/libjpeg-turbo-1.3.1.tar.gz/download libjpeg-turbo-1.3.1`
	`696`	`+ download_and_unpack_file http://sourceforge.net/projects/libjpeg-turbo/files/1.3.1/libjpeg-turbo-1.3.1.tar.gz/download libjpeg-turbo-1.3.1`
	`697`	`+ cd libjpeg-turbo-1.3.1`
	`698`	`+ sed -i.bak 's/nasm nasmw yasm/yasm nasm nasmw/' configure # tell it to prefer yasm, since nasm on OS X is old and broken for 64 bit builds`
	`699`	`+ generic_configure_make_install`
	`700`	`+ cd ..`
`697`	`701`	`}`
`698`	`702`
`699`	`703`	`build_libogg() {`