diff options
| author |   Andrew Opalach <andrew@akon.city>
| 2024-01-05 20:53:10 -0500 |
|---|---|---|
| committer | Andrew Opalach <andrew@akon.city>
| 2024-01-05 20:53:10 -0500 |
| commit | 11bbaf5198d15da44731ffb63411558f1c72f97e (patch) | |
| tree | 84f490c6509e5d13e6d71db5bc96a9502a795258 | |
| parent | b1f375225c1e4096461d08fa351d78062d0ae47b (diff) | |
| download | camu-11bbaf5198d15da44731ffb63411558f1c72f97e.tar.gz camu-11bbaf5198d15da44731ffb63411558f1c72f97e.tar.bz2 camu-11bbaf5198d15da44731ffb63411558f1c72f97e.zip | |
Cleanup and fix build
Signed-off-by: Andrew Opalach <andrew@akon.city>
| -rw-r--r-- | .editorconfig | 3 | ||||
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | flake.lock | 6 | ||||
| -rw-r--r-- | flake.nix | 1 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | pyrightconfig.json | 6 | ||||
| -rwxr-xr-x | scripts/line_count.sh | 3 | ||||
| -rw-r--r-- | subprojects/libplacebo.wrap | 2 |
8 files changed, 14 insertions, 13 deletions
diff --git a/.editorconfig b/.editorconfig index f989111..f0409bd 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,3 +1,6 @@ +root = true + +[*] indent_style=space indent_size=4 tab_width=4 @@ -8,6 +8,7 @@ data/ doc/**.html old/ old_old/ +subprojects/c89atomic/ subprojects/c89atomic.wrap subprojects/curl.wrap subprojects/ffmpeg-6.1/ @@ -15,8 +16,10 @@ subprojects/jansson.wrap subprojects/libakiyo subprojects/libalabaster subprojects/libass/ +subprojects/libev-4.33/ subprojects/libev.wrap subprojects/liblfds.wrap +subprojects/liblfds7.1.1/ subprojects/libplacebo/ subprojects/linmath.h/ subprojects/miniaudio/ @@ -30,5 +33,6 @@ subprojects/stb/ subprojects/vulkan/ subprojects/vulkan.wrap subprojects/wayland-protocols.wrap +subprojects/wlr-protocols/ subprojects/wlr-protocols.wrap subprojects/wuffs/ @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1703637592, - "narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=", + "lastModified": 1704194953, + "narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8", + "rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6", "type": "github" }, "original": { @@ -35,6 +35,7 @@ python3.pkgs.pip python3.pkgs.cython python3.pkgs.setuptools + nodePackages.pyright gsettings-desktop-schemas multimarkdown asciidoc diff --git a/meson.build b/meson.build index 354f64e..ef9da30 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('camu', ['c', 'cpp'], version: '0.01', - default_options: ['warning_level=2', 'c_std=c99', 'cpp_std=c++11']) + default_options: ['warning_level=2', 'c_std=c99', 'cpp_std=c++20']) compiler = meson.get_compiler('c') cmake = import('cmake') diff --git a/pyrightconfig.json b/pyrightconfig.json deleted file mode 100644 index 2013e8b..0000000 --- a/pyrightconfig.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extraPaths": [ - "./subprojects/searxng" - ], - "reportUnusedVariable": false -} diff --git a/scripts/line_count.sh b/scripts/line_count.sh index a99b2c4..2ecb7f5 100755 --- a/scripts/line_count.sh +++ b/scripts/line_count.sh @@ -1,3 +1,2 @@ #! /usr/bin/env sh -find ./src -type f ! -path './src/shoki/cpy/shoki.[c|h]' ! -path '*__pycache__*' \ - ! -path './src/fruits/desktop/camu.[c|h][c|h]' | xargs wc -l +find ./src -type f | xargs wc -l diff --git a/subprojects/libplacebo.wrap b/subprojects/libplacebo.wrap index c98cdf2..e0f5e83 100644 --- a/subprojects/libplacebo.wrap +++ b/subprojects/libplacebo.wrap @@ -1,6 +1,6 @@ [wrap-git] url = https://code.videolan.org/videolan/libplacebo.git -revision = fa423b4242053f5061df87496cf7866df3384bd0 +revision = 52314e0e435fbcb731e326815d4091ed0ba27475 depth = 1 clone-recursive = true |