Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

TexturePacker faild to build with no -I/include/dir in NATIVE_CXXFLAGS #1972

Closed
wants to merge 8 commits into from

3 participants

@droidron

...Change ensures
-I. \
-I@abs_top_srcdir@/lib \
-I@abs_top_srcdir@/xbmc \
-I@abs_top_srcdir@/xbmc/linux
when NATIVE_ROOT_PATH=@USE_TEXTUREPACKER_NATIVE_ROOT@ results in "NATIVE_ROOT_PATH=", like happened to me twice, compiled xbmc on RPI...

droidron and others added some commits
@droidron droidron TexturePacker faild to build with no -I/include/dir in NATIVE_CXXFLAG…
…S. Change ensures

-I. \
-I@abs_top_srcdir@/lib \
-I@abs_top_srcdir@/xbmc \
-I@abs_top_srcdir@/xbmc/linux
when NATIVE_ROOT_PATH=@USE_TEXTUREPACKER_NATIVE_ROOT@ results in "NATIVE_ROOT_PATH=", like happened to me twice, compiled xbmc on RPI...
42b5719
user ready to compile native
sudo sh tools/rbp/setup-sdk.sh#
cbe3cda
user Merge branch 'master' of https://github.com/droidron/xbmc into rbp a0a8726
user native compile ab1ae02
user native compile dd34515
ronson native compile ffa31c5
ronson native compile 610c4f2
ronson rpi nativ compile 6f8181b
@MartijnKaijser

closing as #1090 is preferred

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Dec 22, 2012
  1. @droidron

    TexturePacker faild to build with no -I/include/dir in NATIVE_CXXFLAG…

    droidron authored
    …S. Change ensures
    
    -I. \
    -I@abs_top_srcdir@/lib \
    -I@abs_top_srcdir@/xbmc \
    -I@abs_top_srcdir@/xbmc/linux
    when NATIVE_ROOT_PATH=@USE_TEXTUREPACKER_NATIVE_ROOT@ results in "NATIVE_ROOT_PATH=", like happened to me twice, compiled xbmc on RPI...
Commits on Jan 3, 2013
  1. ready to compile native

    user authored
    sudo sh tools/rbp/setup-sdk.sh#
  2. native compile

    user authored
  3. native compile

    user authored
Commits on Jan 4, 2013
  1. native compile

    ronson authored
  2. native compile

    ronson authored
  3. rpi nativ compile

    ronson authored
This page is out of date. Refresh to see the latest.
View
4 lib/libdvd/Makefile.in
@@ -56,12 +56,12 @@ else
$(SYSDIR)/libdvdcss-$(ARCH).so: $(WRAPPER) libdvdcss/src/.libs/libdvdcss.a
$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ \
- libdvdcss/src/*.o -Wl,--unresolved-symbols=ignore-all -lm \
+ libdvdcss/src/*.o -Wl,--warn-unresolved-symbols -lm \
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a
$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o -lm \
- -Wl,--unresolved-symbols=ignore-all \
+ -Wl,--warn-unresolved-symbols \
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
endif
View
34 tools/TexturePacker/Makefile.in
@@ -12,24 +12,24 @@ CXXFLAGS+= \
RPATH=-Wl,-rpath=$(NATIVE_ROOT_PATH)/lib
ifeq (@USE_TEXTUREPACKER_NATIVE@,1)
-NATIVE_ROOT_PATH=@USE_TEXTUREPACKER_NATIVE_ROOT@
-ifdef NATIVE_ROOT_PATH
-ifeq ($(findstring Darwin,$(shell uname -s)),Darwin)
-DEFINES += -DTARGET_DARWIN
-NATIVE_ARCH=@DARWIN_NATIVE_ARCH@
-RPATH=
-endif
-NATIVE_CXXFLAGS+= -I. \
- -I$(NATIVE_ROOT_PATH)/include \
- -I@abs_top_srcdir@/lib \
- -I@abs_top_srcdir@/xbmc \
- -I@abs_top_srcdir@/xbmc/linux
-NATIVE_LIBS += -L$(NATIVE_ROOT_PATH)/lib
-endif
-NATIVE_LIBS += -lSDL_image -lSDL -llzo2
-NATIVE_LIBS += -L@abs_top_srcdir@/lib/libsquish -lsquish-native
+ NATIVE_CXXFLAGS+= -I. \
+ -I@abs_top_srcdir@/lib \
+ -I@abs_top_srcdir@/xbmc \
+ -I@abs_top_srcdir@/xbmc/linux
+ NATIVE_ROOT_PATH=@USE_TEXTUREPACKER_NATIVE_ROOT@
+ ifdef NATIVE_ROOT_PATH
+ ifeq ($(findstring Darwin,$(shell uname -s)),Darwin)
+ DEFINES += -DTARGET_DARWIN
+ NATIVE_ARCH=@DARWIN_NATIVE_ARCH@
+ RPATH=
+ endif
+ NATIVE_CXXFLAGS+= -I$(NATIVE_ROOT_PATH)/include
+ NATIVE_LIBS += -L$(NATIVE_ROOT_PATH)/lib
+ endif
+ NATIVE_LIBS += -lSDL_image -lSDL -llzo2
+ NATIVE_LIBS += -L@abs_top_srcdir@/lib/libsquish -lsquish-native
else
-LIBS += -L@abs_top_srcdir@/lib/libsquish -lsquish
+ LIBS += -L@abs_top_srcdir@/lib/libsquish -lsquish
endif
LIBS += -lSDL_image -lSDL -llzo2
View
13 tools/rbp/Makefile.include
@@ -0,0 +1,13 @@
+SDKSTAGE=
+XBMCPREFIX=/opt/xbmc-bcm/xbmc-bin
+TARGETFS=
+TOOLCHAIN=/usr
+BUILDROOT=
+USE_BUILDROOT=0
+BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs
+TARBALLS_LOCATION=/opt/xbmc-tarballs
+RETRIEVE_TOOL=/usr/bin/curl
+RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE)
+ARCHIVE_TOOL=/bin/tar
+ARCHIVE_TOOL_FLAGS=xf
+JOBS=1
View
36 tools/rbp/depends/depends.mk
@@ -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 BUILD=i686-linux
+ 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=arm-linux-gnueabihf
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 TARGETFS=
+ export SYSROOT=
+
+# 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)
View
42 tools/rbp/depends/xbmc/Makefile
@@ -9,10 +9,48 @@ endif
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=$(PREFIX) --build=$(BUILD) --host=$(HOST) \
+ --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
all: configure
View
10 tools/rbp/setup-sdk.sh
@@ -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
@@ -14,11 +14,11 @@ if [ "$USE_BUILDROOT" = "1" ]; then
TOOLCHAIN=$BUILDROOT/output/host/usr/
else
TARBALLS=/opt/xbmc-tarballs
- SDKSTAGE=/opt/bcm-rootfs
+ SDKSTAGE=
XBMCPREFIX=/opt/xbmc-bcm/xbmc-bin
- TARGETFS=/opt/bcm-rootfs
- TOOLCHAIN=/usr/local/bcm-gcc
- BUILDROOT=/opt/bcm-rootfs
+ TARGETFS=
+ TOOLCHAIN=/usr
+ BUILDROOT=
fi
sudo mkdir -p $XBMCPREFIX
View
23 xbmc/cores/omxplayer/omxplayer_advancedsettings.xml
@@ -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>
View
14 xbmc/settings/GUISettings.cpp
@@ -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);
Something went wrong with that request. Please try again.