LinuxRendererGLES.h: correct path to `DVDVideoCodec.h`
authorPaul Menzel <paulepanter@users.sourceforge.net>
Mon, 21 Mar 2011 08:35:02 +0000 (09:35 +0100)
committerS. Davilla <davilla@4pi.com>
Tue, 22 Mar 2011 16:59:31 +0000 (12:59 -0400)
commit91261c9d8fde24cdd3471153b13b88b43fad8f2f
tree5edf2e7438c6d9a695c4f7462fce6dffdc1aeecd
parentf5388977908f67406042a3d4508620d3f9a3bf64
LinuxRendererGLES.h: correct path to `DVDVideoCodec.h`

Commit fcba7fc3 [1]

[ios] add corevideo ref buffer support

has the following change

-#include "../dvdplayer/DVDCodecs/Video/DVDVideoCodec.h"
+#include "DVDCodecs/Video/DVDVideoCodec.h"

which breaks the build using OpenEmbedded [2] with `angstrom-2008.1` and `MACHINE = "beagleboard"`.

arm-angstrom-linux-gnueabi-g++ -march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp -mthumb-interwork -mno-thumb --sysroot=/oe/build-angstrom-next/angstrom-dev/s
ysroots/armv7a-angstrom-linux-gnueabi -MD -c -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb2 -fpermissive -fvisibility-inlines-hidden -fPIC -DPIC -D_RE
ENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -g -D_DEBUG -Wall -O2 -mfloat-abi=softfp -mno-apcs-stack-check -Wa,-march=armv7a -mcpu=cortex-a8 -mfpu=neon -mvectorize-with-ne
on-quad -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb2 -fpermissive -fvisibility-inlines-hidden -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE
_OFFSET_BITS=64 -g -D_DEBUG -Wall -O2 -mfloat-abi=softfp -mno-apcs-stack-check -Wa,-march=armv7a -mcpu=cortex-a8 -mfpu=neon -mvectorize-with-neon-quad -fexpensive-optimizations -fo
mit-frame-pointer -frename-registers -O2 -ggdb2 -fpermissive -fvisibility-inlines-hidden -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -g -D_DEBUG -Wall -O2
 -mfloat-abi=softfp -mno-apcs-stack-check -Wa,-march=armv7a -mcpu=cortex-a8 -mfpu=neon -mvectorize-with-neon-quad -D_LINUX -D_FILE_DEFINED -D__STDC_CONSTANT_MACROS -DBIN_INSTALL_PA
TH="\"/usr/lib/xbmc\"" -DINSTALL_PATH="\"/usr/share/xbmc\"" -DHAS_SDL_JOYSTICK -D'GIT_REV="Unknown"' -D_ARMEL -DHAVE_CONFIG_H  -D_GNU_SOURCE=1 -D_REENTRANT -I/oe/build-an
gstrom-next/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/SDL -I/oe/build-angstrom-next/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/
alsa -I/oe/build-angstrom-next/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/dbus-1.0 -I/oe/build-angstrom-next/angstrom-dev/sysroots/armv7a-a
ngstrom-linux-gnueabi/usr/include/freetype2 -I/oe/build-angstrom-next/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/fribidi -I/oe/build-angstr
om-next/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/libpng12 -I/oe/build-angstrom-next/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/lib/dbu
s-1.0/include -I/oe/build-angstrom-next/angstrom-dev/sysroots/i686-linux/usr/armv7a/include -I/oe/build-angstrom-next/angstrom-dev/work/armv7a-angstrom-linux-gn
ueabi/xbmc-10.05-r11+gitr0+2da92bc3acd51af9884c8cdbc148a56d3ee01923/git -I/oe/build-angstrom-next/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/xbmc-10.05-r11+gitr0+2da
92bc3acd51af9884c8cdbc148a56d3ee01923/git/lib -I/oe/build-angstrom-next/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/xbmc-10.05-r11+gitr0+2da92bc3acd51af9884c8cdbc148a
56d3ee01923/git/xbmc -I/oe/build-angstrom-next/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/xbmc-10.05-r11+gitr0+2da92bc3acd51af9884c8cdbc148a56d3ee01923/git/xbmc/linu
x Application.cpp -o Application.o

In file included from cores/VideoRenderers/RenderManager.h:29:0,
               from Application.cpp:107:
cores/VideoRenderers/LinuxRendererGLES.h:33:43: fatal error: DVDCodecs/Video/DVDVideoCodec.h: No such file or directory
compilation terminated.
make[1]: *** [Application.o] Error 1
make[1]: Leaving directory `/oe/build-angstrom-next/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/xbmc-10.05-r11+gitr0+2da92bc3acd51af9884c8cdbc148a56d3ee01923/git/xbmc'
make: *** [xbmc/xbmc.a] Error 2
make: *** Waiting for unfinished jobs....

Reverting that change fixes the build.

[1] https://github.com/xbmc/xbmc/commit/fcba7fc30e1dc32c8cbee9d0bb05746abf17a71d
[2] http://www.openembedded.org/

Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
Closes: Trac ticket #11362
xbmc/cores/VideoRenderers/LinuxRendererGLES.h