* Fri Feb 8 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.10.1-1

- 1.1.10.1 (security update, #431541).
This commit is contained in:
Ville Skyttä 2008-02-08 19:46:29 +00:00
parent ba4214cf25
commit 05ea833ad6
5 changed files with 106 additions and 162 deletions

View File

@ -1,2 +1,2 @@
xine-lib-1.1.10-pruned.tar.bz2
xine-lib-1.1.10-autotools.patch.bz2
xine-lib-1.1.10.1-pruned.tar.bz2
xine-lib-1.1.10.1-autotools.patch.bz2

View File

@ -1,2 +1,2 @@
4989b50fd279ed69b03816233cefa657 xine-lib-1.1.10-pruned.tar.bz2
8bc0516867b8032729a298b0dfe77527 xine-lib-1.1.10-autotools.patch.bz2
3e78ed0690314436b0a74d1d11535fea xine-lib-1.1.10.1-pruned.tar.bz2
b7e702d0bd235e7102efaa11caea2895 xine-lib-1.1.10.1-autotools.patch.bz2

View File

@ -1,40 +0,0 @@
--- misc/xine-config.in~ 2007-04-05 01:18:00.000000000 +0300
+++ misc/xine-config.in 2007-04-11 01:32:44.000000000 +0300
@@ -2,8 +2,8 @@
#
#
-prefix=@XINE_CONFIG_PREFIX@
-exec_prefix=@exec_prefix@
+prefix=$(pkg-config libxine --variable=prefix)
+exec_prefix=$(pkg-config libxine --variable=exec_prefix)
exec_prefix_set=no
usage()
@@ -54,7 +54,7 @@
echo_exec_prefix=yes
;;
--version)
- echo @XINE_MAJOR@.@XINE_MINOR@.@XINE_SUB@
+ pkg-config libxine --modversion
;;
--acflags)
echo_acflags=yes
@@ -100,14 +100,14 @@
fi
if test "$echo_cflags" = "yes"; then
- echo -I@includedir@ @PTHREAD_CFLAGS@
+ pkg-config libxine --cflags
fi
if test "$echo_libs" = "yes"; then
- echo -L@libdir@ -lxine @ZLIB_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@ @LIBICONV@ @RT_LIBS@
+ pkg-config libxine --libs
fi
if test "$echo_plugindir" = "yes"; then
- echo "@XINE_PLUGINPATH@"
+ echo "$(pkg-config libxine --variable=libdir)/xine/plugins/$(pkg-config libxine --modversion)"
fi
if test "$echo_datadir" = "yes"; then
echo "@XINE_DATADIR@"

View File

