rpms/xine-lib/devel .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 xine-lib.spec, 1.22, 1.23 xine-lib-1.1.7-open.patch, 1.1, NONE
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Sat Sep 1 09:20:10 UTC 2007
Author: scop
Update of /cvs/pkgs/rpms/xine-lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30148
Modified Files:
.cvsignore sources xine-lib.spec
Removed Files:
xine-lib-1.1.7-open.patch
Log Message:
* 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.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 7 Jun 2007 20:40:52 -0000 1.8
+++ .cvsignore 1 Sep 2007 09:19:38 -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.8-pruned.tar.bz2
+xine-lib-1.1.8-autotools.patch.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 7 Jun 2007 20:40:52 -0000 1.8
+++ sources 1 Sep 2007 09:19:38 -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
+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/devel/xine-lib.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xine-lib.spec 25 Aug 2007 21:23:05 -0000 1.22
+++ xine-lib.spec 1 Sep 2007 09:19:38 -0000 1.23
@@ -13,11 +13,16 @@
%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: 3%{?dist}
+Version: 1.1.8
+Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://xinehq.de/
@@ -30,13 +35,15 @@
# autotools patch created with source2
Patch0: %{name}-%{version}-autotools.patch.bz2
Patch1: %{name}-1.1.4-optflags.patch
-Patch2: %{name}-1.1.7-open.patch
Patch6: %{name}-1.1.1-deepbind-939.patch
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
-BuildRequires: libGLU-devel libxcb-devel
+BuildRequires: libGLU-devel
+%if %{with_xcb}
+BuildRequires: libxcb-devel
+%endif
# Video
BuildRequires: SDL-devel libtheora-devel libmng-devel
BuildRequires: aalib-devel >= 1.4
@@ -114,7 +121,9 @@
%if 0%{!?_without_directfb:1}
- DirectFB output
%endif
-
+%if %{with_xcb}
+ - XCB output
+%endif
%prep
@@ -124,7 +133,6 @@
touch -r m4/optimizations.m4 m4/optimizations.m4.stamp
%patch1 -p1 -b .optflags
touch -r m4/optimizations.m4.stamp m4/optimizations.m4
-%patch2 -p1 -b .open
# Patch6 needed at least when compiling with external ffmpeg, #939.
%patch6 -p1 -b .deepbind
%patch7 -p0 -b .multilib-devel
@@ -321,8 +329,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
@@ -338,6 +348,10 @@
%changelog
+* 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
--- xine-lib-1.1.7-open.patch DELETED ---
More information about the fedora-extras-commits
mailing list