From f56abfafcd4fa722b807278b138f805112cd953e Mon Sep 17 00:00:00 2001
From: Andrew Opalach <andrew@akon.city>
Date: Tue, 29 Oct 2024 16:47:10 -0400
Subject: Update deps and cleanup build

Signed-off-by: Andrew Opalach <andrew@akon.city>
---
 src/buffer/meson.build  |  2 +-
 src/codec/meson.build   | 14 +++++++-------
 src/liana/meson.build   |  8 ++++----
 src/mixer/meson.build   |  3 +--
 src/portal/cpy/build.sh |  1 +
 src/portal/meson.build  |  6 ++++--
 6 files changed, 18 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/buffer/meson.build b/src/buffer/meson.build
index a2def3e..a3538f1 100644
--- a/src/buffer/meson.build
+++ b/src/buffer/meson.build
@@ -1,7 +1,7 @@
-no_video = meson.is_subproject()
 buffer_src = ['audio.c', 'clock.c', 'peak_buffer.c']
 buffer_deps = [common_deps]
 buffer_args = []
+no_video = meson.is_subproject()
 if not no_video
   buffer_src += ['video.c']
 else
diff --git a/src/codec/meson.build b/src/codec/meson.build
index 7a01040..d27099a 100644
--- a/src/codec/meson.build
+++ b/src/codec/meson.build
@@ -9,15 +9,15 @@ if get_option('codecs').contains('ffmpeg')
     'ffmpeg/scaler.c',
     'ffmpeg/encoder.c',
   ]
+  if not get_option('sink-only')
+    ffmpeg_src += [
+      'ffmpeg/demuxer.c',
+      'ffmpeg/avio.c'
+    ]
+  endif
   ffmpeg_inc = []
   ffmpeg_deps = []
   ffmpeg_args = []
-if not get_option('sink-only')
-  ffmpeg_src += [
-    'ffmpeg/demuxer.c',
-    'ffmpeg/avio.c'
-  ]
-endif
 
   libavutil = dependency('libavutil', required: false)
   libavformat = dependency('libavformat', required: false)
@@ -49,7 +49,7 @@ endif
     ffmpeg_deps += [libavutil, libavformat, libavcodec, libswresample, libswscale]
     ffmpeg_args += ['-DCAMU_HAVE_FFMPEG']
     ffmpeg_codec = declare_dependency(sources: ffmpeg_src, dependencies: ffmpeg_deps,
-        include_directories: ffmpeg_inc, compile_args: ffmpeg_args)
+      include_directories: ffmpeg_inc, compile_args: ffmpeg_args)
     codec_deps += [ffmpeg_codec]
   endif
 endif
diff --git a/src/liana/meson.build b/src/liana/meson.build
index da53214..32e6a00 100644
--- a/src/liana/meson.build
+++ b/src/liana/meson.build
@@ -19,7 +19,7 @@ if cache_have_cdio
   liana_args += ['-DLIANA_HAVE_CDIO']
 endif
 
-liana_server = declare_dependency(sources: liana_server_src, dependencies: liana_deps,
-    compile_args: [liana_args, '-DLIANA_SERVER'])
-liana_client = declare_dependency(sources: liana_client_src, dependencies: liana_deps,
-    compile_args: [liana_args, '-DLIANA_CLIENT'])
+liana_server = declare_dependency(sources: liana_server_src,
+  dependencies: liana_deps, compile_args: [liana_args, '-DLIANA_SERVER'])
+liana_client = declare_dependency(sources: liana_client_src,
+  dependencies: liana_deps, compile_args: [liana_args, '-DLIANA_CLIENT'])
diff --git a/src/mixer/meson.build b/src/mixer/meson.build
index be5894f..f3ea6c7 100644
--- a/src/mixer/meson.build
+++ b/src/mixer/meson.build
@@ -29,5 +29,4 @@ else
   mixer_src += ['audio_null.c']
 endif
 
-mixer = declare_dependency(sources: mixer_src, dependencies: mixer_deps,
-  compile_args: mixer_args)
+mixer = declare_dependency(sources: mixer_src, dependencies: mixer_deps, compile_args: mixer_args)
diff --git a/src/portal/cpy/build.sh b/src/portal/cpy/build.sh
index 15ff4f5..5e5fb10 100755
--- a/src/portal/cpy/build.sh
+++ b/src/portal/cpy/build.sh
@@ -1,3 +1,4 @@
 #! /usr/bin/env sh
+cd $1
 export PYTHONDONTWRITEBYTECODE=1
 python3 setup.py build_ext -i
diff --git a/src/portal/meson.build b/src/portal/meson.build
index c3bbeb4..7cf31a7 100644
--- a/src/portal/meson.build
+++ b/src/portal/meson.build
@@ -7,8 +7,10 @@ portal_src = [
 portal_deps = []
 portal_args = ['-DCAMU_HAVE_PORTAL']
 
+cpy_dir = join_paths(meson.current_source_dir(), 'cpy')
+run_command(join_paths(cpy_dir, 'build.sh'), cpy_dir)
+
 python3_embed = import('python').find_installation('python3.12').dependency(embed: true)
 portal_deps += [python3_embed]
 
-portal = declare_dependency(sources: portal_src, dependencies: portal_deps,
-    compile_args: portal_args)
+portal = declare_dependency(sources: portal_src, dependencies: portal_deps, compile_args: portal_args)
-- 
cgit v1.2.3-101-g0448