@ -1,19 +0,0 @@
http://thread.gmane.org/gmane.comp.video.xine.devel/17682
diff -up xine-lib-1.1.9.1/src/xine-engine/audio_out.c~ xine-lib-1.1.9.1/src/xine-engine/audio_out.c
--- xine-lib-1.1.9.1/src/xine-engine/audio_out.c~ 2008-01-01 15:30:09.000000000 +0200
+++ xine-lib-1.1.9.1/src/xine-engine/audio_out.c 2008-01-20 11:46:40.000000000 +0200
@@ -1612,11 +1612,13 @@ static void ao_close(xine_audio_port_t *
xprintf (this->xine, XINE_VERBOSITY_DEBUG, "audio_out: no streams left, closing driver\n");
if (this->audio_loop_running) {
+#if 0
if (this->clock->speed == XINE_SPEED_PAUSE ||
(this->clock->speed != XINE_FINE_SPEED_NORMAL && !this->slow_fast_audio)) {
/* discard buffers, otherwise we'll wait forever */
ao_set_property(this_gen, AO_PROP_DISCARD_BUFFERS, 1);
}
+#endif
/* make sure there are no more buffers on queue */
fifo_wait_empty(this->out_fifo);
}

View File

@ -33,8 +33,8 @@
Summary: Xine library
Name: xine-lib
Version: 1.1.10
Release: 2%{?dist}
Version: 1.1.10.1
Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://xinehq.de/
@ -241,136 +241,136 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man5/xine.5*
%dir %{_libdir}/xine/
%dir %{_libdir}/xine/plugins/
%dir %{_libdir}/xine/plugins/%{version}/
%{_libdir}/xine/plugins/%{version}/mime.types
%dir %{_libdir}/xine/plugins/*/
%{_libdir}/xine/plugins/*/mime.types
# Listing every plugin separately for better control over binary packages
# containing exactly the plugins we want, nothing accidentally snuck in
# nor dropped.
%dir %{_libdir}/xine/plugins/%{version}/post/
%{_libdir}/xine/plugins/%{version}/post/xineplug_post_audio_filters.so
%{_libdir}/xine/plugins/%{version}/post/xineplug_post_goom.so
%{_libdir}/xine/plugins/%{version}/post/xineplug_post_mosaico.so
%{_libdir}/xine/plugins/%{version}/post/xineplug_post_switch.so
%{_libdir}/xine/plugins/%{version}/post/xineplug_post_visualizations.so
%dir %{_libdir}/xine/plugins/*/post/
%{_libdir}/xine/plugins/*/post/xineplug_post_audio_filters.so
%{_libdir}/xine/plugins/*/post/xineplug_post_goom.so
%{_libdir}/xine/plugins/*/post/xineplug_post_mosaico.so
%{_libdir}/xine/plugins/*/post/xineplug_post_switch.so
%{_libdir}/xine/plugins/*/post/xineplug_post_visualizations.so
%if %{have_vidix}
%dir %{_libdir}/xine/plugins/%{version}/vidix/
%{_libdir}/xine/plugins/%{version}/vidix/cyberblade_vid.so
%{_libdir}/xine/plugins/%{version}/vidix/mach64_vid.so
%{_libdir}/xine/plugins/%{version}/vidix/mga_crtc2_vid.so
%{_libdir}/xine/plugins/%{version}/vidix/mga_vid.so
%{_libdir}/xine/plugins/%{version}/vidix/nvidia_vid.so
%{_libdir}/xine/plugins/%{version}/vidix/pm2_vid.so
%{_libdir}/xine/plugins/%{version}/vidix/pm3_vid.so
%{_libdir}/xine/plugins/%{version}/vidix/radeon_vid.so
%{_libdir}/xine/plugins/%{version}/vidix/rage128_vid.so
%{_libdir}/xine/plugins/%{version}/vidix/savage_vid.so
%{_libdir}/xine/plugins/%{version}/vidix/sis_vid.so
%{_libdir}/xine/plugins/%{version}/vidix/unichrome_vid.so
%dir %{_libdir}/xine/plugins/*/vidix/
%{_libdir}/xine/plugins/*/vidix/cyberblade_vid.so
%{_libdir}/xine/plugins/*/vidix/mach64_vid.so
%{_libdir}/xine/plugins/*/vidix/mga_crtc2_vid.so
%{_libdir}/xine/plugins/*/vidix/mga_vid.so
%{_libdir}/xine/plugins/*/vidix/nvidia_vid.so
%{_libdir}/xine/plugins/*/vidix/pm2_vid.so
%{_libdir}/xine/plugins/*/vidix/pm3_vid.so
%{_libdir}/xine/plugins/*/vidix/radeon_vid.so
%{_libdir}/xine/plugins/*/vidix/rage128_vid.so
%{_libdir}/xine/plugins/*/vidix/savage_vid.so
%{_libdir}/xine/plugins/*/vidix/sis_vid.so
%{_libdir}/xine/plugins/*/vidix/unichrome_vid.so
%endif # vidix
%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_alsa.so
%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_file.so
%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_none.so
%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_oss.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_bitplane.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_gsm610.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_lpcm.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_mpc.so
%{_libdir}/xine/plugins/*/xineplug_ao_out_alsa.so
%{_libdir}/xine/plugins/*/xineplug_ao_out_file.so
%{_libdir}/xine/plugins/*/xineplug_ao_out_none.so
%{_libdir}/xine/plugins/*/xineplug_ao_out_oss.so
%{_libdir}/xine/plugins/*/xineplug_decode_bitplane.so
%{_libdir}/xine/plugins/*/xineplug_decode_gsm610.so
%{_libdir}/xine/plugins/*/xineplug_decode_lpcm.so
%{_libdir}/xine/plugins/*/xineplug_decode_mpc.so
%ifarch %ix86
%{_libdir}/xine/plugins/%{version}/xineplug_decode_qt.so
%{_libdir}/xine/plugins/*/xineplug_decode_qt.so
%endif # ix86
%{_libdir}/xine/plugins/%{version}/xineplug_decode_real.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_rgb.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_speex.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_spu.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_spucc.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_spucmml.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_spudvb.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_sputext.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_theora.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_vorbis.so
%{_libdir}/xine/plugins/*/xineplug_decode_real.so
%{_libdir}/xine/plugins/*/xineplug_decode_rgb.so
%{_libdir}/xine/plugins/*/xineplug_decode_speex.so
%{_libdir}/xine/plugins/*/xineplug_decode_spu.so
%{_libdir}/xine/plugins/*/xineplug_decode_spucc.so
%{_libdir}/xine/plugins/*/xineplug_decode_spucmml.so
%{_libdir}/xine/plugins/*/xineplug_decode_spudvb.so
%{_libdir}/xine/plugins/*/xineplug_decode_sputext.so
%{_libdir}/xine/plugins/*/xineplug_decode_theora.so
%{_libdir}/xine/plugins/*/xineplug_decode_vorbis.so
%ifarch %ix86
%{_libdir}/xine/plugins/%{version}/xineplug_decode_w32dll.so
%{_libdir}/xine/plugins/*/xineplug_decode_w32dll.so
%endif # ix86
%{_libdir}/xine/plugins/%{version}/xineplug_decode_yuv.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_audio.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_avi.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_fli.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_flv.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_games.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_iff.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_image.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_matroska.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_mng.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_nsv.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_ogg.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_pva.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_qt.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_rawdv.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_real.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_slave.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_sputext.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_yuv_frames.so
%{_libdir}/xine/plugins/%{version}/xineplug_flac.so
%{_libdir}/xine/plugins/%{version}/xineplug_inp_cdda.so
%{_libdir}/xine/plugins/%{version}/xineplug_inp_dvb.so
%{_libdir}/xine/plugins/%{version}/xineplug_inp_file.so
%{_libdir}/xine/plugins/%{version}/xineplug_inp_http.so
%{_libdir}/xine/plugins/%{version}/xineplug_inp_net.so
%{_libdir}/xine/plugins/%{version}/xineplug_inp_pnm.so
%{_libdir}/xine/plugins/%{version}/xineplug_inp_pvr.so
%{_libdir}/xine/plugins/%{version}/xineplug_inp_rtp.so
%{_libdir}/xine/plugins/%{version}/xineplug_inp_rtsp.so
%{_libdir}/xine/plugins/%{version}/xineplug_inp_stdin_fifo.so
%{_libdir}/xine/plugins/%{version}/xineplug_inp_v4l.so
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_fb.so
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_none.so
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_opengl.so
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_syncfb.so
%{_libdir}/xine/plugins/*/xineplug_decode_yuv.so
%{_libdir}/xine/plugins/*/xineplug_dmx_audio.so
%{_libdir}/xine/plugins/*/xineplug_dmx_avi.so
%{_libdir}/xine/plugins/*/xineplug_dmx_fli.so
%{_libdir}/xine/plugins/*/xineplug_dmx_flv.so
%{_libdir}/xine/plugins/*/xineplug_dmx_games.so
%{_libdir}/xine/plugins/*/xineplug_dmx_iff.so
%{_libdir}/xine/plugins/*/xineplug_dmx_image.so
%{_libdir}/xine/plugins/*/xineplug_dmx_matroska.so
%{_libdir}/xine/plugins/*/xineplug_dmx_mng.so
%{_libdir}/xine/plugins/*/xineplug_dmx_nsv.so
%{_libdir}/xine/plugins/*/xineplug_dmx_ogg.so
%{_libdir}/xine/plugins/*/xineplug_dmx_pva.so
%{_libdir}/xine/plugins/*/xineplug_dmx_qt.so
%{_libdir}/xine/plugins/*/xineplug_dmx_rawdv.so
%{_libdir}/xine/plugins/*/xineplug_dmx_real.so
%{_libdir}/xine/plugins/*/xineplug_dmx_slave.so
%{_libdir}/xine/plugins/*/xineplug_dmx_sputext.so
%{_libdir}/xine/plugins/*/xineplug_dmx_yuv_frames.so
%{_libdir}/xine/plugins/*/xineplug_flac.so
%{_libdir}/xine/plugins/*/xineplug_inp_cdda.so
%{_libdir}/xine/plugins/*/xineplug_inp_dvb.so
%{_libdir}/xine/plugins/*/xineplug_inp_file.so
%{_libdir}/xine/plugins/*/xineplug_inp_http.so
%{_libdir}/xine/plugins/*/xineplug_inp_net.so
%{_libdir}/xine/plugins/*/xineplug_inp_pnm.so
%{_libdir}/xine/plugins/*/xineplug_inp_pvr.so
%{_libdir}/xine/plugins/*/xineplug_inp_rtp.so
%{_libdir}/xine/plugins/*/xineplug_inp_rtsp.so
%{_libdir}/xine/plugins/*/xineplug_inp_stdin_fifo.so
%{_libdir}/xine/plugins/*/xineplug_inp_v4l.so
%{_libdir}/xine/plugins/*/xineplug_vo_out_fb.so
%{_libdir}/xine/plugins/*/xineplug_vo_out_none.so
%{_libdir}/xine/plugins/*/xineplug_vo_out_opengl.so
%{_libdir}/xine/plugins/*/xineplug_vo_out_syncfb.so
%if %{have_vidix}
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_vidix.so
%{_libdir}/xine/plugins/*/xineplug_vo_out_vidix.so
%endif # vidix
%if %{with_xcb}
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbshm.so
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbxv.so
%{_libdir}/xine/plugins/*/xineplug_vo_out_xcbshm.so
%{_libdir}/xine/plugins/*/xineplug_vo_out_xcbxv.so
%endif # xcb
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xshm.so
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xv.so
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xvmc.so
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xxmc.so
%{_libdir}/xine/plugins/*/xineplug_vo_out_xshm.so
%{_libdir}/xine/plugins/*/xineplug_vo_out_xv.so
%{_libdir}/xine/plugins/*/xineplug_vo_out_xvmc.so
%{_libdir}/xine/plugins/*/xineplug_vo_out_xxmc.so
%if %{with_wpack}
%{_libdir}/xine/plugins/%{version}/xineplug_wavpack.so
%{_libdir}/xine/plugins/*/xineplug_wavpack.so
%endif # wpack
%files arts
%defattr(-,root,root,-)
%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_arts.so
%{_libdir}/xine/plugins/*/xineplug_ao_out_arts.so
%files extras
%defattr(-,root,root,-)
%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_esd.so
%{_libdir}/xine/plugins/*/xineplug_ao_out_esd.so
%if %{with_jack}
%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_jack.so
%{_libdir}/xine/plugins/*/xineplug_ao_out_jack.so
%endif # jack
%if %{with_pa}
%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_pulseaudio.so
%{_libdir}/xine/plugins/*/xineplug_ao_out_pulseaudio.so
%endif # pa
%{_libdir}/xine/plugins/%{version}/xineplug_decode_gdk_pixbuf.so
%{_libdir}/xine/plugins/*/xineplug_decode_gdk_pixbuf.so
%if 0%{!?_without_imagemagick:1}
%{_libdir}/xine/plugins/%{version}/xineplug_decode_image.so
%{_libdir}/xine/plugins/*/xineplug_decode_image.so
%endif # imagemagick
%{_libdir}/xine/plugins/%{version}/xineplug_inp_gnome_vfs.so
%{_libdir}/xine/plugins/%{version}/xineplug_inp_smb.so
%{_libdir}/xine/plugins/*/xineplug_inp_gnome_vfs.so
%{_libdir}/xine/plugins/*/xineplug_inp_smb.so
%if %{with_aalib}
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_aa.so
%{_libdir}/xine/plugins/*/xineplug_vo_out_aa.so
%endif # aalib
%if %{with_caca}
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_caca.so
%{_libdir}/xine/plugins/*/xineplug_vo_out_caca.so
%endif # caca
%if 0%{!?_without_directfb:1}
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_directfb.so
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xdirectfb.so
%{_libdir}/xine/plugins/*/xineplug_vo_out_directfb.so
%{_libdir}/xine/plugins/*/xineplug_vo_out_xdirectfb.so
%endif # directfb
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_sdl.so
%{_libdir}/xine/plugins/*/xineplug_vo_out_sdl.so
%files devel
%defattr(-,root,root,-)
@ -385,6 +385,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Fri Feb 8 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.10.1-1
- 1.1.10.1 (security update, #431541).
* Sun Jan 27 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.10-2
- Include spu, spucc, and spucmml decoders (#213597).