rpms/xine-lib/F-7 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 xine-lib-cleanup-sources.sh, 1.4, 1.5 xine-lib.spec, 1.17, 1.18
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Sat Jan 12 11:28:09 UTC 2008
- Previous message (by thread): rpms/xine-lib/devel .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 xine-lib.spec, 1.29, 1.30
- Next message (by thread): rpms/xine-lib/F-8 .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 xine-lib.spec, 1.29, 1.30
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: scop
Update of /cvs/pkgs/rpms/xine-lib/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10048/F-7
Modified Files:
.cvsignore sources xine-lib-cleanup-sources.sh xine-lib.spec
Log Message:
Sync with devel
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-7/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 12 Jun 2007 20:48:51 -0000 1.8
+++ .cvsignore 12 Jan 2008 11:27:24 -0000 1.9
@@ -1,2 +1,2 @@
-xine-lib-1.1.7-pruned.tar.bz2
-xine-lib-1.1.7-autotools.patch.bz2
+xine-lib-1.1.9.1-pruned.tar.bz2
+xine-lib-1.1.9.1-autotools.patch.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-7/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 12 Jun 2007 20:48:51 -0000 1.8
+++ sources 12 Jan 2008 11:27:24 -0000 1.9
@@ -1,2 +1,2 @@
-8f0714de28dab403288bbccf1a8c30c2 xine-lib-1.1.7-pruned.tar.bz2
-6b7f1d168b8b367a8c7709db687c60f6 xine-lib-1.1.7-autotools.patch.bz2
+012fbd83dec565a06697426620baf21e xine-lib-1.1.9.1-pruned.tar.bz2
+fae182d050b231fff79eddf335b9a618 xine-lib-1.1.9.1-autotools.patch.bz2
Index: xine-lib-cleanup-sources.sh
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-7/xine-lib-cleanup-sources.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xine-lib-cleanup-sources.sh 11 Apr 2007 21:36:29 -0000 1.4
+++ xine-lib-cleanup-sources.sh 12 Jan 2008 11:27:24 -0000 1.5
@@ -66,7 +66,7 @@
-e /xineplug_decode_nsf/d \
-e 's/ nosefart//' \
src/libxineadec/Makefile.am
-sed -i -e /nosefart/d configure.ac
+sed -i -e '/nosefart\/Makefile/d' configure.ac
# All clean !
Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-7/xine-lib.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xine-lib.spec 12 Jun 2007 20:48:51 -0000 1.17
+++ xine-lib.spec 12 Jan 2008 11:27:24 -0000 1.18
@@ -1,24 +1,45 @@
# TODO, sometime, maybe:
# - libstk: http://www.libstk.net/ - probably not, see 1.1.5 ChangeLog
-# - xcb stuff when it's available
+# - drop the opengl video out plugin?
+# http://www.redhat.com/archives/fedora-legal-list/2007-August/msg00011.html
+# - move pulseaudio to main package from -extras?
+# http://fedoraproject.org/wiki/Releases/FeaturePulseaudio
+# --> not yet:
+# http://www.redhat.com/archives/fedora-devel-list/2007-August/msg01411.html
%define codecdir %{_libdir}/codecs
%ifarch %{ix86}
-%define have_vidix 1
+ %define have_vidix 1
%else
-%define have_vidix 0
-%endif
+ %define have_vidix 0
+%endif # ix86
+%if 0%{?fedora} >= 8
+ %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}
+ %define with_aalib %{?_without_aalib:0}%{!?_without_aalib:1}
+ %define with_caca %{?_without_caca:0}%{!?_without_caca:1}
+ %define with_pa %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1}
+%else
+ %define with_aalib %{?_with_aalib:1}%{!?_with_aalib:0}
+ %define with_caca %{?_with_caca:1}%{!?_with_caca:0}
+ %define with_pa %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0}
+%endif # Fedora
Summary: Xine library
Name: xine-lib
-Version: 1.1.7
+Version: 1.1.9.1
Release: 1%{?dist}
-License: GPL
+License: GPLv2+
Group: System Environment/Libraries
URL: http://xinehq.de/
# The tarball is generated from the upstream tarball using
# the script in SOURCE1. It prunes potentially patented code
-#Source0: http://dl.sourceforge.net/xine/xine-lib-%{version}.tar.bz2
+#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
@@ -29,25 +50,41 @@
Patch7: %{name}-1.1.5-multilib-devel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# X11
-BuildRequires: libX11-devel libXv-devel libXinerama-devel libXvMC-devel libGLU-devel
+BuildRequires: libX11-devel libXv-devel libXinerama-devel libXvMC-devel
+BuildRequires: libGLU-devel
+%if %{with_xcb}
+BuildRequires: libxcb-devel
+%endif # xcb
# Video
BuildRequires: SDL-devel libtheora-devel libmng-devel
+%if %{with_aalib}
BuildRequires: aalib-devel >= 1.4
+%endif # aalib
+%if %{with_caca}
BuildRequires: libcaca-devel >= 0.99
+%endif # caca
%if 0%{!?_without_directfb:1}
BuildRequires: directfb-devel
-%endif
+%endif # directfb
%if 0%{!?_without_imagemagick:1}
BuildRequires: ImageMagick-devel >= 6.2.4.6-1
-%endif
+%endif # imagemagick
%if 0%{?_with_freetype:1}
BuildRequires: fontconfig-devel
-%endif
+%endif # freetype
# Audio
BuildRequires: libogg-devel libvorbis-devel flac-devel libmodplug-devel
BuildRequires: esound-devel speex-devel arts-devel alsa-lib-devel >= 0.9.0
-BuildRequires: jack-audio-connection-kit-devel wavpack-devel libmpcdec-devel
+BuildRequires: libmpcdec-devel
+%if %{with_wpack}
+BuildRequires: wavpack-devel
+%endif # wpack
+%if %{with_pa}
BuildRequires: pulseaudio-lib-devel
+%endif # pa
+%if %{with_jack}
+BuildRequires: jack-audio-connection-kit-devel
+%endif # jack
# CDs
BuildRequires: libcdio-devel
# Other
@@ -61,6 +98,13 @@
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
@@ -72,34 +116,42 @@
It can play back various media. It also decodes multimedia files from local
disk drives, and displays multimedia streamed over the Internet. It
interprets many of the most common multimedia formats available - and some
-of the most uncommon formats, too. Non-default rpmbuild options:
---without imagemagick: Disable ImageMagick support
---without directfb: Disable DirectFB support
---with freetype: Enable FreeType/Fontconfig support
---with antialiasing: Enable font antialiasing (with FreeType/FontConfig)
+of the most uncommon formats, too. --with/--without rpmbuild options
+(some default values depend on target distribution): aalib, caca, directfb,
+imagemagick, freetype, antialiasing (with freetype), jack, pulseaudio,
+wavpack, xcb.
%description devel
This package contains development files for xine-lib.
+%description arts
+This package contains the aRts extra plugin for xine-lib.
+
%description extras
This package contains extra plugins for xine-lib:
- - aRts
- EsounD
+%if %{with_jack}
- JACK
+%endif # jack
+%if %{with_pa}
- Pulseaudio
+%endif # pa
- GDK-Pixbuf
- GNOME VFS
- SMB
- SDL
+%if %{with_aalib}
- AA-lib
+%endif # aalib
+%if %{with_caca}
- Libcaca
+%endif # caca
%if 0%{!?_without_imagemagick:1}
- Image decoding
-%endif
+%endif # imagemagick
%if 0%{!?_without_directfb:1}
- DirectFB output
-%endif
-
+%endif # directfb
%prep
@@ -121,36 +173,39 @@
export FFMPEG_CFLAGS=" " FFMPEG_LIBS=" "
export FFMPEG_POSTPROC_CFLAGS=" " FFMPEG_POSTPROC_LIBS=" "
export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)"
-%configure --disable-dependency-tracking \
- --with-xv-path=%{_libdir} \
- --with-w32-path=%{codecdir} \
- --with-real-codecs-path=%{codecdir} \
- --with-external-ffmpeg \
- --with-external-libmpcdec \
- --with-libflac \
- --with-wavpack \
- --with-arts \
+# Keep list of options in mostly the same order as ./configure --help.
+%configure \
+ --disable-dependency-tracking \
--enable-ipv6 \
%if 0%{!?_without_directfb:1}
--enable-directfb \
-%endif
-%if 0%{?_without_imagemagick:1}
- --without-imagemagick \
-%endif
+%endif # directfb
+ --disable-a52dec \
+ --disable-mad \
+ --disable-dvdnavtest --with-external-dvdnav \
+ --disable-vcd \
+ --disable-asf \
+ --disable-faad \
%if 0%{?_with_freetype:1}
- --with-freetype \
- --with-fontconfig \
%if 0%{?_with_antialiasing:1}
--enable-antialiasing \
+%endif # antialiasing
+ --with-freetype \
+ --with-fontconfig \
+%endif # freetype
+ --with-external-ffmpeg \
+ --with-xv-path=%{_libdir} \
+ --with-libflac \
+ --with-external-libmpcdec \
+%if 0%{?_without_imagemagick:1}
+ --without-imagemagick \
+%endif # imagemagick
+ --with-arts \
+%if %{with_wpack}
+ --with-wavpack \
%endif
-%endif
- --disable-libfame \
- --disable-faad \
- --disable-mad \
- --disable-asf \
- --disable-vcd \
- --disable-a52dec \
- --with-external-dvdnav --disable-dvdnavtest
+ --with-real-codecs-path=%{codecdir} \
+ --with-w32-path=%{codecdir}
make %{?_smp_mflags}
@@ -215,7 +270,7 @@
%{_libdir}/xine/plugins/%{version}/vidix/savage_vid.so
%{_libdir}/xine/plugins/%{version}/vidix/sis_vid.so
%{_libdir}/xine/plugins/%{version}/vidix/unichrome_vid.so
-%endif
+%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
@@ -226,7 +281,7 @@
%{_libdir}/xine/plugins/%{version}/xineplug_decode_mpc.so
%ifarch %ix86
%{_libdir}/xine/plugins/%{version}/xineplug_decode_qt.so
-%endif
+%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
@@ -236,7 +291,7 @@
%{_libdir}/xine/plugins/%{version}/xineplug_decode_vorbis.so
%ifarch %ix86
%{_libdir}/xine/plugins/%{version}/xineplug_decode_w32dll.so
-%endif
+%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
@@ -274,35 +329,50 @@
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_syncfb.so
%if %{have_vidix}
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_vidix.so
-%endif
+%endif # vidix
+%if %{with_xcb}
+%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbshm.so
+%{_libdir}/xine/plugins/%{version}/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
+%if %{with_wpack}
%{_libdir}/xine/plugins/%{version}/xineplug_wavpack.so
+%endif # wpack
+%files arts
+%defattr(-,root,root,-)
+%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_arts.so
%files extras
%defattr(-,root,root,-)
-%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_arts.so
%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_esd.so
+%if %{with_jack}
%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_jack.so
+%endif # jack
+%if %{with_pa}
%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_pulseaudio.so
+%endif # pa
%{_libdir}/xine/plugins/%{version}/xineplug_decode_gdk_pixbuf.so
%if 0%{!?_without_imagemagick:1}
%{_libdir}/xine/plugins/%{version}/xineplug_decode_image.so
-%endif
+%endif # imagemagick
%{_libdir}/xine/plugins/%{version}/xineplug_inp_gnome_vfs.so
%{_libdir}/xine/plugins/%{version}/xineplug_inp_smb.so
+%if %{with_aalib}
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_aa.so
+%endif # aalib
+%if %{with_caca}
%{_libdir}/xine/plugins/%{version}/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
-%endif
+%endif # directfb
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_sdl.so
-
%files devel
%defattr(-,root,root,-)
%doc __docs/hackersguide/*
@@ -316,9 +386,49 @@
%changelog
+* Sat Jan 12 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.9.1-1
+- 1.1.9.1 (security update).
+
+* Sun Jan 6 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.9-1
+- 1.1.9.
+
+* Thu Sep 27 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.8-6
+- Enable wavpack support by default for all distros.
+
+* Sun Sep 23 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.8-5
+- Enable JACK support by default for all distros.
+
+* Wed Sep 19 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.8-4
+- Fix "--without wavpack" build.
+
+* Sat Sep 15 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.8-3
+- Move XCB plugins to the main package.
+- Make aalib, caca, pulseaudio, jack, and wavpack support optional at build
+ time in preparation for the first EPEL build.
+
+* Sun Sep 09 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.1.8-2
+- remove the dependency from -extras to -arts, and use Obsoletes to
+ provide an upgrade path
+
+* Thu Aug 30 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.8-1
+- 1.1.8, "open" patch applied upstream.
+- Build XCB plugins by default for Fedora 8+ only.
+
+* Sat Aug 25 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.1.7-3
+- Split the aRts plugin into its own subpackage
+
+* Tue Aug 14 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.7-2
+- Include XCB output plugins (in -extras at least for now).
+- Protect "open" with glibc 2.6.90 and -D_FORTIFY_SOURCE=2.
+- Clean up %%configure options.
+- License: GPLv2+
+
* Thu Jun 7 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.7-1
- 1.1.7.
+* Wed Jun 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 1.1.6-3
+- respin (for libmpcdec)
+
* Wed Apr 25 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.6-2
- Make Real codec search path /usr/lib(64)/codecs again (#237743).
- Previous message (by thread): rpms/xine-lib/devel .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 xine-lib.spec, 1.29, 1.30
- Next message (by thread): rpms/xine-lib/F-8 .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 xine-lib.spec, 1.29, 1.30
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list