Merge branch 'Boria138-flatpak-gstreamer' into devel

data_from_portwine/scripts/functions_helper

@@ -1639,7 +1639,10 @@ init_wine_ver () {
         fi
     fi
     
+	if ! check_flatpak ; then
 		export WINE_LIBRARY_PATH="${WINEDIR}/lib64:${WINEDIR}/lib"
+	fi
+
     export MEDIACONV_BLANK_VIDEO_FILE="${WINEDIR}"/share/media/blank.mkv
     export MEDIACONV_BLANK_AUDIO_FILE="${WINEDIR}"/share/media/blank.ptna
     return 0
@@ -1673,6 +1676,7 @@ pw_init_runtime () {
 
     PW_PV_OVERRIDES="/usr/lib/pressure-vessel/overrides/lib"
 
+	if ! check_flatpak; then
 	  export PW_LD_LIBRARY_PATH="\
 	  ${PW_PLUGINS_PATH}/portable/lib/lib64:\
 	  ${PW_PLUGINS_PATH}/portable/lib/lib32:\
@@ -1682,6 +1686,8 @@ ${PW_PV_OVERRIDES}/i386-linux-gnu/aliases:\
 	  /overrides/lib/i386-linux-gnu:\
 	  /lib/x86_64-linux-gnu:\
 	  /lib/i386-linux-gnu"
+	fi
+
 
     if [[ -n "${PATH}" ]]
     then export PW_PATH="${PATH}:${PW_PLUGINS_PATH}/portable/bin"