Author: kwizart Update of /cvs/free/rpms/vlc/EL-6 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24899/EL-6 Modified Files: .cvsignore sources vlc.spec Added Files: 0001-Fix-build-with-unreleased-FLAC-1.3.x.patch 0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch Log Message: Update to 2.0.06 0001-Fix-build-with-unreleased-FLAC-1.3.x.patch: flac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- NEW FILE 0001-Fix-build-with-unreleased-FLAC-1.3.x.patch --- diff -up vlc-2.0.5/modules/codec/flac.c.FLAC13 vlc-2.0.5/modules/codec/flac.c --- vlc-2.0.5/modules/codec/flac.c.FLAC13 2011-12-08 19:00:26.000000000 +0100 +++ vlc-2.0.5/modules/codec/flac.c 2013-01-02 20:48:33.569532663 +0100 @@ -38,8 +38,8 @@ #include <vlc_codec.h> #include <vlc_aout.h> -#include <stream_decoder.h> -#include <stream_encoder.h> +#include <FLAC/stream_decoder.h> +#include <FLAC/stream_encoder.h> #include <vlc_block_helper.h> #include <vlc_bits.h> 0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch: configure.ac | 5 +++-- modules/access/Modules.am | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) --- NEW FILE 0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch --- From: Nicolas Chauvet <kwizart(a)gmail.com&gt; Date: Sat, 23 Feb 2013 16:39:23 +0100 Subject: [PATCH] Switch detection of smbclient from header to pkgconfig --- configure.ac | 5 +++-- modules/access/Modules.am | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 65377ac..6c634f2 100644 --- a/configure.ac +++ b/configure.ac @@ -1874,9 +1874,10 @@ dnl AC_ARG_ENABLE(smb, [AS_HELP_STRING([--disable-smb], [disable SMB/CIFS support (default auto)])]) if test "${enable_smb}" != "no"; then - AC_CHECK_HEADERS(libsmbclient.h, + PKG_CHECK_MODULES(SMBCLIENT, smbclient, [ VLC_ADD_PLUGIN([access_smb]) - VLC_ADD_LIBS([access_smb],[-lsmbclient]) ], + VLC_ADD_CFLAGS([access_smb],[$SMBCLIENT_CFLAGS]) + VLC_ADD_LIBS([access_smb],[$SMBCLIENT_LIBS])], [ if test -n "${enable_smb}"; then AC_MSG_ERROR([cannot find libsmbclient headers]) fi ]) diff --git a/modules/access/Modules.am b/modules/access/Modules.am index ff6047e..c06c89b 100644 --- a/modules/access/Modules.am +++ b/modules/access/Modules.am @@ -35,7 +35,7 @@ libsdp_plugin_la_LIBADD = $(AM_LIBADD) libsdp_plugin_la_DEPENDENCIES = libaccess_smb_plugin_la_SOURCES = smb.c -libaccess_smb_plugin_la_CFLAGS = $(AM_CFLAGS) +libaccess_smb_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_access_smb) libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_access_smb) if HAVE_WIN32 libaccess_smb_plugin_la_LIBADD += -lmpr -- 1.7.11.7 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/vlc/EL-6/.cvsignore,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- .cvsignore 21 Jul 2012 12:19:55 -0000 1.49 +++ .cvsignore 8 Apr 2013 12:28:07 -0000 1.50 @@ -1 +1 @@ -vlc-2.0.3.tar.xz +vlc-2.0.6.tar.xz Index: sources =================================================================== RCS file: /cvs/free/rpms/vlc/EL-6/sources,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- sources 21 Jul 2012 12:19:55 -0000 1.57 +++ sources 8 Apr 2013 12:28:07 -0000 1.58 @@ -1 +1 @@ -a7e79565e3df07dcf9abc6cad3ac26bb vlc-2.0.3.tar.xz +b45be633c71dca04ca7d6c3d64dd728b vlc-2.0.6.tar.xz Index: vlc.spec =================================================================== RCS file: /cvs/free/rpms/vlc/EL-6/vlc.spec,v retrieving revision 1.158 retrieving revision 1.159 diff -u -r1.158 -r1.159 --- vlc.spec 21 Jul 2012 12:19:55 -0000 1.158 +++ vlc.spec 8 Apr 2013 12:28:07 -0000 1.159 @@ -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 @@ -18,7 +18,7 @@ %global _with_xcb 1 %endif %if 0%{?fedora} -%global _with_fluidsyth 1 +%global _with_fluidsynth 1 %global _with_bluray 1 %ifarch x86_64 i686 %global _with_crystalhd 1 @@ -30,13 +30,15 @@ Summary: The cross-platform open-source multimedia framework, player and server Name: vlc -Version: 2.0.3 +Version: 2.0.6 Release: 1%{?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 +Patch1: 0001-Fix-build-with-unreleased-FLAC-1.3.x.patch +Patch2: 0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -120,6 +122,7 @@ BuildRequires: ncurses-devel %{?_with_opencv:BuildRequires: opencv-devel} BuildRequires: openslp-devel +Buildrequires: opus-devel BuildRequires: pcre-devel BuildRequires: pulseaudio-libs-devel >= 0.9.8 BuildRequires: portaudio-devel @@ -127,7 +130,7 @@ %{?_with_schroedinger:BuildRequires: schroedinger-devel >= 1.0.10} BuildRequires: sqlite-devel BuildRequires: SDL_image-devel -%{?_with_sidplay:BuildRequires: sidplay-libs-devel} +%{?_with_sidplay:BuildRequires: pkgconfig(libsidplay2)} BuildRequires: speex-devel >= 1.1.5 BuildRequires: taglib-devel %{?_with_twolame:BuildRequires: twolame-devel} @@ -147,6 +150,7 @@ %{?_with_xcb: BuildRequires: libxcb-devel BuildRequires: xcb-util-devel +BuildRequires: pkgconfig(xcb-keysyms) } BuildRequires: xorg-x11-proto-devel @@ -191,7 +195,10 @@ Group: Applications/Multimedia Provides: vlc-nox = %{version}-%{release} Obsoletes: vlc-nox < 1.1.5-2 +#Deprecated since F-19, can be dropped by F-21/EL-7 %{?live555date:Requires: live555date%{_isa} = %{live555date}} +#Introduced in F-19 +%{?live555_version:Requires: live555%{?_isa} = %{live555_version}} %description core VLC media player core components @@ -218,12 +225,14 @@ %setup -q -n %{name}-%{version}%{?vlc_rc} %if 0%{?rhel} -%patch0 -p1 -b .xcb_discard +%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 +%patch1 -p1 -b .FLAC13 +%patch2 -p1 -b .samba4 %{?_with_bootstrap: rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || : @@ -236,6 +245,7 @@ %configure \ --disable-dependency-tracking \ + --disable-silent-rules \ --with-pic \ --disable-rpath \ --with-binary-version=%{version} \ @@ -334,6 +344,11 @@ #Fix unowned directories rm -rf $RPM_BUILD_ROOT%{_docdir}/vlc +#Workaround config file provided in %%{_datadir} +#https://bugzilla.rpmfusion.org/show_bug.cgi?id=2726 +mv $RPM_BUILD_ROOT%{_datadir}/vlc/lua/http/.hosts \ + $RPM_BUILD_ROOT%{_datadir}/vlc/lua/http/hosts-sample + %find_lang %{name} @@ -510,6 +525,46 @@ %changelog +* Mon Apr 08 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 2.0.6-1 +- Update to 2.0.6 + +* Tue Mar 26 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 2.0.5-6 +- Move %%{_datadir}/vlc/lua/http/.hosts to hosts-sample to avoid + config file - https://bugzilla.rpmfusion.org/2726 + +* Sat Feb 23 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 2.0.5-5 +- Fix samba4 detection rfbz#2659 + +* Wed Jan 30 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 2.0.5-4 +- Add new live555 requires + +* Sun Jan 20 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 2.0.5-3 +- Rebuilt for ffmpeg/x264 + +* Wed Jan 02 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 2.0.5-2 +- Fix build with FLAC-1.3.x + +* Fri Dec 14 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 2.0.5-1 +- Update to 2.0.5 + +* Sat Nov 24 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 2.0.4-3 +- Fix build with kernel-3.7 + +* Fri Nov 23 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 2.0.4-2 +- Rebuilt for x264 + +* Fri Oct 19 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 2.0.4-1 +- Update to 2.0.4 +- Enable opus +- Disable x86 loader +- Avoid rpath + +* Wed Sep 26 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 2.0.3-3 +- Fix --with fluidsynth typo + +* Wed Sep 05 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 2.0.3-2 +- Rebuilt for x264 ABI 125 + * Fri Jul 20 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 2.0.3-1 - Update to 2.0.3 @@ -713,7 +768,7 @@ - Update bugfix to 20091025 - Clean dc1394 sub-package -* Thu Oct 16 2009 kwizart < kwizart at gmail.com > - 1.0.2-2 +* Fri Oct 16 2009 kwizart < kwizart at gmail.com > - 1.0.2-2 - Update to 1.0-bugfix 20091016 - Rebuild for x264/ffmpeg @@ -1136,7 +1191,7 @@ - Test Updated static live555 to 2007.02.22 - Clean up svn to release changes -* Tue Mar 22 2007 kwizart < kwizart at gmail.com > - 0.8.6a-4.4 +* Thu Mar 22 2007 kwizart < kwizart at gmail.com > - 0.8.6a-4.4 - WIP changes - ld.conf is unusefull... * Wed Mar 21 2007 kwizart < kwizart at gmail.com > - 0.8.6a-4.3