- add PACKAGECONFIG for hdr10plus and 10bit - add numa support - build shared library by default - do manual packaging to avoid dev-elf error: x265-4.1-r0 do_package_qa: QA Issue: -dev package x265-dev contains non-symlink .so '/usr/lib/libhdr10plus.so' [dev-elf]
Signed-off-by: Markus Volk <[email protected]> --- .../recipes-multimedia/x265/x265_3.2.1.bb | 26 ----------------- .../recipes-multimedia/x265/x265_4.1.bb | 29 +++++++++++++++++++ 2 files changed, 29 insertions(+), 26 deletions(-) delete mode 100644 meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb create mode 100644 meta-multimedia/recipes-multimedia/x265/x265_4.1.bb diff --git a/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb b/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb deleted file mode 100644 index 225fbdee87..0000000000 --- a/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "H.265/HEVC video encoder" -DESCRIPTION = "A free software library and application for encoding video streams into the H.265/HEVC format." -HOMEPAGE = "http://www.videolan.org/developers/x265.html" - -LICENSE = "GPL-2.0-only" -LICENSE_FLAGS = "commercial" -LIC_FILES_CHKSUM = "file://../COPYING;md5=c9e0427bc58f129f99728c62d4ad4091" - -DEPENDS = "nasm-native gnutls zlib libpcre" - -SRC_URI = "http://ftp.videolan.org/pub/videolan/x265/x265_${PV}.tar.gz" - -S = "${WORKDIR}/x265_${PV}/source" - -SRC_URI[sha256sum] = "fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b58cbbcc" - -inherit lib_package pkgconfig cmake - -do_generate_toolchain_file:append() { - echo "set(CMAKE_ASM_NASM_FLAGS --debug-prefix-map ${S}=${TARGET_DBGSRC_DIR})" >> ${WORKDIR}/toolchain.cmake -} - -EXTRA_OECMAKE:append:x86 = " -DENABLE_ASSEMBLY=OFF" -EXTRA_OECMAKE:append:aarch64 = " -DENABLE_PIC=ON" - -AS[unexport] = "1" diff --git a/meta-multimedia/recipes-multimedia/x265/x265_4.1.bb b/meta-multimedia/recipes-multimedia/x265/x265_4.1.bb new file mode 100644 index 0000000000..4837b69cfa --- /dev/null +++ b/meta-multimedia/recipes-multimedia/x265/x265_4.1.bb @@ -0,0 +1,29 @@ +SUMMARY = "H.265/HEVC video encoder" +DESCRIPTION = "A free software library and application for encoding video streams into the H.265/HEVC format." +HOMEPAGE = "https://bitbucket.org/multicoreware/x265_git" + +LICENSE = "GPL-2.0-only" +LICENSE_FLAGS = "commercial" +LIC_FILES_CHKSUM = "file://../COPYING;md5=c9e0427bc58f129f99728c62d4ad4091" + +DEPENDS = "nasm-native gnutls zlib libpcre numactl" + +SRC_URI = "https://bitbucket.org/multicoreware/x265_git/downloads/x265_${PV}.tar.gz" +SRC_URI[sha256sum] = "a31699c6a89806b74b0151e5e6a7df65de4b49050482fe5ebf8a4379d7af8f29" +S = "${WORKDIR}/x265_${PV}/source" + +inherit lib_package cmake pkgconfig + +EXTRA_OECMAKE += "-DENABLE_SHARED=ON -DENABLE_CLI=ON" + +do_generate_toolchain_file:append() { + echo "set(CMAKE_ASM_NASM_FLAGS --debug-prefix-map ${S}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR})" >> ${WORKDIR}/toolchain.cmake +} + +PACKAGECONFIG ?= "hdr10plus 10bit" +PACKAGECONFIG[hdr10plus] = "-DENABLE_HDR10_PLUS=ON,-DENABLE_HDR10_PLUS=OFF" +PACKAGECONFIG[10bit] = "-DHIGH_BIT_DEPTH=ON=ON,-DHIGH_BIT_DEPTH=ON=OFF" + +FILES:${PN} += "${libdir}/libhdr10plus.so" +FILES:${PN}-dev = "${includedir} ${libdir}/pkgconfig ${libdir}/libx265.so" + -- 2.47.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#114717): https://lists.openembedded.org/g/openembedded-devel/message/114717 Mute This Topic: https://lists.openembedded.org/mt/110480923/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
