Skip to contentSkip to conversation

luajit: Upgrade to latest on v2.1 branch

PATCH New Khem Raj 1 participant 4 messages Mar 20, 2022

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/4 luajit: Upgrade to latest on v2.1 branch

License-Update: Copyright years and date updated [1] [2]

[1] https://repo.or.cz/luajit-2.0.git/commit/f47c864b0186fc92a2264e68e1151d0d2b24969e
[2] https://repo.or.cz/luajit-2.0.git/commit/c4dfb625bad8937d72074852a977738ec3eb1ab7

---
 meta-oe/recipes-devtools/luajit/luajit_git.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
meta-oe/recipes-devtools/luajit/luajit_git.bb +3 -3
index d4ff06b677..3f3939eeb4 100644
@@ -1,6 +1,6 @@
 SUMMARY = "Just-In-Time Compiler for Lua"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=abe9020de9c00909317d02d5c803810e"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=23d6278200de9b48fd1439f80507cba8"
 HOMEPAGE = "http://luajit.org"
 
 SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \
@@ -10,7 +10,7 @@ SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \
 
 # Set PV to a version tag and date (YYMMDD) associated with SRCREV if it is later.
 PV = "2.1.0~beta3-210112"
-SRCREV = "ec6edc5c39c25e4eb3fca51b753f9995e97215da"
+SRCREV = "43ebb949a249a16c49d232ad24dc9127cc4302bb"
 
 S = "${WORKDIR}/git"
 
@@ -92,7 +92,7 @@ FILES:${PN}-dev += "${libdir}/libluajit-5.1.a \
 "
 FILES:luajit-common = "${datadir}/${BPN}-${PV}"
 
-# mips64/ppc/ppc64/riscv64 is not supported in this release
+# mips64/ppc/ppc64/riscv64/riscv32 is not supported in this release
 COMPATIBLE_HOST:mipsarchn32 = "null"
 COMPATIBLE_HOST:mipsarchn64 = "null"
 COMPATIBLE_HOST:powerpc = "null"
Signature · 1 line
2.35.1
author
#1 lore raw

PATCH 2/4 libcppkafka: Use CMAKE_INSTALL_LIBDIR instead of hardcoding lib

---
 .../0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch | 30 +++++++++++++++++++
 .../libcppkafka/libcppkafka_git.bb            |  4 ++-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-support/libcppkafka/libcppkafka/0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch
meta-oe/recipes-support/libcppkafka/libcppkafka/0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch new file +30 -0
new file mode 100644
index 0000000000..d78ee7a8df
@@ -0,0 +1,30 @@
+From 51ec4c1f533dee9a499490c1c5bbd23d2191a4a7 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Sun, 20 Mar 2022 11:14:25 -0700
+Subject: [PATCH] cmake: Use CMAKE_INSTALL_LIBDIR
+
+Do not hardcode library path, this helps it install in right location
+independent of platforms, e.g. ppc64 uses lib64 and not lib
+
+Upstream-Status: Submitted [https://github.com/mfontanini/cppkafka/pull/291]
+Signed-off-by: Khem Raj <[email protected]>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c4e44e6..25ec1ce 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -51,7 +51,7 @@ option(CPPKAFKA_EXPORT_CMAKE_CONFIG "Generate CMake config, target and version f
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
+ 
+ if (NOT CPPKAFKA_CONFIG_DIR)
+-    set(CPPKAFKA_CONFIG_DIR lib/cmake/${PROJECT_NAME})
++    set(CPPKAFKA_CONFIG_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
+ endif()
+ 
+ # Maintain previous compatibility
+-- 
+2.35.1
+
meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb +3 -1
index 8f777eb182..0cb33fcd50 100644
@@ -8,7 +8,9 @@ LIC_FILES_CHKSUM = " \
 file://LICENSE;md5=d8b4ca15d239dc1485ef495c8f1bcc72 \
 "
 
-SRC_URI = "git://github.com/mfontanini/cppkafka;protocol=https;branch=master"
+SRC_URI = "git://github.com/mfontanini/cppkafka;protocol=https;branch=master \
+           file://0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch \
+"
 SRCREV = "5e4b350806d561473138ce7a982e8f6cf2e77733"
 
 DEPENDS = "librdkafka boost chrpath-replacement-native"
Signature · 1 line
2.35.1
author
#2 lore raw

PATCH 3/4 lvgl,lv-lib-png,lv-drivers: Pass libdir via LIB_INSTALL_DIR to cmake

In reply to Khem Raj

Ensures it packages correclty on all platforms e.g. pp64

---
 meta-oe/recipes-graphics/lvgl/lv-drivers_7.11.0.bb | 2 +-
 meta-oe/recipes-graphics/lvgl/lv-lib-png_8.0.2.bb  | 2 ++
 meta-oe/recipes-graphics/lvgl/lvgl_8.1.0.bb        | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)
meta-oe/recipes-graphics/lvgl/lv-drivers_7.11.0.bb +1 -1
index 7ccee6bf11..1a94215839 100644
@@ -24,7 +24,7 @@ S = "${WORKDIR}/${PN}-${PV}"
 LVGL_CONFIG_WAYLAND_HOR_RES ?= "480"
 LVGL_CONFIG_WAYLAND_VER_RES ?= "320"
 
-EXTRA_OECMAKE += "-Dinstall:BOOL=ON"
+EXTRA_OECMAKE += "-Dinstall:BOOL=ON -DLIB_INSTALL_DIR=${BASELIB}"
 
 TARGET_CFLAGS += "-DLV_CONF_INCLUDE_SIMPLE=1"
 TARGET_CFLAGS += "-I${RECIPE_SYSROOT}/${includedir}/lvgl"
meta-oe/recipes-graphics/lvgl/lv-lib-png_8.0.2.bb +2 -0
index 5b3b38d4a6..032e85f522 100644
@@ -16,6 +16,8 @@ REQUIRED_DISTRO_FEATURES = "wayland"
 
 DEPENDS += "lvgl"
 
+EXTRA_OECMAKE += "-DLIB_INSTALL_DIR=${BASELIB}"
+
 inherit cmake
 inherit features_check
 
meta-oe/recipes-graphics/lvgl/lvgl_8.1.0.bb +1 -0
index 958639b046..2005afa2fd 100644
@@ -16,6 +16,7 @@ REQUIRED_DISTRO_FEATURES = "wayland"
 inherit cmake
 inherit features_check
 
+EXTRA_OECMAKE = "-DLIB_INSTALL_DIR=${BASELIB}"
 S = "${WORKDIR}/${PN}-${PV}"
 
 LVGL_CONFIG_LV_MEM_CUSTOM ?= "0"
Signature · 1 line
2.35.1
author
#3 lore raw

PATCH 4/4 io-compress-lzma-perl, io-compress-perl: Rename to use debian names

In reply to Khem Raj
Cc Hongxu Jia <[email protected]>
Cc Tim "moto-timo" Orling <[email protected]>
---
 ...s-lzma-perl_2.096.bb => libio-compress-lzma-perl_2.096.bb} | 2 +-
 ...io-compress-perl_2.096.bb => libio-compress-perl_2.096.bb} | 0
 .../recipes-perl/packagegroups/packagegroup-meta-perl.bb      | 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename meta-perl/recipes-perl/libio/{io-compress-lzma-perl_2.096.bb => libio-compress-lzma-perl_2.096.bb} (95%)
 rename meta-perl/recipes-perl/libio/{io-compress-perl_2.096.bb => libio-compress-perl_2.096.bb} (100%)
