diff options
| author | wsnipex <wsnipex@a1.net> | 2014-04-17 15:18:07 +0200 |
|---|---|---|
| committer | Rainer Hochecker <fernetmenta@online.de> | 2014-04-27 18:05:13 +0200 |
| commit | 4982f25c91c2963a8f05bef86904dc5ab0f5f380 (patch) | |
| tree | 2feb2ef33035893398033471df7b292a6be02ec4 /tools | |
| parent | 9d6a9f115f31315c55aad7d01d37a4150e69e8a1 (diff) | |
[linux] log how ffmpeg was linked, ffmpeg version check and logging
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/depends/target/ffmpeg/Makefile | 2 | ||||
| -rwxr-xr-x | tools/depends/target/ffmpeg/autobuild.sh | 1 | ||||
| -rw-r--r-- | tools/rbp/depends/ffmpeg/Makefile | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile index 8b95d5cfe6..4abc3f0a13 100644 --- a/tools/depends/target/ffmpeg/Makefile +++ b/tools/depends/target/ffmpeg/Makefile @@ -7,7 +7,7 @@ DEPS= ../../Makefile.include FFMPEG-VERSION Makefile APPLY_PATCHES=no # configuration settings -ffmpg_config = --prefix=$(PREFIX) +ffmpg_config = --prefix=$(PREFIX) --extra-version="xbmc-$(VERSION)" ffmpg_config += --cc=$(CC) --cxx=$(CXX) ffmpg_config += --disable-devices --disable-doc ffmpg_config += --disable-ffplay --disable-ffmpeg diff --git a/tools/depends/target/ffmpeg/autobuild.sh b/tools/depends/target/ffmpeg/autobuild.sh index b7a1ba66a0..543c10e901 100755 --- a/tools/depends/target/ffmpeg/autobuild.sh +++ b/tools/depends/target/ffmpeg/autobuild.sh @@ -126,6 +126,7 @@ tar --strip-components=1 -xf ../${ARCHIVE} CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \ ./configure --prefix=$FFMPEG_PREFIX \ + --extra-version="xbmc-${VERSION}" \ --disable-devices \ --disable-ffplay \ --disable-ffmpeg \ diff --git a/tools/rbp/depends/ffmpeg/Makefile b/tools/rbp/depends/ffmpeg/Makefile index 93b5a02231..0c11ceaffd 100644 --- a/tools/rbp/depends/ffmpeg/Makefile +++ b/tools/rbp/depends/ffmpeg/Makefile @@ -8,7 +8,7 @@ DEPS= ../../Makefile.include ../depends.mk ../../../depends/target/ffmpeg/FFMPEG APPLY_PATCHES=no # configuration settings -ffmpg_config = --sysroot=$(SYSROOT) --prefix=$(PREFIX) +ffmpg_config = --sysroot=$(SYSROOT) --prefix=$(PREFIX) --extra-version="xbmc-$(VERSION)" ffmpg_config += --enable-cross-compile --target-os=linux --cpu=arm1176jzf-s --arch=arm ffmpg_config += --cc=$(CC) --cxx=$(CXX) ffmpg_config += --disable-devices --disable-doc |