From 6d6b6726fa7692aa9d869af9d56e215105c2b13e Mon Sep 17 00:00:00 2001 From: XxJSONDeruloxX Date: Sun, 25 Oct 2026 10:44:26 -0400 Subject: [PATCH] build: vendor pinned SDL3 bridge sources --- .gitattributes | 3 + .github/workflows/build.yml | 2 +- app/build.gradle | 17 +- app/src/main/cpp/CMakeLists.txt | 1 - app/src/main/cpp/sdl3bridge/CMakeLists.txt | 13 +- docs/development/sdl3-controllers.md | 14 +- third_party/README.md | 20 + third_party/sdl3/LICENSE.txt | 18 + .../patches/0001-droiddeck-integration.patch | 13 + third_party/sdl3/upstream.json | 61 ++ .../java/org/libsdl/app/HIDDevice.java | 0 .../app/HIDDeviceBLESteamController.java | 0 .../java/org/libsdl/app/HIDDeviceManager.java | 4 - .../java/org/libsdl/app/HIDDeviceUSB.java | 0 .../upstream}/java/org/libsdl/app/SDL.java | 0 .../java/org/libsdl/app/SDLActivity.java | 0 .../java/org/libsdl/app/SDLAudioManager.java | 0 .../org/libsdl/app/SDLControllerManager.java | 0 .../java/org/libsdl/app/SDLDummyEdit.java | 0 .../org/libsdl/app/SDLInputConnection.java | 0 .../java/org/libsdl/app/SDLSensorManager.java | 0 .../java/org/libsdl/app/SDLSurface.java | 0 third_party/sdlbridge/LICENSE | 674 ++++++++++++++++++ .../patches/0001-droiddeck-integration.patch | 76 ++ third_party/sdlbridge/upstream.json | 74 ++ .../com/example/dsedge/BridgeActivity.java | 2 +- .../com/example/dsedge/BridgeService.java | 3 +- .../com/example/dsedge/ControllerView.java | 0 .../com/example/dsedge/HookupIdentity.java | 0 .../java/com/example/dsedge/Host.java | 5 - .../java/com/example/dsedge/NativeBridge.java | 4 +- .../java/com/example/dsedge/SdlEngine.java | 0 .../com/example/dsedge/SdlHostActivity.java | 0 .../java/com/example/dsedge/Settings.java | 0 .../com/example/dsedge/UpdateChecker.java | 0 .../com/example/dsedge/UsbAttachActivity.java | 0 .../sdlbridge/upstream/native}/hkshm.h | 0 .../sdlbridge/upstream/native}/hookup.h | 0 .../sdlbridge/upstream/native}/main.c | 3 +- .../sdlbridge/upstream/native}/triton.h | 0 tools/prepare_controller_sources.py | 70 ++ tools/tests/test_controller_sources.py | 61 ++ 42 files changed, 1111 insertions(+), 27 deletions(-) create mode 100644 third_party/README.md create mode 100644 third_party/sdl3/LICENSE.txt create mode 100644 third_party/sdl3/patches/0001-droiddeck-integration.patch create mode 100644 third_party/sdl3/upstream.json rename {app/src/main => third_party/sdl3/upstream}/java/org/libsdl/app/HIDDevice.java (100%) rename {app/src/main => third_party/sdl3/upstream}/java/org/libsdl/app/HIDDeviceBLESteamController.java (100%) rename {app/src/main => third_party/sdl3/upstream}/java/org/libsdl/app/HIDDeviceManager.java (99%) rename {app/src/main => third_party/sdl3/upstream}/java/org/libsdl/app/HIDDeviceUSB.java (100%) rename {app/src/main => third_party/sdl3/upstream}/java/org/libsdl/app/SDL.java (100%) rename {app/src/main => third_party/sdl3/upstream}/java/org/libsdl/app/SDLActivity.java (100%) rename {app/src/main => third_party/sdl3/upstream}/java/org/libsdl/app/SDLAudioManager.java (100%) rename {app/src/main => third_party/sdl3/upstream}/java/org/libsdl/app/SDLControllerManager.java (100%) rename {app/src/main => third_party/sdl3/upstream}/java/org/libsdl/app/SDLDummyEdit.java (100%) rename {app/src/main => third_party/sdl3/upstream}/java/org/libsdl/app/SDLInputConnection.java (100%) rename {app/src/main => third_party/sdl3/upstream}/java/org/libsdl/app/SDLSensorManager.java (100%) rename {app/src/main => third_party/sdl3/upstream}/java/org/libsdl/app/SDLSurface.java (100%) create mode 100644 third_party/sdlbridge/LICENSE create mode 100644 third_party/sdlbridge/patches/0001-droiddeck-integration.patch create mode 100644 third_party/sdlbridge/upstream.json rename {app/src/main => third_party/sdlbridge/upstream}/java/com/example/dsedge/BridgeActivity.java (99%) rename {app/src/main => third_party/sdlbridge/upstream}/java/com/example/dsedge/BridgeService.java (99%) rename {app/src/main => third_party/sdlbridge/upstream}/java/com/example/dsedge/ControllerView.java (100%) rename {app/src/main => third_party/sdlbridge/upstream}/java/com/example/dsedge/HookupIdentity.java (100%) rename {app/src/main => third_party/sdlbridge/upstream}/java/com/example/dsedge/Host.java (85%) rename {app/src/main => third_party/sdlbridge/upstream}/java/com/example/dsedge/NativeBridge.java (98%) rename {app/src/main => third_party/sdlbridge/upstream}/java/com/example/dsedge/SdlEngine.java (100%) rename {app/src/main => third_party/sdlbridge/upstream}/java/com/example/dsedge/SdlHostActivity.java (100%) rename {app/src/main => third_party/sdlbridge/upstream}/java/com/example/dsedge/Settings.java (100%) rename {app/src/main => third_party/sdlbridge/upstream}/java/com/example/dsedge/UpdateChecker.java (100%) rename {app/src/main => third_party/sdlbridge/upstream}/java/com/example/dsedge/UsbAttachActivity.java (100%) rename {app/src/main/cpp/sdl3bridge/src => third_party/sdlbridge/upstream/native}/hkshm.h (100%) rename {app/src/main/cpp/sdl3bridge/src => third_party/sdlbridge/upstream/native}/hookup.h (100%) rename {app/src/main/cpp/sdl3bridge/src => third_party/sdlbridge/upstream/native}/main.c (99%) rename {app/src/main/cpp/sdl3bridge/src => third_party/sdlbridge/upstream/native}/triton.h (100%) create mode 100644 tools/prepare_controller_sources.py create mode 100644 tools/tests/test_controller_sources.py diff --git a/.gitattributes b/.gitattributes index 3cb68a29e1..cf7a1aaf9c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10,3 +10,6 @@ tools/mangoapp/mangoapp text eol=lf app/src/main/assets/desktop-removal/*.json text eol=lf app/src/main/assets/desktop-removal/*.txt text eol=lf *.pdf binary +third_party/sdlbridge/upstream/** -text +third_party/sdl3/upstream/** -text +third_party/*/patches/*.patch text eol=lf diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 146e7fe3bf..151b1d5d6d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -467,7 +467,7 @@ jobs: path: | app/.cxx app/build/intermediates/cxx - key: cxx-${{ env.NDK_VERSION }}-${{ hashFiles('app/src/main/cpp/**', 'tools/vr/src/xr_*.h') }} + key: cxx-${{ env.NDK_VERSION }}-${{ hashFiles('app/src/main/cpp/**', 'third_party/sdlbridge/**', 'third_party/sdl3/**', 'tools/prepare_controller_sources.py', 'tools/vr/src/xr_*.h') }} restore-keys: | cxx-${{ env.NDK_VERSION }}- diff --git a/app/build.gradle b/app/build.gradle index 8ba8c8ea09..3381f53128 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -149,6 +149,7 @@ android { arguments '-DANDROID_STL=c++_shared' arguments "-DDROIDDECK_VITURE_SDK_DIR=${vitureSdkDir.toString().replace('\\', '/')}" arguments "-DDROIDDECK_UVC_DIR=${uvcDir.toString().replace('\\', '/')}" + arguments "-DDROIDDECK_CONTROLLER_SOURCES_DIR=${layout.buildDirectory.dir('controller-sources').get().asFile.absolutePath.replace('\\', '/')}" } } } @@ -275,7 +276,21 @@ if (uvcDir) { tasks.named('preBuild').configure { dependsOn(stageUvcNotices) } android.sourceSets.main.assets.srcDir(layout.buildDirectory.dir('uvcAssets')) } -tasks.named('preBuild').configure { dependsOn(stageRuntimeAssets) } +def controllerSourcesDir = layout.buildDirectory.dir('controller-sources') +def prepareControllerSources = tasks.register('prepareControllerSources', Exec) { + inputs.dir(rootProject.file('third_party/sdlbridge')) + inputs.dir(rootProject.file('third_party/sdl3')) + inputs.file(rootProject.file('tools/prepare_controller_sources.py')) + outputs.dir(controllerSourcesDir) + workingDir rootProject.projectDir + commandLine pythonExecutable, 'tools/prepare_controller_sources.py', '--output', controllerSourcesDir.get().asFile.absolutePath +} +android.sourceSets.main.java.srcDir(controllerSourcesDir.map { it.dir('sdlbridge/java') }) +android.sourceSets.main.java.srcDir(controllerSourcesDir.map { it.dir('sdl3/java') }) +tasks.configureEach { task -> + if (task.name.startsWith('configureCMake')) task.dependsOn(prepareControllerSources) +} +tasks.named('preBuild').configure { dependsOn(stageRuntimeAssets, prepareControllerSources) } def verifyRuntimeInputs = tasks.register('verifyRuntimeInputs', Exec) { mustRunAfter(stageSessionScripts, stageRuntimeAssets) diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt index d06b353b9b..d47dd000ad 100644 --- a/app/src/main/cpp/CMakeLists.txt +++ b/app/src/main/cpp/CMakeLists.txt @@ -64,5 +64,4 @@ if(DROIDDECK_UVC_DIR) target_link_options(droiddeck_uvc PRIVATE -Wl,-z,max-page-size=16384) endif() -# sdl3droiddeck: SDL3 and the SDL3 bridge (patch-droiddeck.sh step 30) add_subdirectory(sdl3bridge) diff --git a/app/src/main/cpp/sdl3bridge/CMakeLists.txt b/app/src/main/cpp/sdl3bridge/CMakeLists.txt index 1ca8a275fd..9a4dcafc5a 100644 --- a/app/src/main/cpp/sdl3bridge/CMakeLists.txt +++ b/app/src/main/cpp/sdl3bridge/CMakeLists.txt @@ -1,5 +1,3 @@ -# sdl3droiddeck: SDL3 and the SDL3 bridge's controller loop, built into the app (libSDL3.so + libmain.so, loaded by -# the bridge in its own ":sdl3" process). Written by patch-droiddeck.sh (step 30); the sources are SdlBridge's. set(SDL_SHARED ON CACHE BOOL "" FORCE) set(SDL_STATIC OFF CACHE BOOL "" FORCE) set(SDL_TEST_LIBRARY OFF CACHE BOOL "" FORCE) @@ -14,10 +12,15 @@ include(FetchContent) if(POLICY CMP0135) cmake_policy(SET CMP0135 NEW) endif() +set(SDL3_MANIFEST "${DROIDDECK_CONTROLLER_SOURCES_DIR}/sdl3/upstream.json") +set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${SDL3_MANIFEST}") +file(READ "${SDL3_MANIFEST}" SDL3_UPSTREAM) +string(JSON SDL3_ARCHIVE GET "${SDL3_UPSTREAM}" source archive) +string(JSON SDL3_SHA256 GET "${SDL3_UPSTREAM}" source sha256) FetchContent_Declare(sdl3 - URL https://github.com/libsdl-org/SDL/releases/download/release-3.4.18/SDL3-3.4.18.tar.gz - URL_HASH SHA256=9c75cf16330322c217dedd2e0609f1124f1b54b8633e763467b4684d0f4334a3 + URL "${SDL3_ARCHIVE}" + URL_HASH "SHA256=${SDL3_SHA256}" ) FetchContent_MakeAvailable(sdl3) -add_library(main SHARED src/main.c) +add_library(main SHARED "${DROIDDECK_CONTROLLER_SOURCES_DIR}/sdlbridge/native/main.c") target_link_libraries(main PRIVATE SDL3::SDL3 log) diff --git a/docs/development/sdl3-controllers.md b/docs/development/sdl3-controllers.md index 7b16517e33..2a16f12615 100644 --- a/docs/development/sdl3-controllers.md +++ b/docs/development/sdl3-controllers.md @@ -16,19 +16,25 @@ Gyro, touchpad, remapping and lightbar settings belong to Steam while Hook-up is ## Source and attribution The controller implementation is by [pablo89898991](https://github.com/pablo89898991), -imported from [SdlBridge at 63feeac6](https://github.com/pablo89898991/SdlBridge/tree/63feeac6) -through [SDLApiDroidDeck at 131f1cef](https://github.com/pablo89898991/SDLApiDroidDeck/tree/131f1cef). +imported from [SdlBridge at 63feeac6](https://github.com/pablo89898991/SdlBridge/tree/63feeac6a3b9f3b51ec7664d677e099cdf5ae4d0) +through [SDLApiDroidDeck at 131f1cef](https://github.com/pablo89898991/SDLApiDroidDeck/tree/131f1ceffe52554758079c6a3bb3c045b9be2afe). The imported commit retains Pablo's Git author identity. DroidDeck integration and build adjustments are recorded separately. +Reusable bridge code and SDL's Android Java bindings are unchanged snapshots under +`third_party/sdlbridge` and `third_party/sdl3`. Their manifests pin upstream revisions +and every source file's hash. Small patches hold the embedded-mode changes. Gradle +verifies and prepares the patched sources under `app/build/controller-sources` before +Java or native compilation. See [the update procedure](../../third_party/README.md). + The port keeps DroidDeck's name, signing, workflows and test failure handling. It excludes the fork's ADPF changes, cursor-compositing default, Steam controller-rate override, and CI/download fallbacks. SDL 3.4.18 is downloaded by CMake from its official release archive and verified against its SHA-256 digest. Its Android Java classes are imported from the same -release. `HIDDeviceManager.java` retains the bridge's marked Bluetooth-permission -adjustment. SDL uses the zlib license, included in +release. The separate SDL Java patch leaves Bluetooth handling with DroidDeck. +SDL uses the zlib license, included in `app/src/main/assets/licenses/sdl3/LICENSE.txt`; the bridge is distributed under DroidDeck's GPLv3 license. diff --git a/third_party/README.md b/third_party/README.md new file mode 100644 index 0000000000..e3003b9c45 --- /dev/null +++ b/third_party/README.md @@ -0,0 +1,20 @@ +# Controller source snapshots + +`sdlbridge/upstream` contains the reusable Java and native controller implementation +by pablo89898991. `sdl3/upstream` contains SDL's Android Java bindings. Each snapshot's +`upstream.json` records its exact upstream revision or release archive and the +SHA-256 of every imported file. License notices are included alongside the snapshots. + +Keep snapshots unchanged. DroidDeck's embedded-mode adjustments live in each +component's `patches` directory. `prepareControllerSources` verifies the snapshots +and applies those patches into `app/build/controller-sources`; Kotlin, Java and CMake +compile against that generated directory. No SdlBridge download is needed to build. +SDL's native release archive is separately pinned and hash-checked by CMake. + +DroidDeck's Compose UI, session lifecycle, controller slots and Linux input integration +remain in the application's normal source directories. + +To update a dependency, import the selected upstream files, update the revision and +file hashes in `upstream.json`, and rebase the small local patch set. Run +`python3 tools/prepare_controller_sources.py` to check the inventory, hashes and patch +application before building. An upstream change that breaks a patch fails preparation. diff --git a/third_party/sdl3/LICENSE.txt b/third_party/sdl3/LICENSE.txt new file mode 100644 index 0000000000..e9adee4484 --- /dev/null +++ b/third_party/sdl3/LICENSE.txt @@ -0,0 +1,18 @@ +Copyright (C) 1997-2026 Sam Lantinga + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. + diff --git a/third_party/sdl3/patches/0001-droiddeck-integration.patch b/third_party/sdl3/patches/0001-droiddeck-integration.patch new file mode 100644 index 0000000000..f5b697ab79 --- /dev/null +++ b/third_party/sdl3/patches/0001-droiddeck-integration.patch @@ -0,0 +1,13 @@ +--- a/java/org/libsdl/app/HIDDeviceManager.java ++++ b/java/org/libsdl/app/HIDDeviceManager.java +@@ -377,6 +377,10 @@ + } + + private void initializeBluetooth() { ++ if (true) { // sdl3droiddeck: Bluetooth controllers are DroidDeck's own (SteamControllerBle) ++ Log.d(TAG, "Bluetooth left to the app"); ++ return; ++ } + Log.d(TAG, "Initializing Bluetooth"); + + if (Build.VERSION.SDK_INT >= 31 /* Android 12 */ && diff --git a/third_party/sdl3/upstream.json b/third_party/sdl3/upstream.json new file mode 100644 index 0000000000..697ac27771 --- /dev/null +++ b/third_party/sdl3/upstream.json @@ -0,0 +1,61 @@ +{ + "version": 1, + "source": { + "version": "3.4.18", + "archive": "https://github.com/libsdl-org/SDL/releases/download/release-3.4.18/SDL3-3.4.18.tar.gz", + "sha256": "9c75cf16330322c217dedd2e0609f1124f1b54b8633e763467b4684d0f4334a3" + }, + "files": { + "java/org/libsdl/app/HIDDevice.java": { + "source": "android-project/app/src/main/java/org/libsdl/app/HIDDevice.java", + "sha256": "afdeaf583f051583eff5cc9dcbfb983e3e8923e66d1130ff3e30c21afc8f87f1" + }, + "java/org/libsdl/app/HIDDeviceBLESteamController.java": { + "source": "android-project/app/src/main/java/org/libsdl/app/HIDDeviceBLESteamController.java", + "sha256": "2f88711d2c5bb2114be4273b6f3461b165cf19fcedae714d0c0105b2422a4c36" + }, + "java/org/libsdl/app/HIDDeviceManager.java": { + "source": "android-project/app/src/main/java/org/libsdl/app/HIDDeviceManager.java", + "sha256": "5bff9432726930a17cad9502191dd807da2e3cbcff2ad6990966b4b4bd9a7757" + }, + "java/org/libsdl/app/HIDDeviceUSB.java": { + "source": "android-project/app/src/main/java/org/libsdl/app/HIDDeviceUSB.java", + "sha256": "2304ead390ae8839405f338866646fd7e12013732c5abe9339af60864626ddf4" + }, + "java/org/libsdl/app/SDL.java": { + "source": "android-project/app/src/main/java/org/libsdl/app/SDL.java", + "sha256": "49d13bd76b65b40bc13b8f4ff1333ecf9fc5473a57bb2d216e2a60dc2e5973a4" + }, + "java/org/libsdl/app/SDLActivity.java": { + "source": "android-project/app/src/main/java/org/libsdl/app/SDLActivity.java", + "sha256": "41e9a367d1b623d56735a2f6301dd2370ce1e43ecbb5e956ebb517202e2a200c" + }, + "java/org/libsdl/app/SDLAudioManager.java": { + "source": "android-project/app/src/main/java/org/libsdl/app/SDLAudioManager.java", + "sha256": "129990250d389bc6550c1a27a81ee9a4cc32a4d6e9080f2fe466480988f214eb" + }, + "java/org/libsdl/app/SDLControllerManager.java": { + "source": "android-project/app/src/main/java/org/libsdl/app/SDLControllerManager.java", + "sha256": "3bb5d739727b72688cdfe4fe2a3dd6fd7005a2fd2aac311deeda1e53c23e3981" + }, + "java/org/libsdl/app/SDLDummyEdit.java": { + "source": "android-project/app/src/main/java/org/libsdl/app/SDLDummyEdit.java", + "sha256": "fb777fa4b4cce4d328229014acf156c2c2f47445dacccd5f74f876a64cdf502b" + }, + "java/org/libsdl/app/SDLInputConnection.java": { + "source": "android-project/app/src/main/java/org/libsdl/app/SDLInputConnection.java", + "sha256": "7079f65944ce0f6e8e3ca0293fc79c1e4e050f3b4290c39990723e3a0e40bc9b" + }, + "java/org/libsdl/app/SDLSensorManager.java": { + "source": "android-project/app/src/main/java/org/libsdl/app/SDLSensorManager.java", + "sha256": "3ffd781744c54e6809ad61515d254af366d34b44e086db90a296c8f159f13dd7" + }, + "java/org/libsdl/app/SDLSurface.java": { + "source": "android-project/app/src/main/java/org/libsdl/app/SDLSurface.java", + "sha256": "94762faf8067f9ff64b96c8be13c04c1d6daa5561b59f753e9ad0c0aa30e23c8" + } + }, + "patches": [ + "patches/0001-droiddeck-integration.patch" + ] +} diff --git a/app/src/main/java/org/libsdl/app/HIDDevice.java b/third_party/sdl3/upstream/java/org/libsdl/app/HIDDevice.java similarity index 100% rename from app/src/main/java/org/libsdl/app/HIDDevice.java rename to third_party/sdl3/upstream/java/org/libsdl/app/HIDDevice.java diff --git a/app/src/main/java/org/libsdl/app/HIDDeviceBLESteamController.java b/third_party/sdl3/upstream/java/org/libsdl/app/HIDDeviceBLESteamController.java similarity index 100% rename from app/src/main/java/org/libsdl/app/HIDDeviceBLESteamController.java rename to third_party/sdl3/upstream/java/org/libsdl/app/HIDDeviceBLESteamController.java diff --git a/app/src/main/java/org/libsdl/app/HIDDeviceManager.java b/third_party/sdl3/upstream/java/org/libsdl/app/HIDDeviceManager.java similarity index 99% rename from app/src/main/java/org/libsdl/app/HIDDeviceManager.java rename to third_party/sdl3/upstream/java/org/libsdl/app/HIDDeviceManager.java index 5fd82e9062..a719a63ffe 100644 --- a/app/src/main/java/org/libsdl/app/HIDDeviceManager.java +++ b/third_party/sdl3/upstream/java/org/libsdl/app/HIDDeviceManager.java @@ -377,10 +377,6 @@ public class HIDDeviceManager { } private void initializeBluetooth() { - if (true) { // sdl3droiddeck: Bluetooth controllers are DroidDeck's own (SteamControllerBle) - Log.d(TAG, "Bluetooth left to the app"); - return; - } Log.d(TAG, "Initializing Bluetooth"); if (Build.VERSION.SDK_INT >= 31 /* Android 12 */ && diff --git a/app/src/main/java/org/libsdl/app/HIDDeviceUSB.java b/third_party/sdl3/upstream/java/org/libsdl/app/HIDDeviceUSB.java similarity index 100% rename from app/src/main/java/org/libsdl/app/HIDDeviceUSB.java rename to third_party/sdl3/upstream/java/org/libsdl/app/HIDDeviceUSB.java diff --git a/app/src/main/java/org/libsdl/app/SDL.java b/third_party/sdl3/upstream/java/org/libsdl/app/SDL.java similarity index 100% rename from app/src/main/java/org/libsdl/app/SDL.java rename to third_party/sdl3/upstream/java/org/libsdl/app/SDL.java diff --git a/app/src/main/java/org/libsdl/app/SDLActivity.java b/third_party/sdl3/upstream/java/org/libsdl/app/SDLActivity.java similarity index 100% rename from app/src/main/java/org/libsdl/app/SDLActivity.java rename to third_party/sdl3/upstream/java/org/libsdl/app/SDLActivity.java diff --git a/app/src/main/java/org/libsdl/app/SDLAudioManager.java b/third_party/sdl3/upstream/java/org/libsdl/app/SDLAudioManager.java similarity index 100% rename from app/src/main/java/org/libsdl/app/SDLAudioManager.java rename to third_party/sdl3/upstream/java/org/libsdl/app/SDLAudioManager.java diff --git a/app/src/main/java/org/libsdl/app/SDLControllerManager.java b/third_party/sdl3/upstream/java/org/libsdl/app/SDLControllerManager.java similarity index 100% rename from app/src/main/java/org/libsdl/app/SDLControllerManager.java rename to third_party/sdl3/upstream/java/org/libsdl/app/SDLControllerManager.java diff --git a/app/src/main/java/org/libsdl/app/SDLDummyEdit.java b/third_party/sdl3/upstream/java/org/libsdl/app/SDLDummyEdit.java similarity index 100% rename from app/src/main/java/org/libsdl/app/SDLDummyEdit.java rename to third_party/sdl3/upstream/java/org/libsdl/app/SDLDummyEdit.java diff --git a/app/src/main/java/org/libsdl/app/SDLInputConnection.java b/third_party/sdl3/upstream/java/org/libsdl/app/SDLInputConnection.java similarity index 100% rename from app/src/main/java/org/libsdl/app/SDLInputConnection.java rename to third_party/sdl3/upstream/java/org/libsdl/app/SDLInputConnection.java diff --git a/app/src/main/java/org/libsdl/app/SDLSensorManager.java b/third_party/sdl3/upstream/java/org/libsdl/app/SDLSensorManager.java similarity index 100% rename from app/src/main/java/org/libsdl/app/SDLSensorManager.java rename to third_party/sdl3/upstream/java/org/libsdl/app/SDLSensorManager.java diff --git a/app/src/main/java/org/libsdl/app/SDLSurface.java b/third_party/sdl3/upstream/java/org/libsdl/app/SDLSurface.java similarity index 100% rename from app/src/main/java/org/libsdl/app/SDLSurface.java rename to third_party/sdl3/upstream/java/org/libsdl/app/SDLSurface.java diff --git a/third_party/sdlbridge/LICENSE b/third_party/sdlbridge/LICENSE new file mode 100644 index 0000000000..5ae980bfc6 --- /dev/null +++ b/third_party/sdlbridge/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + Pluvia is an unofficial Steam client app for Android + Copyright (C) 2024 Oxters Wyzgowski + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Pluvia Copyright (C) 2024 Oxters Wyzgowski + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/third_party/sdlbridge/patches/0001-droiddeck-integration.patch b/third_party/sdlbridge/patches/0001-droiddeck-integration.patch new file mode 100644 index 0000000000..f788bba487 --- /dev/null +++ b/third_party/sdlbridge/patches/0001-droiddeck-integration.patch @@ -0,0 +1,76 @@ +--- a/java/com/example/dsedge/BridgeActivity.java ++++ b/java/com/example/dsedge/BridgeActivity.java +@@ -174,7 +174,7 @@ + // ---- SDL3 driver ---- + LinearLayout drv = card(root); + cardTitle(drv, "SDL3 driver"); +- addSpinner(drv, "Controller source", new String[] { ++ if (!Host.embedded(this)) addSpinner(drv, "Controller source", new String[] { + "Auto: any controller (SDL3 USB driver when plugged in, else Android/Bluetooth)", + "Forced: only SDL3's USB driver (USB cable only)" + }, Settings.forceUsb ? 1 : 0, v -> { +--- a/java/com/example/dsedge/BridgeService.java ++++ b/java/com/example/dsedge/BridgeService.java +@@ -214,7 +214,7 @@ + : "SDL3Bridge · Steam Native Hook-up") + .setContentText(text) + .setStyle(new Notification.BigTextStyle().bigText(text)) +- .setSmallIcon(R.drawable.ic_stat_bridge) ++ .setSmallIcon(com.droiddeck.launcher.R.drawable.sdl3_ic_stat_bridge) + .setColor(0xFF4FC3F7) + .setContentIntent(open) + .setOngoing(true) +@@ -832,6 +832,7 @@ + b.putInt("presentAs", Settings.presentAs); + b.putBoolean("driverEnabled", Settings.driverEnabled); + b.putBoolean("forceUsb", Settings.forceUsb); ++ b.putBoolean("embedded", Host.embedded(this)); + b.putInt("pollMs", Settings.pollMs); + b.putBoolean("bubble", Settings.bubble); + // choices +--- a/java/com/example/dsedge/Host.java ++++ b/java/com/example/dsedge/Host.java +@@ -16,6 +16,11 @@ + return c != null && !OWN_PACKAGE.equals(c.getPackageName()); + } + ++ static boolean usbOnly(Context c, boolean configured) { ++ // Android input events go to DroidDeck's activity, outside the headless SDL process. ++ return embedded(c) || configured; ++ } ++ + /** A preferences file name of the bridge: unchanged as its own app, prefixed when built into another app. */ + static String prefs(Context c, String name) { + return embedded(c) ? "sdl3bridge_" + name : name; +--- a/java/com/example/dsedge/NativeBridge.java ++++ b/java/com/example/dsedge/NativeBridge.java +@@ -305,7 +305,7 @@ + + /** Forced mode: ignore Android's basic input and only use SDL's own USB driver. */ + static void applyForce() { +- try { nativeSetForce(Settings.forceUsb ? 1 : 0); } catch (UnsatisfiedLinkError e) { } ++ try { nativeSetForce(Host.usbOnly(appContext, Settings.forceUsb) ? 1 : 0); } catch (UnsatisfiedLinkError e) { } + } + + static void rescan() { +@@ -321,7 +321,7 @@ + try { + nativeSetDriver(Settings.driverEnabled ? 1 : 0); + nativeSetHookup(hookupMode()); +- if (Settings.driverEnabled) nativeSetForce(Settings.forceUsb ? 1 : 0); ++ if (Settings.driverEnabled) nativeSetForce(Host.usbOnly(appContext, Settings.forceUsb) ? 1 : 0); + } catch (UnsatisfiedLinkError e) { } + } + +--- a/native/main.c ++++ b/native/main.c +@@ -359,8 +359,7 @@ + SDL_free(ids); + snprintf(diag, sizeof(diag), + "Forced SDL3 USB mode: waiting for the USB driver. Plug the controller in with a USB-C cable, " +- "then tap 'Force SDL3 USB driver' and allow USB access (or switch Controller source to Auto to " +- "also use Bluetooth / Android-only controllers). Ignored Android-only controllers: %d", ignored); ++ "then tap 'Force SDL3 USB driver' and allow USB access. Android-only controllers: %d", ignored); + if (!atomic_load(&g_force)) + snprintf(diag, sizeof(diag), "Waiting for a controller: plug any SDL3-supported controller in via USB-C " + "(full features) or connect it over Bluetooth"); diff --git a/third_party/sdlbridge/upstream.json b/third_party/sdlbridge/upstream.json new file mode 100644 index 0000000000..c24b60fead --- /dev/null +++ b/third_party/sdlbridge/upstream.json @@ -0,0 +1,74 @@ +{ + "version": 1, + "source": { + "repository": "https://github.com/pablo89898991/SdlBridge", + "commit": "63feeac6a3b9f3b51ec7664d677e099cdf5ae4d0", + "integration_repository": "https://github.com/pablo89898991/SDLApiDroidDeck", + "integration_commit": "131f1ceffe52554758079c6a3bb3c045b9be2afe" + }, + "files": { + "java/com/example/dsedge/BridgeActivity.java": { + "source": "app/src/main/java/com/example/dsedge/BridgeActivity.java", + "sha256": "e56a7740e897c3a8e72c0aeb29b9cd78c6815fb4b1e177ff713cd28a477ba01c" + }, + "java/com/example/dsedge/BridgeService.java": { + "source": "app/src/main/java/com/example/dsedge/BridgeService.java", + "sha256": "bc613763a8c3dbef26dc6ddde1cfafa2342391cc230795728a39058365e8f624" + }, + "java/com/example/dsedge/ControllerView.java": { + "source": "app/src/main/java/com/example/dsedge/ControllerView.java", + "sha256": "4f7bd81223b4058853dd4380263a9e5f99679ba78f3627de87947f7753874fcf" + }, + "java/com/example/dsedge/HookupIdentity.java": { + "source": "app/src/main/java/com/example/dsedge/HookupIdentity.java", + "sha256": "5179ef52f1b9c4319def2e3af250b0e63ed173c6bbbfc5dfde6ffedae947c9cd" + }, + "java/com/example/dsedge/Host.java": { + "source": "app/src/main/java/com/example/dsedge/Host.java", + "sha256": "3fb04cb3275af97fec4c76e29d269ac5ed6c282cdcedb3fc249f6165e9ee75d5" + }, + "java/com/example/dsedge/NativeBridge.java": { + "source": "app/src/main/java/com/example/dsedge/NativeBridge.java", + "sha256": "b3195c541d1f8a476da972f4b3fd5eb1acfa13540ebf516c1cbe4c713d5675b3" + }, + "java/com/example/dsedge/SdlEngine.java": { + "source": "app/src/main/java/com/example/dsedge/SdlEngine.java", + "sha256": "777af8d6447f9be9cfef054ce016f61daaf6fe99334976c6a8657c58852dfef8" + }, + "java/com/example/dsedge/SdlHostActivity.java": { + "source": "app/src/main/java/com/example/dsedge/SdlHostActivity.java", + "sha256": "39a1e8f01764ab5cecb0ffe90afd663a292648278dde180f6a0b4a5f35eb01f9" + }, + "java/com/example/dsedge/Settings.java": { + "source": "app/src/main/java/com/example/dsedge/Settings.java", + "sha256": "65bcd3c9c0c1c2e485b9a14dd5de53505c3053c0bffa1684ae4a6023e66067ac" + }, + "java/com/example/dsedge/UpdateChecker.java": { + "source": "app/src/main/java/com/example/dsedge/UpdateChecker.java", + "sha256": "f50cd1fbe6d93b74e8f77729c6850fcf0b156dfbc589d8f7725026dbfd296d37" + }, + "java/com/example/dsedge/UsbAttachActivity.java": { + "source": "app/src/main/java/com/example/dsedge/UsbAttachActivity.java", + "sha256": "0c43ddf11ec8af80259c01359b3c2e920a4311b67d7a426d780f71bc0160e540" + }, + "native/hkshm.h": { + "source": "app/jni/src/hkshm.h", + "sha256": "38f7f30a087f3ac3c7e0208744a338343e7d8940acd33c1386a3009a1f460df3" + }, + "native/hookup.h": { + "source": "app/jni/src/hookup.h", + "sha256": "ec3aa73cfac6fecd1169ff91eccbbaf9a8deffc31a84bbb9ab198ea495946407" + }, + "native/main.c": { + "source": "app/jni/src/main.c", + "sha256": "3bf05818ec786b76fcfc92e17f6e640a7473d74c8abc7acab2d863ca5bee92a6" + }, + "native/triton.h": { + "source": "app/jni/src/triton.h", + "sha256": "1291e35392757b225cbebbb06e42649c1555fc1536b1b9ea804abaf2933adbde" + } + }, + "patches": [ + "patches/0001-droiddeck-integration.patch" + ] +} diff --git a/app/src/main/java/com/example/dsedge/BridgeActivity.java b/third_party/sdlbridge/upstream/java/com/example/dsedge/BridgeActivity.java similarity index 99% rename from app/src/main/java/com/example/dsedge/BridgeActivity.java rename to third_party/sdlbridge/upstream/java/com/example/dsedge/BridgeActivity.java index 1da4eda000..822836b22e 100644 --- a/app/src/main/java/com/example/dsedge/BridgeActivity.java +++ b/third_party/sdlbridge/upstream/java/com/example/dsedge/BridgeActivity.java @@ -174,7 +174,7 @@ public class BridgeActivity extends android.app.Activity implements NativeBridge // ---- SDL3 driver ---- LinearLayout drv = card(root); cardTitle(drv, "SDL3 driver"); - if (!Host.embedded(this)) addSpinner(drv, "Controller source", new String[] { + addSpinner(drv, "Controller source", new String[] { "Auto: any controller (SDL3 USB driver when plugged in, else Android/Bluetooth)", "Forced: only SDL3's USB driver (USB cable only)" }, Settings.forceUsb ? 1 : 0, v -> { diff --git a/app/src/main/java/com/example/dsedge/BridgeService.java b/third_party/sdlbridge/upstream/java/com/example/dsedge/BridgeService.java similarity index 99% rename from app/src/main/java/com/example/dsedge/BridgeService.java rename to third_party/sdlbridge/upstream/java/com/example/dsedge/BridgeService.java index 61165120ac..49b4a14b2a 100644 --- a/app/src/main/java/com/example/dsedge/BridgeService.java +++ b/third_party/sdlbridge/upstream/java/com/example/dsedge/BridgeService.java @@ -214,7 +214,7 @@ public class BridgeService extends Service implements NativeBridge.Listener { : "SDL3Bridge · Steam Native Hook-up") .setContentText(text) .setStyle(new Notification.BigTextStyle().bigText(text)) - .setSmallIcon(com.droiddeck.launcher.R.drawable.sdl3_ic_stat_bridge) + .setSmallIcon(R.drawable.ic_stat_bridge) .setColor(0xFF4FC3F7) .setContentIntent(open) .setOngoing(true) @@ -832,7 +832,6 @@ public class BridgeService extends Service implements NativeBridge.Listener { b.putInt("presentAs", Settings.presentAs); b.putBoolean("driverEnabled", Settings.driverEnabled); b.putBoolean("forceUsb", Settings.forceUsb); - b.putBoolean("embedded", Host.embedded(this)); b.putInt("pollMs", Settings.pollMs); b.putBoolean("bubble", Settings.bubble); // choices diff --git a/app/src/main/java/com/example/dsedge/ControllerView.java b/third_party/sdlbridge/upstream/java/com/example/dsedge/ControllerView.java similarity index 100% rename from app/src/main/java/com/example/dsedge/ControllerView.java rename to third_party/sdlbridge/upstream/java/com/example/dsedge/ControllerView.java diff --git a/app/src/main/java/com/example/dsedge/HookupIdentity.java b/third_party/sdlbridge/upstream/java/com/example/dsedge/HookupIdentity.java similarity index 100% rename from app/src/main/java/com/example/dsedge/HookupIdentity.java rename to third_party/sdlbridge/upstream/java/com/example/dsedge/HookupIdentity.java diff --git a/app/src/main/java/com/example/dsedge/Host.java b/third_party/sdlbridge/upstream/java/com/example/dsedge/Host.java similarity index 85% rename from app/src/main/java/com/example/dsedge/Host.java rename to third_party/sdlbridge/upstream/java/com/example/dsedge/Host.java index db523b9ce6..4f4e61bb99 100644 --- a/app/src/main/java/com/example/dsedge/Host.java +++ b/third_party/sdlbridge/upstream/java/com/example/dsedge/Host.java @@ -16,11 +16,6 @@ final class Host { return c != null && !OWN_PACKAGE.equals(c.getPackageName()); } - static boolean usbOnly(Context c, boolean configured) { - // Android input events go to DroidDeck's activity, outside the headless SDL process. - return embedded(c) || configured; - } - /** A preferences file name of the bridge: unchanged as its own app, prefixed when built into another app. */ static String prefs(Context c, String name) { return embedded(c) ? "sdl3bridge_" + name : name; diff --git a/app/src/main/java/com/example/dsedge/NativeBridge.java b/third_party/sdlbridge/upstream/java/com/example/dsedge/NativeBridge.java similarity index 98% rename from app/src/main/java/com/example/dsedge/NativeBridge.java rename to third_party/sdlbridge/upstream/java/com/example/dsedge/NativeBridge.java index 8b21fa27a4..e5ee0bf307 100644 --- a/app/src/main/java/com/example/dsedge/NativeBridge.java +++ b/third_party/sdlbridge/upstream/java/com/example/dsedge/NativeBridge.java @@ -305,7 +305,7 @@ public final class NativeBridge { /** Forced mode: ignore Android's basic input and only use SDL's own USB driver. */ static void applyForce() { - try { nativeSetForce(Host.usbOnly(appContext, Settings.forceUsb) ? 1 : 0); } catch (UnsatisfiedLinkError e) { } + try { nativeSetForce(Settings.forceUsb ? 1 : 0); } catch (UnsatisfiedLinkError e) { } } static void rescan() { @@ -321,7 +321,7 @@ public final class NativeBridge { try { nativeSetDriver(Settings.driverEnabled ? 1 : 0); nativeSetHookup(hookupMode()); - if (Settings.driverEnabled) nativeSetForce(Host.usbOnly(appContext, Settings.forceUsb) ? 1 : 0); + if (Settings.driverEnabled) nativeSetForce(Settings.forceUsb ? 1 : 0); } catch (UnsatisfiedLinkError e) { } } diff --git a/app/src/main/java/com/example/dsedge/SdlEngine.java b/third_party/sdlbridge/upstream/java/com/example/dsedge/SdlEngine.java similarity index 100% rename from app/src/main/java/com/example/dsedge/SdlEngine.java rename to third_party/sdlbridge/upstream/java/com/example/dsedge/SdlEngine.java diff --git a/app/src/main/java/com/example/dsedge/SdlHostActivity.java b/third_party/sdlbridge/upstream/java/com/example/dsedge/SdlHostActivity.java similarity index 100% rename from app/src/main/java/com/example/dsedge/SdlHostActivity.java rename to third_party/sdlbridge/upstream/java/com/example/dsedge/SdlHostActivity.java diff --git a/app/src/main/java/com/example/dsedge/Settings.java b/third_party/sdlbridge/upstream/java/com/example/dsedge/Settings.java similarity index 100% rename from app/src/main/java/com/example/dsedge/Settings.java rename to third_party/sdlbridge/upstream/java/com/example/dsedge/Settings.java diff --git a/app/src/main/java/com/example/dsedge/UpdateChecker.java b/third_party/sdlbridge/upstream/java/com/example/dsedge/UpdateChecker.java similarity index 100% rename from app/src/main/java/com/example/dsedge/UpdateChecker.java rename to third_party/sdlbridge/upstream/java/com/example/dsedge/UpdateChecker.java diff --git a/app/src/main/java/com/example/dsedge/UsbAttachActivity.java b/third_party/sdlbridge/upstream/java/com/example/dsedge/UsbAttachActivity.java similarity index 100% rename from app/src/main/java/com/example/dsedge/UsbAttachActivity.java rename to third_party/sdlbridge/upstream/java/com/example/dsedge/UsbAttachActivity.java diff --git a/app/src/main/cpp/sdl3bridge/src/hkshm.h b/third_party/sdlbridge/upstream/native/hkshm.h similarity index 100% rename from app/src/main/cpp/sdl3bridge/src/hkshm.h rename to third_party/sdlbridge/upstream/native/hkshm.h diff --git a/app/src/main/cpp/sdl3bridge/src/hookup.h b/third_party/sdlbridge/upstream/native/hookup.h similarity index 100% rename from app/src/main/cpp/sdl3bridge/src/hookup.h rename to third_party/sdlbridge/upstream/native/hookup.h diff --git a/app/src/main/cpp/sdl3bridge/src/main.c b/third_party/sdlbridge/upstream/native/main.c similarity index 99% rename from app/src/main/cpp/sdl3bridge/src/main.c rename to third_party/sdlbridge/upstream/native/main.c index 85790bd302..773cdbd1f2 100644 --- a/app/src/main/cpp/sdl3bridge/src/main.c +++ b/third_party/sdlbridge/upstream/native/main.c @@ -359,7 +359,8 @@ static void refresh_status(JNIEnv *env) SDL_free(ids); snprintf(diag, sizeof(diag), "Forced SDL3 USB mode: waiting for the USB driver. Plug the controller in with a USB-C cable, " - "then tap 'Force SDL3 USB driver' and allow USB access. Android-only controllers: %d", ignored); + "then tap 'Force SDL3 USB driver' and allow USB access (or switch Controller source to Auto to " + "also use Bluetooth / Android-only controllers). Ignored Android-only controllers: %d", ignored); if (!atomic_load(&g_force)) snprintf(diag, sizeof(diag), "Waiting for a controller: plug any SDL3-supported controller in via USB-C " "(full features) or connect it over Bluetooth"); diff --git a/app/src/main/cpp/sdl3bridge/src/triton.h b/third_party/sdlbridge/upstream/native/triton.h similarity index 100% rename from app/src/main/cpp/sdl3bridge/src/triton.h rename to third_party/sdlbridge/upstream/native/triton.h diff --git a/tools/prepare_controller_sources.py b/tools/prepare_controller_sources.py new file mode 100644 index 0000000000..6a6bff7f5a --- /dev/null +++ b/tools/prepare_controller_sources.py @@ -0,0 +1,70 @@ +import argparse +import hashlib +import json +from pathlib import Path +import shutil +import subprocess +import tempfile + + +ROOT = Path(__file__).resolve().parents[1] + + +def contained(directory, relative): + path = directory / relative + if path.is_symlink() or not path.resolve().is_relative_to(directory.resolve()): + raise ValueError('Controller source path escapes its directory: ' + relative) + return path + + +def prepare(root=ROOT, output=None): + root = root.resolve() + build = root / 'app/build' + output = output or build / 'controller-sources' + if output.is_symlink() or output.resolve() == build.resolve() or not output.resolve().is_relative_to(build.resolve()): + raise ValueError('Controller sources must be generated below app/build') + output.parent.mkdir(parents=True, exist_ok=True) + with tempfile.TemporaryDirectory(prefix='controller-sources-', dir=output.parent) as temporary: + stage = Path(temporary) + for name in ('sdlbridge', 'sdl3'): + vendor = root / 'third_party' / name + manifest = json.loads((vendor / 'upstream.json').read_text(encoding='utf-8')) + if manifest.get('version') != 1: + raise ValueError('Unsupported controller source manifest: ' + name) + source = vendor / 'upstream' + files = manifest['files'] + actual = {p.relative_to(source).as_posix() for p in source.rglob('*') if p.is_file()} + if set(files) != actual: + raise ValueError('Vendored controller source inventory changed: ' + name) + for relative, metadata in files.items(): + original = contained(source, relative) + if hashlib.sha256(original.read_bytes()).hexdigest() != metadata['sha256']: + raise ValueError('Vendored controller source hash changed: ' + name + '/' + relative) + destination = contained(stage / name, relative) + destination.parent.mkdir(parents=True, exist_ok=True) + shutil.copyfile(original, destination) + shutil.copyfile(vendor / 'upstream.json', stage / name / 'upstream.json') + for relative in manifest['patches']: + patch = contained(vendor, relative) + for line in patch.read_text(encoding='utf-8').splitlines(): + if line.startswith(('--- ', '+++ ')): + filename = line[4:].split('\t', 1)[0] + if filename[:2] not in ('a/', 'b/') or filename[2:] not in files: + raise ValueError('Patch modifies an unlisted controller source: ' + filename) + result = subprocess.run(['git', '-c', 'core.autocrlf=false', '-c', 'core.eol=lf', + 'apply', '--no-index', '--whitespace=nowarn', + '--directory=' + (stage / name).relative_to(root).as_posix(), str(patch)], + cwd=root, capture_output=True, text=True) + if result.returncode: + raise ValueError(name + '/' + relative + ': ' + result.stderr.strip()) + if output.exists(): + shutil.rmtree(output) + shutil.copytree(stage, output) + print('Verified and prepared pinned SDL3 and bridge sources.') + + +if __name__ == '__main__': + parser = argparse.ArgumentParser(description='Verify vendored controller snapshots and apply local patches.') + parser.add_argument('--output', type=Path) + args = parser.parse_args() + prepare(output=args.output) diff --git a/tools/tests/test_controller_sources.py b/tools/tests/test_controller_sources.py new file mode 100644 index 0000000000..c3b53a97e5 --- /dev/null +++ b/tools/tests/test_controller_sources.py @@ -0,0 +1,61 @@ +import difflib +import hashlib +import json +from pathlib import Path +import tempfile +import unittest + +from tools.prepare_controller_sources import prepare + + +class ControllerSourcesTest(unittest.TestCase): + def setUp(self): + self.temporary = tempfile.TemporaryDirectory() + self.addCleanup(self.temporary.cleanup) + self.root = Path(self.temporary.name) + for name in ('sdlbridge', 'sdl3'): + vendor = self.root / 'third_party' / name + (vendor / 'upstream/java').mkdir(parents=True) + (vendor / 'patches').mkdir() + (vendor / 'upstream/java/Input.java').write_bytes(b'upstream\n') + patch = ''.join(difflib.unified_diff(['upstream\n'], ['embedded\n'], + fromfile='a/java/Input.java', tofile='b/java/Input.java')) + (vendor / 'patches/embed.patch').write_text(patch, encoding='utf-8', newline='\n') + manifest = {'version': 1, 'source': {'commit': 'a' * 40}, + 'files': {'java/Input.java': {'sha256': hashlib.sha256(b'upstream\n').hexdigest()}}, + 'patches': ['patches/embed.patch']} + (vendor / 'upstream.json').write_text(json.dumps(manifest), encoding='utf-8') + + def test_prepares_patched_sources_without_changing_snapshots(self): + prepare(self.root) + for name in ('sdlbridge', 'sdl3'): + self.assertEqual(b'embedded\n', (self.root / 'app/build/controller-sources' / name / 'java/Input.java').read_bytes()) + self.assertEqual(b'upstream\n', (self.root / 'third_party' / name / 'upstream/java/Input.java').read_bytes()) + self.assertTrue((self.root / 'app/build/controller-sources' / name / 'upstream.json').is_file()) + + def test_rejects_changed_snapshot_before_replacing_previous_output(self): + output = self.root / 'app/build/controller-sources' + output.mkdir(parents=True) + (output / 'previous').write_text('keep') + (self.root / 'third_party/sdlbridge/upstream/java/Input.java').write_bytes(b'drift\n') + with self.assertRaisesRegex(ValueError, 'hash changed'): + prepare(self.root) + self.assertEqual('keep', (output / 'previous').read_text()) + + def test_fails_when_an_upstream_update_breaks_a_patch(self): + vendor = self.root / 'third_party/sdlbridge' + (vendor / 'upstream/java/Input.java').write_bytes(b'new upstream\n') + manifest = json.loads((vendor / 'upstream.json').read_text()) + manifest['files']['java/Input.java']['sha256'] = hashlib.sha256(b'new upstream\n').hexdigest() + (vendor / 'upstream.json').write_text(json.dumps(manifest)) + with self.assertRaisesRegex(ValueError, 'patch does not apply'): + prepare(self.root) + self.assertFalse((self.root / 'app/build/controller-sources').exists()) + + def test_refuses_output_outside_the_build_directory(self): + with self.assertRaisesRegex(ValueError, 'below app/build'): + prepare(self.root, self.root / 'third_party') + + +if __name__ == '__main__': + unittest.main()