Skip to contentSkip to conversation

x265: Re-add -DENABLE_PIC=ON

PATCH New Khem Raj 1 participant 3 messages Jan 7, 2025

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/3 x265: Re-add -DENABLE_PIC=ON

Its needed on architectures like aarch64 and riscv

---
 meta-multimedia/recipes-multimedia/x265/x265_4.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-multimedia/recipes-multimedia/x265/x265_4.1.bb +1 -1
index 176774e359..268ccec167 100644
@@ -14,7 +14,7 @@ S = "${WORKDIR}/x265_${PV}/source"
 
 inherit lib_package cmake pkgconfig
 
-EXTRA_OECMAKE += "-DENABLE_SHARED=ON -DENABLE_CLI=ON"
+EXTRA_OECMAKE += "-DENABLE_PIC=ON -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
author
#1 lore raw

PATCH 2/3 openh264: Disable build on riscv32

---
 meta-multimedia/recipes-multimedia/openh264/openh264_2.5.0.bb | 1 +
 1 file changed, 1 insertion(+)
meta-multimedia/recipes-multimedia/openh264/openh264_2.5.0.bb +1 -0
index 04e93ce790..5ea7825fa0 100644
@@ -17,4 +17,5 @@ BRANCH = "openh264v${PV}"
 SRC_URI = "git://github.com/cisco/openh264.git;protocol=https;branch=${BRANCH}"
 
 COMPATIBLE_MACHINE:powerpc64le = "null"
+COMPATIBLE_MACHINE:riscv32 = "null"
 
author
#2 lore raw

PATCH 3/3 libheif: Make openh264 as packageconfig

In reply to Khem Raj

openh264 is an optional dependency so its good to make it a configurable option since the build says that its an optional dependency, this helps in building libheif for architectures like riscv32

---
 meta-multimedia/recipes-multimedia/libheif/libheif_1.19.5.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
meta-multimedia/recipes-multimedia/libheif/libheif_1.19.5.bb +3 -2
index 4610a60392..b0f09d113c 100644
@@ -14,13 +14,14 @@ SRCREV = "cd95b113d78d0696105a9e678cbd19487ee13d6c"
 inherit cmake pkgconfig
 
 DEPENDS += "gdk-pixbuf openh264 x265 libde265 tiff zlib libpng libwebp"
-
-PACKAGECONFIG += "dav1d jpeg jpeg2000 ffmpeg aom"
+PACKAGECONFIG += "dav1d jpeg jpeg2000 ffmpeg aom openh264"
+PACKAGECONFIG:remove:riscv32 = "openh264"
 PACKAGECONFIG[aom] = "-DWITH_AOM_ENCODER=ON -DWITH_AOM_DECODER=ON,-DWITH_AOM_ENCODER=OFF -DWITH_AOM_DECODER=OFF,aom"
 PACKAGECONFIG[dav1d] = "-DWITH_DAV1D=ON, -DWITH_DAV1D=OFF,dav1d"
 PACKAGECONFIG[svt-av1] = "-DWITH_SvtEnc=ON,-DWITH_SvtEnc=OFF,svt-av1"
 PACKAGECONFIG[jpeg] = "-DWITH_JPEG_DECODER=ON -DWITH_JPEG_ENCODER=ON,-DWITH_JPEG_ENCODER=OFF -DWITH_JPEG_DECODER=OFF,jpeg"
 PACKAGECONFIG[ffmpeg] = "-DWITH_FFMPEG_DECODER=ON,-DWITH_FFMPEG_DECODER=OFF,ffmpeg"
 PACKAGECONFIG[jpeg2000] = "-DWITH_OpenJPEG_ENCODER=ON -DWITH_OpenJPEG_DECODER=ON,-DWITH_OpenJPEG_ENCODER=OFF -DWITH_OpenJPEG_DECODER=OFF,openjpeg"
+PACKAGECONFIG[openh264] = ",,openh264"
 
 FILES:${PN} += "${libdir}/libheif ${datadir}/thumbnailers ${libdir}/gdk-pixbuf*"