rpms/vlc/F-17 0001-Fix-build-with-unreleased-FLAC-1.3.x.patch, NONE, 1.1 0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch, NONE, 1.1 .cvsignore, 1.51, 1.52 sources, 1.59, 1.60 vlc.spec, 1.157, 1.158
Nicolas Chauvet
kwizart at rpmfusion.org
Mon Apr 8 14:28:37 CEST 2013
Author: kwizart
Update of /cvs/free/rpms/vlc/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24899/F-17
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 9cbe32f2d9542a4a8d17a0828c1a7c0046397f57 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart at gmail.com>
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/F-17/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore 14 Dec 2012 22:46:58 -0000 1.51
+++ .cvsignore 8 Apr 2013 12:28:07 -0000 1.52
@@ -1 +1 @@
-vlc-2.0.5.tar.xz
+vlc-2.0.6.tar.xz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/F-17/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources 14 Dec 2012 22:46:58 -0000 1.59
+++ sources 8 Apr 2013 12:28:07 -0000 1.60
@@ -1 +1 @@
-4f959c0766ada8cea5a72c65fce94ebe vlc-2.0.5.tar.xz
+b45be633c71dca04ca7d6c3d64dd728b vlc-2.0.6.tar.xz
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/F-17/vlc.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- vlc.spec 14 Dec 2012 22:46:58 -0000 1.157
+++ vlc.spec 8 Apr 2013 12:28:07 -0000 1.158
@@ -30,13 +30,15 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
-Version: 2.0.5
+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}%{?vlc_rc}.tar.xz
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
@@ -193,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
@@ -220,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 || :
@@ -238,6 +245,7 @@
%configure \
--disable-dependency-tracking \
+ --disable-silent-rules \
--with-pic \
--disable-rpath \
--with-binary-version=%{version} \
@@ -336,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}
@@ -512,6 +525,25 @@
%changelog
+* Mon Apr 08 2013 Nicolas Chauvet <kwizart at gmail.com> - 2.0.6-1
+- Update to 2.0.6
+
+* Tue Mar 26 2013 Nicolas Chauvet <kwizart at gmail.com> - 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 at gmail.com> - 2.0.5-5
+- Fix samba4 detection rfbz#2659
+
+* Wed Jan 30 2013 Nicolas Chauvet <kwizart at gmail.com> - 2.0.5-4
+- Add new live555 requires
+
+* Sun Jan 20 2013 Nicolas Chauvet <kwizart at gmail.com> - 2.0.5-3
+- Rebuilt for ffmpeg/x264
+
+* Wed Jan 02 2013 Nicolas Chauvet <kwizart at gmail.com> - 2.0.5-2
+- Fix build with FLAC-1.3.x
+
* Fri Dec 14 2012 Nicolas Chauvet <kwizart at gmail.com> - 2.0.5-1
- Update to 2.0.5
@@ -736,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
@@ -1159,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
More information about the rpmfusion-commits
mailing list