| Message ID | 20180905210224.21225-12-raj.khem@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [oe,meta-oe,01/12] asio: Upgrade to 1.12.1 | expand |
Nice series, thanks! Something seems to be missing in the commit summary of the last one. On Wed, Sep 5, 2018 at 11:04 PM Khem Raj <raj.khem@gmail.com> wrote: > Signed-off-by: Khem Raj <raj.khem@gmail.com> > --- > .../rtmpdump/rtmpdump/fix-racing-build-issue.patch | 10 +++++----- > .../recipes-multimedia/rtmpdump/rtmpdump_2.4.bb | 4 ++-- > 2 files changed, 7 insertions(+), 7 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 > index bb3d8b0efe..6e11c9752e 100644 > --- > a/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump/fix-racing-build-issue.patch > +++ > b/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump/fix-racing-build-issue.patch > @@ -8,11 +8,11 @@ Index: git/librtmp/Makefile > =================================================================== > --- git.orig/librtmp/Makefile > +++ git/librtmp/Makefile > -@@ -107,6 +107,7 @@ install_base: librtmp.a librtmp.pc > +@@ -115,6 +115,7 @@ install_base: librtmp.a librtmp.pc > cp librtmp.3 $(MANDIR)/man3 > > - install_so: librtmp.$(SO_EXT) > + install_so: librtmp$(SO_EXT) > + -mkdir -p $(SODIR) > - cp librtmp.$(SO_EXT) $(SODIR) > - cd $(SODIR); ln -sf librtmp.$(SO_EXT) librtmp.$(SOX) > - > + 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 > index c5513b0252..a72b0d651e 100644 > --- a/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.4.bb > +++ b/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.4.bb > @@ -5,9 +5,9 @@ HOMEPAGE = "http://rtmpdump.mplayerhq.hu/" > LICENSE = "GPLv2" > LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" > > -DEPENDS = "openssl zlib" > +DEPENDS = "openssl10 zlib" > > -SRCREV = "3121324046e4ca1934e7e28293fc8326475d5053" > +SRCREV = "fa8646daeb19dfd12c181f7d19de708d623704c0" > SRC_URI = " \ > git://git.ffmpeg.org/rtmpdump \ > file://fix-racing-build-issue.patch" > -- > 2.18.0 > > -- > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel > -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
On 9/5/18 2:19 PM, Martin Jansa wrote: > Nice series, thanks! > > Something seems to be missing in the commit summary of the last one. this is vim autowrapping in full swing during editing the patch subject lines. The real commit is ok see http://git.openembedded.org/meta-openembedded-contrib/commit/?h=kraj/master&id=2a48709d884f24f3cbcc6da4892d3c21b3f5274e > > On Wed, Sep 5, 2018 at 11:04 PM Khem Raj <raj.khem@gmail.com > <mailto:raj.khem@gmail.com>> wrote: > > Signed-off-by: Khem Raj <raj.khem@gmail.com <mailto:raj.khem@gmail.com>> > --- > .../rtmpdump/rtmpdump/fix-racing-build-issue.patch | 10 +++++----- > .../recipes-multimedia/rtmpdump/rtmpdump_2.4.bb > <http://rtmpdump_2.4.bb> | 4 ++-- > 2 files changed, 7 insertions(+), 7 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 > index bb3d8b0efe..6e11c9752e 100644 > --- > a/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump/fix-racing-build-issue.patch > +++ > b/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump/fix-racing-build-issue.patch > @@ -8,11 +8,11 @@ Index: git/librtmp/Makefile > =================================================================== > --- git.orig/librtmp/Makefile > +++ git/librtmp/Makefile > -@@ -107,6 +107,7 @@ install_base: librtmp.a librtmp.pc > +@@ -115,6 +115,7 @@ install_base: librtmp.a librtmp.pc > cp librtmp.3 $(MANDIR)/man3 > > - install_so: librtmp.$(SO_EXT) > + install_so: librtmp$(SO_EXT) > + -mkdir -p $(SODIR) > - cp librtmp.$(SO_EXT) $(SODIR) > - cd $(SODIR); ln -sf librtmp.$(SO_EXT) librtmp.$(SOX) > - > + 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 > <http://rtmpdump_2.4.bb> > b/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.4.bb > <http://rtmpdump_2.4.bb> > index c5513b0252..a72b0d651e 100644 > --- a/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.4.bb > <http://rtmpdump_2.4.bb> > +++ b/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.4.bb > <http://rtmpdump_2.4.bb> > @@ -5,9 +5,9 @@ HOMEPAGE = "http://rtmpdump.mplayerhq.hu/" > LICENSE = "GPLv2" > LIC_FILES_CHKSUM = > "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" > > -DEPENDS = "openssl zlib" > +DEPENDS = "openssl10 zlib" > > -SRCREV = "3121324046e4ca1934e7e28293fc8326475d5053" > +SRCREV = "fa8646daeb19dfd12c181f7d19de708d623704c0" > SRC_URI = " \ > git://git.ffmpeg.org/rtmpdump <http://git.ffmpeg.org/rtmpdump> \ > file://fix-racing-build-issue.patch" > -- > 2.18.0 > > -- > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > <mailto:Openembedded-devel@lists.openembedded.org> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel > -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
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 index bb3d8b0efe..6e11c9752e 100644 --- a/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump/fix-racing-build-issue.patch +++ b/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump/fix-racing-build-issue.patch @@ -8,11 +8,11 @@ Index: git/librtmp/Makefile =================================================================== --- git.orig/librtmp/Makefile +++ git/librtmp/Makefile -@@ -107,6 +107,7 @@ install_base: librtmp.a librtmp.pc +@@ -115,6 +115,7 @@ install_base: librtmp.a librtmp.pc cp librtmp.3 $(MANDIR)/man3 - install_so: librtmp.$(SO_EXT) + install_so: librtmp$(SO_EXT) + -mkdir -p $(SODIR) - cp librtmp.$(SO_EXT) $(SODIR) - cd $(SODIR); ln -sf librtmp.$(SO_EXT) librtmp.$(SOX) - + 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 index c5513b0252..a72b0d651e 100644 --- a/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.4.bb +++ b/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.4.bb @@ -5,9 +5,9 @@ HOMEPAGE = "http://rtmpdump.mplayerhq.hu/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS = "openssl zlib" +DEPENDS = "openssl10 zlib" -SRCREV = "3121324046e4ca1934e7e28293fc8326475d5053" +SRCREV = "fa8646daeb19dfd12c181f7d19de708d623704c0" SRC_URI = " \ git://git.ffmpeg.org/rtmpdump \ file://fix-racing-build-issue.patch"
Signed-off-by: Khem Raj <raj.khem@gmail.com> --- .../rtmpdump/rtmpdump/fix-racing-build-issue.patch | 10 +++++----- .../recipes-multimedia/rtmpdump/rtmpdump_2.4.bb | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) -- 2.18.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel