2 files changed, 38 insertions, 1 deletions

diff --git a/meta-multimedia/recipes-multimedia/libsquish/libsquish/0001-makefile-Add-LIBDIR.patch b/meta-multimedia/recipes-multimedia/libsquish/libsquish/0001-makefile-Add-LIBDIR.patch
new file mode 100644
index 0000000000..c6eb7ac576
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/libsquish/libsquish/0001-makefile-Add-LIBDIR.patch
@@ -0,0 +1,36 @@
+From 4fd08c0446ca02917014b63f9080c4205958a130 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 20 Mar 2022 01:15:32 -0700
+Subject: [PATCH] makefile: Add LIBDIR
+
+Avoid hardcoding /lib
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 1c01f89..2b1df5b 100644
+--- a/Makefile
++++ b/Makefile
+@@ -11,12 +11,12 @@ all : $(LIB) squish.pc
+ 
+ install : $(LIB) squish.pc
+        install squish.h $(INSTALL_DIR)/include 
+-       install libsquish.a $(INSTALL_DIR)/lib
+-       install squish.pc $(INSTALL_DIR)/lib/pkgconfig
++       install libsquish.a $(INSTALL_DIR)/$(LIBDIR)
++       install squish.pc $(INSTALL_DIR)/$(LIBDIR)/pkgconfig
+ 
+ uninstall:
+        $(RM) $(INSTALL_DIR)/include/squish.h
+-       $(RM) $(INSTALL_DIR)/lib/libsquish.a
++       $(RM) $(INSTALL_DIR)/$(LIBDIR)/libsquish.a
+ 
+ $(LIB) : $(OBJ)
+        $(AR) cr $@ $?
+-- 
+2.35.1
+
diff --git a/meta-multimedia/recipes-multimedia/libsquish/libsquish_git.bb b/meta-multimedia/recipes-multimedia/libsquish/libsquish_git.bb
index cb42d943fc..b69d30d259 100644
--- a/meta-multimedia/recipes-multimedia/libsquish/libsquish_git.bb
+++ b/meta-multimedia/recipes-multimedia/libsquish/libsquish_git.bb
@@ -10,7 +10,8 @@ SRC_URI = "git://github.com/OpenELEC/libsquish.git;protocol=https;branch=master"
 
 S = "${WORKDIR}/git"
 
-EXTRA_OEMAKE = "INSTALL_DIR=${D}${prefix}"
+EXTRA_OEMAKE = "INSTALL_DIR=${D}${prefix} LIBDIR=${base_libdir} \
+                ${@bb.utils.contains('TUNE_FEATURES', 'altivec', 'USE_ALTIVEC=1', '', d)}"
 
 do_install() {
         install -d ${D}${includedir}