From: cvs2git Date: Thu, 26 Aug 2010 21:00:16 +0000 (+0000) Subject: This commit was manufactured by cvs2git to create branch 'AC-branch'. X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;ds=sidebyside;h=refs%2Fheads%2FAC-branch;p=packages%2Fmoc.git This commit was manufactured by cvs2git to create branch 'AC-branch'. Sprout from master 2007-01-02 05:09:24 UTC Szymon Siwek '- allows build with flac-1.1.3' Cherrypick from master 2003-02-03 21:22:54 UTC migo '- initial revision': moc-ncurses.patch -> 1.1 Cherrypick from master 2010-08-26 21:00:16 UTC Elan Ruusamäe '- use system ltdl': moc.spec -> 1.49 --- diff --git a/moc-ncurses.patch b/moc-ncurses.patch new file mode 100644 index 0000000..5c4399d --- /dev/null +++ b/moc-ncurses.patch @@ -0,0 +1,14 @@ +diff -ur moc-1.1.0-orig/configure.in moc-1.1.0/configure.in +--- moc-1.1.0-orig/configure.in Tue Dec 3 18:25:40 2002 ++++ moc-1.1.0/configure.in Mon Feb 3 22:14:31 2003 +@@ -47,8 +47,8 @@ + + dnl ncurses + AC_CHECK_LIB(ncurses, initscr, [ +- AC_CHECK_HEADER([ncurses.h],, [ +- AC_MSG_ERROR([You nedd ncurses header file.])]) ++ AC_CHECK_HEADER([ncurses/ncurses.h],, [ ++ AC_MSG_ERROR([You need ncurses header file.])]) + ], + [AC_MSG_ERROR([You need ncurses library.])] + ) diff --git a/moc.spec b/moc.spec index 27c1b47..208e091 100644 --- a/moc.spec +++ b/moc.spec @@ -3,23 +3,24 @@ %bcond_without home_etc # disable HOME_ETC support # Summary: Console audio player with simple ncurses interface -Summary(pl): Konsolowy odtwarzacz audio z prostym interfejsem ncurses +Summary(hu.UTF-8): Konzolos audiólejátszó egyszerű ncurses felülettel +Summary(pl.UTF-8): Konsolowy odtwarzacz audio z prostym interfejsem ncurses Name: moc -Version: 2.4.1 -Release: 3 +Version: 2.4.4 +Release: 2 License: GPL Group: Applications/Sound Source0: ftp://ftp.daper.net/pub/soft/moc/stable/%{name}-%{version}.tar.bz2 -# Source0-md5: 7b760a9c05d3f50781d06ed2d83aaee8 +# Source0-md5: 647c770a5542a4ae5437386807a89796 Patch0: %{name}-home_etc.patch URL: http://moc.daper.net/ +BuildRequires: a52dec-libs-devel BuildRequires: alsa-lib-devel BuildRequires: autoconf BuildRequires: automake BuildRequires: curl-devel -BuildRequires: ffmpeg-devel -BuildRequires: speex-devel -BuildRequires: flac-devel +BuildRequires: ffmpeg-devel >= 0.4.9-4.20080822.1 +BuildRequires: flac-devel >= 1.1.3 BuildRequires: libao-devel BuildRequires: libid3tag-devel BuildRequires: libltdl-devel @@ -31,6 +32,7 @@ BuildRequires: libtool BuildRequires: libvorbis-devel BuildRequires: ncurses-devel BuildRequires: pkgconfig +BuildRequires: speex-devel BuildRequires: taglib-devel >= 1.3.1 BuildRequires: zlib-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -40,138 +42,193 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description MOC is a console audio player with simple ncurses interface in playmp3list style. It supports MP3, Ogg, FLAC, Musepack, Speex, WAV -and other less popular formats supported by libsndfile. It has -all functions one may expect from simple audio player. Now it supports -net streams (shoutcast, icecast, regular HTTP, FTP) also. - -%description -l pl -MOC to konsolowy odtwarzacz audio z prostym interfejsem budz±cym -skojarzenia z playmp3list. Obs³uguje formaty MP3, Ogg, FLAC, -Musepack, Speex, WAV oraz inne mniej popularne formaty wspierane przez -bibliotekê libsndfile. Ma wszystkie funkcje, których mo¿na spodziewaæ -siê w prostym odtwarzaczu audio. Teraz tak¿e obs³uguje strumienie +and other less popular formats supported by libsndfile. It has all +functions one may expect from simple audio player. Now it supports net +streams (shoutcast, icecast, regular HTTP, FTP) also. + +%description -l hu.UTF-8 +MOC egy konzolos audió lejátszó egyszerű ncurses felülettel +playmp3list stílusban. MP3, Ogg, FLAC, Musepack, Speex, WAV és egyéb +kevésbé elterjedt formátumokat támogat a libsndfile segítségével. +Minden funkció megtalálható a programban, amelyet egy egyszerű audió +lejátszótól elvárható. A hálózati streameket (shoutcast, icecast, +általános HTTP, FTP) is támogatja. + +%description -l pl.UTF-8 +MOC to konsolowy odtwarzacz audio z prostym interfejsem budzącym +skojarzenia z playmp3list. Obsługuje formaty MP3, Ogg, FLAC, Musepack, +Speex, WAV oraz inne mniej popularne formaty wspierane przez +bibliotekę libsndfile. Ma wszystkie funkcje, których można spodziewać +się w prostym odtwarzaczu audio. Teraz także obsługuje strumienie sieciowe (shoutcast, icecast, HTTP, FTP). %package mp3 Summary: MP3 decoder for MoC - Music on Console -Summary(pl): Dekoder MP3 dla MOC +Summary(hu.UTF-8): MP3 formátum támogatása MoC-hoz +Summary(pl.UTF-8): Dekoder MP3 dla MOC Group: Applications/Sound Requires: %{name} = %{version}-%{release} Provides: %{name}-input = %{version}-%{release} %description mp3 -This package contains the MP3 decoder. -After install you should reload MOC player. +This package contains the MP3 decoder. After install you should reload +MOC player. + +%description mp3 -l hu.UTF-8 +Ez a csomag az MP3 dekódert tartalmazza. A telepítés után a MOC +lejátsztót újra kell indítani. -%description mp3 -l pl -Ten pakiet zawiera dekodowanie formatu MP3. -Po zainstalowaniu nale¿y uruchomiæ ponownie MOC. +%description mp3 -l pl.UTF-8 +Ten pakiet zawiera dekodowanie formatu MP3. Po zainstalowaniu należy +uruchomić ponownie MOC. %package musepack Summary: Musepack (MPC) decoder for MoC - Music on Console -Summary(pl): Dekoder Musepack (MPC) dla MOC +Summary(hu.UTF-8): Musepack (MPC) dekóder MoC-hoz +Summary(pl.UTF-8): Dekoder Musepack (MPC) dla MOC Group: Applications/Sound Requires: %{name} = %{version}-%{release} Provides: %{name}-input = %{version}-%{release} %description musepack -This package contains the Musepack (MPC) decoder. -After install you should reload MOC player. +This package contains the Musepack (MPC) decoder. After install you +should reload MOC player. -%description musepack -l pl -Ten pakiet zawiera dekodowanie formatu Musepack (MPC). -Po zainstalowaniu nale¿y uruchomiæ ponownie MOC. +%description musepack -l hu.UTF-8 +Ez a csomag a Musepack (MPC) dekódert tartalmazza. A telepítés után a +MOC lejátsztót újra kell indítani. + +%description musepack -l pl.UTF-8 +Ten pakiet zawiera dekodowanie formatu Musepack (MPC). Po +zainstalowaniu należy uruchomić ponownie MOC. %package ogg Summary: Ogg decoder for MoC - Music on Console -Summary(pl): Dekoder Ogg dla MOC +Summary(hu.UTF-8): Ogg dekóder MOC-hoz +Summary(pl.UTF-8): Dekoder Ogg dla MOC Group: Applications/Sound Requires: %{name} = %{version}-%{release} Provides: %{name}-input = %{version}-%{release} %description ogg -This package contains the Ogg decoder. -After install you should reload MOC player. +This package contains the Ogg decoder. After install you should reload +MOC player. + +%description ogg -l hu.UTF-8 +Ez a csomag az Ogg dekódert tartalmazza. A telepítés után a MOC +lejátsztót újra kell indítani. -%description ogg -l pl -Ten pakiet zawiera dekodowanie formatu Ogg. -Po zainstalowaniu nale¿y uruchomiæ ponownie MOC. +%description ogg -l pl.UTF-8 +Ten pakiet zawiera dekodowanie formatu Ogg. Po zainstalowaniu należy +uruchomić ponownie MOC. %package flac Summary: FLAC decoder for MoC - Music on Console -Summary(pl): Dekoder FLAC dla MOC +Summary(hu.UTF-8): FLAC dekóder MOC-hoz +Summary(pl.UTF-8): Dekoder FLAC dla MOC Group: Applications/Sound Requires: %{name} = %{version}-%{release} Provides: %{name}-input = %{version}-%{release} %description flac -This package contains the FLAC decoder. -After install you should reload MOC player. +This package contains the FLAC decoder. After install you should +reload MOC player. + +%description flac -l hu.UTF-8 +Ez a csomag az FLAC dekódert tartalmazza. A telepítés után a MOC +lejátsztót újra kell indítani. -%description flac -l pl -Ten pakiet zawiera dekodowanie formatu FLAC. -Po zainstalowaniu nale¿y uruchomiæ ponownie MOC. +%description flac -l pl.UTF-8 +Ten pakiet zawiera dekodowanie formatu FLAC. Po zainstalowaniu należy +uruchomić ponownie MOC. %package ffmpeg Summary: ffmpeg decoder for MoC - Music on Console -Summary(pl): Dekoder ffmpeg dla MOC +Summary(hu.UTF-8): ffmpeg dekóder MOC-hoz +Summary(pl.UTF-8): Dekoder ffmpeg dla MOC Group: Applications/Sound Requires: %{name} = %{version}-%{release} Provides: %{name}-input = %{version}-%{release} %description ffmpeg -This package contains module to decode WMA (and others) -files. -After install you should reload MOC player. +This package contains module to decode WMA (and others) files. After +install you should reload MOC player. -%description ffmpeg -l pl -Ten pakiet zawiera modu³ dekoduj±cy pliki w formacie WMA (i nie tylko) -Po zainstalowaniu nale¿y uruchomiæ ponownie MOC. +%description ffmpeg -l hu.UTF-8 +Ez a csomag az ffmpeg dekódert tartalmazza. A telepítés után a MOC +lejátsztót újra kell indítani. + +%description ffmpeg -l pl.UTF-8 +Ten pakiet zawiera moduł dekodujący pliki w formacie WMA (i nie tylko) +Po zainstalowaniu należy uruchomić ponownie MOC. %package sndfile Summary: Decoder of the sndfile formats for MoC - Music on Console -Summary(pl): Dekoder plików WAV/AIFF +Summary(hu.UTF-8): sndfile dekóder MOC-hoz +Summary(pl.UTF-8): Dekoder plików WAV/AIFF Group: Applications/Sound Requires: %{name} = %{version}-%{release} Provides: %{name}-input = %{version}-%{release} %description sndfile -This package contains the decoders of sndfile. -After install you should reload MOC player. +This package contains the decoders of sndfile. After install you +should reload MOC player. + +%description sndfile -l hu.UTF-8 +Ez a csomag az sndfile dekódert tartalmazza. A telepítés után a MOC +lejátsztót újra kell indítani. -%description sndfile -l pl -Ten pakiet zapewnia dekodowanie plików WAV/AIFF. -Po zainstalowaniu nale¿y uruchomiæ ponownie MOC. +%description sndfile -l pl.UTF-8 +Ten pakiet zapewnia dekodowanie plików WAV/AIFF. Po zainstalowaniu +należy uruchomić ponownie MOC. %package speex Summary: Speex decoder for MoC - Music on Console -Summary(pl): Dekoder formatu Speex dla MOC +Summary(hu.UTF-8): Speex dekóder MOC-hoz +Summary(pl.UTF-8): Dekoder formatu Speex dla MOC Group: Applications/Sound Requires: %{name} = %{version}-%{release} Provides: %{name}-input = %{version}-%{release} %description speex -This package contains the Speex decoder. -After install you should reload MOC player. +This package contains the Speex decoder. After install you should +reload MOC player. + +%description speex -l hu.UTF-8 +Ez a csomag az speex dekódert tartalmazza. A telepítés után a MOC +lejátsztót újra kell indítani. -%description speex -l pl -Ten pakiet zapewnia dekodowanie formatu Speex. -Po zainstalowaniu nale¿y uruchomiæ ponownie MOC. +%description speex -l pl.UTF-8 +Ten pakiet zapewnia dekodowanie formatu Speex. Po zainstalowaniu +należy uruchomić ponownie MOC. %prep %setup -q %{?with_home_etc:%patch0 -p1} + +rm -rf libltdl +%{__sed} -i -e '/SUBDIRS/ s/libltdl//' Makefile.am +%{__sed} -i -e ' + /LT_CONFIG_LTDL_DIR/d + /LT_INIT/d + /LTDL_INIT/d + /AC_CONFIG_AUX_DIR/d + /AC_CONFIG_MACRO_DIR/d +' configure.in + %build CFLAGS="-I/usr/include/ncurses %{rpmcflags}" +%{__libtoolize} %{__aclocal} -I m4 %{__autoconf} %{__automake} %configure \ - --disable-debug + --disable-debug -%{__make} +%{__make} \ + LIBLTDL=-lltdl %install rm -rf $RPM_BUILD_ROOT @@ -204,7 +261,7 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_decoder_plugins}/libflac_decoder.so* %files ffmpeg -%defattr(664,root,root,755) +%defattr(644,root,root,755) %attr(755,root,root) %{_decoder_plugins}/libffmpeg_decoder.so %files mp3