commit 15db86c552885986e748fa83b904f523a2400a0c
Author: Jakub Bogusz <[email protected]>
Date: Sun Nov 24 09:05:57 2013 +0100
- updated to 0.45.3
- removed obsolete makefile patch (autotools are used now)
- added system-libs patch (allow using system portaudio and portmidi)
puredata-makefile.patch | 40 -----------
puredata-system-libs.patch | 59 ++++++++++++++++
puredata.spec | 173 ++++++++++++++++++++++++++++++++++-----------
3 files changed, 191 insertions(+), 81 deletions(-)
---
diff --git a/puredata.spec b/puredata.spec
index 4a46afa..ef34126 100644
--- a/puredata.spec
+++ b/puredata.spec
@@ -1,68 +1,106 @@
-# TODO: portaudio, portmidi
-# TODO: optflags for extra
-Summary: Pd - free real-time computer music software package resembling
Max
-Summary(pl.UTF-8): Pd - darmowy pakiet do muzyki w czasie rzeczywistym
podobny do Maksa
+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.44.0
-Release: 0.1
-License: BSD, only expr plugin on GPL
+Version: 0.45.3
+Release: 1
+License: GPL v2+ (expr plugin), BSD (the rest)
Group: Libraries
-Source0: http://dl.sourceforge.net/pure-data/pd-0.40-2.src.tar.gz
-# Source0-md5: 2622e12b6fa0bd69db9732972e953afb
-Patch0: %{name}-makefile.patch
+Source0: http://downloads.sourceforge.net/pure-data/pd-0.45-3.src.tar.gz
+# Source0-md5: 461a3d0d558a4f45c49943234baa9ca8
+Patch0: %{name}-system-libs.patch
URL: http://puredata.info/
BuildRequires: alsa-lib-devel
-BuildRequires: fftw-devel
+BuildRequires: autoconf >= 2.59
+BuildRequires: automake
+BuildRequires: fftw-devel >= 2
BuildRequires: jack-audio-connection-kit-devel
-#BuildRequires: portaudio-devel
+BuildRequires: libtool
+BuildRequires: portaudio-devel >= 19
#BuildRequires: portmidi-devel
-BuildRequires: tk-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
-Pd - free real-time computer music software package resembling Max.
+Pd is a graphical programming environment for real-time audio
+synthesis and related applications. It supports a rich set of
+real-time control and I/O features.
%description -l pl.UTF-8
-Pd - darmowy pakiet do muzyki w czasie rzeczywistym podobny do Maksa.
+Pd to środowisko do graficznego programowania dla syntezy dźwięku w
+czasie rzeczywistym i zbliżonych zastosowań. Obsługuje bogaty zbiór
+kontrolek czasu rzeczywistego oraz funkcji we/wy.
+
+%package gui
+Summary: Tcl/Tk based graphical user interface for Pd
+Summary(pl.UTF-8): Oparty na Tcl/Tk graficzny interfejs użytkownika do Pd
+Group: X11/Applications
+Requires: %{name} = %{version}-%{release}
+Requires: tcl >= 8.3
+Requires: tk >= 8.3
+
+%description gui
+Tcl/Tk based graphical user interface for Pd.
+
+%description gui -l pl.UTF-8
+Oparty na Tcl/Tk graficzny interfejs użytkownika do Pd.
%package devel
-Summary: Header file for Pd
-Summary(pl.UTF-8): Plik nagłówkowy Pd
+Summary: Header files for Pd
+Summary(pl.UTF-8): Pliki nagłówkowe Pd
Group: Development/Libraries
# doesn't require base
%description devel
-Header file for Pd.
+Header files for Pd.
%description devel -l pl.UTF-8
-Plik nagłówkowy Pd.
+Pliki nagłówkowe Pd.
+
+%package doc
+Summary: Documentation and examples for Pd
+Summary(pl.UTF-8): Dokumentacja i przykłady do Pd
+Group: Documentation
+
+%description doc
+Documentation and examples for Pd.
+
+%description doc -l pl.UTF-8
+Dokumentacja i przykłady do Pd.
%prep
-%setup -q -n pd-0.40-2
-%patch0 -p0
+%setup -q -n pd-0.45-3
+%patch0 -p1
cp extra/expr~/README.txt README-expr.txt
+# use system libs
+%{__rm} -r portaudio portmidi
+
%build
-cd src
+%{__libtoolize}
+%{__aclocal} -I m4/generated -I m4
+%{__autoconf}
+%{__automake}
%configure \
--with-fftw \
--with-jack \
--with-alsa \
-# --with-portaudio --with-portmidi (fix to use system lisb)
-%{__make} \
- CC="%{__cc}" \
- MORECFLAGS=-D_LARGEFILE64_SOURCE
+# note: --enable-portmidi conflicts with OSS (which is enabled on Linux)
+
+%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} -C src install \
- DESTDIR=$RPM_BUILD_ROOT \
- libdir=$RPM_BUILD_ROOT%{_libdir}
+%{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT
+
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/pd/extra/*/*.la
-mv -f $RPM_BUILD_ROOT%{_libdir}/pd/doc pd-doc
-find $RPM_BUILD_ROOT%{_libdir}/pd/extra -name '*.[ch]*' -or -name 'makefile'
-or -name '*_o' | xargs rm -f
+install -d $RPM_BUILD_ROOT%{_docdir}
+mv -f $RPM_BUILD_ROOT%{_libdir}/pd/doc $RPM_BUILD_ROOT%{_docdir}/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
%clean
rm -rf $RPM_BUILD_ROOT
@@ -75,40 +113,93 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/pdsend
%dir %{_libdir}/pd
%dir %{_libdir}/pd/bin
-# two following R: tcl/tk
-%attr(755,root,root) %{_libdir}/pd/bin/pd-gui
-%{_libdir}/pd/bin/pd.tk
+%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/bonk~
%attr(755,root,root) %{_libdir}/pd/extra/bonk~/bonk~.pd_linux
-%{_libdir}/pd/extra/bonk~/*.pd
-%{_libdir}/pd/extra/bonk~/*.txt
+%{_libdir}/pd/extra/bonk~/bonk~-help.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/*.pd
+%{_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~/*.pd
+%{_libdir}/pd/extra/fiddle~/fiddle~-help.pd
%dir %{_libdir}/pd/extra/loop~
%attr(755,root,root) %{_libdir}/pd/extra/loop~/loop~.pd_linux
%{_libdir}/pd/extra/loop~/*.pd
%dir %{_libdir}/pd/extra/lrshift~
%attr(755,root,root) %{_libdir}/pd/extra/lrshift~/lrshift~.pd_linux
-%{_libdir}/pd/extra/lrshift~/*.pd
+%{_libdir}/pd/extra/lrshift~/lrshift~-help.pd
+%dir %{_libdir}/pd/extra/pd~
+%attr(755,root,root) %{_libdir}/pd/extra/pd~/pd*.pd_linux
+%{_libdir}/pd/extra/pd~/pd~-*.pd
%dir %{_libdir}/pd/extra/pique
%attr(755,root,root) %{_libdir}/pd/extra/pique/pique.pd_linux
-%{_libdir}/pd/extra/pique/*.pd
+%{_libdir}/pd/extra/pique/pique-help.pd
%dir %{_libdir}/pd/extra/sigmund~
%attr(755,root,root) %{_libdir}/pd/extra/sigmund~/sigmund~.pd_linux
-%{_libdir}/pd/extra/sigmund~/*.pd
+%{_libdir}/pd/extra/sigmund~/sigmund~-help.pd
+%dir %{_libdir}/pd/extra/stdout
+%attr(755,root,root) %{_libdir}/pd/extra/stdout/stdout.pd_linux
+%{_libdir}/pd/extra/stdout/stdout-help.pd
+%{_libdir}/pd/startup
%{_mandir}/man1/pd.1*
%{_mandir}/man1/pdreceive.1*
%{_mandir}/man1/pdsend.1*
+%files gui
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/pd-gui.tcl
+%dir %{_libdir}/pd/po
+%lang(af) %{_libdir}/pd/po/af.msg
+%lang(az) %{_libdir}/pd/po/az.msg
+%lang(be) %{_libdir}/pd/po/be.msg
+%lang(bg) %{_libdir}/pd/po/bg.msg
+%lang(de) %{_libdir}/pd/po/de.msg
+%lang(el) %{_libdir}/pd/po/el.msg
+%lang(en_CA) %{_libdir}/pd/po/en_ca.msg
+%lang(eu) %{_libdir}/pd/po/eu.msg
+%lang(fr) %{_libdir}/pd/po/fr.msg
+%lang(gu) %{_libdir}/pd/po/gu.msg
+%lang(he) %{_libdir}/pd/po/he.msg
+%lang(hi) %{_libdir}/pd/po/hi.msg
+%lang(hu) %{_libdir}/pd/po/hu.msg
+%lang(it) %{_libdir}/pd/po/it.msg
+%lang(pa) %{_libdir}/pd/po/pa.msg
+%lang(pt_BR) %{_libdir}/pd/po/pt_br.msg
+%lang(pt) %{_libdir}/pd/po/pt_pt.msg
+%lang(sq) %{_libdir}/pd/po/sq.msg
+%lang(sv) %{_libdir}/pd/po/sv.msg
+%lang(vi) %{_libdir}/pd/po/vi.msg
+%dir %{_libdir}/pd/tcl
+%attr(755,root,root) %{_libdir}/pd/tcl/pd-gui.tcl
+%{_libdir}/pd/tcl/AppMain.tcl
+%{_libdir}/pd/tcl/apple_events.tcl
+%{_libdir}/pd/tcl/dialog_*.tcl
+%{_libdir}/pd/tcl/helpbrowser.tcl
+%{_libdir}/pd/tcl/opt_parser.tcl
+%{_libdir}/pd/tcl/pd_*.tcl
+%{_libdir}/pd/tcl/pdtk_*.tcl
+%{_libdir}/pd/tcl/pdwindow.tcl
+%{_libdir}/pd/tcl/pkgIndex.tcl
+%{_libdir}/pd/tcl/pkg_mkIndex.tcl
+%{_libdir}/pd/tcl/scrollbox*.tcl
+%{_libdir}/pd/tcl/wheredoesthisgo.tcl
+%{_libdir}/pd/tcl/pd.ico
+
%files devel
%defattr(644,root,root,755)
%{_includedir}/m_pd.h
+%{_includedir}/pd
+%{_pkgconfigdir}/pd.pc
+
+%files doc
+%defattr(644,root,root,755)
+%{_docdir}/pd-doc
diff --git a/puredata-makefile.patch b/puredata-makefile.patch
deleted file mode 100644
index 063ec55..0000000
--- a/puredata-makefile.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- extra/makefile~ 2006-09-25 06:17:22.000000000 +0200
-+++ extra/makefile 2013-06-01 22:44:59.000000000 +0200
-@@ -57,7 +57,7 @@
-
- .SUFFIXES: .pd_linux
-
--LINUXCFLAGS = -DPD -O2 -funroll-loops -fomit-frame-pointer -fPIC -m32 \
-+LINUXCFLAGS = -DPD -O2 -funroll-loops -fomit-frame-pointer -fPIC \
- -Wall -W -Wshadow -Wstrict-prototypes \
- -Wno-unused -Wno-parentheses -Wno-switch $(CFLAGS)
-
-@@ -65,7 +65,7 @@
-
- .c.pd_linux:
- $(CC) $(LINUXCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c
-- $(CC) -m32 -export_dynamic -shared -o $*.pd_linux $*.o -lc -lm
-+ $(CC) -export_dynamic -shared -o $*.pd_linux $*.o -lc -lm
- strip --strip-unneeded $*.pd_linux
- rm -f $*.o
-
---- extra/expr~/makefile~ 2006-09-25 06:19:11.000000000 +0200
-+++ extra/expr~/makefile 2013-06-01 22:45:27.000000000 +0200
-@@ -77,7 +77,7 @@
- LINUXOBJ = vexp.pd_linux_o vexp_fun.pd_linux_o vexp_if.pd_linux_o
- .SUFFIXES: .pd_linux_o
-
--LINUXCFLAGS = -DPD -O2 -funroll-loops -fomit-frame-pointer -fPIC -m32 \
-+LINUXCFLAGS = -DPD -O2 -funroll-loops -fomit-frame-pointer -fPIC \
- -Wall -W -Wshadow -Wstrict-prototypes \
- -Wno-unused -Wno-parentheses -Wno-switch
-
-@@ -87,7 +87,7 @@
- $(CC) -g $(LINUXCFLAGS) $(LINUXINCLUDE) -o $*.pd_linux_o -c $*.c
-
- expr.pd_linux: $(LINUXOBJ)
-- $(CC) -m32 -export_dynamic -shared -o expr.pd_linux $(LINUXOBJ) -lc -lm
-+ $(CC) -export_dynamic -shared -o expr.pd_linux $(LINUXOBJ) -lc -lm
- strip --strip-unneeded expr.pd_linux
-
- expr~.pd_linux: expr.pd_linux
diff --git a/puredata-system-libs.patch b/puredata-system-libs.patch
new file mode 100644
index 0000000..fedd176
--- /dev/null
+++ b/puredata-system-libs.patch
@@ -0,0 +1,59 @@
+--- 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/15db86c552885986e748fa83b904f523a2400a0c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
