10:51 a.m.
Author: kwizart
Update of /cvs/free/rpms/vlc/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2073/F-17
Modified Files:
.cvsignore sources vlc.spec
Added Files:
vlc-2.0.2-xcb_discard.patch
Log Message:
Update to 2.0.3
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: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vlc/F-17/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore 29 Jun 2012 11:00:41 -0000 1.48
+++ .cvsignore 21 Jul 2012 10:51:46 -0000 1.49
@@ -1 +1 @@
-vlc-2.0.2.tar.xz
+vlc-2.0.3.tar.xz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/F-17/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources 29 Jun 2012 11:00:41 -0000 1.56
+++ sources 21 Jul 2012 10:51:46 -0000 1.57
@@ -1 +1 @@
-93e729cc970a4535b3213dbef0e69528 vlc-2.0.2.tar.xz
+a7e79565e3df07dcf9abc6cad3ac26bb vlc-2.0.3.tar.xz
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/F-17/vlc.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- vlc.spec 29 Jun 2012 11:00:41 -0000 1.152
+++ vlc.spec 21 Jul 2012 10:51:46 -0000 1.153
@@ -1,5 +1,5 @@
#global vlc_rc -rc1
-%global _with_bootstrap 1
+#global _with_bootstrap 1
%global _with_workaround_circle_deps 1
%if 0%{?!_without_freeworld:1}
%global _with_a52dec --with-a52dec
@@ -15,19 +15,28 @@
%global _with_xvidcore --with-xvidcore
%global _with_live555 --with-live555
%global _with_vaapi --with-vaapi
-%global _without_opencv 1
+%global _with_xcb 1
+%endif
+%if 0%{?fedora}
+%global _with_fluidsyth 1
+%global _with_bluray 1
+%ifarch x86_64 i686
+%global _with_crystalhd 1
+%endif
+%global _with_projectm 1
+%global _with_schroedinger 1
%endif
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
-Version: 2.0.2
+Version: 2.0.3
Release: 1%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}%{...
-Patch5: vlc-1.1.8-bugfix.opencv22.patch
+Patch0: vlc-2.0.2-xcb_discard.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -51,7 +60,7 @@
%{?_with_faad2:BuildRequires: faad2-devel}
%{?_with_ffmpeg:BuildRequires: ffmpeg-devel >= 0.4.9-0}
BuildRequires: flac-devel
-BuildRequires: fluidsynth-devel
+%{?_with_fluidsynth:BuildRequires: fluidsynth-devel}
BuildRequires: fribidi-devel
%{?_with_gnomevfs:BuildRequires: gnome-vfs2-devel}
BuildRequires: gnutls-devel >= 1.0.17
@@ -61,11 +70,11 @@
BuildRequires: game-music-emu-devel
BuildRequires: libavc1394-devel
BuildRequires: libass-devel >= 0.9.7
-BuildRequires: libbluray-devel
+%{?_with_bluray:BuildRequires: libbluray-devel >= 0.2.1}
BuildRequires: libcaca-devel
BuildRequires: libcddb-devel
BuildRequires: libcdio-devel >= 0.77-3
-BuildRequires: libcrystalhd-devel
+%{?_with_crystalhd:BuildRequires: libcrystalhd-devel}
BuildRequires: libdc1394-devel >= 2.1.0
%{?_with_libdca:BuildRequires: libdca-devel}
BuildRequires: libdv-devel
@@ -80,10 +89,9 @@
BuildRequires: libmp4v2-devel
BuildRequires: libmpcdec-devel
BuildRequires: libmtp-devel >= 1.0.0
-BuildRequires: libprojectM-qt-devel
+%{?_with_projectm:BuildRequires: libprojectM-qt-devel}
BuildRequires: libproxy-devel
BuildRequires: librsvg2-devel >= 2.9.0
-BuildRequires: librtmp-devel
BuildRequires: libssh2-devel
BuildRequires: libsysfs-devel
BuildRequires: libshout-devel
@@ -92,14 +100,14 @@
BuildRequires: libtheora-devel
BuildRequires: libtiger-devel
BuildRequires: libtiff-devel
-BuildRequires: libudev-devel >= 142
+BuildRequires: pkgconfig(libudev)
BuildRequires: libupnp-devel
BuildRequires: libv4l-devel
%{?_with_vaapi:BuildRequires: libva-devel}
BuildRequires: libvorbis-devel
BuildRequires: libxml2-devel
BuildRequires: lirc-devel
-%{?_with_live555:BuildRequires: live555-devel >= 0-0.33.2011.12.23}
+%{?_with_live555:BuildRequires: live555-devel >= 0-0.33}
BuildRequires: kernel-headers
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
@@ -110,15 +118,16 @@
BuildRequires: minizip-devel
%{?_with_libmpeg2:BuildRequires: mpeg2dec-devel >= 0.3.2}
BuildRequires: ncurses-devel
-%{!?_without_opencv:BuildRequires: opencv-devel}
+%{?_with_opencv:BuildRequires: opencv-devel}
BuildRequires: openslp-devel
BuildRequires: pcre-devel
BuildRequires: pulseaudio-libs-devel >= 0.9.8
BuildRequires: portaudio-devel
BuildRequires: qt4-devel >= 4.5.2
-BuildRequires: schroedinger-devel
+%{?_with_schroedinger:BuildRequires: schroedinger-devel >= 1.0.10}
BuildRequires: sqlite-devel
BuildRequires: SDL_image-devel
+%{?_with_sidplay:BuildRequires: sidplay-libs-devel}
BuildRequires: speex-devel >= 1.1.5
BuildRequires: taglib-devel
%{?_with_twolame:BuildRequires: twolame-devel}
@@ -135,7 +144,10 @@
BuildRequires: libX11-devel
BuildRequires: libXext-devel
BuildRequires: libXpm-devel
-BuildRequires: xcb-util-devel
+%{?_with_xcb:
+BuildRequires: libxcb-devel
+BuildRequires: xcb-util-devel
+}
BuildRequires: xorg-x11-proto-devel
@@ -146,13 +158,9 @@
Requires: vlc-core%{_isa} = %{version}-%{release}
Requires: kde-filesystem
-%if 0%{?fedora} > 10 || 0%{?rhel} > 5
Requires: dejavu-sans-fonts
Requires: dejavu-sans-mono-fonts
Requires: dejavu-serif-fonts
-%else
-Requires: dejavu-fonts
-%endif
Requires: qt4%{?_isa} >= %{_qt4_version}
#For xdg-sreensaver
@@ -208,8 +216,13 @@
%prep
%setup -q -n %{name}-%{version}%{?vlc_rc}
-%if 0%{?fedora} >= 15
-%patch5 -p1 -b .opencv22
+
+%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:
@@ -227,15 +240,13 @@
--disable-rpath \
--with-binary-version=%{version} \
--with-tuning=no \
-%if 0%{?fedora} > 14
--disable-notify \
-%endif
--with-kde-solid=%{_kde4_appsdir}/solid/actions \
%{?_with_ffmpeg:--enable-switcher} \
--enable-lua \
- --enable-live555 \
+%{?_with_live555:--enable-live555} \
--enable-dv \
-%{!?_without_opencv:--enable-opencv} \
+%{?_with_opencv:--enable-opencv} \
--enable-sftp \
--enable-pvr \
%{?_with_gnomevfs:--enable-gnomevfs} \
@@ -259,7 +270,8 @@
--enable-dirac \
--enable-libass \
--enable-shout \
- --enable-xcb \
+%{?_with_xcb:--enable-xcb --enable-xvideo} \
+%{!?_with_xcb:--disable-xcb --disable-xvideo} \
--enable-svg \
%{!?_without_directfb:--enable-directfb} \
--enable-aa \
@@ -391,19 +403,23 @@
%{?_with_gnomevfs:
%{_libdir}/vlc/plugins/access/libaccess_gnomevfs_plugin.so
}
+%{_libdir}/vlc/plugins/video_output/libaa_plugin.so
+%{_libdir}/vlc/plugins/video_output/libcaca_plugin.so
+%{?_with_xcb:
%{_libdir}/vlc/plugins/access/libxcb_screen_plugin.so
%if 0%{?fedora} < 17
%{_libdir}/vlc/plugins/control/libglobalhotkeys_plugin.so
%endif
-%{_libdir}/vlc/plugins/video_output/libaa_plugin.so
-%{_libdir}/vlc/plugins/video_output/libcaca_plugin.so
%{_libdir}/vlc/plugins/video_output/libxcb_glx_plugin.so
%{_libdir}/vlc/plugins/video_output/libxcb_x11_plugin.so
%{_libdir}/vlc/plugins/video_output/libxcb_window_plugin.so
%{_libdir}/vlc/plugins/video_output/libxcb_xv_plugin.so
-%{_libdir}/vlc/plugins/gui/libskins2_plugin.so
%{_libdir}/vlc/plugins/video_filter/libpanoramix_plugin.so
+}
+%{_libdir}/vlc/plugins/gui/libskins2_plugin.so
+%{?_with_projectm:
%{_libdir}/vlc/plugins/visualization/libprojectm_plugin.so
+}
%{_libdir}/vlc/plugins/audio_output/libpulse_plugin.so
%files core -f %{name}.lang
@@ -421,13 +437,16 @@
%exclude %{_libdir}/vlc/plugins/access/libaccess_gnomevfs_plugin.so
}
%exclude %{_libdir}/vlc/plugins/access/libaccess_jack_plugin.so
-%exclude %{_libdir}/vlc/plugins/access/libxcb_screen_plugin.so
%{?_with_vcdimager:
%exclude %{_libdir}/vlc/plugins/access/libvcd_plugin.so
%exclude %{_libdir}/vlc/plugins/access/libvcdx_plugin.so
%exclude %{_libdir}/vlc/plugins/codec/libsvcdsub_plugin.so
}
+%{?_with_fluidsynth:
%exclude %{_libdir}/vlc/plugins/codec/libfluidsynth_plugin.so
+}
+%{?_with_xcb:
+%exclude %{_libdir}/vlc/plugins/access/libxcb_screen_plugin.so
%if 0%{?fedora} < 17
%exclude %{_libdir}/vlc/plugins/control/libglobalhotkeys_plugin.so
%endif
@@ -437,16 +456,19 @@
%exclude %{_libdir}/vlc/plugins/video_output/libxcb_x11_plugin.so
%exclude %{_libdir}/vlc/plugins/video_output/libxcb_window_plugin.so
%exclude %{_libdir}/vlc/plugins/video_output/libxcb_xv_plugin.so
+%exclude %{_libdir}/vlc/plugins/video_filter/libpanoramix_plugin.so
+}
%{!?_without_directfb:
%exclude %{_libdir}/vlc/plugins/video_output/libdirectfb_plugin.so
}
%exclude %{_libdir}/vlc/plugins/gui/libskins2_plugin.so
-%{!?_without_opencv:
+%{?_with_opencv:
%exclude %{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so
%exclude %{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so
}
-%exclude %{_libdir}/vlc/plugins/video_filter/libpanoramix_plugin.so
+%{?_with_projectm:
%exclude %{_libdir}/vlc/plugins/visualization/libprojectm_plugin.so
+}
%exclude %{_libdir}/vlc/plugins/audio_output/libjack_plugin.so
%exclude %{_libdir}/vlc/plugins/audio_output/libportaudio_plugin.so
%exclude %{_libdir}/vlc/plugins/audio_output/libpulse_plugin.so
@@ -458,14 +480,16 @@
%{_libdir}/vlc/plugins/access/libaccess_jack_plugin.so
%{_libdir}/vlc/plugins/audio_output/libportaudio_plugin.so
%{_libdir}/vlc/plugins/audio_output/libjack_plugin.so
+%{?_with_fluidsynth:
%{_libdir}/vlc/plugins/codec/libfluidsynth_plugin.so
+}
%files extras
%defattr(-,root,root,-)
%{!?_without_directfb:
%{_libdir}/vlc/plugins/video_output/libdirectfb_plugin.so
}
-%{!?_without_opencv:
+%{?_with_opencv:
%{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so
%{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so
}
@@ -486,6 +510,17 @@
%changelog
+* Fri Jul 20 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.3-1
+- Update to 2.0.3
+
+* Wed Jul 11 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.2-3
+- Fix build of xcb
+- Switch to pkgconfig(libudev)
+
+* 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.
+
* Thu Jun 28 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.2-1
- Update to 2.0.2