From 6efd0a3a1ccf8b7f2d736b49d3656403bbe6cab4 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 30 Sep 2011 18:47:50 +0200 Subject: [PATCH] xbmc: update to xbmc-471c468 Signed-off-by: Stephan Raue --- .../mediacenter/xbmc-theme-Confluence/meta | 2 +- packages/mediacenter/xbmc/build | 7 ++++ packages/mediacenter/xbmc/meta | 7 +++- ...-add_support_to_specify_GIT_REV-0.1.patch} | 0 ...13-reenable_lcd_config_settings-0.1.patch} | 0 ...c-471c468-303-fix_libdvd_xFLAGS-0.1.patch} | 0 ...1c468-351-increase_YV12_buffers-0.1.patch} | 0 ...xSwapBuffers_going_to_far_ahead-0.1.patch} | 0 ...mber_of_video_surface_allocated-0.1.patch} | 0 ...1c468-402-enable_yasm_in_ffmpeg-0.1.patch} | 0 ...xbmc-471c468-404-add_lame_check-0.6.patch} | 0 ...ONOPTIMIZE_with_external_Python-0.1.patch} | 0 ...-471c468-452-change_lcd_content-0.1.patch} | 0 ...68-453-add_openelec.tv_RSS_news-0.1.patch} | 0 ...68-453-ps3_remote_be_more_quiet-0.1.patch} | 0 ...c-471c468-454-disable_backslash-0.1.patch} | 0 ...-add_remote_irtrans_mediacenter-0.1.patch} | 0 ...471c468-463-add_remote_devinput-0.1.patch} | 0 ...4-add_eject_keymapping_for_lirc-0.1.patch} | 0 ...02-enable_afpfs_support_in_linux-0.1.patch | 38 ------------------- projects/ATV/options | 3 ++ projects/Fusion/options | 3 ++ projects/Generic/options | 3 ++ projects/Generic_OSS/options | 3 ++ projects/ION/options | 3 ++ projects/Intel/options | 3 ++ projects/Ultra/options | 3 ++ 27 files changed, 35 insertions(+), 40 deletions(-) rename packages/mediacenter/xbmc/patches/{xbmc-dab646e-001-add_support_to_specify_GIT_REV-0.1.patch => xbmc-471c468-001-add_support_to_specify_GIT_REV-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-dab646e-013-reenable_lcd_config_settings-0.1.patch => xbmc-471c468-013-reenable_lcd_config_settings-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-dab646e-303-fix_libdvd_xFLAGS-0.1.patch => xbmc-471c468-303-fix_libdvd_xFLAGS-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-dab646e-351-increase_YV12_buffers-0.1.patch => xbmc-471c468-351-increase_YV12_buffers-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-dab646e-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch => xbmc-471c468-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-dab646e-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch => xbmc-471c468-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-dab646e-402-enable_yasm_in_ffmpeg-0.1.patch => xbmc-471c468-402-enable_yasm_in_ffmpeg-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-dab646e-404-add_lame_check-0.6.patch => xbmc-471c468-404-add_lame_check-0.6.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-dab646e-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch => xbmc-471c468-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-dab646e-452-change_lcd_content-0.1.patch => xbmc-471c468-452-change_lcd_content-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-dab646e-453-add_openelec.tv_RSS_news-0.1.patch => xbmc-471c468-453-add_openelec.tv_RSS_news-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-dab646e-453-ps3_remote_be_more_quiet-0.1.patch => xbmc-471c468-453-ps3_remote_be_more_quiet-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-dab646e-454-disable_backslash-0.1.patch => xbmc-471c468-454-disable_backslash-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-dab646e-462-add_remote_irtrans_mediacenter-0.1.patch => xbmc-471c468-462-add_remote_irtrans_mediacenter-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-dab646e-463-add_remote_devinput-0.1.patch => xbmc-471c468-463-add_remote_devinput-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-dab646e-464-add_eject_keymapping_for_lirc-0.1.patch => xbmc-471c468-464-add_eject_keymapping_for_lirc-0.1.patch} (100%) delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-dab646e-302-enable_afpfs_support_in_linux-0.1.patch diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index 83621cb167..9df6137533 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-theme-Confluence/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-theme-Confluence" -PKG_VERSION="dab646e" +PKG_VERSION="471c468" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build index 4c3c276364..9b85af16f8 100755 --- a/packages/mediacenter/xbmc/build +++ b/packages/mediacenter/xbmc/build @@ -52,6 +52,12 @@ else XBMC_AIRPLAY="--disable-airplay" fi +if [ "$AIRTUNES_SUPPORT" = yes ]; then + XBMC_AIRTUNES="--enable-airtunes" +else + XBMC_AIRTUNES="--disable-airtunes" +fi + if [ "$DVDCSS_SUPPORT" = yes ]; then XBMC_DVDCSS="--enable-dvdcss" else @@ -203,6 +209,7 @@ cd $PKG_BUILD --disable-hal \ $XBMC_AVAHI \ $XBMC_AIRPLAY \ + $XBMC_AIRTUNES \ $XBMC_NONFREE \ --disable-asap-codec \ $XBMC_WEBSERVER \ diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index e7dd57a53e..9493fdd8c9 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="dab646e" +PKG_VERSION="471c468" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" @@ -72,6 +72,11 @@ if [ "$AIRPLAY_SUPPORT" = yes ]; then PKG_DEPENDS="$PKG_DEPENDS libplist" fi +if [ "$AIRTUNES_SUPPORT" = yes ]; then + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libshairport" + PKG_DEPENDS="$PKG_DEPENDS libshairport" +fi + if [ "$NFS_SUPPORT" = yes ]; then PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libnfs" PKG_DEPENDS="$PKG_DEPENDS libnfs" diff --git a/packages/mediacenter/xbmc/patches/xbmc-dab646e-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-471c468-001-add_support_to_specify_GIT_REV-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-dab646e-001-add_support_to_specify_GIT_REV-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-471c468-001-add_support_to_specify_GIT_REV-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-dab646e-013-reenable_lcd_config_settings-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-471c468-013-reenable_lcd_config_settings-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-dab646e-013-reenable_lcd_config_settings-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-471c468-013-reenable_lcd_config_settings-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-dab646e-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-471c468-303-fix_libdvd_xFLAGS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-dab646e-303-fix_libdvd_xFLAGS-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-471c468-303-fix_libdvd_xFLAGS-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-dab646e-351-increase_YV12_buffers-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-471c468-351-increase_YV12_buffers-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-dab646e-351-increase_YV12_buffers-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-471c468-351-increase_YV12_buffers-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-dab646e-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-471c468-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-dab646e-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-471c468-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-dab646e-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-471c468-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-dab646e-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-471c468-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-dab646e-402-enable_yasm_in_ffmpeg-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-471c468-402-enable_yasm_in_ffmpeg-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-dab646e-402-enable_yasm_in_ffmpeg-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-471c468-402-enable_yasm_in_ffmpeg-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-dab646e-404-add_lame_check-0.6.patch b/packages/mediacenter/xbmc/patches/xbmc-471c468-404-add_lame_check-0.6.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-dab646e-404-add_lame_check-0.6.patch rename to packages/mediacenter/xbmc/patches/xbmc-471c468-404-add_lame_check-0.6.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-dab646e-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-471c468-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-dab646e-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-471c468-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-dab646e-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-471c468-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-dab646e-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-471c468-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-dab646e-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-471c468-453-add_openelec.tv_RSS_news-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-dab646e-453-add_openelec.tv_RSS_news-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-471c468-453-add_openelec.tv_RSS_news-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-dab646e-453-ps3_remote_be_more_quiet-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-471c468-453-ps3_remote_be_more_quiet-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-dab646e-453-ps3_remote_be_more_quiet-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-471c468-453-ps3_remote_be_more_quiet-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-dab646e-454-disable_backslash-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-471c468-454-disable_backslash-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-dab646e-454-disable_backslash-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-471c468-454-disable_backslash-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-dab646e-462-add_remote_irtrans_mediacenter-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-471c468-462-add_remote_irtrans_mediacenter-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-dab646e-462-add_remote_irtrans_mediacenter-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-471c468-462-add_remote_irtrans_mediacenter-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-dab646e-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-471c468-463-add_remote_devinput-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-dab646e-463-add_remote_devinput-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-471c468-463-add_remote_devinput-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-dab646e-464-add_eject_keymapping_for_lirc-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-471c468-464-add_eject_keymapping_for_lirc-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-dab646e-464-add_eject_keymapping_for_lirc-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-471c468-464-add_eject_keymapping_for_lirc-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-dab646e-302-enable_afpfs_support_in_linux-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-dab646e-302-enable_afpfs_support_in_linux-0.1.patch deleted file mode 100644 index 9036c72d05..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-dab646e-302-enable_afpfs_support_in_linux-0.1.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -Naur xbmc-dab646e/configure.in xbmc-dab646e.patch/configure.in ---- xbmc-dab646e/configure.in 2011-09-27 15:56:42.000000000 +0200 -+++ xbmc-dab646e.patch/configure.in 2011-09-27 17:31:10.639824226 +0200 -@@ -987,27 +987,22 @@ - fi - - # libafpclient --USE_LIBAFPCLIENT=0 --if test "$host_vendor" = "apple" ; then -- if test "x$use_libafpclient" != "xno"; then -- AC_CHECK_HEADERS([afpfs-ng/libafpclient.h],, -- [if test "x$use_libafpclient" = "xyes"; then -+if test "x$use_libafpclient" != "xno"; then -+ AC_CHECK_HEADERS([afpfs-ng/libafpclient.h],, -+ [if test "x$use_libafpclient" = "xyes"; then - AC_MSG_ERROR($libafpclient_not_found) -- elif test "x$use_libafpclient" != "xno"; then -+ elif test "x$use_libafpclient" != "xno"; then - AC_MSG_NOTICE($libafpclient_not_found) - use_libafpclient="no" -- fi -- ]) -+ fi -+ ]) - if test "x$use_libafpclient" != "xno"; then - XB_FIND_SONAME([AFPCLIENT], [afpclient], [use_libafpclient]) - AC_DEFINE([HAVE_LIBAFPCLIENT], [1], [Whether to use libafpclient library.]) - USE_LIBAFPCLIENT=1 - fi -- else -- AC_MSG_NOTICE($libafpclient_disabled) -- fi - else -- use_libafpclient="no" -+ AC_MSG_NOTICE($libafpclient_disabled) - fi - - # libplist for airplay feature diff --git a/projects/ATV/options b/projects/ATV/options index 34aa17baec..12fadb8331 100644 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -158,6 +158,9 @@ # build with AirPlay support (stream videos from iDevices to XBMC) (yes / no) AIRPLAY_SUPPORT="yes" +# build with AirTunes support (stream music from iDevices to XBMC) (yes / no) + AIRTUNES_SUPPORT="yes" + # build with libnfs support (mounting nfs shares with XBMC) (yes / no) NFS_SUPPORT="yes" diff --git a/projects/Fusion/options b/projects/Fusion/options index 05439924b8..f2d82a1fd9 100644 --- a/projects/Fusion/options +++ b/projects/Fusion/options @@ -158,6 +158,9 @@ # build with AirPlay support (stream videos from iDevices to XBMC) (yes / no) AIRPLAY_SUPPORT="yes" +# build with AirTunes support (stream music from iDevices to XBMC) (yes / no) + AIRTUNES_SUPPORT="yes" + # build with libnfs support (mounting nfs shares with XBMC) (yes / no) NFS_SUPPORT="yes" diff --git a/projects/Generic/options b/projects/Generic/options index c967f26f20..b576232a11 100644 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -158,6 +158,9 @@ # build with AirPlay support (stream videos from iDevices to XBMC) (yes / no) AIRPLAY_SUPPORT="yes" +# build with AirTunes support (stream music from iDevices to XBMC) (yes / no) + AIRTUNES_SUPPORT="yes" + # build with libnfs support (mounting nfs shares with XBMC) (yes / no) NFS_SUPPORT="yes" diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options index 1c6c644b7f..a30453e043 100644 --- a/projects/Generic_OSS/options +++ b/projects/Generic_OSS/options @@ -158,6 +158,9 @@ # build with AirPlay support (stream videos from iDevices to XBMC) (yes / no) AIRPLAY_SUPPORT="yes" +# build with AirTunes support (stream music from iDevices to XBMC) (yes / no) + AIRTUNES_SUPPORT="yes" + # build with libnfs support (mounting nfs shares with XBMC) (yes / no) NFS_SUPPORT="yes" diff --git a/projects/ION/options b/projects/ION/options index d52282a17c..7530327924 100644 --- a/projects/ION/options +++ b/projects/ION/options @@ -158,6 +158,9 @@ # build with AirPlay support (stream videos from iDevices to XBMC) (yes / no) AIRPLAY_SUPPORT="yes" +# build with AirTunes support (stream music from iDevices to XBMC) (yes / no) + AIRTUNES_SUPPORT="yes" + # build with libnfs support (mounting nfs shares with XBMC) (yes / no) NFS_SUPPORT="yes" diff --git a/projects/Intel/options b/projects/Intel/options index 543f816c02..c96b19fcc6 100644 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -158,6 +158,9 @@ # build with AirPlay support (stream videos from iDevices to XBMC) (yes / no) AIRPLAY_SUPPORT="yes" +# build with AirTunes support (stream music from iDevices to XBMC) (yes / no) + AIRTUNES_SUPPORT="yes" + # build with libnfs support (mounting nfs shares with XBMC) (yes / no) NFS_SUPPORT="yes" diff --git a/projects/Ultra/options b/projects/Ultra/options index f2200845f6..1baf7e40d5 100644 --- a/projects/Ultra/options +++ b/projects/Ultra/options @@ -158,6 +158,9 @@ # build with AirPlay support (stream videos from iDevices to XBMC) (yes / no) AIRPLAY_SUPPORT="yes" +# build with AirTunes support (stream music from iDevices to XBMC) (yes / no) + AIRTUNES_SUPPORT="yes" + # build and install with NFS mount support in XBMC (yes / no) NFS_SUPPORT="yes"