Message ID | 20231112081748.69354-1-alperyasinak1@gmail.com |
---|---|
State | Accepted |
Headers | show |
Series | [meta-multimedia] libupnp: upgrade 1.14.6 -> 1.14.18 | expand |
On Sun, Nov 12, 2023 at 12:18 AM Alper Ak <alperyasinak1@gmail.com> wrote: > > Changelog: > > github.com/pupnp/pupnp/blob/branch-1.14.x/ChangeLog > > Signed-off-by: alperak <alperyasinak1@gmail.com> > --- > Conditional statements removed in the newer version so no need the patch anymore. > 1.14.18 -> github.com/pupnp/pupnp/blob/c540ce2431bdeac73359029d4592b45790e1d154/upnp/inc/ithread.h > 1.14.6 -> github.com/pupnp/pupnp/blob/cef2b23fb36baac091b0c7d41136b4c1d9549c6d/upnp/inc/ithread.h > > ...ead_mutexattr_gettype-pthread_mutexa.patch | 42 ------------------- > .../{libupnp_1.14.6.bb => libupnp_1.14.18.bb} | 3 +- > 2 files changed, 1 insertion(+), 44 deletions(-) > delete mode 100644 meta-multimedia/recipes-connectivity/libupnp/libupnp/0001-ithread-Use-pthread_mutexattr_gettype-pthread_mutexa.patch > rename meta-multimedia/recipes-connectivity/libupnp/{libupnp_1.14.6.bb => libupnp_1.14.18.bb} (87%) > > diff --git a/meta-multimedia/recipes-connectivity/libupnp/libupnp/0001-ithread-Use-pthread_mutexattr_gettype-pthread_mutexa.patch b/meta-multimedia/recipes-connectivity/libupnp/libupnp/0001-ithread-Use-pthread_mutexattr_gettype-pthread_mutexa.patch > deleted file mode 100644 > index ee7819677..000000000 > --- a/meta-multimedia/recipes-connectivity/libupnp/libupnp/0001-ithread-Use-pthread_mutexattr_gettype-pthread_mutexa.patch > +++ /dev/null > @@ -1,42 +0,0 @@ > -From 343a3b724225d3c87af0b268da14d3acb7a5b9a1 Mon Sep 17 00:00:00 2001 > -From: Khem Raj <raj.khem@gmail.com> > -Date: Sun, 9 May 2021 15:38:43 -0700 > -Subject: [PATCH] ithread: Use > - pthread_mutexattr_gettype/pthread_mutexattr_settype on linux > - > -_np variants are not recommended anymore, and glibc 2.34+ will have > -these removed > - > -Upstream-Status: Pending > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > ---- > - upnp/inc/ithread.h | 6 ++++-- > - 1 file changed, 4 insertions(+), 2 deletions(-) > - > -diff --git a/upnp/inc/ithread.h b/upnp/inc/ithread.h > -index f6800ea9..1d0f9dba 100644 > ---- a/upnp/inc/ithread.h > -+++ b/upnp/inc/ithread.h > -@@ -304,7 +304,8 @@ static UPNP_INLINE int ithread_cleanup_thread(void) > - * Returns EINVAL if the kind is not supported. > - * See man page for pthread_mutexattr_setkind_np > - *****************************************************************************/ > --#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__) > -+#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__) \ > -+ || defined (__linux__) > - #define ithread_mutexattr_setkind_np pthread_mutexattr_settype > - #else > - #define ithread_mutexattr_setkind_np pthread_mutexattr_setkind_np > -@@ -329,7 +330,8 @@ static UPNP_INLINE int ithread_cleanup_thread(void) > - * Always returns 0. > - * See man page for pthread_mutexattr_getkind_np > - *****************************************************************************/ > --#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__) > -+#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__) \ > -+ || defined (__linux__) > - #define ithread_mutexattr_getkind_np pthread_mutexattr_gettype > - #else > - #define ithread_mutexattr_getkind_np pthread_mutexattr_getkind_np > --- > -2.31.1 This patch is needed to fix build on musl systems. Has this been taken care of in this version ? if so it would be good to mention that in the commit. > - > diff --git a/meta-multimedia/recipes-connectivity/libupnp/libupnp_1.14.6.bb b/meta-multimedia/recipes-connectivity/libupnp/libupnp_1.14.18.bb > similarity index 87% > rename from meta-multimedia/recipes-connectivity/libupnp/libupnp_1.14.6.bb > rename to meta-multimedia/recipes-connectivity/libupnp/libupnp_1.14.18.bb > index 81b42da41..5b15d1809 100644 > --- a/meta-multimedia/recipes-connectivity/libupnp/libupnp_1.14.6.bb > +++ b/meta-multimedia/recipes-connectivity/libupnp/libupnp_1.14.18.bb > @@ -8,9 +8,8 @@ HOMEPAGE = "http://pupnp.sourceforge.net/" > LICENSE = "BSD-3-Clause" > LIC_FILES_CHKSUM = "file://COPYING;md5=394a0f17b97f33426275571e15920434" > > -SRCREV = "cef2b23fb36baac091b0c7d41136b4c1d9549c6d" > +SRCREV = "c540ce2431bdeac73359029d4592b45790e1d154" > SRC_URI = "git://github.com/pupnp/pupnp.git;protocol=https;branch=branch-1.14.x \ > - file://0001-ithread-Use-pthread_mutexattr_gettype-pthread_mutexa.patch \ > " > > S="${WORKDIR}/git" > -- > 2.25.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#106579): https://lists.openembedded.org/g/openembedded-devel/message/106579 > Mute This Topic: https://lists.openembedded.org/mt/102539464/1997914 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
Since conditional expressions are removed in the new version, I removed them thinking that the patch is not needed. They are now defined directly. https://github.com/pupnp/pupnp/commit/c0b552973c5db6dbe4dd0bdc47496da3d7af9606 As far as I have researched, people say that it will be enough to define TCLIBC = "musl" in local.conf so that I can test it on musl systems, but get errors from poky's runqueue and process scripts. How can I check if a recipe can be buildable or not on musl systems? By the way, I have just started to contribute to Yocto. In addition, I am new to software world. Your feedback and help is very important for me, thank you.
On Sun, 12 Nov 2023 11:17:48 +0300, alperak wrote: > Changelog: > > github.com/pupnp/pupnp/blob/branch-1.14.x/ChangeLog > > Applied, thanks! [1/1] libupnp: upgrade 1.14.6 -> 1.14.18 commit: 6908f7fcb825b896fcea102ae75dab2a6122b42a Best regards,
diff --git a/meta-multimedia/recipes-connectivity/libupnp/libupnp/0001-ithread-Use-pthread_mutexattr_gettype-pthread_mutexa.patch b/meta-multimedia/recipes-connectivity/libupnp/libupnp/0001-ithread-Use-pthread_mutexattr_gettype-pthread_mutexa.patch deleted file mode 100644 index ee7819677..000000000 --- a/meta-multimedia/recipes-connectivity/libupnp/libupnp/0001-ithread-Use-pthread_mutexattr_gettype-pthread_mutexa.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 343a3b724225d3c87af0b268da14d3acb7a5b9a1 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 9 May 2021 15:38:43 -0700 -Subject: [PATCH] ithread: Use - pthread_mutexattr_gettype/pthread_mutexattr_settype on linux - -_np variants are not recommended anymore, and glibc 2.34+ will have -these removed - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - upnp/inc/ithread.h | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/upnp/inc/ithread.h b/upnp/inc/ithread.h -index f6800ea9..1d0f9dba 100644 ---- a/upnp/inc/ithread.h -+++ b/upnp/inc/ithread.h -@@ -304,7 +304,8 @@ static UPNP_INLINE int ithread_cleanup_thread(void) - * Returns EINVAL if the kind is not supported. - * See man page for pthread_mutexattr_setkind_np - *****************************************************************************/ --#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__) -+#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__) \ -+ || defined (__linux__) - #define ithread_mutexattr_setkind_np pthread_mutexattr_settype - #else - #define ithread_mutexattr_setkind_np pthread_mutexattr_setkind_np -@@ -329,7 +330,8 @@ static UPNP_INLINE int ithread_cleanup_thread(void) - * Always returns 0. - * See man page for pthread_mutexattr_getkind_np - *****************************************************************************/ --#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__) -+#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__) \ -+ || defined (__linux__) - #define ithread_mutexattr_getkind_np pthread_mutexattr_gettype - #else - #define ithread_mutexattr_getkind_np pthread_mutexattr_getkind_np --- -2.31.1 - diff --git a/meta-multimedia/recipes-connectivity/libupnp/libupnp_1.14.6.bb b/meta-multimedia/recipes-connectivity/libupnp/libupnp_1.14.18.bb similarity index 87% rename from meta-multimedia/recipes-connectivity/libupnp/libupnp_1.14.6.bb rename to meta-multimedia/recipes-connectivity/libupnp/libupnp_1.14.18.bb index 81b42da41..5b15d1809 100644 --- a/meta-multimedia/recipes-connectivity/libupnp/libupnp_1.14.6.bb +++ b/meta-multimedia/recipes-connectivity/libupnp/libupnp_1.14.18.bb @@ -8,9 +8,8 @@ HOMEPAGE = "http://pupnp.sourceforge.net/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=394a0f17b97f33426275571e15920434" -SRCREV = "cef2b23fb36baac091b0c7d41136b4c1d9549c6d" +SRCREV = "c540ce2431bdeac73359029d4592b45790e1d154" SRC_URI = "git://github.com/pupnp/pupnp.git;protocol=https;branch=branch-1.14.x \ - file://0001-ithread-Use-pthread_mutexattr_gettype-pthread_mutexa.patch \ " S="${WORKDIR}/git"
Changelog: github.com/pupnp/pupnp/blob/branch-1.14.x/ChangeLog Signed-off-by: alperak <alperyasinak1@gmail.com> --- Conditional statements removed in the newer version so no need the patch anymore. 1.14.18 -> github.com/pupnp/pupnp/blob/c540ce2431bdeac73359029d4592b45790e1d154/upnp/inc/ithread.h 1.14.6 -> github.com/pupnp/pupnp/blob/cef2b23fb36baac091b0c7d41136b4c1d9549c6d/upnp/inc/ithread.h ...ead_mutexattr_gettype-pthread_mutexa.patch | 42 ------------------- .../{libupnp_1.14.6.bb => libupnp_1.14.18.bb} | 3 +- 2 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 meta-multimedia/recipes-connectivity/libupnp/libupnp/0001-ithread-Use-pthread_mutexattr_gettype-pthread_mutexa.patch rename meta-multimedia/recipes-connectivity/libupnp/{libupnp_1.14.6.bb => libupnp_1.14.18.bb} (87%)