diff options
| author |   Athanasios Oikonomou <athoik@gmail.com> | 2018-12-28 21:37:42 +0200 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2019-01-02 10:28:18 -0800 |
| commit | cd6d63e580fb187a137454af14979286e87bbb38 (patch) | |
| tree | c109334ba35d38952a51e3599f9fdb166f73c2f3 /meta-multimedia | |
| parent | c5f551f84149e53583ff83aef2a2c7d0b8c67e47 (diff) | |
| download | meta-openembedded-contrib-cd6d63e580fb187a137454af14979286e87bbb38.tar.gz | |
faac: update 1.29 -> 1.29.9.2
Remove not required patch and extra EXTRA_OECONF "--without-mp4v2".
Previously not required mp4v2 library was dropped on 1.29.9.2.
While being there also fix issue with multilib build on aarch64
using FILES_lib${BPN} instead of FILES_lib${PN}.
WARNING: lib32-faac-1.29.9.2-r0 do_package: QA Issue: lib32-faac: Files/directories were installed but not shipped in any package:
/usr/lib/libfaac.so.0
/usr/lib/libfaac.so.0.0.0
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
lib32-faac: 2 installed and not shipped files. [installed-vs-shipped]
Signed-off-by: Athanasios Oikonomou <athoik@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-multimedia')
| -rw-r--r-- | meta-multimedia/recipes-multimedia/faac/faac_1.29.9.2.bb (renamed from meta-multimedia/recipes-multimedia/faac/faac_1.29.bb) | 11 | ||||
| -rw-r--r-- | meta-multimedia/recipes-multimedia/faac/files/0001-mp4v2-Define-__STRING-if-cdefs.h-does-not-exist.patch | 28 |
2 files changed, 4 insertions, 35 deletions
diff --git a/meta-multimedia/recipes-multimedia/faac/faac_1.29.bb b/meta-multimedia/recipes-multimedia/faac/faac_1.29.9.2.bb index d36f2f48d8..278bda9ff5 100644 --- a/meta-multimedia/recipes-multimedia/faac/faac_1.29.bb +++ b/meta-multimedia/recipes-multimedia/faac/faac_1.29.9.2.bb @@ -11,19 +11,16 @@ inherit autotools SRC_URI = " \ ${SOURCEFORGE_MIRROR}/faac/${BP}.tar.gz \ - file://0001-mp4v2-Define-__STRING-if-cdefs.h-does-not-exist.patch \ " -SRC_URI[md5sum] = "78603720f655180059d6970c582a3005" -SRC_URI[sha256sum] = "8cc7b03ceb2722223a6457e95d4c994731d80214a03ba33d1af76ba53f4b3197" - -EXTRA_OECONF += "--without-mp4v2" +SRC_URI[md5sum] = "2b58d621fad8fda879f07b7cad8bfe10" +SRC_URI[sha256sum] = "d45f209d837c49dae6deebcdd87b8cc3b04ea290880358faecf5e7737740c771" PACKAGES =+ "lib${BPN} lib${BPN}-dev" FILES_${PN} = " ${bindir}/faac " -FILES_lib${PN} = " ${libdir}/*.so.*" -FILES_lib${PN}-dev = " \ +FILES_lib${BPN} = " ${libdir}/*.so.*" +FILES_lib${BPN}-dev = " \ ${includedir} \ ${libdir}/*.so \ ${libdir}/*.la \ diff --git a/meta-multimedia/recipes-multimedia/faac/files/0001-mp4v2-Define-__STRING-if-cdefs.h-does-not-exist.patch b/meta-multimedia/recipes-multimedia/faac/files/0001-mp4v2-Define-__STRING-if-cdefs.h-does-not-exist.patch deleted file mode 100644 index d845ddf595..0000000000 --- a/meta-multimedia/recipes-multimedia/faac/files/0001-mp4v2-Define-__STRING-if-cdefs.h-does-not-exist.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 46cc9298c38b9dd735fec3f39aa2d6e56a362410 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 28 Mar 2017 21:33:36 -0700 -Subject: [PATCH 2/2] mp4v2: Define __STRING if cdefs.h does not exist - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - common/mp4v2/mp4util.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/common/mp4v2/mp4util.h b/common/mp4v2/mp4util.h -index 1f9cb64..1e7aced 100644 ---- a/common/mp4v2/mp4util.h -+++ b/common/mp4v2/mp4util.h -@@ -23,6 +23,10 @@ - #define __MP4_UTIL_INCLUDED__ - #include <assert.h> - -+#ifndef __STRING -+#define __STRING(x) #x -+#endif -+ - #ifndef ASSERT - #define ASSERT(expr) \ - if (!(expr)) { \ --- -2.12.1 - |