Merge branch 'master' into openelec-pvr

Conflicts:
	packages/mediacenter/xbmc-theme-Confluence/meta
	packages/mediacenter/xbmc/meta
	packages/mediacenter/xbmc/patches/xbmc-2e00d86-001-add_support_to_specify_GIT_REV-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2e00d86-013-reenable_lcd_config_settings-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2e00d86-303-fix_libdvd_xFLAGS-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2e00d86-311-fix_rsxs_build-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2e00d86-351-increase_YV12_buffers-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2e00d86-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2e00d86-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2e00d86-402-enable_yasm_in_ffmpeg-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2e00d86-404-add_lame_check-0.6.patch
	packages/mediacenter/xbmc/patches/xbmc-2e00d86-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2e00d86-452-change_lcd_content-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2e00d86-453-add_openelec.tv_RSS_news-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2e00d86-454-disable_backslash-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2e00d86-457-fix_connection_check-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2e00d86-462-add_remote_irtrans_mediacenter-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2e00d86-463-add_remote_devinput-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2e00d86-464-add_eject_keymapping_for_lirc-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-3943772-001-add_support_to_specify_GIT_REV-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-3943772-013-reenable_lcd_config_settings-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-3943772-303-fix_libdvd_xFLAGS-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-3943772-311-fix_rsxs_build-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-3943772-351-increase_YV12_buffers-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-3943772-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-3943772-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-3943772-402-enable_yasm_in_ffmpeg-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-3943772-404-add_lame_check-0.6.patch
	packages/mediacenter/xbmc/patches/xbmc-3943772-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-3943772-452-change_lcd_content-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-3943772-453-add_openelec.tv_RSS_news-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-3943772-454-disable_backslash-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-3943772-457-fix_connection_check-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-3943772-462-add_remote_irtrans_mediacenter-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-3943772-463-add_remote_devinput-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-3943772-464-add_eject_keymapping_for_lirc-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-aeb4dec-001-add_support_to_specify_GIT_REV-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-aeb4dec-013-reenable_lcd_config_settings-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-aeb4dec-303-fix_libdvd_xFLAGS-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-aeb4dec-311-fix_rsxs_build-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-aeb4dec-351-increase_YV12_buffers-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-aeb4dec-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-aeb4dec-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-aeb4dec-402-enable_yasm_in_ffmpeg-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-aeb4dec-404-add_lame_check-0.6.patch
	packages/mediacenter/xbmc/patches/xbmc-aeb4dec-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-aeb4dec-452-change_lcd_content-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-aeb4dec-453-add_openelec.tv_RSS_news-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-aeb4dec-454-disable_backslash-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-aeb4dec-457-fix_connection_check-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-aeb4dec-462-add_remote_irtrans_mediacenter-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-aeb4dec-463-add_remote_devinput-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-aeb4dec-464-add_eject_keymapping_for_lirc-0.1.patch
This commit is contained in:
Gujs 2011-12-06 20:40:08 +01:00
commit e8711b8610
2 changed files with 5 additions and 6 deletions

View File

@ -42,10 +42,9 @@ cd $PKG_BUILD
--disable-hh2serial-gps \
--disable-ofono \
--disable-openconnect \
--disable-portal \
--disable-openvpn \
--disable-vpnc \
--disable-l2tp \
--disable-pptp \
--enable-loopback=builtin \
--disable-pacrunner \
--disable-google \
@ -55,7 +54,6 @@ cd $PKG_BUILD
--enable-ntpd=builtin \
--with-ntpd="/usr/sbin/ntpd" \
--disable-nmcompat \
--disable-tist \
--disable-polkit \
--enable-client \
--disable-tools \

View File

@ -19,14 +19,15 @@
################################################################################
PKG_NAME="connman"
PKG_VERSION="0.78"
PKG_VERSION="0.77"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.connman.net"
#PKG_URL="http://www.kernel.org/pub/linux/network/connman/$PKG_NAME-$PKG_VERSION.tar.bz2"
#PKG_URL="http://www.mirrorservice.org/sites/ftp.kernel.org/pub/linux/network/connman/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_URL="http://www.mirrorservice.org/sites/ftp.kernel.org/pub/linux/network/connman/$PKG_NAME-$PKG_VERSION.tar.bz2"
#PKG_URL="ftp://ftp.pgpi.com/linux/kernel/pub/linux/network/connman//$PKG_NAME-$PKG_VERSION.tar.bz2"
#PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS="glib dbus udev iptables wpa_supplicant ntp"
PKG_BUILD_DEPENDS="toolchain glib dbus udev iptables"
PKG_PRIORITY="optional"