0.2.61. ggi disabled. mmx optimalizations. stb

Changed files:
    vlc.spec -> 1.5

diff --git a/vlc.spec b/vlc.spec
index 2a5191904921f5be2066da65fb7de46447571c7c..94f43991370a16bb0705a6947e57db6a412e9b38 100644 (file)
--- a/vlc.spec
+++ b/vlc.spec
@@ -1,18 +1,19 @@
 Summary:       VideoLAN Client
+Summary(pl):   Klient VideoLAN
 Name:          vlc
-Version:       0.1.99i
-Release:       2
+Version:       0.2.61
+Release:       1
 License:       GPL
 Group:         X11/Applications/Multimedia
 Group(de):     X11/Applikationen/Multimedia
 Group(pl):     X11/Aplikacje/Multimedia
 Source0:       http://www.videolan.org/packages/%{version}/%{name}-%{version}.tar.bz2
-Patch0:                %{name}-CFLAGS.patch
-Patch1:                %{name}-SDL.patch
-Patch2:                %{name}-DESTDIR.patch
+Patch0:                %{name}-DESTDIR.patch
+Patch1:                %{name}-newapi.patch
+Patch2:                %{name}-SDL.patch
 URL:           http://www.videolan.org/
 BuildRequires: gnome-libs-devel
-BuildRequires: libggi-devel
+#BuildRequires:        libggi-devel
 BuildRequires: esound-devel
 BuildRequires: SDL-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -20,15 +21,21 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _prefix         /usr/X11R6
 %define                _mandir         %{_prefix}/man
 
-%description
 %description
 VideoLAN is a free MPEG2 software solution.
 
 The VideoLAN Client allows to play MPEG2 Transport Streams from the
 network or from a file, as well as direct DVD playback.
 
+%description -l pl
+VideoLAN jest darmowym rozwi±zaniem dla streamingu MPEG2.
+
+Klient VideoLAN pozwala na odtwarzanie strumienia MPEG2 z sieci lub z
+pliku jak równie¿ bezpo¶rednie odtwarzanie z DVD.
+
 %package X11
 Summary:       VideoLAN Client - X11 output plugin
+Summary(pl):   Klient VideoLAN - plugin dla X11
 Group:         X11/Applications/Multimedia
 Group(de):     X11/Applikationen/Multimedia
 Group(pl):     X11/Aplikacje/Multimedia
@@ -37,18 +44,26 @@ Requires:   %{name} = %{version}
 %description X11
 X11 output plugin for VideoLAN Client
 
-%package GGI
-Summary:       VideoLAN Client - GGI output plugin
-Group:         X11/Applications/Multimedia
-Group(de):     X11/Applikationen/Multimedia
-Group(pl):     X11/Aplikacje/Multimedia
-Requires:      %{name} = %{version}
-   
-%description GGI
-GGI output plugin for VideoLAN Client.
+%description -l pl X11
+Plugin X11 dla Klienta VideoLAN
+
+#%package GGI
+#Summary:      VideoLAN Client - GGI output plugin
+#Summary(pl):  Klient VideoLAN - plugin GGI
+#Group:                X11/Applications/Multimedia
+#Group(de):    X11/Applikationen/Multimedia
+#Group(pl):    X11/Aplikacje/Multimedia
+#Requires:     %{name} = %{version}
+#
+#%description GGI
+#GGI output plugin for VideoLAN Client.
+#
+#%description -l pl GGI
+#Plugin GGI dla Klienta VideoLAN.
 
 %package SDL
 Summary:       VideoLAN Client - SDL output plugin
+Summary(pl):   Klient VideoLAN - plugin SDL
 Group:         X11/Applications/Multimedia
 Group(de):     X11/Applikationen/Multimedia
 Group(pl):     X11/Aplikacje/Multimedia
@@ -57,8 +72,12 @@ Requires:    %{name} = %{version}
 %description SDL
 SDL output plugin for VideoLAN Client.
 
+%description -l pl SDL
+Plugin SDL dla Klienta VideoLAN.
+
 %package gnome
 Summary:       VideoLAN Client - gnome output plugin
+Summary(pl):   Klient VideoLAN - plugin gnome
 Group:         X11/Applications/Multimedia
 Group(de):     X11/Applikationen/Multimedia
 Group(pl):     X11/Aplikacje/Multimedia
@@ -67,8 +86,12 @@ Requires:    %{name} = %{version}
 %description gnome
 Gnome output plugin for VideoLAN Client.
 
+%description -l pl gnome
+Plugin gnome dla Klienta VideoLAN.
+
 %package esd
 Summary:       VideoLAN Client - esound output plugin
+Summary(pl):   Klient VideoLAN - plugin esound
 Group:         X11/Applications/Multimedia
 Group(de):     X11/Applikationen/Multimedia
 Group(pl):     X11/Aplikacje/Multimedia
@@ -77,6 +100,9 @@ Requires:    %{name} = %{version}
 %description esd
 Esd output plugin for VideoLAN Client.
 
+%description -l pl esd
+Plugin esd dla Klienta VideoLAN.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -84,21 +110,28 @@ Esd output plugin for VideoLAN Client.
 %patch2 -p1
 
 %build
+autoconf
+# ggi disabled becaue it's still not ported to new API
 %configure \
 %ifarch i586 i686
        --enable-mmx \
+%ifarch i686
+       --enable-ppro \
+%endif
 %else
        --disable-mmx \
+       --disable-ppro \
 %endif
        --enable-dummy \
        --enable-dsp \
        --enable-esd \
        --enable-fb \
-       --enable-ggi \
+       --disable-ggi \
        --enable-sdl \
        --disable-glide \
        --enable-gnome \
-       --enable-x11
+       --enable-x11 \
+       --disable-optimizations # we use own RPM_OPT_FLAGS optimalizations
        
 %{__make}
 
@@ -122,7 +155,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/videolan/vlc/dsp.so
 %attr(755,root,root) %{_libdir}/videolan/vlc/dummy.so
 %attr(755,root,root) %{_libdir}/videolan/vlc/fb.so
-%attr(755,root,root) %{_libdir}/videolan/vlc/yuv*.so
+%attr(755,root,root) %{_libdir}/videolan/vlc/yuv.so
+%ifarch i586 i686
+%attr(755,root,root) %{_libdir}/videolan/vlc/*mmx*.so
+%endif
 %dir %{_datadir}/videolan
 %{_datadir}/videolan/*.psf
 %{_datadir}/videolan/vlc.png
@@ -131,9 +167,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/videolan/vlc/x11.so
 
-%files GGI
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/videolan/vlc/ggi.so
+#%files GGI
+#%defattr(644,root,root,755)
+#%attr(755,root,root) %{_libdir}/videolan/vlc/ggi.so
 
 %files SDL
 %defattr(644,root,root,755)