switch to meson build system (#11)

.dockerignore

@@ -1,4 +1,6 @@
-*.o
-/deps
-/prefix
-/mtxrpicam_*
+/build
+/subprojects/*
+!/subprojects/packagefiles
+!/subprojects/freetype.wrap
+!/subprojects/libcamera.wrap
+!/subprojects/x264.wrap

.github/workflows/release.yml

@@ -14,11 +14,11 @@ jobs:
 
     - run: make -f utils.mk build_32
 
-    - run: tar -czf mtxrpicam_32.tar.gz mtxrpicam_32
+    - run: cd build && tar -czf mtxrpicam_32.tar.gz mtxrpicam_32
 
     - uses: actions/upload-artifact@v4
       with:
-        path: mtxrpicam_32.tar.gz
+        path: build/mtxrpicam_32.tar.gz
         name: mtxrpicam_32.tar.gz
 
   build_64:
@@ -29,11 +29,11 @@ jobs:
 
     - run: make -f utils.mk build_64
 
-    - run: tar -czf mtxrpicam_64.tar.gz mtxrpicam_64
+    - run: cd build && tar -czf mtxrpicam_64.tar.gz mtxrpicam_64
 
     - uses: actions/upload-artifact@v4
       with:
-        path: mtxrpicam_64.tar.gz
+        path: build/mtxrpicam_64.tar.gz
         name: mtxrpicam_64.tar.gz
 
   github_release:

.github/workflows/test.yml

@@ -15,11 +15,11 @@ jobs:
 
     - run: make -f utils.mk build_32
 
-    - run: tar -czf mtxrpicam_32.tar.gz mtxrpicam_32
+    - run: cd build && tar -czf mtxrpicam_32.tar.gz mtxrpicam_32
 
     - uses: actions/upload-artifact@v4
       with:
-        path: mtxrpicam_32.tar.gz
+        path: build/mtxrpicam_32.tar.gz
         name: mtxrpicam_32.tar.gz
 
   build_64:
@@ -30,11 +30,11 @@ jobs:
 
     - run: make -f utils.mk build_64
 
-    - run: tar -czf mtxrpicam_64.tar.gz mtxrpicam_64
+    - run: cd build && tar -czf mtxrpicam_64.tar.gz mtxrpicam_64
 
     - uses: actions/upload-artifact@v4
       with:
-        path: mtxrpicam_64.tar.gz
+        path: build/mtxrpicam_64.tar.gz
         name: mtxrpicam_64.tar.gz
 
   test_bullseye_32:
@@ -47,9 +47,9 @@ jobs:
     - uses: actions/download-artifact@v4
       with:
         name: mtxrpicam_32.tar.gz
-        path: .
+        path: build/
 
-    - run: tar xvf mtxrpicam_32.tar.gz
+    - run: cd build && tar xvf mtxrpicam_32.tar.gz
 
     - run: make -f utils.mk test_bullseye_32
 
@@ -63,9 +63,9 @@ jobs:
     - uses: actions/download-artifact@v4
       with:
         name: mtxrpicam_64.tar.gz
-        path: .
+        path: build/
 
-    - run: tar xvf mtxrpicam_64.tar.gz
+    - run: cd build && tar xvf mtxrpicam_64.tar.gz
 
     - run: make -f utils.mk test_bullseye_64
 
@@ -79,9 +79,9 @@ jobs:
     - uses: actions/download-artifact@v4
       with:
         name: mtxrpicam_32.tar.gz
-        path: .
+        path: build/
 
-    - run: tar xvf mtxrpicam_32.tar.gz
+    - run: cd build && tar xvf mtxrpicam_32.tar.gz
 
     - run: make -f utils.mk test_bookworm_32
 
@@ -95,8 +95,8 @@ jobs:
     - uses: actions/download-artifact@v4
       with:
         name: mtxrpicam_64.tar.gz
-        path: .
+        path: build/
 
-    - run: tar xvf mtxrpicam_64.tar.gz
+    - run: cd build && tar xvf mtxrpicam_64.tar.gz
 
     - run: make -f utils.mk test_bookworm_64

.gitignore

@@ -1,4 +1,6 @@
-*.o
-/deps
-/prefix
-/mtxrpicam_*
+/build
+/subprojects/*
+!/subprojects/packagefiles
+!/subprojects/freetype.wrap
+!/subprojects/libcamera.wrap
+!/subprojects/x264.wrap

README.md

@@ -15,13 +15,11 @@ This is embedded into all MediaMTX releases and shouldn't normally be downloaded
    ```sh
    sudo apt install -y \
    g++ \
-   make \
    xxd \
    wget \
    git \
    cmake \
    meson \
-   patch \
    pkg-config \
    python3-jinja2 \
    python3-yaml \
@@ -31,10 +29,10 @@ This is embedded into all MediaMTX releases and shouldn't normally be downloaded
 3. Build:
 
    ```sh
-   make -j$(nproc)
+   meson setup build && DESTDIR=./prefix ninja -C build install
    ```
 
-   This will produce the `mtxrpicam_32` or `mtxrpicam_64` folder (depending on the architecture).
+   This will produce the `build/mtxrpicam_32` or `build/mtxrpicam_64` folder (depending on the architecture).
 
 ## Cross-compile
 
@@ -48,15 +46,15 @@ This is embedded into all MediaMTX releases and shouldn't normally be downloaded
    make -f utils.mk build
    ```
 
-   This will produce the `mtxrpicam_32` and `mtxrpicam_64` folders.
+   This will produce the `build/mtxrpicam_32` and `build/mtxrpicam_64` folders.
 
 ## Install
 
 1. Download MediaMTX source code and open a terminal in it
 
 2. Run `go generate ./...`
 
-3. Copy `mtxrpicam_32` and/or `mtxrpicam_64` inside `internal/staticsources/rpicamera/`
+3. Copy `build/mtxrpicam_32` and/or `build/mtxrpicam_64` inside `internal/staticsources/rpicamera/`
 
 4. Compile MediaMTX
 

encoder.c

@@ -5,6 +5,7 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
+#include <time.h>
 
 #include <linux/videodev2.h>