diff options
author | Hugo "ThePooN" Denizart | 2018-08-04 03:34:46 +0200 |
---|---|---|
committer | Hugo "ThePooN" Denizart | 2018-08-04 03:34:46 +0200 |
commit | 7f357c16ee858c07f407e51fde42d1f6d6c24980 (patch) | |
tree | 8ce0fa9e985e077ef378ac2234fd8f3fecfd82dd | |
parent | 67a755681cbeab9ba0ac6a8d554179ead93bcc74 (diff) | |
download | aur-7f357c16ee858c07f407e51fde42d1f6d6c24980.tar.gz |
Revert "Release 3.13-1"
This reverts commit 67a755681cbeab9ba0ac6a8d554179ead93bcc74.
Patch needed some rework for this release and the latency has regressed.
-rw-r--r-- | .SRCINFO | 14 | ||||
-rw-r--r-- | PKGBUILD | 10 | ||||
-rw-r--r-- | winepulse_latency.patch | 14 |
3 files changed, 19 insertions, 19 deletions
@@ -1,6 +1,6 @@ pkgbase = wine-osu pkgdesc = A compatibility layer for running Windows programs - Staging branch, optimized for audio low latency on osu! (by ThePooN) - pkgver = 3.13 + pkgver = 3.12 pkgrel = 1 url = https://blog.thepoon.fr/osuLinuxAudioLatency/ arch = x86_64 @@ -135,20 +135,20 @@ pkgbase = wine-osu optdepends = samba optdepends = dosbox options = staticlibs - source = https://dl.winehq.org/wine/source/3.x/wine-3.13.tar.xz - source = https://dl.winehq.org/wine/source/3.x/wine-3.13.tar.xz.sign - source = wine-staging-v3.13.tar.gz::https://github.com/wine-staging/wine-staging/archive/v3.13.tar.gz + source = https://dl.winehq.org/wine/source/3.x/wine-3.12.tar.xz + source = https://dl.winehq.org/wine/source/3.x/wine-3.12.tar.xz.sign + source = wine-staging-v3.12.tar.gz::https://github.com/wine-staging/wine-staging/archive/v3.12.tar.gz source = harmony-fix.diff source = winealsa_latency.patch source = winepulse_latency.patch validpgpkeys = 5AC1A08B03BD7A313E0A955AF5E6E9EEB9461DD7 validpgpkeys = DA23579A74D4AD9AF9D3F945CEFAC8EAAF17519D - sha512sums = a07a3d2a19261f9251f165ca4c14871e6ebda4d3f99da16f9fc41f06e80cae3fb50aeab96628c7a739e635e896dbb31c55df8b42c4637a058f9035c664c93a59 + sha512sums = afc76e8975ea780f664de27a17128f730bcbe72a9fad0c01bfe6dcc98c2f98729ccde32e97fe4df2cf98f5d1b254b28f0e7cd380855148c5cfb41dd88f3012a1 sha512sums = SKIP - sha512sums = 0124950cc18d566daecc532a432bce27d712f48eaaa9b37bf930e056b460e30a8fb1806aa179f72b44a95dc56963a3dc063b4acb71affb7b8ddff3001fe59b9a + sha512sums = 166f991f7c8f59df656f3fb28150a8e26e48d1ff6906b3eccd31cb84524e28efe7e7df00eadc21881940308ccc4b4edebcb2a71bdd03ba3de5beb1cf42e2f058 sha512sums = b86edf07bfc560f403fdfd5a71f97930ee2a4c3f76c92cc1a0dbb2e107be9db3bed3a727a0430d8a049583c63dd11f5d4567fb7aa69b193997c6da241acc4f2e sha512sums = 8212f4ec07045faa28704035ea6c8173ade503afe3bf94c4ec19e9edb788004579bb37e16c58d92ddc23e9a4de52480437f8486a32d794c5edc59d448db46874 - sha512sums = 3baaddbb91db84407200e6d33110ac8a6c200781b26b8ba269b16e69faa301479769132f981f76316410e78d31abdebfa45509e30b7bd781ab1ed3a0c344ddbe + sha512sums = 3c5eda2d24892ca6428138bd9f07d5c598b606f9e181533d73556b25aabe41935efb44748cdb65524d7598ceac1bc81d9c9d507b76a15c51f32e34b3cdc3969a pkgname = wine-osu @@ -6,7 +6,7 @@ # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=wine-osu -pkgver=3.13 +pkgver=3.12 pkgrel=1 _pkgbasever=${pkgver/rc/-rc} @@ -16,12 +16,12 @@ source=(https://dl.winehq.org/wine/source/3.x/wine-$_pkgbasever.tar.xz{,.sign} harmony-fix.diff winealsa_latency.patch winepulse_latency.patch) -sha512sums=('a07a3d2a19261f9251f165ca4c14871e6ebda4d3f99da16f9fc41f06e80cae3fb50aeab96628c7a739e635e896dbb31c55df8b42c4637a058f9035c664c93a59' +sha512sums=('afc76e8975ea780f664de27a17128f730bcbe72a9fad0c01bfe6dcc98c2f98729ccde32e97fe4df2cf98f5d1b254b28f0e7cd380855148c5cfb41dd88f3012a1' 'SKIP' - '0124950cc18d566daecc532a432bce27d712f48eaaa9b37bf930e056b460e30a8fb1806aa179f72b44a95dc56963a3dc063b4acb71affb7b8ddff3001fe59b9a' + '166f991f7c8f59df656f3fb28150a8e26e48d1ff6906b3eccd31cb84524e28efe7e7df00eadc21881940308ccc4b4edebcb2a71bdd03ba3de5beb1cf42e2f058' 'b86edf07bfc560f403fdfd5a71f97930ee2a4c3f76c92cc1a0dbb2e107be9db3bed3a727a0430d8a049583c63dd11f5d4567fb7aa69b193997c6da241acc4f2e' '8212f4ec07045faa28704035ea6c8173ade503afe3bf94c4ec19e9edb788004579bb37e16c58d92ddc23e9a4de52480437f8486a32d794c5edc59d448db46874' - '3baaddbb91db84407200e6d33110ac8a6c200781b26b8ba269b16e69faa301479769132f981f76316410e78d31abdebfa45509e30b7bd781ab1ed3a0c344ddbe') + '3c5eda2d24892ca6428138bd9f07d5c598b606f9e181533d73556b25aabe41935efb44748cdb65524d7598ceac1bc81d9c9d507b76a15c51f32e34b3cdc3969a') validpgpkeys=(5AC1A08B03BD7A313E0A955AF5E6E9EEB9461DD7 DA23579A74D4AD9AF9D3F945CEFAC8EAAF17519D) @@ -120,7 +120,7 @@ prepare() { patch -d $pkgname -Np1 < harmony-fix.diff patch -d $pkgname -Np1 < winealsa_latency.patch -# patch -d $pkgname -Np1 < winepulse_latency.patch + patch -d $pkgname -Np1 < winepulse_latency.patch sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i $pkgname/configure* diff --git a/winepulse_latency.patch b/winepulse_latency.patch index 1009189b50a8..f000a7a42f55 100644 --- a/winepulse_latency.patch +++ b/winepulse_latency.patch @@ -11,7 +11,7 @@ static pa_context *pulse_ctx; static pa_mainloop *pulse_ml; -@@ -409,9 +409,9 @@ +@@ -406,9 +406,9 @@ ss.channels = map.channels; attr.maxlength = -1; @@ -24,7 +24,7 @@ stream = pa_stream_new(ctx, "format test stream", &ss, &map); if (stream) -@@ -420,9 +420,9 @@ +@@ -417,9 +417,9 @@ ret = -1; else if (render) ret = pa_stream_connect_playback(stream, NULL, &attr, @@ -36,10 +36,10 @@ if (ret >= 0) { while (pa_mainloop_iterate(ml, 1, &ret) >= 0 && pa_stream_get_state(stream) == PA_STREAM_CREATING) -@@ -1789,6 +1789,13 @@ - period = pulse_def_period[This->dataflow == eCapture]; - if (duration < 3 * period) - duration = 3 * period; +@@ -1767,6 +1767,13 @@ + /* Uh oh, really low latency requested.. */ + if (duration <= 2 * period) + period /= 2; + + const char *env = getenv("STAGING_AUDIO_DURATION"); + if(env) { @@ -48,5 +48,5 @@ + printf("Set audio duration to %d (STAGING_AUDIO_DURATION).\n", val); + } - This->period_bytes = pa_frame_size(&This->ss) * MulDiv(period, This->ss.rate, 10000000); + period_bytes = pa_frame_size(&This->ss) * MulDiv(period, This->ss.rate, 10000000); |