Skip to contentSkip to conversation

oscam: Add DCMAKE_POLICY_VERSION_MINIMUM=3.5

PATCH New Khem Raj 1 participant 2 messages Jul 12, 2025

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 oscam: Add DCMAKE_POLICY_VERSION_MINIMUM=3.5

Fixes build with cmake4

---
 meta-multimedia/recipes-dvb/oscam/oscam_1.20.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
meta-multimedia/recipes-dvb/oscam/oscam_1.20.bb +4 -1
index 37431dca05..e63564350a 100644
@@ -12,7 +12,10 @@ SRC_URI = "git://repo.or.cz/oscam.git;protocol=https;nobranch=1"
 
 inherit cmake
 
-EXTRA_OECMAKE = "-DDEFAULT_CS_CONFDIR=${sysconfdir} -DCMAKE_BUILD_TYPE=Debug"
+EXTRA_OECMAKE = "-DDEFAULT_CS_CONFDIR=${sysconfdir} \
+                 -DCMAKE_BUILD_TYPE=Debug \
+                 -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
+                "
 
 do_configure:append() {
     sed -i -e '1 s|${TOPDIR}|<TOPDIR>|g' ${B}/config.c
author
#1 lore raw

PATCH 2/2 libmusicbrainz: Upgrade to tip of trunk

* Brings fixes for cmake4 builds
* Temporarily install make-c-interface in build area for target build

---
 .../musicbrainz/libmusicbrainz_git.bb                | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb +10 -2
index 1ae43e8aef..d42814feab 100644
@@ -7,7 +7,7 @@ DEPENDS = "expat libxml2 libxml2-native neon neon-native libmusicbrainz-native"
 
 PV = "5.1.0+git"
 
-SRCREV = "4655b571a70d73d41467091f59c518517c956198"
+SRCREV = "4efbed3afae11ef68281816088d7cf3d0f704dfe"
 SRC_URI = "git://github.com/metabrainz/libmusicbrainz.git;branch=master;protocol=https \
            file://0001-http-fetch-Pass-a-non-null-buffer-to-ne_set_request_.patch \
            "
@@ -20,7 +20,15 @@ EXTRA_OECMAKE:append:class-target = " -DIMPORT_EXECUTABLES=${STAGING_LIBDIR_NATI
 do_install:append:class-native() {
     install -Dm 0755 ${B}/src/make-c-interface ${D}${bindir}/make-c-interface
     install -Dm 0644 ${B}/ImportExecutables.cmake ${D}${libdir}/cmake/${BPN}/ImportExecutables.cmake
-    sed -i -e s:'${B}'/src/::g ${D}${libdir}/cmake/${BPN}/ImportExecutables.cmake
+    sed -i -e 's:${B}/src/::g' ${D}${libdir}/cmake/${BPN}/ImportExecutables.cmake
+}
+
+do_compile:prepend:class-target() {
+	install -Dm 0755 ${STAGING_BINDIR_NATIVE}/make-c-interface ${B}/src/make-c-interface
+}
+
+do_compile:append:class-target() {
+	rm -rf ${B}/src/make-c-interface
 }
 
 BBCLASSEXTEND = "native"