rpms/vlc/EL-6 vlc-2.0.2-xcb_discard.patch, NONE, 1.1 vlc.spec, 1.156, 1.157
Author: kwizart
Update of /cvs/free/rpms/vlc/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1202/EL-6
Modified Files:
vlc.spec
Added Files:
vlc-2.0.2-xcb_discard.patch
Log Message:
Fix build with xcb
vlc-2.0.2-xcb_discard.patch:
xcb.c | 4 ++++
1 file changed, 4 insertions(+)
--- NEW FILE vlc-2.0.2-xcb_discard.patch ---
diff -up vlc-2.0.2/modules/access/screen/xcb.c.discard
vlc-2.0.2/modules/access/screen/xcb.c
--- vlc-2.0.2/modules/access/screen/xcb.c.discard 2011-12-08 19:00:26.000000000 +0100
+++ vlc-2.0.2/modules/access/screen/xcb.c 2012-07-11 15:07:43.092366202 +0200
@@ -319,7 +319,11 @@ static void Demux (void *data)
msg_Err (demux, "bad X11 drawable 0x%08"PRIx32, sys->window);
discard:
if (sys->follow_mouse)
+#if 0
xcb_discard_reply (conn, gc.sequence);
+#else
+ msg_Warn (demux, "xcb_discard_reply not available in libxcb <
1.6") ;
+#endif
return;
}
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/EL-6/vlc.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- vlc.spec 4 Jul 2012 16:44:29 -0000 1.156
+++ vlc.spec 11 Jul 2012 14:44:28 -0000 1.157
@@ -15,6 +15,7 @@
%global _with_xvidcore --with-xvidcore
%global _with_live555 --with-live555
%global _with_vaapi --with-vaapi
+%global _with_xcb 1
%endif
%if 0%{?fedora}
%global _with_fluidsyth 1
@@ -28,11 +29,12 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: 2.0.2
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}%{...
+Patch0: vlc-2.0.2-xcb_discard.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -140,7 +142,10 @@
BuildRequires: libX11-devel
BuildRequires: libXext-devel
BuildRequires: libXpm-devel
+%{?_with_xcb:
+BuildRequires: libxcb-devel
BuildRequires: xcb-util-devel
+}
BuildRequires: xorg-x11-proto-devel
@@ -210,6 +215,14 @@
%prep
%setup -q -n %{name}-%{version}%{?vlc_rc}
+%if 0%{?rhel}
+%patch0 -p1 -b .xcb_discard
+%{?_with_xcb:
+sed -i -e "s|xcb >= 1.6|xcb >= 1.5|" configure configure.ac
+touch -r config.h.in configure configure.ac
+}
+%endif
+
%{?_with_bootstrap:
rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
./bootstrap
@@ -495,6 +508,9 @@
%changelog
+* Wed Jul 11 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.2-3
+- Fix build of xcb
+
* Wed Jul 04 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.2-2
- Rework BR and RPM conditionals
- Drop support for anything below EL-6 and current Fedora.