Removed JACK library tweaks

Since the library is now dynamically loaded it is no longer needed.
This commit is contained in:
Martin Pulec
2020-10-16 16:22:58 +02:00
parent 9cfcf3464c
commit 3c9b8293d5
3 changed files with 1 additions and 34 deletions

View File

@@ -88,7 +88,7 @@ jobs:
- name: Install FFmpeg
run: .github/scripts/Linux/install_ffmpeg.sh
- name: configure
run: "[ ${{ github.ref }} != refs/heads/ndi-build ] && NDI=-disable-ndi; ./autogen.sh --enable-qt --with-cuda-host-compiler=$CUDA_HOST_COMPILER --enable-plugins --enable-jack-transport=force --with-live555=/usr/local $NDI"
run: "[ ${{ github.ref }} != refs/heads/ndi-build ] && NDI=-disable-ndi; ./autogen.sh --enable-qt --with-cuda-host-compiler=$CUDA_HOST_COMPILER --enable-plugins --with-live555=/usr/local $NDI"
- name: make
run: make -j4
- name: make check

View File

@@ -44,9 +44,6 @@ while read -r x; do
continue
fi
NAME=$(echo "$x" | awk '{ print $1 }')
if [ "$NAME" = libjack.so.0 ]; then # JACK is currently handled in AppRun
continue
fi
EXCLUDE_LIST="$EXCLUDE_LIST $NAME"
done < excludelist
for n in $EXCLUDE_LIST; do

View File

@@ -2,40 +2,10 @@
set -u
get_loader() {
LOADERS='/lib64/ld-linux-*so* /lib/ld-linux-*so* /lib*/ld-linux-*so*'
for n in $LOADERS; do
for m in `ls $n`; do
if [ -x $m ]; then
echo $m
return
fi
done
done
}
set_ld_preload() {
if [ ! -f $DIR/lib/ultragrid/ultragrid_aplay_jack.so ]; then
return
fi
local LOADER=$(get_loader)
if [ ! -x "$LOADER" ]; then
return
fi
S_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
LD_LIBRARY_PATH=
JACK_LIB=$(LD_TRACE_LOADED_OBJECTS=1 $LOADER $DIR/lib/ultragrid/ultragrid_aplay_jack.so | grep libjack | grep -v 'not found' | awk '{print $3}')
LD_LIBRARY_PATH=$S_LD_LIBRARY_PATH
if [ -n "$JACK_LIB" ]; then
export LD_PRELOAD=$JACK_LIB${LD_PRELOAD:+" $LD_PRELOAD"}
fi
}
DIR=`dirname $0`
export LD_LIBRARY_PATH=$DIR/lib${LD_LIBRARY_PATH:+":$LD_LIBRARY_PATH"}
# there is an issue with running_from_path() which evaluates this executable
# as being system-installed
#export PATH=$DIR/bin:$PATH
set_ld_preload
exec $DIR/bin/uv "$@"