Skip to content

Update to self-contained protonfixes #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: proton_9.0
Choose a base branch
from
Open

Update to self-contained protonfixes #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80f87e5
proton: update protonfixes handling to self-contained
loathingKernel May 12, 2025
10a1ef7
build: use self-contained protonfixes
loathingKernel May 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1111,17 +1111,18 @@ all-dist: $(DIST_LICENSE) $(DIST_OFL_LICENSE) $(DIST_AV1_PATENTS)
## protonfixes
##

PROTONFIXES_OBJ := $(addprefix $(OBJ)/,obj-protonfixes)
PROTONFIXES_TARGET := $(addprefix $(DST_BASE)/,protonfixes)
$(PROTONFIXES_TARGET): $(addprefix $(SRCDIR)/,protonfixes)

$(OBJ)/.build-protonfixes:
cd $(SRCDIR)/protonfixes && ./build.sh
cd $(SRCDIR)/protonfixes && \
env BUILD=$(PROTONFIXES_OBJ) make
touch $(@)

$(PROTONFIXES_TARGET): $(OBJ)/.build-protonfixes
cd $(SRCDIR)/protonfixes && make install
cp -a $(SRCDIR)/protonfixes/dist/protonfixes $(PROTONFIXES_TARGET)
rm -r $(SRCDIR)/protonfixes/dist
cd $(SRCDIR)/protonfixes && \
env BUILD=$(PROTONFIXES_OBJ) DIST=$(PROTONFIXES_TARGET) make install

all-dist: $(PROTONFIXES_TARGET)

Expand Down Expand Up @@ -1175,11 +1176,6 @@ deploy: all
redist: all
mkdir -p $(REDIST_DIR)
rsync --delete -arx $(DST_BASE)/ $(REDIST_DIR)
cp $(PROTONFIXES_TARGET)/cabextract $(REDIST_DIR)/files/bin/
cp $(PROTONFIXES_TARGET)/unzip $(REDIST_DIR)/files/bin/
cp -a $(PROTONFIXES_TARGET)/libmspack.so $(REDIST_DIR)/files/lib64/
cp -a $(PROTONFIXES_TARGET)/libmspack.so.0 $(REDIST_DIR)/files/lib64/
cp $(PROTONFIXES_TARGET)/libmspack.so.0.1.0 $(REDIST_DIR)/files/lib64/
mv $(REDIST_DIR) $(BUILD_NAME)
tar -cvzf $(BUILD_NAME).tar.gz $(BUILD_NAME)
sha512sum $(BUILD_NAME).tar.gz > $(BUILD_NAME).sha512sum
Expand Down
5 changes: 4 additions & 1 deletion proton
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1929,6 +1929,9 @@ if __name__ == "__main__":

g_session.init_session(sys.argv[1] != "runinprefix")

import protonfixes
protonfixes.setup(g_session.env, "PATH", ld_path_var, prepend_to_env_str)

# Allow umu clients to run winetricks verbs and be the frontend for them
if (
g_session.env.get("UMU_ID")
Expand All @@ -1947,7 +1950,7 @@ if __name__ == "__main__":

sys.exit(rc)

import protonfixes
protonfixes.execute()

#determine mode
rc = 0
Expand Down