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

Add PW_MANGOHAD in PortProton_vars.

Browse Source
This commit is contained in:
castro-fidel
2021-04-09 00:57:30 +03:00
parent f904ddacf7
commit 70a4b8da4d
5 changed files with 69 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
data_from_portwine/scripts/lang
View File

@@ -37,7 +37,7 @@ then
export port_del6="был удален."
export port_deb1="PortWINE был запущен в режиме создания ${portname}.log и он успешно сохранен в корне каталога порта"
export port_deb2="Для диагностики проблем, скопируйте ВЕСЬ лог в комментарии к игре на сайте portwine-linux.ru"
export port_deb2="Для диагностики проблемы, скопируйте ВЕСЬ лог в соответствующий канал у нас на сервере дискорда: https://discord.gg/jfXkZW7F"
export port_start1="Запуск PortWINE"
export port_start2="В каком режиме вы хотите запустить PortWINE?"
@@ -79,6 +79,17 @@ then
export debug_path="Выберите ярлык для создания .log файла..."
export loc_creat_shortcut="Создать ярлык для запускаемого файла."
export loc_debug="Запуск c созданием .log файла в корне ${portname}"
export loc_launch="Запустить файл..."
export loc_winecfg="Запустить winecfg для редактирования настроек префикса ${portname}"
export loc_winefile="Запустить файловый менеждер встроенный в wine"
export loc_winecmd="Запустить командную строку wine"
export loc_winereg="Запустить редактор реестра префикса ${portname}"
export loc_winetricks="Запустить winetricks для установки доп. библиотек в префикс ${portname}"
export loc_scripts_update=" Обновление базы данных для игр\n и программ успешно завершено.\n\n Перезапустите ${portname}."
elif [ "${update_loc}" = "ENG" ]
then
@@ -112,7 +123,7 @@ then
export port_del6="was deleted."
export port_deb1="PortWINE was launched in creation mode ${portname}.log and it is successfully stored in the root directory of the port"
export port_deb2="To diagnose the problem, copy ALL of the log in comments to the game on the site portwine-linux.ru"
export port_deb2="To diagnose the problem, copy ALL of the log to discord server: https://discord.gg/jfXkZW7F"
export port_start1="Starting the PortWINE"
export port_start2="In what mode you want to start the PortWINE?"
@@ -153,6 +164,17 @@ then
export sc_cmd="Add command line"
export debug_path="Select the .desktop file for create the log"
#Helped in translation: ConTI1NuEsZZZ
export loc_creat_shortcut="Create shortcut for select file..."
export loc_debug="Launch with the creation of a .log file at the root ${portname}"
export loc_launch="Run file ..."
export loc_winecfg="Run winecfg to edit prefix settings ${portname}"
export loc_winefile="Run the file manager built into wine"
export loc_winecmd="Run wine command line"
export loc_winereg="Run Registry Prefix Editor ${portname}"
export loc_winetricks="Run winetricks to install additional libraries to the prefix ${portname}"
export loc_scripts_update="Updating scripts and database of games\n and programs completed successfully.\n\n Restart ${portname}."
fi

5
data_from_portwine/scripts/portwine_db/setup
View File

@@ -8,8 +8,8 @@
export PW_VULKAN_USE=0 #dxvk or vkd3d
#export WINEDLLOVERRIDES="blabla=n,b"
#export PW_LOG=0 # Enable debug mode fo terminal
#export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.
#export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives
export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.
export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives
#export PW_DXVK_NO_ASYNC=1
#export PW_USE_TERMINAL=0
#export PW_OLD_GL_STRING=0
@@ -25,3 +25,4 @@ export PW_FORCE_LARGE_ADDRESS_AWARE=0 # Force Wine to enable the LARGE_
export PW_DLL_INSTALL="vcrun6 mfc42 vcrun6sp6"
#export LAUNCH_PARAMETERS="-d3d9"
export PW_GUI_DISABLED_CS=1
export PW_WINDOWS_VER=XP # Set windows version 10, 7 or XP

43
data_from_portwine/scripts/runlib
View File

