Merge branch 'main' of github.com:ggarra13/mrv2

ggarra13 · Oct 10, 2023 · 1f4c711 · 1f4c711
2 parents 54ce2e8 + aa68ded
commit 1f4c711
Show file tree

Hide file tree

Showing 410 changed files with 17,405 additions and 925 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,19 +1,19 @@
-*.txt text eol=lf
-*.md  text eol=lf
-*.sh  text eol=lf
+*.cmake text eol=lf
 *.cpp text eol=lf
 *.h   text eol=lf
-*.rb  text eol=lf
-*.py  text eol=lf
-*.rst text eol=lf
 *.html text eol=lf
 *.in  text eol=lf
+*.i   text eol=lf
 *.fl  text eol=lf
-*.cmake text eol=lf
-*.po  diff=podiff
-*.pot diff=podiff
-*.po  filter=po
-*.pot filter=po
+*.md  text eol=lf
+*.po  text eol=lf
+*.pot text eol=lf
+*.py  text eol=lf
+*.rb  text eol=lf
+*.rst text eol=lf
+*.sh  text eol=lf
+*.txt text eol=lf
+
 *.ttf -text
 *.lib -text
 *.dll -text
@@ -22,13 +22,17 @@
 *.mpv -text
 *.webm -text
 
-*.py  linguist-language=Python
-*.sh  linguist-language=bash
+*.po  diff=podiff
+*.pot diff=podiff
+*.po  filter=po
+*.pot filter=poç
 
 windows/win32/include/lib/** linguist-language=C
 windows/win64/include/lib/** linguist-language=C
 
+*.bat linguist-language=bat
 *.cpp linguist-language=C++
 *.h   linguist-language=C++
 *.nsh linguist-language=NSIS
-*.bat linguist-language=bat
+*.py  linguist-language=Python
+*.sh  linguist-language=bash
diff --git a/.githooks/pre-commit b/.githooks/pre-commit
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-echo "Running .githooks/pre-commit"
+echo "Running .githooks/pre-commit.sh"
 
 for FILE in $(git diff --cached --name-only)
 do
@@ -9,11 +9,23 @@ do
 	if [[ -e $FILE ]]; then
             clang-format -i $FILE
 	    git add $FILE
+	    chmod 0644 $FILE
 	fi
     else
 	echo "Skipping formatting of $FILE"
-	if [[ $FILE == *.sh || $FILE == .py || $FILE == .rb ]]; then
-	    chmod 0755 $FILE
+	if [[ $FILE == *.sh || $FILE == *.py || $FILE == *.rb ||
+		  $FILE == *pre-commit ]]; then
+	    if [[ -e $FILE ]]; then
+		echo "Changing $FILE permissions to 0755"
+		chmod 0755 $FILE
+	    fi
+	else
+	    if [[ -d $FILE ]]; then
+		chmod 0755 $FILE
+	    elif [[ -e $FILE ]]; then
+		echo "Changing $FILE permissions to 0644"
+		chmod 0644 $FILE
+	    fi
 	fi
     fi
 done
diff --git a/.github/workflows/full.yml b/.github/workflows/full.yml
@@ -59,13 +59,17 @@ jobs:
 
     - name: Set permissions on SSH key
       run: chmod 600 ssh/id_rsa
+
+    - name: Set executable permissions
+      run: |
+        chmod +x ./*.sh ./bin/*.sh ./etc/*.sh
   
     - name: Build mrv2
-      run:
+      run: |
         ./runme_nolog.sh -t package
 
     - name: Upload binaries
-      run:
+      run: |
         ./bin/upload_sourceforge.sh
 
   windows-full-build:
@@ -101,13 +105,17 @@ jobs:
       shell: cmd
       run: |
         icacls "ssh\id_rsa" /inheritance:r /grant:r "%USERNAME%:R"
+        
+    - name: Set executable permissions
+      run: |
+        chmod +x ./*.sh ./bin/*.sh ./etc/*.sh
       
     - name: Build mrv2
-      run:
+      run: |
         ./runme_nolog.sh -t package -D TLRENDER_USD=OFF
       
     - name: Upload binaries
-      run:
+      run: |
         ./bin/upload_sourceforge.sh
 
 
@@ -141,13 +149,17 @@ jobs:
 
     - name: Set permissions on SSH key
       run: chmod 600 ssh/id_rsa
+
+    - name: Set executable permissions
+      run: |
+        chmod +x ./*.sh ./bin/*.sh ./etc/*.sh
 
     - name: Build mrv2
-      run:
+      run: |
         ./runme_nolog.sh -t package
 
     - name: Upload binaries
-      run:
+      run: |
         ./bin/upload_sourceforge.sh
 
   # macos-m1-full-build:
@@ -180,11 +192,15 @@ jobs:
 
   #   - name: Set permissions on SSH key
   #     run: chmod 600 ssh/id_rsa
+
+  #   - name: Set executable permissions
+  #      run: |
+  #        chmod +x ./*.sh ./bin/*.sh ./etc/*.sh
 
   #   - name: Build mrv2
-  #     run:
+  #     run: |
   #       ./runme_nolog.sh -t package
 
-  #   # - name: Upload binaries
-  #   #   run:
-  #   #     ./bin/upload_sourceforge.sh
+  #   - name: Upload binaries
+  #     run: |
+  #       ./bin/upload_sourceforge.sh
diff --git a/.github/workflows/gpl.yml b/.github/workflows/gpl.yml
@@ -60,12 +60,16 @@ jobs:
     - name: Set permissions on SSH key
       run: chmod 600 ssh/id_rsa
 
+    - name: Set executable permissions
+      run: |
+        chmod +x ./*.sh ./bin/*.sh ./etc/*.sh
+        
     - name: Build mrv2
-      run:
+      run: |
         ./runme_nolog.sh -gpl -t package
 
     # - name: Upload binaries
-    #   run:
+    #   run: |
     #     ./bin/upload_sourceforge.sh
 
   windows-gpl-build:
@@ -102,12 +106,16 @@ jobs:
       run: |
         icacls "ssh\id_rsa" /inheritance:r /grant:r "%USERNAME%:R"
       
+    - name: Set executable permissions
+      run: |
+        chmod +x ./*.sh ./bin/*.sh ./etc/*.sh
+        
     - name: Build mrv2
-      run:
+      run: |
         ./runme_nolog.sh -gpl -t package -D TLRENDER_USD=OFF
       
     # - name: Upload binaries
-    #   run:
+    #   run: |
     #     ./bin/upload_sourceforge.sh
 
 
@@ -141,11 +149,15 @@ jobs:
 
     - name: Set permissions on SSH key
       run: chmod 600 ssh/id_rsa
+
+    - name: Set executable permissions
+      run: |
+        chmod +x ./*.sh ./bin/*.sh ./etc/*.sh
 
     - name: Build mrv2
-      run:
+      run: |
         ./runme_nolog.sh -gpl -t package
 
     # - name: Upload binaries
-    #   run:
+    #   run: |
     #     ./bin/upload_sourceforge.sh
diff --git a/.github/workflows/minimal.yml b/.github/workflows/minimal.yml
@@ -57,10 +57,10 @@ 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 BUILD_PYTHON=OFF -D TLRENDER_EXR=OFF -D TLRENDER_RAW=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 BUILD_PYTHON=OFF -D TLRENDER_EXR=OFF -D TLRENDER_RAW=OFF -D TLRENDER_TIFF=OFF
 
     # - name: Upload binaries
-    #   run:
+    #   run: |
     #     ./bin/upload_sourceforge.sh
 
 
@@ -100,10 +100,10 @@ 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 BUILD_PYTHON=OFF -D TLRENDER_EXR=OFF -D TLRENDER_RAW=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 BUILD_PYTHON=OFF -D TLRENDER_EXR=OFF -D TLRENDER_RAW=OFF -D TLRENDER_TIFF=OFF
 
     # - name: Upload binaries
-    #   run:
+    #   run: |
     #     ./bin/upload_sourceforge.sh
 
 
@@ -140,10 +140,10 @@ 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 BUILD_PYTHON=OFF -D TLRENDER_EXR=OFF -D TLRENDER_RAW=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 BUILD_PYTHON=OFF -D TLRENDER_EXR=OFF -D TLRENDER_RAW=OFF -D TLRENDER_TIFF=OFF
 
     # - name: Upload binaries
-    #   run:
+    #   run: |
     #     ./bin/upload_sourceforge.sh
 
 
@@ -179,7 +179,9 @@ jobs:
   #     run: chmod 600 ssh/id_rsa
 
   #   - name: Build mrv2
-  #     run:
+  #     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 BUILD_PYTHON=OFF -D TLRENDER_EXR=OFF -D TLRENDER_RAW=OFF -D TLRENDER_TIFF=OFF
 
-
+  # #   - name: Upload binaries
+  # #      run: |
+  # #        ./bin/upload_sourceforge.sh