From 0faa661f2bd7700d8aec8526cb1328802d4a8c8c Mon Sep 17 00:00:00 2001 From: tytan652 Date: Mon, 24 Jul 2023 10:50:54 +0200 Subject: [PATCH] CI,build-aux: Add uthash on Linux --- .github/scripts/utils.zsh/setup_linux | 1 + build-aux/com.obsproject.Studio.json | 1 + build-aux/modules/90-uthash.json | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 build-aux/modules/90-uthash.json diff --git a/.github/scripts/utils.zsh/setup_linux b/.github/scripts/utils.zsh/setup_linux index 4bf0da75f..fa7ec3549 100644 --- a/.github/scripts/utils.zsh/setup_linux +++ b/.github/scripts/utils.zsh/setup_linux @@ -90,6 +90,7 @@ sudo apt-get install -y --no-install-recommends \ libmbedtls-dev \ libgl1-mesa-dev \ libjansson-dev \ + uthash-dev \ libluajit-5.1-dev python3-dev \ libx11-dev libxcb-randr0-dev libxcb-shm0-dev libxcb-xinerama0-dev \ libxcb-composite0-dev libxinerama-dev libxcb1-dev libx11-xcb-dev libxcb-xfixes0-dev \ diff --git a/build-aux/com.obsproject.Studio.json b/build-aux/com.obsproject.Studio.json index 2c2c18b25..011ba0b7f 100644 --- a/build-aux/com.obsproject.Studio.json +++ b/build-aux/com.obsproject.Studio.json @@ -67,6 +67,7 @@ "modules/50-v4l-utils.json", "modules/90-asio.json", "modules/90-nlohmann-json.json", + "modules/90-uthash.json", "modules/90-websocketpp.json", "modules/99-cef.json", { diff --git a/build-aux/modules/90-uthash.json b/build-aux/modules/90-uthash.json new file mode 100644 index 000000000..7b1958e02 --- /dev/null +++ b/build-aux/modules/90-uthash.json @@ -0,0 +1,19 @@ +{ + "name": "uthash", + "buildsystem": "simple", + "build-commands": [ + "mkdir -p /app/include", + "cp src/{utarray.h,uthash.h,utlist.h,utringbuffer.h,utstack.h,utstring.h} /app/include/" + ], + "cleanup": [ + "*" + ], + "sources": [ + { + "type": "git", + "url": "https://github.com/troydhanson/uthash.git", + "tag": "v2.3.0", + "commit": "e493aa90a2833b4655927598f169c31cfcdf7861" + } + ] +}