@@ -26,7 +26,7 @@ print_info () {
}
print_var () {
PS1_old="${PS1}" && PS1="\e[47;11;30m[\u@\h \W]$"
for vp in $@ ; do echo "${vp} = ${!vp}" ; done
for vp in $@ ; do echo "${vp}=${!vp}" ; done
PS1="${PS1_old}"
}
try_copy_file () {
@@ -140,12 +140,12 @@ fi
export pw_libs_ver="_v7"
export pw_gecko_mono_ver="_v2"
export WINEARCH=
export PW_VULKAN_DLL="${PORT_WINE_PATH}"/data/vulkan
export WINEDIR="${PORT_WINE_PATH}"/data/dist
export WINELIB="${HOME}/.PortWINE/libs${pw_libs_ver}"
export WINE_MONO_GECKO="${HOME}/.PortWINE/mono_gecko${pw_gecko_mono_ver}"
export WINEPREFIX="${PORT_WINE_PATH}/data/pfx/"
export PW_COMPAT_DATA_PATH="${PORT_WINE_PATH}/data/"
export PW_COMPAT_MEDIA_PATH="${PORT_WINE_TMP_PATH}/"
export PW_RUNTIME="$WINELIB/run.sh"
export PW_GUI_ICON_PATH="${PORT_WINE_PATH}/data/img/gui"
@@ -218,8 +218,7 @@ if [ ! -z "${PORTWINE_DB}" ]; then
echo "Use default db file."
fi
fi
########################################################################
START_PORTWINE ()
START_PORTWINE ()
{
if [ "${PW_USE_TERMINAL}" = "1" ]; then
if [ -x "`which konsole 2>/dev/null`" ]; then
@@ -260,6 +259,7 @@ fi
try_copy_file "${WINEDIR}"/lib64/wine/fakedlls/dxgi.dll "${WINEPREFIX}/drive_c/windows/system32/"
var_winedlloverride_update "dxgi=b"
export PW_FORCE_LARGE_ADDRESS_AWARE=0
[ "${PW_MANGOHUD}" == "1" ] && export MANGOHUD_DLSYM=1
echo "Use OpenGL"
elif [ "${var_pw_vulkan}" = "dxvk" ]; then
if [ -d "${WINEDIR}_dxvk" ]; then
@@ -270,6 +270,7 @@ fi
try_copy_file "${PW_VULKAN_DLL}/dxvk/x64/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/"
[ "$?" == 0 ] && var_winedlloverride_update "${wine_dxvk_dll}=n"
done
[ "${PW_MANGOHUD}" == "1" ] && export MANGOHUD=1
echo "Use DXVK (DX9-DX11 to Vulkan)"
else
if [ -d "${WINEDIR}_vkd3d" ]; then
@@ -289,6 +290,7 @@ fi
try_copy_file "${WINEDIR}/lib64/wine/fakedlls/dxgi.dll" "${WINEPREFIX}/drive_c/windows/system32/"
var_winedlloverride_update "dxgi=b"
fi
[ "${PW_MANGOHUD}" == "1" ] && export MANGOHUD=1
export PW_WINDOWS_VER="10"
echo "Use VKD3D (DX12 to vulkan)"
fi
@@ -487,16 +489,14 @@ UPDATE_WINETRICKS () {
chmod u+x "${PORT_WINE_TMP_PATH}/winetricks"
else
W_TRX_INT_VER="$(cat "${PORT_WINE_TMP_PATH}/winetricks" | grep -i 'WINETRICKS_VERSION=' | sed 's/WINETRICKS_VERSION=//')"
print_info "Version winetricks in port: ${W_TRX_EXT_VER}"
if [ $W_TRX_INT_VER != $W_TRX_EXT_VER ] ; then
rm -f "${PORT_WINE_TMP_PATH}/winetricks"
try_download "${W_TRX_URL}" "${PORT_WINE_TMP_PATH}/winetricks"
[ "$?" == 0 ] && print_info "Winetricks version in port has been updated"
print_info "Version winetricks in port: ${W_TRX_INT_VER}"
if [ "$W_TRX_INT_VER" != "$W_TRX_EXT_VER" ] ; then
try_download "${W_TRX_URL}" "${PORT_WINE_TMP_PATH}/winetricks_new"
[ "$DOWNLOAD_ERROR" != "1" ] && mv -f "${PORT_WINE_TMP_PATH}/winetricks_new" "${PORT_WINE_TMP_PATH}/winetricks"
[ "$DOWNLOAD_ERROR" != "1" ] && W_TRX_INT_VER="$(cat "${PORT_WINE_TMP_PATH}/winetricks" | grep -i 'WINETRICKS_VERSION=' | sed 's/WINETRICKS_VERSION=//')" && print_info "Winetricks version in port has been updated (${W_TRX_INT_VER})"
chmod u+x "${PORT_WINE_TMP_PATH}/winetricks"
fi
fi #modded by Cefeiko
sed -i '/w_try winetricks_early_wine cmd/d' "${PORT_WINE_TMP_PATH}/winetricks"
try_remove_dir "${HOME}/.cache/winetricks/"
}
RUN_WINETRICKS_FROM_DB () {
@@ -635,7 +635,7 @@ PW_SCRIPTS_UPDATE () {
if [ "$?" == "0" ] ; then
try_remove_file "${PORT_WINE_TMP_PATH}/scripts.tar.xz"
echo "${scripts_current_ver}" > "${PORT_WINE_TMP_PATH}/scripts_ver"
`zenity --info --title "Info..." --text " Updating scripts and database of games\n and programs completed successfully.\n\n Restart ${portname}." --no-wrap ` > /dev/null 2>&1
`zenity --info --title "Info..." --text "${loc_scripts_update}" --no-wrap ` > /dev/null 2>&1
exit 0
fi
fi
@@ -649,24 +649,25 @@ PW_RUN () {
else
cd "${WINEPREFIX}/drive_c"
fi
export RUN_MANGOHUD=""
[ "${PW_MANGOHUD}" == "1" ] && export RUN_MANGOHUD=mangohud
print_var "PATH_TO_GAME" "WINEDLLOVERRIDES" "PATH"
if [ ! -z "${PW_GAMEMODERUN}" ] && [ "${PW_GAMEMODERUN}" != 0 ] ; then
if [ ! -z ${optirun_on} ]; then
echo "Full command line: ${optirun_on} $PW_TERM "${PW_RUNTIME}" gamemoderun "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]}"
${optirun_on} $PW_TERM "${PW_RUNTIME}" gamemoderun "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]}
echo "Full command line: ${optirun_on} $PW_TERM "${PW_RUNTIME}" gamemoderun ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]}"
${optirun_on} $PW_TERM "${PW_RUNTIME}" gamemoderun ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]}
else
echo "Full command line: $PW_TERM "${PW_RUNTIME}" gamemoderun "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]}"
$PW_TERM "${PW_RUNTIME}" gamemoderun "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]}
echo "Full command line: $PW_TERM "${PW_RUNTIME}" gamemoderun ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]}"
$PW_TERM "${PW_RUNTIME}" gamemoderun ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]}
fi
else
if [ ! -z ${optirun_on} ]; then
echo "Full command line: ${optirun_on} $PW_TERM "${PW_RUNTIME}" "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]}"
${optirun_on} $PW_TERM "${PW_RUNTIME}" "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]}
echo "Full command line: ${optirun_on} $PW_TERM "${PW_RUNTIME}" ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]}"
${optirun_on} $PW_TERM "${PW_RUNTIME}" ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]}
else
echo "Full command line: $PW_TERM "${PW_RUNTIME}" "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]}"
$PW_TERM "${PW_RUNTIME}" "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]}
echo "Full command line: $PW_TERM "${PW_RUNTIME}" ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]}"
$PW_TERM "${PW_RUNTIME}" ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]}
fi
fi
}

