diff --git a/pipewire-v4l2/src/pw-v4l2.in b/pipewire-v4l2/src/pw-v4l2.in index a383ba230..248d9ee60 100755 --- a/pipewire-v4l2/src/pw-v4l2.in +++ b/pipewire-v4l2/src/pw-v4l2.in @@ -54,10 +54,16 @@ done shift $(( OPTIND - 1 )) -if [ "$LD_PRELOAD" = "" ] ; then - LD_PRELOAD='@LIBV4L2_PATH@/libpw-v4l2.so' +if [ "$PW_UNINSTALLED" = 1 ] ; then + PW_V4L2_LD_PRELOAD="$PW_BUILDDIR"'/pipewire-v4l2/src/libpw-v4l2.so' else - LD_PRELOAD="$LD_PRELOAD "'@LIBV4L2_PATH@/libpw-v4l2.so' + PW_V4L2_LD_PRELOAD='@LIBV4L2_PATH@/libpw-v4l2.so' +fi + +if [ "$LD_PRELOAD" = "" ] ; then + LD_PRELOAD="$PW_V4L2_LD_PRELOAD" +else + LD_PRELOAD="$LD_PRELOAD $PW_V4L2_LD_PRELOAD" fi export LD_PRELOAD diff --git a/pw-uninstalled.sh b/pw-uninstalled.sh index 7bc948ddd..1bb6c55c2 100755 --- a/pw-uninstalled.sh +++ b/pw-uninstalled.sh @@ -41,7 +41,7 @@ export SPA_PLUGIN_DIR="${BUILDDIR}/spa/plugins" export SPA_DATA_DIR="${SCRIPT_DIR}/spa/plugins" # the directory with pipewire modules export PIPEWIRE_MODULE_DIR="${BUILDDIR}/src/modules" -export PATH="${BUILDDIR}/src/daemon:${BUILDDIR}/src/tools:${BUILDDIR}/src/media-session:${BUILDDIR}/src/examples:${PATH}" +export PATH="${BUILDDIR}/src/daemon:${BUILDDIR}/src/tools:${BUILDDIR}/src/media-session:${BUILDDIR}/src/examples:${BUILDDIR}/pipewire-v4l2/src:${PATH}" export LD_LIBRARY_PATH="${BUILDDIR}/src/pipewire/:${BUILDDIR}/pipewire-jack/src/${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}" export GST_PLUGIN_PATH="${BUILDDIR}/src/gst/${GST_PLUGIN_PATH+":${GST_PLUGIN_PATH}"}" # the directory with card profiles and paths @@ -50,6 +50,7 @@ export ACP_PROFILES_DIR="${SCRIPT_DIR}/spa/plugins/alsa/mixer/profile-sets" # ALSA plugin directory export ALSA_PLUGIN_DIR="${BUILDDIR}/pipewire-alsa/alsa-plugins" +export PW_BUILDDIR=$BUILDDIR export PW_UNINSTALLED=1 export PKG_CONFIG_PATH="${BUILDDIR}/meson-uninstalled/:${PKG_CONFIG_PATH}"