mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-next
This commit is contained in:
Stephan Raue
commit
8c05f3c4f8
@ -1,114 +1,169 @@
|
||||
@ECHO OFF
|
||||
TITLE OpenELEC USB Installer
|
||||
mode con:cols=67 lines=17
|
||||
COLOR 17
|
||||
SET DRIVE=
|
||||
|
||||
:checkPrivileges
|
||||
mkdir "%windir%\OEAdminCheck"
|
||||
if '%errorlevel%' == '0' (
|
||||
rmdir "%windir%\OEAdminCheck" & goto gotPrivileges
|
||||
) else ( goto getPrivileges )
|
||||
|
||||
:getPrivileges
|
||||
CLS
|
||||
ECHO.
|
||||
ECHO OpenELEC.tv USB Installer
|
||||
ECHO.
|
||||
ECHO OpenELEC.tv USB Installer
|
||||
ECHO.
|
||||
ECHO.
|
||||
ECHO ******************************************************
|
||||
ECHO.
|
||||
ECHO This will wipe any data off your chosen drive
|
||||
ECHO Please read the instructions and use very carefully...
|
||||
ECHO *****************************************************************
|
||||
ECHO.
|
||||
ECHO Administrator Rights are required for USB Stick creation
|
||||
ECHO Invoking UAC for Privilege Escalation
|
||||
ECHO.
|
||||
ECHO *****************************************************************
|
||||
ECHO.
|
||||
ECHO ******************************************************
|
||||
ECHO.
|
||||
ECHO.
|
||||
ECHO. Are you running this USB Wizard for the first time
|
||||
ECHO. on Windows 7 or Windows Vista? [Y/N]
|
||||
ECHO.
|
||||
ECHO.
|
||||
|
||||
SET /P OS= --
|
||||
IF "%OS%"=="n" GOTO INSTALL
|
||||
IF "%OS%"=="N" GOTO INSTALL
|
||||
ECHO Set UAC = CreateObject^("Shell.Application"^) > "%temp%\OEgetPrivileges.vbs"
|
||||
ECHO UAC.ShellExecute %0, "", "", "runas", 1 >> "%temp%\OEgetPrivileges.vbs"
|
||||
"%temp%\OEgetPrivileges.vbs"
|
||||
exit /B
|
||||
|
||||
:NOTES
|
||||
CLS
|
||||
ECHO.
|
||||
ECHO ******************************************************
|
||||
ECHO.
|
||||
ECHO.
|
||||
ECHO Due to UAC in Windows 7 / Windows Vista we need to run
|
||||
ECHO syslinux.exe as 'Administrator'
|
||||
ECHO.
|
||||
ECHO After pressing any key the folder containing syslinux.exe
|
||||
ECHO will pop up automatically.
|
||||
ECHO.
|
||||
ECHO 1. Right click on syslinux.exe
|
||||
ECHO 2. Click on 'Properties'
|
||||
ECHO 3. Change to the 'Compatibility' tab
|
||||
ECHO 4. Check the 'Run this program as an administrator' checkbox
|
||||
ECHO.
|
||||
ECHO.
|
||||
ECHO.
|
||||
ECHO ******************************************************
|
||||
ECHO.
|
||||
ECHO Press any key to open the syslinux directory
|
||||
ECHO.
|
||||
pause >NUL
|
||||
explorer "%CD%\3rdparty\syslinux\win32"
|
||||
ECHO When finished changing the administrator rights,
|
||||
ECHO please press any key to continue with the installation
|
||||
pause >NUL
|
||||
GOTO :INSTALL
|
||||
:gotPrivileges
|
||||
if exist "%temp%\OEgetPrivileges.vbs" ( del "%temp%\OEgetPrivileges.vbs" )
|
||||
pushd "%CD%"
|
||||
CD /D "%~dp0"
|
||||
|
||||
:INSTALL
|
||||
:HashCheck
|
||||
3rdparty\md5sum\md5sum.exe -c "%CD%\target\SYSTEM.md5"
|
||||
IF ERRORLEVEL 1 GOTO BADMD5
|
||||
IF ERRORLEVEL 1 GOTO BadMD5
|
||||
3rdparty\md5sum\md5sum.exe -c "%CD%\target\KERNEL.md5"
|
||||
IF ERRORLEVEL 1 GOTO BADMD5
|
||||
IF ERRORLEVEL 1 GOTO BadMD5
|
||||
|
||||
:InstallOE
|
||||
CLS
|
||||
ECHO.
|
||||
ECHO OpenELEC.tv USB Installer
|
||||
ECHO.
|
||||
ECHO OpenELEC.tv USB Installer
|
||||
ECHO.
|
||||
ECHO.
|
||||
ECHO ******************************************************
|
||||
ECHO.
|
||||
ECHO This will wipe any data off your chosen drive
|
||||
ECHO Please read the instructions and use very carefully...
|
||||
ECHO *****************************************************************
|
||||
ECHO.
|
||||
ECHO ******************************************************
|
||||
ECHO This WILL wipe ALL data off the selected drive
|
||||
ECHO Please use carefully...
|
||||
ECHO.
|
||||
ECHO *****************************************************************
|
||||
ECHO.
|
||||
ECHO.
|
||||
|
||||
:SelectDrive
|
||||
ECHO Enter USB Drive letter
|
||||
ECHO eg. d:
|
||||
ECHO.
|
||||
|
||||
SET /P DRIVE= --
|
||||
if %DRIVE%!==! goto INSTALL
|
||||
format %DRIVE% /V:OPENELEC /Q /FS:FAT32
|
||||
3rdparty\syslinux\win32\syslinux.exe -f -m -a %DRIVE%
|
||||
ECHO Copying necessary files to %DRIVE%
|
||||
copy target\* %DRIVE%
|
||||
copy Autorun.inf %DRIVE%
|
||||
copy CHANGELOG %DRIVE%
|
||||
copy INSTALL %DRIVE%
|
||||
copy README %DRIVE%
|
||||
copy RELEASE %DRIVE%
|
||||
copy openelec.ico %DRIVE%
|
||||
FOR /F "tokens=5" %%G IN ('vol %DRIVE% ^|find "-"') DO SET DRIVEUUID=%%G
|
||||
echo DEFAULT linux > %DRIVE%\syslinux.cfg
|
||||
echo PROMPT 0 >> %DRIVE%\syslinux.cfg
|
||||
echo. >> %DRIVE%\syslinux.cfg
|
||||
echo LABEL linux >> %DRIVE%\syslinux.cfg
|
||||
echo KERNEL /KERNEL >> %DRIVE%\syslinux.cfg
|
||||
echo APPEND boot=LABEL=OPENELEC installer quiet >> %DRIVE%\syslinux.cfg
|
||||
GOTO END
|
||||
IF NOT DEFINED DRIVE goto InvalidDrive
|
||||
if %DRIVE%==c: goto InvalidDrive
|
||||
if %DRIVE%==C: goto InvalidDrive
|
||||
|
||||
:BADMD5
|
||||
CLS
|
||||
ECHO.
|
||||
ECHO.
|
||||
ECHO ***** OpenELEC.tv failed md5 check - Installation will quit *****
|
||||
ECHO OpenELEC.tv USB Installer
|
||||
ECHO.
|
||||
ECHO.
|
||||
ECHO *****************************************************************
|
||||
ECHO.
|
||||
ECHO Installing OpenELEC to %DRIVE%
|
||||
ECHO Please wait approximately 20 seconds...
|
||||
ECHO.
|
||||
ECHO *****************************************************************
|
||||
ECHO.
|
||||
ECHO.
|
||||
ECHO.
|
||||
ECHO Your original download was probably corrupt.
|
||||
ECHO Please visit www.openelec.tv and get another copy
|
||||
ECHO.
|
||||
ECHO.
|
||||
|
||||
ECHO. | >NUL format %DRIVE% /V:OPENELEC /Q /FS:FAT32 /X
|
||||
IF ERRORLEVEL 1 goto InvalidDrive
|
||||
>NUL 3rdparty\syslinux\win32\syslinux.exe -f -m -a %DRIVE%
|
||||
>NUL copy target\* %DRIVE%
|
||||
>NUL copy Autorun.inf %DRIVE%
|
||||
>NUL copy CHANGELOG %DRIVE%
|
||||
>NUL copy INSTALL %DRIVE%
|
||||
>NUL copy README %DRIVE%
|
||||
>NUL copy RELEASE %DRIVE%
|
||||
>NUL copy openelec.ico %DRIVE%
|
||||
FOR /F "tokens=5" %%G IN ('vol %DRIVE% ^|find "-"') DO SET DRIVEUUID=%%G
|
||||
ECHO DEFAULT linux > %DRIVE%\syslinux.cfg
|
||||
ECHO PROMPT 0 >> %DRIVE%\syslinux.cfg
|
||||
ECHO. >> %DRIVE%\syslinux.cfg
|
||||
ECHO LABEL linux >> %DRIVE%\syslinux.cfg
|
||||
ECHO KERNEL /KERNEL >> %DRIVE%\syslinux.cfg
|
||||
ECHO APPEND boot=LABEL=OPENELEC installer quiet >> %DRIVE%\syslinux.cfg
|
||||
GOTO END
|
||||
|
||||
:InvalidDrive
|
||||
CLS
|
||||
ECHO.
|
||||
ECHO.
|
||||
ECHO OpenELEC.tv USB Installer
|
||||
ECHO.
|
||||
ECHO.
|
||||
ECHO *****************************************************************
|
||||
ECHO.
|
||||
ECHO Invalid Drive Selected...
|
||||
ECHO Please confirm the drive letter of your USB stick
|
||||
ECHO.
|
||||
ECHO *****************************************************************
|
||||
ECHO.
|
||||
ECHO.
|
||||
GOTO SelectDrive
|
||||
|
||||
:BadMD5
|
||||
CLS
|
||||
ECHO.
|
||||
ECHO.
|
||||
ECHO OpenELEC.tv USB Installer
|
||||
ECHO.
|
||||
ECHO.
|
||||
ECHO *****************************************************************
|
||||
ECHO.
|
||||
ECHO OpenELEC.tv failed md5 check - Installation will now quit
|
||||
ECHO.
|
||||
ECHO Your original download is probably corrupt
|
||||
ECHO Please visit www.openelec.tv and download another copy
|
||||
ECHO.
|
||||
ECHO *****************************************************************
|
||||
ECHO.
|
||||
ECHO.
|
||||
ECHO.
|
||||
PAUSE
|
||||
EXIT
|
||||
|
||||
:END
|
||||
CLS
|
||||
ECHO.
|
||||
ECHO.
|
||||
ECHO OpenELEC.tv USB Installer
|
||||
ECHO.
|
||||
ECHO.
|
||||
ECHO *****************************************************************
|
||||
ECHO.
|
||||
ECHO The OpenELEC USB Installer has been successfully copied to %DRIVE%
|
||||
ECHO Please boot your HTPC off this USB stick
|
||||
ECHO.
|
||||
ECHO *****************************************************************
|
||||
ECHO.
|
||||
ECHO.
|
||||
ECHO.
|
||||
ECHO.
|
||||
|
||||
SET DRIVE=
|
||||
SET OS=
|
||||
SET DRIVEUUID=
|
||||
SET DRIVEUUID=
|
||||
PAUSE
|
||||
|
||||
@ -46,12 +46,24 @@ else
|
||||
XBMC_DVDCSS="--disable-dvdcss"
|
||||
fi
|
||||
|
||||
if [ "$BLURAY_SUPPORT" = yes ]; then
|
||||
XBMC_BLURAY="--enable-libbluray"
|
||||
else
|
||||
XBMC_BLURAY="--disable-libbluray"
|
||||
fi
|
||||
|
||||
if [ "$AVAHI_DAEMON" = yes ]; then
|
||||
XBMC_AVAHI="--enable-avahi"
|
||||
else
|
||||
XBMC_AVAHI="--disable-avahi"
|
||||
fi
|
||||
|
||||
if [ "$SAMBA_CLIENT" = yes ]; then
|
||||
XBMC_SAMBA="--enable-samba"
|
||||
else
|
||||
XBMC_SAMBA="--disable-samba"
|
||||
fi
|
||||
|
||||
if [ "$WEBSERVER" = yes ]; then
|
||||
XBMC_WEBSERVER="--enable-webserver"
|
||||
else
|
||||
@ -141,13 +153,14 @@ do_autoreconf xbmc/lib/libid3tag/libid3tag
|
||||
$XBMC_DVDCSS \
|
||||
--disable-mid \
|
||||
$XBMC_AVAHI \
|
||||
$XBMC_SAMBA \
|
||||
--disable-hal \
|
||||
$XBMC_NONFREE \
|
||||
--disable-asap-codec \
|
||||
$XBMC_WEBSERVER \
|
||||
--disable-libdts \
|
||||
--disable-liba52 \
|
||||
--enable-libbluray \
|
||||
$XBMC_BLURAY \
|
||||
--disable-external-ffmpeg \
|
||||
--disable-external-liba52 \
|
||||
--disable-external-libdts \
|
||||
|
||||
@ -25,8 +25,8 @@ PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.xbmc.org"
|
||||
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack lame libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba alsa bc xbmc-addon-settings"
|
||||
PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack lame libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba"
|
||||
PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack lame libmpeg2 SDL SDL_mixer SDL_image sqlite mysql alsa bc xbmc-addon-settings"
|
||||
PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack lame libmpeg2 SDL SDL_mixer SDL_image sqlite mysql"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="mediacenter"
|
||||
PKG_SHORTDESC="xbmc: XBMC Mediacenter"
|
||||
@ -40,11 +40,21 @@ if [ "$FAAC_SUPPORT" = yes ]; then
|
||||
PKG_DEPENDS="$PKG_DEPENDS faac"
|
||||
fi
|
||||
|
||||
if [ "$BLURAY_SUPPORT" = yes ]; then
|
||||
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libbluray"
|
||||
PKG_DEPENDS="$PKG_DEPENDS libbluray"
|
||||
fi
|
||||
|
||||
if [ "$AVAHI_DAEMON" = yes ]; then
|
||||
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS avahi"
|
||||
PKG_DEPENDS="$PKG_DEPENDS avahi"
|
||||
fi
|
||||
|
||||
if [ "$SAMBA_CLIENT" = yes ]; then
|
||||
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS samba"
|
||||
PKG_DEPENDS="$PKG_DEPENDS samba"
|
||||
fi
|
||||
|
||||
if [ "$WEBSERVER" = yes ]; then
|
||||
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libmicrohttpd"
|
||||
PKG_DEPENDS="$PKG_DEPENDS libmicrohttpd"
|
||||
|
||||
@ -0,0 +1,147 @@
|
||||
diff -Naur xbmc-10.1-Dharma/configure.in xbmc-10.1-Dharma.patch/configure.in
|
||||
--- xbmc-10.1-Dharma/configure.in 2011-09-14 15:17:03.499574627 +0200
|
||||
+++ xbmc-10.1-Dharma.patch/configure.in 2011-09-14 15:20:45.627527971 +0200
|
||||
@@ -92,6 +92,8 @@
|
||||
openmax_not_found="== Could not find libnvomx. OpenMax support disabled. =="
|
||||
libass_using_internal="== External Libass not found, using internal. =="
|
||||
ssh_not_found="== Could not find libssh. SSH FTP VFS support disabled. =="
|
||||
+samba_not_found="== Could not find libsmbclient. SAMBA support disabled. =="
|
||||
+samba_disabled="== SAMBA support disabled. =="
|
||||
librtmp_not_found="== Could not find libRTMP. RTMP support disabled. =="
|
||||
librtmp_disabled="== RTMP support disabled. =="
|
||||
|
||||
@@ -274,6 +276,12 @@
|
||||
[use_avahi=$enableval],
|
||||
[use_avahi=yes])
|
||||
|
||||
+AC_ARG_ENABLE([samba],
|
||||
+ [AS_HELP_STRING([--disable-samba],
|
||||
+ [disable SAMBA support (default is enabled if libsmbclient is found)])],
|
||||
+ [use_samba=$enableval],
|
||||
+ [use_samba=yes])
|
||||
+
|
||||
AC_ARG_ENABLE([non-free],
|
||||
[AS_HELP_STRING([--disable-non-free],
|
||||
[disable componentents with non-compliant licenses])],
|
||||
@@ -625,7 +633,6 @@
|
||||
if test "$host_vendor" = "apple" ; then
|
||||
AC_CHECK_LIB([iconv], [main],, AC_MSG_ERROR($missing_library))
|
||||
AC_CHECK_LIB([mysqlclient], [main],, AC_MSG_ERROR($missing_library))
|
||||
- AC_CHECK_LIB([smbclient], [main],, AC_MSG_ERROR($missing_library))
|
||||
PKG_CHECK_MODULES([VORBISFILE], [vorbisfile],
|
||||
[INCLUDES="$INCLUDES $VORBISFILE_CFLAGS"; LIBS="$LIBS $VORBISFILE_LIBS"],
|
||||
AC_MSG_ERROR($missing_library))
|
||||
@@ -643,7 +650,6 @@
|
||||
AC_CHECK_LIB([mysqlclient],[main],, AC_MSG_ERROR($missing_library))
|
||||
AC_CHECK_LIB([faad], [main],, AC_MSG_ERROR($missing_library))
|
||||
AC_CHECK_HEADER([FLAC/stream_decoder.h],, AC_MSG_ERROR($missing_library))
|
||||
- AC_CHECK_LIB([smbclient], [main],, AC_MSG_ERROR($missing_library))
|
||||
AC_CHECK_LIB([SDL_mixer], [main],, AC_MSG_ERROR($missing_library))
|
||||
AC_CHECK_LIB([dl], [main],, AC_MSG_ERROR($missing_library))
|
||||
AC_CHECK_LIB([resolv], [main],, AC_MSG_ERROR($missing_library))
|
||||
@@ -786,6 +792,18 @@
|
||||
fi
|
||||
fi
|
||||
|
||||
+# samba
|
||||
+if test "$use_samba" = "yes"; then
|
||||
+ AC_CHECK_LIB([smbclient], [main],,
|
||||
+ use_samba=no;AC_MSG_RESULT($samba_not_found))
|
||||
+else
|
||||
+ AC_MSG_RESULT($samba_disabled)
|
||||
+fi
|
||||
+
|
||||
+if test "$use_samba" = "yes"; then
|
||||
+ AC_DEFINE([HAVE_LIBSMBCLIENT], [1], [Define to 1 if you have Samba installed])
|
||||
+fi
|
||||
+
|
||||
# XRandR
|
||||
if test "$host_vendor" = "apple" ; then
|
||||
use_xrandr="no"
|
||||
@@ -1312,6 +1330,12 @@
|
||||
final_message="$final_message\n Avahi:\tNo"
|
||||
fi
|
||||
|
||||
+if test "$use_samba" = "yes"; then
|
||||
+ final_message="$final_message\n Samba:\tYes"
|
||||
+else
|
||||
+ final_message="$final_message\n Samba:\tNo"
|
||||
+fi
|
||||
+
|
||||
if test "$host_vendor" = "apple"; then
|
||||
echo "#define GIT_REV \"$GIT_REV\"" > git_revision.h
|
||||
else
|
||||
diff -Naur xbmc-10.1-Dharma/guilib/system.h xbmc-10.1-Dharma.patch/guilib/system.h
|
||||
--- xbmc-10.1-Dharma/guilib/system.h 2011-03-08 02:49:13.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma.patch/guilib/system.h 2011-09-14 15:19:35.257592410 +0200
|
||||
@@ -58,7 +58,6 @@
|
||||
#endif
|
||||
|
||||
#define HAS_FILESYSTEM
|
||||
-#define HAS_FILESYSTEM_SMB
|
||||
#define HAS_FILESYSTEM_CDDA
|
||||
#define HAS_FILESYSTEM_RTV
|
||||
#define HAS_FILESYSTEM_DAAP
|
||||
@@ -67,6 +66,10 @@
|
||||
#define HAS_FILESYSTEM_HTSP
|
||||
#define HAS_FILESYSTEM_MMS
|
||||
|
||||
+#ifdef HAVE_LIBSMBCLIENT
|
||||
+#define HAS_FILESYSTEM_SMB
|
||||
+#endif
|
||||
+
|
||||
/**********************
|
||||
* Non-free Components
|
||||
**********************/
|
||||
diff -Naur xbmc-10.1-Dharma/xbmc/GUIDialogMediaSource.cpp xbmc-10.1-Dharma.patch/xbmc/GUIDialogMediaSource.cpp
|
||||
--- xbmc-10.1-Dharma/xbmc/GUIDialogMediaSource.cpp 2011-03-08 02:49:14.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma.patch/xbmc/GUIDialogMediaSource.cpp 2011-09-14 17:13:07.080677066 +0200
|
||||
@@ -240,9 +240,11 @@
|
||||
share1.m_ignore = true;
|
||||
extraShares.push_back(share1);
|
||||
|
||||
+#ifdef HAS_FILESYSTEM_SMB
|
||||
share1.strPath = "smb://";
|
||||
share1.strName = g_localizeStrings.Get(20171);
|
||||
extraShares.push_back(share1);
|
||||
+#endif
|
||||
|
||||
share1.strPath = "upnp://";
|
||||
share1.strName = "UPnP Devices";
|
||||
@@ -282,9 +284,11 @@
|
||||
share1.strName = "ReplayTV Devices";
|
||||
extraShares.push_back(share1);
|
||||
|
||||
+#ifdef HAS_FILESYSTEM_SMB
|
||||
share1.strPath = "smb://";
|
||||
share1.strName = g_localizeStrings.Get(20171);
|
||||
extraShares.push_back(share1);
|
||||
+#endif
|
||||
|
||||
share1.strPath = "hdhomerun://";
|
||||
share1.strName = "HDHomerun Devices";
|
||||
@@ -313,9 +317,11 @@
|
||||
extraShares.push_back(share1);
|
||||
}
|
||||
|
||||
+#ifdef HAS_FILESYSTEM_SMB
|
||||
share1.strPath = "smb://";
|
||||
share1.strName = g_localizeStrings.Get(20171);
|
||||
extraShares.push_back(share1);
|
||||
+#endif
|
||||
|
||||
share1.strPath = "upnp://";
|
||||
share1.strName = "UPnP Devices";
|
||||
diff -Naur xbmc-10.1-Dharma/xbmc/GUIDialogNetworkSetup.cpp xbmc-10.1-Dharma.patch/xbmc/GUIDialogNetworkSetup.cpp
|
||||
--- xbmc-10.1-Dharma/xbmc/GUIDialogNetworkSetup.cpp 2011-03-08 02:49:14.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma.patch/xbmc/GUIDialogNetworkSetup.cpp 2011-09-14 16:49:00.902517185 +0200
|
||||
@@ -128,7 +128,9 @@
|
||||
return;
|
||||
|
||||
pSpin->Clear();
|
||||
+#ifdef HAS_FILESYSTEM_SMB
|
||||
pSpin->AddLabel(g_localizeStrings.Get(20171), NET_PROTOCOL_SMB);
|
||||
+#endif
|
||||
pSpin->AddLabel(g_localizeStrings.Get(20256), NET_PROTOCOL_HTSP);
|
||||
pSpin->AddLabel(g_localizeStrings.Get(20257), NET_PROTOCOL_VTP);
|
||||
pSpin->AddLabel(g_localizeStrings.Get(21331), NET_PROTOCOL_TUXBOX);
|
||||
@ -61,4 +61,8 @@ fi
|
||||
done
|
||||
|
||||
# Tools
|
||||
PKG_DEPENDS="$PKG_DEPENDS pciutils ratpoison xrandr setxkbmap"
|
||||
PKG_DEPENDS="$PKG_DEPENDS pciutils xrandr setxkbmap"
|
||||
|
||||
if [ -n "$WINDOWMANAGER" -a "$WINDOWMANAGER" != "none" ]; then
|
||||
PKG_DEPENDS="$PKG_DEPENDS $WINDOWMANAGER"
|
||||
fi
|
||||
|
||||
@ -131,6 +131,9 @@
|
||||
# (DVD decryption support in XBMC) (yes / no)
|
||||
DVDCSS_SUPPORT="yes"
|
||||
|
||||
# build and install with BluRay support (yes / no)
|
||||
BLURAY_SUPPORT="yes"
|
||||
|
||||
# additional drivers to install:
|
||||
# asix-ax887xx: Asix AX887xx USB LAN Driver
|
||||
# Space separated list is supported,
|
||||
@ -149,6 +152,9 @@
|
||||
# build and install Avahi (Zeroconf) daemon (yes / no)
|
||||
AVAHI_DAEMON="yes"
|
||||
|
||||
# build and install Samba Client support (yes / no)
|
||||
SAMBA_CLIENT="yes"
|
||||
|
||||
# build and install Samba Server (yes / no)
|
||||
SAMBA_SERVER="yes"
|
||||
|
||||
@ -178,6 +184,9 @@
|
||||
# Displayserver to use (xorg-server / no)
|
||||
DISPLAYSERVER="xorg-server"
|
||||
|
||||
# Windowmanager to use (ratpoison / none)
|
||||
WINDOWMANAGER="ratpoison"
|
||||
|
||||
# Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
|
||||
# Space separated list is supported,
|
||||
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
|
||||
|
||||
@ -131,6 +131,9 @@
|
||||
# (DVD decryption support in XBMC) (yes / no)
|
||||
DVDCSS_SUPPORT="yes"
|
||||
|
||||
# build and install with BluRay support (yes / no)
|
||||
BLURAY_SUPPORT="yes"
|
||||
|
||||
# additional drivers to install:
|
||||
# asix-ax887xx: Asix AX887xx USB LAN Driver
|
||||
# Space separated list is supported,
|
||||
@ -149,6 +152,9 @@
|
||||
# build and install Avahi (Zeroconf) daemon (yes / no)
|
||||
AVAHI_DAEMON="yes"
|
||||
|
||||
# build and install Samba Client support (yes / no)
|
||||
SAMBA_CLIENT="yes"
|
||||
|
||||
# build and install Samba Server (yes / no)
|
||||
SAMBA_SERVER="yes"
|
||||
|
||||
@ -178,6 +184,9 @@
|
||||
# Displayserver to use (xorg-server / no)
|
||||
DISPLAYSERVER="xorg-server"
|
||||
|
||||
# Windowmanager to use (ratpoison / none)
|
||||
WINDOWMANAGER="ratpoison"
|
||||
|
||||
# Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
|
||||
# Space separated list is supported,
|
||||
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon fglrx nvidia nouveau"
|
||||
|
||||
@ -131,6 +131,9 @@
|
||||
# (DVD decryption support in XBMC) (yes / no)
|
||||
DVDCSS_SUPPORT="yes"
|
||||
|
||||
# build and install with BluRay support (yes / no)
|
||||
BLURAY_SUPPORT="yes"
|
||||
|
||||
# additional drivers to install:
|
||||
# asix-ax887xx: Asix AX887xx USB LAN Driver
|
||||
# Space separated list is supported,
|
||||
@ -149,6 +152,9 @@
|
||||
# build and install Avahi (Zeroconf) daemon (yes / no)
|
||||
AVAHI_DAEMON="yes"
|
||||
|
||||
# build and install Samba Client support (yes / no)
|
||||
SAMBA_CLIENT="yes"
|
||||
|
||||
# build and install Samba Server (yes / no)
|
||||
SAMBA_SERVER="yes"
|
||||
|
||||
@ -178,6 +184,9 @@
|
||||
# Displayserver to use (xorg-server / no)
|
||||
DISPLAYSERVER="xorg-server"
|
||||
|
||||
# Windowmanager to use (ratpoison / none)
|
||||
WINDOWMANAGER="ratpoison"
|
||||
|
||||
# Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
|
||||
# Space separated list is supported,
|
||||
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 nvidia nouveau"
|
||||
|
||||
@ -131,6 +131,9 @@
|
||||
# (DVD decryption support in XBMC) (yes / no)
|
||||
DVDCSS_SUPPORT="yes"
|
||||
|
||||
# build and install with BluRay support (yes / no)
|
||||
BLURAY_SUPPORT="yes"
|
||||
|
||||
# additional drivers to install:
|
||||
# asix-ax887xx: Asix AX887xx USB LAN Driver
|
||||
# Space separated list is supported,
|
||||
@ -149,6 +152,9 @@
|
||||
# build and install Avahi (Zeroconf) daemon (yes / no)
|
||||
AVAHI_DAEMON="yes"
|
||||
|
||||
# build and install Samba Client support (yes / no)
|
||||
SAMBA_CLIENT="yes"
|
||||
|
||||
# build and install Samba Server (yes / no)
|
||||
SAMBA_SERVER="yes"
|
||||
|
||||
@ -178,6 +184,9 @@
|
||||
# Displayserver to use (xorg-server / no)
|
||||
DISPLAYSERVER="xorg-server"
|
||||
|
||||
# Windowmanager to use (ratpoison / none)
|
||||
WINDOWMANAGER="ratpoison"
|
||||
|
||||
# Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
|
||||
# Space separated list is supported,
|
||||
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 nvidia nouveau"
|
||||
|
||||
@ -131,6 +131,9 @@
|
||||
# (DVD decryption support in XBMC) (yes / no)
|
||||
DVDCSS_SUPPORT="yes"
|
||||
|
||||
# build and install with BluRay support (yes / no)
|
||||
BLURAY_SUPPORT="yes"
|
||||
|
||||
# additional drivers to install:
|
||||
# asix-ax887xx: Asix AX887xx USB LAN Driver
|
||||
# Space separated list is supported,
|
||||
@ -149,8 +152,11 @@
|
||||
# build and install Avahi (Zeroconf) daemon (yes / no)
|
||||
AVAHI_DAEMON="yes"
|
||||
|
||||
# build and install Samba Client support (yes / no)
|
||||
SAMBA_CLIENT="yes"
|
||||
|
||||
# build and install Samba Server (yes / no)
|
||||
SAMBA_SERVER="yes"
|
||||
SAMBA_SERVER="no"
|
||||
|
||||
# build and install SFTP Server (yes / no)
|
||||
SFTP_SERVER="yes"
|
||||
@ -178,6 +184,9 @@
|
||||
# Displayserver to use (xorg-server / no)
|
||||
DISPLAYSERVER="xorg-server"
|
||||
|
||||
# Windowmanager to use (ratpoison / none)
|
||||
WINDOWMANAGER="ratpoison"
|
||||
|
||||
# Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
|
||||
# Space separated list is supported,
|
||||
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
|
||||
|
||||
@ -131,6 +131,9 @@
|
||||
# (DVD decryption support in XBMC) (yes / no)
|
||||
DVDCSS_SUPPORT="yes"
|
||||
|
||||
# build and install with BluRay support (yes / no)
|
||||
BLURAY_SUPPORT="yes"
|
||||
|
||||
# additional drivers to install:
|
||||
# asix-ax887xx: Asix AX887xx USB LAN Driver
|
||||
# Space separated list is supported,
|
||||
@ -149,6 +152,9 @@
|
||||
# build and install Avahi (Zeroconf) daemon (yes / no)
|
||||
AVAHI_DAEMON="yes"
|
||||
|
||||
# build and install Samba Client support (yes / no)
|
||||
SAMBA_CLIENT="yes"
|
||||
|
||||
# build and install Samba Server (yes / no)
|
||||
SAMBA_SERVER="yes"
|
||||
|
||||
@ -178,6 +184,9 @@
|
||||
# Displayserver to use (xorg-server / no)
|
||||
DISPLAYSERVER="xorg-server"
|
||||
|
||||
# Windowmanager to use (ratpoison / none)
|
||||
WINDOWMANAGER="ratpoison"
|
||||
|
||||
# Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
|
||||
# Space separated list is supported,
|
||||
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
|
||||
|
||||
@ -131,6 +131,9 @@
|
||||
# (DVD decryption support in XBMC) (yes / no)
|
||||
DVDCSS_SUPPORT="yes"
|
||||
|
||||
# build and install with BluRay support (yes / no)
|
||||
BLURAY_SUPPORT="yes"
|
||||
|
||||
# additional drivers to install:
|
||||
# asix-ax887xx: Asix AX887xx USB LAN Driver
|
||||
# Space separated list is supported,
|
||||
@ -149,6 +152,9 @@
|
||||
# build and install Avahi (Zeroconf) daemon (yes / no)
|
||||
AVAHI_DAEMON="yes"
|
||||
|
||||
# build and install Samba Client support (yes / no)
|
||||
SAMBA_CLIENT="yes"
|
||||
|
||||
# build and install Samba Server (yes / no)
|
||||
SAMBA_SERVER="yes"
|
||||
|
||||
@ -178,6 +184,9 @@
|
||||
# Displayserver to use (xorg-server / no)
|
||||
DISPLAYSERVER="xorg-server"
|
||||
|
||||
# Windowmanager to use (ratpoison / none)
|
||||
WINDOWMANAGER="ratpoison"
|
||||
|
||||
# Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
|
||||
# Space separated list is supported,
|
||||
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user