Permalink
Browse files

ready to compile native

sudo sh tools/rbp/setup-sdk.sh#
  • Loading branch information...
user
user committed Jan 3, 2013
1 parent 74b907c commit cbe3cdae1ca8ad80aabe1144ad7b1891a61c0f8c
@@ -22,18 +22,30 @@ ifeq ($(USE_BUILDROOT),1)
export TEXTUREPACKER_NATIVE_ROOT=/usr
export PYTHON_LDFLAGS=-L$(SDKSTAGE)/usr/lib -lpython$(PYTHON_VERSION) -lpthread -ldl -lutil -lm
else
- export CFLAGS=-pipe -O3 -mcpu=arm1176jzf-s -mtune=arm1176jzf-s -mfloat-abi=softfp -mfpu=vfp -mabi=aapcs-linux -Wno-psabi -Wa,-mno-warn-deprecated -Wno-deprecated-declarations
- export HOST=arm-bcm2708-linux-gnueabi
+ export CFLAGS=-pipe -O3 -mcpu=arm1176jzf-s -mtune=arm1176jzf-s -mfloat-abi=hard -mfpu=vfp -mabi=aapcs-linux -Wno-psabi -Wa,-mno-warn-deprecated -Wno-deprecated-declarations -Wl, --dynamic-linker=/lib/ld-linux-armhf.so.3
+ export HOST=arm-linux-gnueabihf
export BUILD=i686-linux
export PREFIX=${XBMCPREFIX}
export TARGETFS
- export SYSROOT=/usr/local/bcm-gcc/arm-bcm2708-linux-gnueabi/sys-root
- export RLINK_PATH=-Wl,-rpath-link,${SYSROOT}/lib -Wl,-rpath-link,${TARGETFS}/lib -Wl,-rpath-link,${TARGETFS}/usr/lib -Wl,-rpath-link,${TARGETFS}/opt/vc/
- export CFLAGS+=-isystem${XBMCPREFIX}/include -isystem${SDKSTAGE}/usr/include -isystem${SDKSTAGE}/opt/vc/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -isystem${SDKSTAGE}/opt/vc
- export CFLAGS+=-L${XBMCPREFIX}/lib -L${SYSROOT}/lib -L${TARGETFS}/lib -L${TARGETFS}/usr/lib -L${TARGETFS}/opt/vc/lib ${RLINK_PATH}
+ export SYSROOT=/usr/local/arm-linux-gnueabihf/arm-linux-gnueabihf/sys-root
+
+# export RLINK_PATH=-Wl,-rpath-link,${SYSROOT}/lib -Wl,-rpath-link,${TARGETFS}/lib -Wl,-rpath-link,${TARGETFS}/usr/lib -Wl,-rpath-link,${TARGETFS}/opt/vc/
+ export RLINK_PATH=-Wl,-rpath-link,${SYSROOT}/lib -Wl,-rpath-link,${TARGETFS}/lib/arm-linux-gnueabihf:${TARGETFS}/usr/lib/arm-linux-gnueabihf:${TARGETFS}/lib:${TARGETFS}/usr/lib:${TARGETFS}/usr/lib/pulseaudio -Wl,-rpath-link,${TARGETFS}/opt/vc/
+
+# export CFLAGS+=-isystem${XBMCPREFIX}/include -isystem${SDKSTAGE}/usr/include -isystem${SDKSTAGE}/opt/vc/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -isystem${SDKSTAGE}/opt/vc
+ export CFLAGS+=-isystem${XBMCPREFIX}/include -isystem${SDKSTAGE}/usr/include/arm-linux-gnueabihf -isystem${SDKSTAGE}/usr/include -isystem${SDKSTAGE}/opt/vc/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -isystem${SDKSTAGE}/opt/vc -isystem${SDKSTAGE}/opt/vc/include/interface/vmcs_host/linux
+
+# export CFLAGS+=-L${XBMCPREFIX}/lib -L${SYSROOT}/lib -L${TARGETFS}/lib -L${TARGETFS}/usr/lib -L${TARGETFS}/opt/vc/lib ${RLINK_PATH}
+ export CFLAGS+=-L${XBMCPREFIX}/lib -L${SYSROOT}/lib -L${SYSROOT}/usr/lib -L${TARGETFS}/lib -L${TARGETFS}/usr/lib -L${TARGETFS}/opt/vc/lib ${RLINK_PATH} -L${TARGETFS}/usr/lib/arm-linux-gnueabihf -L${TARGETFS}/lib/arm-linux-gnueabihf
+
+
export CXXFLAGS=${CFLAGS}
export CPPFLAGS=${CFLAGS}
- export LDFLAGS=${RLINK_PATH} -L${TARGETFS}/lib -L${TARGETFS}/usr/lib -L${XBMCPREFIX}/lib
+
+# export LDFLAGS=${RLINK_PATH} -L${TARGETFS}/lib -L${TARGETFS}/usr/lib -L${XBMCPREFIX}/lib
+ export LDFLAGS=${RLINK_PATH} -L${SYSROOT}/usr/lib -L${TARGETFS}/lib -L${TARGETFS}/usr/lib -L${XBMCPREFIX}/lib -L${TARGETFS}/usr/lib/arm-linux-gnueabihf -Wl,--dynamic-linker=/lib/ld-linux-armhf.so.3
+
+
export LD=${TOOLCHAIN}/bin/${HOST}-ld
export AR=${TOOLCHAIN}/bin/${HOST}-ar
export CC=${TOOLCHAIN}/bin/${HOST}-gcc
@@ -43,9 +55,11 @@ else
export STRIP=${TOOLCHAIN}/bin/${HOST}-strip
export OBJDUMP=${TOOLCHAIN}/bin/${HOST}-objdump
#export ACLOCAL=aclocal -I ${SDKSTAGE}/usr/share/aclocal -I ${TARGETFS}/usr/share/aclocal-1.11
- export PKG_CONFIG_LIBDIR=${PREFIX}/lib/pkgconfig:${SDKSTAGE}/lib/pkgconfig:${SDKSTAGE}/usr/lib/pkgconfig
+
+# export PKG_CONFIG_LIBDIR=${PREFIX}/lib/pkgconfig:${SDKSTAGE}/lib/pkgconfig:${SDKSTAGE}/usr/lib/pkgconfig
+ export PKG_CONFIG_LIBDIR=${PREFIX}/lib/pkgconfig:${SDKSTAGE}/lib/pkgconfig:${SDKSTAGE}/usr/lib/pkgconfig:${SDKSTAGE}/usr/lib/arm-linux-gnueabihf/pkgconfig:${STKSTAGE}/usr/share/pkgconfig
export PKG_CONFIG_PATH=$(PREFIX)/bin/pkg-config
- export PYTHON_VERSION=2.6
+ export PYTHON_VERSION=2.7
export PATH:=${PREFIX}/bin:$(PATH):${TOOLCHAIN}/bin
export TEXTUREPACKER_NATIVE_ROOT=/usr
export PYTHON_LDFLAGS=-L$(SDKSTAGE)/usr/lib -lpython$(PYTHON_VERSION)
@@ -0,0 +1,69 @@
+ifeq ($(USE_BUILDROOT),1)
+ export CFLAGS=-pipe -O3 -mcpu=arm1176jzf-s -mtune=arm1176jzf-s -mfloat-abi=hard -mfpu=vfp -mabi=aapcs-linux -Wno-psabi -Wa,-mno-warn-deprecated -Wno-deprecated-declarations
+ export HOST=arm-unknown-linux-gnueabi
+ export BUILD=i686-linux
+ export PREFIX=$(XBMCPREFIX)
+ export SYSROOT=$(BUILDROOT)/output/host/usr/arm-unknown-linux-gnueabi/sysroot
+ export CFLAGS+=-isystem$(SYSROOT)/usr/include -isystem$(SYSROOT)/opt/vc/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -isystem$(PREFIX)/include -isystem$(PREFIX)/usr/include/mysql --sysroot=$(SYSROOT)
+ export CXXFLAGS=$(CFLAGS) --sysroot=$(SYSROOT)
+ export CPPFLAGS=$(CFLAGS) --sysroot=$(SYSROOT)
+ export LDFLAGS=-L$(SYSROOT)/opt/vc/lib -L$(XBMCPREFIX)/lib
+ export LD=$(TOOLCHAIN)/bin/$(HOST)-ld
+ export CC=$(TOOLCHAIN)/bin/$(HOST)-gcc
+ export CXX=$(TOOLCHAIN)/bin/$(HOST)-g++
+ export OBJDUMP=$(TOOLCHAIN)/bin/$(HOST)-objdump
+ export RANLIB=$(TOOLCHAIN)/bin/$(HOST)-ranlib
+ export STRIP=$(TOOLCHAIN)/bin/$(HOST)-strip
+ export AR=$(TOOLCHAIN)/bin/$(HOST)-ar
+ export CXXCPP=$(CXX) -E
+ export PKG_CONFIG_PATH=$(PREFIX)/lib/pkgconfig
+ export PYTHON_VERSION=2.7
+ export PATH:=$(PREFIX)/bin:$(BUILDROOT)/output/host/usr/bin:$(PATH)
+ export TEXTUREPACKER_NATIVE_ROOT=/usr
+ export PYTHON_LDFLAGS=-L$(SDKSTAGE)/usr/lib -lpython$(PYTHON_VERSION) -lpthread -ldl -lutil -lm
+else
+ export CFLAGS=-pipe -O3 -mcpu=arm1176jzf-s -mtune=arm1176jzf-s -mfloat-abi=hard -mfpu=vfp -mabi=aapcs-linux -Wno-psabi -Wa,-mno-warn-deprecated -Wno-deprecated-declarations -Wl, --dynamic-linker=/lib/ld-linux-armhf.so.3
+ export HOST=arm-linux-gnueabihf
+ export BUILD=i686-linux
+ export PREFIX=${XBMCPREFIX}
+ export TARGETFS
+ export SYSROOT=/usr/local/arm-linux-gnueabihf/arm-linux-gnueabihf/sys-root
+
+# export RLINK_PATH=-Wl,-rpath-link,${SYSROOT}/lib -Wl,-rpath-link,${TARGETFS}/lib -Wl,-rpath-link,${TARGETFS}/usr/lib -Wl,-rpath-link,${TARGETFS}/opt/vc/
+ export RLINK_PATH=-Wl,-rpath-link,${SYSROOT}/lib -Wl,-rpath-link,${TARGETFS}/lib/arm-linux-gnueabihf:${TARGETFS}/usr/lib/arm-linux-gnueabihf:${TARGETFS}/lib:${TARGETFS}/usr/lib:${TARGETFS}/usr/lib/pulseaudio -Wl,-rpath-link,${TARGETFS}/opt/vc/
+
+# export CFLAGS+=-isystem${XBMCPREFIX}/include -isystem${SDKSTAGE}/usr/include -isystem${SDKSTAGE}/opt/vc/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -isystem${SDKSTAGE}/opt/vc
+ export CFLAGS+=-isystem${XBMCPREFIX}/include -isystem${SDKSTAGE}/usr/include/arm-linux-gnueabihf -isystem${SDKSTAGE}/usr/include -isystem${SDKSTAGE}/opt/vc/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -isystem${SDKSTAGE}/opt/vc -isystem${SDKSTAGE}/opt/vc/include/interface/vmcs_host/linux
+
+# export CFLAGS+=-L${XBMCPREFIX}/lib -L${SYSROOT}/lib -L${TARGETFS}/lib -L${TARGETFS}/usr/lib -L${TARGETFS}/opt/vc/lib ${RLINK_PATH}
+ export CFLAGS+=-L${XBMCPREFIX}/lib -L${SYSROOT}/lib -L${SYSROOT}/usr/lib -L${TARGETFS}/lib -L${TARGETFS}/usr/lib -L${TARGETFS}/opt/vc/lib ${RLINK_PATH} -L${TARGETFS}/usr/lib/arm-linux-gnueabihf -L${TARGETFS}/lib/arm-linux-gnueabihf
+
+
+ export CXXFLAGS=${CFLAGS}
+ export CPPFLAGS=${CFLAGS}
+
+# export LDFLAGS=${RLINK_PATH} -L${TARGETFS}/lib -L${TARGETFS}/usr/lib -L${XBMCPREFIX}/lib
+ export LDFLAGS=${RLINK_PATH} -L${SYSROOT}/usr/lib -L${TARGETFS}/lib -L${TARGETFS}/usr/lib -L${XBMCPREFIX}/lib -L${TARGETFS}/usr/lib/arm-linux-gnueabihf -Wl,--dynamic-linker=/lib/ld-linux-armhf.so.3
+
+
+ export LD=${TOOLCHAIN}/bin/${HOST}-ld
+ export AR=${TOOLCHAIN}/bin/${HOST}-ar
+ export CC=${TOOLCHAIN}/bin/${HOST}-gcc
+ export CXX=${TOOLCHAIN}/bin/${HOST}-g++
+ export CXXCPP=${CXX} -E
+ export RANLIB=${TOOLCHAIN}/bin/${HOST}-ranlib
+ export STRIP=${TOOLCHAIN}/bin/${HOST}-strip
+ export OBJDUMP=${TOOLCHAIN}/bin/${HOST}-objdump
+ #export ACLOCAL=aclocal -I ${SDKSTAGE}/usr/share/aclocal -I ${TARGETFS}/usr/share/aclocal-1.11
+
+# export PKG_CONFIG_LIBDIR=${PREFIX}/lib/pkgconfig:${SDKSTAGE}/lib/pkgconfig:${SDKSTAGE}/usr/lib/pkgconfig
+ export PKG_CONFIG_LIBDIR=${PREFIX}/lib/pkgconfig:${SDKSTAGE}/lib/pkgconfig:${SDKSTAGE}/usr/lib/pkgconfig:${SDKSTAGE}/usr/lib/arm-linux-gnueabihf/pkgconfig:${STKSTAGE}/usr/share/pkgconfig
+ export PKG_CONFIG_PATH=$(PREFIX)/bin/pkg-config
+ export PYTHON_VERSION=2.7
+ export PATH:=${PREFIX}/bin:$(PATH):${TOOLCHAIN}/bin
+ export TEXTUREPACKER_NATIVE_ROOT=/usr
+ export PYTHON_LDFLAGS=-L$(SDKSTAGE)/usr/lib -lpython$(PYTHON_VERSION)
+endif
+export PYTHON_CPPFLAGS=-I$(SDKSTAGE)/usr/include/python$(PYTHON_VERSION)
+export PYTHON_SITE_PKG=$(SDKSTAGE)/usr/lib/python$(PYTHON_VERSION)/site-packages
+export PYTHON_NOVERSIONCHECK=no-check
@@ -7,12 +7,55 @@ ifeq ($(USE_BUILDROOT),1)
export PATH:=$(PREFIX)/bin:$(BUILDROOT)/output/host/usr/bin:$(SYSROOT)/usr/bin:$(PATH)
endif
+#C_INCLUDE_PATH=/opt/vc/include:/opt/vc/include/interface/vcos/pthreads
+#CPLUS_INCLUDE_PATH=/opt/vc/include:/opt/vc/include/interface/vcos/pthreads
+#LDFLAGS="-L/opt/vc/lib"
+
CONFIGURE=./configure --prefix=$(PREFIX) --build=$(BUILD) --host=$(HOST) \
--enable-gles --disable-sdl --disable-x11 --disable-xrandr --disable-openmax \
- --disable-optical-drive --disable-dvdcss --disable-joystick --disable-debug \
+ --enable-optical-drive --enable-dvdcss --disable-joystick --disable-debug \
--disable-crystalhd --disable-vtbdecoder --disable-vaapi --disable-vdpau \
--disable-pulse --disable-projectm --with-platform=raspberry-pi --enable-optimizations \
- --enable-libcec --enable-player=omxplayer
+ --disable-libcec --enable-player=omxplayer
+
+CONFIGURE=./configure --prefix=/usr --build=arm-linux-gnueabihf --host=arm-linux-gnueabihf \
+ --localstatedir=/var/lib --with-platform=raspberry-pi \
+ --disable-gl \
+ --enable-gles \
+ --disable-x11 \
+ --disable-sdl \
+ --disable-openmax \
+ --enable-ccache \
+ --enable-optimizations \
+ --enable-external-libraries \
+ --disable-goom \
+ --disable-hal \
+ --disable-pulse \
+ --disable-vaapi \
+ --disable-vdpau \
+ --disable-xrandr \
+ --disable-airplay \
+ --disable-airtunes \
+ --enable-webserver \
+ --disable-alsa \
+ --enable-avahi \
+ --enable-libbluray \
+ --enable-dvdcss \
+ --disable-debug \
+ --disable-joystick \
+ --enable-mid \
+ --disable-nfs \
+ --disable-profiling \
+ --disable-projectm \
+ --enable-rsxs \
+ --enable-rtmp \
+ --disable-vaapi \
+ --disable-vtbdecoder \
+ --disable-external-ffmpeg \
+ --disable-crystalhd \
+ --enable-optical-drive \
+ --enable-libcec \
+ --enable-rpi-cec-api
all: configure
@@ -0,0 +1,70 @@
+include ../../Makefile.include
+include ../depends.mk
+
+SOURCE=../../../../
+
+ifeq ($(USE_BUILDROOT),1)
+ export PATH:=$(PREFIX)/bin:$(BUILDROOT)/output/host/usr/bin:$(SYSROOT)/usr/bin:$(PATH)
+endif
+
+#C_INCLUDE_PATH=/opt/vc/include:/opt/vc/include/interface/vcos/pthreads
+#CPLUS_INCLUDE_PATH=/opt/vc/include:/opt/vc/include/interface/vcos/pthreads
+#LDFLAGS="-L/opt/vc/lib"
+
+CONFIGURE=./configure --prefix=$(PREFIX) --build=$(BUILD) --host=$(HOST) \
+ --enable-gles --disable-sdl --disable-x11 --disable-xrandr --disable-openmax \
+ --enable-optical-drive --enable-dvdcss --disable-joystick --disable-debug \
+ --disable-crystalhd --disable-vtbdecoder --disable-vaapi --disable-vdpau \
+ --disable-pulse --disable-projectm --with-platform=raspberry-pi --enable-optimizations \
+ --disable-libcec --enable-player=omxplayer
+
+CONFIGURE=./configure --prefix=/usr --build=arm-linux-gnueabihf --host=arm-linux-gnueabihf \
+ --localstatedir=/var/lib --with-platform=raspberry-pi \
+ --disable-gl \
+ --enable-gles \
+ --disable-x11 \
+ --disable-sdl \
+ --disable-openmax \
+ --enable-ccache \
+ --enable-optimizations \
+ --enable-external-libraries \
+ --disable-goom \
+ --disable-hal \
+ --disable-pulse \
+ --disable-vaapi \
+ --disable-vdpau \
+ --disable-xrandr \
+ --disable-airplay \
+ --disable-airtunes \
+ --enable-webserver \
+ --disable-alsa \
+ --enable-avahi \
+ --enable-libbluray \
+ --enable-dvdcss \
+ --disable-debug \
+ --disable-joystick \
+ --enable-mid \
+ --disable-nfs \
+ --disable-profiling \
+ --disable-projectm \
+ --enable-rsxs \
+ --enable-rtmp \
+ --disable-vaapi \
+ --disable-vtbdecoder \
+ --disable-external-ffmpeg \
+ --disable-crystalhd \
+ --enable-optical-drive \
+ --enable-libcec \
+ --enable-rpi-cec-api
+
+all: configure
+
+clean:
+distclean:
+ cd $(SOURCE);
+
+configure:
+ cd $(SOURCE); ./bootstrap
+ cd $(SOURCE); $(CONFIGURE)
+ #cd $(SOURCE); make -j $(JOBS)
+ #cd $(SOURCE); make install
View
@@ -2,7 +2,7 @@
SCRIPT_PATH=$(cd `dirname $0` && pwd)
-USE_BUILDROOT=1
+USE_BUILDROOT=0
if [ "$USE_BUILDROOT" = "1" ]; then
BUILDROOT=/opt/xbmc-bcm/buildroot
@@ -17,7 +17,7 @@ else
SDKSTAGE=/opt/bcm-rootfs
XBMCPREFIX=/opt/xbmc-bcm/xbmc-bin
TARGETFS=/opt/bcm-rootfs
- TOOLCHAIN=/usr/local/bcm-gcc
+ TOOLCHAIN=/usr
BUILDROOT=/opt/bcm-rootfs
fi
View
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+SCRIPT_PATH=$(cd `dirname $0` && pwd)
+
+USE_BUILDROOT=1
+
+if [ "$USE_BUILDROOT" = "1" ]; then
+ BUILDROOT=/opt/xbmc-bcm/buildroot
+ TARBALLS=/opt/xbmc-tarballs
+ XBMCPREFIX=/opt/xbmc-bcm/xbmc-bin
+
+ SDKSTAGE=$BUILDROOT/output/staging
+ TARGETFS=$BUILDROOT/output/target
+ TOOLCHAIN=$BUILDROOT/output/host/usr/
+else
+ TARBALLS=/opt/xbmc-tarballs
+ SDKSTAGE=/opt/bcm-rootfs
+ XBMCPREFIX=/opt/xbmc-bcm/xbmc-bin
+ TARGETFS=/opt/bcm-rootfs
+ TOOLCHAIN=/usr/local/bcm-gcc
+ BUILDROOT=/opt/bcm-rootfs
+fi
+
+sudo mkdir -p $XBMCPREFIX
+sudo chmod 777 $XBMCPREFIX
+mkdir -p $XBMCPREFIX/lib
+mkdir -p $XBMCPREFIX/include
+
+echo "SDKSTAGE=$SDKSTAGE" > $SCRIPT_PATH/Makefile.include
+echo "XBMCPREFIX=$XBMCPREFIX" >> $SCRIPT_PATH/Makefile.include
+echo "TARGETFS=$TARGETFS" >> $SCRIPT_PATH/Makefile.include
+echo "TOOLCHAIN=$TOOLCHAIN" >> $SCRIPT_PATH/Makefile.include
+echo "BUILDROOT=$BUILDROOT" >> $SCRIPT_PATH/Makefile.include
+echo "USE_BUILDROOT=$USE_BUILDROOT" >> $SCRIPT_PATH/Makefile.include
+echo "BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs" >> $SCRIPT_PATH/Makefile.include
+echo "TARBALLS_LOCATION=$TARBALLS" >> $SCRIPT_PATH/Makefile.include
+echo "RETRIEVE_TOOL=/usr/bin/curl" >> $SCRIPT_PATH/Makefile.include
+echo "RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output \$(TARBALLS_LOCATION)/\$(ARCHIVE)" >> $SCRIPT_PATH/Makefile.include
+echo "ARCHIVE_TOOL=/bin/tar" >> $SCRIPT_PATH/Makefile.include
+echo "ARCHIVE_TOOL_FLAGS=xf" >> $SCRIPT_PATH/Makefile.include
+echo "JOBS=$((`grep -c processor /proc/cpuinfo -1`))" >> $SCRIPT_PATH/Makefile.include
@@ -1,10 +1,17 @@
<advancedsettings>
- <video>
- <defaultplayer>omxplayer</defaultplayer>
- <defaultdvdplayer>omxplayer</defaultdvdplayer>
- </video>
- <audio>
- <defaultplayer>omxplayer</defaultplayer>
- <streamsilence>false</streamsilence>
- </audio>
+<cputempcommand>/opt/vc/bin/vcgencmd measure_temp | sed -e 's/temp=\([0-9]*\).*/\1 C/'</cputempcommand>
+<gputempcommand>/opt/vc/bin/vcgencmd measure_temp | sed -e 's/temp=\([0-9]*\).*/\1 C/'</gputempcommand>
+<network>
+<cachemembuffersize>10485760</cachemembuffersize>
+</network>
+<imageres>540</imageres>
+<fanartres>720</fanartres>
+<video>
+<defaultplayer>omxplayer</defaultplayer>
+<defaultdvdplayer>omxplayer</defaultdvdplayer>
+</video>
+<audio>
+<defaultplayer>paplayer</defaultplayer>
+<streamsilence>false</streamsilence>
+</audio>
</advancedsettings>
@@ -0,0 +1,10 @@
+<advancedsettings>
+ <video>
+ <defaultplayer>omxplayer</defaultplayer>
+ <defaultdvdplayer>omxplayer</defaultdvdplayer>
+ </video>
+ <audio>
+ <defaultplayer>omxplayer</defaultplayer>
+ <streamsilence>false</streamsilence>
+ </audio>
+</advancedsettings>
@@ -652,8 +652,8 @@ void CGUISettings::Initialize()
flattenTVShowOptions.insert(make_pair(20422, 2));
AddInt(vdl, "videolibrary.flattentvshows", 20412, 1, flattenTVShowOptions, SPIN_CONTROL_TEXT);
- AddBool(vdl, "videolibrary.groupmoviesets", 20458, false);
- AddBool(vdl, "videolibrary.updateonstartup", 22000, false);
+ AddBool(vdl, "videolibrary.groupmoviesets", 20458, true);
+ AddBool(vdl, "videolibrary.updateonstartup", 22000, true);
AddBool(vdl, "videolibrary.backgroundupdate", 22001, false);
AddSeparator(vdl, "videolibrary.sep3");
AddString(vdl, "videolibrary.cleanup", 334, "", BUTTON_CONTROL_STANDARD);
@@ -780,7 +780,7 @@ void CGUISettings::Initialize()
AddInt(vid, "myvideos.selectaction", 22079, SELECT_ACTION_PLAY_OR_RESUME, myVideosSelectActions, SPIN_CONTROL_TEXT);
AddBool(vid, "myvideos.extractflags",20433, true);
AddBool(vid, "myvideos.replacelabels", 20419, true);
- AddBool(NULL, "myvideos.extractthumb",20433, true);
+ AddBool(NULL, "myvideos.extractthumb",20433, false);
CSettingsCategory* sub = AddCategory(SETTINGS_VIDEOS, "subtitles", 287);
AddString(sub, "subtitles.font", 14089, "arial.ttf", SPIN_CONTROL_TEXT);
@@ -810,7 +810,7 @@ void CGUISettings::Initialize()
CSettingsCategory* dvd = AddCategory(SETTINGS_VIDEOS, "dvds", 14087);
AddBool(dvd, "dvds.autorun", 14088, false);
AddInt(dvd, "dvds.playerregion", 21372, 0, 0, 1, 8, SPIN_CONTROL_INT_PLUS, -1, TEXT_OFF);
- AddBool(dvd, "dvds.automenu", 21882, false);
+ AddBool(dvd, "dvds.automenu", 21882, true);
AddDefaultAddon(NULL, "scrapers.moviesdefault", 21413, "metadata.themoviedb.org", ADDON_SCRAPER_MOVIES);
AddDefaultAddon(NULL, "scrapers.tvshowsdefault", 21414, "metadata.tvdb.com", ADDON_SCRAPER_TVSHOWS);
@@ -829,9 +829,9 @@ void CGUISettings::Initialize()
#ifdef HAS_WEB_SERVER
CSettingsCategory* srvWeb = AddCategory(SETTINGS_SERVICE, "webserver", 33101);
- AddBool(srvWeb, "services.webserver", 263, false);
+ AddBool(srvWeb, "services.webserver", 263, true);
AddString(srvWeb,"services.webserverport", 730, CUtil::CanBindPrivileged()?"80":"8080", EDIT_CONTROL_NUMBER_INPUT, false, 730);
- AddString(srvWeb,"services.webserverusername",1048, "xbmc", EDIT_CONTROL_INPUT);
+ AddString(srvWeb,"services.webserverusername",1048, "", EDIT_CONTROL_INPUT);
AddString(srvWeb,"services.webserverpassword",733, "", EDIT_CONTROL_HIDDEN_INPUT, true, 733);
AddDefaultAddon(srvWeb, "services.webskin",199, DEFAULT_WEB_INTERFACE, ADDON_WEB_INTERFACE);
#endif
@@ -879,7 +879,7 @@ void CGUISettings::Initialize()
AddInt(laf, "lookandfeel.startupwindow",512,1, WINDOW_HOME, 1, WINDOW_PYTHON_END, SPIN_CONTROL_TEXT);
AddString(laf, "lookandfeel.soundskin",15108,"SKINDEFAULT", SPIN_CONTROL_TEXT);
AddSeparator(laf, "lookandfeel.sep2");
- AddBool(laf, "lookandfeel.enablerssfeeds",13305, true);
+ AddBool(laf, "lookandfeel.enablerssfeeds",13305, false);
AddString(laf, "lookandfeel.rssedit", 21450, "", BUTTON_CONTROL_STANDARD);
CSettingsCategory* loc = AddCategory(SETTINGS_APPEARANCE, "locale", 14090);
Oops, something went wrong.

0 comments on commit cbe3cda

Please sign in to comment.