From 8f686182c74a080238acfa75acb9f1e8b2d09564 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Wed, 29 Nov 2023 13:28:12 -0800 Subject: [PATCH] chore: Pass libdir to Make --- spec_files/steamdeck-dsp/fedora.patch | 18 ++++++++++++++++++ spec_files/steamdeck-dsp/steamdeck-dsp.spec | 6 +++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/spec_files/steamdeck-dsp/fedora.patch b/spec_files/steamdeck-dsp/fedora.patch index c07cfc3c..352135dd 100644 --- a/spec_files/steamdeck-dsp/fedora.patch +++ b/spec_files/steamdeck-dsp/fedora.patch @@ -9,3 +9,21 @@ label = noise_suppressor_stereo control = { "VAD Threshold (%)" = 23.0 +--- a/scripts/install_plugins.sh ++++ b/scripts/install_plugins.sh +@@ -5,9 +5,9 @@ + if [ -e $HARDCODED_PLUGIN_DEST_2 ]; then rm -r $HARDCODED_PLUGIN_DEST_2; fi; + + +-mkdir -p $DEST_DIR/usr/lib/lv2 +-cp -r bin/lv2/g++/valve_deck_speakers.lv2 $DEST_DIR/usr/lib/lv2/valve_deck_speakers.lv2 +-cp -r bin/lv2/g++/valve_binaural.lv2 $DEST_DIR/usr/lib/lv2/valve_binaural.lv2 +-cp -r bin/lv2/g++/valve_deck_microphone.lv2 $DEST_DIR/usr/lib/lv2/valve_deck_microphone.dsp +-cp -r bin/svg $DEST_DIR/usr/lib/lv2/svg +-cp version.txt $DEST_DIR/usr/lib/lv2/valve_audio_dsp_version.txt ++mkdir -p $LIB_DIR/lv2 ++cp -r bin/lv2/g++/valve_deck_speakers.lv2 $LIB_DIR/lv2/valve_deck_speakers.lv2 ++cp -r bin/lv2/g++/valve_binaural.lv2 $LIB_DIR/lv2/valve_binaural.lv2 ++cp -r bin/lv2/g++/valve_deck_microphone.lv2 $LIB_DIR/lv2/valve_deck_microphone.dsp ++cp -r bin/svg $LIB_DIR/lv2/svg ++cp version.txt $LIB_DIR/lv2/valve_audio_dsp_version.txt diff --git a/spec_files/steamdeck-dsp/steamdeck-dsp.spec b/spec_files/steamdeck-dsp/steamdeck-dsp.spec index 082fb244..1ec01ffb 100644 --- a/spec_files/steamdeck-dsp/steamdeck-dsp.spec +++ b/spec_files/steamdeck-dsp/steamdeck-dsp.spec @@ -33,7 +33,7 @@ Steamdeck Audio Processing %make_build FAUSTINC="/usr/include/faust" FAUSTLIB="/usr/share/faust" %install -%make_install DEST_DIR="%{buildroot}" +%make_install DEST_DIR="%{buildroot}" LIB_DIR="%{buildroot}%{_libdir}" mkdir -p %{buildroot}%{_datadir}/licenses/%{name}/ cp LICENSE %{buildroot}%{_datadir}/licenses/%{name}/LICENSE @@ -42,8 +42,8 @@ cp LICENSE %{buildroot}%{_datadir}/licenses/%{name}/LICENSE %files %license LICENSE %{_prefix}/lib/firmware/amd/* -%{_prefix}/lib/lv2/svg/valve_deck_* -%{_prefix}/lib/lv2/valve_* +%{_libdir}/lv2/svg/valve_deck_* +%{_libdir}/lv2/valve_* %{_datadir}/alsa/ucm2/conf.d/acp5x/*.conf %{_datadir}/alsa/ucm2/conf.d/sof-nau8821-max/*.conf %{_datadir}/pipewire/pipewire.conf.d/*.conf