Try to fix linux

.github/workflows/pipeline.yml

@@ -65,7 +65,9 @@ jobs:
       if: matrix.os =='macos-latest' || matrix.os == 'ubuntu-latest'
       run: |-
         pushd vendor
-        git clone https://github.com/Thealexbarney/LibAtrac9.git --depth 1
+        if [ ! -d "LibAtrac9" ]; then
+          git clone https://github.com/Thealexbarney/LibAtrac9.git --depth 1
+        fi
         cd LibAtrac9/C
         if [ "${{ matrix.os_name }}" == 'macos' ]; then
           sed -i '' -e 's/,--version-script=libatrac9.version//g' Makefile
@@ -78,7 +80,7 @@ jobs:
         popd
         echo "LIBATRAC9DIR=vendor/LibAtrac9" >> $GITHUB_ENV
     - name: Install Dependencies Linux
-      run: sudo apt-get install nasm libx11-dev libxft-dev libxext-dev libwayland-dev libxkbcommon-dev libegl1-mesa-dev libibus-1.0-dev libxrandr-dev libvorbis-dev libogg-dev
+      run: sudo apt-get install nasm libx11-dev libxft-dev libxext-dev libwayland-dev libxkbcommon-dev libegl1-mesa-dev libibus-1.0-dev libxrandr-dev
       if: matrix.os_name == 'linux'
     - name: Install Dependencies Mac
       run: brew install nasm
@@ -162,7 +164,7 @@ jobs:
     needs:
     - job-matrix
 
-    if: ${{needs.*.result}} == "failure" || ${{needs.*.result}} == "cancelled"
+    if: always() && contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')
     steps:
     - uses: actions/checkout@v2
     - name: 'Get Jobs Status'

CMakeLists.txt

@@ -774,10 +774,12 @@ if (EMSCRIPTEN)
 else ()
     find_package(SDL2 REQUIRED)
     find_package(ZLIB REQUIRED)
-    find_package(OggVorbis REQUIRED)
+    find_package(Ogg REQUIRED)
+    find_package(Vorbis REQUIRED)
     find_package(WebP REQUIRED)
 
-    include_directories(${OGGVORBIS_INCLUDE_DIRS})
+    include_directories(${OGG_INCLUDE_DIR})
+    include_directories(${VORBIS_INCLUDE_DIRS})
 
     if (NX)
         list(APPEND Impacto_Libs
@@ -807,7 +809,8 @@ else ()
         list(APPEND Impacto_Libs
                 ${SDL2_LIBRARIES}
                 ZLIB::ZLIB
-                ${OGGVORBIS_LIBRARIES}
+                ${OGG_LIBRARY}
+                ${VORBIS_LIBRARIES}
                 ${WebP_LIBRARIES}
         )
 

modules/FindOgg.cmake

@@ -0,0 +1,35 @@
+set(_LIBOGG_SEARCH
+  PATHS
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /sw # Fink
+  /opt/local # DarwinPorts
+  /opt/csw # Blastwave
+  /opt
+  /usr
+  /usr/local
+)
+
+foreach(search ${_LIBOGG_SEARCH})
+
+find_path(OGG_INCLUDE_DIR ogg/ogg.h
+  HINTS
+    ENV OGGDIR
+  PATH_SUFFIXES include
+)
+
+find_library(OGG_LIBRARY
+  NAMES ogg
+  HINTS
+    ENV OGGDIR
+  PATH_SUFFIXES libx32 lib64 lib libs64 libs
+)
+
+endforeach()
+
+unset(_LIBOGG_SEARCH)
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Ogg DEFAULT_MSG OGG_LIBRARY OGG_INCLUDE_DIR)
+
+mark_as_advanced(OGG_LIBRARY OGG_INCLUDE_DIR)

modules/FindVorbis.cmake

@@ -0,0 +1,49 @@
+
+set(_LIBVORBIS_SEARCH
+  PATHS
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /sw # Fink
+  /opt/local # DarwinPorts
+  /opt/csw # Blastwave
+  /opt
+  /usr
+  /usr/local
+)
+
+foreach(search ${_LIBVORBIS_SEARCH})
+
+find_path(VORBIS_INCLUDE_DIR vorbis/vorbisfile.h
+  HINTS
+    ENV VORBISDIR
+  PATH_SUFFIXES include
+
+)
+
+find_library(VORBIS_LIBRARY
+  NAMES vorbis
+  HINTS
+    ENV VORBISDIR
+  PATH_SUFFIXES libx32 lib64 lib libs64 libs
+)
+
+find_library(VORBISFILE_LIBRARY
+  NAMES vorbisfile Vorbis::vorbisFile
+  HINTS
+    ENV VORBISDIR
+  PATH_SUFFIXES libx32 lib64 lib libs64 libs
+)
+
+endforeach()
+
+unset(_LIBVORBIS_SEARCH)
+
+set(VORBIS_LIBRARIES
+  ${VORBIS_LIBRARY}
+  ${VORBISFILE_LIBRARY}
+)
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Vorbis DEFAULT_MSG VORBIS_LIBRARIES VORBIS_INCLUDE_DIR)
+
+mark_as_advanced(VORBIS_LIBRARIES VORBIS_INCLUDE_DIR)