Author: kwizart Update of /cvs/free/rpms/vlc/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv31029/devel Modified Files: vlc.spec Added Files: vlc-1.1.4-hardode_font_patch.patch vlc-1.1.4-tls_path.patch Log Message: - Disable notify by f15 - deprecated upstream - Fix libProjectM crash once selected. - Fix default CA file for gnutls module. vlc-1.1.4-hardode_font_patch.patch: projectm.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- NEW FILE vlc-1.1.4-hardode_font_patch.patch --- diff -up vlc-1.1.4/modules/visualization/projectm.cpp.hardcode vlc-1.1.4/modules/visualization/projectm.cpp --- vlc-1.1.4/modules/visualization/projectm.cpp.hardcode 2010-04-13 02:22:27.000000000 +0200 +++ vlc-1.1.4/modules/visualization/projectm.cpp 2010-11-10 22:52:59.496688406 +0100 @@ -75,9 +75,9 @@ vlc_module_begin () #else add_file( "projectm-preset-path", "/usr/share/projectM/presets", NULL, PRESET_PATH_TXT, PRESET_PATH_LONGTXT, true ) - add_file( "projectm-title-font", "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf", NULL, + add_file( "projectm-title-font", "/usr/share/fonts/dejavu/DejaVuSans.ttf", NULL, TITLE_FONT_TXT, TITLE_FONT_LONGTXT, true ) - add_file( "projectm-menu-font", "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf", NULL, + add_file( "projectm-menu-font", "/usr/share/fonts/dejavu/DejaVuSansMono.ttf", NULL, MENU_FONT_TXT, MENU_FONT_LONGTXT, true ) #endif add_integer( "projectm-width", 800, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, vlc-1.1.4-tls_path.patch: gnutls.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- NEW FILE vlc-1.1.4-tls_path.patch --- diff -up vlc-1.1.4/modules/misc/gnutls.c.tls_path vlc-1.1.4/modules/misc/gnutls.c --- vlc-1.1.4/modules/misc/gnutls.c.tls_path 2010-06-08 00:57:45.000000000 +0200 +++ vlc-1.1.4/modules/misc/gnutls.c 2010-11-10 23:13:01.390977175 +0100 @@ -695,8 +695,8 @@ static int OpenClient (vlc_object_t *obj 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 ("/pki/tls/certs/ca-bundle.crt")]; + sprintf (path, "%s/pki/tls/certs/ca-bundle.crt", confdir); gnutls_Addx509File (VLC_OBJECT (p_session), p_sys->x509_cred, path, false); } Index: vlc.spec =================================================================== RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- vlc.spec 9 Nov 2010 09:04:38 -0000 1.96 +++ vlc.spec 10 Nov 2010 22:19:32 -0000 1.97 @@ -22,7 +22,7 @@ Summary: The cross-platform open-source multimedia framework, player and server Name: vlc Version: 1.1.4 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.videolan.org @@ -32,7 +32,9 @@ %endif Patch0: vlc-1.1.0-vlc-cache-gen_noerror.patch Patch1: 0001-Libnotify-depends-on-a-gtk.patch -Patch2: vlc-1.1.0-pending-taglib-not-tread_safe.patch +Patch2: vlc-1.1.0-pending-taglib-not-tread_safe.patch +Patch3: vlc-1.1.4-hardode_font_patch.patch +Patch4: vlc-1.1.4-tls_path.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -81,7 +83,9 @@ BuildRequires: libmp4v2-devel BuildRequires: libmpcdec-devel BuildRequires: libmtp-devel >= 1.0.0 +%if 0%{?fedora} < 15 || 0%{?rhel} =< 6 BuildRequires: libnotify-devel +%endif BuildRequires: libprojectM-qt-devel BuildRequires: libproxy-devel BuildRequires: librsvg2-devel >= 2.9.0 @@ -152,6 +156,7 @@ %if 0%{?fedora} > 10 || 0%{?rhel} > 5 Requires: dejavu-sans-fonts +Requires: dejavu-sans-mono-fonts Requires: dejavu-serif-fonts %else Requires: dejavu-fonts @@ -231,6 +236,8 @@ %patch0 -p1 -b .noerror %patch1 -p1 -b .gtk23 %patch2 -p1 -b .taglib_ts +%patch3 -p1 -b .hardode_path +%patch4 -p1 -b .tls_path sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in rm modules/access/videodev2.h @@ -260,6 +267,9 @@ --disable-rpath \ --with-binary-version=%{version} \ --with-tuning=no \ +%if 0%{?fedora} < 15 || 0%{?rhel} =< 6 + --disable-notify \ +%endif --with-kde-solid=%{_kde4_appsdir}/solid/actions \ %{?_with_ffmpeg:--enable-switcher} \ --enable-lua \ @@ -428,7 +438,9 @@ %{_libdir}/vlc/plugins/access/libxcb_screen_plugin.so %{_libdir}/vlc/plugins/control/libglobalhotkeys_plugin.so %{_libdir}/vlc/plugins/misc/libsvg_plugin.so +%if 0%{?fedora} < 15 || 0%{?rhel} =< 6 %{_libdir}/vlc/plugins/misc/libnotify_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 @@ -462,7 +474,9 @@ %exclude %{_libdir}/vlc/plugins/codec/libfluidsynth_plugin.so %exclude %{_libdir}/vlc/plugins/control/libglobalhotkeys_plugin.so %exclude %{_libdir}/vlc/plugins/misc/libsvg_plugin.so +%if 0%{?fedora} < 15 || 0%{?rhel} =< 6 %exclude %{_libdir}/vlc/plugins/misc/libnotify_plugin.so +%endif %exclude %{_libdir}/vlc/plugins/video_output/libaa_plugin.so %exclude %{_libdir}/vlc/plugins/video_output/libcaca_plugin.so %exclude %{_libdir}/vlc/plugins/video_output/libxcb_glx_plugin.so @@ -524,6 +538,11 @@ %changelog +* Wed Nov 10 2010 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.1.4-6 +- Disable notify by f15 - deprecated upstream +- Fix libProjectM crash once selected. +- Fix default CA file for gnutls module. + * Tue Nov 09 2010 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.1.4-5 - Enable VAAPI