File kodi-tools-libdir.patch of Package kodi

File kodi-tools-libdir.patch of Package kodi (Revision 961126e4018e95da0893184342590eb6)

Currently displaying revision 961126e4018e95da0893184342590eb6 , Show latest

Index: tools/depends/target/libdvdread/Makefile
===================================================================
--- tools/depends/target/libdvdread/Makefile.orig	2017-11-21 11:15:09.356861040 +0200
+++ tools/depends/target/libdvdread/Makefile	2017-11-22 14:01:17.324102964 +0200
@@ -3,7 +3,7 @@ include DVDREAD-VERSION
 DEPS = DVDREAD-VERSION Makefile
 
 # configuration settings
-config = --prefix=$(PREFIX) --disable-shared --enable-static --with-pic
+config = --prefix=$(PREFIX) --libdir=$(PREFIX)/$(DVD_LIB) --disable-shared --enable-static --with-pic
 EXTRA_CFLAGS = -D_XBMC
 
 ifeq ($(CROSS_COMPILING), yes)
@@ -16,7 +16,7 @@ else
   ifeq ($(PLATFORM),)
     PLATFORM = native
     TARBALLS_LOCATION = $(ROOT_DIR)
-    PKGCONFIGPATH = PKG_CONFIG_PATH="$(ROOT_DIR)/../libdvdcss/dvdcss-install/lib/pkgconfig"
+    PKGCONFIGPATH = PKG_CONFIG_PATH="$(ROOT_DIR)/../libdvdcss/dvdcss-install/$(DVD_LIB)/pkgconfig"
     EXTRA_CFLAGS += -I$(ROOT_DIR)/../libdvdcss/dvdcss-install/include
   endif
 endif
@@ -42,7 +42,6 @@ else
   ARCHIVE=$(LIBNAME)-$(GITREV).tar.gz
 endif
 
-
 CLEAN_FILES=$(ARCHIVE) $(PLATFORM)
 
 all: .installed-$(PLATFORM)
Index: lib/libdvd/Makefile.in
===================================================================
--- lib/libdvd/Makefile.in.orig	2017-11-21 11:15:09.356861040 +0200
+++ lib/libdvd/Makefile.in	2017-11-21 11:44:59.603860055 +0200
@@ -6,13 +6,13 @@ CXX=@CXX@
 
 ifeq (@CROSS_COMPILING@,yes)
   DEPENDS_DIR = $(shell grep "^PREFIX=/" @abs_top_srcdir@/tools/depends/Makefile.include | sed 's/PREFIX=//g')
-  DVDNAV_A = $(DEPENDS_DIR)/lib/libdvdnav.a
-  DVDREAD_A = $(DEPENDS_DIR)/lib/libdvdread.a
-  DVDCSS_A = $(DEPENDS_DIR)/lib/libdvdcss.a
+  DVDNAV_A = $(DEPENDS_DIR)/$(DVD_LIB)/libdvdnav.a
+  DVDREAD_A = $(DEPENDS_DIR)/$(DVD_LIB)/libdvdread.a
+  DVDCSS_A = $(DEPENDS_DIR)/$(DVD_LIB)/libdvdcss.a
 else
-  DVDNAV_A = @abs_top_srcdir@/tools/depends/target/libdvdnav/dvdnav-install/lib/libdvdnav.a
-  DVDREAD_A = @abs_top_srcdir@/tools/depends/target/libdvdread/dvdread-install/lib/libdvdread.a
-  DVDCSS_A = @abs_top_srcdir@/tools/depends/target/libdvdcss/dvdcss-install/lib/libdvdcss.a
+  DVDNAV_A = @abs_top_srcdir@/tools/depends/target/libdvdnav/dvdnav-install/$(DVD_LIB)/libdvdnav.a
+  DVDREAD_A = @abs_top_srcdir@/tools/depends/target/libdvdread/dvdread-install/$(DVD_LIB)/libdvdread.a
+  DVDCSS_A = @abs_top_srcdir@/tools/depends/target/libdvdcss/dvdcss-install/$(DVD_LIB)/libdvdcss.a
 endif
 
 SYSDIR = @abs_top_srcdir@/system/players/VideoPlayer
Index: tools/depends/target/libdvdcss/Makefile
===================================================================
--- tools/depends/target/libdvdcss/Makefile.orig	2017-10-23 07:55:21.000000000 +0200
+++ tools/depends/target/libdvdcss/Makefile	2017-11-22 11:23:22.801643723 +0200
@@ -19,7 +19,7 @@ RETRIEVE_TOOL := curl -Ls --create-dirs
 ARCHIVE_TOOL := tar --strip-components=1 -xf
 
 # configuration settings
-config = --prefix=$(PREFIX) --disable-shared --enable-static --with-pic
+config = --prefix=$(PREFIX) --libdir=$(PREFIX)/$(DVD_LIB) --disable-shared --enable-static --with-pic
 
 CLEAN_FILES=$(ARCHIVE) $(PLATFORM)
 
Index: tools/depends/target/libdvdnav/Makefile
===================================================================
--- tools/depends/target/libdvdnav/Makefile.orig	2017-10-23 07:55:21.000000000 +0200
+++ tools/depends/target/libdvdnav/Makefile	2017-11-22 14:01:49.397317647 +0200
@@ -3,7 +3,7 @@ include DVDNAV-VERSION
 DEPS = DVDNAV-VERSION Makefile
 
 # configuration settings
-config = --prefix=$(PREFIX) --disable-shared --enable-static --with-pic
+config = --prefix=$(PREFIX) --libdir=$(PREFIX)/$(DVD_LIB) --disable-shared --enable-static --with-pic
 EXTRA_CFLAGS = -D_XBMC -DHAVE_DVDCSS_DVDCSS_H
 
 ifeq ($(CROSS_COMPILING), yes)
@@ -16,7 +16,7 @@ else
   ifeq ($(PLATFORM),)
     PLATFORM = native
     TARBALLS_LOCATION = $(ROOT_DIR)
-    PKGCONFIGPATH = PKG_CONFIG_PATH="$(ROOT_DIR)/../libdvdread/dvdread-install/lib/pkgconfig:$(ROOT_DIR)/../libdvdcss/dvdcss-install/lib/pkgconfig"
+    PKGCONFIGPATH = PKG_CONFIG_PATH="$(ROOT_DIR)/../libdvdread/dvdread-install/$(DVD_LIB)/pkgconfig:$(ROOT_DIR)/../libdvdcss/dvdcss-install/$(DVD_LIB)/pkgconfig"
     EXTRA_CFLAGS += -I$(ROOT_DIR)/../libdvdread/dvdread-install/include -I$(ROOT_DIR)/../libdvdcss/dvdcss-install/include
   endif
 endif