33
data_from_portwine/scripts/start.sh
View File

@@ -173,7 +173,8 @@ PORTWINE_DEBUG () {
try_remove_file "${PORT_WINE_PATH}/${portname}.log.wine"
deb_text=$(cat "${PORT_WINE_PATH}/${portname}.log" | awk '! a[$0]++')
echo "$deb_text" > "${PORT_WINE_PATH}/${portname}.log"
echo "$deb_text" | zenity --text-info --editable --width=800 --height=600 --title="${portname}.log"
xdg-open "${PORT_WINE_PATH}/${portname}.log"
#echo "$deb_text" | zenity --text-info --editable --width=800 --height=600 --title="${portname}.log"
}
PW_WINECFG () {
START_PORTWINE
@@ -206,17 +207,17 @@ if [ ! -z "${portwine_exe}" ]; then
fi
OUTPUT_START=$("${pw_yad}" --text-align=center --text "$PW_COMMENT_DB" --wrap-width=150 --borders=15 --form --center \
--title "$portname" --image "$PW_GUI_ICON_PATH/port_proton.png" --separator=";" \
--button='CREATE SHORTCUT'!!"111":100 \
--button='DEBUG'!!'проверка подсказки1':102 \
--button='LAUNCH'!!'проверка подсказки3':106 )
--button='CREATE SHORTCUT'!!"${loc_creat_shortcut}":100 \
--button='DEBUG'!!"${loc_debug}":102 \
--button='LAUNCH'!!"${loc_launch}":106 )
PW_YAD_SET="$?"
else
OUTPUT_START=$("${pw_yad}" --wrap-width=250 --borders=15 --form --center \
--title "$portname" --image "$PW_GUI_ICON_PATH/port_proton.png" --separator=";" \
--field="WINE:CB" "DXVK ${PW_WINE_VER_DXVK}"!"VKD3D ${PW_WINE_VER_VKD3D}"!"OPENGL ${PW_WINE_VER_DXVK}" \
--button='CREATE SHORTCUT'!!"111":100 \
--button='DEBUG'!!'проверка подсказки1':102 \
--button='LAUNCH'!!'проверка подсказки3':106 )
--button='CREATE SHORTCUT'!!"${loc_creat_shortcut}":100 \
--button='DEBUG'!!"${loc_debug}":102 \
--button='LAUNCH'!!"${loc_launch}":106 )
PW_YAD_SET="$?"
fi
elif [ ! -z "${PORTWINE_DB_FILE}" ]; then
@@ -225,21 +226,21 @@ if [ ! -z "${portwine_exe}" ]; then
OUTPUT_START=$("${pw_yad}" --wrap-width=250 --borders=15 --form --center \
--title "$portname" --image "$PW_GUI_ICON_PATH/port_proton.png" --separator=";" \
--field="WINE:CB" "DXVK ${PW_WINE_VER_DXVK}"!"VKD3D ${PW_WINE_VER_VKD3D}"!"OPENGL ${PW_WINE_VER_DXVK}" \
--button='CREATE SHORTCUT'!!"111":100 \
--button='DEBUG'!!'проверка подсказки1':102 \
--button='LAUNCH'!!'проверка подсказки3':106 )
--button='CREATE SHORTCUT'!!"${loc_creat_shortcut}":100 \
--button='DEBUG'!!"${loc_debug}":102 \
--button='LAUNCH'!!"${loc_launch}":106 )
PW_YAD_SET="$?"
fi
else
OUTPUT_START=$("${pw_yad}" --wrap-width=250 --borders=15 --form --center \
--title "$portname" --image "$PW_GUI_ICON_PATH/port_proton.png" --separator=";" \
--field="WINE:CB" "DXVK ${PW_WINE_VER_DXVK}"!"VKD3D ${PW_WINE_VER_VKD3D}"!"OPENGL ${PW_WINE_VER_DXVK}" \
--button='DEBUG'!!'проверка подсказки1':102 \
--button='WINECFG'!!"Run winecfg for $portname":108 \
--button='WINEFILE'!!'проверка подсказки1':110 \
--button='WINECMD'!!'проверка подсказки2':112 \
--button='WINEREG'!!'проверка подсказки3':114 \
--button='WINETRICKS'!!'проверка подсказки4 - бла бла бла бла бла ла ла ла =)':116 )
--button='DEBUG'!!"${loc_debug}":102 \
--button='WINECFG'!!"${loc_winecfg}":108 \
--button='WINEFILE'!!"${loc_winefile}":110 \
--button='WINECMD'!!"${loc_winecmd}":112 \
--button='WINEREG'!!"${loc_winereg}":114 \
--button='WINETRICKS'!!"${loc_winetricks}":116 )
PW_YAD_SET="$?"
fi
export VULKAN_MOD=$(echo $OUTPUT_START | awk 'BEGIN {FS=";" } { print $1 }')

4
data_from_portwine/scripts/vars/PortProton_vars
View File

@@ -10,9 +10,9 @@ export PW_NVAPI_DISABLE=1
export PW_FORCE_USE_VSYNC=2 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
export PW_WINEDBG_DISABLE=0
export PW_FORCE_DISABLED_GAMEMOD=0 # Force disabele gamemod
export PW_FORCE_LARGE_ADDRESS_AWARE=1 # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
#export PW_FORCE_LARGE_ADDRESS_AWARE=1 # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
export PULSE_LATENCY_MSEC=60
#export MANGOHUD=1
#export PW_MANGOHUD=1
#export MANGOHUD_CONFIG=full,height=500,font_size=32,position=top-right,toggle_hud=F9
#export DXVK_HUD=fps,devinfo
########################################################################