xbmc: switch to external ffmpeg

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2012-06-05 13:41:05 +02:00
parent b08a6acd25
commit d562b24ebd
2 changed files with 6 additions and 7 deletions

View File

@ -165,12 +165,11 @@ else
XBMC_CRYSTALHD="--disable-crystalhd"
fi
# xbmc (ffmpeg) fails to build with LTO optimization
# xbmc fails to build with LTO optimization
strip_lto
# dont use some optimizations because of problems
# this fixes problems with faac implementation of ffmpeg
LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"`
# dont build parallel
MAKEFLAGS=-j1
export PYTHON_VERSION="2.7"
export PYTHON_CPPFLAGS="-I$SYSROOT_PREFIX/usr/include/python$PYTHON_VERSION"
@ -256,7 +255,7 @@ cd $PKG_BUILD
$XBMC_BLURAY \
--enable-texturepacker \
--disable-external-libraries \
--disable-external-ffmpeg \
--enable-external-ffmpeg \
# setup default skin inside the sources
sed -i -e "s|skin.confluence|$SKIN_DIR|g" xbmc/settings/Settings.h

View File

@ -29,8 +29,8 @@ PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.xbmc.org"
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS="boost Python zlib bzip2 systemd pcre alsa-lib libass curl libssh rtmpdump fontconfig libmad libogg libvorbis libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl alsa bc xbmc-addon-settings"
PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 systemd lzo pcre alsa-lib libass enca curl libssh rtmpdump fontconfig fribidi libjpeg-turbo libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql"
PKG_DEPENDS="boost Python zlib bzip2 systemd pcre ffmpeg alsa-lib libass curl libssh rtmpdump fontconfig libmad libogg libvorbis libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl alsa bc xbmc-addon-settings"
PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 systemd lzo pcre alsa-lib ffmpeg libass enca curl libssh rtmpdump fontconfig fribidi libjpeg-turbo libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql"
PKG_PRIORITY="optional"
PKG_SECTION="mediacenter"
PKG_SHORTDESC="xbmc: XBMC Mediacenter"