* [meta-multimedia][PATCH] srt: Backport fix for missing <limits> header
@ 2021-03-02 20:09 Khem Raj
2021-03-03 13:38 ` Jose Quaresma
0 siblings, 1 reply; 3+ messages in thread
From: Khem Raj @ 2021-03-02 20:09 UTC (permalink / raw)
To: openembedded-devel; +Cc: Khem Raj, Jose Quaresma, Andreas Müller
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Jose Quaresma <quaresma.jose@gmail.com>
Cc: Andreas Müller <schnitzeltony@gmail.com>
---
...001-core-Fix-build-with-GCC-11.-1806.patch | 26 +++++++++++
.../recipes-support/srt/srt_1.4.2.bb | 1 +
meta-oe/recipes-devtools/mpich/mpich_3.4.1.bb | 46 +++++++++++++++++++
3 files changed, 73 insertions(+)
create mode 100644 meta-multimedia/recipes-support/srt/srt/0001-core-Fix-build-with-GCC-11.-1806.patch
create mode 100644 meta-oe/recipes-devtools/mpich/mpich_3.4.1.bb
diff --git a/meta-multimedia/recipes-support/srt/srt/0001-core-Fix-build-with-GCC-11.-1806.patch b/meta-multimedia/recipes-support/srt/srt/0001-core-Fix-build-with-GCC-11.-1806.patch
new file mode 100644
index 0000000000..0cb6943ccb
--- /dev/null
+++ b/meta-multimedia/recipes-support/srt/srt/0001-core-Fix-build-with-GCC-11.-1806.patch
@@ -0,0 +1,26 @@
+From f1b35cbf5b9b42b031e9b119e4c802b5f744468c Mon Sep 17 00:00:00 2001
+From: Christophe Giboudeaux <krop@users.noreply.github.com>
+Date: Wed, 10 Feb 2021 12:42:45 +0000
+Subject: [PATCH] [core] Fix build with GCC 11. (#1806)
+
+The 'limits' header must be included explicitly.
+---
+Upstream-Status: Backport [https://github.com/haivision/srt/commit/f1b35cbf5b9b42b031e9b119e4c802b5f744468c]
+ srtcore/sync.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/srtcore/sync.h b/srtcore/sync.h
+index 59c125a7..9f01ca91 100644
+--- a/srtcore/sync.h
++++ b/srtcore/sync.h
+@@ -15,6 +15,7 @@
+ //#define ENABLE_CXX17
+
+ #include <cstdlib>
++#include <limits>
+ #ifdef ENABLE_STDCXX_SYNC
+ #include <chrono>
+ #include <thread>
+--
+2.30.1
+
diff --git a/meta-multimedia/recipes-support/srt/srt_1.4.2.bb b/meta-multimedia/recipes-support/srt/srt_1.4.2.bb
index 567ea68edf..f7dfda28f1 100644
--- a/meta-multimedia/recipes-support/srt/srt_1.4.2.bb
+++ b/meta-multimedia/recipes-support/srt/srt_1.4.2.bb
@@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad"
SRCREV = "50b7af06f3a0a456c172b4cb3aceafa8a5cc0036"
SRC_URI = "git://github.com/Haivision/srt;protocol=https \
file://0001-don-t-install-srt-ffplay.patch \
+ file://0001-core-Fix-build-with-GCC-11.-1806.patch \
"
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
S = "${WORKDIR}/git"
diff --git a/meta-oe/recipes-devtools/mpich/mpich_3.4.1.bb b/meta-oe/recipes-devtools/mpich/mpich_3.4.1.bb
new file mode 100644
index 0000000000..e5f36a5140
--- /dev/null
+++ b/meta-oe/recipes-devtools/mpich/mpich_3.4.1.bb
@@ -0,0 +1,46 @@
+SUMMARY = "Message Passing Interface (MPI) implementation"
+HOMEPAGE = "http://www.mpich.org/"
+SECTION = "devel"
+
+LICENSE = "BSD-2-Clause"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=bd4d7ab13df98988b1ca2a4e01c8c163"
+
+SRC_URI = "http://www.mpich.org/static/downloads/${PV}/mpich-${PV}.tar.gz"
+SRC_URI[sha256sum] = "8836939804ef6d492bcee7d54abafd6477d2beca247157d92688654d13779727"
+
+RDEPENDS_${PN} += "bash perl libxml2"
+
+EXTRA_OECONF = "--enable-debuginfo \
+ --enable-fast \
+ --enable-shared \
+ --with-pm=gforker \
+ --disable-rpath \
+ --disable-f77 \
+ --disable-fc \
+ --disable-fortran \
+ --disable-cxx \
+ --with-device=ch4:ucx \
+ --disable-numa \
+"
+
+inherit autotools gettext pkgconfig
+
+do_configure() {
+ for d in confdb test/mpi test/mpi/confdb src/pm/hydra/confdb \
+ src/pm/hydra/tools/topo/hwloc/hwloc/config src/pm/hydra/mpl/confdb \
+ modules/yaksa/m4 modules/json-c modules/ucx test/mpi/dtpools/confdb \
+ src/mpl/confdb src/mpi/romio/confdb; do
+ install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/$d
+ install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/$d
+ done
+ cd ${S}
+ autoupdate
+ autoreconf --verbose --install --force
+ cd ${B}
+ oe_runconf
+}
+
+do_install_append() {
+ sed -i 's,${S}/,,g' ${D}/${libdir}/libmpi.la
+ sed -i 's,${DEBUG_PREFIX_MAP},,g' ${D}/${libdir}/pkgconfig/mpich.pc
+}
--
2.30.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [meta-multimedia][PATCH] srt: Backport fix for missing <limits> header
2021-03-02 20:09 [meta-multimedia][PATCH] srt: Backport fix for missing <limits> header Khem Raj
@ 2021-03-03 13:38 ` Jose Quaresma
2021-03-03 15:09 ` Khem Raj
0 siblings, 1 reply; 3+ messages in thread
From: Jose Quaresma @ 2021-03-03 13:38 UTC (permalink / raw)
To: Khem Raj; +Cc: openembeded-devel, Andreas Müller
[-- Attachment #1: Type: text/plain, Size: 4592 bytes --]
Hi Khem,
Khem Raj <raj.khem@gmail.com> escreveu no dia terça, 2/03/2021 à(s) 20:09:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> Cc: Jose Quaresma <quaresma.jose@gmail.com>
> Cc: Andreas Müller <schnitzeltony@gmail.com>
> ---
> ...001-core-Fix-build-with-GCC-11.-1806.patch | 26 +++++++++++
> .../recipes-support/srt/srt_1.4.2.bb | 1 +
> meta-oe/recipes-devtools/mpich/mpich_3.4.1.bb | 46 +++++++++++++++++++
>
I thinks that mpich needs to go in another patch.
3 files changed, 73 insertions(+)
> create mode 100644
> meta-multimedia/recipes-support/srt/srt/0001-core-Fix-build-with-GCC-11.-1806.patch
> create mode 100644 meta-oe/recipes-devtools/mpich/mpich_3.4.1.bb
>
> diff --git
> a/meta-multimedia/recipes-support/srt/srt/0001-core-Fix-build-with-GCC-11.-1806.patch
> b/meta-multimedia/recipes-support/srt/srt/0001-core-Fix-build-with-GCC-11.-1806.patch
> new file mode 100644
> index 0000000000..0cb6943ccb
> --- /dev/null
> +++
> b/meta-multimedia/recipes-support/srt/srt/0001-core-Fix-build-with-GCC-11.-1806.patch
> @@ -0,0 +1,26 @@
> +From f1b35cbf5b9b42b031e9b119e4c802b5f744468c Mon Sep 17 00:00:00 2001
> +From: Christophe Giboudeaux <krop@users.noreply.github.com>
> +Date: Wed, 10 Feb 2021 12:42:45 +0000
> +Subject: [PATCH] [core] Fix build with GCC 11. (#1806)
> +
> +The 'limits' header must be included explicitly.
> +---
> +Upstream-Status: Backport [
> https://github.com/haivision/srt/commit/f1b35cbf5b9b42b031e9b119e4c802b5f744468c
> ]
> + srtcore/sync.h | 1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/srtcore/sync.h b/srtcore/sync.h
> +index 59c125a7..9f01ca91 100644
> +--- a/srtcore/sync.h
> ++++ b/srtcore/sync.h
> +@@ -15,6 +15,7 @@
> + //#define ENABLE_CXX17
> +
> + #include <cstdlib>
> ++#include <limits>
> + #ifdef ENABLE_STDCXX_SYNC
> + #include <chrono>
> + #include <thread>
> +--
> +2.30.1
> +
> diff --git a/meta-multimedia/recipes-support/srt/srt_1.4.2.bb
> b/meta-multimedia/recipes-support/srt/srt_1.4.2.bb
> index 567ea68edf..f7dfda28f1 100644
> --- a/meta-multimedia/recipes-support/srt/srt_1.4.2.bb
> +++ b/meta-multimedia/recipes-support/srt/srt_1.4.2.bb
> @@ -9,6 +9,7 @@ LIC_FILES_CHKSUM =
> "file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad"
> SRCREV = "50b7af06f3a0a456c172b4cb3aceafa8a5cc0036"
> SRC_URI = "git://github.com/Haivision/srt;protocol=https \
> file://0001-don-t-install-srt-ffplay.patch \
> + file://0001-core-Fix-build-with-GCC-11.-1806.patch \
> "
> UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
> S = "${WORKDIR}/git"
> diff --git a/meta-oe/recipes-devtools/mpich/mpich_3.4.1.bb
> b/meta-oe/recipes-devtools/mpich/mpich_3.4.1.bb
> new file mode 100644
> index 0000000000..e5f36a5140
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/mpich/mpich_3.4.1.bb
> @@ -0,0 +1,46 @@
> +SUMMARY = "Message Passing Interface (MPI) implementation"
> +HOMEPAGE = "http://www.mpich.org/"
> +SECTION = "devel"
> +
> +LICENSE = "BSD-2-Clause"
> +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=bd4d7ab13df98988b1ca2a4e01c8c163"
> +
> +SRC_URI = "http://www.mpich.org/static/downloads/${PV}/mpich-${PV}.tar.gz
> "
> +SRC_URI[sha256sum] =
> "8836939804ef6d492bcee7d54abafd6477d2beca247157d92688654d13779727"
> +
> +RDEPENDS_${PN} += "bash perl libxml2"
> +
> +EXTRA_OECONF = "--enable-debuginfo \
> + --enable-fast \
> + --enable-shared \
> + --with-pm=gforker \
> + --disable-rpath \
> + --disable-f77 \
> + --disable-fc \
> + --disable-fortran \
> + --disable-cxx \
> + --with-device=ch4:ucx \
> + --disable-numa \
> +"
> +
> +inherit autotools gettext pkgconfig
> +
> +do_configure() {
> + for d in confdb test/mpi test/mpi/confdb src/pm/hydra/confdb \
> + src/pm/hydra/tools/topo/hwloc/hwloc/config
> src/pm/hydra/mpl/confdb \
> + modules/yaksa/m4 modules/json-c modules/ucx
> test/mpi/dtpools/confdb \
> + src/mpl/confdb src/mpi/romio/confdb; do
> + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess
> ${S}/$d
> + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub
> ${S}/$d
> + done
> + cd ${S}
> + autoupdate
> + autoreconf --verbose --install --force
> + cd ${B}
> + oe_runconf
> +}
> +
> +do_install_append() {
> + sed -i 's,${S}/,,g' ${D}/${libdir}/libmpi.la
> + sed -i 's,${DEBUG_PREFIX_MAP},,g' ${D}/${libdir}/pkgconfig/mpich.pc
> +}
> --
> 2.30.1
>
>
--
Best regards,
José Quaresma
[-- Attachment #2: Type: text/html, Size: 7029 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [meta-multimedia][PATCH] srt: Backport fix for missing <limits> header
2021-03-03 13:38 ` Jose Quaresma
@ 2021-03-03 15:09 ` Khem Raj
0 siblings, 0 replies; 3+ messages in thread
From: Khem Raj @ 2021-03-03 15:09 UTC (permalink / raw)
To: Jose Quaresma; +Cc: openembeded-devel, Andreas Müller
On Wed, Mar 3, 2021 at 5:39 AM Jose Quaresma <quaresma.jose@gmail.com> wrote:
>
> Hi Khem,
>
> Khem Raj <raj.khem@gmail.com> escreveu no dia terça, 2/03/2021 à(s) 20:09:
>>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> Cc: Jose Quaresma <quaresma.jose@gmail.com>
>> Cc: Andreas Müller <schnitzeltony@gmail.com>
>> ---
>> ...001-core-Fix-build-with-GCC-11.-1806.patch | 26 +++++++++++
>> .../recipes-support/srt/srt_1.4.2.bb | 1 +
>> meta-oe/recipes-devtools/mpich/mpich_3.4.1.bb | 46 +++++++++++++++++++
>
>
> I thinks that mpich needs to go in another patch.
>
indeed. I have messed a squash. Sent v2
>> 3 files changed, 73 insertions(+)
>> create mode 100644 meta-multimedia/recipes-support/srt/srt/0001-core-Fix-build-with-GCC-11.-1806.patch
>> create mode 100644 meta-oe/recipes-devtools/mpich/mpich_3.4.1.bb
>>
>> diff --git a/meta-multimedia/recipes-support/srt/srt/0001-core-Fix-build-with-GCC-11.-1806.patch b/meta-multimedia/recipes-support/srt/srt/0001-core-Fix-build-with-GCC-11.-1806.patch
>> new file mode 100644
>> index 0000000000..0cb6943ccb
>> --- /dev/null
>> +++ b/meta-multimedia/recipes-support/srt/srt/0001-core-Fix-build-with-GCC-11.-1806.patch
>> @@ -0,0 +1,26 @@
>> +From f1b35cbf5b9b42b031e9b119e4c802b5f744468c Mon Sep 17 00:00:00 2001
>> +From: Christophe Giboudeaux <krop@users.noreply.github.com>
>> +Date: Wed, 10 Feb 2021 12:42:45 +0000
>> +Subject: [PATCH] [core] Fix build with GCC 11. (#1806)
>> +
>> +The 'limits' header must be included explicitly.
>> +---
>> +Upstream-Status: Backport [https://github.com/haivision/srt/commit/f1b35cbf5b9b42b031e9b119e4c802b5f744468c]
>> + srtcore/sync.h | 1 +
>> + 1 file changed, 1 insertion(+)
>> +
>> +diff --git a/srtcore/sync.h b/srtcore/sync.h
>> +index 59c125a7..9f01ca91 100644
>> +--- a/srtcore/sync.h
>> ++++ b/srtcore/sync.h
>> +@@ -15,6 +15,7 @@
>> + //#define ENABLE_CXX17
>> +
>> + #include <cstdlib>
>> ++#include <limits>
>> + #ifdef ENABLE_STDCXX_SYNC
>> + #include <chrono>
>> + #include <thread>
>> +--
>> +2.30.1
>> +
>> diff --git a/meta-multimedia/recipes-support/srt/srt_1.4.2.bb b/meta-multimedia/recipes-support/srt/srt_1.4.2.bb
>> index 567ea68edf..f7dfda28f1 100644
>> --- a/meta-multimedia/recipes-support/srt/srt_1.4.2.bb
>> +++ b/meta-multimedia/recipes-support/srt/srt_1.4.2.bb
>> @@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad"
>> SRCREV = "50b7af06f3a0a456c172b4cb3aceafa8a5cc0036"
>> SRC_URI = "git://github.com/Haivision/srt;protocol=https \
>> file://0001-don-t-install-srt-ffplay.patch \
>> + file://0001-core-Fix-build-with-GCC-11.-1806.patch \
>> "
>> UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
>> S = "${WORKDIR}/git"
>> diff --git a/meta-oe/recipes-devtools/mpich/mpich_3.4.1.bb b/meta-oe/recipes-devtools/mpich/mpich_3.4.1.bb
>> new file mode 100644
>> index 0000000000..e5f36a5140
>> --- /dev/null
>> +++ b/meta-oe/recipes-devtools/mpich/mpich_3.4.1.bb
>> @@ -0,0 +1,46 @@
>> +SUMMARY = "Message Passing Interface (MPI) implementation"
>> +HOMEPAGE = "http://www.mpich.org/"
>> +SECTION = "devel"
>> +
>> +LICENSE = "BSD-2-Clause"
>> +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=bd4d7ab13df98988b1ca2a4e01c8c163"
>> +
>> +SRC_URI = "http://www.mpich.org/static/downloads/${PV}/mpich-${PV}.tar.gz"
>> +SRC_URI[sha256sum] = "8836939804ef6d492bcee7d54abafd6477d2beca247157d92688654d13779727"
>> +
>> +RDEPENDS_${PN} += "bash perl libxml2"
>> +
>> +EXTRA_OECONF = "--enable-debuginfo \
>> + --enable-fast \
>> + --enable-shared \
>> + --with-pm=gforker \
>> + --disable-rpath \
>> + --disable-f77 \
>> + --disable-fc \
>> + --disable-fortran \
>> + --disable-cxx \
>> + --with-device=ch4:ucx \
>> + --disable-numa \
>> +"
>> +
>> +inherit autotools gettext pkgconfig
>> +
>> +do_configure() {
>> + for d in confdb test/mpi test/mpi/confdb src/pm/hydra/confdb \
>> + src/pm/hydra/tools/topo/hwloc/hwloc/config src/pm/hydra/mpl/confdb \
>> + modules/yaksa/m4 modules/json-c modules/ucx test/mpi/dtpools/confdb \
>> + src/mpl/confdb src/mpi/romio/confdb; do
>> + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/$d
>> + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/$d
>> + done
>> + cd ${S}
>> + autoupdate
>> + autoreconf --verbose --install --force
>> + cd ${B}
>> + oe_runconf
>> +}
>> +
>> +do_install_append() {
>> + sed -i 's,${S}/,,g' ${D}/${libdir}/libmpi.la
>> + sed -i 's,${DEBUG_PREFIX_MAP},,g' ${D}/${libdir}/pkgconfig/mpich.pc
>> +}
>> --
>> 2.30.1
>>
>
>
> --
> Best regards,
>
> José Quaresma
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-03-03 15:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-02 20:09 [meta-multimedia][PATCH] srt: Backport fix for missing <limits> header Khem Raj
2021-03-03 13:38 ` Jose Quaresma
2021-03-03 15:09 ` Khem Raj
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.