Jmoguillansky/meson windows master

.gitattributes

@@ -0,0 +1 @@
+* -text

.github/workflows/ci_coverage.yml

@@ -6,7 +6,7 @@ on:
       - 'master'
 
 jobs:
-  build_libs:
+  coverage:
     runs-on: ubuntu-20.04
 
     steps:
@@ -18,18 +18,13 @@ jobs:
         sudo apt -y install libsdl2-dev python3-venv gcovr
         sudo apt -y install ffmpeg libavcodec-dev libavutil-dev libavformat-dev libavdevice-dev libavfilter-dev libswscale-dev libswresample-dev libpostproc-dev
 
-    - name: Run tests with GL backend
+    - name: Run tests
       run: |
-        export CFLAGS=-fPIE
-        DISABLE_TESTS_SAMPLES=yes DISABLE_TESTS_STD430=yes BACKEND=gl DEBUG=yes DEBUG_GL=yes make -k -j$(($(nproc)+1)) tests COVERAGE=yes
-    - name: Run tests with GLES backend
-      run: |
-        DISABLE_TESTS_SAMPLES=yes DISABLE_TESTS_STD430=yes BACKEND=gles DEBUG=yes DEBUG_GL=yes make -k -j$(($(nproc)+1)) tests COVERAGE=yes
+        DEBUG=yes DEBUG_GL=yes make -k -j$(($(nproc)+1)) tests COVERAGE=yes
     - name: Get coverage
       run: |
-        gcovr -r libnodegl -s -x -o coverage.xml
-        make clean
+        make coverage-xml
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v1
       with:
-        file: coverage.xml
+        file: builddir/libnodegl/meson-logs/coverage.xml

.github/workflows/ci_linux.yml

@@ -7,7 +7,7 @@ on:
   pull_request:
 
 jobs:
-  build_libs:
+  linux:
 
     runs-on: ubuntu-20.04
 
@@ -30,32 +30,27 @@ jobs:
 
     - name: Build
       run: |
-        #
-        # This -fPIE is a workaround for the following link issue:
-        #     relocation R_X86_64_32 against `.rodata.str1.8' can not be used
-        #     when making a PIE object; recompile with -fPIE
-        #
-        # To summarize the issue:
-        #
-        # - On Python side, `python3-config` is a script generated from a
-        #   template using a global CFLAGS. But at the same time, the script
-        #   uses LIBS and SYSLIBS to construct the LDFLAGS (and not LDFLAGS for
-        #   some moronic reason).
-        # - On Debian/Ubuntu side, they decided to have the following injected:
-        #   CFLAGS="-specs=/usr/share/dpkg/no-pie-compile.specs"
-        #   LDFLAGS="-specs=/usr/share/dpkg/no-pie-link.specs"
-        #   And unfortunately, the former can not go without the latter
-        #   (otherwise there is a link error).
-        #
-        # As a result, `python3-config --cflags` will return the `-specs=...`
-        # flags, but `python3-config --ldflags` will not return the
-        # complementary `-specs=...`.
-        #
-        export CFLAGS=-fPIE
         make -j$(($(nproc)+1))
-    - name: Run tests with GL backend
+    - name: Run tests
       run: |
-        DISABLE_TESTS_SAMPLES=yes DISABLE_TESTS_STD430=yes BACKEND=gl DEBUG=yes DEBUG_GL=yes make -k -j$(($(nproc)+1)) tests
-    - name: Run tests with GLES backend
+        DEBUG=yes DEBUG_GL=yes make -k -j$(($(nproc)+1)) tests
+
+  gles2:
+
+    runs-on: ubuntu-20.04
+
+    steps:
+    - uses: actions/checkout@v1
+
+    - name: Install dependencies
+      run: |
+        sudo apt -y update
+        sudo apt -y install libsdl2-dev python3-venv
+        sudo apt -y install ffmpeg libavcodec-dev libavutil-dev libavformat-dev libavdevice-dev libavfilter-dev libswscale-dev libswresample-dev libpostproc-dev
+
+    - name: Build
+      run: |
+        make -j$(($(nproc)+1))
+    - name: Run tests with OpenGLES2
       run: |
-        DISABLE_TESTS_SAMPLES=yes DISABLE_TESTS_STD430=yes BACKEND=gles DEBUG=yes DEBUG_GL=yes make -k -j$(($(nproc)+1)) tests
+        MESA_GLES_VERSION_OVERRIDE=2.0 DEBUG=yes DEBUG_GL=yes make -k -j$(($(nproc)+1)) tests TESTS_SUITE=opengles

