From cc78e543c48c116bd3553790da8dc06fa8aa176a Mon Sep 17 00:00:00 2001 From: Thomas Schlien Date: Fri, 24 Jan 2025 15:14:29 +0100 Subject: rtmpdump: update 2.4 -> v2.6 - remove fix-racing-build-issue.patch since it is included upstream Signed-off-by: Thomas Schlien Signed-off-by: Khem Raj --- .../rtmpdump/rtmpdump/fix-racing-build-issue.patch | 18 --------------- .../recipes-multimedia/rtmpdump/rtmpdump_2.4.bb | 27 ---------------------- .../recipes-multimedia/rtmpdump/rtmpdump_2.6.bb | 27 ++++++++++++++++++++++ 3 files changed, 27 insertions(+), 45 deletions(-) delete mode 100644 meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump/fix-racing-build-issue.patch delete mode 100644 meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.4.bb create mode 100644 meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.6.bb diff --git a/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump/fix-racing-build-issue.patch b/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump/fix-racing-build-issue.patch deleted file mode 100644 index 6e11c9752e..0000000000 --- a/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump/fix-racing-build-issue.patch +++ /dev/null @@ -1,18 +0,0 @@ -Make sure libdir (SODIR) is created when running parallel make. - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Andrei Gherzan - -Index: git/librtmp/Makefile -=================================================================== ---- git.orig/librtmp/Makefile -+++ git/librtmp/Makefile -@@ -115,6 +115,7 @@ install_base: librtmp.a librtmp.pc - cp librtmp.3 $(MANDIR)/man3 - - install_so: librtmp$(SO_EXT) -+ -mkdir -p $(SODIR) - cp librtmp$(SO_EXT) $(SODIR) - $(INSTALL_IMPLIB) - cd $(SODIR); ln -sf librtmp$(SO_EXT) librtmp.$(SOX) diff --git a/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.4.bb b/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.4.bb deleted file mode 100644 index ba2e5195e9..0000000000 --- a/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.4.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "RTMP Dump" -DESCRIPTION = "rtmpdump is a toolkit for RTMP streams. All forms of RTMP are \ -supported, including rtmp://, rtmpt://, rtmpe://, rtmpte://, and rtmps://." -HOMEPAGE = "http://rtmpdump.mplayerhq.hu/" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -DEPENDS = "gnutls zlib" - -PV .= "+git" -SRCREV = "fa8646daeb19dfd12c181f7d19de708d623704c0" -SRC_URI = " \ - git://git.ffmpeg.org/rtmpdump;branch=master \ - file://fix-racing-build-issue.patch" - -S = "${WORKDIR}/git" - -CVE_STATUS_GROUPS += "CVES_2015" -CVES_2015 = "CVE-2015-8270 CVE-2015-8271 CVE-2015-8272" -CVES_2015[status] = "fixed-version: patched in current git hash" - -inherit autotools-brokensep - -EXTRA_OEMAKE = " \ - CC='${CC}' LD='${LD} ${STAGING_LIBDIR}' XCFLAGS='${CFLAGS}' XLDFLAGS='${LDFLAGS}' \ - SYS=posix INC=-I=/usr/include DESTDIR=${D} CRYPTO=GNUTLS \ - prefix=${prefix} libdir=${libdir} incdir=${includedir}/librtmp bindir=${bindir} mandir=${mandir}" diff --git a/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.6.bb b/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.6.bb new file mode 100644 index 0000000000..1d2abb3d68 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.6.bb @@ -0,0 +1,27 @@ +SUMMARY = "RTMP Dump" +DESCRIPTION = "rtmpdump is a toolkit for RTMP streams. All forms of RTMP are \ +supported, including rtmp://, rtmpt://, rtmpe://, rtmpte://, and rtmps://." +HOMEPAGE = "http://rtmpdump.mplayerhq.hu/" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +DEPENDS = "gnutls zlib" + +PV .= "+git" +SRCREV = "6f6bb1353fc84f4cc37138baa99f586750028a01" +SRC_URI = " \ + git://git.ffmpeg.org/rtmpdump;branch=master \ +" + +S = "${WORKDIR}/git" + +CVE_STATUS_GROUPS += "CVES_2015" +CVES_2015 = "CVE-2015-8270 CVE-2015-8271 CVE-2015-8272" +CVES_2015[status] = "fixed-version: patched in current git hash" + +inherit autotools-brokensep + +EXTRA_OEMAKE = " \ + CC='${CC}' LD='${LD} ${STAGING_LIBDIR}' XCFLAGS='${CFLAGS}' XLDFLAGS='${LDFLAGS}' \ + SYS=posix INC=-I=/usr/include DESTDIR=${D} CRYPTO=GNUTLS \ + prefix=${prefix} libdir=${libdir} incdir=${includedir}/librtmp bindir=${bindir} mandir=${mandir}" -- cgit v1.2.3-54-g00ecf