diff --git a/build_wine.sh b/build_wine.sh index 30fd464..2b1d78d 100755 --- a/build_wine.sh +++ b/build_wine.sh @@ -46,8 +46,8 @@ export WINE_OSU="true" # use their own versions. export WINE_VERSION="latest" -# Available branches: vanilla, staging, staging-tkg, proton, wayland, custom, local -export WINE_BRANCH="staging" +# Available branches: winello, vanilla, staging, staging-tkg, proton, wayland, custom, local +export WINE_BRANCH="winello" # Custom path for Wine source export CUSTOM_WINE_SOURCE="" @@ -242,6 +242,11 @@ elif [ "$WINE_BRANCH" = "custom" ]; then else Error "Please add a Wine source to CUSTOM_WINE_SOURCE." fi +elif [ "$WINE_BRANCH" = "winello" ]; then + git clone https://github.com/NelloKudo/winello-wine.git wine || Error "Cloning failed, is the source you used working? Please try again." + + WINE_VERSION="$(cat wine/VERSION | tail -c +14)" + BUILD_NAME="${WINE_VERSION}"-winello elif [ "$WINE_BRANCH" = "local" ]; then echo "" ## Time for your local tests! Example, try your own source like this: @@ -303,10 +308,10 @@ if [ ! -d wine ]; then exit 1 fi -# Changing winepulse.drv content for osu! if enabled +# Changing winepulse.drv and other audio components for osu! if enabled if [ "${WINE_OSU}" = "true" ] ; then - osu_files=("winepulse-513.tar" "mmdevapi-revert.tar" "winealsa-revert.tar" "winecoreaudio-revert.tar" "wineoss-revert.tar") + osu_files=("audio-revert.tar") for file in "${osu_files[@]}" do @@ -315,31 +320,17 @@ if [ "${WINE_OSU}" = "true" ] ; then fi done - Info "Reverting winepulse..." - - rm -f "${BUILD_DIR}"/wine/dlls/winepulse.drv/* - tar -xf "$curdir/osu-misc/winepulse-513.tar" -C "${BUILD_DIR}/wine/dlls/winepulse.drv" - - # If this does not work, please just comment these lines yourself. You only need this for versions after 8.14! - if (( $(echo "$WINE_VERSION > 8.14" | bc -l) )); then - - Info "Reverting mmdevapi..." - rm -f "${BUILD_DIR}"/wine/dlls/mmdevapi/* - tar -xf "$curdir/osu-misc/mmdevapi-revert.tar" -C "${BUILD_DIR}/wine/dlls/mmdevapi" - - Info "Reverting winealsa..." - rm -f "${BUILD_DIR}"/wine/dlls/winealsa.drv/* - tar -xf "$curdir/osu-misc/winealsa-revert.tar" -C "${BUILD_DIR}/wine/dlls/winealsa.drv" - - Info "Reverting winecoreaudio..." - rm -f "${BUILD_DIR}"/wine/dlls/winecoreaudio.drv/* - tar -xf "$curdir/osu-misc/winecoreaudio-revert.tar" -C "${BUILD_DIR}/wine/dlls/winecoreaudio.drv" - - Info "Reverting wineoss..." - rm -f "${BUILD_DIR}"/wine/dlls/wineoss.drv/* - tar -xf "$curdir/osu-misc/wineoss-revert.tar" -C "${BUILD_DIR}/wine/dlls/wineoss.drv" - - fi + ## If you ever need to compile a version that does NOT require all the reverts, please uncomment the lines + ## below instead and comment out the main ones! + ## + ## Info "Applying audio reverts.." + ## rm -rf "${BUILD_DIR}"/wine/dlls/winepulse.drv + ## mkdir -p "${BUILD_DIR}"/wine/dlls/winepulse.drv + ## tar -xf "$curdir"/osu-misc/old-reverts/winepulse-513.tar -C "${BUILD_DIR}"/wine/dlls/ + + Info "Applying audio reverts.." + rm -rf "${BUILD_DIR}"/wine/dlls/{winepulse.drv,mmdevapi,winealsa.drv,winecoreaudio.drv,wineoss.drv} + tar -xf "$curdir"/osu-misc/audio-revert.tar -C "${BUILD_DIR}"/wine/dlls/ else Info "Replacing Winepulse not needed, skipping.." diff --git a/osu-misc/README.md b/osu-misc/README.md new file mode 100644 index 0000000..b185bca --- /dev/null +++ b/osu-misc/README.md @@ -0,0 +1,6 @@ +## osu! builds instructions + +To build wine-osu, please follow the instructions at [here!](https://gist.github.com/NelloKudo/b6f6d48807548bd3cacd3018a1cadef5) + +Patches can be found in the **patchsets** folder in here, just extract them all and copy +them to **custompatches** to actually apply them e.e \ No newline at end of file diff --git a/osu-misc/audio-revert.tar b/osu-misc/audio-revert.tar new file mode 100644 index 0000000..0a23830 Binary files /dev/null and b/osu-misc/audio-revert.tar differ diff --git a/osu-misc/mmdevapi-revert.tar b/osu-misc/mmdevapi-revert.tar deleted file mode 100644 index 30eaf8a..0000000 Binary files a/osu-misc/mmdevapi-revert.tar and /dev/null differ diff --git a/osu-misc/winepulse-513.tar b/osu-misc/old-reverts/winepulse-513.tar similarity index 100% rename from osu-misc/winepulse-513.tar rename to osu-misc/old-reverts/winepulse-513.tar diff --git a/osu-misc/patchsets/8.20-patchset.tar b/osu-misc/patchsets/8.20-patchset.tar new file mode 100644 index 0000000..cf5ded2 Binary files /dev/null and b/osu-misc/patchsets/8.20-patchset.tar differ diff --git a/osu-misc/winealsa-revert.tar b/osu-misc/winealsa-revert.tar deleted file mode 100644 index 1fc7098..0000000 Binary files a/osu-misc/winealsa-revert.tar and /dev/null differ diff --git a/osu-misc/winecoreaudio-revert.tar b/osu-misc/winecoreaudio-revert.tar deleted file mode 100644 index 8dfd918..0000000 Binary files a/osu-misc/winecoreaudio-revert.tar and /dev/null differ diff --git a/osu-misc/wineoss-revert.tar b/osu-misc/wineoss-revert.tar deleted file mode 100644 index 2a3633b..0000000 Binary files a/osu-misc/wineoss-revert.tar and /dev/null differ