- remove fix-racing-build-issue.patch since it is included upstream Signed-off-by: Thomas Schlien <[email protected]> --- .../rtmpdump/fix-racing-build-issue.patch | 18 ------------------ .../{rtmpdump_2.4.bb => rtmpdump_2.6.bb} | 4 ++-- 2 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump/fix-racing-build-issue.patch rename meta-multimedia/recipes-multimedia/rtmpdump/{rtmpdump_2.4.bb => rtmpdump_2.6.bb} (90%)
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 <[email protected]> - -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.6.bb similarity index 90% rename from meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.4.bb rename to meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.6.bb index ba2e5195e9..1d2abb3d68 100644 --- a/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.4.bb +++ b/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.6.bb @@ -8,10 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "gnutls zlib" PV .= "+git" -SRCREV = "fa8646daeb19dfd12c181f7d19de708d623704c0" +SRCREV = "6f6bb1353fc84f4cc37138baa99f586750028a01" SRC_URI = " \ git://git.ffmpeg.org/rtmpdump;branch=master \ - file://fix-racing-build-issue.patch" +" S = "${WORKDIR}/git"
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#115060): https://lists.openembedded.org/g/openembedded-devel/message/115060 Mute This Topic: https://lists.openembedded.org/mt/110790536/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
