Author: shadzik                      Date: Mon Oct 23 00:22:09 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 0.61 stable
- new Source0
- now we use autotools to configure the programm
- added alsa,jack and sdl sound support (sdl detection doesn't seem to work 
properly at the moment so it's off by default)
- removed all patches (they all seem to be obsolete)
- rel 0.1

---- Files affected:
SPECS:
   mpg123.spec (1.60 -> 1.61) 

---- Diffs:

================================================================
Index: SPECS/mpg123.spec
diff -u SPECS/mpg123.spec:1.60 SPECS/mpg123.spec:1.61
--- SPECS/mpg123.spec:1.60      Thu Jun 22 00:10:55 2006
+++ SPECS/mpg123.spec   Mon Oct 23 02:22:03 2006
@@ -2,7 +2,10 @@
 #
 # Conditional build:
 %bcond_with    mmx     # use MMX to decode stream (won't run without MMX)
-%bcond_without esd     # don't build esound subpackage
+%bcond_without esd     # disable esound supprot
+%bcond_without alsa    # disable alsa support
+%bcond_without jack    # disable jack support
+%bcond_with    sdl     # disable sdl support
 #
 Summary:       MPEG audio player
 Summary(es):   Ejecuta archivos MP3
@@ -11,46 +14,19 @@
 Summary(ru):   đŇĎÉÇŇŮ×ÁÔĹĚŘ MPEG ÁŐÄÉĎĆÁĘĚĎ×
 Summary(uk):   đŇĎÇŇÁ×ÁŢ MPEG ÁŐÄŚĎĆÁĘĚŚ×
 Name:          mpg123
-Version:       0.59s
-Release:       0.pre.10
+Version:       0.61
+Release:       0.1
 Group:         Applications/Sound
 License:       freely distributable for non-commercial use, GPL (mpglib)
-Source0:       http://www.mpg123.de/mpg123/%{name}-pre%{version}.tar.gz
-# Source0-md5: a63675b0ea7990d4a7d7e7e14f23a3e4
-Patch0:                %{name}-makefile.patch
-Patch1:                %{name}-esd.patch
-Patch2:                %{name}-audio_sun.patch
-Patch3:                %{name}-security.patch
-Patch4:                %{name}-id3v2-hack.patch
-Patch5:                %{name}-http-overflow.patch
-Patch6:                %{name}-layer2-overflow.patch
-Patch7:                %{name}-bufoverflow.patch
-Patch8:                %{name}-CAN-2004-1284.patch
-Patch9:                %{name}-gcc4.patch
+Source0:       http://dl.sourceforge.net/mpg123/%{name}-%{version}.tar.bz2
+# Source0-md5: 13b505ec04e5afb10399c89f24e99f0e
 URL:           http://www.mpg123.de/
+%{?with_alsa:BuildRequires:    alsa-lib-devel}
 %{?with_esd:BuildRequires:     esound-devel}
+%{?with_jack:BuildRequires:    jack-audio-connection-kit-devel}
+%{?with_sdl:BuildRequires:     SDL_sound-devel}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%ifarch %{ix86}
-%ifarch athlon
-%define                trgt    linux-3dnow
-%else
-%ifarch i586 i686
-%define                trgt    linux%{?with_mmx:-mmx}
-%else
-%define                trgt    linux-i486
-%endif
-%endif
-%else
-%ifarch %{x8664}
-%define                trgt    linux-amd64
-%else
-%define                trgt    linux-%{_target_cpu}
-%endif
-%endif
-
-%define                specflags       -fomit-frame-pointer
-
 %description
 Mpg123 is a fast, free(for non-commercial use) and portable MPEG audio
 player for Unix. It supports MPEG 1.0/2.0 layers 1, 2 and 3 (those
@@ -113,38 +89,145 @@
 
 Wersja z wyjściem na ESD.
 
+%package alsa
+Summary:       mpg123 for ALSA
+Summary(pl):   mpg123 dla ALSA
+Group:         Applications/Sound
+
+%description alsa
+Mpg123 is a fast, free(for non-commercial use) and portable MPEG audio
+player for Unix. It supports MPEG 1.0/2.0 layers 1, 2 and 3 (those
+famous "MP3" files). For full CD quality playback (44 kHz, 16 bit,
+stereo) a Pentium, SPARCstation10, DEC Alpha or similar CPU is
+required. Mono and/or reduced quality playback (22 kHz or 11 kHz) is
+even possible on 486 CPUs.
+
+Version for ALSA output.
+
+%description alsa -l pl
+Mpg123 jest szybkim, darmowym (do celów niekomercyjnych) oraz
+uniwersalnym dekoderem plików dźwiękowych MPEG dla systemów
+uniksowych. Obsługuje standard MPEG 1.0/2.0 warstwy 1, 2 oraz 3
+(słynne "MP3"). Do uzyskania pełnej jakości CD wymagany jest silny
+procesor (Pentium, SPARCstation10, DEC Alpha lub podobny). Niższą
+jakość (22 lub 11 kHz) można uzyskać już na procesorach 486.
+
+Wersja z wyjściem na ALSA.
+
+%package jack
+Summary:       mpg123 for Jack
+Summary(pl):   mpg123 dla Jack
+Group:         Applications/Sound
+
+%description jack
+Mpg123 is a fast, free(for non-commercial use) and portable MPEG audio
+player for Unix. It supports MPEG 1.0/2.0 layers 1, 2 and 3 (those
+famous "MP3" files). For full CD quality playback (44 kHz, 16 bit,
+stereo) a Pentium, SPARCstation10, DEC Alpha or similar CPU is
+required. Mono and/or reduced quality playback (22 kHz or 11 kHz) is
+even possible on 486 CPUs.
+
+Version for Jack output.
+
+%description jack -l pl
+Mpg123 jest szybkim, darmowym (do celów niekomercyjnych) oraz
+uniwersalnym dekoderem plików dźwiękowych MPEG dla systemów
+uniksowych. Obsługuje standard MPEG 1.0/2.0 warstwy 1, 2 oraz 3
+(słynne "MP3"). Do uzyskania pełnej jakości CD wymagany jest silny
+procesor (Pentium, SPARCstation10, DEC Alpha lub podobny). Niższą
+jakość (22 lub 11 kHz) można uzyskać już na procesorach 486.
+
+Wersja z wyjściem na Jack.
+
+%package sdl
+Summary:       mpg123 for SDL
+Summary(pl):   mpg123 dla SDL
+Group:         Applications/Sound
+
+%description sdl
+Mpg123 is a fast, free(for non-commercial use) and portable MPEG audio
+player for Unix. It supports MPEG 1.0/2.0 layers 1, 2 and 3 (those
+famous "MP3" files). For full CD quality playback (44 kHz, 16 bit,
+stereo) a Pentium, SPARCstation10, DEC Alpha or similar CPU is
+required. Mono and/or reduced quality playback (22 kHz or 11 kHz) is
+even possible on 486 CPUs.
+
+Version for SDL output.
+
+%description sdl -l pl
+Mpg123 jest szybkim, darmowym (do celów niekomercyjnych) oraz
+uniwersalnym dekoderem plików dźwiękowych MPEG dla systemów
+uniksowych. Obsługuje standard MPEG 1.0/2.0 warstwy 1, 2 oraz 3
+(słynne "MP3"). Do uzyskania pełnej jakości CD wymagany jest silny
+procesor (Pentium, SPARCstation10, DEC Alpha lub podobny). Niższą
+jakość (22 lub 11 kHz) można uzyskać już na procesorach 486.
+
+Wersja z wyjściem na SDL.
+
 %prep
-%setup -q -n %{name}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p0
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
+%setup -q
 
 %build
-%{__make} %{trgt} \
-       OPT_FLAGS="%{rpmcflags} -DINET6"
+%configure \
+       %{?with_oss:--with-audio=oss} \
+       %{?with_mmx:--with-cpu=mmx}
+%{__make}
+mv -f src/mpg123 src/mpg123.base
+
+%if %{with alsa}
+%configure \
+       %{?with_alsa:--with-audio=alsa} \
+       %{?with_mmx:--with-cpu=mmx}
+%{__make}
+mv -f src/mpg123 src/mpg123-alsa
+%endif
 
-mv -f mpg123 mpg123.base
 %if %{with esd}
-%{__make} clean
-%{__make} %{trgt}-esd \
-       OPT_FLAGS="%{rpmcflags} -DINET6"
+%configure \
+       %{?with_esd:--with-audio=esd} \
+       %{?with_mmx:--with-cpu=mmx}
+%{__make}
+mv -f src/mpg123 src/mpg123-esd
+%endif
+
+%if %{with jack}
+%configure \
+       %{?with_jack:--with-audio=jack} \
+       %{?with_mmx:--with-cpu=mmx}
+%{__make}
+mv -f src/mpg123 src/mpg123-jack
+%endif
+
+%if %{with sdl}
+%configure \
+       %{?with_sdl:--with-audio=sdl} \
+       %{?with_mmx:--with-cpu=mmx}
+%{__make}
+mv -f src/mpg123 src/mpg123-sdl
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}
 
-install %{name}.base   $RPM_BUILD_ROOT%{_bindir}/%{name}
+install src/%{name}.base       $RPM_BUILD_ROOT%{_bindir}/%{name}
+
+%if %{with alsa}
+install src/%{name}-alsa               $RPM_BUILD_ROOT%{_bindir}/
+%endif
+
 %if %{with esd}
-install %{name}                $RPM_BUILD_ROOT%{_bindir}/%{name}-esd
+install src/%{name}-esd                $RPM_BUILD_ROOT%{_bindir}/
 %endif
+
+%if %{with jack}
+install src/%{name}-jack       $RPM_BUILD_ROOT%{_bindir}/
+%endif
+
+%if %{with sdl}
+install src/%{name}-sdl                $RPM_BUILD_ROOT%{_bindir}/
+%endif
+
 install %{name}.1      $RPM_BUILD_ROOT%{_mandir}/man1
 
 %clean
@@ -152,25 +235,51 @@
 
 %files
 %defattr(644,root,root,755)
-%doc BENCHMARKING BUGS CHANGES COPYING JUKEBOX README README.remote TODO
+%doc doc/BENCHMARKING doc/BUGS ChangeLog README doc/README.remote doc/TODO
 %ifarch athlon
-%doc README.3DNOW
+%doc doc/README.3DNOW
 %endif
 %attr(755,root,root) %{_bindir}/%{name}
 %{_mandir}/man1/*
 
+%if %{with alsa}
+%files alsa
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/%{name}-alsa
+%endif
+
 %if %{with esd}
 %files esd
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/%{name}-esd
 %endif
 
+%if %{with jack}
+%files jack
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/%{name}-jack
+%endif
+
+%if %{with sdl}
+%files sdl
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/%{name}-sdl
+%endif
+
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <[EMAIL PROTECTED]>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.61  2006/10/23 00:22:03  shadzik
+- up to 0.61 stable
+- new Source0
+- now we use autotools to configure the programm
+- added alsa,jack and sdl sound support (sdl detection doesn't seem to work 
properly at the moment so it's off by default)
+- removed all patches (they all seem to be obsolete)
+- rel 0.1
+
 Revision 1.60  2006/06/21 22:10:55  pluto
 - minor build fix.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mpg123.spec?r1=1.60&r2=1.61&f=u

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

Reply via email to