Merge branch 'openelec-eden' of github.com:OpenELEC/OpenELEC.tv into openelec-pvr

2025-07-31 14:37:59 +00:00 · 2011-07-28 17:54:39 +02:00 · 2011-07-28 17:54:39 +02:00 · fc4eacc09b
commit fc4eacc09b
parent 4e2a5a68d5 a69cb88cb4
7 changed files with 42 additions and 67 deletions
--- a/packages/debug/gdb/meta
+++ b/packages/debug/gdb/meta
@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="gdb"
-PKG_VERSION="7.2"
+PKG_VERSION="7.3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/debug/gdb/patches/gdb-7.3-10-uclibc_conf.patch
+++ b/packages/debug/gdb/patches/gdb-7.3-10-uclibc_conf.patch
--- a/packages/mediacenter/xbmc/patches/xbmc-30a9070-201-let_select_XBMCProjectM-0.1.patch
+++ b/packages/mediacenter/xbmc/patches/xbmc-30a9070-201-let_select_XBMCProjectM-0.1.patch
@ -1,6 +1,6 @@
-diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in
--- xbmc-pvr-3513480/configure.in	2011-04-25 03:08:17.936138616 +0200
-+++ xbmc-pvr-3513480.patch/configure.in	2011-04-25 03:24:35.056907267 +0200
+diff -Naur xbmc-30a9070/configure.in xbmc-30a9070.patch/configure.in
+--- xbmc-30a9070/configure.in	2011-07-28 06:20:11.000000000 +0200
+++ xbmc-30a9070.patch/configure.in	2011-07-28 09:03:13.184376904 +0200
@@ -66,6 +66,8 @@
 xrandr_disabled="== XRandR support disabled. SDL will be used for resolution support. =="
 goom_enabled="== GOOM enabled. =="
@ -10,7 +10,7 @@ diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in
 pulse_not_found="== Could not find libpulse. PulseAudio support disabled. =="
 pulse_disabled="== PulseAudio support manually disabled. =="
 dvdcss_enabled="== DVDCSS support enabled. =="
-@@ -204,6 +206,12 @@
+@@ -207,6 +209,12 @@
   [use_goom=$enableval],
   [use_goom=no])
 
@ -23,7 +23,7 @@ diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in
 AC_ARG_ENABLE([ccache],
   [AS_HELP_STRING([--enable-ccache],
   [enable building with ccache feature (default is auto)])],
-@@ -807,6 +815,15 @@
+@@ -804,6 +812,15 @@
   fi
 fi
 
@ -39,7 +39,7 @@ diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in
 # libRTMP
 if test "$use_librtmp" != "no"; then
   AC_CHECK_HEADERS([librtmp/log.h librtmp/amf.h librtmp/rtmp.h],,
-@@ -1216,6 +1233,12 @@
+@@ -1258,6 +1275,12 @@
   final_message="$final_message\n  GOOM:\t\tNo"
 fi
 
@ -52,7 +52,7 @@ diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in
 if test "$use_libbluray" = "yes"; then
   final_message="$final_message\n  Bluray:\tYes"
 else
-@@ -1422,6 +1445,7 @@
+@@ -1486,6 +1509,7 @@
 AC_SUBST(SDL_DEFINES)
 AC_SUBST(BUILD_DVDCSS)
 AC_SUBST(DISABLE_GOOM)
@ -60,8 +60,8 @@ diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in
 AC_SUBST(USE_EXTERNAL_FFMPEG)
 AC_SUBST(PYTHON_VERSION)
 AC_SUBST(OUTPUT_FILES)
-@@ -1647,7 +1671,7 @@
-       -DSYSCONF_INSTALL_DIR:PATH="${sysconfdir}" -DSHARE_INSTALL_PREFIX:PATH="${datadir}" .
+@@ -1729,7 +1753,7 @@
+     fi
 set +x
 fi
 -], [0])
@ -69,10 +69,10 @@ diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in
 
 XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
   ./configure  \
-diff -Naur xbmc-pvr-3513480/Makefile.in xbmc-pvr-3513480.patch/Makefile.in
--- xbmc-pvr-3513480/Makefile.in	2011-04-25 02:36:33.000000000 +0200
-+++ xbmc-pvr-3513480.patch/Makefile.in	2011-04-25 03:15:20.988746910 +0200
-@@ -140,8 +140,11 @@
+diff -Naur xbmc-30a9070/Makefile.in xbmc-30a9070.patch/Makefile.in
+--- xbmc-30a9070/Makefile.in	2011-07-28 06:20:13.000000000 +0200
+++ xbmc-30a9070.patch/Makefile.in	2011-07-28 09:03:13.186376930 +0200
+@@ -143,8 +143,11 @@
 ifeq (@USE_OPENGL@,1)
 VIS_DIRS+=\
 	xbmc/visualizations/OpenGLSpectrum \
