[packages/puredata] Version: 0.48.1
jajcus
jajcus at pld-linux.org
Sun Aug 12 11:09:44 CEST 2018
commit 24ea12d51da09440ed459e5571fd8b41ce9251c0
Author: Jacek Konieczny <jajcus at jajcus.net>
Date: Sun Aug 12 11:08:35 2018 +0200
Version: 0.48.1
also: fix locating the installation directory, so it actually works.
findprogdir.patch | 20 ++++++++++++++++
puredata-system-libs.patch | 59 ----------------------------------------------
puredata.spec | 59 ++++++++++++++++++++++++++--------------------
3 files changed, 54 insertions(+), 84 deletions(-)
---
diff --git a/puredata.spec b/puredata.spec
index ef34126..80d045b 100644
--- a/puredata.spec
+++ b/puredata.spec
@@ -1,24 +1,28 @@
Summary: Pd - graphical programming environment for real-time audio synthesis etc.
Summary(pl.UTF-8): Pd - środowisko do graficznego programowania syntezy dźwięku itp.
Name: puredata
-Version: 0.45.3
+Version: 0.48.1
Release: 1
License: GPL v2+ (expr plugin), BSD (the rest)
Group: Libraries
-Source0: http://downloads.sourceforge.net/pure-data/pd-0.45-3.src.tar.gz
-# Source0-md5: 461a3d0d558a4f45c49943234baa9ca8
-Patch0: %{name}-system-libs.patch
+Source0: http://msp.ucsd.edu/Software/pd-0.48-1.src.tar.gz
+# Source0-md5: 8c4deff54b47a10d2f55e363022cc634
+Patch0: findprogdir.patch
URL: http://puredata.info/
BuildRequires: alsa-lib-devel
BuildRequires: autoconf >= 2.59
BuildRequires: automake
-BuildRequires: fftw-devel >= 2
+BuildRequires: fftw3-devel
BuildRequires: jack-audio-connection-kit-devel
BuildRequires: libtool
BuildRequires: portaudio-devel >= 19
#BuildRequires: portmidi-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+# puredata actually sanitizes the format string before use
+# and the usual '%s', trick would break '%%' format strings
+%define filterout_c -Werror=format-security
+
%description
Pd is a graphical programming environment for real-time audio
synthesis and related applications. It supports a rich set of
@@ -67,23 +71,26 @@ Documentation and examples for Pd.
Dokumentacja i przykłady do Pd.
%prep
-%setup -q -n pd-0.45-3
-%patch0 -p1
+%setup -q -n pd-0.48-1
-cp extra/expr~/README.txt README-expr.txt
+%patch0 -p1
-# use system libs
-%{__rm} -r portaudio portmidi
+cp extra/README.txt README-extra.txt
+for f in extra/*/README.txt ; do
+ cp "$f" README-"$(basename $(dirname "$f"))".txt
+done
%build
%{__libtoolize}
%{__aclocal} -I m4/generated -I m4
%{__autoconf}
%{__automake}
-%configure \
- --with-fftw \
- --with-jack \
- --with-alsa \
+%configure CPPFLAGS="%{rpmcppflags} -DPROGDIR='\"%{_libdir}/pd\"'" \
+ --enable-fftw \
+ --enable-jack \
+ --enable-alsa \
+ --without-local-portmidi \
+ --without-local-portaudio
# note: --enable-portmidi conflicts with OSS (which is enabled on Linux)
%{__make}
@@ -97,17 +104,18 @@ rm -rf $RPM_BUILD_ROOT
%{__rm} $RPM_BUILD_ROOT%{_libdir}/pd/extra/*/*.la
install -d $RPM_BUILD_ROOT%{_docdir}
-mv -f $RPM_BUILD_ROOT%{_libdir}/pd/doc $RPM_BUILD_ROOT%{_docdir}/pd-doc
+mv -f $RPM_BUILD_ROOT%{_libdir}/pd/doc $RPM_BUILD_ROOT%{_docdir}/puredata-doc
+ln -s %{_docdir}/puredata-doc $RPM_BUILD_ROOT%{_libdir}/pd/doc
-# README.txt is packaged as README-expr.txt, LICENSE.txt is just GPL
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/pd/extra/expr~/{LICENSE,README}.txt
+# 'Symlink points to BuildRoot'
+ln -sf %{_bindir}/pd $RPM_BUILD_ROOT%{_libdir}/pd/bin/pd
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc LICENSE.txt README.txt README-expr.txt src/CHANGELOG.txt
+%doc LICENSE.txt README.txt README-*.txt src/CHANGELOG.txt
%attr(755,root,root) %{_bindir}/pd
%attr(755,root,root) %{_bindir}/pdreceive
%attr(755,root,root) %{_bindir}/pdsend
@@ -116,18 +124,17 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/pd/bin/pd
%attr(755,root,root) %{_libdir}/pd/bin/pd-watchdog
%dir %{_libdir}/pd/extra
-%attr(755,root,root) %{_libdir}/pd/extra/*.pd_linux
%{_libdir}/pd/extra/*.pd
+%dir %{_libdir}/pd/extra/bob~
+%attr(755,root,root) %{_libdir}/pd/extra/bob~/bob~.pd_linux
+%{_libdir}/pd/extra/bob~/*.pd
%dir %{_libdir}/pd/extra/bonk~
%attr(755,root,root) %{_libdir}/pd/extra/bonk~/bonk~.pd_linux
-%{_libdir}/pd/extra/bonk~/bonk~-help.pd
+%{_libdir}/pd/extra/bonk~/*.pd
%{_libdir}/pd/extra/bonk~/templates.txt
%dir %{_libdir}/pd/extra/choice
%attr(755,root,root) %{_libdir}/pd/extra/choice/choice.pd_linux
%{_libdir}/pd/extra/choice/choice-help.pd
-%dir %{_libdir}/pd/extra/expr~
-%attr(755,root,root) %{_libdir}/pd/extra/expr~/*.pd_linux
-%{_libdir}/pd/extra/expr~/expr-help.pd
%dir %{_libdir}/pd/extra/fiddle~
%attr(755,root,root) %{_libdir}/pd/extra/fiddle~/fiddle~.pd_linux
%{_libdir}/pd/extra/fiddle~/fiddle~-help.pd
@@ -156,7 +163,7 @@ rm -rf $RPM_BUILD_ROOT
%files gui
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/pd-gui.tcl
+%attr(755,root,root) %{_bindir}/pd-gui
%dir %{_libdir}/pd/po
%lang(af) %{_libdir}/pd/po/af.msg
%lang(az) %{_libdir}/pd/po/az.msg
@@ -165,6 +172,7 @@ rm -rf $RPM_BUILD_ROOT
%lang(de) %{_libdir}/pd/po/de.msg
%lang(el) %{_libdir}/pd/po/el.msg
%lang(en_CA) %{_libdir}/pd/po/en_ca.msg
+%lang(es) %{_libdir}/pd/po/es.msg
%lang(eu) %{_libdir}/pd/po/eu.msg
%lang(fr) %{_libdir}/pd/po/fr.msg
%lang(gu) %{_libdir}/pd/po/gu.msg
@@ -202,4 +210,5 @@ rm -rf $RPM_BUILD_ROOT
%files doc
%defattr(644,root,root,755)
-%{_docdir}/pd-doc
+%{_libdir}/pd/doc
+%{_docdir}/puredata-doc
diff --git a/findprogdir.patch b/findprogdir.patch
new file mode 100644
index 0000000..cbb8a9c
--- /dev/null
+++ b/findprogdir.patch
@@ -0,0 +1,20 @@
+diff -dur pd-0.48-1.orig/src/s_main.c pd-0.48-1/src/s_main.c
+--- pd-0.48-1.orig/src/s_main.c 2018-01-07 21:53:58.000000000 +0100
++++ pd-0.48-1/src/s_main.c 2018-08-12 10:51:57.153575246 +0200
+@@ -550,6 +550,8 @@
+ INSTALL_PREFIX. In MSW, we don't try to use INSTALL_PREFIX. */
+ void sys_findprogdir(char *progname)
+ {
++ sys_libdir = gensym(PROGDIR);
++#if 0
+ char sbuf[MAXPDSTRING], sbuf2[MAXPDSTRING], *sp;
+ char *lastslash;
+ #ifndef _WIN32
+@@ -625,6 +627,7 @@
+ sys_libdir = gensym(sbuf2);
+ }
+ #endif
++#endif
+ }
+
+ #ifdef _WIN32
diff --git a/puredata-system-libs.patch b/puredata-system-libs.patch
deleted file mode 100644
index fedd176..0000000
--- a/puredata-system-libs.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- pd-0.45-3/src/Makefile.am.orig 2013-09-30 23:33:35.000000000 +0200
-+++ pd-0.45-3/src/Makefile.am 2013-11-23 21:20:28.788845222 +0100
-@@ -85,8 +85,8 @@
- endif
-
- if PORTAUDIO
--pd_CFLAGS += -DUSEAPI_PORTAUDIO -I$(top_srcdir)/portaudio/include
--pd_LDADD += $(top_builddir)/portaudio/lib/libportaudio.la
-+pd_CFLAGS += -DUSEAPI_PORTAUDIO
-+pd_LDADD += -lportaudio
- pd_SOURCES += s_audio_pa.c s_audio_paring.c
- endif
-
-@@ -96,8 +96,7 @@
- endif
-
- if PORTMIDI
--INCLUDES += -I$(top_srcdir)/portmidi/pm_common -I$(top_srcdir)/portmidi/porttime
--pd_LDADD += $(top_builddir)/portmidi/libportmidi.la
-+pd_LDADD += -lportmidi
- pd_SOURCES += s_midi_pm.c
- endif
-
---- pd-0.45-3/configure.ac.orig 2013-10-03 18:22:29.000000000 +0200
-+++ pd-0.45-3/configure.ac 2013-11-23 21:25:07.512166857 +0100
-@@ -251,7 +251,6 @@
- AC_CONFIG_FILES([Makefile
- asio/Makefile
- man/Makefile
-- portmidi/Makefile
- tcl/Makefile
- po/Makefile
- src/Makefile
---- pd-0.45-3/Makefile.am.orig 2013-09-30 23:33:35.000000000 +0200
-+++ pd-0.45-3/Makefile.am 2013-11-23 21:25:25.632166098 +0100
-@@ -12,14 +12,6 @@
- EXTRA_SUBDIRS += asio
- endif
-
--if PORTAUDIO
--EXTRA_SUBDIRS += portaudio
--endif
--
--if PORTMIDI
--EXTRA_SUBDIRS += portmidi
--endif
--
- # files that are included but not built
- EXTRA_DIST = LICENSE.txt README.txt INSTALL.txt
-
-@@ -19,7 +19,7 @@
- SUBDIRS = $(EXTRA_SUBDIRS) src man tcl po extra
-
- # subdirs that are always included in the dist, etc.
--DIST_SUBDIRS = asio extra man po portaudio portmidi src tcl
-+DIST_SUBDIRS = asio extra man po src tcl
-
- BUILT_SOURCES =
- if MSGFMT
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/puredata.git/commitdiff/24ea12d51da09440ed459e5571fd8b41ce9251c0
More information about the pld-cvs-commit
mailing list