jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-08-03 16:07:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

xbmc-rpi: switch to external ffmpeg

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2012-06-05 13:41:14 +02:00
parent d562b24ebd
commit f707ba9f80
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/mediacenter/xbmc-rpi/build
View File

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

4
packages/mediacenter/xbmc-rpi/meta
View File

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

12
packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-0bcbaa3-992.01-ffmpeg_compile_fixes.patch Normal file
View File

@ -0,0 +1,12 @@
diff -Naur xbmc-rpi-0bcbaa3/lib/DllAvFormat.h xbmc-rpi-0bcbaa3.patch/lib/DllAvFormat.h
--- xbmc-rpi-0bcbaa3/lib/DllAvFormat.h 2012-06-01 21:10:03.000000000 +0200
+++ xbmc-rpi-0bcbaa3.patch/lib/DllAvFormat.h 2012-06-05 07:06:49.123867584 +0200
@@ -119,7 +119,7 @@
virtual int url_feof(AVIOContext *s) { return ::url_feof(s); }
virtual void avformat_close_input(AVFormatContext **s) { ::avformat_close_input(s); }
virtual int av_read_frame(AVFormatContext *s, AVPacket *pkt) { return ::av_read_frame(s, pkt); }
- virtual void av_read_frame_flush(AVFormatContext *s) { ::av_read_frame_flush_internal(s); }
+ virtual void av_read_frame_flush(AVFormatContext *s) { ::av_read_frame_flush(s); }
virtual int av_read_play(AVFormatContext *s) { return ::av_read_play(s); }
virtual int av_read_pause(AVFormatContext *s) { return ::av_read_pause(s); }
virtual int av_seek_frame(AVFormatContext *s, int stream_index, int64_t timestamp, int flags) { return ::av_seek_frame(s, stream_index, timestamp, flags); }