diff options
33 files changed, 597 insertions, 25 deletions
@@ -13,6 +13,8 @@ subprojects/BLAKE3/ subprojects/c89atomic.wrap subprojects/c89atomic/ subprojects/ffmpeg-*/ +subprojects/glfm.wrap +subprojects/glfm/ subprojects/glfw3.wrap subprojects/glfw3/ subprojects/jansson.wrap diff --git a/cross/aarch64-linux-android.txt b/cross/aarch64-linux-android.txt new file mode 100644 index 0000000..c522b81 --- /dev/null +++ b/cross/aarch64-linux-android.txt @@ -0,0 +1,15 @@ +[binaries] +c = 'aarch64-linux-android31-clang' +cpp = 'aarch64-linux-android31-clang++' +as = 'aarch64-linux-android-as' + +[cmake] +ANDROID_ABI = 'arm64-v8a' +ANDROID_PLATFORM = '23' +CMAKE_SYSTEM_VERSION = '23' + +[host_machine] +system = 'android' +cpu_family = 'aarch64' +cpu = 'aarch64' +endian = 'little' diff --git a/cross/armv7a-linux-android.txt b/cross/armv7a-linux-android.txt new file mode 100644 index 0000000..9557dac --- /dev/null +++ b/cross/armv7a-linux-android.txt @@ -0,0 +1,15 @@ +[binaries] +c = 'armv7a-linux-androideabi31-clang' +cpp = 'armv7a-linux-androideabi31-clang++' +as = 'arm-linux-androideabi-as' + +[cmake] +ANDROID_ABI = 'armeabi-v7a' +ANDROID_PLATFORM = '23' +CMAKE_SYSTEM_VERSION = '23' + +[host_machine] +system = 'android' +cpu_family = 'armv7-a' +cpu = 'armv7-a' +endian = 'little' @@ -14,7 +14,14 @@ }); }) ]; - pkgs = import nixpkgs { inherit overlays; inherit system; }; + pkgs = import nixpkgs { + inherit system; + inherit overlays; + config = { + allowUnfree = true; + android_sdk.accept_license = true; + }; + }; in with pkgs; rec { @@ -182,6 +189,43 @@ exec ${pkgs.zsh}/bin/zsh -l ''; }; + + devShells.android = let + cmakeVersion = "3.22.1"; + androidComposition = androidenv.composeAndroidPackages { + cmdLineToolsVersion = "13.0"; + toolsVersion = "26.1.1"; + platformToolsVersion = "34.0.5"; + buildToolsVersions = [ "34.0.0" ]; + includeEmulator = false; + emulatorVersion = "35.2.5"; + platformVersions = [ "34" ]; + includeSources = false; + includeSystemImages = false; + systemImageTypes = [ "google_apis_playstore" ]; + abiVersions = [ "armeabi-v7a" "arm64-v8a" ]; + cmakeVersions = [ cmakeVersion ]; + includeNDK = true; + ndkVersions = ["23.2.8568313"]; + useGoogleAPIs = false; + useGoogleTVAddOns = false; + includeExtras = [ "extras;google;gcm" ]; + }; + in pkgs.mkShell rec { + ANDROID_HOME = "${androidComposition.androidsdk}/libexec/android-sdk"; + ANDROID_NDK_ROOT = "${ANDROID_HOME}/ndk-bundle"; + nativeBuildInputs = [ + ninja + meson + androidComposition.androidsdk + ]; + shellHook = '' + export NIX_SHELL="camu-android" + export PATH="$(echo "$ANDROID_HOME/cmake/${cmakeVersion}"*/bin):$PATH" + export PATH="$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH" + exec ${pkgs.zsh}/bin/zsh -l + ''; + }; } ); } diff --git a/meson.build b/meson.build index 3cff345..0cc690b 100644 --- a/meson.build +++ b/meson.build @@ -6,7 +6,9 @@ cmake = import('cmake') is_debug = get_option('buildtype').startswith('debug') is_minsize = get_option('buildtype') == 'minsize' +is_linux = host_machine.system() == 'linux' is_windows = host_machine.system() == 'windows' +is_android = host_machine.system() == 'android' alabaster = subproject('libalabaster') akiyo_opts = [] @@ -18,10 +20,16 @@ akiyo_has_curl = akiyo.get_variable('akiyo_has_curl') akiyo_has_mmap = akiyo.get_variable('akiyo_has_mmap') common_deps = [alabaster.get_variable('alabaster'), akiyo.get_variable('akiyo')] -sink_use_vulkan = false +if is_linux + window = 'window=wayland' +elif is_android + window = 'window=glfm' +else + window = 'window=glfw' +endif stela = subproject('stela', default_options: [ - sink_use_vulkan ? 'api=vulkan' : 'api=opengl', - is_windows ? 'window=glfw' : 'window=wayland', + get_option('sink-use-vulkan') ? 'api=vulkan' : 'api=opengl', + window, 'poll=inline', 'event-buffer=false', 'pause=true' @@ -64,6 +72,10 @@ if get_option('sink').enabled() endif endif +if is_android + subdir('src/fruits/ctv') +endif + if get_option('tests') subdir('tests') endif diff --git a/meson_options.txt b/meson_options.txt index f187f48..9956981 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,5 +1,6 @@ option('sink', type: 'feature', value: 'enabled') option('sink-only', type: 'boolean', value: true) +option('sink-use-vulkan', type: 'boolean', value: false) option('codecs', type: 'array', choices: ['ffmpeg', 'stb_image', 'spng', 'wuffs'], value: ['ffmpeg']) option('renderer', type: 'combo', choices: ['libplacebo', 'tiger'], value: 'libplacebo') option('portal', type: 'feature', value: 'disabled') diff --git a/src/codec/meson.build b/src/codec/meson.build index d27099a..32a942e 100644 --- a/src/codec/meson.build +++ b/src/codec/meson.build @@ -32,12 +32,14 @@ if get_option('codecs').contains('ffmpeg') libavcodec = ffmpeg_proj.get_variable('avcodec') libswresample = ffmpeg_proj.get_variable('swresample') libswscale = ffmpeg_proj.get_variable('swscale') - # Only used to set include dirs for ffmpeg. - ffmpeg_inc_dep = ffmpeg_proj.get_variable('ffmpeg_inc_dep') - # Extra static dependencies. - zlib = dependency('zlib') - bcrypt = compiler.find_library('bcrypt') - ffmpeg_deps += [ffmpeg_inc_dep, zlib, bcrypt] + # Only used to set include dirs for FFmpeg. + ffmpeg_deps += [ffmpeg_proj.get_variable('ffmpeg_inc_dep')] + # We explicitly enable zlib in the FFmpeg build. + ffmpeg_deps += [dependency('zlib')] + if is_windows + # Extra static dependencies for Windows. + ffmpeg_deps += [compiler.find_library('bcrypt')] + endif soxr = compiler.find_library('soxr', required: false) if soxr.found() ffmpeg_deps += [soxr] diff --git a/src/fruits/ctv/ctv.c b/src/fruits/ctv/ctv.c new file mode 100644 index 0000000..9c45637 --- /dev/null +++ b/src/fruits/ctv/ctv.c @@ -0,0 +1,26 @@ +#include <stl/window.h> +#include <stl/platform.h> + +#include "../../sink/desktop.h" + +struct ctv { + struct aki_event_loop loop; + struct camu_desktop desktop; +}; + +static void onSurfaceDestroyed(GLFMDisplay *display) { +} + +static void onDraw(GLFMDisplay *display) { +} + +void glfmMain(GLFMDisplay *display) { + glfmSetDisplayConfig(display, + GLFMRenderingAPIOpenGLES2, + GLFMColorFormatRGBA8888, + GLFMDepthFormatNone, + GLFMStencilFormatNone, + GLFMMultisampleNone); + glfmSetRenderFunc(display, onDraw); + glfmSetSurfaceDestroyedFunc(display, onSurfaceDestroyed); +} diff --git a/src/fruits/ctv/meson.build b/src/fruits/ctv/meson.build new file mode 100644 index 0000000..768f9e1 --- /dev/null +++ b/src/fruits/ctv/meson.build @@ -0,0 +1,6 @@ +ctv_src = ['ctv.c'] +ctv_deps = [desktop] +ctv_args = [] + +# https://github.com/google/ExoPlayer/issues/9933#issuecomment-1029775358 +shared_library('ctv', ctv_src, dependencies: ctv_deps, c_args: ctv_args, link_args: ['-Wl,-Bsymbolic', '-static-libstdc++']) diff --git a/src/fruits/droid/ctv/.gitignore b/src/fruits/droid/ctv/.gitignore new file mode 100644 index 0000000..9c951ae --- /dev/null +++ b/src/fruits/droid/ctv/.gitignore @@ -0,0 +1,19 @@ +*.iml +.gradle +.idea +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties +app/src/main/jniLibs/arm64-v8a/* +app/src/main/jniLibs/armeabi-v7a/* +app/src/main/jniLibs/x86/* diff --git a/src/fruits/droid/ctv/app/.gitignore b/src/fruits/droid/ctv/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/src/fruits/droid/ctv/app/.gitignore @@ -0,0 +1 @@ +/build
\ No newline at end of file diff --git a/src/fruits/droid/ctv/app/build.gradle b/src/fruits/droid/ctv/app/build.gradle new file mode 100644 index 0000000..065f134 --- /dev/null +++ b/src/fruits/droid/ctv/app/build.gradle @@ -0,0 +1,31 @@ +plugins { + alias(libs.plugins.android.application) +} + +android { + namespace 'city.akon.ctv' + compileSdk 34 + ndkVersion '23.2.8568313' + + defaultConfig { + applicationId "city.akon.ctv" + minSdk 21 + targetSdk 34 + versionCode 1 + versionName "1.0" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 + } +} + +dependencies { +}
\ No newline at end of file diff --git a/src/fruits/droid/ctv/app/proguard-rules.pro b/src/fruits/droid/ctv/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/src/fruits/droid/ctv/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile
\ No newline at end of file diff --git a/src/fruits/droid/ctv/app/src/main/AndroidManifest.xml b/src/fruits/droid/ctv/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..be6971b --- /dev/null +++ b/src/fruits/droid/ctv/app/src/main/AndroidManifest.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<manifest xmlns:android="http://schemas.android.com/apk/res/android"> + + <application + android:allowBackup="true" + android:icon="@mipmap/ic_launcher" + android:label="@string/app_name" + android:hasCode="false" + android:supportsRtl="true" + android:theme="@android:style/Theme.DeviceDefault"> + + <activity android:name="android.app.NativeActivity" + android:exported="true" + android:configChanges="orientation|screenLayout|screenSize|keyboardHidden|keyboard"> + <meta-data + android:name="android.app.lib_name" + android:value="ctv" /> + <intent-filter> + <action android:name="android.intent.action.MAIN"/> + <category android:name="android.intent.category.LAUNCHER"/> + </intent-filter> + </activity> + </application> + +</manifest>
\ No newline at end of file diff --git a/src/fruits/droid/ctv/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/src/fruits/droid/ctv/app/src/main/res/mipmap-hdpi/ic_launcher.webp Binary files differnew file mode 100644 index 0000000..c209e78 --- /dev/null +++ b/src/fruits/droid/ctv/app/src/main/res/mipmap-hdpi/ic_launcher.webp diff --git a/src/fruits/droid/ctv/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/src/fruits/droid/ctv/app/src/main/res/mipmap-mdpi/ic_launcher.webp Binary files differnew file mode 100644 index 0000000..4f0f1d6 --- /dev/null +++ b/src/fruits/droid/ctv/app/src/main/res/mipmap-mdpi/ic_launcher.webp diff --git a/src/fruits/droid/ctv/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/src/fruits/droid/ctv/app/src/main/res/mipmap-xhdpi/ic_launcher.webp Binary files differnew file mode 100644 index 0000000..948a307 --- /dev/null +++ b/src/fruits/droid/ctv/app/src/main/res/mipmap-xhdpi/ic_launcher.webp diff --git a/src/fruits/droid/ctv/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/src/fruits/droid/ctv/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp Binary files differnew file mode 100644 index 0000000..28d4b77 --- /dev/null +++ b/src/fruits/droid/ctv/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp diff --git a/src/fruits/droid/ctv/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/src/fruits/droid/ctv/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp Binary files differnew file mode 100644 index 0000000..aa7d642 --- /dev/null +++ b/src/fruits/droid/ctv/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp diff --git a/src/fruits/droid/ctv/app/src/main/res/values/strings.xml b/src/fruits/droid/ctv/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..98f2c00 --- /dev/null +++ b/src/fruits/droid/ctv/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ +<resources> + <string name="app_name">ctv</string> +</resources>
\ No newline at end of file diff --git a/src/fruits/droid/ctv/build.gradle b/src/fruits/droid/ctv/build.gradle new file mode 100644 index 0000000..565f8c2 --- /dev/null +++ b/src/fruits/droid/ctv/build.gradle @@ -0,0 +1,4 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +plugins { +alias(libs.plugins.android.application) apply false +}
\ No newline at end of file diff --git a/src/fruits/droid/ctv/gradle.properties b/src/fruits/droid/ctv/gradle.properties new file mode 100644 index 0000000..4387edc --- /dev/null +++ b/src/fruits/droid/ctv/gradle.properties @@ -0,0 +1,21 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. For more details, visit +# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects +# org.gradle.parallel=true +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app's APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Enables namespacing of each library's R class so that its R class includes only the +# resources declared in the library itself and none from the library's dependencies, +# thereby reducing the size of the R class for that library +android.nonTransitiveRClass=true
\ No newline at end of file diff --git a/src/fruits/droid/ctv/gradle/libs.versions.toml b/src/fruits/droid/ctv/gradle/libs.versions.toml new file mode 100644 index 0000000..0b1b89c --- /dev/null +++ b/src/fruits/droid/ctv/gradle/libs.versions.toml @@ -0,0 +1,8 @@ +[versions] +agp = "8.7.1" + +[libraries] + +[plugins] +android-application = { id = "com.android.application", version.ref = "agp" } + diff --git a/src/fruits/droid/ctv/gradle/wrapper/gradle-wrapper.jar b/src/fruits/droid/ctv/gradle/wrapper/gradle-wrapper.jar Binary files differnew file mode 100644 index 0000000..e708b1c --- /dev/null +++ b/src/fruits/droid/ctv/gradle/wrapper/gradle-wrapper.jar diff --git a/src/fruits/droid/ctv/gradle/wrapper/gradle-wrapper.properties b/src/fruits/droid/ctv/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..354c93e --- /dev/null +++ b/src/fruits/droid/ctv/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed Oct 30 14:10:25 EDT 2024 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/src/fruits/droid/ctv/gradlew b/src/fruits/droid/ctv/gradlew new file mode 100755 index 0000000..4f906e0 --- /dev/null +++ b/src/fruits/droid/ctv/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/src/fruits/droid/ctv/gradlew.bat b/src/fruits/droid/ctv/gradlew.bat new file mode 100644 index 0000000..ac1b06f --- /dev/null +++ b/src/fruits/droid/ctv/gradlew.bat @@ -0,0 +1,89 @@ +@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/src/fruits/droid/ctv/settings.gradle b/src/fruits/droid/ctv/settings.gradle new file mode 100644 index 0000000..ec29b53 --- /dev/null +++ b/src/fruits/droid/ctv/settings.gradle @@ -0,0 +1,23 @@ +pluginManagement { + repositories { + google { + content { + includeGroupByRegex("com\\.android.*") + includeGroupByRegex("com\\.google.*") + includeGroupByRegex("androidx.*") + } + } + mavenCentral() + gradlePluginPortal() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} + +rootProject.name = "ctv" +include ':app' diff --git a/src/mixer/audio_miniaudio.c b/src/mixer/audio_miniaudio.c index 7db1b5a..2f98335 100644 --- a/src/mixer/audio_miniaudio.c +++ b/src/mixer/audio_miniaudio.c @@ -17,12 +17,17 @@ _Pragma("GCC diagnostic pop") #endif static ma_backend backends[] = { -#ifndef _WIN32 +#ifdef MA_ENABLE_PULSEAUDIO ma_backend_pulseaudio, - ma_backend_alsa -#else - ma_backend_wasapi -// ma_backend_dsound +#endif +#ifdef MA_ENABLE_ALSA + ma_backend_alsa, +#endif +#ifdef MA_ENABLE_WASAPI + ma_backend_wasapi, +#endif +#ifdef MA_ENABLE_AAUDIO + ma_backend_aaudio, #endif }; diff --git a/src/mixer/meson.build b/src/mixer/meson.build index f3ea6c7..0a2e9d7 100644 --- a/src/mixer/meson.build +++ b/src/mixer/meson.build @@ -16,14 +16,15 @@ if use_miniaudio '-DMA_NO_ENGINE', '-DMA_NO_GENERATION', ] - if not is_windows + if is_linux libpulse = dependency('libpulse') alsa = dependency('alsa') mixer_deps += [libpulse, alsa] mixer_args += ['-DMA_ENABLE_ALSA', '-DMA_ENABLE_PULSEAUDIO', '-DMA_NO_RUNTIME_LINKING'] - else + elif is_windows mixer_args += ['-DMA_ENABLE_WASAPI'] - #mixer_args += ['-DMA_ENABLE_DSOUND'] + elif is_android + mixer_args += ['-DMA_ENABLE_AAUDIO'] endif else mixer_src += ['audio_null.c'] diff --git a/src/render/meson.build b/src/render/meson.build index b62a5a5..1b6fd71 100644 --- a/src/render/meson.build +++ b/src/render/meson.build @@ -22,7 +22,7 @@ elif get_option('renderer') == 'libplacebo' 'libdovi=disabled' ] - if sink_use_vulkan + if get_option('sink-use-vulkan') shaderc = dependency('shaderc', required: false, allow_fallback: false) if shaderc.found() render_deps += [shaderc] diff --git a/src/util/meson.build b/src/util/meson.build index 1d62f55..57b07d9 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -2,6 +2,7 @@ util_src = ['color_palette.c', 'blocking_ring_buffer.c'] blake3_opts = cmake.subproject_options() reltype = is_minsize ? 'MinSizeRel' : 'Release' blake3_opts.add_cmake_defines({ 'CMAKE_BUILD_TYPE': is_debug ? 'Debug' : reltype }) -blake3 = cmake.subproject('BLAKE3').dependency('blake3') +blake3_opts.add_cmake_defines({ 'CMAKE_POSITION_INDEPENDENT_CODE': true }) +blake3 = cmake.subproject('BLAKE3', options: blake3_opts).dependency('blake3') util_deps = [blake3] util = declare_dependency(sources: util_src, dependencies: util_deps) diff --git a/subprojects/packagefiles/ffmpeg/meson.build b/subprojects/packagefiles/ffmpeg/meson.build index d1c9d5a..511b233 100644 --- a/subprojects/packagefiles/ffmpeg/meson.build +++ b/subprojects/packagefiles/ffmpeg/meson.build @@ -17,14 +17,19 @@ if not is_debug endif extra_options += ['--cc=' + compiler.cmd_array()[0]] +extra_options += ['--arch=' + cpu] extra_options += ['--nm=' + meson.get_external_property('nm', 'nm')] extra_options += ['--ar=' + meson.get_external_property('ar', 'ar')] +if cpu == 'x86_64' or cpu == 'x86' + extra_options += ['--enable-x86asm'] +endif + if is_windows if is_64bit - extra_options += ['--target-os=win64', '--arch=x86_64'] + extra_options += ['--target-os=win64'] else - extra_options += ['--target-os=win32', '--arch=x86'] + extra_options += ['--target-os=win32'] endif if is_msvc extra_options += ['--toolchain=msvc'] @@ -63,8 +68,9 @@ proj = ext_proj.add_project('configure', '--incdir=@PREFIX@/@INCLUDEDIR@', '--enable-pic', '--enable-static', - '--disable-logging', '--disable-shared', + '--disable-stripping', + '--disable-logging', '--disable-all', '--disable-autodetect', '--disable-everything', @@ -88,11 +94,11 @@ proj = ext_proj.add_project('configure', '--disable-alsa', '--disable-xlib', '--disable-vulkan', - '--enable-nonfree', + '--enable-gpl', + '--enable-version3', '--enable-runtime-cpudetect', '--enable-asm', '--enable-inline-asm', - '--enable-x86asm', '--enable-avutil', '--enable-avformat', '--enable-avcodec', |
