Made runme_minimal.sh not build FFmpeg for quicker checks.

ggarra13 · Mar 15, 2024 · 95006cb · 95006cb
1 parent 2a5d8dd
commit 95006cb
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 11 deletions.
diff --git a/.github/workflows/minimal.yml b/.github/workflows/minimal.yml
@@ -61,7 +61,7 @@ jobs:
 
     - name: Build mrv2
       run:
-        bash ./runme_nolog.sh -D TLRENDER_USD=OFF -D TLRENDER_FFMPEG=OFF -D MRV2_PDF=OFF -D MRV2_NETWORK=OFF -D MRV2_PYBIND11=OFF -D MRV2_PYFLTK=OFF -D BUILD_PYTHON=OFF -D TLRENDER_EXR=OFF -D TLRENDER_RAW=OFF -D TLRENDER_NET=OFF -D TLRENDER_TIFF=OFF
+        bash ./runme_nolog.sh -D TLRENDER_USD=OFF -D TLRENDER_FFMPEG=OFF -D MRV2_PDF=OFF -D MRV2_NETWORK=OFF -D MRV2_PYBIND11=OFF -D MRV2_PYFLTK=OFF -D BUILD_PYTHON=OFF -D TLRENDER_EXR=OFF -D TLRENDER_NDI=OFF -D TLRENDER_RAW=OFF -D TLRENDER_NET=OFF -D TLRENDER_TIFF=OFF
 
     # - name: Upload binaries
     #   run: |
@@ -192,7 +192,7 @@ jobs:
 
     - name: Build mrv2
       run: |
-        ./runme_nolog.sh -D TLRENDER_USD=OFF -D TLRENDER_FFMPEG=OFF -D MRV2_PDF=OFF -D MRV2_NETWORK=OFF -D MRV2_PYBIND11=OFF -D MRV2_PYFLTK=OFF -D BUILD_PYTHON=OFF -D TLRENDER_EXR=OFF -D TLRENDER_RAW=OFF -D TLRENDER_NET=OFF -D TLRENDER_TIFF=OFF
+        ./runme_nolog.sh  -D BUILD_PYTHON=OFF -D TLRENDER_USD=OFF -D TLRENDER_FFMPEG=OFF -D MRV2_PDF=OFF -D MRV2_NETWORK=OFF -D MRV2_PYBIND11=OFF -D MRV2_PYFLTK=OFF-D TLRENDER_EXR=OFF  -D TLRENDER_NDI=OFF -D TLRENDER_RAW=OFF -D TLRENDER_NET=OFF -D TLRENDER_TIFF=OFF
 
   #   - name: Upload binaries
   #      run: |

diff --git a/bin/runme_minimal.sh b/bin/runme_minimal.sh
@@ -44,20 +44,23 @@ echo "Saving compile log to $BUILD_DIR/compile.log ..."
 #
 # These are some of the expensive mrv2 options
 #
-export BUILD_PYTHON=ON
-export MRV2_PYFLTK=ON
-export MRV2_PYBIND11=ON
+export BUILD_PYTHON=OFF
+export MRV2_PYFLTK=OFF
+export MRV2_PYBIND11=OFF
 export MRV2_NETWORK=OFF
 export MRV2_PDF=OFF
 
 #
 # These are some of the expensive TLRENDER options
 #
+export TLRENDER_FFMPEG=OFF
+export TLRENDER_NDI=OFF
 export TLRENDER_NET=OFF
 export TLRENDER_RAW=OFF
 export TLRENDER_USD=OFF
 export TLRENDER_VPX=OFF
 export TLRENDER_WAYLAND=ON
+export TLRENDER_X11=ON
 export TLRENDER_YASM=OFF
 
 echo

diff --git a/cmake/Modules/BuildFLTK.cmake b/cmake/Modules/BuildFLTK.cmake
@@ -5,7 +5,7 @@
 include( ExternalProject )
 
 #set( FLTK_GIT_TAG master )
-set(FLTK_GIT_TAG a1d3bf182e6c085779b6e7e7315bf15f384f7112) # Stable TAG
+set(FLTK_GIT_TAG 26f5b38a0113be817d13193387913580b5996d77) # Stable TAG
 
 set( FLTK_BUILD_SHARED_LIBS ON )  # We no longer compile static.
 
@@ -62,6 +62,8 @@ ExternalProject_Add(
     -DCMAKE_CXX_FLAGS=${FLTK_CXX_FLAGS}
     -DCMAKE_INSTALL_MESSAGE=${CMAKE_INSTALL_MESSAGE}
     -DFLTK_BUILD_EXAMPLES=OFF
+    -DFLTK_BUILD_FLTK_OPTIONS=OFF
+    -DFLTK_BUILD_HTML_DOCS=OFF
     -DFLTK_BUILD_TEST=OFF
     -DFLTK_BUILD_SHARED_LIBS=${FLTK_BUILD_SHARED_LIBS}
     -DFLTK_USE_SYSTEM_ZLIB=0

diff --git a/runme_nolog.sh b/runme_nolog.sh
@@ -84,7 +84,11 @@ fi
 if [ -z "$TLRENDER_NDI" ]; then
     if [ -d "${TLRENDER_NDI_SDK}" ]; then
 	export TLRENDER_NDI=ON
-    else
+    fi
+fi
+
+if [[ $TLRENDER_NDI == ON || $TLRENDER_NDI == 1 ]]; then
+    if [[ $TLRENDER_FFMPEG != ON && $TLRENDER_FFMPEG != 1 ]]; then
 	export TLRENDER_NDI=OFF
     fi
 fi
@@ -122,7 +126,7 @@ if [ -z "$TLRENDER_WAYLAND" ]; then
 fi
 
 if [ -z "$TLRENDER_X11" ]; then
-    export TLRENDER_X11=ON
+    export TLRENDER_X11=ON  # Not yet possible to turn it off
 fi
 
 if [ -z "$TLRENDER_YASM" ]; then
@@ -145,13 +149,13 @@ echo
 
 mkdir -p $BUILD_DIR/install
 
-#if [[ $KERNEL == *Linux* ]]; then
+if [[ $KERNEL == *Linux* ]]; then
     echo "Common options"
     echo
     echo "Wayland support .................... ${TLRENDER_WAYLAND} 	(TLRENDER_WAYLAND)"
-    echo "X11 support ........................ ${TLRENDER_X11}     	(TLRENDER_X11)"
+    #echo "X11 support ........................ ${TLRENDER_X11}     	(TLRENDER_X11)"
     echo
-#fi
+fi
 
 echo "mrv2 Options"
 echo