.github/workflows/ci_mac.yml

@@ -7,7 +7,7 @@ on:
   pull_request:
 
 jobs:
-  build_libs:
+  macos:
 
     runs-on: macos-latest
 

.github/workflows/ci_win.yml

@@ -0,0 +1,98 @@
+name: 'tests Windows'
+
+on:
+  push:
+    branches:
+      - 'master'
+  pull_request:
+
+jobs:
+  mingw:
+
+    runs-on: windows-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: msys2/setup-msys2@v2
+        with:
+          msystem: MINGW64 # Start a 64 bit Mingw environment
+          update: true
+
+      - name: Install dependencies
+        run: |
+          C:\msys64\usr\bin\bash -lc "pacman -S --noconfirm --needed git make"
+          C:\msys64\usr\bin\bash -lc "pacman -S --noconfirm --needed mingw-w64-x86_64-{toolchain,ffmpeg,python}"
+          C:\msys64\usr\bin\bash -lc "pacman -S --noconfirm --needed mingw-w64-x86_64-python3-{pillow,pip}"
+          C:\msys64\usr\bin\bash -lc "pacman -S --noconfirm --needed mingw-w64-x86_64-meson"
+
+      - name: Build
+        run: |
+          $env:CHERE_INVOKING = 'yes'  # Preserve the current working directory
+          C:\msys64\usr\bin\bash -lc "make -j$(($(nproc)+1)) TARGET_OS=MinGW-w64"
+
+  win-msvc:
+
+    runs-on: windows-latest
+
+    defaults:
+      run:
+        shell: wsl-bash {0}
+
+    steps:
+      - uses: Vampire/setup-wsl@v1
+        with:
+          distribution: Ubuntu-20.04
+
+      - uses: actions/checkout@v2
+
+      - name: Install dependencies
+        run: |
+          sudo apt -y update
+          sudo apt -y install build-essential zip
+          pip.exe install meson
+          wget https://github.com/jmoguillansky-gpsw/gopro-pkg/blob/master/external/win64/pkg-config.exe?raw=true -O pkg-config.exe
+
+      - name: Restore from cache and install vcpkg
+        uses: lukka/run-vcpkg@v6
+        with:
+          vcpkgGitCommitId: 595777db2332a3442b73f9af9f656355f207aec9
+          vcpkgTriplet: x64-windows
+          vcpkgArguments: pthreads opengl-registry ffmpeg[ffmpeg] sdl2
+          cleanAfterBuild: false
+
+      - name: vcpkg integrate install
+        run: |
+          cd vcpkg && ./vcpkg.exe integrate install
+
+      - name: Build
+        run: |
+          make -j8 TARGET_OS=Windows PKG_CONFIG="D:\\\\a\\\\gopro-lib-node.gl\\\\gopro-lib-node.gl\\\\pkg-config.exe" VCPKG_DIR="D:\\\\a\\\\gopro-lib-node.gl\\\\gopro-lib-node.gl\\\\vcpkg"
+
+#      - name: Setup debug session using tmate
+#        if: always()
+#        run: |
+#          sudo apt -y update
+#          #Install tmate
+#          sudo apt-get install -y tmate openssh-client
+#          # Generate ssh key if needed
+#          [ -e ~/.ssh/id_rsa ] || ssh-keygen -t rsa -f ~/.ssh/id_rsa -q -N ""
+#          # Run deamonized tmate
+#          echo Running tmate...
+#          tmate -S /tmp/tmate.sock new-session -d
+#          tmate -S /tmp/tmate.sock wait tmate-ready
+#          # Print connection info
+#          tmate -S /tmp/tmate.sock display -p '#{tmate_ssh}'
+#
+#      - name: Wait for connection
+#        if: always()
+#        run: |
+#          # Wait for connection
+#          while [ -S /tmp/tmate.sock ]; do
+#            sleep 1
+#          done
+
+
+#      - name: Run tests
+#        run: |
+#          make -j8 tests PYTHON="C:/hostedtoolcache/windows/Python/3.9.0/x64/python.exe" TARGET_OS=Windows

.gitignore

@@ -1,8 +1,5 @@
-*.d
-*.exe
-*.o
+/builddir
 nodegl-env/
-sxplayer*
-*.gcda
-*.gcno
-ngl-cov/
+/sxplayer*
+/external/win64
+external/token.cfg