Merge branch 'dyne:master' into master

Author: namikiri

.github/workflows/release.yml

@@ -23,11 +23,11 @@ jobs:
       release: ${{ steps.tag_release.outputs.release }}
       version: ${{ steps.tag_release.outputs.version }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 18.x
+          node-version: latest
       - name: Install semantic-release
         run: |
           npm i npx
@@ -51,7 +51,7 @@ jobs:
     needs: [semantic-release]
     if: ${{ needs.semantic-release.outputs.release == 'True' }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: apt install deps
         run: |
           sudo apt-get update -y -q
@@ -62,22 +62,22 @@ jobs:
           cmake -G "Ninja" ../
           ninja
       - name: Upload linux filter
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: release-linux-filter
           path: build/src/filter/**/*.so
       - name: Upload linux mixer2
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: release-linux-mixer2
           path: build/src/mixer2/**/*.so
       - name: Upload linux mixer3
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: release-linux-mixer3
           path: build/src/mixer3/**/*.so
       - name: Upload linux generator
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: release-linux-generator
           path: build/src/generator/**/*.so
@@ -88,7 +88,7 @@ jobs:
     needs: [semantic-release]
     if: ${{ needs.semantic-release.outputs.release == 'True' }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ilammy/msvc-dev-cmd@v1
       - name: choco install deps
         uses: crazy-max/ghaction-chocolatey@v2
@@ -100,22 +100,22 @@ jobs:
           cmake -G "NMake Makefiles" ../
           nmake
       - name: Upload win64 filter
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: release-win64-filter
           path: build/src/filter/**/*.dll
       - name: Upload win64 mixer2
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: release-win64-mixer2
           path: build/src/mixer2/**/*.dll
       - name: Upload win64 mixer3
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: release-win64-mixer3
           path: build/src/mixer3/**/*.dll
       - name: Upload win64 generator
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: release-win64-generator
           path: build/src/generator/**/*.dll
@@ -126,36 +126,36 @@ jobs:
     needs: [semantic-release]
     if: ${{ needs.semantic-release.outputs.release == 'True' }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Update Homebrew
         run: |
-          brew update --preinstall
+          brew update
       - name: Install Homebrew dependencies
         run: |
           env HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_CLEANUP=1 \
-          brew install cmake ninja cairo
+          brew install ninja cairo
       - name: Build using ninja
         run: |
           mkdir build && cd build
           cmake -G "Ninja" ../
           ninja
       - name: Upload osx filter
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: release-osx-filter
           path: build/src/filter/**/*.so
       - name: Upload osx mixer2
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: release-osx-mixer2
           path: build/src/mixer2/**/*.so
       - name: Upload osx mixer3
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: release-osx-mixer3
           path: build/src/mixer3/**/*.so
       - name: Upload osx generator
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: release-osx-generator
           path: build/src/generator/**/*.so
@@ -166,9 +166,9 @@ jobs:
     if: ${{ needs.semantic-release.outputs.release == 'True' }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: download binary artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: |
             frei0r-bin
@@ -183,7 +183,7 @@ jobs:
           cp README.md $dst/README.txt
           cp COPYING   $dst/LICENSE.txt
           cp ChangeLog $dst/ChangeLog.txt
-          cp AUTHORS   $dst/AUTHORS.txt
+          cp AUTHORS.md   $dst/AUTHORS.txt
           cp include/frei0r.h include/frei0r.hpp $dst/
           echo "${{ needs.semantic-release.outputs.version }}" > $dst/VERSION.txt
           zip -r -9 $dst.zip $dst
@@ -197,7 +197,7 @@ jobs:
           cp README.md $dst/README.txt
           cp COPYING   $dst/LICENSE.txt
           cp ChangeLog $dst/ChangeLog.txt
-          cp AUTHORS   $dst/AUTHORS.txt
+          cp AUTHORS.md   $dst/AUTHORS.txt
           cp include/frei0r.h include/frei0r.hpp $dst/
           echo "${{ needs.semantic-release.outputs.version }}" > $dst/VERSION.txt
           zip -r -9 $dst.zip $dst
@@ -211,7 +211,7 @@ jobs:
           cp README.md $dst/README.txt
           cp COPYING   $dst/LICENSE.txt
           cp ChangeLog $dst/ChangeLog.txt
-          cp AUTHORS   $dst/AUTHORS.txt
+          cp AUTHORS.md   $dst/AUTHORS.txt
           cp include/frei0r.h include/frei0r.hpp $dst/
           echo "${{ needs.semantic-release.outputs.version }}" > $dst/VERSION.txt
           tar cvfz $dst.tar.gz $dst

.github/workflows/test.yml

@@ -27,15 +27,15 @@ jobs:
   #   name: 🚨 REUSE Compliance
   #   runs-on: ubuntu-latest
   #   steps:
-  #     - uses: actions/checkout@v3
+  #     - uses: actions/checkout@v4
   #     - uses: fsfe/reuse-action@v1
 
   c-lint:
     name: 🚨 C lint
     runs-on: ubuntu-latest
     if: "!contains(github.event.pull_request.labels.*.name, 'skip-lint')"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: reviewdog/action-cpplint@master
         env:
           REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -62,6 +62,7 @@ jobs:
             ,-whitespace/semicolon\
             ,-build/include_subdir\
             ,-build/include_order\
+            ,-build/header_guard\
             "
 
   test-suite:
@@ -74,7 +75,7 @@ jobs:
       fail-fast: false
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: install dependencies
         run: |
           sudo apt-get update -qy
@@ -90,8 +91,7 @@ jobs:
         run: |
           cd test && make
       - name: ${{ matrix.compiler }} upload plugin analysis
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: release-plugin-analysis
           path: test/*.json
-        

.gitignore

@@ -39,3 +39,4 @@ doc/html
 /out/
 /.vs/
 CMakeSettings.json
+.vscode

AUTHORS

@@ -1,36 +1,41 @@
+# Frei0r developers union
 
-Project initiated at the Piksel Festival in 2004
-hosted by BEK - Bergen Senter for Elektronisk Kunst
-Maintained at the Dyne.org Foundation
+Read here an account of [Frei0r's project history](https://medium.com/think-do-tank/frei0r-the-free-and-open-source-video-effect-preservation-project-604134dde8b3).
 
-Developers who contributed, in alphabetic order:
+Frei0r is a Dyne.org project maintained by Denis "Jaromil" Roio and Dan Dennedy.
+
+## Developers who contributed, in alphabetic order:
 
 Akito Iwakura
 Albert Frisch
+Ajrat Makhmutov
+Brendan Hack
 Brian Matherly
 Burkhard Plaum
 Carlo E. Prelz
 Christoph Willing
-Dan Dennedy
-Denis Roio (Jaromil)
+Cynthia
+Erik Beck
+Esmane
 Filippo Giunchedi
 Gabriel Finch (Salsaman)
 Georg Seidel
 Henner Zeller
 Hedde Bosman
-IOhannes M. Zmölnig
+IOhannes m. zmölnig
 Janne Liljeblad
 Jean-Baptiste Mardelle
 Jean-François Fortin Tam 
 Jean-Sebastien Senecal
 Jerome Blanchi (d.j.a.y)
+Johann Jeg
 Joshua M. Doe
 Luca Bigliardi
 Maksim Golovkin (Максим Головкин)
 Marko Cebokli
 Martin Bayer
 Mathieu Guindon
-Matthias Schnoell
+Matthias Schnöll
 Nicolas Carion
 Niels Elburg
 Phillip Promesberger
@@ -47,4 +52,5 @@ Steinar H. Gunderson
 Thomas Coldrick
 Thomas Perl
 Till Theato
+Vadim Druzhin
 Vincent Pinon

AUTHORS.md

@@ -10,6 +10,10 @@ The presence of optional libraries on the system will trigger compilation of ext
 
   + [Cairo](http://cairographics.org) required for cairo- filters and mixers
 
+## Optional build flags
+
+  + `-DWITHOUT_FACERECOGNITION=ON` - Disable face recognition plugins (facedetect and facebl0r) to avoid protobuf conflicts with applications like MLT
+
 It is recommended to use a separate `build` sub-folder.
 
 ```
@@ -18,6 +22,13 @@ cd build && cmake ../
 make
 ```
 
+To disable face recognition plugins (recommended when using with MLT):
+```
+mkdir -p build
+cd build && cmake -DWITHOUT_FACERECOGNITION=ON ../
+make
+```
+
 Also ninja and nmake are supported through cmake:
 ```
 cmake -G 'Ninja' ../

BUILD.md

@@ -1,13 +1,15 @@
-cmake_minimum_required (VERSION 3.1)
+cmake_minimum_required (VERSION 3.12)
 
 list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
 
 project (frei0r)
-set (VERSION 1.8)
+set (VERSION 2.5.1)
 
 include(GNUInstallDirs)
 
 option (WITHOUT_OPENCV "Disable plugins dependent upon OpenCV" OFF)
+option (WITHOUT_FACERECOGNITION "Disable facedetect plugin to avoid protobuf conflicts" OFF)
+
 if (NOT WITHOUT_OPENCV)
   find_package (OpenCV)
 endif ()
@@ -35,8 +37,7 @@ set (FREI0R_1_1_DEF "${CMAKE_SOURCE_DIR}/msvc/frei0r_1_1.def")
 # --- custom targets: ---
 INCLUDE( cmake/modules/TargetDistclean.cmake OPTIONAL)
 
-# See this thread for a ridiculous discussion about the simple question how to install a header file with CMake: http://www.cmake.org/pipermail/cmake/2009-October/032874.html
-install (DIRECTORY include DESTINATION . FILES_MATCHING PATTERN "frei0r.h" PATTERN "msvc" EXCLUDE)
+install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 
 # For code documentation run: doxygen doc/Doxyfile
 # add_subdirectory (doc)

CMakeLists.txt

@@ -1,4 +1,4 @@
-[![Frei0r logo](https://github.com/dyne/frei0r/raw/gh_pages/pics/frei0r.png)](https://frei0r.dyne.org)
+[![Frei0r logo](https://frei0r.dyne.org/pics/fla_name_lb.webp)](https://frei0r.dyne.org)
 
 <img src="https://files.dyne.org/software_by_dyne.png" width="300">
 
@@ -53,6 +53,10 @@ Stable frei0r releases are built automatically and made available on
 
 Frei0r sourcecode is released under the terms of the GNU General Public License and, eventually other compatible Free Software licenses.
 
+## Packaging
+
+[![Packaging status](https://repology.org/badge/vertical-allrepos/frei0r.svg?columns=3)](https://repology.org/project/frei0r/versions)
+
 ## Build dependencies 
 
 Frei0r can be built on GNU/Linux, M$/Windows and Apple/OSX platforms, possibly in even more environments like embedded devices.