Skip to contentSkip to conversation

wireshark: Inherit mime and mime-xdg

PATCH New Khem Raj 1 participant 5 messages Mar 9, 2020

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/5 wireshark: Inherit mime and mime-xdg

Fixes
ERROR: QA Issue: package contains mime types but does not inherit mime: wireshark path '/work/cortexa7t2hf-neon-vfpv4-yoe-linux-gnueabi/wireshark/1_3.2.2-r0/packages-split/wireshark/usr/share/mime/packages/wireshark.xml' [mime]
ERROR: QA Issue: package contains desktop file with key 'MimeType' but does not inhert mime-xdg: wireshark path '/work/cortexa7t2hf-neon-vfpv4-yoe-linux-gnueabi/wireshark/1_3.2.2-r0/packages-split/wireshark/usr/share/applications/wireshark.desktop' [mime-xdg]

---
 meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb +1 -1
index b2bcf5fd96..91a7e1a36d 100644
@@ -17,7 +17,7 @@ SRC_URI[sha256sum] = "5f5923ef4c3fee370ed0ca1bb324f37c246015eba4a7e74ab95d9208fe
 
 PE = "1"
 
-inherit cmake pkgconfig python3native perlnative upstream-version-is-even
+inherit cmake pkgconfig python3native perlnative upstream-version-is-even mime mime-xdg
 
 PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc ${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', 'qt5 plugins', '', d)}"
 
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH 2/5 kronoset: Disable sign-compare with clang

clang isn't suppressing warnings from system headers like it should
Fixes
../../git/libknet/transport_udp.c:326:48: error: comparison of integers of different signs: 'unsigned long' and 'int' [-Werror,-Wsign-compare]

                for (cmsg = CMSG_FIRSTHDR(&msg);cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
                                                             ^~~~~~~~~~~~~~~~~~~~~~~
---
 .../recipes-extended/kronosnet/kronosnet_1.15.bb            | 6 ++++++
 1 file changed, 6 insertions(+)
meta-networking/recipes-extended/kronosnet/kronosnet_1.15.bb +6 -0
index 24aa27a87b..6bf268da9d 100644
@@ -15,3 +15,9 @@ SRC_URI = "git://github.com/kronosnet/kronosnet;protocol=https;branch=stable1"
 inherit autotools
 
 S = "${WORKDIR}/git"
+
+# libknet/transport_udp.c:326:48: error: comparison of integers of different signs: 'unsigned long' and 'int' [-Werror,-Wsign-compare]
+# for (cmsg = CMSG_FIRSTHDR(&msg);cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
+#                                                             ^~~~~~~~~~~~~~~~~~~~~~~
+CFLAGS_append_toolchain-clang = " -Wno-sign-compare"
+
Signature · 1 line
2.25.1
author
#2 lore raw

PATCH 3/5 abseil-cpp: Depend on libexecinfo on musl

In reply to Khem Raj

Needed for execinfo to work
Fixes
absl/debugging/internal/stacktrace_generic-inl.inc:14:10: fatal error: 'execinfo.h' file not found

         ^~~~~~~~~~~~

1 error generated.

---
 meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb | 2 ++
 1 file changed, 2 insertions(+)
meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb +2 -0
index 115ffc69f9..b6ea5fdecc 100644
@@ -19,6 +19,8 @@ SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH}                \
 
 S = "${WORKDIR}/git"
 
+DEPENDS_append_libc-musl = " libexecinfo "
+
 ASNEEDED_class-native = ""
 ASNEEDED_class-nativesdk = ""
 
Signature · 1 line
2.25.1
author
#3 lore raw

PATCH 4/5 minidlna: Use clock_gettime API insteaad of syscall

In reply to Khem Raj

Makes it 64bit time_t safe

---
 .../recipes-multimedia/minidlna/minidlna.inc  |  1 +
 ...for-clock_gettime-seprately-from-__N.patch | 36 +++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure-Check-for-clock_gettime-seprately-from-__N.patch
meta-multimedia/recipes-multimedia/minidlna/minidlna.inc +1 -0
index 187ff536aa..04648a5d28 100644
@@ -12,6 +12,7 @@ SRC_URI = "git://git.code.sf.net/p/minidlna/git;branch=master;module=git \
            file://minidlna-daemon.init.d \
            file://minidlna.service \
            file://0001-Update-Gettext-version.patch \
+           file://0001-configure-Check-for-clock_gettime-seprately-from-__N.patch \
            "
 
 S = "${WORKDIR}/git"
meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure-Check-for-clock_gettime-seprately-from-__N.patch new file +36 -0
new file mode 100644
index 0000000000..24a307db19
@@ -0,0 +1,36 @@
+From 1118b1912916924bbfa3fd4dced9dfed01fbf0e0 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Mon, 9 Mar 2020 09:44:33 -0700
+Subject: [PATCH] configure: Check for clock_gettime seprately from
+ __NR_clock_gettime
+
+This helps prioritize using clock_gettime API from libc over syscall
+since direct use of __NR_clock_gettime is not time64-safe
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <[email protected]>
+---
+ configure.ac | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -125,6 +125,10 @@ case $host in
+ esac
+ 
+ AC_CHECK_HEADERS(syscall.h sys/syscall.h mach/mach_time.h)
++
++AC_MSG_CHECKING([for clock_gettime])
++AC_SEARCH_LIBS([clock_gettime], [rt], [AC_DEFINE([HAVE_CLOCK_GETTIME], [1], [use clock_gettime])],)
++
+ AC_MSG_CHECKING([for __NR_clock_gettime syscall])
+ AC_COMPILE_IFELSE(
+     [AC_LANG_PROGRAM(
+@@ -143,7 +147,6 @@ AC_COMPILE_IFELSE(
+     ],
+     [
+         AC_MSG_RESULT([no])
+-        AC_SEARCH_LIBS([clock_gettime], [rt], [AC_DEFINE([HAVE_CLOCK_GETTIME], [1], [use clock_gettime])],)
+     ])
+ 
+ AC_CHECK_HEADER(linux/netlink.h,
Signature · 1 line
2.25.1
author
#4 lore raw

PATCH 5/5 libde265: Update to 1.0.5

In reply to Khem Raj

License-Update: Examples are now MIT see [1]

[1] https://github.com/strukturag/libde265/commit/4488ae0c3b287ef6f24a958004481b2b337abc76

---
 .../libde265/{libde265_1.0.2.bb => libde265_1.0.5.bb}      | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
 rename meta-multimedia/recipes-multimedia/libde265/{libde265_1.0.2.bb => libde265_1.0.5.bb} (69%)
meta-multimedia/recipes-multimedia/libde265/libde265_1.0.5.bb renamed from meta-multimedia/recipes-multimedia/libde265/libde265_1.0.2.bb +3 -4
similarity index 69%
rename from meta-multimedia/recipes-multimedia/libde265/libde265_1.0.2.bb
rename to meta-multimedia/recipes-multimedia/libde265/libde265_1.0.5.bb
index cd075ffe1b..613dcc71bf 100644
@@ -4,13 +4,12 @@ simple integration into other software."
 HOMEPAGE = "http://www.libde265.org/"
 SECTION = "libs/multimedia"
 
-LICENSE = "LGPLv3"
+LICENSE = "LGPLv3 & MIT"
 LICENSE_FLAGS = "commercial"
-LIC_FILES_CHKSUM = "file://COPYING;md5=852f345c1c52c9160f9a7c36bb997546"
+LIC_FILES_CHKSUM = "file://COPYING;md5=695b556799abb2435c97a113cdca512f"
 
 SRC_URI = "https://github.com/strukturag/libde265/releases/download/v${PV}/${BPN}-${PV}.tar.gz"
-SRC_URI[md5sum] = "93520b378df25f3a94e962f2b54872cc"
-SRC_URI[sha256sum] = "eaa0348839c2935dd90647d72c6dd4a043e36361cb3c33d2b04df10fbcebd3cb"
+SRC_URI[sha256sum] = "e3f277d8903408615a5cc34718b391b83c97c646faea4f41da93bac5ee08a87f"
 
 EXTRA_OECONF = "--disable-sherlock265 --disable-dec265"
 
Signature · 1 line
2.25.1