--- a/packages/mediacenter/xbmc/patches/xbmc-30a9070-202-let_select_RSXS-0.1.patch
+++ b/packages/mediacenter/xbmc/patches/xbmc-30a9070-202-let_select_RSXS-0.1.patch
@ -1,6 +1,6 @@
-diff -Naur xbmc-04e78f4/configure.in xbmc-04e78f4.patch/configure.in
--- xbmc-04e78f4/configure.in	2011-04-26 20:01:52.765037011 +0200
-+++ xbmc-04e78f4.patch/configure.in	2011-04-26 20:02:20.083478775 +0200
+diff -Naur xbmc-30a9070/configure.in xbmc-30a9070.patch/configure.in
+--- xbmc-30a9070/configure.in	2011-07-28 09:05:20.854037605 +0200
+++ xbmc-30a9070.patch/configure.in	2011-07-28 09:05:32.890194108 +0200
@@ -68,6 +68,8 @@
 goom_disabled="== GOOM disabled. =="
 xbmcprojectm_enabled="== XBMCProjectM enabled. =="
@ -10,7 +10,7 @@ diff -Naur xbmc-04e78f4/configure.in xbmc-04e78f4.patch/configure.in
 pulse_not_found="== Could not find libpulse. PulseAudio support disabled. =="
 pulse_disabled="== PulseAudio support manually disabled. =="
 dvdcss_enabled="== DVDCSS support enabled. =="
-@@ -212,6 +214,12 @@
+@@ -215,6 +217,12 @@
   [use_xbmcprojectm=$enableval],
   [use_xbmcprojectm=yes])
 
