zrythm
/
zrythm-installer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix carla pkg config path

use_builds_script
Alexandros Theodotou 2 years ago
parent
6770e73ef1
commit
6e6959be60
Signed by: alex
GPG Key ID: 022EAE42313D70F3
7 changed files with 29 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      arch/PKGBUILD.in
  2. 2
      arch/meson.build
  3. 2
      debian/meson.build
  4. 12
      debian/rules.in
  5. 2
      meson.build
  6. 2
      rpm/meson.build
  7. 32
      rpm/zrythm.spec.in

11
arch/PKGBUILD.in
Unescape View File

@ -50,14 +50,13 @@ package() { @@ -50,14 +50,13 @@ package() {
install -vDm 644 AUTHORS CONTRIBUTING.md CHANGELOG.md README.md THANKS TRANSLATORS \
-t "${pkgdir}/usr/share/doc/zrythm/"
DESTDIR="${pkgdir}/" ninja -C build install
mkdir -p "${pkgdir}/usr/lib/zrythm/lib/lv2"
for file in carla-discovery-native carla-bridge-lv2-gtk2 carla-bridge-lv2-gtk3 carla-bridge-lv2-qt5 carla-bridge-lv2-x11 carla-bridge-native libcarla_host-pllugin.so; do
mkdir -p "${pkgdir}/usr/lib/zrythm/carla"
mkdir -p "${pkgdir}/usr/lib/lv2"
for file in carla-discovery-native carla-bridge-lv2-gtk2 carla-bridge-lv2-gtk3 carla-bridge-lv2-qt5 carla-bridge-lv2-x11 carla-bridge-native libcarla_host-plugin.so; do
cp -Lv "@CARLA_FULL_BINS_PATH@/$file" \
${pkgdir}/usr/lib/zrythm/carla/
done
cp -RLv @BUILT_ZPLUGINS_DIR@/* \
${pkdir}/usr/lib/lv2/
for f in `ls %{buildroot}/usr/lib/lv2`; do
mv $f "%{buildroot}/usr/lib/lv2/Zrythm-$f"
for f in `ls @BUILT_ZPLUGINS_DIR@/lib/lv2`; do
cp -RLv "@BUILT_ZPLUGINS_DIR@/lib/lv2/$f" "${pkgdir}/usr/lib/lv2/Zrythm-$f"
done
}

2
arch/meson.build
Unescape View File

@ -23,7 +23,7 @@ arch_conf.set ( @@ -23,7 +23,7 @@ arch_conf.set (
'CARLA_PKG_CONFIG_PATH', carla_pkgconfig_path)
arch_conf.set (
'CARLA_FULL_BINS_PATH',
carla_installation.full_path () + carla_prefix / 'lib/carla')
carla_installation.full_path () + carla_prefix / 'carla')
pkgbuild = configure_file (
output: 'PKGBUILD',

2
debian/meson.build vendored
Unescape View File

@ -41,7 +41,7 @@ debian_conf.set ( @@ -41,7 +41,7 @@ debian_conf.set (
debian_conf.set (
'CARLA_PREFIX', carla_prefix)
debian_conf.set (
'CARLA_FULL_BINS_PATH', carla_installation.full_path () + carla_prefix / 'lib/carla')
'CARLA_FULL_BINS_PATH', carla_installation.full_path () + carla_prefix / 'carla')
debian_conf.set (
'BUILT_ZPLUGINS_DIR',
zplugins_installation.full_path ())

12
debian/rules.in vendored
Unescape View File

@ -32,13 +32,11 @@ override_dh_auto_install: @@ -32,13 +32,11 @@ override_dh_auto_install:
DESTDIR=${CURDIR}/debian/zrythm@DASH_TRIAL@ ninja install
mkdir -p ${CURDIR}/debian/zrythm@DASH_TRIAL@/usr/lib/lv2
mkdir -p ${CURDIR}/debian/zrythm@DASH_TRIAL@/usr/lib/zrythm/carla
for file in carla-discovery-native carla-bridge-lv2-gtk2 carla-bridge-lv2-gtk3 carla-bridge-lv2-qt5 carla-bridge-lv2-x11 carla-bridge-native libcarla_host-pllugin.so; do
cp -Lv "@CARLA_FULL_BINS_PATH@/${file}" \
%{buildroot}/usr/lib/zrythm/carla/
for file in carla-discovery-native carla-bridge-lv2-gtk2 carla-bridge-lv2-gtk3 carla-bridge-lv2-qt5 carla-bridge-lv2-x11 carla-bridge-native libcarla_host-plugin.so; do \
cp -Lv "@CARLA_FULL_BINS_PATH@/$$file" \
${CURDIR}/debian/zrythm@DASH_TRIAL@/usr/lib/zrythm/carla/ ; \
done
cp -RLv @BUILT_ZPLUGINS_DIR@/* \
${CURDIR}/debian/zrythm@DASH_TRIAL@/usr/lib/lv2/
for f in `ls ${CURDIR}/usr/lib/lv2`; do
mv $f "${CURDIR}/usr/lib/lv2/Zrythm-$f"
for f in `ls @BUILT_ZPLUGINS_DIR@/lib/lv2`; do \
cp -RLv @BUILT_ZPLUGINS_DIR@/lib/lv2/$$f "${CURDIR}/debian/zrythm@DASH_TRIAL@/usr/lib/lv2/Zrythm-$$f"; \
done
if [ ! -f ${CURDIR}/debian/zrythm@DASH_TRIAL@/usr/lib/zrythm/carla/libcarla_host-plugin.so ] ; then exit 1 ; fi

2
meson.build
Unescape View File

@ -157,7 +157,7 @@ carla_installation = custom_target ( @@ -157,7 +157,7 @@ carla_installation = custom_target (
],
install: false,
)
carla_pkgconfig_path = carla_installation.full_path () + carla_prefix / 'lib/pkgconfig'
carla_pkgconfig_path = carla_installation.full_path () + carla_prefix / 'pkgconfig'
zplugins_installation = custom_target (
'zplugins-installation',

2
rpm/meson.build
Unescape View File

@ -25,7 +25,7 @@ rpm_conf.set ( @@ -25,7 +25,7 @@ rpm_conf.set (
'CARLA_PKG_CONFIG_PATH', carla_pkgconfig_path)
rpm_conf.set (
'CARLA_FULL_BINS_PATH',
carla_installation.full_path () + carla_prefix / 'lib/carla')
carla_installation.full_path () + carla_prefix / 'carla')
make_rpm_pkg = configure_file (
output: 'make_rpm_pkg.sh',

32
rpm/zrythm.spec.in
Unescape View File

@ -107,16 +107,15 @@ ninja -C build @@ -107,16 +107,15 @@ ninja -C build
%install
DESTDIR="%{buildroot}/" ninja -C build install
mkdir -p "%{buildroot}/usr/lib/zrythm/lib/lv2"
rm -rf "%{buildroot}/usr/lib64/libcm_reproc.a"
for file in carla-discovery-native carla-bridge-lv2-gtk2 carla-bridge-lv2-gtk3 carla-bridge-lv2-qt5 carla-bridge-lv2-x11 carla-bridge-native libcarla_host-pllugin.so; do
mkdir -p "%{buildroot}%{_libdir}/lv2"
mkdir -p "%{buildroot}%{_libdir}/zrythm/carla"
rm -rf "%{buildroot}%{_libdir}/libcm_reproc.a"
for file in carla-discovery-native carla-bridge-lv2-gtk2 carla-bridge-lv2-gtk3 carla-bridge-lv2-qt5 carla-bridge-lv2-x11 carla-bridge-native libcarla_host-plugin.so; do
cp -Lv "@CARLA_FULL_BINS_PATH@/$file" \
%{buildroot}/usr/lib/zrythm/carla/
%{buildroot}%{_libdir}/zrythm/carla/
done
cp -RLv @BUILT_ZPLUGINS_DIR@/* \
%{buildroot}/usr/lib/lv2/
for f in `ls %{buildroot}/usr/lib/lv2`; do
mv $f "%{buildroot}/usr/lib/lv2/Zrythm-$f"
for f in `ls @BUILT_ZPLUGINS_DIR@/lib/lv2`; do
cp -RLv "@BUILT_ZPLUGINS_DIR@/lib/lv2/$f" "%{buildroot}%{_libdir}/lv2/Zrythm-$f"
done
%find_lang zrythm
@ -134,17 +133,16 @@ done @@ -134,17 +133,16 @@ done
%{_datadir}/zrythm
%{_datadir}/man/man1/zrythm.*
%{_datadir}/mime/packages/org.zrythm.Zrythm-mime.xml
%{_prefix}/lib/lv2/Zrythm-*
%{_prefix}/lib/zrythm/carla/carla-discovery-native
%{_prefix}/lib/zrythm/carla/carla-bridge-lv2-gtk2
%{_prefix}/lib/zrythm/carla/carla-bridge-lv2-gtk3
%{_prefix}/lib/zrythm/carla/carla-bridge-lv2-qt5
%{_prefix}/lib/zrythm/carla/carla-bridge-lv2-x11
%{_prefix}/lib/zrythm/carla/carla-bridge-native
%{_prefix}/lib/zrythm/carla/libcarla_host-plugin.so
%{_libdir}/lv2/Zrythm-*
%{_libdir}/zrythm/carla/carla-discovery-native
%{_libdir}/zrythm/carla/carla-bridge-lv2-gtk2
%{_libdir}/zrythm/carla/carla-bridge-lv2-gtk3
%{_libdir}/zrythm/carla/carla-bridge-lv2-qt5
%{_libdir}/zrythm/carla/carla-bridge-lv2-x11
%{_libdir}/zrythm/carla/carla-bridge-native
%{_libdir}/zrythm/carla/libcarla_host-plugin.so
%{_sysconfdir}/bash_completion.d/zrythm
# _exec_prefix/lib64/**/*
%{_prefix}/lib/zrythm
%post
%if ! 0%{?suse_version}

Write Preview
Loading…
Cancel
Save