rpms/xine-lib/EL-5 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 xine-lib.spec, 1.9, 1.10
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Mon Sep 10 15:18:22 UTC 2007
- Previous message (by thread): rpms/telepathy-salut/OLPC-2 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 telepathy-salut.spec, 1.10, 1.11
- Next message (by thread): rpms/eclipse-subclipse/devel subclipse-fetch-1.2.4.sh, NONE, 1.1 .cvsignore, 1.5, 1.6 eclipse-subclipse.spec, 1.11, 1.12 sources, 1.5, 1.6 subclipse-fetch-1.2.2.sh, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: scop
Update of /cvs/pkgs/rpms/xine-lib/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20278
Modified Files:
.cvsignore sources xine-lib.spec
Log Message:
Sync with devel
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 14 Jul 2007 09:13:26 -0000 1.7
+++ .cvsignore 10 Sep 2007 15:17:50 -0000 1.8
@@ -1,2 +1,2 @@
-xine-lib-1.1.7-pruned.tar.bz2
-xine-lib-1.1.7-autotools.patch.bz2
+xine-lib-1.1.8-pruned.tar.bz2
+xine-lib-1.1.8-autotools.patch.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 14 Jul 2007 09:13:26 -0000 1.7
+++ sources 10 Sep 2007 15:17:50 -0000 1.8
@@ -1,2 +1,2 @@
-8f0714de28dab403288bbccf1a8c30c2 xine-lib-1.1.7-pruned.tar.bz2
-6b7f1d168b8b367a8c7709db687c60f6 xine-lib-1.1.7-autotools.patch.bz2
+6cbfae9d31fc138c7cb3c3d178e1286d xine-lib-1.1.8-pruned.tar.bz2
+b4a7c7a9af428b26667402d6dc180107 xine-lib-1.1.8-autotools.patch.bz2
Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-5/xine-lib.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xine-lib.spec 14 Jul 2007 09:13:26 -0000 1.9
+++ xine-lib.spec 10 Sep 2007 15:17:50 -0000 1.10
@@ -1,6 +1,11 @@
# 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}
@@ -8,12 +13,17 @@
%else
%define have_vidix 0
%endif
+%if 0%{?fedora} >= 8
+%define with_xcb 1
+%else
+%define with_xcb 0
+%endif
Summary: Xine library
Name: xine-lib
-Version: 1.1.7
-Release: 1%{?dist}
-License: GPL
+Version: 1.1.8
+Release: 2%{?dist}
+License: GPLv2+
Group: System Environment/Libraries
URL: http://xinehq.de/
# The tarball is generated from the upstream tarball using
@@ -29,7 +39,11 @@
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
# Video
BuildRequires: SDL-devel libtheora-devel libmng-devel
BuildRequires: aalib-devel >= 1.4
@@ -61,6 +75,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
@@ -81,9 +102,11 @@
%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
- JACK
- Pulseaudio
@@ -99,7 +122,9 @@
%if 0%{!?_without_directfb:1}
- DirectFB output
%endif
-
+%if %{with_xcb}
+ - XCB output
+%endif
%prep
@@ -121,36 +146,37 @@
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
-%endif
- --disable-libfame \
- --disable-faad \
- --disable-mad \
- --disable-asf \
- --disable-vcd \
- --disable-a52dec \
- --with-external-dvdnav --disable-dvdnavtest
+%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 \
+ --with-wavpack \
+ --with-real-codecs-path=%{codecdir} \
+ --with-w32-path=%{codecdir}
make %{?_smp_mflags}
@@ -282,9 +308,12 @@
%{_libdir}/xine/plugins/%{version}/xineplug_wavpack.so
-%files extras
+%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_esd.so
%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_jack.so
%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_pulseaudio.so
@@ -301,6 +330,10 @@
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xdirectfb.so
%endif
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_sdl.so
+%if %{with_xcb}
+%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbshm.so
+%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbxv.so
+%endif
%files devel
@@ -316,9 +349,29 @@
%changelog
+* 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/telepathy-salut/OLPC-2 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 telepathy-salut.spec, 1.10, 1.11
- Next message (by thread): rpms/eclipse-subclipse/devel subclipse-fetch-1.2.4.sh, NONE, 1.1 .cvsignore, 1.5, 1.6 eclipse-subclipse.spec, 1.11, 1.12 sources, 1.5, 1.6 subclipse-fetch-1.2.2.sh, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list