diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index 40e7cda8f7..2ed6e1577a 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="e6b1484" +PKG_VERSION="9389dc8" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index 12b88c90a4..c77eae6b37 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="e6b1484" +PKG_VERSION="9389dc8" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/patches/xbmc-e6b1484-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-9389dc8-001-add_support_to_specify_GIT_REV-0.1.patch similarity index 76% rename from packages/mediacenter/xbmc/patches/xbmc-e6b1484-001-add_support_to_specify_GIT_REV-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-9389dc8-001-add_support_to_specify_GIT_REV-0.1.patch index 89a229d0d0..c013e0ae3a 100644 --- a/packages/mediacenter/xbmc/patches/xbmc-e6b1484-001-add_support_to_specify_GIT_REV-0.1.patch +++ b/packages/mediacenter/xbmc/patches/xbmc-9389dc8-001-add_support_to_specify_GIT_REV-0.1.patch @@ -1,7 +1,7 @@ -diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in ---- xbmc-pvr-3513480/configure.in 2011-04-25 02:36:33.000000000 +0200 -+++ xbmc-pvr-3513480.patch/configure.in 2011-04-25 03:05:04.609266887 +0200 -@@ -380,6 +380,14 @@ +diff -Naur xbmc-9389dc8/configure.in xbmc-9389dc8.patch/configure.in +--- xbmc-9389dc8/configure.in 2011-09-01 17:21:47.000000000 +0200 ++++ xbmc-9389dc8.patch/configure.in 2011-09-01 23:30:40.419399392 +0200 +@@ -428,6 +428,14 @@ esac AC_SUBST([ARCH]) @@ -16,7 +16,7 @@ diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in # platform debug flags if test "$use_debug" = "yes"; then final_message="$final_message\n Debugging:\tYes" -@@ -1090,7 +1098,6 @@ +@@ -1177,7 +1185,6 @@ fi fi @@ -24,7 +24,7 @@ diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in # Checks for header files. AC_HEADER_DIRENT -@@ -1279,12 +1286,6 @@ +@@ -1408,12 +1415,6 @@ final_message="$final_message\n Avahi:\tNo" fi diff --git a/packages/mediacenter/xbmc/patches/xbmc-e6b1484-013-reenable_lcd_config_settings-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-9389dc8-013-reenable_lcd_config_settings-0.1.patch similarity index 54% rename from packages/mediacenter/xbmc/patches/xbmc-e6b1484-013-reenable_lcd_config_settings-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-9389dc8-013-reenable_lcd_config_settings-0.1.patch index c8bb48ac28..656dcac934 100644 --- a/packages/mediacenter/xbmc/patches/xbmc-e6b1484-013-reenable_lcd_config_settings-0.1.patch +++ b/packages/mediacenter/xbmc/patches/xbmc-9389dc8-013-reenable_lcd_config_settings-0.1.patch @@ -1,7 +1,7 @@ -diff -Naur xbmc-eedceeb/xbmc/settings/GUISettings.cpp xbmc-eedceeb.patch/xbmc/settings/GUISettings.cpp ---- xbmc-eedceeb/xbmc/settings/GUISettings.cpp 2011-06-18 21:30:30.000000000 +0200 -+++ xbmc-eedceeb.patch/xbmc/settings/GUISettings.cpp 2011-06-18 22:02:53.535611620 +0200 -@@ -422,7 +422,8 @@ +diff -Naur xbmc-9389dc8/xbmc/settings/GUISettings.cpp xbmc-9389dc8.patch/xbmc/settings/GUISettings.cpp +--- xbmc-9389dc8/xbmc/settings/GUISettings.cpp 2011-09-01 23:34:05.267139356 +0200 ++++ xbmc-9389dc8.patch/xbmc/settings/GUISettings.cpp 2011-09-01 23:34:52.098765331 +0200 +@@ -423,7 +423,8 @@ AddString(vs, "videoscreen.testpattern",226,"", BUTTON_CONTROL_STANDARD); #endif #if defined(_LINUX) && !defined(__APPLE__) diff --git a/packages/mediacenter/xbmc/patches/xbmc-e6b1484-201-let_select_XBMCProjectM-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-9389dc8-201-let_select_XBMCProjectM-0.1.patch similarity index 55% rename from packages/mediacenter/xbmc/patches/xbmc-e6b1484-201-let_select_XBMCProjectM-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-9389dc8-201-let_select_XBMCProjectM-0.1.patch index 0b89364acb..90ca4d1f01 100644 --- a/packages/mediacenter/xbmc/patches/xbmc-e6b1484-201-let_select_XBMCProjectM-0.1.patch +++ b/packages/mediacenter/xbmc/patches/xbmc-9389dc8-201-let_select_XBMCProjectM-0.1.patch @@ -1,18 +1,18 @@ -diff -Naur xbmc-1d9a8e0/configure.in xbmc-1d9a8e0.patch/configure.in ---- xbmc-1d9a8e0/configure.in 2011-08-09 06:37:07.000000000 +0200 -+++ xbmc-1d9a8e0.patch/configure.in 2011-08-09 06:58:57.094093611 +0200 -@@ -66,6 +66,8 @@ - xrandr_disabled="== XRandR support disabled. SDL will be used for resolution support. ==" - goom_enabled="== GOOM enabled. ==" +diff -Naur xbmc-9389dc8/configure.in xbmc-9389dc8.patch/configure.in +--- xbmc-9389dc8/configure.in 2011-09-01 23:34:05.488142309 +0200 ++++ xbmc-9389dc8.patch/configure.in 2011-09-01 23:51:26.371021628 +0200 +@@ -68,6 +68,8 @@ goom_disabled="== GOOM disabled. ==" + rsxs_enabled="== RSXS enabled. ==" + rsxs_disabled="== RSXS disabled. ==" +xbmcprojectm_enabled="== XBMCProjectM enabled. ==" +xbmxprojectm_disabled="== XBMCProjectM disabled. ==" + x11_enabled="== X11 enabled. ==" + x11_disabled="== X11 disabled. ==" pulse_not_found="== Could not find libpulse. PulseAudio support disabled. ==" - pulse_disabled="== PulseAudio support manually disabled. ==" - dvdcss_enabled="== DVDCSS support enabled. ==" -@@ -208,6 +210,12 @@ - [use_goom=$enableval], - [use_goom=no]) +@@ -219,6 +221,12 @@ + [use_rsxs=$enableval], + [use_rsxs=yes]) +AC_ARG_ENABLE([xbmcprojectm], + [AS_HELP_STRING([--enable-xbmcprojectm], @@ -20,27 +20,27 @@ diff -Naur xbmc-1d9a8e0/configure.in xbmc-1d9a8e0.patch/configure.in + [use_xbmcprojectm=$enableval], + [use_xbmcprojectm=yes]) + - AC_ARG_ENABLE([ccache], - [AS_HELP_STRING([--enable-ccache], - [enable building with ccache feature (default is auto)])], -@@ -803,6 +811,15 @@ + AC_ARG_ENABLE([x11], + [AS_HELP_STRING([--enable-x11], + [enable x11 (default is yes) 'Linux Only'])], +@@ -850,6 +858,15 @@ fi fi +# XBMCPROJECTM -+if test "$use_xbmcprojectm" = "yes" && test "use_gl" == "yes"; then -+ AC_MSG_NOTICE($xbmcprojectm_enabled) -+ DISABLE_XBMCPROJECTM=0 -+else ++if test "$use_xbmcprojectm" = "no" || test "$use_gl" = "no"; then + AC_MSG_NOTICE($xbmcprojectm_disabled) + DISABLE_XBMCPROJECTM=1 ++else ++ AC_MSG_NOTICE($xbmcprojectm_enabled) ++ DISABLE_XBMCPROJECTM=0 +fi + # libRTMP if test "$use_librtmp" != "no"; then AC_CHECK_HEADERS([librtmp/log.h librtmp/amf.h librtmp/rtmp.h],, -@@ -1266,6 +1283,12 @@ - final_message="$final_message\n GOOM:\t\tNo" +@@ -1324,6 +1341,12 @@ + final_message="$final_message\n RSXS:\t\tNo" fi +if test "$use_xbmcprojectm" = "yes"; then @@ -49,18 +49,18 @@ diff -Naur xbmc-1d9a8e0/configure.in xbmc-1d9a8e0.patch/configure.in + final_message="$final_message\n XBMCProjectM:\tNo" +fi + - if test "$use_libbluray" = "yes"; then - final_message="$final_message\n Bluray:\tYes" + if test "$use_x11" = "yes"; then + final_message="$final_message\n X11:\t\tYes" else -@@ -1495,6 +1518,7 @@ - AC_SUBST(SDL_DEFINES) +@@ -1553,6 +1576,7 @@ AC_SUBST(BUILD_DVDCSS) AC_SUBST(DISABLE_GOOM) + AC_SUBST(DISABLE_RSXS) +AC_SUBST(DISABLE_XBMCPROJECTM) AC_SUBST(USE_EXTERNAL_FFMPEG) AC_SUBST(PYTHON_VERSION) AC_SUBST(OUTPUT_FILES) -@@ -1739,7 +1763,7 @@ +@@ -1797,7 +1821,7 @@ fi set +x fi @@ -69,9 +69,9 @@ diff -Naur xbmc-1d9a8e0/configure.in xbmc-1d9a8e0.patch/configure.in XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[ ./configure \ -diff -Naur xbmc-1d9a8e0/Makefile.in xbmc-1d9a8e0.patch/Makefile.in ---- xbmc-1d9a8e0/Makefile.in 2011-08-09 06:37:11.000000000 +0200 -+++ xbmc-1d9a8e0.patch/Makefile.in 2011-08-09 07:01:36.862090884 +0200 +diff -Naur xbmc-9389dc8/Makefile.in xbmc-9389dc8.patch/Makefile.in +--- xbmc-9389dc8/Makefile.in 2011-09-01 23:34:05.581143554 +0200 ++++ xbmc-9389dc8.patch/Makefile.in 2011-09-01 23:52:59.832272157 +0200 @@ -144,8 +144,10 @@ ifeq (@USE_OPENGL@,1) VIS_DIRS+=\ @@ -80,7 +80,7 @@ diff -Naur xbmc-1d9a8e0/Makefile.in xbmc-1d9a8e0.patch/Makefile.in - xbmc/visualizations/XBMCProjectM + xbmc/visualizations/WaveForm +ifneq (@DISABLE_XBMCPROJECTM@,1) -+VIS_DIRS+=xbmc/visualizations/XBMCProjectM ++ VIS_DIRS+=xbmc/visualizations/XBMCProjectM +endif endif diff --git a/packages/mediacenter/xbmc/patches/xbmc-e6b1484-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-9389dc8-303-fix_libdvd_xFLAGS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-e6b1484-303-fix_libdvd_xFLAGS-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-9389dc8-303-fix_libdvd_xFLAGS-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-e6b1484-351-increase_YV12_buffers-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-9389dc8-351-increase_YV12_buffers-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-e6b1484-351-increase_YV12_buffers-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-9389dc8-351-increase_YV12_buffers-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-e6b1484-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-9389dc8-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-e6b1484-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-9389dc8-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-e6b1484-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-9389dc8-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-e6b1484-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-9389dc8-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-e6b1484-402-enable_yasm_in_ffmpeg-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-9389dc8-402-enable_yasm_in_ffmpeg-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-e6b1484-402-enable_yasm_in_ffmpeg-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-9389dc8-402-enable_yasm_in_ffmpeg-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-e6b1484-404-add_lame_check-0.6.patch b/packages/mediacenter/xbmc/patches/xbmc-9389dc8-404-add_lame_check-0.6.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-e6b1484-404-add_lame_check-0.6.patch rename to packages/mediacenter/xbmc/patches/xbmc-9389dc8-404-add_lame_check-0.6.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-e6b1484-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-9389dc8-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-e6b1484-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-9389dc8-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-e6b1484-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-9389dc8-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-e6b1484-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-9389dc8-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-e6b1484-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-9389dc8-453-add_openelec.tv_RSS_news-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-e6b1484-453-add_openelec.tv_RSS_news-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-9389dc8-453-add_openelec.tv_RSS_news-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-e6b1484-453-ps3_remote_be_more_quiet-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-9389dc8-453-ps3_remote_be_more_quiet-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-e6b1484-453-ps3_remote_be_more_quiet-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-9389dc8-453-ps3_remote_be_more_quiet-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-e6b1484-454-disable_backslash-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-9389dc8-454-disable_backslash-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-e6b1484-454-disable_backslash-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-9389dc8-454-disable_backslash-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-e6b1484-462-add_remote_irtrans_mediacenter-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-9389dc8-462-add_remote_irtrans_mediacenter-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-e6b1484-462-add_remote_irtrans_mediacenter-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-9389dc8-462-add_remote_irtrans_mediacenter-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-e6b1484-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-9389dc8-463-add_remote_devinput-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-e6b1484-463-add_remote_devinput-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-9389dc8-463-add_remote_devinput-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-e6b1484-464-add_eject_keymapping_for_lirc-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-9389dc8-464-add_eject_keymapping_for_lirc-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-e6b1484-464-add_eject_keymapping_for_lirc-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-9389dc8-464-add_eject_keymapping_for_lirc-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-e6b1484-901-advancedsettings_alwaysextractflags.patch b/packages/mediacenter/xbmc/patches/xbmc-9389dc8-901-advancedsettings_alwaysextractflags.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-e6b1484-901-advancedsettings_alwaysextractflags.patch rename to packages/mediacenter/xbmc/patches/xbmc-9389dc8-901-advancedsettings_alwaysextractflags.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-e6b1484-202-let_select_RSXS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-e6b1484-202-let_select_RSXS-0.1.patch deleted file mode 100644 index 6d8f41d1bd..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-e6b1484-202-let_select_RSXS-0.1.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff -Naur xbmc-1d9a8e0/configure.in xbmc-1d9a8e0.patch/configure.in ---- xbmc-1d9a8e0/configure.in 2011-08-09 07:03:00.703139237 +0200 -+++ xbmc-1d9a8e0.patch/configure.in 2011-08-09 07:03:18.731364683 +0200 -@@ -68,6 +68,8 @@ - goom_disabled="== GOOM disabled. ==" - xbmcprojectm_enabled="== XBMCProjectM enabled. ==" - xbmxprojectm_disabled="== XBMCProjectM disabled. ==" -+rsxs_enabled="== RSXS enabled. ==" -+rsxs_disabled="== RSXS disabled. ==" - pulse_not_found="== Could not find libpulse. PulseAudio support disabled. ==" - pulse_disabled="== PulseAudio support manually disabled. ==" - dvdcss_enabled="== DVDCSS support enabled. ==" -@@ -216,6 +218,12 @@ - [use_xbmcprojectm=$enableval], - [use_xbmcprojectm=yes]) - -+AC_ARG_ENABLE([rsxs], -+ [AS_HELP_STRING([--enable-rsxs], -+ [enable RSXS Screensaver (default is yes)])], -+ [use_rsxs=$enableval], -+ [use_rsxs=yes]) -+ - AC_ARG_ENABLE([ccache], - [AS_HELP_STRING([--enable-ccache], - [enable building with ccache feature (default is auto)])], -@@ -820,6 +828,15 @@ - DISABLE_XBMCPROJECTM=1 - fi - -+# RSXS -+if test "$use_rsxs" = "yes" && test "use_gl" == "yes"; then -+ AC_MSG_NOTICE($rsxs_enabled) -+ DISABLE_RSXS=0 -+else -+ AC_MSG_NOTICE($rsxs_disabled) -+ DISABLE_RSXS=1 -+fi -+ - # libRTMP - if test "$use_librtmp" != "no"; then - AC_CHECK_HEADERS([librtmp/log.h librtmp/amf.h librtmp/rtmp.h],, -@@ -1289,6 +1306,12 @@ - final_message="$final_message\n XBMCProjectM:\tNo" - fi - -+if test "$use_rsxs" = "yes"; then -+ final_message="$final_message\n RSXS:\t\tYes" -+else -+ final_message="$final_message\n RSXS:\t\tNo" -+fi -+ - if test "$use_libbluray" = "yes"; then - final_message="$final_message\n Bluray:\tYes" - else -@@ -1519,6 +1542,7 @@ - AC_SUBST(BUILD_DVDCSS) - AC_SUBST(DISABLE_GOOM) - AC_SUBST(DISABLE_XBMCPROJECTM) -+AC_SUBST(DISABLE_RSXS) - AC_SUBST(USE_EXTERNAL_FFMPEG) - AC_SUBST(PYTHON_VERSION) - AC_SUBST(OUTPUT_FILES) -@@ -1801,7 +1825,7 @@ - --disable-lattice \ - --disable-skyrocket - fi --], [0]) -+], [$DISABLE_RSXS]) - - XB_CONFIG_MODULE([lib/libapetag], [ - ./configure \ -diff -Naur xbmc-1d9a8e0/Makefile.in xbmc-1d9a8e0.patch/Makefile.in ---- xbmc-1d9a8e0/Makefile.in 2011-08-09 07:03:00.704139249 +0200 -+++ xbmc-1d9a8e0.patch/Makefile.in 2011-08-09 07:05:02.890667374 +0200 -@@ -137,8 +137,10 @@ - - SS_DIRS= - ifeq (@USE_OPENGL@,1) -+ifneq (@DISABLE_RSXS@,1) - SS_DIRS+= xbmc/screensavers/rsxs-0.9/xbmc - endif -+endif - - VIS_DIRS= - ifeq (@USE_OPENGL@,1)