diff --git a/package/base/vlc/vlc.conf b/package/base/vlc/vlc.conf index ebc381b9a..0293977cc 100644 --- a/package/base/vlc/vlc.conf +++ b/package/base/vlc/vlc.conf @@ -24,17 +24,23 @@ var_append extraconfopt ' ' '--enable-release' var_append extraconfopt ' ' '--enable-loader' -var_append extraconfopt ' ' '--enable-esd' -var_append extraconfopt ' ' '--enable-arts' -var_append extraconfopt ' ' '--enable-jack' +pkginstalled esound && var_append extraconfopt ' ' '--enable-esd' +pkginstalled arts && var_append extraconfopt ' ' '--enable-arts' +pkginstalled jack && var_append extraconfopt ' ' '--enable-jack' +pkginstalled qt4 || var_append extraconfopt '--disable-qt4 --disable-skins2' var_append extraconfopt ' ' '--enable-pvr' var_append extraconfopt ' ' '--enable-v4l' var_append extraconfopt ' ' '--enable-dvb' -pkginstalled mozilla || pkginstalled firefox && \ - var_append extraconfopt ' ' '--enable-mozilla' -pkginstalled firefox && hook_add preconf 3 \ - 'export ac_cv_path_MOZILLA_CONFIG="$root/usr/bin/firefox-config" ; \ - export ac_cv_path_XPIDL="$root/usr/lib/firefox-`$ac_cv_path_MOZILLA_CONFIG --version`/xpidl - var_append makeinstopt npvlcdir=$root/usr/lib/firefox-`$ac_cv_path_MOZILLA_CONFIG --version`/plugins"' +# Fixes errors like this: +# libvlc.c: In function 'libvlc_InternalCleanup': +# libvlc.c:1002: error: 'for' loop initial declaration used outside C99 mode +var_append CC_WRAPPER_APPEND " " "-std=gnu99" + +# pkginstalled mozilla || pkginstalled firefox && \ +# var_append extraconfopt ' ' '--enable-mozilla' +# pkginstalled firefox && hook_add preconf 3 \ +# 'export ac_cv_path_MOZILLA_CONFIG="$root/usr/bin/firefox-config" ; \ +# export ac_cv_path_XPIDL="$root/usr/lib/firefox-`$ac_cv_path_MOZILLA_CONFIG --version`/xpidl" ; \ +# var_append makeinstopt " " "npvlcdir=$root/usr/lib/firefox-`$ac_cv_path_MOZILLA_CONFIG --version`/plugins"' diff --git a/package/base/vlc/vlc.desc b/package/base/vlc/vlc.desc index 265622522..42c0824cb 100644 --- a/package/base/vlc/vlc.desc +++ b/package/base/vlc/vlc.desc @@ -42,8 +42,8 @@ [L] GPL [S] Alpha -[V] 0.8.6f +[V] 0.9.3 [P] X --?--5---9 240.600 -[D] 2847639860 vlc-0.8.6f.tar.bz2 http://www.videolan.org/pub/videolan/vlc/0.8.6f/ +[D] 1426904803 vlc-0.9.3.tar.bz2 http://www.videolan.org/pub/videolan/vlc/0.9.3/ diff --git a/package/base/vlc/wxwidgets.patch b/package/base/vlc/wxwidgets.patch deleted file mode 100644 index 9311860c5..000000000 --- a/package/base/vlc/wxwidgets.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./modules/gui/wxwidgets/dialogs.cpp 2007-02-09 13:51:37.000000000 +0100 -+++ ./modules/gui/wxwidgets/dialogs.cpp 2007-02-09 14:06:59.000000000 +0100 -@@ -376,7 +376,7 @@ - { - p_file_generic_dialog->SetMessage( wxU(p_arg->psz_title) ); - p_file_generic_dialog->SetWildcard( wxU(p_arg->psz_extensions) ); -- p_file_generic_dialog->SetStyle( (p_arg->b_save ? wxSAVE : wxOPEN) | -+ p_file_generic_dialog->SetWindowStyle( (p_arg->b_save ? wxSAVE : wxOPEN) | - (p_arg->b_multiple ? wxMULTIPLE:0) ); - } -