summaryrefslogtreecommitdiff
path: root/src/fruits
diff options
context:
space:
mode:
authorAndrew Opalach <andrew@akon.city> 2024-11-13 21:46:10 -0500
committerAndrew Opalach <andrew@akon.city> 2024-11-13 21:46:10 -0500
commit58d38d767442c83e31ae6dbaea7b1fc8ccb00633 (patch)
treeb5b6e3bb845bc7b18ff2fc41fe60ad09ad30537d /src/fruits
parent8c996a5b597bd1cd9c188a0e61eae1ff718c8ca2 (diff)
downloadcamu-58d38d767442c83e31ae6dbaea7b1fc8ccb00633.tar.gz
camu-58d38d767442c83e31ae6dbaea7b1fc8ccb00633.tar.bz2
camu-58d38d767442c83e31ae6dbaea7b1fc8ccb00633.zip
Cleanup build
Signed-off-by: Andrew Opalach <andrew@akon.city>
Diffstat (limited to 'src/fruits')
-rw-r--r--src/fruits/cmc/meson.build2
-rw-r--r--src/fruits/cmsrv/meson.build6
-rw-r--r--src/fruits/cmv/meson.build2
-rw-r--r--src/fruits/ctv/meson.build2
-rw-r--r--src/fruits/droid/ctv/app/src/main/AndroidManifest.xml6
5 files changed, 10 insertions, 8 deletions
diff --git a/src/fruits/cmc/meson.build b/src/fruits/cmc/meson.build
index 4cbe553..6f79b78 100644
--- a/src/fruits/cmc/meson.build
+++ b/src/fruits/cmc/meson.build
@@ -1,5 +1,5 @@
cmc_src = ['cmc.c']
-cmc_deps = [libclient]
+cmc_deps = [common_deps, libclient]
cmc_args = []
if get_option('portal').enabled()
diff --git a/src/fruits/cmsrv/meson.build b/src/fruits/cmsrv/meson.build
index ee8eb91..1ace2c2 100644
--- a/src/fruits/cmsrv/meson.build
+++ b/src/fruits/cmsrv/meson.build
@@ -1,11 +1,7 @@
cmsrv_src = ['cmsrv.c']
-cmsrv_deps = [server]
+cmsrv_deps = [common_deps, server]
cmsrv_args = []
-if get_option('portal').enabled()
- cmsrv_deps += [portal]
-endif
-
use_tui = true
if use_tui
cmsrv_src += ['ui.c']
diff --git a/src/fruits/cmv/meson.build b/src/fruits/cmv/meson.build
index ba571c3..bdb7d85 100644
--- a/src/fruits/cmv/meson.build
+++ b/src/fruits/cmv/meson.build
@@ -1,5 +1,5 @@
cmv_src = ['cmv.c']
-cmv_deps = [desktop]
+cmv_deps = [common_deps, desktop]
cmv_args = []
if get_option('sink-only')
cmv_args += ['-DCAMU_SINK_ONLY']
diff --git a/src/fruits/ctv/meson.build b/src/fruits/ctv/meson.build
index c06cec3..dff208d 100644
--- a/src/fruits/ctv/meson.build
+++ b/src/fruits/ctv/meson.build
@@ -1,5 +1,5 @@
ctv_src = ['ctv.c']
-ctv_deps = [common_deps, buffer, render, screen, mixer, libsink]
+ctv_deps = [common_deps, libsink]
ctv_args = ['-DCAMU_MIXER_THREADED', '-DCAMU_SCREEN_THREADED']
# https://github.com/google/ExoPlayer/issues/9933#issuecomment-1029775358
diff --git a/src/fruits/droid/ctv/app/src/main/AndroidManifest.xml b/src/fruits/droid/ctv/app/src/main/AndroidManifest.xml
index 4393ee9..00f96c1 100644
--- a/src/fruits/droid/ctv/app/src/main/AndroidManifest.xml
+++ b/src/fruits/droid/ctv/app/src/main/AndroidManifest.xml
@@ -1,8 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.INTERNET" />
+ <uses-feature android:name="android.software.leanback"
+ android:required="false" />
+ <uses-feature android:name="android.hardware.touchscreen"
+ android:required="false" />
<application
android:allowBackup="true"
+ android:banner="@mipmap/ic_launcher"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:hasCode="false"
@@ -18,6 +23,7 @@
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
+ <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
</intent-filter>
</activity>
</application>