[packages/ardour] - up to 8.12, todo: fix linking
baggins
baggins at pld-linux.org
Mon Aug 18 01:36:27 CEST 2025
commit bf1100dc912a17f5270a605fcb95b4373f9d6fb8
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Mon Aug 18 03:36:00 2025 +0200
- up to 8.12, todo: fix linking
ardour.spec | 39 +++++++++++++++---------------
ffmpeg_paths.patch | 68 ++++++++++++-----------------------------------------
localedir.patch | 6 ++---
no_proc_build.patch | 6 ++---
4 files changed, 41 insertions(+), 78 deletions(-)
---
diff --git a/ardour.spec b/ardour.spec
index d86b7b8..357df04 100644
--- a/ardour.spec
+++ b/ardour.spec
@@ -1,12 +1,15 @@
Summary: Multitrack hard disk recorder
Summary(pl.UTF-8): Wielościeżkowy magnetofon nagrywający na twardym dysku
Name: ardour
-Version: 5.12.0
-Release: 4
+Version: 8.12
+Release: 0.1
License: GPL
Group: X11/Applications/Sound
-Source0: https://community.ardour.org/srctar/Ardour-%{version}.tar.bz2
-# Source0-md5: cb45f31a59dd5a0da07422e4ac1c44fd
+# Aredour does not allow fetching github tags :/
+# https://tracker.ardour.org/view.php?id=7328
+# https://github.com/Ardour/ardour/archive/%{version}/%{name}-%{version}.tar.gz
+Source0: ardour-8.12.tar.xz
+# Source0-md5: 655db71e5511f2e26b82d031576433c4
Source1: %{name}.desktop
Patch0: localedir.patch
Patch1: no_proc_build.patch
@@ -76,8 +79,7 @@ Obsługuje próbki do 32 bitów, 24+ kanałów do 96kHz, pełną kontrolę
MMC, niedestruktywny, nieliniowy edytor oraz wtyczki LADSPA.
%prep
-%setup -q -n Ardour-%{version}
-
+%setup -q
%patch -P0 -p1
%patch -P1 -p1
%patch -P2 -p1
@@ -98,8 +100,7 @@ export LDFLAGS="%{rpmldflags}"
--libdir=%{_libdir} \
--mandir=%{_mandir} \
--lv2 \
- --lv2dir=%{_libdir}/lv2 \
- --cxx11 \
+ --cxx17 \
--freedesktop
./waf build -v
@@ -122,7 +123,7 @@ install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
cp -a gtk2_ardour/icons/application-x-ardour_48px.png $RPM_BUILD_ROOT%{_pixmapsdir}/ardour.png
-rm -r $RPM_BUILD_ROOT%{_localedir}/{pt_PT,zh}
+#rm -r $RPM_BUILD_ROOT%{_localedir}/{pt_PT,zh}
%find_lang %{name} --all-name
@@ -133,20 +134,20 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc README
%dir %{_sysconfdir}/ardour5
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ardour5/ardour.keys
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ardour5/ardour.menus
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ardour5/clearlooks.rc
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ardour5/default_ui_config
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ardour5/system_config
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ardour5/trx.menus
-%attr(755,root,root) %{_bindir}/ardour5
-%attr(755,root,root) %{_bindir}/ardour5-lua
-%{_datadir}/ardour5
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ardour8/ardour.keys
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ardour8/ardour.menus
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ardour8/clearlooks.rc
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ardour8/default_ui_config
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ardour8/system_config
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ardour8/trx.menus
+%attr(755,root,root) %{_bindir}/ardour8
+%attr(755,root,root) %{_bindir}/ardour8-lua
+%{_datadir}/ardour8
%{_desktopdir}/ardour.desktop
%{_pixmapsdir}/ardour.png
# everything executable there
-%attr(755,root,root) %{_libdir}/ardour5
+%attr(755,root,root) %{_libdir}/ardour8
%dir %{_libdir}/lv2/*.lv2
%attr(755,root,root) %{_libdir}/lv2/*.lv2/*.so
diff --git a/ffmpeg_paths.patch b/ffmpeg_paths.patch
index edc6fde..774864b 100644
--- a/ffmpeg_paths.patch
+++ b/ffmpeg_paths.patch
@@ -1,64 +1,26 @@
-diff -dur -x '*~' Ardour-5.12.0.orig/gtk2_ardour/po/de.po Ardour-5.12.0/gtk2_ardour/po/de.po
---- Ardour-5.12.0.orig/gtk2_ardour/po/de.po 2017-09-15 22:56:22.000000000 +0200
-+++ Ardour-5.12.0/gtk2_ardour/po/de.po 2018-10-23 19:27:38.331895133 +0200
-@@ -16185,12 +16185,6 @@
- "The tools are included with the %1 releases from ardour.org and also "
- "available with the video-server at http://x42.github.com/harvid/\n"
- "\n"
--"Important: the files need to be installed in $PATH and named ffmpeg_harvid "
--"and ffprobe_harvid.\n"
--"If you already have a suitable ffmpeg installation on your system, we "
--"recommend creating symbolic links from ffmpeg to ffmpeg_harvid and from "
--"ffprobe to ffprobe_harvid.\n"
--"\n"
- "see also http://manual.ardour.org/video-timeline/setup/"
- msgstr ""
- "Auf diesem System konnte keine ffmpeg-Installation gefunden werden.\n"
-@@ -16200,12 +16194,6 @@
- "Die Werkzeuge sind in den %1-Veröffentlichungen von ardour.org enthalten und "
- "ebenfalls mit dem Videoserver auf http://x42.github.com/harvid/ erhältlich.\n"
- "\n"
--"Wichtig: Die Dateien müssen in $PATH installiert werden und nach "
--"ffmpeg_harvid und ffprobe_harvid umbenannt werden.\n"
--"Falls Sie eine geeignete ffmpeg-Installation auf Ihrem System haben, "
--"empfehlen wir, symbolische Verknüpfungen von ffmpeg auf ffmpeg_harvid und "
--"von ffprobe auf ffprobe_harvid zu erzeugen.\n"
--"\n"
- "Sehen Sie auch http://manual.ardour.org/video-timeline/setup/"
-
- #: transcode_video_dialog.cc:56
diff -dur -x '*~' Ardour-5.12.0.orig/gtk2_ardour/transcode_ffmpeg.cc Ardour-5.12.0/gtk2_ardour/transcode_ffmpeg.cc
--- Ardour-5.12.0.orig/gtk2_ardour/transcode_ffmpeg.cc 2017-09-15 22:56:22.000000000 +0200
+++ Ardour-5.12.0/gtk2_ardour/transcode_ffmpeg.cc 2018-10-23 19:27:09.621396487 +0200
@@ -60,10 +60,6 @@
- "The tools are included with the %1 releases from ardour.org "
- "and also available with the video-server at http://x42.github.com/harvid/\n"
- "\n"
-- "Important: the files need to be installed in $PATH and named ffmpeg_harvid and ffprobe_harvid.\n"
-- "If you already have a suitable ffmpeg installation on your system, we recommend creating "
-- "symbolic links from ffmpeg to ffmpeg_harvid and from ffprobe to ffprobe_harvid.\n"
-- "\n"
- "see also http://manual.ardour.org/video-timeline/setup/"
- ), PROGRAM_NAME) << endmsg;
- return;
-diff -dur -x '*~' Ardour-5.12.0.orig/gtk2_ardour/video_tool_paths.cc Ardour-5.12.0/gtk2_ardour/video_tool_paths.cc
---- Ardour-5.12.0.orig/gtk2_ardour/video_tool_paths.cc 2017-09-15 22:56:22.000000000 +0200
-+++ Ardour-5.12.0/gtk2_ardour/video_tool_paths.cc 2018-10-23 19:26:43.792949900 +0200
+ "The tools are included with the %1 releases from ardour.org "
+ "and also available with the video-server at http://x42.github.com/harvid/\n"
+ "\n"
+- "Important: the files need to be installed in $PATH and named ffmpeg_harvid and ffprobe_harvid.\n"
+- "If you already have a suitable ffmpeg installation on your system, we recommend creating "
+- "symbolic links from ffmpeg to ffmpeg_harvid and from ffprobe to ffprobe_harvid.\n"
+- "\n"
+ "see also http://manual.ardour.org/video-timeline/setup/"),
+ PROGRAM_NAME)
+ << endmsg;
+diff -dur -x '*~' Ardour-5.12.0.orig/libs/ardour/video_tools_paths.cc Ardour-5.12.0/libs/ardour/video_tools_paths.cc
+--- Ardour-5.12.0.orig/libs/ardour/video_tools_paths.cc 2017-09-15 22:56:22.000000000 +0200
++++ Ardour-5.12.0/libs/ardour/video_tools_paths.cc 2018-10-23 19:26:43.792949900 +0200
@@ -166,7 +166,7 @@
- ffprobe_exe = X_("");
+ _ffprobe_exe = X_("");
std::string ff_file_path;
- if (find_file (Searchpath(Glib::getenv("PATH")), X_("ffmpeg_harvid"), ff_file_path)) {
+ if (find_file (Searchpath(Glib::getenv("PATH")), X_("ffmpeg"), ff_file_path)) {
- ffmpeg_exe = ff_file_path;
- }
- #ifdef PLATFORM_WINDOWS
-@@ -194,7 +194,7 @@
- }
- #endif
-
-- if (find_file (Searchpath(Glib::getenv("PATH")), X_("ffprobe_harvid"), ff_file_path)) {
-+ if (find_file (Searchpath(Glib::getenv("PATH")), X_("ffprobe"), ff_file_path)) {
- ffprobe_exe = ff_file_path;
+ _ffmpeg_exe = ff_file_path;
}
#ifdef PLATFORM_WINDOWS
diff --git a/localedir.patch b/localedir.patch
index dbd8918..fb0aa44 100644
--- a/localedir.patch
+++ b/localedir.patch
@@ -2,8 +2,8 @@ diff -dur Ardour-5.4.0.orig/wscript Ardour-5.4.0/wscript
--- Ardour-5.4.0.orig/wscript 2016-09-28 23:25:46.000000000 +0200
+++ Ardour-5.4.0/wscript 2016-10-11 21:53:46.000000000 +0200
@@ -1265,6 +1265,7 @@
- bld.env.append_value ('CFLAGS', '-DUSE_TRACKS_CODE_FEATURES')
- lwrcase_dirname = 'trx'
+ # set up target directories
+ lwrcase_dirname = 'ardour' + bld.env['MAJOR']
+ bld.env['LOCALEDIR'] = os.path.join(bld.env['DATADIR'], 'locale')
# configuration files go here
@@ -14,6 +14,6 @@ diff -dur Ardour-5.4.0.orig/wscript Ardour-5.4.0/wscript
bld.env['DLLDIR'] = os.path.join(bld.env['LIBDIR'], lwrcase_dirname)
bld.env['LIBDIR'] = bld.env['DLLDIR']
- bld.env['LOCALEDIR'] = os.path.join(bld.env['DATADIR'], 'locale')
- bld.env['lwrcase_dirname'] = lwrcase_dirname;
+ bld.env['lwrcase_dirname'] = lwrcase_dirname
autowaf.set_recursive()
diff --git a/no_proc_build.patch b/no_proc_build.patch
index ecdbe9e..70d9c76 100644
--- a/no_proc_build.patch
+++ b/no_proc_build.patch
@@ -2,10 +2,10 @@ diff -dur Ardour-5.4.0.orig/wscript Ardour-5.4.0/wscript
--- Ardour-5.4.0.orig/wscript 2016-10-11 21:55:23.000000000 +0200
+++ Ardour-5.4.0/wscript 2016-10-11 21:56:20.000000000 +0200
@@ -439,7 +439,9 @@
+ if not (opt.arm64 or conf.env['build_target'] == 'armhf' and conf.env['build_target'] == 'aarch64'):
+ compiler_flags.append ("-DARCH_X86")
- compiler_flags.append ("-DARCH_X86")
-
-- if platform == 'linux' :
+- if platform == 'linux' and conf.env['build_target'] != 'armhf' and conf.env['build_target'] != 'aarch64':
+ build_host_supports_sse = True
+ compiler_flags.append ("-mmmx")
+ if False :
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ardour.git/commitdiff/bf1100dc912a17f5270a605fcb95b4373f9d6fb8
More information about the pld-cvs-commit
mailing list