diff options
-rw-r--r-- | meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump/fix-racing-build-issue.patch | 18 | ||||
-rw-r--r-- | meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.6.bb (renamed from meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.4.bb) | 4 |
2 files changed, 2 insertions, 20 deletions
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 @@ | |||
1 | Make sure libdir (SODIR) is created when running parallel make. | ||
2 | |||
3 | Upstream-Status: Inappropriate [configuration] | ||
4 | |||
5 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> | ||
6 | |||
7 | Index: git/librtmp/Makefile | ||
8 | =================================================================== | ||
9 | --- git.orig/librtmp/Makefile | ||
10 | +++ git/librtmp/Makefile | ||
11 | @@ -115,6 +115,7 @@ install_base: librtmp.a librtmp.pc | ||
12 | cp librtmp.3 $(MANDIR)/man3 | ||
13 | |||
14 | install_so: librtmp$(SO_EXT) | ||
15 | + -mkdir -p $(SODIR) | ||
16 | cp librtmp$(SO_EXT) $(SODIR) | ||
17 | $(INSTALL_IMPLIB) | ||
18 | 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 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" | |||
8 | DEPENDS = "gnutls zlib" | 8 | DEPENDS = "gnutls zlib" |
9 | 9 | ||
10 | PV .= "+git" | 10 | PV .= "+git" |
11 | SRCREV = "fa8646daeb19dfd12c181f7d19de708d623704c0" | 11 | SRCREV = "6f6bb1353fc84f4cc37138baa99f586750028a01" |
12 | SRC_URI = " \ | 12 | SRC_URI = " \ |
13 | git://git.ffmpeg.org/rtmpdump;branch=master \ | 13 | git://git.ffmpeg.org/rtmpdump;branch=master \ |
14 | file://fix-racing-build-issue.patch" | 14 | " |
15 | 15 | ||
16 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
17 | 17 | ||