meta-perl/recipes-perl/libio/libio-compress-lzma-perl_2.096.bb renamed from meta-perl/recipes-perl/libio/io-compress-lzma-perl_2.096.bb +1 -1
similarity index 95%
rename from meta-perl/recipes-perl/libio/io-compress-lzma-perl_2.096.bb
rename to meta-perl/recipes-perl/libio/libio-compress-lzma-perl_2.096.bb
index 3b8ce8d02d..15952f17e6 100644
@@ -15,7 +15,7 @@ SRC_URI = "https://cpan.metacpan.org/authors/id/P/PM/PMQS/IO-Compress-Lzma-2.096
 SRC_URI[md5sum] = "6c1b70740605b8073e4fbb5ba1e7bbdb"
 SRC_URI[sha256sum] = "2f29125f19bb41d29c4b5a2467e3560b7bce5d428176a046b7c8a51609dce6e8"
 RDEPENDS:${PN} += "compress-raw-lzma-perl"
-RDEPENDS:${PN} += "io-compress-perl"
+RDEPENDS:${PN} += "libio-compress-perl"
 
 S = "${WORKDIR}/IO-Compress-Lzma-${PV}"
 
meta-perl/recipes-perl/libio/libio-compress-perl_2.096.bb renamed from meta-perl/recipes-perl/libio/io-compress-perl_2.096.bb +0 -0
similarity index 100%
rename from meta-perl/recipes-perl/libio/io-compress-perl_2.096.bb
rename to meta-perl/recipes-perl/libio/libio-compress-perl_2.096.bb
meta-perl/recipes-perl/packagegroups/packagegroup-meta-perl.bb +2 -2
index 918c21dd51..4b2f5cc029 100644
@@ -14,8 +14,6 @@ RDEPENDS:packagegroup-meta-perl = "\
     compress-raw-bzip2-perl \
     compress-raw-lzma-perl \
     compress-raw-zlib-perl \
-    io-compress-perl \
-    io-compress-lzma-perl \
     libalgorithm-diff-perl \
     libauthen-sasl-perl \
     libauthen-radius-perl \
@@ -33,6 +31,8 @@ RDEPENDS:packagegroup-meta-perl = "\
     libhtml-tree-perl \
     libhtml-tagset-perl \
     libimport-into-perl \
+    libio-compress-perl \
+    libio-compress-lzma-perl \
     libio-socket-ssl-perl \
     libio-stringy-perl \
     libipc-signal-perl \
Signature · 1 line
2.35.1