Author: glen Date: Wed Jul 12 07:13:54 2006 GMT Module: SPECS Tag: AC-branch ---- Log message: - merge 1.1.2 update from HEAD fixes CVE-2005-4048 CVE-2006-1664 CVE-2006-2802
---- Files affected: SPECS: xine-lib.spec (1.165.2.4 -> 1.165.2.5) ---- Diffs: ================================================================ Index: SPECS/xine-lib.spec diff -u SPECS/xine-lib.spec:1.165.2.4 SPECS/xine-lib.spec:1.165.2.5 --- SPECS/xine-lib.spec:1.165.2.4 Sun Jun 11 21:42:10 2006 +++ SPECS/xine-lib.spec Wed Jul 12 09:13:48 2006 @@ -1,4 +1,6 @@ # $Revision$, $Date$ +# TODO +# - --with-external-ffmpeg # # Conditional build: %bcond_without aalib # don't build aalib video output plugin @@ -9,9 +11,11 @@ %bcond_without dxr3 # don't build dxr3 video output and decode plugins %bcond_without dvd # don't build dvdnav stuff %bcond_without esd # don't build EsounD audio output plugin +%bcond_without fusionsound # don't build FusionSound audio output plugin +%bcond_without gdkpixbuf # don't build gdk-pixbuf decode plugin %bcond_without gnome # don't build gnome_vfs input plugin %bcond_without opengl # don't build OpenGL video output plugin -%bcond_with polypaudio # don't build polypaudio output plugin +%bcond_with polypaudio # build polypaudio output plugin %bcond_without samba # don't build SMB input plugin %bcond_without sdl # don't build SDL video output plugin %bcond_without stk # don't build stk video output plugin @@ -26,21 +30,23 @@ Summary(pl): Odtwarzacz filmów Summary(pt_BR): Xine, um player de video Name: xine-lib -Version: 1.1.1 -Release: 6 +Version: 1.1.2 +Release: 1 Epoch: 2 License: GPL Group: Libraries -Source0: http://dl.sourceforge.net/xine/%{name}-%{version}.tar.gz -# Source0-md5: b1f42602c776bb93e3cbf127e220cbfd +Source0: http://dl.sourceforge.net/xine/%{name}-%{version}.tar.bz2 +# Source0-md5: c4dd262c47caae6f428eb902ac8ec0e8 Patch0: %{name}-syncfb.patch Patch1: %{name}-nolibs.patch Patch2: %{name}-sparc.patch Patch3: %{name}-win32-path.patch URL: http://xine.sourceforge.net/ %{?with_directfb:BuildRequires: DirectFB-devel >= 0.9.22} +%{?with_fusionsound:BuildRequires: FusionSound-devel >= 0.9.23} BuildRequires: ImageMagick-devel -%{?with_opengl:BuildRequires: OpenGL-devel} +%{?with_opengl:BuildRequires: OpenGL-GLU-devel} +%{?with_opengl:BuildRequires: OpenGL-glut-devel} %{?with_sdl:BuildRequires: SDL-devel >= 1.1.5} %{?with_aalib:BuildRequires: aalib-devel >= 1.3} %{?with_alsa:BuildRequires: alsa-lib-devel >= 0.9.0} @@ -50,8 +56,8 @@ %{?with_esd:BuildRequires: esound-devel >= 0.2.8} BuildRequires: flac-devel BuildRequires: gettext-devel -%{?with_opengl:BuildRequires: glut-devel} %{?with_gnome:BuildRequires: gnome-vfs2-devel} +%{?with_gdkpixbuf:BuildRequires: gtk+2-devel >= 2.0} BuildRequires: libXvMCW-devel %{?with_caca:BuildRequires: libcaca-devel} BuildRequires: libcdio-devel >= 0.72 @@ -62,10 +68,11 @@ BuildRequires: libpng-devel %{?with_samba:BuildRequires: libsmbclient-devel} %{?with_stk:BuildRequires: libstk-devel >= 0.2.0} -BuildRequires: libvorbis-devel BuildRequires: libtheora-devel BuildRequires: libtool >= 0:1.4.2-9 +BuildRequires: libvorbis-devel BuildRequires: pkgconfig +%{?with_polypaudio:BuildRequires: polypaudio-devel < 0.8} %{?with_polypaudio:BuildRequires: polypaudio-devel >= 0.6} #%{?with_dxr3:BuildRequires: rte-devel} # only 0.4 supported BuildRequires: speex-devel >= 1:1.1.6 @@ -82,6 +89,8 @@ %define _pluginsdir %{_libdir}/xine/plugins/%{version} +%define specflags -fomit-frame-pointer + %description xine is a free gpl-licensed video player for unix-like systems. We support mpeg-2 and mpeg-1 system (audio + video multiplexed) streams, @@ -155,6 +164,18 @@ %description -n xine-decode-flac -l pl XINE - wtyczka dekodera i demuxera FLAC. +%package -n xine-decode-gdkpixbuf +Summary: XINE - gdk-pixbuf decoder plugin +Summary(pl): XINE - wtyczka dekodera gdk-pixbuf +Group: Libraries +Requires: %{name} = %{epoch}:%{version}-%{release} + +%description -n xine-decode-gdkpixbuf +XINE - gdk-pixbuf decoder plugin. + +%description -n xine-decode-gdkpixbuf -l pl +XINE - wtyczka dekodera gdk-pixbuf. + %package -n xine-decode-ogg Summary: XINE - Ogg/Vorbis, Ogg/Speex, Ogg/Theora decoder plugins Summary(pl): XINE - wtyczki dekoderów Ogg/Vorbis, Ogg/Speex, Ogg/Theora @@ -300,8 +321,8 @@ Summary(pl): XINE - obsługa esd Summary(pt_BR): XINE - suporte a esd Group: Libraries -Provides: xine-plugin-audio = %{epoch}:%{version}-%{release} Requires: %{name} = %{epoch}:%{version}-%{release} +Provides: xine-plugin-audio = %{epoch}:%{version}-%{release} Obsoletes: xine-lib-esd %description -n xine-output-audio-esd @@ -313,6 +334,19 @@ %description -n xine-output-audio-esd -l pt_BR Plugin de audio para o xine, com suporte a esd. +%package -n xine-output-audio-fusionsound +Summary: XINE - FusionSound support +Summary(pl): XINE - obsługa FusionSound +Group: Libraries +Requires: %{name} = %{epoch}:%{version}-%{release} +Provides: xine-plugin-audio = %{epoch}:%{version}-%{release} + +%description -n xine-output-audio-fusionsound +XINE audio output plugin with FusionSound support. + +%description -n xine-output-audio-fusionsound -l pl +Wtyczka wyjścia dźwięku do XINE z obsługą FusionSound. + %package -n xine-output-audio-oss Summary: XINE - OSS/ALSA support Summary(pl): XINE - obsługa OSS/ALSA @@ -353,8 +387,8 @@ Summary(pl): XINE - obsługa Ascii Art Summary(pt_BR): XINE - suporte a aalib Group: Libraries -Provides: xine-plugin-video = %{epoch}:%{version}-%{release} Requires: %{name} = %{epoch}:%{version}-%{release} +Provides: xine-plugin-video = %{epoch}:%{version}-%{release} Obsoletes: xine-lib-aa %description -n xine-output-video-aa @@ -370,8 +404,8 @@ Summary: XINE - accelereted framebuffer support Summary(pl): XINE - obsługa akcelerowanego framebuffera Group: Libraries -Provides: xine-plugin-video = %{epoch}:%{version}-%{release} Requires: %{name} = %{epoch}:%{version}-%{release} +Provides: xine-plugin-video = %{epoch}:%{version}-%{release} Obsoletes: xine-lib-directfb %description -n xine-output-video-directfb @@ -386,8 +420,8 @@ Summary: XINE - DXR3 support Summary(pl): XINE - obsługa DXR3 Group: Libraries -Provides: xine-plugin-video = %{epoch}:%{version}-%{release} Requires: %{name} = %{epoch}:%{version}-%{release} +Provides: xine-plugin-video = %{epoch}:%{version}-%{release} Obsoletes: xine-lib-dxr3 %description -n xine-output-video-dxr3 @@ -400,8 +434,8 @@ Summary: XINE - Color AsCii Art support Summary(pl): XINE - obsługa Color AsCii Art Group: Libraries -Provides: xine-plugin-video = %{epoch}:%{version}-%{release} Requires: %{name} = %{epoch}:%{version}-%{release} +Provides: xine-plugin-video = %{epoch}:%{version}-%{release} %description -n xine-output-video-caca Color AsCii Art output plugin for xine. @@ -413,8 +447,8 @@ Summary: XINE - framebuffer support Summary(pl): XINE - obsługa framebuffera Group: Libraries -Provides: xine-plugin-video = %{epoch}:%{version}-%{release} Requires: %{name} = %{epoch}:%{version}-%{release} +Provides: xine-plugin-video = %{epoch}:%{version}-%{release} Obsoletes: xine-lib-fb %description -n xine-output-video-fb @@ -427,9 +461,8 @@ Summary: XINE - OpenGL video output Summary(pl): XINE - wyświetlanie przez OpenGL Group: Libraries -Provides: xine-plugin-video = %{epoch}:%{version}-%{release} Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: OpenGL +Provides: xine-plugin-video = %{epoch}:%{version}-%{release} Obsoletes: xine-lib-opengl %description -n xine-output-video-opengl @@ -442,8 +475,8 @@ Summary: XINE - SDL output support Summary(pl): XINE - obsługa wyjścia SDL Group: Libraries -Provides: xine-plugin-video = %{epoch}:%{version}-%{release} Requires: %{name} = %{epoch}:%{version}-%{release} +Provides: xine-plugin-video = %{epoch}:%{version}-%{release} Obsoletes: xine-lib-sdl %description -n xine-output-video-sdl @@ -456,9 +489,9 @@ Summary: XINE - STK video output support Summary(pl): XINE - obsługa wyjścia obrazu STK Group: Libraries -Provides: xine-plugin-video = %{epoch}:%{version}-%{release} Requires: %{name} = %{epoch}:%{version}-%{release} Requires: libstk(xine) >= 0.2.0 +Provides: xine-plugin-video = %{epoch}:%{version}-%{release} Obsoletes: xine-lib-sdl %description -n xine-output-video-stk @@ -472,8 +505,8 @@ Summary: XINE - SyncFB (Matrox G200/G400) support Summary(pl): XINE - obsługa SyncFB (Matrox G200/G400) Group: Libraries -Provides: xine-plugin-video = %{epoch}:%{version}-%{release} Requires: %{name} = %{epoch}:%{version}-%{release} +Provides: xine-plugin-video = %{epoch}:%{version}-%{release} Obsoletes: xine-lib-syncfb %description -n xine-output-video-syncfb @@ -487,9 +520,9 @@ %package -n xine-output-video-vidix Summary: XINE - VIDIX video output plugin Summary(pl): XINE - wtyczka wyjścia obrazu VIDIX -Provides: xine-plugin-video = %{epoch}:%{version}-%{release} Group: Libraries Requires: %{name} = %{epoch}:%{version}-%{release} +Provides: xine-plugin-video = %{epoch}:%{version}-%{release} %description -n xine-output-video-vidix XINE video output plugin using VIDIX. @@ -501,8 +534,8 @@ Summary: VIDIX driver for Cyberblade/i1 chips Summary(pl): Sterownik VIDIX dla układów Cyberblade/i1 Group: Libraries -Provides: xine-plugin-video = %{epoch}:%{version}-%{release} Requires: xine-output-video-vidix = %{epoch}:%{version}-%{release} +Provides: xine-plugin-video = %{epoch}:%{version}-%{release} Obsoletes: xine-lib-vidix-cyberblade %description -n xine-output-video-vidix-cyberblade @@ -515,8 +548,8 @@ Summary: VIDIX driver for Mach64 and 3Drage chips Summary(pl): Sterownik VIDIX dla układów Mach64 oraz 3DRage Group: Libraries -Provides: xine-plugin-video = %{epoch}:%{version}-%{release} Requires: xine-output-video-vidix = %{epoch}:%{version}-%{release} +Provides: xine-plugin-video = %{epoch}:%{version}-%{release} Obsoletes: xine-lib-vidix-mach64 %description -n xine-output-video-vidix-mach64 @@ -529,8 +562,8 @@ Summary: VIDIX drivers for Matrox Mga chips Summary(pl): Sterowniki VIDIX dla układów Matrox Mga Group: Libraries -Provides: xine-plugin-video = %{epoch}:%{version}-%{release} Requires: xine-output-video-vidix = %{epoch}:%{version}-%{release} +Provides: xine-plugin-video = %{epoch}:%{version}-%{release} Obsoletes: xine-lib-vidix-matrox %description -n xine-output-video-vidix-matrox @@ -543,8 +576,8 @@ Summary: VIDIX driver for Riva and Riva-derived chips Summary(pl): Sterownik VIDIX dla układów Riva oraz pochodnych Group: Libraries -Provides: xine-plugin-video = %{epoch}:%{version}-%{release} Requires: xine-output-video-vidix = %{epoch}:%{version}-%{release} +Provides: xine-plugin-video = %{epoch}:%{version}-%{release} Obsoletes: xine-lib-vidix-nvidia %description -n xine-output-video-vidix-nvidia @@ -558,8 +591,8 @@ Summary: VIDIX drivers for 3Dlabs GLINT R3 and Permedia chips Summary(pl): Sterowniki VIDIX dla układów 3Dlabs GLINT R3 oraz Permedia Group: Libraries -Provides: xine-plugin-video = %{epoch}:%{version}-%{release} Requires: xine-output-video-vidix = %{epoch}:%{version}-%{release} +Provides: xine-plugin-video = %{epoch}:%{version}-%{release} Obsoletes: xine-lib-vidix-permedia %description -n xine-output-video-vidix-permedia @@ -572,8 +605,8 @@ Summary: VIDIX driver for Radeon chips Summary(pl): Sterownik VIDIX dla układów Radeon Group: Libraries -Provides: xine-plugin-video = %{epoch}:%{version}-%{release} Requires: xine-output-video-vidix = %{epoch}:%{version}-%{release} +Provides: xine-plugin-video = %{epoch}:%{version}-%{release} Obsoletes: xine-lib-vidix-radeon %description -n xine-output-video-vidix-radeon @@ -586,8 +619,8 @@ Summary: VIDIX driver for Rage128 chips Summary(pl): Sterownik VIDIX dla układów Rage128 Group: Libraries -Provides: xine-plugin-video = %{epoch}:%{version}-%{release} Requires: xine-output-video-vidix = %{epoch}:%{version}-%{release} +Provides: xine-plugin-video = %{epoch}:%{version}-%{release} Obsoletes: xine-lib-vidix-rage128 %description -n xine-output-video-vidix-rage128 @@ -600,8 +633,8 @@ Summary: VIDIX driver for S3 Savage chips Summary(pl): Sterownik VIDIX dla układów S3 Savage Group: Libraries -Provides: xine-plugin-video = %{epoch}:%{version}-%{release} Requires: xine-output-video-vidix = %{epoch}:%{version}-%{release} +Provides: xine-plugin-video = %{epoch}:%{version}-%{release} %description -n xine-output-video-vidix-savage VIDIX driver for S3 Savage series chips. @@ -613,8 +646,8 @@ Summary: VIDIX driver for SiS chips Summary(pl): Sterownik VIDIX dla układów SiS Group: Libraries -Provides: xine-plugin-video = %{epoch}:%{version}-%{release} Requires: xine-output-video-vidix = %{epoch}:%{version}-%{release} +Provides: xine-plugin-video = %{epoch}:%{version}-%{release} %description -n xine-output-video-vidix-sis VIDIX driver for SiS 300 and 310/325 series chips. @@ -626,8 +659,8 @@ Summary: VIDIX driver for VIA CLE266 Unichrome chips Summary(pl): Sterownik VIDIX dla układów VIA CLE266 Unichrome Group: Libraries -Provides: xine-plugin-video = %{epoch}:%{version}-%{release} Requires: xine-output-video-vidix = %{epoch}:%{version}-%{release} +Provides: xine-plugin-video = %{epoch}:%{version}-%{release} %description -n xine-output-video-vidix-unichrome VIDIX driver for VIA CLE266 Unichrome chips. @@ -639,8 +672,8 @@ Summary: XINE - XFree XShm support Summary(pl): XINE - obsługa XFree XShm Group: Libraries -Provides: xine-plugin-video = %{epoch}:%{version}-%{release} Requires: %{name} = %{epoch}:%{version}-%{release} +Provides: xine-plugin-video = %{epoch}:%{version}-%{release} Obsoletes: xine-lib-xshm %description -n xine-output-video-xshm @@ -654,8 +687,8 @@ Summary(pl): XINE - obsługa XFree XVideo Summary(pt_BR): XINE - suporte a XFree XVideo Group: Libraries -Provides: xine-plugin-video = %{epoch}:%{version}-%{release} Requires: %{name} = %{epoch}:%{version}-%{release} +Provides: xine-plugin-video = %{epoch}:%{version}-%{release} Obsoletes: xine-lib-xv %description -n xine-output-video-xv @@ -676,7 +709,8 @@ %build %{__libtoolize} -%{__gettextize} +# breaks DOMAIN (modified Makefile.in.in?) +#%%{__gettextize} %{__aclocal} -I m4 %{__autoconf} %{__automake} @@ -686,12 +720,15 @@ %{?with_dxr3:--enable-dxr3} \ %{!?with_dxr3:--disable-dxr3} \ %{?with_directfb:--enable-directfb} \ - %{!?with_polypaudio:--disable-polypaudio} \ + %{?with_fusionsound:--enable-fusionsound} \ + %{!?with_gdkpixbuf:--disable-gdkpixbuf} \ --enable-ipv6 \ %{?with_aalib:--with-aalib-prefix=/usr} \ --with-external-dvdnav \ + %{!?with_polypaudio:--disable-polypaudio} \ --with-w32-path=%{_libdir}/codecs \ - --with-xv-path=/usr/X11R6/%{_lib} + --with-xv-path=/usr/X11R6/%{_lib} \ + --disable-optimizations # we use own RPM_OPT_FLAGS optimalizations %{__make} @@ -706,7 +743,7 @@ # remove useless *.la files rm -f $RPM_BUILD_ROOT%{_pluginsdir}/{,vidix,post}/*.la -%find_lang xine-lib +%find_lang libxine1 %clean rm -rf $RPM_BUILD_ROOT @@ -714,7 +751,7 @@ %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%files -f xine-lib.lang +%files -f libxine1.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog TODO %attr(755,root,root) %{_libdir}/libxine*.so.*.* @@ -807,6 +844,12 @@ %defattr(644,root,root,755) %attr(755,root,root) %{_pluginsdir}/xineplug_flac.so +%if %{with gdkpixbuf} +%files -n xine-decode-gdkpixbuf +%defattr(644,root,root,755) +%attr(755,root,root) %{_pluginsdir}/xineplug_decode_gdk_pixbuf.so +%endif + %files -n xine-decode-ogg %defattr(644,root,root,755) %attr(755,root,root) %{_pluginsdir}/xineplug_decode_speex.so @@ -871,6 +914,12 @@ %attr(755,root,root) %{_pluginsdir}/xineplug_ao_out_esd.so %endif +%if %{with fusionsound} +%files -n xine-output-audio-fusionsound +%defattr(644,root,root,755) +%attr(755,root,root) %{_pluginsdir}/xineplug_ao_out_fusionsound.so +%endif + %files -n xine-output-audio-oss %defattr(644,root,root,755) %attr(755,root,root) %{_pluginsdir}/xineplug_ao_out_oss.so @@ -998,6 +1047,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.165.2.5 2006/07/12 07:13:48 glen +- merge 1.1.2 update from HEAD + fixes CVE-2005-4048 CVE-2006-1664 CVE-2006-2802 + Revision 1.165.2.4 2006/06/11 19:42:10 hawk - temporarily disabled polypaudio bcond, it breaks build due to heavy changes in polypaudio 0.9.x API/ABI ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xine-lib.spec?r1=1.165.2.4&r2=1.165.2.5&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
