Skip to content

Commit

Permalink
Wine 10.0 v2 patchset (10.0-7)
Browse files Browse the repository at this point in the history
 - Rebase wine/staging
 - Fix issue with esync/fsync which was breaking some programs (dnspy, specifically)
   - Not sure what the exact problem was, but I rebased esync/fsync/ntsync
     more carefully and this alleviated the issue.
 - Add EDID generation patch from Proton to fix dxvk "failed to obtain EDID" error
 - Some more NtYieldExecution experiments
 - Misc. build optimizations and dev environment improvement patches (to PKGBUILD as well)
   - Build with llvm-mingw's bundled clang+clang-msvc toolchain by default
     (instead of bundled clang + mingw-clang)
 - Other patch housekeeping/cleanup
  • Loading branch information
whrvt committed Feb 6, 2025
1 parent d4a6672 commit 52a6952
Show file tree
Hide file tree
Showing 263 changed files with 5,422 additions and 7,044 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/build-aur.yml
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,11 @@ jobs:
sudo -u builder bash << EOF
mkdir -p /tmp/artifact/${AUR_PACKAGE}
mkdir -p /tmp/artifact/${AUR_PACKAGE}-wow64
mv ${{ env.PARU_CACHE }}/clone/${AUR_PACKAGE}/*.pkg.tar.xz /tmp/artifact/${AUR_PACKAGE}/
mv ${{ env.PARU_CACHE }}/clone/${AUR_PACKAGE}-wow64/*.pkg.tar.xz /tmp/artifact/${AUR_PACKAGE}-wow64/
mv ${{ env.PARU_CACHE }}/clone/${AUR_PACKAGE}/*.pkg.tar.zst /tmp/artifact/${AUR_PACKAGE}/
mv ${{ env.PARU_CACHE }}/clone/${AUR_PACKAGE}-wow64/*.pkg.tar.zst /tmp/artifact/${AUR_PACKAGE}-wow64/
echo "${{ secrets.GPG_PASS }}" | gpg --batch --yes --passphrase-fd 0 --detach-sign --no-armor /tmp/artifact/${AUR_PACKAGE}/*.pkg.tar.xz
echo "${{ secrets.GPG_PASS }}" | gpg --batch --yes --passphrase-fd 0 --detach-sign --no-armor /tmp/artifact/${AUR_PACKAGE}-wow64/*.pkg.tar.xz
echo "${{ secrets.GPG_PASS }}" | gpg --batch --yes --passphrase-fd 0 --detach-sign --no-armor /tmp/artifact/${AUR_PACKAGE}/*.pkg.tar.zst
echo "${{ secrets.GPG_PASS }}" | gpg --batch --yes --passphrase-fd 0 --detach-sign --no-armor /tmp/artifact/${AUR_PACKAGE}-wow64/*.pkg.tar.zst
rm -rf ${{ env.PARU_CACHE }}/clone/${AUR_PACKAGE}
rm -rf ${{ env.PARU_CACHE }}/clone/${AUR_PACKAGE}-wow64
Expand Down Expand Up @@ -207,12 +207,12 @@ jobs:
- name: Extract version from package name
id: get_version
run: |
PKGFILE=$(ls artifacts/${{ env.AUR_PACKAGE }}/*.pkg.tar.xz | head -n1)
PKGFILE=$(ls artifacts/${{ env.AUR_PACKAGE }}/*.pkg.tar.zst | head -n1)
# from e.g. wine-osu-spectator-9.20.w1.s5a1b9d5-1-x86_64.pkg.tar.xz
# from e.g. wine-osu-spectator-9.20.w1.s5a1b9d5-1-x86_64.pkg.tar.zst
# get VERSION=9.20 and RELEASE=1
VERSION=$(basename "$PKGFILE" | sed -E 's/.*-([0-9]+\.[0-9]+)\..*-([0-9]+)-.*pkg\.tar\.xz/\1/')
RELEASE=$(basename "$PKGFILE" | sed -E 's/.*-([0-9]+\.[0-9]+)\..*-([0-9]+)-.*pkg\.tar\.xz/\2/')
VERSION=$(basename "$PKGFILE" | sed -E 's/.*-([0-9]+\.[0-9]+)\..*-([0-9]+)-.*pkg\.tar\.zst/\1/')
RELEASE=$(basename "$PKGFILE" | sed -E 's/.*-([0-9]+\.[0-9]+)\..*-([0-9]+)-.*pkg\.tar\.zst/\2/')
echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
echo "RELEASE=$RELEASE" >> $GITHUB_OUTPUT
Expand All @@ -225,7 +225,7 @@ jobs:
draft: false
prerelease: false
files: |
artifacts/${{ env.AUR_PACKAGE }}/*.pkg.tar.xz*
artifacts/${{ env.AUR_PACKAGE }}-wow64/*.pkg.tar.xz*
artifacts/${{ env.AUR_PACKAGE }}/*.pkg.tar.zst*
artifacts/${{ env.AUR_PACKAGE }}-wow64/*.pkg.tar.zst*
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
From 5d20ea83485b9cc2da9e8a5bd051be798635370f Mon Sep 17 00:00:00 2001
From: Davide Beatrici <[email protected]>
Date: Thu, 27 Jun 2024 03:35:57 +0200
Subject: [PATCH] Add clang-format configuration file

---
.clang-format | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 112 insertions(+)
create mode 100644 .clang-format

diff --git a/.clang-format b/.clang-format
new file mode 100644
index 00000000000..8434c6c792c
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,112 @@
+Language: Cpp
+
+AlignAfterOpenBracket: Align
+AlignArrayOfStructures: None # This affects everything, we want "Right" just for digits
+AlignConsecutiveAssignments:
+ Enabled: false
+ AcrossComments: true
+ AcrossEmptyLines: false
+ AlignCompound: true
+ PadOperators: true
+AlignConsecutiveBitFields:
+ Enabled: true
+ AcrossComments: true
+ AcrossEmptyLines: false
+AlignConsecutiveDeclarations:
+ Enabled: false
+ AcrossComments: false
+ AcrossEmptyLines: false
+ AlignFunctionPointers: true
+AlignConsecutiveMacros:
+ Enabled: true
+ AcrossComments: true
+ AcrossEmptyLines: false
+AlignConsecutiveShortCaseStatements:
+ Enabled: true
+ AcrossComments: true
+ AcrossEmptyLines: false
+AlignEscapedNewlines: DontAlign # Set to LeftWithLastLine when supported
+AlignOperands: Align
+AlignTrailingComments:
+ Kind: Always
+ OverEmptyLines: 0
+AllowAllArgumentsOnNextLine: false
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: Empty
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortEnumsOnASingleLine: true
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLoopsOnASingleLine: true
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+BinPackArguments: true
+BinPackParameters: true
+BraceWrapping:
+ AfterCaseLabel: true
+ AfterClass: true
+ AfterControlStatement: Always
+ AfterEnum: true
+ AfterFunction: true
+ AfterNamespace: true
+ AfterStruct: true
+ AfterUnion: true
+ AfterExternBlock: true
+ BeforeElse: true
+ BeforeWhile: false
+ IndentBraces: false
+ SplitEmptyFunction: true
+ SplitEmptyRecord: true
+ SplitEmptyNamespace: true
+BreakAdjacentStringLiterals: false
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Custom
+BreakBeforeTernaryOperators: false
+BreakStringLiterals: false
+ColumnLimit: 100
+ContinuationIndentWidth: 8
+IncludeBlocks: Preserve
+IndentCaseBlocks: false
+IndentCaseLabels: false
+IndentExternBlock: false
+IndentGotoLabels: false
+IndentPPDirectives: None
+IndentWidth: 4
+IndentWrappedFunctionNames: false
+InsertBraces: false
+InsertNewlineAtEOF: true
+InsertTrailingCommas: None
+KeepEmptyLinesAtEOF: false
+KeepEmptyLinesAtTheStartOfBlocks: false
+LineEnding: LF
+MaxEmptyLinesToKeep: 1
+PPIndentWidth: 0
+PointerAlignment: Right
+QualifierAlignment: Leave
+ReferenceAlignment: Pointer
+ReflowComments: true
+SkipMacroDefinitionBody: true
+SortIncludes: Never # Otherwise breakage ensues when headers must be included in a specific order
+SpaceAfterLogicalNot: false
+SpaceAroundPointerQualifiers: Default
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCaseColon: false
+SpaceBeforeParens: ControlStatementsExceptControlMacros
+SpaceBeforeSquareBrackets: false
+SpaceInEmptyBlock: false
+SpacesBeforeTrailingComments: 1
+SpacesInContainerLiterals: true
+SpacesInLineCommentPrefix:
+ Maximum: -1
+ Minimum: 1
+SpacesInParens: Custom
+SpacesInParensOptions:
+ ExceptDoubleParentheses: true
+ InConditionalStatements: false
+ InEmptyParentheses: false
+ InCStyleCasts: false
+ Other: true
+SpacesInConditionalStatements: false
+SpacesInSquareBrackets: false
+TabWidth: 4
+UseTab: Never
--
GitLab

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 52a6952

Please sign in to comment.