xpamych/PortWINE
1
0
Fork 0
forked from CastroFidel/PortWINE
Code Pull Requests Activity

use runtime in flatpack

Browse Source
This commit is contained in:
Mikhail Tergoev 2024-03-29 18:01:36 +03:00
parent 8d04691db5
commit 337070718e
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
data_from_portwine/scripts/functions_helper
View File

@ -541,8 +541,8 @@ init_wine_ver () {
fi fi
if [ "${PW_USE_GSTREAMER}" = 1 ] ; then if [[ "${PW_USE_GSTREAMER}" == 1 ]] ; then
if [ -d "${WINEDIR}/lib64/gstreamer-1.0" ] ; then if [[ -d "${WINEDIR}/lib64/gstreamer-1.0" ]] ; then
export GST_PLUGIN_SYSTEM_PATH_1_0="${WINEDIR}/lib64/gstreamer-1.0:${WINEDIR}/lib/gstreamer-1.0" export GST_PLUGIN_SYSTEM_PATH_1_0="${WINEDIR}/lib64/gstreamer-1.0:${WINEDIR}/lib/gstreamer-1.0"
fi fi
create_new_dir "${PORT_WINE_TMP_PATH}"/gstreamer_tmp/ create_new_dir "${PORT_WINE_TMP_PATH}"/gstreamer_tmp/
@ -560,8 +560,7 @@ init_wine_ver () {
pw_init_runtime () { pw_init_runtime () {
if [[ "$PW_USE_RUNTIME" != 1 ]] \ if [[ "$PW_USE_RUNTIME" != 1 ]] \
|| [[ "$PW_WINE_USE" == "USE_SYSTEM_WINE" ]] \ || [[ "$PW_WINE_USE" == "USE_SYSTEM_WINE" ]]
|| check_flatpak
then then
export pw_runtime="" export pw_runtime=""
return 0 return 0

5
data_from_portwine/scripts/runlib
View File

@ -676,8 +676,7 @@ pw_run () {
print_var "WINEDLLPATH" "WINE_CPU_TOPOLOGY" "PW_RUN_GAMESCOPE" "LD_LIBRARY_PATH" print_var "WINEDLLPATH" "WINE_CPU_TOPOLOGY" "PW_RUN_GAMESCOPE" "LD_LIBRARY_PATH"
kill -s SIGUSR1 "$PW_YAD_PID_PFX_COVER_UI" &>/dev/null kill -s SIGUSR1 "$PW_YAD_PID_PFX_COVER_UI" &>/dev/null
if [[ "$PW_USE_RUNTIME" == 1 ]] \ if [[ "$PW_USE_RUNTIME" == 1 ]] \
&& [[ "$PW_WINE_USE" != "USE_SYSTEM_WINE" ]] \ && [[ "$PW_WINE_USE" != "USE_SYSTEM_WINE" ]]
&& ! check_flatpak
then then
if [[ "${PW_LOG}" == 1 ]] ; then if [[ "${PW_LOG}" == 1 ]] ; then
if check_start_from_steam ; then if check_start_from_steam ; then
@ -897,7 +896,7 @@ if [[ -z "${INSTALLING_PORT}" ]] ; then
} }
trap "rm_lock_file" EXIT trap "rm_lock_file" EXIT
check_flatpak || pw_download_libs pw_download_libs
export PW_VULKANINFO_PORTABLE="$PW_PLUGINS_PATH/portable/bin/x86_64-linux-gnu-vulkaninfo" export PW_VULKANINFO_PORTABLE="$PW_PLUGINS_PATH/portable/bin/x86_64-linux-gnu-vulkaninfo"
export VULKAN_API_DRIVER_VERSION="$("$PW_VULKANINFO_PORTABLE" 2>/dev/null | grep "api" | head -n 1 | awk '{print $3}')" export VULKAN_API_DRIVER_VERSION="$("$PW_VULKANINFO_PORTABLE" 2>/dev/null | grep "api" | head -n 1 | awk '{print $3}')"
export VULKAN_DRIVER_NAME="$("$PW_VULKANINFO_PORTABLE" 2>/dev/null | grep driverName | awk '{print$3}' | head -1)" export VULKAN_DRIVER_NAME="$("$PW_VULKANINFO_PORTABLE" 2>/dev/null | grep driverName | awk '{print$3}' | head -1)"