Re: updates and fixes: wired...

Grzegorz Grasza Thu, 24 Feb 2005 16:03:23 -0800

Użytkownik Grzegorz Konopko napisał:

Dnia czwartek, 24 lutego 2005 18:21, Grzegorz Grasza napisał:

%build -mv Makefile.linux Makefile -%{__make} sharedlib \ - CFLAGS="%{rpmcflags}" +%{__aclocal} +%{__autoconf} +%configure +%{__make}

To celowe usunięcie: "CFLAGS="%{rpmcflags}"

czy to się nie dzieje automatycznie przy %configure? (nie jestem pewien może wytłumacz) ale dodałem.

Poza tym te makra wymagają odpowiednich BR: poczytaj PLD-doc/devel-hints-pl.txt tam chyba powinno pisać.

zapomniałem, dodałem.

W soundtouch.spec.diff duzo usuniętych linijek. To na pewno wszystko ok?

kompiluje sie i działa z wired, tak samo z przykładowym soundstretch (łącznie z bibliotekami dynamicznymi) poprzednia wersja była dosyć stara (z paź. 2003)

Nie wiem co w tym wypadku chciałeś osiągnąć: +%{_datadir}/wired +%{_datadir}/wired/* +%{_datadir}/wired/*/* +%{_datadir}/wired/*/*/* +%{_datadir}/wired/*/*/*/*

sam nie wiem :P dłuugo sie toto kompiluje...

Pozd.

dzięki za uwagi.

--
./groz

xmpp/mail: <groz at gryf.info>

Index: portaudio.spec
===================================================================
RCS file: /cvsroot/SPECS/portaudio.spec,v
retrieving revision 1.3
diff -u -r1.3 portaudio.spec
--- portaudio.spec	11 Jan 2005 22:00:21 -0000	1.3
+++ portaudio.spec	24 Feb 2005 23:26:35 -0000
@@ -2,14 +2,15 @@
 Summary:	Free, cross platform, open-source, audio I/O library
 Summary(pl):	Darmowa, mi�dzyplatformowa i otwarta biblioteka I/O audio
 Name:		portaudio
-Version:	18
+Version:	19
 Release:	1
 License:	LGPL-like
 Group:		Libraries
-Source0:	http://www.portaudio.com/archives/%{name}_v%{version}_1.zip
-# Source0-md5:	ce66a732d263fde2b5ad2262ef37a691
+Source0:	http://www.portaudio.com/archives/pa_snapshot_v%{version}.tar.gz
+# Source0-md5:	580924f95b193d4ac86e64f729c66ce6
+BuildRequires:	autoconf
+BuildRequires:	automake
 URL:		http://www.portaudio.com/
-BuildRequires:	unzip
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -36,20 +37,33 @@
 %description devel -l pl
 Pliki nag��wkowe biblioteki PortAudio.
 
+%package static
+Summary:	Static PortAudio library
+Summary(pl):	Statyczna biblioteka PortAudio
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+
+%description static
+Static PortAudio library.
+
+%description static -l pl
+Statyczna biblioteka PortAudio.
+
 %prep
-%setup -q -n %{name}_v%{version}_1
+%setup -q -n %{name}
 
 %build
-mv Makefile.linux Makefile
-%{__make} sharedlib \
+%{__aclocal}
+%{__autoconf}
+%configure
+%{__make} \
 	CFLAGS="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_libdir},%{_includedir}}
-
-install pa_unix_oss/libportaudio.so $RPM_BUILD_ROOT%{_libdir}
-install pa_common/portaudio.h $RPM_BUILD_ROOT%{_includedir}
+%{__make} install \
+	PREFIX=$RPM_BUILD_ROOT/usr
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -60,12 +74,16 @@
 %files
 %defattr(644,root,root,755)
 %doc README.txt LICENSE.txt
-%attr(755,root,root) %{_libdir}/libportaudio.so
+%attr(755,root,root) %{_libdir}/lib*.so*
 
 %files devel
 %defattr(644,root,root,755)
 %doc docs/*
 %{_includedir}/portaudio.h
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/lib*.a
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog

Index: wired.spec
===================================================================
RCS file: /cvsroot/SPECS/wired.spec,v
retrieving revision 1.4
diff -u -r1.4 wired.spec
--- wired.spec	11 Jan 2005 20:59:04 -0000	1.4
+++ wired.spec	24 Feb 2005 23:27:48 -0000
@@ -9,10 +9,11 @@
 Source0:	http://dl.sourceforge.net/wired/%{name}-%{version}.tar.gz
 # Source0-md5:	6002612be1a520088becb1e3369a1088
 URL:		http://bloodshed.net/wired/
-BuildRequires:	portaudio-devel
-BuildRequires:	soundtouch-devel
+BuildRequires:	portaudio-devel >= 19
+BuildRequires:	soundtouch-devel >= 1.3.0
 BuildRequires:	libsndfile-devel
 BuildRequires:	wxGTK2-devel >= 2.5.0
+BuildRequires:	sed >= 4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -33,13 +34,14 @@
 %setup -q -n %{name}
 
 %build
-cd src
+
+sed -i -e 's"#include <soundtouch/SoundTouch.h>"#include <soundtouch/SoundTouch.h>\nusing namespace soundtouch;"g' src/plugins/loop_sampler/Slice.h
+
 #%{__libtoolize}
-#%{__aclocal}
-#%{__autoconf}
-#%{__automake}
+%{__aclocal}
+%{__autoconf}
+%{__automake}
 %configure
-
 %{__make}
 
 %install
@@ -48,22 +50,27 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%find_lang %{name} --with-gnome --all-name
+#%find_lang %{name} --with-gnome --all-name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%gconf_schema_install
+#%gconf_schema_install
 
-%files -f %{name}.lang
+%files
+#-f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/wired_exts.conf
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/wired_plugins.conf
 %attr(755,root,root) %{_bindir}/*
-%{_desktopdir}/*.desktop
-%{_omf_dest_dir}/*
-%{_pixmapsdir}/*
-%{_sysconfdir}/gconf/schemas/*
+%attr(755,root,root) %{_libdir}/lib*.so*
+%{_datadir}/wired
+#%{_desktopdir}/*.desktop
+#%{_omf_dest_dir}/*
+#%{_pixmapsdir}/*
+#%{_sysconfdir}/gconf/schemas/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog

Index: soundtouch.spec
===================================================================
RCS file: /cvsroot/SPECS/soundtouch.spec,v
retrieving revision 1.5
diff -u -r1.5 soundtouch.spec
--- soundtouch.spec	11 Apr 2004 11:09:48 -0000	1.5
+++ soundtouch.spec	24 Feb 2005 23:56:35 -0000
@@ -2,16 +2,19 @@
 Summary:	SoundTouch - sound processing library
 Summary(pl):	SoundTouch - biblioteka do przetwarzania d�wi�ku
 Name:		soundtouch
-Version:	1.1.1
+Version:	1.3.0
 Release:	1
 License:	GPL
 Group:		Libraries
-Source0:	http://www.sunpoint.net/~oparviai/soundtouch/%{name}_v%{version}.zip
-# Source0-md5:	c154b7d3b9c3145297ee359b6d14e3d3
-URL:		http://www.sunpoint.net/~oparviai/soundtouch/soundstretch.html
+Source0:	http://sky.prohosting.com/oparviai/soundtouch/%{name}_v%{version}.zip
+# Source0-md5:	5c2d3f54320e5197885b3462f5f35a15
+URL:		http://sky.prohosting.com/oparviai/soundtouch/
+BuildRequires:	autoconf
+BuildRequires:	automake
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool >= 2:1.4d
 BuildRequires:	unzip
+BuildRequires:	sed >= 4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -67,33 +70,25 @@
 SoundTouch do przetwarzania d�wi�ku we w�asnych programach.
 
 %prep
-%setup -q -n SoundTouch
+%setup -q -n SoundTouch-%{version}
 
 %build
-# try to abuse makefiles :)
-%{__make} -C source/SoundTouch -f makefile.gcc \
-	CC="libtool --mode=compile --tag=CXX %{__cxx}" \
-	FLAGS="-I../../include %{rpmcflags}" \
-	LINK=/bin/true
-
-libtool --mode=link %{__cxx} %{rpmldflags} -o libSoundTouch.la \
-	source/SoundTouch/*.lo -rpath %{_libdir}
-
-%{__make} -C source/example/SoundStretch -f makefile.gcc \
-	main.o RunParameters.o WavFile.o BPMDetect.o PeakFinder.o \
-	CC="%{__cxx}" \
-	FLAGS="-I../../../include %{rpmcflags}"
 
-libtool --mode=link %{__cxx} %{rpmldflags} -o soundstretch \
-	source/example/SoundStretch/*.o libSoundTouch.la
+sed -i -e 's"#define INTEGER_SAMPLES"//#define INTEGER_SAMPLES"g' include/STTypes.h
+sed -i -e 's"//#define FLOAT_SAMPLES"#define FLOAT_SAMPLES"g' include/STTypes.h
+
+%{__aclocal}
+%{__autoconf}
+%{__automake}
+%configure --enable-shared --with-gnu-ld
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_includedir}/SoundTouch}
+install -d $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_includedir}}
 
-libtool --mode=install install libSoundTouch.la $RPM_BUILD_ROOT%{_libdir}
-libtool --mode=install install soundstretch $RPM_BUILD_ROOT%{_bindir}
-install include/*.h $RPM_BUILD_ROOT%{_includedir}/SoundTouch
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -103,14 +98,19 @@
 
 %files
 %defattr(644,root,root,755)
-%doc README.TXT
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
+%doc README.html COPYING.TXT
+%attr(755,root,root) %{_libdir}/libSoundTouch.0.0.0
+%attr(755,root,root) %{_libdir}/libSoundTouch.0
+%attr(755,root,root) %{_libdir}/libSoundTouch
+%attr(755,root,root) %{_libdir}/libBPM.0.0.0
+%attr(755,root,root) %{_libdir}/libBPM.0
+%attr(755,root,root) %{_libdir}/libBPM
+%{_datadir}/aclocal/soundtouch.m4
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
 %{_libdir}/lib*.la
-%{_includedir}/SoundTouch
+%{_includedir}/soundtouch
 
 %files static
 %defattr(644,root,root,755)

_______________________________________________
pld-devel-pl mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-devel-pl

Re: updates and fixes: wired...

Odpowiedź listem elektroniczym