From 9ee11e42998d6896395ed40c25d8049f794f1e16 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 20 Oct 2014 04:51:59 +0200 Subject: [PATCH] [xbmc-rebrand] xbmc-audioencoder-flac: add patch to fix install location, move install location Signed-off-by: Stephan Raue --- .../xbmc-audioencoder-flac/package.mk | 2 +- .../xbmc-audioencoder-flac-xbmc-rebrand.patch | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 packages/mediacenter/xbmc-audioencoder-flac/patches/xbmc-audioencoder-flac-xbmc-rebrand.patch diff --git a/packages/mediacenter/xbmc-audioencoder-flac/package.mk b/packages/mediacenter/xbmc-audioencoder-flac/package.mk index ede1fced4f..a352184e43 100644 --- a/packages/mediacenter/xbmc-audioencoder-flac/package.mk +++ b/packages/mediacenter/xbmc-audioencoder-flac/package.mk @@ -35,7 +35,7 @@ PKG_AUTORECONF="no" configure_target() { cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/xbmc \ + -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ -DFLAC_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include \ -DOGG_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include \ diff --git a/packages/mediacenter/xbmc-audioencoder-flac/patches/xbmc-audioencoder-flac-xbmc-rebrand.patch b/packages/mediacenter/xbmc-audioencoder-flac/patches/xbmc-audioencoder-flac-xbmc-rebrand.patch new file mode 100644 index 0000000000..77e19e43fa --- /dev/null +++ b/packages/mediacenter/xbmc-audioencoder-flac/patches/xbmc-audioencoder-flac-xbmc-rebrand.patch @@ -0,0 +1,24 @@ +diff -Naur xbmc-audioencoder-flac-7aee9d0/CMakeLists.txt xbmc-audioencoder-flac-7aee9d0.patch/CMakeLists.txt +--- xbmc-audioencoder-flac-7aee9d0/CMakeLists.txt 2014-07-18 23:48:22.000000000 +0200 ++++ xbmc-audioencoder-flac-7aee9d0.patch/CMakeLists.txt 2014-10-20 13:03:49.565070141 +0200 +@@ -6,7 +6,7 @@ + + enable_language(CXX) + +-find_package(xbmc REQUIRED) ++find_package(kodi REQUIRED) + find_package(FLAC REQUIRED) + find_package(Ogg REQUIRED) + +diff -Naur xbmc-audioencoder-flac-7aee9d0/src/EncoderFlac.cpp xbmc-audioencoder-flac-7aee9d0.patch/src/EncoderFlac.cpp +--- xbmc-audioencoder-flac-7aee9d0/src/EncoderFlac.cpp 2014-07-18 23:48:22.000000000 +0200 ++++ xbmc-audioencoder-flac-7aee9d0.patch/src/EncoderFlac.cpp 2014-10-20 02:13:58.806998666 +0200 +@@ -20,7 +20,7 @@ + + #include + #include +-#include "xbmc/xbmc_audioenc_dll.h" ++#include "kodi/xbmc_audioenc_dll.h" + #include + + extern "C" {