diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md deleted file mode 100644 index 2afa4fc72..000000000 --- a/CODE_OF_CONDUCT.md +++ /dev/null @@ -1 +0,0 @@ -Moved to [https://rocknix.org/contribute/code-of-conduct/](https://rocknix.org/contribute/code-of-conduct/) \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index 554ef2939..000000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1 +0,0 @@ -Moved to [https://rocknix.org/contribute/](https://rocknix.org/contribute/) \ No newline at end of file diff --git a/LICENSE.md b/LICENSE.md index fa496b1e0..8fbc98b77 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,13 +1,10 @@ -        [![Latest Version](https://img.shields.io/github/release/JustEnoughLinuxOS/distribution.svg?color=5998FF&label=latest%20version&style=flat-square)](https://github.com/JustEnoughLinuxOS/distribution/releases/latest) [![Activity](https://img.shields.io/github/commit-activity/m/JustEnoughLinuxOS/distribution?color=5998FF&style=flat-square)](https://github.com/JustEnoughLinuxOS/distribution/commits) [![Pull Requests](https://img.shields.io/github/issues-pr-closed/JustEnoughLinuxOS/distribution?color=5998FF&style=flat-square)](https://github.com/JustEnoughLinuxOS/distribution/pulls) [![Discord Server](https://img.shields.io/discord/948029830325235753?color=5998FF&label=chat&style=flat-square)](https://discord.gg/seTxckZjJy) -# - ## Licenses -JELOS is a Linux distribution that is made up of many open-source components. Components are provided under their respective licenses. This distribution includes components licensed for non-commercial use only. +ROCKNIX is a Linux distribution that is made up of many open-source components. Components are provided under their respective licenses. This distribution includes components licensed for non-commercial use only. -### JELOS Branding +### ROCKNIX Branding -JELOS branding and images are licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-nc-sa/4.0/). +ROCKNIX branding and images are licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-nc-sa/4.0/). You are free to: @@ -20,11 +17,11 @@ Under the following terms: - NonCommercial: You may not use the material for commercial purposes. - ShareAlike: If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original. -### JELOS Software +### ROCKNIX Software -Copyright 2023 JELOS (https://github.com/JustEnoughLinuxOS) +Copyright 2024 ROCKNIX (https://github.com/ROCKNIX) -Original software and scripts developed by the JELOS team are licensed under the terms of the [GNU GPL Version 2](https://choosealicense.com/licenses/gpl-2.0/). The full license can be found in this project's licenses folder. +Original software and scripts developed by the ROCKNIX team are licensed under the terms of the [GNU GPL Version 2](https://choosealicense.com/licenses/gpl-2.0/). The full license can be found in this project's licenses folder. ### Bundled Works -All other software is provided under each component's respective license. These licenses can be found in the software sources or in this project's licenses folder. Modifications to bundled software and scripts by the JELOS team are licensed under the terms of the software being modified. +All other software is provided under each component's respective license. These licenses can be found in the software sources or in this project's licenses folder. Modifications to bundled software and scripts by the ROCKNIX team are licensed under the terms of the software being modified. diff --git a/Makefile b/Makefile index d4e31b027..bd499264b 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ BUILD_DIRS=build.* --include $(HOME)/.${DISTRONAME}/options +-include $(HOME)/.ROCKNIX/options all: world @@ -47,6 +47,7 @@ S922X: PROJECT=Amlogic DEVICE=S922X ARCH=aarch64 ./scripts/build_distro RK3566: + unset DEVICE_ROOT DEVICE_ROOT=RK3566 PROJECT=Rockchip DEVICE=RK3566 ARCH=arm ./scripts/build_distro DEVICE_ROOT=RK3566 PROJECT=Rockchip DEVICE=RK3566 ARCH=aarch64 ./scripts/build_distro @@ -74,7 +75,7 @@ package-clean: # For example: make docker-AMD64 will use docker to call: make AMD64 # All variables are scoped to docker-* commands to prevent weird collisions/behavior with non-docker commands -docker-%: DOCKER_IMAGE := "justenoughlinuxos/rocknix-build:latest" +docker-%: DOCKER_IMAGE := "rocknix/rocknix-build:latest" # DOCKER_WORK_DIR is the directory in the Docker image - it is set to /work by default # Anytime this directory changes, you must run `make clean` similarly to moving the distribution directory diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index 39be8557f..000000000 --- a/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,38 +0,0 @@ -# Pull Request Template - -## Description - -Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change. - -Fixes # (issue) - -## Type of change - -Please delete options that are not relevant. - -- [ ] Bug fix (non-breaking change which fixes an issue) -- [ ] New feature (non-breaking change which adds functionality) -- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected) -- [ ] This change requires a documentation update - -## How Has This Been Tested Locally? - -Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration - -- [ ] Test A -- [ ] Test B - -**Test Configuration**: -* Build OS name and version: -* Docker (Y/N): -* JELOS Branch: -* Any additional information that may be useful: - -## Checklist: - -- [ ] My code follows the style guidelines of this project -- [ ] I have performed a self-review of my own code -- [ ] I have commented my code, particularly in hard-to-understand areas -- [ ] I have made corresponding changes to the documentation - -Note: This PR template is adapted from [embeddedartistry](https://github.com/embeddedartistry/templates/blob/master/oss_docs/PULL_REQUEST_TEMPLATE.md) diff --git a/distributions/ROCKNIX/splash/splash.png b/distributions/ROCKNIX/splash/splash.png deleted file mode 100644 index bd538c154..000000000 Binary files a/distributions/ROCKNIX/splash/splash.png and /dev/null differ diff --git a/documentation/DEVEL_ADD_HARDWARE_QUIRKS.md b/documentation/DEVEL_ADD_HARDWARE_QUIRKS.md deleted file mode 100644 index 67208e1f9..000000000 --- a/documentation/DEVEL_ADD_HARDWARE_QUIRKS.md +++ /dev/null @@ -1 +0,0 @@ -Moved to [https://rocknix.org/contribute/quirks/](https://rocknix.org/contribute/quirks/) \ No newline at end of file diff --git a/documentation/DEVEL_BUILDING_ROCKNIX.md b/documentation/DEVEL_BUILDING_ROCKNIX.md deleted file mode 100644 index f44c0cc8b..000000000 --- a/documentation/DEVEL_BUILDING_ROCKNIX.md +++ /dev/null @@ -1 +0,0 @@ -Moved to [https://rocknix.org/contribute/build/](https://rocknix.org/contribute/build/) \ No newline at end of file diff --git a/documentation/DEVEL_CREATING_PACKAGES.md b/documentation/DEVEL_CREATING_PACKAGES.md deleted file mode 100644 index 93733f014..000000000 --- a/documentation/DEVEL_CREATING_PACKAGES.md +++ /dev/null @@ -1 +0,0 @@ -Moved to [https://rocknix.org/contribute/packages/](https://rocknix.org/contribute/packages/) \ No newline at end of file diff --git a/documentation/GENERAL_CUSTOM_SHADERS.md b/documentation/GENERAL_CUSTOM_SHADERS.md deleted file mode 100644 index 3d863dd9e..000000000 --- a/documentation/GENERAL_CUSTOM_SHADERS.md +++ /dev/null @@ -1 +0,0 @@ -Moved to [https://rocknix.org/configure/shaders/](https://rocknix.org/configure/shaders/) \ No newline at end of file diff --git a/documentation/GENERAL_DONATING_TO_ROCKNIX.md b/documentation/GENERAL_DONATING_TO_ROCKNIX.md deleted file mode 100644 index aad4fade2..000000000 --- a/documentation/GENERAL_DONATING_TO_ROCKNIX.md +++ /dev/null @@ -1 +0,0 @@ -Moved to [https://rocknix.org/donations/](https://rocknix.org/donations/) \ No newline at end of file diff --git a/documentation/GENERAL_FREQUENTLY_ASKED_QUESTIONS.md b/documentation/GENERAL_FREQUENTLY_ASKED_QUESTIONS.md deleted file mode 100644 index f687d057e..000000000 --- a/documentation/GENERAL_FREQUENTLY_ASKED_QUESTIONS.md +++ /dev/null @@ -1 +0,0 @@ -Moved to [https://rocknix.org/faqs/](https://rocknix.org/faqs/) \ No newline at end of file diff --git a/documentation/GENERAL_HOTKEYS_AND_BUTTON_CODES.md b/documentation/GENERAL_HOTKEYS_AND_BUTTON_CODES.md deleted file mode 100644 index e4408a7cd..000000000 --- a/documentation/GENERAL_HOTKEYS_AND_BUTTON_CODES.md +++ /dev/null @@ -1 +0,0 @@ -Moved to [https://rocknix.org/play/controls/](https://rocknix.org/play/controls/) \ No newline at end of file diff --git a/documentation/GENERAL_NETWORK_PLAY.md b/documentation/GENERAL_NETWORK_PLAY.md deleted file mode 100644 index 05656b1f0..000000000 --- a/documentation/GENERAL_NETWORK_PLAY.md +++ /dev/null @@ -1 +0,0 @@ -Moved to [https://rocknix.org/play/netplay/](https://rocknix.org/play/netplay/) \ No newline at end of file diff --git a/documentation/GENERAL_PERFORMANCE_AND_BATTERY.md b/documentation/GENERAL_PERFORMANCE_AND_BATTERY.md deleted file mode 100644 index d6217f7fb..000000000 --- a/documentation/GENERAL_PERFORMANCE_AND_BATTERY.md +++ /dev/null @@ -1 +0,0 @@ -Moved to [https://rocknix.org/configure/optimizations/](https://rocknix.org/configure/optimizations/) \ No newline at end of file diff --git a/documentation/SETUP_BT_AUDIO.md b/documentation/SETUP_BT_AUDIO.md deleted file mode 100644 index ae73e88a2..000000000 --- a/documentation/SETUP_BT_AUDIO.md +++ /dev/null @@ -1,23 +0,0 @@ -# Bluetooth Audio Setup - -## How to pair your headset -Go to the "Controller & Bluetooth Settings" menu in Emulation Station and enable Bluetooth. Put your headset into pairing mode, then select "Pair a bluetooth device" - your audio device should be detected and paired automatically. -Once your headset is paired go to "System Settings" -> "Audio Device" - your headset should appear in the list of devices. Select "Bluetooth Device" or your paired device from the list and let EmulationStation restart. All audio should now go through your bluetooth device. - -## Known Working Devices -Since bluetooth is infamously unreliable I'm putting together a few test results with various headphones. This list is very outdated at this point so please feel free to submit your own results - it would greatly help to identify issues and fix them. - -| JELOS Device | JELOS Version | Bluetooth Device | Codec(s) | Test Results | -|:-------------:|:-------------:|:----------------:|:-----:|:-------| -| RG353V,
RG351V (+dongle) | 20221114 | Jaybird X3 | AAC | Connects but does not play any audio.
Worked with previous JELOS version. | -| RG353V | 20221114 | Sennheiser PXC 550-II | AAC, aptX | No issues, connects and works fine. | -| RG353V,
RG351V (+dongle) | 20221114 | Sennheiser Momentum TW3 | aptX | No issues, connects and works fine.
Required bluez update to v5.66 to prevent occasional crashes. -| RG353V,
RG351V (+dongle) | 20221114 | Sony WH-1000XM3 | LDAC | **Very** minor audio stutters with "mobile" (330kbps) and "standard" (660kbps) quality profiles. Best results achieved with "standard" and adaptive bit rate.
"High" (990kbps) quality profile has significant impact on emulator performance and is not recommended.
No connectivity issues. | - -## How to change codec settings -If you run into issues playing audio from your headset you can try playing with the codec configuration options for BlueALSA. A list of command line parameters can be found here: https://github.com/Arkq/bluez-alsa/blob/master/doc/bluealsa.8.rst. On the device they are read from `/storage/.cache/services/bluealsa.conf` (restart required after change). - -## Known Issues - -* Disconnects are not handled gracefully by JELOS at this point. If you disconnect your headset without first switching back to the default audio device, you won't get any audio until you reboot. -* Does not work with the PCSX ReARMed32 Retroarch core for unknown reasons (no sound will play from this core).
**Workaround**: Use a different PSX core (e.g. PCSX ReARMed, SwanStation) when you want to play with a bluetooth headset. diff --git a/documentation/SETUP_CLOUD_DRIVES.md b/documentation/SETUP_CLOUD_DRIVES.md deleted file mode 100644 index d87b124f4..000000000 --- a/documentation/SETUP_CLOUD_DRIVES.md +++ /dev/null @@ -1 +0,0 @@ -Moved to [https://rocknix.org/configure/cloud-sync/](https://rocknix.org/configure/cloud-sync/) \ No newline at end of file diff --git a/documentation/SETUP_GAME_ENGINES_AND_LAUNCH_FILES.md b/documentation/SETUP_GAME_ENGINES_AND_LAUNCH_FILES.md deleted file mode 100644 index 467b8571b..000000000 --- a/documentation/SETUP_GAME_ENGINES_AND_LAUNCH_FILES.md +++ /dev/null @@ -1,91 +0,0 @@ -        [![Latest Version](https://img.shields.io/github/release/JustEnoughLinuxOS/distribution.svg?color=5998FF&label=latest%20version&style=flat-square)](https://github.com/JustEnoughLinuxOS/distribution/releases/latest) [![Activity](https://img.shields.io/github/commit-activity/m/JustEnoughLinuxOS/distribution?color=5998FF&style=flat-square)](https://github.com/JustEnoughLinuxOS/distribution/commits) [![Pull Requests](https://img.shields.io/github/issues-pr-closed/JustEnoughLinuxOS/distribution?color=5998FF&style=flat-square)](https://github.com/JustEnoughLinuxOS/distribution/pulls) [![Discord Server](https://img.shields.io/discord/948029830325235753?color=5998FF&label=chat&style=flat-square)](https://discord.gg/seTxckZjJy) -# - -# Game Engine Launch Files -Game engines such as Build Engine, GZDoom, LZDoom, ScummVM and ECWolf use launch files for launching the game with the specified files and mods. Most are configurable to enable different configurations of game files and mods per game. -> Note: the extensions for game engine launch files are case-sensitive, so make sure the launch extensions `.build`, `.doom`, `.scummvm` and `.ecwolf` are lower case, and make sure any references to game files match the case of the game files exactly (e.g. if the game file is `DOOM.WAD` then trying to launch it as `doom.wad` won't work). - -## .build files -These files must be created for each build engine game that will be launched with raze. The file contains a `PATH` variable and an optional `GRP` variable. The `PATH` variable points to the subfolder containing the game's **GRP** file. The optional `GRP` variable is used to identify the specific **GRP** file to load for games with multiple **GRP** files. - -Example: `/storage/roms/build/shadow warrior.build` contains -``` -PATH=sw -GRP=SW.GRP --- end -- -``` -where the Shadow Warrior games files are stored in subfolder `sw`, i.e. `/storage/roms/build/sw/` -> Note: don't leave any space between `GRP` or `PATH` and `=` and enclose filenames containing spaces with "quotes" - -> Note: add `-- end --` to the end of the file if it contains multiple lines - -## .doom files -These files must be created for each **WAD** that you want to load with gzdoom or lzdoom. The file contains `IWAD` variables and optional `MOD` variables. Multiple `IWAD` and `MOD` variables can be used in the same file to load multiple wads, mods and packages. Therefore, multiple **.doom** files can be created for the same **WAD** for each configuration of the game. It is recommended to store **WAD** files in a **iwads** subfolder and `MODs` in a **mods** subfolder and include the full path to each file in the **.doom** file. - -Example: `/storage/roms/doom/doom.doom` contains -``` -IWAD=/storage/roms/doom/iwads/doom.wad -``` -to load vanilla doom -> Note: don't leave any space between `GRP` or `PATH` and `=` and enclose filenames containing spaces with "quotes" - -Example: `/storage/roms/doom/heretic-mod.doom` contains -``` -IWAD=/storage/roms/doom/iwads/heretic.wad -IWAD=/storage/roms/doom/iwads/IWMPP_Heretic.wad -MOD=/storage/roms/doom/mods/precise-crosshair-v1.4.1.pk3 -MOD=/storage/roms/doom/mods/target-spy-v2.0.1.pk3 --- end -- -``` -to load Heretic with additional patches and mods. -> Note: add `-- end --` to the end of the file when it contains multiple lines - -## .scummvm or .svm files -These files are created by `_Scan ScummVM Games.sh` script in `/storage/.config/scummvm` folder (which is also displayed in EmuStation). The script scans for game folders and generates the relevant `.scummvm` files to launch those games. The files are stored in `/storage/.config/scummvm/games`. - -`.scummvm` files are named using the common name of the game and the Game Short Name in brackets (e.g. `Beneath a Steel Sky (sky).scummvm`). - -`.scummvm` files contain a single line in the form: -* `--path=` variable and the path to the folder containing the game, *followed by* -* Game Short Name - -Example: `/storage/.config/scummvm/games/Beneath a Steel Sky (sky).scummvm` contains -``` ---path="/storage/roms/scummvm/Beneath a Steel Sky (CD VGA)" sky -``` -> Note: enclose filenames containing spaces with "quotes" - -> Note: `.scummvm` and `.svm` files are identical and interchangeable - -> Note: the `.scummvm` files are **NOT** stored in `/storage/roms/scummvm` and any `.scummvm` files stored there will not be displayed by EmuStation. EmuStation only displays `.scummvm` files that are in `/storage/.config/scummvm/games`. - -> Note: to display metadata and media within EmuStation, put `gamelist.xml` in `/storage/.config/scummvm/games` and media into relevant subfolders (e.g. `/storage/.config/scummvm/games/media` folder with `boxart`, `images` and `videos` subfolders) - -## .ecwolf files -These files must be created for each Wolfenstein 3D compatible game. The file contains `PATH` variable that points to the subfolder containing the game's game files, `DATA` variable with the extension of the game files and `PK3` variables for each separate package file to load. `PK3` variables must be sequentially numbered with **_1**, **_2** etc. - -Example: `/storage/roms/ecwolf/wolfenstein3d.ecwolf` contains -``` -PATH=Wolfenstein 3D -DATA=WL6 -PK3_1=/storage/roms/ecwolf/ecwolf.pk3 --- end -- -``` -where the Wolfenstein 3D game files have extension **.WL6** -> Note: the data value must match the file extension of the game exactly and is case sensitive so `WL6` is not the same as `wl6` - -> Note: don't leave any space between `GRP` or `PATH` and `=` and enclose filenames containing spaces with "quotes" - -> Note: add `-- end --` to the end of the file - -Example: `/storage/roms/ecwolf/spear of destiny.ecwolf` contains -``` -PATH=SOD -DATA=SOD -PK3_1=/storage/roms/ecwolf/SOD/ecwolf.pk3 --- end -- -``` -where the Spear of Destiny game files have extension **.SOD** -> Note: add `-- end --` to the end of the file - - diff --git a/documentation/SETUP_MOONLIGHT_STREAMING.md b/documentation/SETUP_MOONLIGHT_STREAMING.md deleted file mode 100644 index cd5c60513..000000000 --- a/documentation/SETUP_MOONLIGHT_STREAMING.md +++ /dev/null @@ -1 +0,0 @@ -Moved to [https://rocknix.org/systems/moonlight/](https://rocknix.org/systems/moonlight/) \ No newline at end of file diff --git a/documentation/SETUP_P2P_ZEROTIER.md b/documentation/SETUP_P2P_ZEROTIER.md deleted file mode 100644 index 37f2389fa..000000000 --- a/documentation/SETUP_P2P_ZEROTIER.md +++ /dev/null @@ -1 +0,0 @@ -Moved to [https://rocknix.org/configure/vpn/#zerotier](https://rocknix.org/configure/vpn/#zerotier) \ No newline at end of file diff --git a/documentation/SETUP_SYNCTHING.md b/documentation/SETUP_SYNCTHING.md deleted file mode 100644 index d87b124f4..000000000 --- a/documentation/SETUP_SYNCTHING.md +++ /dev/null @@ -1 +0,0 @@ -Moved to [https://rocknix.org/configure/cloud-sync/](https://rocknix.org/configure/cloud-sync/) \ No newline at end of file diff --git a/documentation/SETUP_VPN_TAILSCALE.md b/documentation/SETUP_VPN_TAILSCALE.md deleted file mode 100644 index 60b5157b5..000000000 --- a/documentation/SETUP_VPN_TAILSCALE.md +++ /dev/null @@ -1 +0,0 @@ -Moved to [https://rocknix.org/configure/vpn/#tailscale](https://rocknix.org/configure/vpn/#tailscale) \ No newline at end of file diff --git a/documentation/SETUP_VPN_WIREGUARD.md b/documentation/SETUP_VPN_WIREGUARD.md deleted file mode 100644 index bb593a58f..000000000 --- a/documentation/SETUP_VPN_WIREGUARD.md +++ /dev/null @@ -1 +0,0 @@ -Moved to [https://rocknix.org/configure/vpn/#wireguard](https://rocknix.org/configure/vpn/#wireguard) \ No newline at end of file diff --git a/packages/emulators/tools/control-gen/Makefile b/packages/apps/control-gen/Makefile similarity index 100% rename from packages/emulators/tools/control-gen/Makefile rename to packages/apps/control-gen/Makefile diff --git a/packages/emulators/tools/control-gen/control-gen.cpp b/packages/apps/control-gen/control-gen.cpp similarity index 100% rename from packages/emulators/tools/control-gen/control-gen.cpp rename to packages/apps/control-gen/control-gen.cpp diff --git a/packages/emulators/tools/control-gen/package.mk b/packages/apps/control-gen/package.mk similarity index 100% rename from packages/emulators/tools/control-gen/package.mk rename to packages/apps/control-gen/package.mk diff --git a/packages/emulators/tools/control-gen/scripts/control-gen_init.sh b/packages/apps/control-gen/scripts/control-gen_init.sh similarity index 100% rename from packages/emulators/tools/control-gen/scripts/control-gen_init.sh rename to packages/apps/control-gen/scripts/control-gen_init.sh diff --git a/packages/emulators/tools/gamecontrollerdb/config/gamecontrollerdb.txt b/packages/apps/gamecontrollerdb/config/gamecontrollerdb.txt similarity index 100% rename from packages/emulators/tools/gamecontrollerdb/config/gamecontrollerdb.txt rename to packages/apps/gamecontrollerdb/config/gamecontrollerdb.txt diff --git a/packages/emulators/tools/gamecontrollerdb/package.mk b/packages/apps/gamecontrollerdb/package.mk similarity index 100% rename from packages/emulators/tools/gamecontrollerdb/package.mk rename to packages/apps/gamecontrollerdb/package.mk diff --git a/packages/emulators/tools/jstest-sdl/package.mk b/packages/apps/jstest-sdl/package.mk similarity index 100% rename from packages/emulators/tools/jstest-sdl/package.mk rename to packages/apps/jstest-sdl/package.mk diff --git a/packages/emulators/tools/libgo2/package.mk b/packages/apps/libgo2/package.mk similarity index 100% rename from packages/emulators/tools/libgo2/package.mk rename to packages/apps/libgo2/package.mk diff --git a/packages/emulators/tools/libgo2/patches/001-libevdev.patch b/packages/apps/libgo2/patches/001-libevdev.patch similarity index 100% rename from packages/emulators/tools/libgo2/patches/001-libevdev.patch rename to packages/apps/libgo2/patches/001-libevdev.patch diff --git a/packages/apps/moonlight/package.mk b/packages/apps/moonlight/package.mk index 70b397bd3..90366dc5e 100644 --- a/packages/apps/moonlight/package.mk +++ b/packages/apps/moonlight/package.mk @@ -10,7 +10,7 @@ PKG_SHORTDESC="Moonlight is an open source implementation of NVIDIA's GameStream GET_HANDLER_SUPPORT="git" PKG_PATCH_DIRS+="${DEVICE}" -if [ "${TARGET_ARCH}" = "x86_64" ] +if [ "${TARGET_ARCH}" = "x86_64" ] then PKG_SITE+="qt" PKG_URL="${PKG_SITE}.git" @@ -44,7 +44,7 @@ fi if [ "${PROJECT}" = "Rockchip" ] then - PKG_DEPENDS_TARGET+=" librga rkmpp" + PKG_DEPENDS_TARGET+=" rkmpp" fi if [ ! "${OPENGL}" = "no" ]; then diff --git a/packages/apps/portmaster/package.mk b/packages/apps/portmaster/package.mk index 9ccd1d6f8..65ba1d8c1 100644 --- a/packages/apps/portmaster/package.mk +++ b/packages/apps/portmaster/package.mk @@ -8,7 +8,7 @@ PKG_URL="${PKG_SITE}/releases/download/${PKG_VERSION}/PortMaster.zip" COMPAT_URL="https://github.com/brooksytech/JelosAddOns/raw/main/compat.zip" PKG_LICENSE="MIT" PKG_ARCH="arm aarch64" -PKG_DEPENDS_TARGET="toolchain gptokeyb gamecontrollerdb wget oga_controls control-gen" +PKG_DEPENDS_TARGET="toolchain rocknix-hotkey gamecontrollerdb wget oga_controls control-gen" PKG_TOOLCHAIN="manual" PKG_LONGDESC="Portmaster - a simple tool that allows you to download various game ports" diff --git a/packages/emulators/tools/gptokeyb/Makefile b/packages/apps/rocknix-hotkey/Makefile similarity index 100% rename from packages/emulators/tools/gptokeyb/Makefile rename to packages/apps/rocknix-hotkey/Makefile diff --git a/packages/emulators/tools/gptokeyb/package.mk b/packages/apps/rocknix-hotkey/package.mk similarity index 83% rename from packages/emulators/tools/gptokeyb/package.mk rename to packages/apps/rocknix-hotkey/package.mk index f349141fe..529e5feb3 100644 --- a/packages/emulators/tools/gptokeyb/package.mk +++ b/packages/apps/rocknix-hotkey/package.mk @@ -1,11 +1,11 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2021-present Shanti Gilbert (https://github.com/shantigilbert) -PKG_NAME="gptokeyb" -PKG_VERSION="0303b36b5376a9b25cf82a53ed4242509daf14e9" +PKG_NAME="rocknix-hotkey" +PKG_VERSION="14255daccc61dd8f366b3c88292d54cfef1c087a" PKG_ARCH="any" PKG_LICENSE="GPLv3" -PKG_SITE="https://github.com/EmuELEC/gptokeyb" +PKG_SITE="https://github.com/ROCKNIX/rocknix-hotkey" PKG_URL="${PKG_SITE}.git" PKG_DEPENDS_TARGET="toolchain libevdev SDL2 control-gen" PKG_TOOLCHAIN="make" diff --git a/packages/emulators/tools/sdljoytest/package.mk b/packages/apps/sdljoytest/package.mk similarity index 100% rename from packages/emulators/tools/sdljoytest/package.mk rename to packages/apps/sdljoytest/package.mk diff --git a/packages/devel/librga/package.mk b/packages/devel/librga/package.mk deleted file mode 100644 index c20d432e9..000000000 --- a/packages/devel/librga/package.mk +++ /dev/null @@ -1,12 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2020-present Shanti Gilbert (https://github.com/shantigilbert) - -PKG_NAME="librga" -PKG_VERSION="df26244eb0c3991df319d4276ab80e8c0bf91f64" -PKG_ARCH="arm aarch64" -PKG_LICENSE="GNU" -PKG_DEPENDS_TARGET="toolchain libdrm" -PKG_SITE="https://github.com/ROCKNIX/linux-rga" -PKG_URL="${PKG_SITE}.git" -PKG_LONGDESC="The RGA driver userspace " -PKG_TOOLCHAIN="auto" diff --git a/packages/devel/librga/patches/01-string_not_arr.patch b/packages/devel/librga/patches/01-string_not_arr.patch deleted file mode 100644 index 7ce0b0682..000000000 --- a/packages/devel/librga/patches/01-string_not_arr.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN librga.orig/meson.build librga/meson.build ---- librga.orig/meson.build 2022-07-08 18:24:31.727555866 -0400 -+++ librga/meson.build 2022-07-08 18:24:47.499517461 -0400 -@@ -28,7 +28,7 @@ libthreads_dep = dependency('threads') - - gen_version = vcs_tag( - command : ['./genversion.sh', 'meson'], -- replace_string : ['$GIT_BUILD_VERSION'], -+ replace_string : '$GIT_BUILD_VERSION', - input : 'version.h.template', output : 'version.h', - ) - add_project_arguments('-DLINUX=1', language : 'cpp') diff --git a/packages/emulators/tools/xa/package.mk b/packages/devel/xa/package.mk similarity index 100% rename from packages/emulators/tools/xa/package.mk rename to packages/devel/xa/package.mk diff --git a/packages/emulators/standalone/retroarch/autostart/003-logging b/packages/emulators/libretro/retroarch/autostart/003-logging similarity index 100% rename from packages/emulators/standalone/retroarch/autostart/003-logging rename to packages/emulators/libretro/retroarch/autostart/003-logging diff --git a/packages/emulators/standalone/retroarch/modprobe.d/usbhid.conf b/packages/emulators/libretro/retroarch/modprobe.d/usbhid.conf similarity index 100% rename from packages/emulators/standalone/retroarch/modprobe.d/usbhid.conf rename to packages/emulators/libretro/retroarch/modprobe.d/usbhid.conf diff --git a/packages/emulators/standalone/retroarch/package.mk b/packages/emulators/libretro/retroarch/package.mk similarity index 100% rename from packages/emulators/standalone/retroarch/package.mk rename to packages/emulators/libretro/retroarch/package.mk diff --git a/packages/emulators/standalone/retroarch/patches/0001-Increase-glui-size.patch b/packages/emulators/libretro/retroarch/patches/0001-Increase-glui-size.patch similarity index 100% rename from packages/emulators/standalone/retroarch/patches/0001-Increase-glui-size.patch rename to packages/emulators/libretro/retroarch/patches/0001-Increase-glui-size.patch diff --git a/packages/emulators/standalone/retroarch/patches/0001-Increase-ozone-size.patch b/packages/emulators/libretro/retroarch/patches/0001-Increase-ozone-size.patch similarity index 100% rename from packages/emulators/standalone/retroarch/patches/0001-Increase-ozone-size.patch rename to packages/emulators/libretro/retroarch/patches/0001-Increase-ozone-size.patch diff --git a/packages/emulators/standalone/retroarch/patches/0001-Increase-ozone-widget_size.patch b/packages/emulators/libretro/retroarch/patches/0001-Increase-ozone-widget_size.patch similarity index 100% rename from packages/emulators/standalone/retroarch/patches/0001-Increase-ozone-widget_size.patch rename to packages/emulators/libretro/retroarch/patches/0001-Increase-ozone-widget_size.patch diff --git a/packages/emulators/standalone/retroarch/patches/0002-quit-not-restart.patch b/packages/emulators/libretro/retroarch/patches/0002-quit-not-restart.patch similarity index 100% rename from packages/emulators/standalone/retroarch/patches/0002-quit-not-restart.patch rename to packages/emulators/libretro/retroarch/patches/0002-quit-not-restart.patch diff --git a/packages/emulators/standalone/retroarch/patches/0003-fix-oga-no-preferred.patch b/packages/emulators/libretro/retroarch/patches/0003-fix-oga-no-preferred.patch similarity index 100% rename from packages/emulators/standalone/retroarch/patches/0003-fix-oga-no-preferred.patch rename to packages/emulators/libretro/retroarch/patches/0003-fix-oga-no-preferred.patch diff --git a/packages/emulators/standalone/retroarch/patches/0004-drm-resolution.patch b/packages/emulators/libretro/retroarch/patches/0004-drm-resolution.patch similarity index 100% rename from packages/emulators/standalone/retroarch/patches/0004-drm-resolution.patch rename to packages/emulators/libretro/retroarch/patches/0004-drm-resolution.patch diff --git a/packages/emulators/standalone/retroarch/patches/0006-no-screen-brightness.patch b/packages/emulators/libretro/retroarch/patches/0006-no-screen-brightness.patch similarity index 100% rename from packages/emulators/standalone/retroarch/patches/0006-no-screen-brightness.patch rename to packages/emulators/libretro/retroarch/patches/0006-no-screen-brightness.patch diff --git a/packages/emulators/standalone/retroarch/patches/0008-disable_search.patch b/packages/emulators/libretro/retroarch/patches/0008-disable_search.patch similarity index 100% rename from packages/emulators/standalone/retroarch/patches/0008-disable_search.patch rename to packages/emulators/libretro/retroarch/patches/0008-disable_search.patch diff --git a/packages/emulators/standalone/retroarch/patches/0009-hide-wayland-checkerboard.patch b/packages/emulators/libretro/retroarch/patches/0009-hide-wayland-checkerboard.patch similarity index 100% rename from packages/emulators/standalone/retroarch/patches/0009-hide-wayland-checkerboard.patch rename to packages/emulators/libretro/retroarch/patches/0009-hide-wayland-checkerboard.patch diff --git a/packages/emulators/standalone/retroarch/patches/0010-paths.patch b/packages/emulators/libretro/retroarch/patches/0010-paths.patch similarity index 100% rename from packages/emulators/standalone/retroarch/patches/0010-paths.patch rename to packages/emulators/libretro/retroarch/patches/0010-paths.patch diff --git a/packages/emulators/standalone/retroarch/patches/RK3566-BSP-X55/0011-librga.patch b/packages/emulators/libretro/retroarch/patches/RK3566-BSP-X55/0011-librga.patch similarity index 100% rename from packages/emulators/standalone/retroarch/patches/RK3566-BSP-X55/0011-librga.patch rename to packages/emulators/libretro/retroarch/patches/RK3566-BSP-X55/0011-librga.patch diff --git a/packages/emulators/standalone/retroarch/patches/RK3566-BSP-X55/002-display-tweaks.patch b/packages/emulators/libretro/retroarch/patches/RK3566-BSP-X55/002-display-tweaks.patch similarity index 100% rename from packages/emulators/standalone/retroarch/patches/RK3566-BSP-X55/002-display-tweaks.patch rename to packages/emulators/libretro/retroarch/patches/RK3566-BSP-X55/002-display-tweaks.patch diff --git a/packages/emulators/standalone/retroarch/patches/RK3566-BSP/0011-librga.patch b/packages/emulators/libretro/retroarch/patches/RK3566-BSP/0011-librga.patch similarity index 100% rename from packages/emulators/standalone/retroarch/patches/RK3566-BSP/0011-librga.patch rename to packages/emulators/libretro/retroarch/patches/RK3566-BSP/0011-librga.patch diff --git a/packages/emulators/standalone/retroarch/patches/RK3566-BSP/002-display-tweaks.patch b/packages/emulators/libretro/retroarch/patches/RK3566-BSP/002-display-tweaks.patch similarity index 100% rename from packages/emulators/standalone/retroarch/patches/RK3566-BSP/002-display-tweaks.patch rename to packages/emulators/libretro/retroarch/patches/RK3566-BSP/002-display-tweaks.patch diff --git a/packages/emulators/standalone/retroarch/patches/RK3566-BSP/003-fix-go2-rotation.patch b/packages/emulators/libretro/retroarch/patches/RK3566-BSP/003-fix-go2-rotation.patch similarity index 100% rename from packages/emulators/standalone/retroarch/patches/RK3566-BSP/003-fix-go2-rotation.patch rename to packages/emulators/libretro/retroarch/patches/RK3566-BSP/003-fix-go2-rotation.patch diff --git a/packages/emulators/standalone/retroarch/patches/RK3566/0011-librga.patch b/packages/emulators/libretro/retroarch/patches/RK3566/0011-librga.patch similarity index 100% rename from packages/emulators/standalone/retroarch/patches/RK3566/0011-librga.patch rename to packages/emulators/libretro/retroarch/patches/RK3566/0011-librga.patch diff --git a/packages/emulators/standalone/retroarch/patches/RK3566/002-display-tweaks.patch b/packages/emulators/libretro/retroarch/patches/RK3566/002-display-tweaks.patch similarity index 100% rename from packages/emulators/standalone/retroarch/patches/RK3566/002-display-tweaks.patch rename to packages/emulators/libretro/retroarch/patches/RK3566/002-display-tweaks.patch diff --git a/packages/emulators/standalone/retroarch/patches/RK3566/003-fix-go2-rotation.patch b/packages/emulators/libretro/retroarch/patches/RK3566/003-fix-go2-rotation.patch similarity index 100% rename from packages/emulators/standalone/retroarch/patches/RK3566/003-fix-go2-rotation.patch rename to packages/emulators/libretro/retroarch/patches/RK3566/003-fix-go2-rotation.patch diff --git a/packages/emulators/tools/retroarch-assets/package.mk b/packages/emulators/libretro/retroarch/retroarch-assets/package.mk similarity index 100% rename from packages/emulators/tools/retroarch-assets/package.mk rename to packages/emulators/libretro/retroarch/retroarch-assets/package.mk diff --git a/packages/emulators/tools/retroarch-joypads/gamepads/ THEC64 Joystick THEC64 Joystick .cfg b/packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/ THEC64 Joystick THEC64 Joystick .cfg similarity index 100% rename from packages/emulators/tools/retroarch-joypads/gamepads/ THEC64 Joystick THEC64 Joystick .cfg rename to packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/ THEC64 Joystick THEC64 Joystick .cfg diff --git a/packages/emulators/tools/retroarch-joypads/gamepads/8Bitdo SF30 Pro 8Bitdo SN30 Pro.cfg b/packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/8Bitdo SF30 Pro 8Bitdo SN30 Pro.cfg similarity index 100% rename from packages/emulators/tools/retroarch-joypads/gamepads/8Bitdo SF30 Pro 8Bitdo SN30 Pro.cfg rename to packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/8Bitdo SF30 Pro 8Bitdo SN30 Pro.cfg diff --git a/packages/emulators/tools/retroarch-joypads/gamepads/Atari Classic Controller.cfg b/packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/Atari Classic Controller.cfg similarity index 100% rename from packages/emulators/tools/retroarch-joypads/gamepads/Atari Classic Controller.cfg rename to packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/Atari Classic Controller.cfg diff --git a/packages/emulators/tools/retroarch-joypads/gamepads/Atari Game Controller.cfg b/packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/Atari Game Controller.cfg similarity index 100% rename from packages/emulators/tools/retroarch-joypads/gamepads/Atari Game Controller.cfg rename to packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/Atari Game Controller.cfg diff --git a/packages/emulators/tools/retroarch-joypads/gamepads/Core (Plus) Wired Controller.cfg b/packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/Core (Plus) Wired Controller.cfg similarity index 100% rename from packages/emulators/tools/retroarch-joypads/gamepads/Core (Plus) Wired Controller.cfg rename to packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/Core (Plus) Wired Controller.cfg diff --git a/packages/emulators/tools/retroarch-joypads/gamepads/GO-Super Gamepad.cfg b/packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/GO-Super Gamepad.cfg similarity index 100% rename from packages/emulators/tools/retroarch-joypads/gamepads/GO-Super Gamepad.cfg rename to packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/GO-Super Gamepad.cfg diff --git a/packages/emulators/tools/retroarch-joypads/gamepads/GO-Ultra Gamepad.cfg b/packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/GO-Ultra Gamepad.cfg similarity index 100% rename from packages/emulators/tools/retroarch-joypads/gamepads/GO-Ultra Gamepad.cfg rename to packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/GO-Ultra Gamepad.cfg diff --git a/packages/emulators/tools/retroarch-joypads/gamepads/Game Controller.cfg b/packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/Game Controller.cfg similarity index 100% rename from packages/emulators/tools/retroarch-joypads/gamepads/Game Controller.cfg rename to packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/Game Controller.cfg diff --git a/packages/emulators/tools/retroarch-joypads/gamepads/GameForce ACE Gamepad.cfg b/packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/GameForce ACE Gamepad.cfg similarity index 100% rename from packages/emulators/tools/retroarch-joypads/gamepads/GameForce ACE Gamepad.cfg rename to packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/GameForce ACE Gamepad.cfg diff --git a/packages/emulators/tools/retroarch-joypads/gamepads/Microsoft X-Box 360 pad.cfg b/packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/Microsoft X-Box 360 pad.cfg similarity index 100% rename from packages/emulators/tools/retroarch-joypads/gamepads/Microsoft X-Box 360 pad.cfg rename to packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/Microsoft X-Box 360 pad.cfg diff --git a/packages/emulators/tools/retroarch-joypads/gamepads/OpenSimHardware OSH PB Controller.cfg b/packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/OpenSimHardware OSH PB Controller.cfg similarity index 100% rename from packages/emulators/tools/retroarch-joypads/gamepads/OpenSimHardware OSH PB Controller.cfg rename to packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/OpenSimHardware OSH PB Controller.cfg diff --git a/packages/emulators/tools/retroarch-joypads/gamepads/OpenSimHardware OSH PB Controller_SDL.cfg b/packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/OpenSimHardware OSH PB Controller_SDL.cfg similarity index 100% rename from packages/emulators/tools/retroarch-joypads/gamepads/OpenSimHardware OSH PB Controller_SDL.cfg rename to packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/OpenSimHardware OSH PB Controller_SDL.cfg diff --git a/packages/emulators/tools/retroarch-joypads/gamepads/RGB20S Gamepad.cfg b/packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/RGB20S Gamepad.cfg similarity index 100% rename from packages/emulators/tools/retroarch-joypads/gamepads/RGB20S Gamepad.cfg rename to packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/RGB20S Gamepad.cfg diff --git a/packages/emulators/tools/retroarch-joypads/gamepads/ROCKNIX Gamepad.cfg b/packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/ROCKNIX Gamepad.cfg similarity index 100% rename from packages/emulators/tools/retroarch-joypads/gamepads/ROCKNIX Gamepad.cfg rename to packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/ROCKNIX Gamepad.cfg diff --git a/packages/emulators/tools/retroarch-joypads/gamepads/Steam Controller.cfg b/packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/Steam Controller.cfg similarity index 100% rename from packages/emulators/tools/retroarch-joypads/gamepads/Steam Controller.cfg rename to packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/Steam Controller.cfg diff --git a/packages/emulators/tools/retroarch-joypads/gamepads/XU10 Gamepad.cfg b/packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/XU10 Gamepad.cfg similarity index 100% rename from packages/emulators/tools/retroarch-joypads/gamepads/XU10 Gamepad.cfg rename to packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/XU10 Gamepad.cfg diff --git a/packages/emulators/tools/retroarch-joypads/gamepads/odroidgo2_joypad.cfg b/packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/odroidgo2_joypad.cfg similarity index 100% rename from packages/emulators/tools/retroarch-joypads/gamepads/odroidgo2_joypad.cfg rename to packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/odroidgo2_joypad.cfg diff --git a/packages/emulators/tools/retroarch-joypads/gamepads/odroidgo2_v11_joypad.cfg b/packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/odroidgo2_v11_joypad.cfg similarity index 100% rename from packages/emulators/tools/retroarch-joypads/gamepads/odroidgo2_v11_joypad.cfg rename to packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/odroidgo2_v11_joypad.cfg diff --git a/packages/emulators/tools/retroarch-joypads/gamepads/odroidgo3_joypad.cfg b/packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/odroidgo3_joypad.cfg similarity index 100% rename from packages/emulators/tools/retroarch-joypads/gamepads/odroidgo3_joypad.cfg rename to packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/odroidgo3_joypad.cfg diff --git a/packages/emulators/tools/retroarch-joypads/gamepads/r33s_joypad.cfg b/packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/r33s_joypad.cfg similarity index 100% rename from packages/emulators/tools/retroarch-joypads/gamepads/r33s_joypad.cfg rename to packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/r33s_joypad.cfg diff --git a/packages/emulators/tools/retroarch-joypads/gamepads/retrogame_joypad.cfg b/packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/retrogame_joypad.cfg similarity index 100% rename from packages/emulators/tools/retroarch-joypads/gamepads/retrogame_joypad.cfg rename to packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/retrogame_joypad.cfg diff --git a/packages/emulators/tools/retroarch-joypads/gamepads/rg552_joypad.cfg b/packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/rg552_joypad.cfg similarity index 100% rename from packages/emulators/tools/retroarch-joypads/gamepads/rg552_joypad.cfg rename to packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/rg552_joypad.cfg diff --git a/packages/emulators/tools/retroarch-joypads/gamepads/zed_joystick.cfg b/packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/zed_joystick.cfg similarity index 100% rename from packages/emulators/tools/retroarch-joypads/gamepads/zed_joystick.cfg rename to packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/zed_joystick.cfg diff --git a/packages/emulators/tools/retroarch-joypads/package.mk b/packages/emulators/libretro/retroarch/retroarch-joypads/package.mk similarity index 100% rename from packages/emulators/tools/retroarch-joypads/package.mk rename to packages/emulators/libretro/retroarch/retroarch-joypads/package.mk diff --git a/packages/emulators/tools/retroarch-joypads/system.d/tmp-joypads.mount b/packages/emulators/libretro/retroarch/retroarch-joypads/system.d/tmp-joypads.mount similarity index 100% rename from packages/emulators/tools/retroarch-joypads/system.d/tmp-joypads.mount rename to packages/emulators/libretro/retroarch/retroarch-joypads/system.d/tmp-joypads.mount diff --git a/packages/emulators/tools/retroarch-overlays/package.mk b/packages/emulators/libretro/retroarch/retroarch-overlays/package.mk similarity index 100% rename from packages/emulators/tools/retroarch-overlays/package.mk rename to packages/emulators/libretro/retroarch/retroarch-overlays/package.mk diff --git a/packages/emulators/standalone/retroarch/sources/AMD64/TATE-MAME 2003-Plus.rmp b/packages/emulators/libretro/retroarch/sources/AMD64/TATE-MAME 2003-Plus.rmp similarity index 100% rename from packages/emulators/standalone/retroarch/sources/AMD64/TATE-MAME 2003-Plus.rmp rename to packages/emulators/libretro/retroarch/sources/AMD64/TATE-MAME 2003-Plus.rmp diff --git a/packages/emulators/standalone/retroarch/sources/AMD64/retroarch-core-options.cfg b/packages/emulators/libretro/retroarch/sources/AMD64/retroarch-core-options.cfg similarity index 100% rename from packages/emulators/standalone/retroarch/sources/AMD64/retroarch-core-options.cfg rename to packages/emulators/libretro/retroarch/sources/AMD64/retroarch-core-options.cfg diff --git a/packages/emulators/standalone/retroarch/sources/AMD64/retroarch.cfg b/packages/emulators/libretro/retroarch/sources/AMD64/retroarch.cfg similarity index 100% rename from packages/emulators/standalone/retroarch/sources/AMD64/retroarch.cfg rename to packages/emulators/libretro/retroarch/sources/AMD64/retroarch.cfg diff --git a/packages/emulators/standalone/retroarch/sources/AMD64/retroarch32bit-append.cfg b/packages/emulators/libretro/retroarch/sources/AMD64/retroarch32bit-append.cfg similarity index 100% rename from packages/emulators/standalone/retroarch/sources/AMD64/retroarch32bit-append.cfg rename to packages/emulators/libretro/retroarch/sources/AMD64/retroarch32bit-append.cfg diff --git a/packages/emulators/standalone/retroarch/sources/AMD64/retroarch64bit-append.cfg b/packages/emulators/libretro/retroarch/sources/AMD64/retroarch64bit-append.cfg similarity index 100% rename from packages/emulators/standalone/retroarch/sources/AMD64/retroarch64bit-append.cfg rename to packages/emulators/libretro/retroarch/sources/AMD64/retroarch64bit-append.cfg diff --git a/packages/emulators/standalone/retroarch/sources/RK3326/TATE-MAME 2003-Plus.rmp b/packages/emulators/libretro/retroarch/sources/RK3326/TATE-MAME 2003-Plus.rmp similarity index 100% rename from packages/emulators/standalone/retroarch/sources/RK3326/TATE-MAME 2003-Plus.rmp rename to packages/emulators/libretro/retroarch/sources/RK3326/TATE-MAME 2003-Plus.rmp diff --git a/packages/emulators/standalone/retroarch/sources/RK3326/retroarch-core-options.cfg b/packages/emulators/libretro/retroarch/sources/RK3326/retroarch-core-options.cfg similarity index 100% rename from packages/emulators/standalone/retroarch/sources/RK3326/retroarch-core-options.cfg rename to packages/emulators/libretro/retroarch/sources/RK3326/retroarch-core-options.cfg diff --git a/packages/emulators/standalone/retroarch/sources/RK3326/retroarch.cfg b/packages/emulators/libretro/retroarch/sources/RK3326/retroarch.cfg similarity index 100% rename from packages/emulators/standalone/retroarch/sources/RK3326/retroarch.cfg rename to packages/emulators/libretro/retroarch/sources/RK3326/retroarch.cfg diff --git a/packages/emulators/standalone/retroarch/sources/RK3326/retroarch32bit-append.cfg b/packages/emulators/libretro/retroarch/sources/RK3326/retroarch32bit-append.cfg similarity index 100% rename from packages/emulators/standalone/retroarch/sources/RK3326/retroarch32bit-append.cfg rename to packages/emulators/libretro/retroarch/sources/RK3326/retroarch32bit-append.cfg diff --git a/packages/emulators/standalone/retroarch/sources/RK3326/retroarch64bit-append.cfg b/packages/emulators/libretro/retroarch/sources/RK3326/retroarch64bit-append.cfg similarity index 100% rename from packages/emulators/standalone/retroarch/sources/RK3326/retroarch64bit-append.cfg rename to packages/emulators/libretro/retroarch/sources/RK3326/retroarch64bit-append.cfg diff --git a/packages/emulators/standalone/retroarch/sources/RK3399/TATE-MAME 2003-Plus.rmp b/packages/emulators/libretro/retroarch/sources/RK3399/TATE-MAME 2003-Plus.rmp similarity index 100% rename from packages/emulators/standalone/retroarch/sources/RK3399/TATE-MAME 2003-Plus.rmp rename to packages/emulators/libretro/retroarch/sources/RK3399/TATE-MAME 2003-Plus.rmp diff --git a/packages/emulators/standalone/retroarch/sources/RK3399/retroarch-core-options.cfg b/packages/emulators/libretro/retroarch/sources/RK3399/retroarch-core-options.cfg similarity index 100% rename from packages/emulators/standalone/retroarch/sources/RK3399/retroarch-core-options.cfg rename to packages/emulators/libretro/retroarch/sources/RK3399/retroarch-core-options.cfg diff --git a/packages/emulators/standalone/retroarch/sources/RK3399/retroarch.cfg b/packages/emulators/libretro/retroarch/sources/RK3399/retroarch.cfg similarity index 100% rename from packages/emulators/standalone/retroarch/sources/RK3399/retroarch.cfg rename to packages/emulators/libretro/retroarch/sources/RK3399/retroarch.cfg diff --git a/packages/emulators/standalone/retroarch/sources/RK3399/retroarch32bit-append.cfg b/packages/emulators/libretro/retroarch/sources/RK3399/retroarch32bit-append.cfg similarity index 100% rename from packages/emulators/standalone/retroarch/sources/RK3399/retroarch32bit-append.cfg rename to packages/emulators/libretro/retroarch/sources/RK3399/retroarch32bit-append.cfg diff --git a/packages/emulators/standalone/retroarch/sources/RK3399/retroarch64bit-append.cfg b/packages/emulators/libretro/retroarch/sources/RK3399/retroarch64bit-append.cfg similarity index 100% rename from packages/emulators/standalone/retroarch/sources/RK3399/retroarch64bit-append.cfg rename to packages/emulators/libretro/retroarch/sources/RK3399/retroarch64bit-append.cfg diff --git a/packages/emulators/standalone/retroarch/sources/RK3566/TATE-MAME 2003-Plus.rmp b/packages/emulators/libretro/retroarch/sources/RK3566/TATE-MAME 2003-Plus.rmp similarity index 100% rename from packages/emulators/standalone/retroarch/sources/RK3566/TATE-MAME 2003-Plus.rmp rename to packages/emulators/libretro/retroarch/sources/RK3566/TATE-MAME 2003-Plus.rmp diff --git a/packages/emulators/standalone/retroarch/sources/RK3566/retroarch-core-options.cfg b/packages/emulators/libretro/retroarch/sources/RK3566/retroarch-core-options.cfg similarity index 100% rename from packages/emulators/standalone/retroarch/sources/RK3566/retroarch-core-options.cfg rename to packages/emulators/libretro/retroarch/sources/RK3566/retroarch-core-options.cfg diff --git a/packages/emulators/standalone/retroarch/sources/RK3566/retroarch.cfg b/packages/emulators/libretro/retroarch/sources/RK3566/retroarch.cfg similarity index 100% rename from packages/emulators/standalone/retroarch/sources/RK3566/retroarch.cfg rename to packages/emulators/libretro/retroarch/sources/RK3566/retroarch.cfg diff --git a/packages/emulators/standalone/retroarch/sources/RK3566/retroarch32bit-append.cfg b/packages/emulators/libretro/retroarch/sources/RK3566/retroarch32bit-append.cfg similarity index 100% rename from packages/emulators/standalone/retroarch/sources/RK3566/retroarch32bit-append.cfg rename to packages/emulators/libretro/retroarch/sources/RK3566/retroarch32bit-append.cfg diff --git a/packages/emulators/standalone/retroarch/sources/RK3566/retroarch64bit-append.cfg b/packages/emulators/libretro/retroarch/sources/RK3566/retroarch64bit-append.cfg similarity index 100% rename from packages/emulators/standalone/retroarch/sources/RK3566/retroarch64bit-append.cfg rename to packages/emulators/libretro/retroarch/sources/RK3566/retroarch64bit-append.cfg diff --git a/packages/emulators/standalone/retroarch/sources/RK3588/TATE-MAME 2003-Plus.rmp b/packages/emulators/libretro/retroarch/sources/RK3588/TATE-MAME 2003-Plus.rmp similarity index 100% rename from packages/emulators/standalone/retroarch/sources/RK3588/TATE-MAME 2003-Plus.rmp rename to packages/emulators/libretro/retroarch/sources/RK3588/TATE-MAME 2003-Plus.rmp diff --git a/packages/emulators/standalone/retroarch/sources/RK3588/retroarch-core-options.cfg b/packages/emulators/libretro/retroarch/sources/RK3588/retroarch-core-options.cfg similarity index 100% rename from packages/emulators/standalone/retroarch/sources/RK3588/retroarch-core-options.cfg rename to packages/emulators/libretro/retroarch/sources/RK3588/retroarch-core-options.cfg diff --git a/packages/emulators/standalone/retroarch/sources/RK3588/retroarch.cfg b/packages/emulators/libretro/retroarch/sources/RK3588/retroarch.cfg similarity index 100% rename from packages/emulators/standalone/retroarch/sources/RK3588/retroarch.cfg rename to packages/emulators/libretro/retroarch/sources/RK3588/retroarch.cfg diff --git a/packages/emulators/standalone/retroarch/sources/RK3588/retroarch32bit-append.cfg b/packages/emulators/libretro/retroarch/sources/RK3588/retroarch32bit-append.cfg similarity index 100% rename from packages/emulators/standalone/retroarch/sources/RK3588/retroarch32bit-append.cfg rename to packages/emulators/libretro/retroarch/sources/RK3588/retroarch32bit-append.cfg diff --git a/packages/emulators/standalone/retroarch/sources/RK3588/retroarch64bit-append.cfg b/packages/emulators/libretro/retroarch/sources/RK3588/retroarch64bit-append.cfg similarity index 100% rename from packages/emulators/standalone/retroarch/sources/RK3588/retroarch64bit-append.cfg rename to packages/emulators/libretro/retroarch/sources/RK3588/retroarch64bit-append.cfg diff --git a/packages/emulators/standalone/retroarch/sources/S922X/TATE-MAME 2003-Plus.rmp b/packages/emulators/libretro/retroarch/sources/S922X/TATE-MAME 2003-Plus.rmp similarity index 100% rename from packages/emulators/standalone/retroarch/sources/S922X/TATE-MAME 2003-Plus.rmp rename to packages/emulators/libretro/retroarch/sources/S922X/TATE-MAME 2003-Plus.rmp diff --git a/packages/emulators/standalone/retroarch/sources/S922X/retroarch-core-options.cfg b/packages/emulators/libretro/retroarch/sources/S922X/retroarch-core-options.cfg similarity index 100% rename from packages/emulators/standalone/retroarch/sources/S922X/retroarch-core-options.cfg rename to packages/emulators/libretro/retroarch/sources/S922X/retroarch-core-options.cfg diff --git a/packages/emulators/standalone/retroarch/sources/S922X/retroarch.cfg b/packages/emulators/libretro/retroarch/sources/S922X/retroarch.cfg similarity index 100% rename from packages/emulators/standalone/retroarch/sources/S922X/retroarch.cfg rename to packages/emulators/libretro/retroarch/sources/S922X/retroarch.cfg diff --git a/packages/emulators/standalone/retroarch/sources/S922X/retroarch32bit-append.cfg b/packages/emulators/libretro/retroarch/sources/S922X/retroarch32bit-append.cfg similarity index 100% rename from packages/emulators/standalone/retroarch/sources/S922X/retroarch32bit-append.cfg rename to packages/emulators/libretro/retroarch/sources/S922X/retroarch32bit-append.cfg diff --git a/packages/emulators/standalone/retroarch/sources/S922X/retroarch64bit-append.cfg b/packages/emulators/libretro/retroarch/sources/S922X/retroarch64bit-append.cfg similarity index 100% rename from packages/emulators/standalone/retroarch/sources/S922X/retroarch64bit-append.cfg rename to packages/emulators/libretro/retroarch/sources/S922X/retroarch64bit-append.cfg diff --git a/packages/emulators/standalone/retroarch/system.d/tmp-assets.mount b/packages/emulators/libretro/retroarch/system.d/tmp-assets.mount similarity index 100% rename from packages/emulators/standalone/retroarch/system.d/tmp-assets.mount rename to packages/emulators/libretro/retroarch/system.d/tmp-assets.mount diff --git a/packages/emulators/standalone/retroarch/system.d/tmp-cores.mount b/packages/emulators/libretro/retroarch/system.d/tmp-cores.mount similarity index 100% rename from packages/emulators/standalone/retroarch/system.d/tmp-cores.mount rename to packages/emulators/libretro/retroarch/system.d/tmp-cores.mount diff --git a/packages/emulators/standalone/retroarch/system.d/tmp-database.mount b/packages/emulators/libretro/retroarch/system.d/tmp-database.mount similarity index 100% rename from packages/emulators/standalone/retroarch/system.d/tmp-database.mount rename to packages/emulators/libretro/retroarch/system.d/tmp-database.mount diff --git a/packages/emulators/standalone/retroarch/system.d/tmp-overlays.mount b/packages/emulators/libretro/retroarch/system.d/tmp-overlays.mount similarity index 100% rename from packages/emulators/standalone/retroarch/system.d/tmp-overlays.mount rename to packages/emulators/libretro/retroarch/system.d/tmp-overlays.mount diff --git a/packages/emulators/standalone/retroarch/system.d/tmp-shaders.mount b/packages/emulators/libretro/retroarch/system.d/tmp-shaders.mount similarity index 100% rename from packages/emulators/standalone/retroarch/system.d/tmp-shaders.mount rename to packages/emulators/libretro/retroarch/system.d/tmp-shaders.mount diff --git a/packages/emulators/standalone/retroarch/tmpfiles.d/retroarch-userdirs.conf b/packages/emulators/libretro/retroarch/tmpfiles.d/retroarch-userdirs.conf similarity index 100% rename from packages/emulators/standalone/retroarch/tmpfiles.d/retroarch-userdirs.conf rename to packages/emulators/libretro/retroarch/tmpfiles.d/retroarch-userdirs.conf diff --git a/packages/emulators/standalone/retroarch/udev.d/99-8bitdo-bluetooth-controllers.rules b/packages/emulators/libretro/retroarch/udev.d/99-8bitdo-bluetooth-controllers.rules similarity index 100% rename from packages/emulators/standalone/retroarch/udev.d/99-8bitdo-bluetooth-controllers.rules rename to packages/emulators/libretro/retroarch/udev.d/99-8bitdo-bluetooth-controllers.rules diff --git a/packages/emulators/standalone/retroarch/udev.d/99-ION-iCade-bluetooth.rules b/packages/emulators/libretro/retroarch/udev.d/99-ION-iCade-bluetooth.rules similarity index 100% rename from packages/emulators/standalone/retroarch/udev.d/99-ION-iCade-bluetooth.rules rename to packages/emulators/libretro/retroarch/udev.d/99-ION-iCade-bluetooth.rules diff --git a/packages/emulators/standalone/retroarch/udev.d/99-gen-game-s3-controller.rules b/packages/emulators/libretro/retroarch/udev.d/99-gen-game-s3-controller.rules similarity index 100% rename from packages/emulators/standalone/retroarch/udev.d/99-gen-game-s3-controller.rules rename to packages/emulators/libretro/retroarch/udev.d/99-gen-game-s3-controller.rules diff --git a/packages/emulators/standalone/retroarch/udev.d/99-nintendo-wii-remote.rules b/packages/emulators/libretro/retroarch/udev.d/99-nintendo-wii-remote.rules similarity index 100% rename from packages/emulators/standalone/retroarch/udev.d/99-nintendo-wii-remote.rules rename to packages/emulators/libretro/retroarch/udev.d/99-nintendo-wii-remote.rules diff --git a/packages/emulators/standalone/retroarch/udev.d/99-ninteno-wii-remote.rules b/packages/emulators/libretro/retroarch/udev.d/99-ninteno-wii-remote.rules similarity index 100% rename from packages/emulators/standalone/retroarch/udev.d/99-ninteno-wii-remote.rules rename to packages/emulators/libretro/retroarch/udev.d/99-ninteno-wii-remote.rules diff --git a/packages/emulators/standalone/retroarch/udev.d/99-nv-shield-controller.rules b/packages/emulators/libretro/retroarch/udev.d/99-nv-shield-controller.rules similarity index 100% rename from packages/emulators/standalone/retroarch/udev.d/99-nv-shield-controller.rules rename to packages/emulators/libretro/retroarch/udev.d/99-nv-shield-controller.rules diff --git a/packages/emulators/standalone/retroarch/udev.d/99-ouya-controller.rules b/packages/emulators/libretro/retroarch/udev.d/99-ouya-controller.rules similarity index 100% rename from packages/emulators/standalone/retroarch/udev.d/99-ouya-controller.rules rename to packages/emulators/libretro/retroarch/udev.d/99-ouya-controller.rules diff --git a/packages/emulators/standalone/retroarch/udev.d/99-terios-t3.rules b/packages/emulators/libretro/retroarch/udev.d/99-terios-t3.rules similarity index 100% rename from packages/emulators/standalone/retroarch/udev.d/99-terios-t3.rules rename to packages/emulators/libretro/retroarch/udev.d/99-terios-t3.rules diff --git a/packages/emulators/standalone/drastic-sa/package.mk b/packages/emulators/standalone/drastic-sa/package.mk index f834ed03b..271d7cf3a 100644 --- a/packages/emulators/standalone/drastic-sa/package.mk +++ b/packages/emulators/standalone/drastic-sa/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="1.0" PKG_LICENSE="Proprietary:DRASTIC.pdf" PKG_ARCH="aarch64" PKG_URL="https://github.com/r3claimer/JelosAddOns/raw/main/drastic.tar.gz" -PKG_DEPENDS_TARGET="toolchain" +PKG_DEPENDS_TARGET="toolchain rocknix-hotkey" PKG_LONGDESC="Install Drastic Launcher script, will dowload bin on first run" PKG_TOOLCHAIN="make" diff --git a/packages/emulators/tools/gptokeyb/patches/0001-build_fix.patch b/packages/emulators/tools/gptokeyb/patches/0001-build_fix.patch deleted file mode 100644 index e7f15ff45..000000000 --- a/packages/emulators/tools/gptokeyb/patches/0001-build_fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/gptokeyb.cpp b/gptokeyb.cpp -old mode 100644 -new mode 100755 -index aa4c0b0..0d62f28 ---- a/gptokeyb.cpp -+++ b/gptokeyb.cpp -@@ -42,8 +42,8 @@ - #include - #include - --#include --#include -+#include -+#include - - #include - #include -@@ -2284,7 +2284,7 @@ int main(int argc, char* argv[]) - const char* config_file = nullptr; - - config_mode = true; -- config_file = "/emuelec/configs/gptokeyb/default.gptk"; -+ config_file = "/usr/config/gptokeyb/default.gptk"; - - // Add hotkey environment variable if available - if (char* env_hotkey = SDL_getenv("HOTKEY")) { diff --git a/packages/emulators/tools/virtualcontroller/package.mk b/packages/emulators/tools/virtualcontroller/package.mk deleted file mode 100644 index ddf25ea4e..000000000 --- a/packages/emulators/tools/virtualcontroller/package.mk +++ /dev/null @@ -1,21 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) - -PKG_NAME="virtualcontroller" -PKG_VERSION="85f2c70c25230d90781dbddbc97436fa50283530" -PKG_LICENSE="GPLv2" -PKG_SITE="https://github.com/macromorgan/input-wrapper" -PKG_URL="${PKG_SITE}.git" -PKG_DEPENDS_TARGET="toolchain linux" -PKG_TOOLCHAIN="make" -PKG_PATCH_DIRS+="${DEVICE}" - -makeinstall_target() { - mkdir -p ${INSTALL}/usr/bin - cp virtual_controller ${INSTALL}/usr/bin/virtual_controller - chmod 0755 ${INSTALL}/usr/bin/virtual_controller -} - -post_install() { - enable_service virtualcontroller.service -} diff --git a/packages/emulators/tools/virtualcontroller/system.d/virtualcontroller.service b/packages/emulators/tools/virtualcontroller/system.d/virtualcontroller.service deleted file mode 100644 index 105ea15b5..000000000 --- a/packages/emulators/tools/virtualcontroller/system.d/virtualcontroller.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Virtual Controller Driver -After=systemd-udev-settle.service -Wants=systemd-udev-settle.service - -[Service] -Type=simple -Nice=-20 -OOMScoreAdjust=-1000 -Restart=always -ExecStart=/usr/bin/virtual_controller - -[Install] -WantedBy=multi-user.target diff --git a/packages/emulators/tools/virtualcontroller/udev.d/99-ROCKNIX-not-joysticks.rules b/packages/emulators/tools/virtualcontroller/udev.d/99-ROCKNIX-not-joysticks.rules deleted file mode 100644 index 95380ad14..000000000 --- a/packages/emulators/tools/virtualcontroller/udev.d/99-ROCKNIX-not-joysticks.rules +++ /dev/null @@ -1,2 +0,0 @@ -SUBSYSTEM=="input", ATTRS{name}=="gpio-keys-control", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" -SUBSYSTEM=="input", ATTRS{name}=="adc-joystick", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" diff --git a/packages/graphics/SDL2/package.mk b/packages/graphics/SDL2/package.mk index ff417003c..a990245c8 100644 --- a/packages/graphics/SDL2/package.mk +++ b/packages/graphics/SDL2/package.mk @@ -61,13 +61,6 @@ else -DSDL_X11=OFF" fi -case ${PROJECT} in - Rockchip) - PKG_DEPENDS_TARGET+=" librga" - PKG_PATCH_DIRS_TARGET+="${DEVICE}" - ;; -esac - pre_configure_target(){ if [ -n "${PKG_PATCH_DIRS_TARGET}" ] diff --git a/packages/emulators/tools/capsimg/package.mk b/packages/graphics/capsimg/package.mk similarity index 100% rename from packages/emulators/tools/capsimg/package.mk rename to packages/graphics/capsimg/package.mk diff --git a/packages/devel/qt5/package.mk b/packages/graphics/qt5/package.mk similarity index 100% rename from packages/devel/qt5/package.mk rename to packages/graphics/qt5/package.mk diff --git a/packages/graphics/qt6/package.mk b/packages/graphics/qt6/package.mk deleted file mode 100644 index b21b9dc03..000000000 --- a/packages/graphics/qt6/package.mk +++ /dev/null @@ -1,12 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2023-present JELOS (https://github.com/JustEnoughLinuxOS) - -PKG_NAME="qt6" -PKG_MAJOR_VERSION="6.6" -PKG_VERSION="${PKG_MAJOR_VERSION}.1" -PKG_LICENSE="GPLv3" -PKG_SITE="https://download.qt.io" -PKG_DEPENDS_TARGET="toolchain" -PKG_LONGDESC="Qt6 - Qt is a full development framework with tools designed to streamline the creation of applications and user interfaces for desktop, embedded, and mobile platforms." - -PKG_DEPENDS_TARGET+=" qt6base qt6tools qt6wayland" diff --git a/packages/graphics/qt6/qt6base/package.mk b/packages/graphics/qt6/qt6base/package.mk deleted file mode 100644 index 6e7075c31..000000000 --- a/packages/graphics/qt6/qt6base/package.mk +++ /dev/null @@ -1,63 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2023-present JELOS (https://github.com/JustEnoughLinuxOS) - -PKG_NAME="qt6base" -PKG_MAJOR_VERSION="6.6" -PKG_VERSION="${PKG_MAJOR_VERSION}.1" -PKG_LICENSE="GPLv3" -PKG_SITE="https://download.qt.io" -PKG_URL="${PKG_SITE}/archive/qt/${PKG_MAJOR_VERSION}/${PKG_VERSION}/submodules/qtbase-everywhere-src-${PKG_VERSION}.tar.xz" -PKG_DEPENDS_HOST="toolchain:host" -PKG_DEPENDS_TARGET="toolchain qt6base:host xorgproto" -PKG_LONGDESC="QT6 base package" - -pre_configure_host() { -PKG_CMAKE_OPTS_HOST+=" - -GNinja \ - -DFEATURE_gui=ON \ - -DFEATURE_openssl_linked=ON \ - -DFEATURE_concurrent=ON \ - -DFEATURE_xml=ON \ - -DFEATURE_sql=ON \ - -DFEATURE_testlib=ON \ - -DFEATURE_network=ON \ - -DFEATURE_dbus=ON \ - -DFEATURE_icu=OFF \ - -DFEATURE_glib=OFF \ - -DFEATURE_system_pcre2=ON \ - -DFEATURE_system_zlib=ON \ - -DQT_BUILD_TESTS_BY_DEFAULT=OFF \ - -DQT_BUILD_EXAMPLES_BY_DEFAULT=OFF \ - -DCMAKE_CROSSCOMPILING=OFF" -} - -pre_configure_target() { - PKG_CMAKE_OPTS_TARGET+=" - -GNinja \ - -DQT_HOST_PATH=${PKG_BUILD}/.x86_64-rocknix-linux-gnu \ - -DFEATURE_gui=ON \ - -DFEATURE_concurrent=OFF \ - -DFEATURE_xml=OFF \ - -DFEATURE_sql=OFF \ - -DFEATURE_testlib=OFF \ - -DFEATURE_network=ON \ - -DFEATURE_icu=OFF \ - -DFEATURE_glib=OFF \ - -DFEATURE_system_doubleconversion=OFF \ - -DFEATURE_system_pcre2=ON \ - -DFEATURE_system_zlib=ON \ - -DFEATURE_libudev=ON\ - -DFEATURE_gui=ON \ - -DFEATURE_freetype=ON \ - -DFEATURE_png=ON\ - -DFEATURE_system_png=ON \ - -DFEATURE_gui=ON \ - -DFEATURE_freetype=ON \ - -DFEATURE_vulkan=OFF \ - -DFEATURE_dbus=ON" - -} - -make_host() { - ninja ${NINJA_OPTS} -} diff --git a/packages/graphics/qt6/qt6tools/package.mk b/packages/graphics/qt6/qt6tools/package.mk deleted file mode 100644 index c1c31b3e2..000000000 --- a/packages/graphics/qt6/qt6tools/package.mk +++ /dev/null @@ -1,41 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2023-present JELOS (https://github.com/JustEnoughLinuxOS) - -PKG_NAME="qt6tools" -PKG_MAJOR_VERSION="6.6" -PKG_VERSION="${PKG_MAJOR_VERSION}.1" -PKG_LICENSE="GPLv3" -PKG_SITE="https://download.qt.io" -PKG_URL="${PKG_SITE}/archive/qt/${PKG_MAJOR_VERSION}/${PKG_VERSION}/submodules/qttools-everywhere-src-${PKG_VERSION}.tar.xz" -PKG_DEPENDS_HOST="toolchain:host qt6base" -PKG_DEPENDS_TARGET="toolchain qt6tools:host qt6base" -PKG_LONGDESC="QT6 Tools package" - -pre_configure_host() { - PKG_CMAKE_OPTS_HOST+=" -GNinja \ - -DQT_FEATURE_linguist=ON \ - -DQT_FEATURE_qdbus=OFF \ - -DQT_FEATURE_qtattributionsscanner=ON \ - -DQT_FEATURE_qtdiag=ON \ - -DQT_FEATURE_qtplugininfo=ON \ - -DCMAKE_CROSSCOMPILING=OFF" -} - -pre_configure_target() { - PKG_CMAKE_OPTS_TARGET+=" -GNinja \ - -DQT_HOST_PATH=${PKG_BUILD}/.x86_64-rocknix-linux-gnu \ - -DQT_FEATURE_linguist=ON \ - -DQT_FEATURE_qdbus=ON \ - -DQT_DEBUG_FIND_PACKAGE=ON - -DQT_FEATURE_qtattributionsscanner=ON \ - -DQT_FEATURE_qtdiag=ON \ - -DQT_FEATURE_qtplugininfo=ON \ - -DQT_BUILD_TESTS_BY_DEFAULT=OFF \ - -DQT_BUILD_EXAMPLES_BY_DEFAULT=OFF \ - -DQT_FEATURE_LinguistTools=OFF" -} - - -make_host() { - ninja ${NINJA_OPTS} -} diff --git a/packages/graphics/qt6/qt6wayland/package.mk b/packages/graphics/qt6/qt6wayland/package.mk deleted file mode 100644 index 57d208517..000000000 --- a/packages/graphics/qt6/qt6wayland/package.mk +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2023-present JELOS (https://github.com/JustEnoughLinuxOS) - -PKG_NAME="qt6wayland" -PKG_MAJOR_VERSION="6.6" -PKG_VERSION="${PKG_MAJOR_VERSION}.1" -PKG_LICENSE="GPLv3" -PKG_SITE="https://download.qt.io" -PKG_URL="${PKG_SITE}/archive/qt/${PKG_MAJOR_VERSION}/${PKG_VERSION}/submodules/qtwayland-everywhere-src-${PKG_VERSION}.tar.xz" -PKG_DEPENDS_HOST="toolchain:host qt6base" -PKG_DEPENDS_TARGET="toolchain qt6wayland:host qt6base" -PKG_LONGDESC="QT6 wayland" - -pre_configure_host() { - PKG_CMAKE_OPTS_HOST+=" -GNinja \ - -DBUILD_WITH_PCH=OFF \ - -DQT_BUILD_EXAMPLES=OFF \ - -DQT_BUILD_TESTS=OFF \ - -DCMAKE_CROSSCOMPILING=OFF" -} - -pre_configure_target() { - PKG_CMAKE_OPTS_TARGET+=" -GNinja \ - -DQT_HOST_PATH=${PKG_BUILD}/.x86_64-rocknix-linux-gnu \ - -DQT_DEBUG_FIND_PACKAGE=ON \ - -DBUILD_WITH_PCH=OFF \ - -DQT_BUILD_EXAMPLES=OFF \ - -DQT_BUILD_TESTS=OFF" -} - -make_host() { - ninja ${NINJA_OPTS} -} diff --git a/packages/kernel/linux/package.mk b/packages/kernel/linux/package.mk index 40ed37181..104870237 100644 --- a/packages/kernel/linux/package.mk +++ b/packages/kernel/linux/package.mk @@ -20,13 +20,13 @@ case ${DEVICE} in PKG_URL="https://github.com/hbiyik/linux-rockchip/archive/${PKG_VERSION}.tar.gz" PKG_GIT_CLONE_BRANCH="rk-6.1-rkr1-panthor-v6" ;; - RK3566*) - PKG_VERSION="6.8-rc6" - PKG_URL="https://git.kernel.org/torvalds/t/${PKG_NAME}-${PKG_VERSION}.tar.gz" + RK3326*) + PKG_VERSION="6.7.9" + PKG_URL="${PKG_SITE}/pub/linux/kernel/v6.x/${PKG_NAME}-${PKG_VERSION}.tar.xz" ;; *) PKG_VERSION="6.8.1" - PKG_URL="https://www.kernel.org/pub/linux/kernel/v6.x/${PKG_NAME}-${PKG_VERSION}.tar.xz" + PKG_URL="${PKG_SITE}/pub/linux/kernel/v6.x/${PKG_NAME}-${PKG_VERSION}.tar.xz" ;; esac diff --git a/packages/emulators/tools/sixaxis/package.mk b/packages/network/sixaxis/package.mk similarity index 100% rename from packages/emulators/tools/sixaxis/package.mk rename to packages/network/sixaxis/package.mk diff --git a/packages/emulators/tools/sixaxis/system.d/sixaxis@.service b/packages/network/sixaxis/system.d/sixaxis@.service similarity index 100% rename from packages/emulators/tools/sixaxis/system.d/sixaxis@.service rename to packages/network/sixaxis/system.d/sixaxis@.service diff --git a/packages/emulators/tools/sixaxis/udev.d/99-sixaxis.rules b/packages/network/sixaxis/udev.d/99-sixaxis.rules similarity index 100% rename from packages/emulators/tools/sixaxis/udev.d/99-sixaxis.rules rename to packages/network/sixaxis/udev.d/99-sixaxis.rules diff --git a/packages/emulators/tools/sixpair/package.mk b/packages/network/sixpair/package.mk similarity index 100% rename from packages/emulators/tools/sixpair/package.mk rename to packages/network/sixpair/package.mk diff --git a/packages/virtual/gamesupport/package.mk b/packages/virtual/gamesupport/package.mk index adccabcfb..bdaf04ca7 100644 --- a/packages/virtual/gamesupport/package.mk +++ b/packages/virtual/gamesupport/package.mk @@ -7,7 +7,7 @@ PKG_SITE="https://rocknix.org" PKG_SECTION="virtual" PKG_LONGDESC="Game support software metapackage." -PKG_GAMESUPPORT="sixaxis gptokeyb jstest-sdl gamecontrollerdb sdljoytest control-gen" +PKG_GAMESUPPORT="sixaxis rocknix-hotkey jstest-sdl gamecontrollerdb sdljoytest control-gen" PKG_DEPENDS_TARGET="${PKG_GAMESUPPORT}" diff --git a/projects/Rockchip/options b/projects/Rockchip/options index 768538701..5587c70a5 100755 --- a/projects/Rockchip/options +++ b/projects/Rockchip/options @@ -72,7 +72,7 @@ # driver addons to install: # for a list of additinoal drivers see packages/linux-driver-addons # Space separated list is supported, - DRIVER_ADDONS="dvb-latest" + DRIVER_ADDONS="" # debug tty path DEBUG_TTY="/dev/ttyS2" diff --git a/projects/Rockchip/packages/u-boot/package.mk b/projects/Rockchip/packages/u-boot/package.mk index 235095cad..2a2f82488 100644 --- a/projects/Rockchip/packages/u-boot/package.mk +++ b/projects/Rockchip/packages/u-boot/package.mk @@ -27,9 +27,9 @@ case ${DEVICE} in PKG_URL="https://ftp.denx.de/pub/u-boot/${PKG_NAME}-${PKG_VERSION}.tar.bz2" ;; RK3326) - PKG_URL="https://github.com/hardkernel/u-boot.git" PKG_VERSION="0e26e35cb18a80005b7de45c95858c86a2f7f41e" - PKG_GIT_CLONE_BRANCH="odroidgoA-v2017.09" + PKG_URL="${PKG_SITE}/hardkernel-uboot/archive/${PKG_VERSION}.tar.gz" + PKG_GIT_CLONE_BRANCH="RK3326" ;; esac @@ -87,6 +87,7 @@ make_target() { DEBUG=${PKG_DEBUG} CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="" ARCH=arm64 _python_sysroot="${TOOLCHAIN}" _python_prefix=/ _python_exec_prefix=/ make HOSTCC="${HOST_CC}" HOSTLDFLAGS="-L${TOOLCHAIN}/lib" HOSTCFLAGS="-I${TOOLCHAIN}/include" HOSTSTRIP="true" CONFIG_MKIMAGE_DTC_PATH="scripts/dtc/dtc" elif [[ "${PKG_SOC}" =~ "rk3588" ]] then + # rk3588 devices DEBUG=${PKG_DEBUG} CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="" ARCH=arm64 make mrproper DEBUG=${PKG_DEBUG} CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="" ARCH=arm64 make ${UBOOT_CONFIG} BL31=${PKG_BL31} ${PKG_LOADER} u-boot.dtb u-boot.itb CONFIG_MKIMAGE_DTC_PATH="scripts/dtc/dtc" DEBUG=${PKG_DEBUG} CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="" ARCH=arm64 _python_sysroot="${TOOLCHAIN}" _python_prefix=/ _python_exec_prefix=/ make HOSTCC="${HOST_CC}" HOSTLDFLAGS="-L${TOOLCHAIN}/lib" HOSTSTRIP="true" CONFIG_MKIMAGE_DTC_PATH="scripts/dtc/dtc" diff --git a/scripts/update_packages b/scripts/update_packages index fd9c9ef90..1eeea2a82 100755 --- a/scripts/update_packages +++ b/scripts/update_packages @@ -4,7 +4,7 @@ # Based on work by ToKe79 and Shanti Gilbert -OPTIONS="distributions/${DISTRONAME}/options" +OPTIONS="distributions/rocknix/options" PACKAGES=("packages/virtual/emulators/package.mk" \ "packages/virtual/es-themes/package.mk" \ "packages/virtual/gamesupport/package.mk" )