jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Stephan Raue 2011-08-09 14:59:17 +02:00
commit 239e5b0b06
19 changed files with 33 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/mediacenter/xbmc-theme-Confluence/meta
View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xbmc-theme-Confluence"
PKG_VERSION="ab67480"
PKG_VERSION="32d0382"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

2
packages/mediacenter/xbmc/meta
View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xbmc"
PKG_VERSION="ab67480"
PKG_VERSION="32d0382"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

0
packages/mediacenter/xbmc/patches/xbmc-ab67480-001-add_support_to_specify_GIT_REV-0.1.patch → packages/mediacenter/xbmc/patches/xbmc-32d0382-001-add_support_to_specify_GIT_REV-0.1.patch
View File

0
packages/mediacenter/xbmc/patches/xbmc-ab67480-013-reenable_lcd_config_settings-0.1.patch → packages/mediacenter/xbmc/patches/xbmc-32d0382-013-reenable_lcd_config_settings-0.1.patch
View File

31
packages/mediacenter/xbmc/patches/xbmc-ab67480-201-let_select_XBMCProjectM-0.1.patch → packages/mediacenter/xbmc/patches/xbmc-32d0382-201-let_select_XBMCProjectM-0.1.patch
View File

@ -1,6 +1,6 @@
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
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. =="
@ -10,7 +10,7 @@ diff -Naur xbmc-30a9070/configure.in xbmc-30a9070.patch/configure.in
pulse_not_found="== Could not find libpulse. PulseAudio support disabled. =="
pulse_disabled="== PulseAudio support manually disabled. =="
dvdcss_enabled="== DVDCSS support enabled. =="
@@ -207,6 +209,12 @@
@@ -208,6 +210,12 @@
[use_goom=$enableval],
[use_goom=no])
@ -23,7 +23,7 @@ diff -Naur xbmc-30a9070/configure.in xbmc-30a9070.patch/configure.in
AC_ARG_ENABLE([ccache],
[AS_HELP_STRING([--enable-ccache],
[enable building with ccache feature (default is auto)])],
@@ -804,6 +812,15 @@
@@ -803,6 +811,15 @@
fi
fi
@ -39,7 +39,7 @@ diff -Naur xbmc-30a9070/configure.in xbmc-30a9070.patch/configure.in
# libRTMP
if test "$use_librtmp" != "no"; then
AC_CHECK_HEADERS([librtmp/log.h librtmp/amf.h librtmp/rtmp.h],,
@@ -1258,6 +1275,12 @@
@@ -1266,6 +1283,12 @@
final_message="$final_message\n GOOM:\t\tNo"
fi
@ -52,7 +52,7 @@ diff -Naur xbmc-30a9070/configure.in xbmc-30a9070.patch/configure.in
if test "$use_libbluray" = "yes"; then
final_message="$final_message\n Bluray:\tYes"
else
@@ -1486,6 +1509,7 @@
@@ -1495,6 +1518,7 @@
AC_SUBST(SDL_DEFINES)
AC_SUBST(BUILD_DVDCSS)
AC_SUBST(DISABLE_GOOM)
@ -60,7 +60,7 @@ diff -Naur xbmc-30a9070/configure.in xbmc-30a9070.patch/configure.in
AC_SUBST(USE_EXTERNAL_FFMPEG)
AC_SUBST(PYTHON_VERSION)
AC_SUBST(OUTPUT_FILES)
@@ -1729,7 +1753,7 @@
@@ -1739,7 +1763,7 @@
fi
set +x
fi
@ -69,20 +69,19 @@ diff -Naur xbmc-30a9070/configure.in xbmc-30a9070.patch/configure.in
XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
./configure \
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 @@
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
@@ -144,8 +144,10 @@
ifeq (@USE_OPENGL@,1)
VIS_DIRS+=\
xbmc/visualizations/OpenGLSpectrum \
- xbmc/visualizations/WaveForm \
- xbmc/visualizations/XBMCProjectM \
- xbmc/visualizations/XBMCProjectM
+ xbmc/visualizations/WaveForm
+
+ifneq (@DISABLE_XBMCPROJECTM@,1)
+VIS_DIRS+=xbmc/visualizations/XBMCProjectM
+endif
endif
ifeq (($(findstring osx,@ARCH@), osx),(@USE_OPENGL@,1))
ifeq (($(findstring osx,@ARCH@), osx),(@USE_OPENGL@,1))

26
packages/mediacenter/xbmc/patches/xbmc-ab67480-202-let_select_RSXS-0.1.patch → packages/mediacenter/xbmc/patches/xbmc-32d0382-202-let_select_RSXS-0.1.patch
View File

@ -1,6 +1,6 @@
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
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. =="
@ -10,7 +10,7 @@ diff -Naur xbmc-30a9070/configure.in xbmc-30a9070.patch/configure.in
pulse_not_found="== Could not find libpulse. PulseAudio support disabled. =="
pulse_disabled="== PulseAudio support manually disabled. =="
dvdcss_enabled="== DVDCSS support enabled. =="
@@ -215,6 +217,12 @@
@@ -216,6 +218,12 @@
[use_xbmcprojectm=$enableval],
[use_xbmcprojectm=yes])
@ -23,7 +23,7 @@ diff -Naur xbmc-30a9070/configure.in xbmc-30a9070.patch/configure.in
AC_ARG_ENABLE([ccache],
[AS_HELP_STRING([--enable-ccache],
[enable building with ccache feature (default is auto)])],
@@ -821,6 +829,15 @@
@@ -820,6 +828,15 @@
DISABLE_XBMCPROJECTM=1
fi
@ -39,7 +39,7 @@ diff -Naur xbmc-30a9070/configure.in xbmc-30a9070.patch/configure.in
# libRTMP
if test "$use_librtmp" != "no"; then
AC_CHECK_HEADERS([librtmp/log.h librtmp/amf.h librtmp/rtmp.h],,
@@ -1281,6 +1298,12 @@
@@ -1289,6 +1306,12 @@
final_message="$final_message\n XBMCProjectM:\tNo"
fi
@ -52,7 +52,7 @@ diff -Naur xbmc-30a9070/configure.in xbmc-30a9070.patch/configure.in
if test "$use_libbluray" = "yes"; then
final_message="$final_message\n Bluray:\tYes"
else
@@ -1510,6 +1533,7 @@
@@ -1519,6 +1542,7 @@
AC_SUBST(BUILD_DVDCSS)
AC_SUBST(DISABLE_GOOM)
AC_SUBST(DISABLE_XBMCPROJECTM)
@ -60,7 +60,7 @@ diff -Naur xbmc-30a9070/configure.in xbmc-30a9070.patch/configure.in
AC_SUBST(USE_EXTERNAL_FFMPEG)
AC_SUBST(PYTHON_VERSION)
AC_SUBST(OUTPUT_FILES)
@@ -1791,7 +1815,7 @@
@@ -1801,7 +1825,7 @@
--disable-lattice \
--disable-skyrocket
fi
@ -69,15 +69,15 @@ diff -Naur xbmc-30a9070/configure.in xbmc-30a9070.patch/configure.in
XB_CONFIG_MODULE([lib/libapetag], [
./configure \
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 @@
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
SS_DIRS+= xbmc/screensavers/rsxs-0.9/xbmc
endif
+endif

0
packages/mediacenter/xbmc/patches/xbmc-ab67480-303-fix_libdvd_xFLAGS-0.1.patch → packages/mediacenter/xbmc/patches/xbmc-32d0382-303-fix_libdvd_xFLAGS-0.1.patch
View File

0
packages/mediacenter/xbmc/patches/xbmc-ab67480-402-enable_yasm_in_ffmpeg-0.1.patch → packages/mediacenter/xbmc/patches/xbmc-32d0382-402-enable_yasm_in_ffmpeg-0.1.patch
View File

0
packages/mediacenter/xbmc/patches/xbmc-ab67480-404-add_lame_check-0.6.patch → packages/mediacenter/xbmc/patches/xbmc-32d0382-404-add_lame_check-0.6.patch
View File

0
packages/mediacenter/xbmc/patches/xbmc-ab67480-452-change_lcd_content-0.1.patch → packages/mediacenter/xbmc/patches/xbmc-32d0382-452-change_lcd_content-0.1.patch
View File

0
packages/mediacenter/xbmc/patches/xbmc-ab67480-453-add_openelec.tv_RSS_news-0.1.patch → packages/mediacenter/xbmc/patches/xbmc-32d0382-453-add_openelec.tv_RSS_news-0.1.patch
View File

0
packages/mediacenter/xbmc/patches/xbmc-ab67480-453-ps3_remote_be_more_quiet-0.1.patch → packages/mediacenter/xbmc/patches/xbmc-32d0382-453-ps3_remote_be_more_quiet-0.1.patch
View File

0
packages/mediacenter/xbmc/patches/xbmc-ab67480-454-disable_backslash-0.1.patch → packages/mediacenter/xbmc/patches/xbmc-32d0382-454-disable_backslash-0.1.patch
View File

0
packages/mediacenter/xbmc/patches/xbmc-ab67480-462-add_remote_irtrans_mediacenter-0.1.patch → packages/mediacenter/xbmc/patches/xbmc-32d0382-462-add_remote_irtrans_mediacenter-0.1.patch
View File

0
packages/mediacenter/xbmc/patches/xbmc-ab67480-463-add_remote_devinput-0.1.patch → packages/mediacenter/xbmc/patches/xbmc-32d0382-463-add_remote_devinput-0.1.patch
View File

0
packages/mediacenter/xbmc/patches/xbmc-ab67480-464-add_eject_keymapping_for_lirc-0.1.patch → packages/mediacenter/xbmc/patches/xbmc-32d0382-464-add_eject_keymapping_for_lirc-0.1.patch
View File

0
packages/mediacenter/xbmc/patches/xbmc-ab67480-901-advancedsettings_alwaysextractflags.patch → packages/mediacenter/xbmc/patches/xbmc-32d0382-901-advancedsettings_alwaysextractflags.patch
View File

2
packages/network/libnfs/meta
View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="libnfs"
PKG_VERSION="48593f5"
PKG_VERSION="9115b88"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

5
projects/Fusion/linux/linux.i386.conf
View File

@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
# Linux/i386 3.0.0 Kernel Configuration
# Linux/i386 3.0.1 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@ -798,7 +798,6 @@ CONFIG_MISC_DEVICES=y
# CONFIG_TIFM_CORE is not set
# CONFIG_ICS932S401 is not set
# CONFIG_ENCLOSURE_SERVICES is not set
# CONFIG_CS5535_MFGPT is not set
# CONFIG_HP_ILO is not set
# CONFIG_APDS9802ALS is not set
# CONFIG_ISL29003 is not set
@ -1011,7 +1010,7 @@ CONFIG_R8169=y
# CONFIG_QLA3XXX is not set
# CONFIG_ATL1 is not set
# CONFIG_ATL1E is not set
# CONFIG_ATL1C is not set
CONFIG_ATL1C=y
# CONFIG_JME is not set
# CONFIG_STMMAC_ETH is not set
# CONFIG_PCH_GBE is not set