Merge pull request #23 from mondain/patch-2

Disabled opencl on x264 and ffmpeg build
bytedeco · Nov 1, 2014 · dc29ee1 · dc29ee1
2 parents 905a586 + e1f33ae
commit dc29ee1
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/ffmpeg/cppbuild.sh b/ffmpeg/cppbuild.sh
@@ -72,11 +72,11 @@ case $PLATFORM in
         make -j4
         make install
         cd ../$X264
-        ./configure --prefix=$INSTALL_PATH --enable-static --enable-pic --host=i686-linux
+        ./configure --prefix=$INSTALL_PATH --enable-static --enable-pic --disable-opencl --host=i686-linux
         make -j4
         make install
         cd ../ffmpeg-$FFMPEG_VERSION
-        ./configure --prefix=.. --enable-shared --enable-gpl --enable-version3 --enable-runtime-cpudetect --disable-outdev=sdl --enable-libmp3lame --enable-libx264 --cc="gcc -m32" --extra-cflags="-I../include/" --extra-ldflags="-L../lib/ -ldl"
+        ./configure --prefix=.. --enable-shared --enable-gpl --enable-version3 --enable-runtime-cpudetect --disable-opencl --disable-outdev=sdl --enable-libmp3lame --enable-libx264 --cc="gcc -m32" --extra-cflags="-I../include/" --extra-ldflags="-L../lib/ -ldl"
         make -j4
         make install
         ;;
@@ -86,11 +86,11 @@ case $PLATFORM in
         make -j4
         make install
         cd ../$X264
-        ./configure --prefix=$INSTALL_PATH --enable-static --enable-pic --host=x86_64-linux
+        ./configure --prefix=$INSTALL_PATH --enable-static --enable-pic --disable-opencl --host=x86_64-linux
         make -j4
         make install
         cd ../ffmpeg-$FFMPEG_VERSION
-        ./configure --prefix=.. --enable-shared --enable-gpl --enable-version3 --enable-runtime-cpudetect --disable-outdev=sdl --enable-libmp3lame --enable-libx264 --cc="gcc -m64" --extra-cflags="-I../include/" --extra-ldflags="-L../lib/ -ldl"
+        ./configure --prefix=.. --enable-shared --enable-gpl --enable-version3 --enable-runtime-cpudetect --disable-opencl --disable-outdev=sdl --enable-libmp3lame --enable-libx264 --cc="gcc -m64" --extra-cflags="-I../include/" --extra-ldflags="-L../lib/ -ldl"
         make -j4
         make install
         ;;
@@ -100,11 +100,11 @@ case $PLATFORM in
         make -j4
         make install
         cd ../$X264
-        ./configure --prefix=$INSTALL_PATH --enable-static --enable-pic
+        ./configure --prefix=$INSTALL_PATH --enable-static --enable-pic --disable-opencl
         make -j4
         make install
         cd ../ffmpeg-$FFMPEG_VERSION
-        ./configure --prefix=.. --enable-shared --enable-gpl --enable-version3 --enable-runtime-cpudetect --disable-outdev=sdl --enable-libmp3lame --enable-libx264 --extra-cflags="-I../include/" --extra-ldflags="-L../lib/ -Wl,-headerpad_max_install_names -ldl"
+        ./configure --prefix=.. --enable-shared --enable-gpl --enable-version3 --enable-runtime-cpudetect --disable-opencl --disable-outdev=sdl --enable-libmp3lame --enable-libx264 --extra-cflags="-I../include/" --extra-ldflags="-L../lib/ -Wl,-headerpad_max_install_names -ldl"
         make -j4
         make install
         BADPATH=../lib