Merge branch 'master' into openelec-pvr

Conflicts:
	packages/mediacenter/xbmc-theme-Confluence/meta
	packages/mediacenter/xbmc/meta
	packages/mediacenter/xbmc/patches/xbmc-0e174c0-001-add_support_to_specify_GIT_REV-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-0e174c0-013-reenable_lcd_config_settings-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-0e174c0-303-fix_libdvd_xFLAGS-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-0e174c0-311-fix_rsxs_build-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-0e174c0-351-increase_YV12_buffers-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-0e174c0-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-0e174c0-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-0e174c0-402-enable_yasm_in_ffmpeg-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-0e174c0-404-add_lame_check-0.6.patch
	packages/mediacenter/xbmc/patches/xbmc-0e174c0-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-0e174c0-452-change_lcd_content-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-0e174c0-453-add_openelec.tv_RSS_news-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-0e174c0-454-disable_backslash-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-0e174c0-457-fix_connection_check-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-0e174c0-462-add_remote_irtrans_mediacenter-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-0e174c0-463-add_remote_devinput-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-0e174c0-464-add_eject_keymapping_for_lirc-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-6922560-001-add_support_to_specify_GIT_REV-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-6922560-013-reenable_lcd_config_settings-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-6922560-303-fix_libdvd_xFLAGS-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-6922560-311-fix_rsxs_build-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-6922560-351-increase_YV12_buffers-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-6922560-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-6922560-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-6922560-402-enable_yasm_in_ffmpeg-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-6922560-404-add_lame_check-0.6.patch
	packages/mediacenter/xbmc/patches/xbmc-6922560-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-6922560-452-change_lcd_content-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-6922560-453-add_openelec.tv_RSS_news-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-6922560-454-disable_backslash-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-6922560-457-fix_connection_check-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-6922560-462-add_remote_irtrans_mediacenter-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-6922560-463-add_remote_devinput-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-6922560-464-add_eject_keymapping_for_lirc-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-8e4b699-001-add_support_to_specify_GIT_REV-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-8e4b699-013-reenable_lcd_config_settings-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-8e4b699-303-fix_libdvd_xFLAGS-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-8e4b699-311-fix_rsxs_build-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-8e4b699-341-xbmc-PR468-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-8e4b699-351-increase_YV12_buffers-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-8e4b699-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-8e4b699-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-8e4b699-402-enable_yasm_in_ffmpeg-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-8e4b699-404-add_lame_check-0.6.patch
	packages/mediacenter/xbmc/patches/xbmc-8e4b699-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-8e4b699-452-change_lcd_content-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-8e4b699-453-add_openelec.tv_RSS_news-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-8e4b699-454-disable_backslash-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-8e4b699-457-fix_connection_check-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-8e4b699-462-add_remote_irtrans_mediacenter-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-8e4b699-463-add_remote_devinput-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-8e4b699-464-add_eject_keymapping_for_lirc-0.1.patch
This commit is contained in:
Gujs 2011-11-18 07:54:12 +01:00
commit 67af1e7349
4 changed files with 4 additions and 4 deletions

View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="libcec" PKG_NAME="libcec"
PKG_VERSION="84c27c4" PKG_VERSION="2491aac"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"

View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="xf86-video-fglrx" PKG_NAME="xf86-video-fglrx"
PKG_VERSION="11.10" PKG_VERSION="11.11"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="i386 x86_64" PKG_ARCH="i386 x86_64"
PKG_LICENSE="nonfree" PKG_LICENSE="nonfree"

View File

@ -34,7 +34,7 @@ cd $PKG_BUILD
--enable-dri \ --enable-dri \
--enable-kms-only \ --enable-kms-only \
--disable-xvmc \ --disable-xvmc \
--disable-sna \ --enable-sna \
--with-xorg-module-dir=$XORG_PATH_MODULES --with-xorg-module-dir=$XORG_PATH_MODULES
make make

View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="xf86-video-intel" PKG_NAME="xf86-video-intel"
PKG_VERSION="2.16.0" PKG_VERSION="2.17.0"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="i386 x86_64" PKG_ARCH="i386 x86_64"
PKG_LICENSE="OSS" PKG_LICENSE="OSS"