Skip to content

Commit

Permalink
8.20 support + updates
Browse files Browse the repository at this point in the history
Updated audio reverts for Wine 8.20 + changed the way they install
in a way faster way xd
Also added "Winello" as a source to use 'winello-wine' when needed
and the repo now also includes patchsets for every released vers.
from now on!
  • Loading branch information
NelloKudo committed Nov 21, 2023
1 parent 113b9b0 commit 42e1b22
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 29 deletions.
49 changes: 20 additions & 29 deletions build_wine.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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=""
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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.."
Expand Down
6 changes: 6 additions & 0 deletions osu-misc/README.md
Original file line number Diff line number Diff line change
@@ -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
Binary file added osu-misc/audio-revert.tar
Binary file not shown.
Binary file removed osu-misc/mmdevapi-revert.tar
Binary file not shown.
File renamed without changes.
Binary file added osu-misc/patchsets/8.20-patchset.tar
Binary file not shown.
Binary file removed osu-misc/winealsa-revert.tar
Binary file not shown.
Binary file removed osu-misc/winecoreaudio-revert.tar
Binary file not shown.
Binary file removed osu-misc/wineoss-revert.tar
Binary file not shown.

0 comments on commit 42e1b22

Please sign in to comment.