[oe] [meta-multimedia][PATCH 09/23] dcadec: Define BASELIB as a knob
Khem Raj
raj.khem at gmail.com
Sat Dec 21 00:06:21 UTC 2019
Use https protocol in fetcher
Fixes
ERROR: dcadec-0.2.0-r0 do_package: QA Issue: dcadec: Files/directories were installed but not shipped in any package:
/usr/lib
/usr/lib/libdcadec.so.0
/usr/lib/libdcadec.so.0.1.0
/usr/lib/libdcadec.so
/usr/lib/pkgconfig
/usr/lib/pkgconfig/dcadec.pc
Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
.../0001-define-BASELIB-make-variable.patch | 31 +++++++++++++++++++
.../recipes-multimedia/dca/dcadec_0.2.0.bb | 8 +++--
2 files changed, 36 insertions(+), 3 deletions(-)
create mode 100644 meta-multimedia/recipes-multimedia/dca/dcadec/0001-define-BASELIB-make-variable.patch
diff --git a/meta-multimedia/recipes-multimedia/dca/dcadec/0001-define-BASELIB-make-variable.patch b/meta-multimedia/recipes-multimedia/dca/dcadec/0001-define-BASELIB-make-variable.patch
new file mode 100644
index 0000000000..adce802bc8
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/dca/dcadec/0001-define-BASELIB-make-variable.patch
@@ -0,0 +1,31 @@
+From 18cc69460d2a0c756880bd54fda36afb0173ea02 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem at gmail.com>
+Date: Thu, 19 Dec 2019 19:47:36 -0800
+Subject: [PATCH] define BASELIB make variable
+
+This helps to override the default libdir from environment
+
+Upstream-Status: Submitted [https://github.com/foo86/dcadec/pull/61]
+Signed-off-by: Khem Raj <raj.khem at gmail.com>
+---
+ Makefile | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index a503698..8f323be 100644
+--- a/Makefile
++++ b/Makefile
+@@ -7,8 +7,9 @@ API_PATCH = 0
+ CFLAGS := -std=gnu99 -D_FILE_OFFSET_BITS=64 -Wall -Wextra -O3 -ffast-math -g -MMD $(CFLAGS)
+
+ PREFIX ?= /usr/local
++BASELIB ?= lib
+ BINDIR ?= $(PREFIX)/bin
+-LIBDIR ?= $(PREFIX)/lib
++LIBDIR ?= $(PREFIX)/$(BASELIB)
+ INCLUDEDIR ?= $(PREFIX)/include
+
+ SRC_DIR := $(realpath $(dir $(lastword $(MAKEFILE_LIST))))
+--
+2.24.1
+
diff --git a/meta-multimedia/recipes-multimedia/dca/dcadec_0.2.0.bb b/meta-multimedia/recipes-multimedia/dca/dcadec_0.2.0.bb
index 45b53c1191..1a51abc360 100644
--- a/meta-multimedia/recipes-multimedia/dca/dcadec_0.2.0.bb
+++ b/meta-multimedia/recipes-multimedia/dca/dcadec_0.2.0.bb
@@ -4,14 +4,16 @@ LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c"
SRCREV = "b93deed1a231dd6dd7e39b9fe7d2abe05aa00158"
-SRC_URI = "git://github.com/foo86/dcadec.git;protocol=http"
+SRC_URI = "git://github.com/foo86/dcadec.git;protocol=https \
+ file://0001-define-BASELIB-make-variable.patch \
+ "
S = "${WORKDIR}/git"
inherit lib_package
-EXTRA_OEMAKE = "CONFIG_SHARED=1"
+EXTRA_OEMAKE = "CONFIG_SHARED=1 PREFIX=${prefix} BASELIB=${baselib}"
do_install() {
- oe_runmake install DESTDIR="${D}" PREFIX="${prefix}"
+ oe_runmake install DESTDIR="${D}"
}
--
2.24.1
More information about the Openembedded-devel
mailing list