rpms/xine-lib
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Wed Mar 19 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.11-1

Browse Source 
- 1.1.11 (security update, #438182, CVE-2008-0073).
- Drop jack and wavpack build conditionals.
- Specfile cleanups.
This commit is contained in:
Ville Skyttä 2008-03-19 19:51:59 +00:00
parent 2990be646a
commit 298d6d095f
4 changed files with 70 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.cvsignore
View File

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

4
sources
View File

@ -1,2 +1,2 @@
3e78ed0690314436b0a74d1d11535fea xine-lib-1.1.10.1-pruned.tar.bz2 40d8c51a914ed20b8499c5da9cf57bc0 xine-lib-1.1.11-pruned.tar.bz2
b7e702d0bd235e7102efaa11caea2895 xine-lib-1.1.10.1-autotools.patch.bz2 bb30e6af99e5abfcb6133fbe347be7eb xine-lib-1.1.11-autotools.patch.bz2

16
xine-lib-cleanup-sources.sh
View File

@ -21,6 +21,14 @@ rm -rf $dir
tar -xjf $tarball tar -xjf $tarball
cd $dir cd $dir
rmpluglib()
{
echo "removing src/$1/$2..."
rm -rf src/$1/$2
sed -i -e "s/SUBDIRS = \(.*\)$2\(.*\)/SUBDIRS = \1\2/g" src/$1/Makefile.am
sed -i -e "/^src\/$1\/$2/d" configure.ac
}
# Main libraries # Main libraries
for remove in libfaad libffmpeg libmad libmpeg2 dxr3 liba52 libdts; do for remove in libfaad libffmpeg libmad libmpeg2 dxr3 liba52 libdts; do
echo "removing src/$remove..." echo "removing src/$remove..."
@ -30,10 +38,10 @@ for remove in libfaad libffmpeg libmad libmpeg2 dxr3 liba52 libdts; do
done done
# Input plugin libraries # Input plugin libraries
for remove in vcd; do for remove in vcd; do
echo "removing src/input/$remove..." rmpluglib input vcd
rm -rf src/input/$remove done
sed -i -e "s/SUBDIRS = \(.*\)${remove}\(.*\)/SUBDIRS = \1\2/g" src/input/Makefile.am for remove in ffmpeg; do
sed -i -e "/^src\/input\/$remove/d" configure.ac rmpluglib combined ffmpeg
done done
# Input plugins # Input plugins
for p in dvd vcd mms; do for p in dvd vcd mms; do

105
xine-lib.spec
View File

@ -6,35 +6,32 @@
# http://fedoraproject.org/wiki/Releases/FeaturePulseaudio # http://fedoraproject.org/wiki/Releases/FeaturePulseaudio
# --> not yet: # --> not yet:
# http://www.redhat.com/archives/fedora-devel-list/2007-August/msg01411.html # http://www.redhat.com/archives/fedora-devel-list/2007-August/msg01411.html
# - external dvdnav - not compatible as of 1.1.9.1 and 4.1.1 # - external dvdnav - not compatible as of 1.1.11 and 4.1.1
%define codecdir %{_libdir}/codecs %define codecdir %{_libdir}/codecs
%ifarch %{ix86} %ifarch %{ix86}
%define have_vidix 1 %define have_vidix 1
%else %else
%define have_vidix 0 %define have_vidix 0
%endif # ix86 %endif # ix86
%if 0%{?fedora} > 6
%define with_xcb %{?_without_xcb:0}%{!?_without_xcb:1}
%else
%define with_xcb %{?_with_xcb:1}%{!?_with_xcb:0}
%endif # >= F8
%define with_jack %{?_without_jack:0}%{!?_without_jack:1}
%define with_wpack %{?_without_wavpack:0}%{!?_without_wavpack:1}
%if 0%{?fedora} %if 0%{?fedora}
%define with_aalib %{?_without_aalib:0}%{!?_without_aalib:1} %define with_aalib %{?_without_aalib:0}%{!?_without_aalib:1}
%define with_caca %{?_without_caca:0}%{!?_without_caca:1} %define with_caca %{?_without_caca:0}%{!?_without_caca:1}
%define with_pa %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1} %define with_pa %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1}
%define with_xcb %{?_without_xcb:0}%{!?_without_xcb:1}
%else %else
%define with_aalib %{?_with_aalib:1}%{!?_with_aalib:0} %define with_aalib %{?_with_aalib:1}%{!?_with_aalib:0}
%define with_caca %{?_with_caca:1}%{!?_with_caca:0} %define with_caca %{?_with_caca:1}%{!?_with_caca:0}
%define with_pa %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0} %define with_pa %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0}
%define with_xcb %{?_with_xcb:1}%{!?_with_xcb:0}
%endif # Fedora %endif # Fedora
Summary: Xine library Summary: Xine library
Name: xine-lib Name: xine-lib
Version: 1.1.10.1 Version: 1.1.11
Release: 1%{?dist}.1 Release: 1%{?dist}
License: GPLv2+ License: GPLv2+
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://xinehq.de/ URL: http://xinehq.de/
@ -50,13 +47,18 @@ Patch1: %{name}-1.1.4-optflags.patch
Patch6: %{name}-1.1.1-deepbind-939.patch Patch6: %{name}-1.1.1-deepbind-939.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# X11 # X11
BuildRequires: libX11-devel libXv-devel libXinerama-devel libXvMC-devel BuildRequires: libX11-devel
BuildRequires: libXv-devel
BuildRequires: libXinerama-devel
BuildRequires: libXvMC-devel
BuildRequires: libGLU-devel BuildRequires: libGLU-devel
%if %{with_xcb} %if %{with_xcb}
BuildRequires: libxcb-devel BuildRequires: libxcb-devel
%endif # xcb %endif # xcb
# Video # Video
BuildRequires: SDL-devel libtheora-devel libmng-devel BuildRequires: SDL-devel
BuildRequires: libtheora-devel
BuildRequires: libmng-devel
%if %{with_aalib} %if %{with_aalib}
BuildRequires: aalib-devel >= 1.4 BuildRequires: aalib-devel >= 1.4
%endif # aalib %endif # aalib
@ -73,41 +75,27 @@ BuildRequires: ImageMagick-devel >= 6.2.4.6-1
BuildRequires: fontconfig-devel BuildRequires: fontconfig-devel
%endif # freetype %endif # freetype
# Audio # Audio
BuildRequires: libogg-devel libvorbis-devel flac-devel libmodplug-devel BuildRequires: libogg-devel
BuildRequires: esound-devel speex-devel arts-devel alsa-lib-devel >= 0.9.0 BuildRequires: libvorbis-devel
BuildRequires: flac-devel
BuildRequires: libmodplug-devel
BuildRequires: esound-devel
BuildRequires: speex-devel
BuildRequires: arts-devel
BuildRequires: alsa-lib-devel >= 0.9.0
BuildRequires: libmpcdec-devel BuildRequires: libmpcdec-devel
%if %{with_wpack}
BuildRequires: wavpack-devel BuildRequires: wavpack-devel
%endif # wpack
%if %{with_pa} %if %{with_pa}
BuildRequires: pulseaudio-lib-devel BuildRequires: pulseaudio-lib-devel
%endif # pa %endif # pa
%if %{with_jack}
BuildRequires: jack-audio-connection-kit-devel BuildRequires: jack-audio-connection-kit-devel
%endif # jack
# CDs # CDs
BuildRequires: libcdio-devel BuildRequires: libcdio-devel
# Other # Other
BuildRequires: pkgconfig gnome-vfs2-devel gtk2-devel libsmbclient-devel BuildRequires: pkgconfig
BuildRequires: gnome-vfs2-devel
%package devel BuildRequires: gtk2-devel
Summary: Xine library development files BuildRequires: libsmbclient-devel
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig zlib-devel
%package arts
Summary: aRts plugin for xine-lib
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
# -arts was split off the -extras subpackage at 1.1.7-3
Obsoletes: xine-lib-extras < 1.1.7-3
%package extras
Summary: Additional plugins for xine-lib
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
%description %description
This package contains the Xine library. Xine is a free multimedia player. This package contains the Xine library. Xine is a free multimedia player.
@ -116,21 +104,37 @@ disk drives, and displays multimedia streamed over the Internet. It
interprets many of the most common multimedia formats available - and some interprets many of the most common multimedia formats available - and some
of the most uncommon formats, too. --with/--without rpmbuild options of the most uncommon formats, too. --with/--without rpmbuild options
(some default values depend on target distribution): aalib, caca, directfb, (some default values depend on target distribution): aalib, caca, directfb,
imagemagick, freetype, antialiasing (with freetype), jack, pulseaudio, imagemagick, freetype, antialiasing (with freetype), pulseaudio, xcb.
wavpack, xcb.
%description devel %package devel
Summary: Xine library development files
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
Requires: zlib-devel
%description devel
This package contains development files for xine-lib. This package contains development files for xine-lib.
%description arts %package arts
Summary: aRts plugin for xine-lib
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
# -arts was split off the -extras subpackage at 1.1.7-3
Obsoletes: xine-lib-extras < 1.1.7-3
%description arts
This package contains the aRts extra plugin for xine-lib. This package contains the aRts extra plugin for xine-lib.
%description extras %package extras
Summary: Additional plugins for xine-lib
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
%description extras
This package contains extra plugins for xine-lib: This package contains extra plugins for xine-lib:
- EsounD - EsounD
%if %{with_jack}
- JACK - JACK
%endif # jack
%if %{with_pa} %if %{with_pa}
- Pulseaudio - Pulseaudio
%endif # pa %endif # pa
@ -197,9 +201,7 @@ export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)"
--without-imagemagick \ --without-imagemagick \
%endif # imagemagick %endif # imagemagick
--with-arts \ --with-arts \
%if %{with_wpack}
--with-wavpack \ --with-wavpack \
%endif
--with-real-codecs-path=%{codecdir} \ --with-real-codecs-path=%{codecdir} \
--with-w32-path=%{codecdir} --with-w32-path=%{codecdir}
@ -337,9 +339,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/xine/plugins/*/xineplug_vo_out_xv.so %{_libdir}/xine/plugins/*/xineplug_vo_out_xv.so
%{_libdir}/xine/plugins/*/xineplug_vo_out_xvmc.so %{_libdir}/xine/plugins/*/xineplug_vo_out_xvmc.so
%{_libdir}/xine/plugins/*/xineplug_vo_out_xxmc.so %{_libdir}/xine/plugins/*/xineplug_vo_out_xxmc.so
%if %{with_wpack}
%{_libdir}/xine/plugins/*/xineplug_wavpack.so %{_libdir}/xine/plugins/*/xineplug_wavpack.so
%endif # wpack
%files arts %files arts
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -348,9 +348,7 @@ rm -rf $RPM_BUILD_ROOT
%files extras %files extras
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_libdir}/xine/plugins/*/xineplug_ao_out_esd.so %{_libdir}/xine/plugins/*/xineplug_ao_out_esd.so
%if %{with_jack}
%{_libdir}/xine/plugins/*/xineplug_ao_out_jack.so %{_libdir}/xine/plugins/*/xineplug_ao_out_jack.so
%endif # jack
%if %{with_pa} %if %{with_pa}
%{_libdir}/xine/plugins/*/xineplug_ao_out_pulseaudio.so %{_libdir}/xine/plugins/*/xineplug_ao_out_pulseaudio.so
%endif # pa %endif # pa
@ -385,6 +383,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Wed Mar 19 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.11-1
- 1.1.11 (security update, #438182, CVE-2008-0073).
- Drop jack and wavpack build conditionals.
- Specfile cleanups.
* Fri Mar 7 2008 Rex Dieter <rdieter@fedoraproject.org> - 1.1.10.1-1.1 * Fri Mar 7 2008 Rex Dieter <rdieter@fedoraproject.org> - 1.1.10.1-1.1
- xcb support for f7+ (#373411) - xcb support for f7+ (#373411)