rpms/vlc/F-18 0003-Fix-the-ca-cert-path-in-fedora.patch, NONE, 1.1 0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch, 1.1, 1.2 vlc.spec, 1.170, 1.171 0001-Fix-build-with-unreleased-FLAC-1.3.x.patch, 1.1, NONE vlc-backport-audio_decoder.patch, 1.1, NONE

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/free/rpms/vlc/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8747/F-18

Modified Files:
	0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch 
	vlc.spec 
Added Files:
	0003-Fix-the-ca-cert-path-in-fedora.patch 
Removed Files:
	0001-Fix-build-with-unreleased-FLAC-1.3.x.patch 
	vlc-backport-audio_decoder.patch 
Log Message:
Update to 2.0.9 and fixes


0003-Fix-the-ca-cert-path-in-fedora.patch:
 gnutls.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE 0003-Fix-the-ca-cert-path-in-fedora.patch ---
>From 08c6d8f3cbc5b2bd845b5e6ed8a5d15978ca6186 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart at gmail.com>
Date: Wed, 6 Nov 2013 23:48:48 +0100
Subject: [PATCH 3/3] Fix the ca cert path in fedora

---
 modules/misc/gnutls.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c
index b0129ad..9070e3d 100644
--- a/modules/misc/gnutls.c
+++ b/modules/misc/gnutls.c
@@ -580,8 +580,8 @@ static int OpenClient (vlc_tls_t *session, int fd, const char *hostname)
     const char *confdir = config_GetConfDir ();
     {
         char path[strlen (confdir)
-                   + sizeof ("/ssl/certs/ca-certificates.crt")];
-        sprintf (path, "%s/ssl/certs/ca-certificates.crt", confdir);
+                   + sizeof ("/ssl/certs/ca-bundle.trust.crt")];
+        sprintf (path, "%s/ssl/certs/ca-bundle.trust.crt", confdir);
         gnutls_Addx509File (VLC_OBJECT(session), sys->x509_cred, path, false);
     }
 #else /* WIN32 */
-- 
1.8.3.1


0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch:
 configure.ac              |   13 +++++++------
 modules/access/Modules.am |    5 ++---
 2 files changed, 9 insertions(+), 9 deletions(-)

Index: 0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch
===================================================================
RCS file: /cvs/free/rpms/vlc/F-18/0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch	23 Feb 2013 16:25:55 -0000	1.1
+++ 0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch	6 Nov 2013 22:57:33 -0000	1.2
@@ -1,43 +1,52 @@
-From 9cbe32f2d9542a4a8d17a0828c1a7c0046397f57 Mon Sep 17 00:00:00 2001
+From 497c321ae1829bf92856b259aefad7f90d346086 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
+Subject: [PATCH 1/3] Switch detection of smbclient from header to pkgconfig v2
 
 ---
- configure.ac              | 5 +++--
- modules/access/Modules.am | 2 +-
- 2 files changed, 4 insertions(+), 3 deletions(-)
+ configure.ac              | 13 +++++++------
+ modules/access/Modules.am |  4 ++--
+ 2 files changed, 9 insertions(+), 8 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 65377ac..6c634f2 100644
+index 27d6476..6ecb819 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1874,9 +1874,10 @@ dnl
+@@ -1871,12 +1871,13 @@ 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_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 ])
+-    [ if test -n "${enable_smb}"; then
+-        AC_MSG_ERROR([cannot find libsmbclient headers])
+-     fi ])
++  PKG_CHECK_MODULES(SMBCLIENT, smbclient,
++    [ VLC_ADD_PLUGIN([access_smb]) ], [
++      AC_CHECK_HEADERS(libsmbclient.h, [
++        VLC_ADD_PLUGIN([access_smb])
++        VLC_ADD_LIBS([access_smb],[-lsmbclient]) ],
++        AC_MSG_ERROR([${SMBCLIENT_PKG_ERRORS} (required for smb plugin).])
++    ])
+ fi
+ 
+ 
 diff --git a/modules/access/Modules.am b/modules/access/Modules.am
-index ff6047e..c06c89b 100644
+index ff6047e..d1c0173 100644
 --- a/modules/access/Modules.am
 +++ b/modules/access/Modules.am
-@@ -35,7 +35,7 @@ libsdp_plugin_la_LIBADD = $(AM_LIBADD)
+@@ -35,8 +35,8 @@ 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)
+-libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_access_smb)
++libaccess_smb_plugin_la_CFLAGS = $(AM_CFLAGS) $(SMBCLIENT_CFLAGS)
++libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD) $(SMBCLIENT_LIBS) $(LIBS_access_smb)
  if HAVE_WIN32
  libaccess_smb_plugin_la_LIBADD += -lmpr
+ endif
 -- 
-1.7.11.7
+1.8.3.1
 


Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/F-18/vlc.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- vlc.spec	2 Aug 2013 10:14:51 -0000	1.170
+++ vlc.spec	6 Nov 2013 22:57:33 -0000	1.171
@@ -30,15 +30,15 @@
 
 Summary:	The cross-platform open-source multimedia framework, player and server
 Name:		vlc
-Version:	2.0.8
-Release:	2%{?dist}
+Version:	2.0.9
+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
 Patch2:         0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch
-Patch3:         vlc-backport-audio_decoder.patch
+Patch3:		0003-Fix-the-ca-cert-path-in-fedora.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -232,7 +232,7 @@
 }
 %endif
 %patch2 -p1 -b .samba4
-%patch3 -p1 -b .backport
+%patch3 -p1 -b .tls
 
 %{?_with_bootstrap:
 rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
@@ -458,6 +458,9 @@
 %exclude %{_libdir}/vlc/plugins/access/libvcdx_plugin.so
 %exclude %{_libdir}/vlc/plugins/codec/libsvcdsub_plugin.so
 }
+%{?_with_crystalhd:
+%exclude %{_libdir}/vlc/plugins/codec/libcrystalhd_plugin.so
+}
 %{?_with_fluidsynth:
 %exclude %{_libdir}/vlc/plugins/codec/libfluidsynth_plugin.so
 }
@@ -514,6 +517,9 @@
 %{_libdir}/vlc/plugins/access/libvcdx_plugin.so
 %{_libdir}/vlc/plugins/codec/libsvcdsub_plugin.so
 }
+%{?_with_crystalhd:
+%{_libdir}/vlc/plugins/codec/libcrystalhd_plugin.so
+}
 
 %files devel
 %defattr(-,root,root,-)
@@ -526,6 +532,13 @@
 
 
 %changelog
+* Wed Nov 06 2013 Nicolas Chauvet <kwizart at gmail.com> - 2.0.9-1
+- Update to 2.0.9
+- Move crystalhd to extras - rhbz#2835
+  Patch from Sergio Durigan Junior <sergiodj at riseup.net>
+- Update smb pkgconfig detection
+- Fix ca cert path on fedora
+
 * Fri Aug 02 2013 Nicolas Chauvet <kwizart at gmail.com> - 2.0.8-2
 - Backport patch from 2.0.8a
 


--- 0001-Fix-build-with-unreleased-FLAC-1.3.x.patch DELETED ---


--- vlc-backport-audio_decoder.patch DELETED ---