rpms/xine-lib/F-8 xine-lib-1.1.15-ansi.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 sources, 1.16, 1.17 xine-lib.spec, 1.38, 1.39 xine-lib-1.1.12-CVE-2008-1878.patch, 1.1, NONE
Rex Dieter
rdieter at fedoraproject.org
Fri Aug 22 18:35:19 UTC 2008
- Previous message (by thread): rpms/hgsvn/devel .cvsignore, 1.2, 1.3 hgsvn.spec, 1.2, 1.3 sources, 1.2, 1.3
- Next message (by thread): rpms/em8300/F-9 .cvsignore, 1.15, 1.16 em8300.spec, 1.20, 1.21 sources, 1.15, 1.16
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/xine-lib/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22001
Modified Files:
.cvsignore sources xine-lib.spec
Added Files:
xine-lib-1.1.15-ansi.patch
Removed Files:
xine-lib-1.1.12-CVE-2008-1878.patch
Log Message:
* Wed Aug 20 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.1.15-1
- xine-lib-1.1.15, plugin ABI 1.24 (rh#455752, CVE-2008-3231)
- Obsoletes: -arts (f9+)
xine-lib-1.1.15-ansi.patch:
--- NEW FILE xine-lib-1.1.15-ansi.patch ---
diff -up xine-lib-1.1.15/src/xine-engine/buffer.h.ansi xine-lib-1.1.15/src/xine-engine/buffer.h
--- xine-lib-1.1.15/src/xine-engine/buffer.h.ansi 2008-07-16 16:01:56.000000000 -0500
+++ xine-lib-1.1.15/src/xine-engine/buffer.h 2008-08-19 12:08:46.000000000 -0500
@@ -676,7 +676,7 @@ void _x_bmiheader_le2me( xine_bmiheader
/* convert xine_waveformatex struct from little endian */
void _x_waveformatex_le2me( xine_waveformatex *wavex ) XINE_PROTECTED;
-static inline _x_is_fourcc(void *ptr, void *tag) {
+static __inline _x_is_fourcc(void *ptr, void *tag) {
return memcmp(ptr, tag, 4) == 0;
}
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-8/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 24 Apr 2008 15:23:09 -0000 1.16
+++ .cvsignore 22 Aug 2008 18:34:49 -0000 1.17
@@ -1,2 +1,2 @@
-xine-lib-1.1.12-pruned.tar.bz2
-xine-lib-1.1.12-autotools.patch.bz2
+xine-lib-1.1.15-autotools.patch.bz2
+xine-lib-1.1.15-pruned.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-8/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 24 Apr 2008 15:23:09 -0000 1.16
+++ sources 22 Aug 2008 18:34:49 -0000 1.17
@@ -1,2 +1,2 @@
-3f918af93f52e486fb8fd4dfec04f98f xine-lib-1.1.12-pruned.tar.bz2
-771565628e4dfcfc8657b1256b9f41ef xine-lib-1.1.12-autotools.patch.bz2
+ffd74ec893a5f1167c69987a68f436fd xine-lib-1.1.15-autotools.patch.bz2
+acdbdc024382afac111eb076304448ed xine-lib-1.1.15-pruned.tar.bz2
Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-8/xine-lib.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- xine-lib.spec 24 Apr 2008 15:23:09 -0000 1.38
+++ xine-lib.spec 22 Aug 2008 18:34:49 -0000 1.39
@@ -2,13 +2,10 @@
# - libstk: http://www.libstk.net/ - probably not, see 1.1.5 ChangeLog
# - drop the opengl video out plugin?
# http://www.redhat.com/archives/fedora-legal-list/2007-August/msg00011.html
-# - move -pulseaudio to main package?
-# http://fedoraproject.org/wiki/Releases/FeaturePulseaudio
-# --> not yet:
-# http://www.redhat.com/archives/fedora-devel-list/2007-August/msg01411.html
# - external dvdnav - not compatible as of 1.1.11 and 4.1.1
+# - deprecate ESD support?
-%define abiver 1.21
+%define abiver 1.24
%define codecdir %{_libdir}/codecs
%ifarch %{ix86}
@@ -29,10 +26,14 @@
%define with_xcb %{?_with_xcb:1}%{!?_with_xcb:0}
%endif # Fedora
+%if 0%{?fedora} > 8
+%define _without_arts --without-arts
+%endif
+
Summary: Xine library
Name: xine-lib
-Version: 1.1.12
-Release: 2%{?dist}
+Version: 1.1.15
+Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://xinehq.de/
@@ -40,15 +41,18 @@
# the script in SOURCE1. It prunes potentially patented code
#Source0: http://downloads.sourceforge.net/xine/xine-lib-%{version}.tar.bz2
Source0: %{name}-%{version}-pruned.tar.bz2
-Source1: %{name}-cleanup-sources.sh
-Source2: %{name}-mk-autotools-patch.sh
+Source1: xine-lib-cleanup-sources.sh
+Source2: xine-lib-mk-autotools-patch.sh
# autotools patch created with source2
Patch0: %{name}-%{version}-autotools.patch.bz2
-Patch1: %{name}-1.1.4-optflags.patch
-Patch6: %{name}-1.1.1-deepbind-939.patch
-Patch7: %{name}-1.1.12-CVE-2008-1878.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1: xine-lib-1.1.4-optflags.patch
+Patch6: xine-lib-1.1.1-deepbind-939.patch
+## upstream patches
+# phonon-xine doesn't compile with xine-lib-1.1.15, http://bugs.kde.org/169365
+Patch100: xine-lib-1.1.15-ansi.patch
+
Provides: xine-lib(plugin-abi) = %{abiver}
# X11
BuildRequires: libX11-devel
@@ -79,27 +83,34 @@
BuildRequires: fontconfig-devel
%endif # freetype
# Audio
-BuildRequires: libogg-devel
-BuildRequires: libvorbis-devel
+BuildRequires: alsa-lib-devel >= 0.9.0
+BuildRequires: esound-devel
BuildRequires: flac-devel
+BuildRequires: jack-audio-connection-kit-devel
BuildRequires: libmodplug-devel
-BuildRequires: esound-devel
-BuildRequires: speex-devel
-BuildRequires: arts-devel
-BuildRequires: alsa-lib-devel >= 0.9.0
BuildRequires: libmpcdec-devel
-BuildRequires: wavpack-devel
+BuildRequires: libvorbis-devel
%if %{with_pa}
BuildRequires: pulseaudio-lib-devel
%endif # pa
-BuildRequires: jack-audio-connection-kit-devel
+BuildRequires: speex-devel
+%if 0%{?_without_arts:1}
+Obsoletes: xine-lib-arts < %{version}-%{release}
+%else
+BuildRequires: arts-devel
+%endif
+BuildRequires: wavpack-devel
# CDs
BuildRequires: libcdio-devel
# Other
BuildRequires: pkgconfig
BuildRequires: gnome-vfs2-devel
BuildRequires: gtk2-devel
+%if 0%{?fedora} > 6 || 0%{?rhel} > 5
BuildRequires: libsmbclient-devel
+%else
+BuildRequires: samba-common
+%endif
%description
This package contains the Xine library. Xine is a free multimedia player.
@@ -120,11 +131,11 @@
%description devel
This package contains development files for xine-lib.
-# TODO: consider removing and/or marking as deprecated for F9+ -- Rex
%package arts
Summary: aRts plugin for xine-lib
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
+#Requires: xine-lib(plugin-abi) = %{abiver}
# -arts was split off the -extras subpackage at 1.1.7-3
Obsoletes: xine-lib-extras < 1.1.7-3
@@ -141,10 +152,12 @@
%description pulseaudio
This package contains the pulseaudio plugin for xine-lib.
+
%package extras
Summary: Additional plugins for xine-lib
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
+#Requires: xine-lib(plugin-abi) = %{abiver}
%description extras
This package contains extra plugins for xine-lib:
@@ -177,7 +190,8 @@
touch -r m4/optimizations.m4.stamp m4/optimizations.m4
# Patch6 needed at least when compiling with external ffmpeg, #939.
%patch6 -p1 -b .deepbind
-%patch7 -p1 -b .CVE-2008-1878
+
+%patch100 -p1 -b .ansi
# Avoid standard rpaths on lib64 archs:
sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
@@ -213,7 +227,7 @@
%if 0%{?_without_imagemagick:1}
--without-imagemagick \
%endif # imagemagick
- --with-arts \
+ %{!?_without_arts:--with-arts} %{?_without_arts} \
--with-wavpack \
--with-real-codecs-path=%{codecdir} \
--with-w32-path=%{codecdir}
@@ -355,15 +369,17 @@
%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xxmc.so
%{_libdir}/xine/plugins/%{abiver}/xineplug_wavpack.so
+%if 0%{!?_without_arts:1}
%files arts
%defattr(-,root,root,-)
%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_arts.so
+%endif
%if %{with_pa}
%files pulseaudio
%defattr(-,root,root,-)
%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_pulseaudio.so
-%endif
+%endif
%files extras
%defattr(-,root,root,-)
@@ -402,20 +418,27 @@
%changelog
+* Wed Aug 20 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.1.15-1
+- xine-lib-1.1.15, plugin ABI 1.24 (rh#455752, CVE-2008-3231)
+- Obsoletes: -arts (f9+)
+
+* Sun Apr 27 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.1.12-3
+- rebuild for new ImageMagick (6.4.0.10)
+
* Thu Apr 24 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.1.12-2
-- CVE-2008-1878 (#443055)
+- CVE-2008-1878
* Wed Apr 16 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.12-1
- 1.1.12 (plugin ABI 1.21); qt, mkv, and pulseaudio patches applied upstream.
-* Mon Apr 9 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.1.11.1-2
-- pulse-rework2 patch (#439731)
-- -pulseaudio subpkg (#439731)
-
-* Wed Apr 9 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.11.1-1.1
+* Wed Apr 9 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.11.1-3
- Apply upstream fixes for Quicktime (#441705) and Matroska regressions
introduced in 1.1.11.1.
+* Mon Apr 07 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.1.11.1-2
+- pulse-rework2 patch (#439731)
+- -pulseaudio subpkg (#439731)
+
* Sun Mar 30 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.11.1-1
- 1.1.11.1 (security update, #438663, CVE-2008-1482).
- Provide versioned xine-lib(plugin-abi) so 3rd party packages installing
--- xine-lib-1.1.12-CVE-2008-1878.patch DELETED ---
- Previous message (by thread): rpms/hgsvn/devel .cvsignore, 1.2, 1.3 hgsvn.spec, 1.2, 1.3 sources, 1.2, 1.3
- Next message (by thread): rpms/em8300/F-9 .cvsignore, 1.15, 1.16 em8300.spec, 1.20, 1.21 sources, 1.15, 1.16
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list