@ -23,7 +23,7 @@ diff -Naur xbmc-04e78f4/configure.in xbmc-04e78f4.patch/configure.in
 AC_ARG_ENABLE([ccache],
   [AS_HELP_STRING([--enable-ccache],
   [enable building with ccache feature (default is auto)])],
-@@ -816,6 +824,15 @@
+@@ -821,6 +829,15 @@
   DISABLE_XBMCPROJECTM=1
 fi
 
@ -39,7 +39,7 @@ diff -Naur xbmc-04e78f4/configure.in xbmc-04e78f4.patch/configure.in
 # libRTMP
 if test "$use_librtmp" != "no"; then
   AC_CHECK_HEADERS([librtmp/log.h librtmp/amf.h librtmp/rtmp.h],,
-@@ -1232,6 +1249,12 @@
+@@ -1281,6 +1298,12 @@
   final_message="$final_message\n  XBMCProjectM:\tNo"
 fi
 
@ -52,7 +52,7 @@ diff -Naur xbmc-04e78f4/configure.in xbmc-04e78f4.patch/configure.in
 if test "$use_libbluray" = "yes"; then
   final_message="$final_message\n  Bluray:\tYes"
 else
-@@ -1439,6 +1462,7 @@
+@@ -1510,6 +1533,7 @@
 AC_SUBST(BUILD_DVDCSS)
 AC_SUBST(DISABLE_GOOM)
 AC_SUBST(DISABLE_XBMCPROJECTM)
@ -60,7 +60,7 @@ diff -Naur xbmc-04e78f4/configure.in xbmc-04e78f4.patch/configure.in
 AC_SUBST(USE_EXTERNAL_FFMPEG)
 AC_SUBST(PYTHON_VERSION)
 AC_SUBST(OUTPUT_FILES)
-@@ -1702,7 +1726,7 @@
+@@ -1791,7 +1815,7 @@
     --disable-lattice \
     --disable-skyrocket
 fi
@ -69,30 +69,17 @@ diff -Naur xbmc-04e78f4/configure.in xbmc-04e78f4.patch/configure.in
 
 XB_CONFIG_MODULE([lib/libapetag], [
   ./configure \
-diff -Naur xbmc-04e78f4/Makefile.in xbmc-04e78f4.patch/Makefile.in
--- xbmc-04e78f4/Makefile.in	2011-04-26 20:01:52.767036969 +0200
-+++ xbmc-04e78f4.patch/Makefile.in	2011-04-26 20:03:45.888725973 +0200
-@@ -125,8 +125,10 @@
- 	lib/xbmc-dll-symbols \
- 	lib/jsoncpp/src/lib_json
+diff -Naur xbmc-30a9070/Makefile.in xbmc-30a9070.patch/Makefile.in
+--- xbmc-30a9070/Makefile.in	2011-07-28 09:05:20.856037631 +0200
+++ xbmc-30a9070.patch/Makefile.in	2011-07-28 09:10:44.898247687 +0200
+@@ -136,8 +136,10 @@
 
-SS_DIRS=\
-	xbmc/screensavers/rsxs-0.9/xbmc
-+SS_DIRS=
+ SS_DIRS=
+ ifeq (@USE_OPENGL@,1)
 +ifneq (@DISABLE_RSXS@,1)
-+SS_DIRS=+xbmc/screensavers/rsxs-0.9/xbmc
+ SS_DIRS+= xbmc/screensavers/rsxs-0.9/xbmc
+ endif
 +endif
 
 VIS_DIRS=
 ifeq (@USE_OPENGL@,1)
-@@ -377,8 +379,10 @@
- 	for d in $(VIS_DIRS); do $(MAKE) -C $$d; done
- screensavers: exports
- ifeq (@USE_OPENGL@,1)
-+ifneq (@DISABLE_RSXS@,1)
- 	$(MAKE) -C xbmc/screensavers/rsxs-0.9/xbmc
- endif
-+endif
- libpython: dllloader
- 	$(MAKE) -C xbmc/interfaces/python
- 	$(MAKE) -C xbmc/interfaces/python/xbmcmodule
--- a/packages/mediacenter/xbmc/patches/xbmc-30a9070-321-CrystalHD_use_yuy2_to_yv12-0.1.patch
+++ b/packages/mediacenter/xbmc/patches/xbmc-30a9070-321-CrystalHD_use_yuy2_to_yv12-0.1.patch
@ -1,12 +0,0 @@
-diff -Naur xbmc-pvr-3513480/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp xbmc-pvr-3513480.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp
--- xbmc-pvr-3513480/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp	2011-04-25 02:36:33.000000000 +0200
-+++ xbmc-pvr-3513480.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp	2011-04-25 05:07:26.043098079 +0200
-@@ -771,7 +771,7 @@
-           if (!pBuffer)
-           {
-             // No free pre-allocated buffers so make one
-#ifdef _WIN32
-+#if 1
-             // force Windows to use YV12 until DX renderer gets NV12 or YUY2 capability.
-             pBuffer = new CPictureBuffer(DVDVideoPicture::FMT_YUV420P, m_width, m_height);
- #else
--- a/packages/mediacenter/xbmc/patches/xbmc-30a9070-454-disable_backslash-0.1.patch
+++ b/packages/mediacenter/xbmc/patches/xbmc-30a9070-454-disable_backslash-0.1.patch
@ -1,12 +1,12 @@
-diff -Naur xbmc-10.1-Dharma/system/keymaps/keyboard.xml xbmc-10.1-Dharma.patch/system/keymaps/keyboard.xml
--- xbmc-10.1-Dharma/system/keymaps/keyboard.xml	2011-03-08 02:49:23.000000000 +0100
-+++ xbmc-10.1-Dharma.patch/system/keymaps/keyboard.xml	2011-07-23 18:04:59.406603684 +0200
-@@ -75,7 +75,7 @@
-       <seven>Number7</seven>
-       <eight>Number8</eight>
-       <nine>Number9</nine>
+diff -Naur xbmc-30a9070/system/keymaps/keyboard.xml xbmc-30a9070.patch/system/keymaps/keyboard.xml
+--- xbmc-30a9070/system/keymaps/keyboard.xml	2011-07-28 06:20:13.000000000 +0200
+++ xbmc-30a9070.patch/system/keymaps/keyboard.xml	2011-07-28 09:39:57.210973380 +0200
+@@ -90,7 +90,7 @@
+       <numpadseven>Number7</numpadseven>
+       <numpadeight>Number8</numpadeight>
+       <numpadnine>Number9</numpadnine>
 -      <backslash>ToggleFullScreen</backslash>
-+<!--      <backslash>ToggleFullScreen</backslash>   -->
-       <browser_home>XBMC.ActivateWindow(Home)</browser_home>
-       <browser_favorites>ActivateWindow(Favourites)</browser_favorites>
-       <browser_refresh/>
+      <!-- <backslash>ToggleFullScreen</backslash> -->
+       <home>FirstPage</home>
+       <end>LastPage</end>
+       <!-- Multimedia keyboard keys -->
--- a/packages/tools/flashrom/meta
+++ b/packages/tools/flashrom/meta
@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="flashrom"
-PKG_VERSION="1283"
+PKG_VERSION="1061"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"