From b2e92bd577c059fa35fe258bcd9701b1a18dc08d Mon Sep 17 00:00:00 2001 From: uNiversaI Date: Sat, 31 Jan 2015 16:35:47 +0900 Subject: [PATCH] [rebrand] ffmpeg extra-version xbmc -> kodi Looking at these for entirely different reason, these must go anyway. @fernetmenta --- tools/depends/target/ffmpeg/Makefile | 2 +- tools/depends/target/ffmpeg/autobuild.sh | 4 ++-- xbmc/Application.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile index 269a0c4df2ff5..711182f6b058c 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) --extra-version="xbmc-$(VERSION)" +ffmpg_config = --prefix=$(PREFIX) --extra-version="kodi-$(VERSION)" ffmpg_config += --cc=$(CC) --cxx=$(CXX) --ar=$(AR) --ranlib=$(RANLIB) ffmpg_config += --disable-devices --disable-doc ffmpg_config += --disable-ffplay --disable-ffmpeg --disable-sdl diff --git a/tools/depends/target/ffmpeg/autobuild.sh b/tools/depends/target/ffmpeg/autobuild.sh index e57396dab0ac5..8733de05f6383 100755 --- a/tools/depends/target/ffmpeg/autobuild.sh +++ b/tools/depends/target/ffmpeg/autobuild.sh @@ -127,7 +127,7 @@ tar --strip-components=1 -xf ../${ARCHIVE} CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \ ./configure --prefix=$FFMPEG_PREFIX \ - --extra-version="xbmc-${VERSION}" \ + --extra-version="kodi-${VERSION}" \ --disable-devices \ --disable-ffplay \ --disable-ffmpeg \ @@ -167,6 +167,6 @@ then [ ${SUDO} ] && echo "Root priviledges are required to install to ${FFMPEG_PREFIX}" ${SUDO} make install && echo "$VERSION" > ../.ffmpeg-installed else - echo "ERROR: building ffmpeg failed" + echo "ERROR: Building ffmpeg failed" exit 1 fi diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp index fabe145eb5104..0442b52723015 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp @@ -615,8 +615,8 @@ bool CApplication::Create() #endif // !USE_STATIC_FFMPEG if (!strstr(FFMPEG_VERSION, FFMPEG_VER_SHA)) { - if (strstr(FFMPEG_VERSION, "xbmc")) - CLog::Log(LOGNOTICE, "WARNING: unknown ffmpeg-xbmc version detected"); + if (strstr(FFMPEG_VERSION, "kodi")) + CLog::Log(LOGNOTICE, "WARNING: unknown ffmpeg-kodi version detected"); else CLog::Log(LOGNOTICE, "WARNING: unsupported ffmpeg version detected"); }