[Buildroot] [PATCH] gst-fsl-plugins: Refresh one patch to fix build

[Buildroot] [PATCH] gst-fsl-plugins: Refresh one patch to fix build

[Vincent Stehlé]

This fixes the following patch application error when building for i.MX6:

  Applying gst-fsl-plugins-0004-Fix-libgstfsl-linkage-add-lrt-for-shared-memory-func.patch using patch:
  patching file configure.ac
  Hunk #1 succeeded at 178 with fuzz 2 (offset 5 lines).
  patching file libs/Makefile.am
  Hunk #1 FAILED at 12.
  1 out of 1 hunk FAILED -- saving rejects to file libs/Makefile.am.rej
  Patch failed!  Please fix gst-fsl-plugins-0004-Fix-libgstfsl-linkage-add-lrt-for-shared-memory-func.patch!

Signed-off-by: Vincent Stehl? <vincent.stehle@freescale.com>
Cc: Peter Seiderer <ps.report@gmx.net>
Cc: Eric Nelson <eric.nelson@boundarydevices.com>
---
 ...gstfsl-linkage-add-lrt-for-shared-memory-func.patch | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0004-Fix-libgstfsl-linkage-add-lrt-for-shared-memory-func.patch b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0004-Fix-libgstfsl-linkage-add-lrt-for-shared-memory-func.patch
index 863f1b6..e58467e 100644
--- a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0004-Fix-libgstfsl-linkage-add-lrt-for-shared-memory-func.patch
+++ b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0004-Fix-libgstfsl-linkage-add-lrt-for-shared-memory-func.patch
@@ -15,7 +15,7 @@ Signed-off-by: Peter Seiderer <ps.report@gmx.net>
  2 files changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index f7907a7..9f834df 100755
+index a5d1655..7b5a7a6 100755
 --- a/configure.ac
 +++ b/configure.ac
 @@ -173,6 +173,9 @@ AC_CHECK_LIB(ipu, mxc_ipu_lib_task_init, [IPU_LIBS=-lipu], [echo "No libipu arou
@@ -25,19 +25,19 @@ index f7907a7..9f834df 100755
 +AC_SEARCH_LIBS([shm_open], [rt], [SHM_LIBS="-lrt"])
 +AC_SUBST(SHM_LIBS)
 +
- FSL_MM_CORE_CFLAGS=`$PKG_CONFIG --cflags libfslaudiocodec 2>/dev/null`
- FSL_MM_CORE_CFLAGS="$FSL_MM_CORE_CFLAGS `$PKG_CONFIG --cflags libfslvideocodec 2>/dev/null`"
- FSL_MM_CORE_CFLAGS="$FSL_MM_CORE_CFLAGS `$PKG_CONFIG --cflags libfslparser 2>/dev/null`"
+ dnl of the POSIX Real-Time Extensions.
+ AC_CHECK_LIB(rt, clock_gettime)
+ AC_SUBST(RT_CFLAGS)
 diff --git a/libs/Makefile.am b/libs/Makefile.am
-index a68fd4b..7b19b92 100755
+index 2f56bba..5b30657 100755
 --- a/libs/Makefile.am
 +++ b/libs/Makefile.am
-@@ -12,7 +12,7 @@ libgstfsl_ at GST_MAJORMINOR@_la_SOURCES = \
+@@ -42,7 +42,7 @@ libgstfsl_ at GST_MAJORMINOR@_la_CFLAGS  += -DIPULIB
+ endif
  
- libgstfsl_ at GST_MAJORMINOR@_la_CFLAGS  = $(GST_BASE_CFLAGS) $(IPU_CFLAGS) -I../inc/common
  libgstfsl_ at GST_MAJORMINOR@_la_LDFLAGS = -version-info @GSTMXLIBS_VERSION@
--libgstfsl_ at GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) -lgstvideo- at GST_MAJORMINOR@ -lgstinterfaces-$(GST_MAJORMINOR) $(IPU_LIBS)
-+libgstfsl_ at GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) -lgstvideo- at GST_MAJORMINOR@ -lgstinterfaces-$(GST_MAJORMINOR) $(IPU_LIBS) $(SHM_LIBS)
+-libgstfsl_ at GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) -lgstvideo- at GST_MAJORMINOR@ -lgstinterfaces-$(GST_MAJORMINOR) $(IPU_LIBS) $(RT_LIBS)
++libgstfsl_ at GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) -lgstvideo- at GST_MAJORMINOR@ -lgstinterfaces-$(GST_MAJORMINOR) $(IPU_LIBS) $(RT_LIBS) $(SHM_LIBS)
  
  libgstfsl_ at GST_MAJORMINOR@includedir = $(includedir)/gstreamer- at GST_MAJORMINOR@/gst/imx-mm
  libgstfsl_ at GST_MAJORMINOR@include_HEADERS = \
-- 
1.9.1

[Buildroot] [PATCH] gst-fsl-plugins: Refresh one patch to fix build

[Peter Seiderer]

Hello Vincent,

> Gesendet: Freitag, 04. April 2014 um 11:47 Uhr
> Von: "Vincent Stehl?" <vincent.stehle@freescale.com>
> An: buildroot at busybox.net
> Cc: "Vincent Stehl?" <vincent.stehle@freescale.com>, "Peter Seiderer" <ps.report@gmx.net>, "Eric Nelson" <eric.nelson@boundarydevices.com>
> Betreff: [PATCH] gst-fsl-plugins: Refresh one patch to fix build
>
> This fixes the following patch application error when building for i.MX6:
> 
>   Applying gst-fsl-plugins-0004-Fix-libgstfsl-linkage-add-lrt-for-shared-memory-func.patch using patch:
>   patching file configure.ac
>   Hunk #1 succeeded at 178 with fuzz 2 (offset 5 lines).
>   patching file libs/Makefile.am
>   Hunk #1 FAILED at 12.
>   1 out of 1 hunk FAILED -- saving rejects to file libs/Makefile.am.rej
>   Patch failed!  Please fix gst-fsl-plugins-0004-Fix-libgstfsl-linkage-add-lrt-for-shared-memory-func.patch!
> 
> Signed-off-by: Vincent Stehl? <vincent.stehle@freescale.com>
> Cc: Peter Seiderer <ps.report@gmx.net>
> Cc: Eric Nelson <eric.nelson@boundarydevices.com>
> ---
>  ...gstfsl-linkage-add-lrt-for-shared-memory-func.patch | 18 +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0004-Fix-libgstfsl-linkage-add-lrt-for-shared-memory-func.patch b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0004-Fix-libgstfsl-linkage-add-lrt-for-shared-memory-func.patch
> index 863f1b6..e58467e 100644
> --- a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0004-Fix-libgstfsl-linkage-add-lrt-for-shared-memory-func.patch
> +++ b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0004-Fix-libgstfsl-linkage-add-lrt-for-shared-memory-func.patch
> @@ -15,7 +15,7 @@ Signed-off-by: Peter Seiderer <ps.report@gmx.net>
>   2 files changed, 4 insertions(+), 1 deletion(-)
>  
>  diff --git a/configure.ac b/configure.ac
> -index f7907a7..9f834df 100755
> +index a5d1655..7b5a7a6 100755
>  --- a/configure.ac
>  +++ b/configure.ac
>  @@ -173,6 +173,9 @@ AC_CHECK_LIB(ipu, mxc_ipu_lib_task_init, [IPU_LIBS=-lipu], [echo "No libipu arou
> @@ -25,19 +25,19 @@ index f7907a7..9f834df 100755
>  +AC_SEARCH_LIBS([shm_open], [rt], [SHM_LIBS="-lrt"])
>  +AC_SUBST(SHM_LIBS)
>  +
> - FSL_MM_CORE_CFLAGS=`$PKG_CONFIG --cflags libfslaudiocodec 2>/dev/null`
> - FSL_MM_CORE_CFLAGS="$FSL_MM_CORE_CFLAGS `$PKG_CONFIG --cflags libfslvideocodec 2>/dev/null`"
> - FSL_MM_CORE_CFLAGS="$FSL_MM_CORE_CFLAGS `$PKG_CONFIG --cflags libfslparser 2>/dev/null`"
> + dnl of the POSIX Real-Time Extensions.
> + AC_CHECK_LIB(rt, clock_gettime)
> + AC_SUBST(RT_CFLAGS)
>  diff --git a/libs/Makefile.am b/libs/Makefile.am
> -index a68fd4b..7b19b92 100755
> +index 2f56bba..5b30657 100755
>  --- a/libs/Makefile.am
>  +++ b/libs/Makefile.am
> -@@ -12,7 +12,7 @@ libgstfsl_ at GST_MAJORMINOR@_la_SOURCES = \
> +@@ -42,7 +42,7 @@ libgstfsl_ at GST_MAJORMINOR@_la_CFLAGS  += -DIPULIB
> + endif
>   
> - libgstfsl_ at GST_MAJORMINOR@_la_CFLAGS  = $(GST_BASE_CFLAGS) $(IPU_CFLAGS) -I../inc/common
>   libgstfsl_ at GST_MAJORMINOR@_la_LDFLAGS = -version-info @GSTMXLIBS_VERSION@
> --libgstfsl_ at GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) -lgstvideo- at GST_MAJORMINOR@ -lgstinterfaces-$(GST_MAJORMINOR) $(IPU_LIBS)
> -+libgstfsl_ at GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) -lgstvideo- at GST_MAJORMINOR@ -lgstinterfaces-$(GST_MAJORMINOR) $(IPU_LIBS) $(SHM_LIBS)
> +-libgstfsl_ at GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) -lgstvideo- at GST_MAJORMINOR@ -lgstinterfaces-$(GST_MAJORMINOR) $(IPU_LIBS) $(RT_LIBS)
> ++libgstfsl_ at GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) -lgstvideo- at GST_MAJORMINOR@ -lgstinterfaces-$(GST_MAJORMINOR) $(IPU_LIBS) $(RT_LIBS) $(SHM_LIBS)
>   

Looks like the latest freescale version of gst-fsl-plugins already adds '-lrt' (as I guess from the name RT_LIBS)?
If so the whole patch is obsoleted...

Regards,
Peter


>   libgstfsl_ at GST_MAJORMINOR@includedir = $(includedir)/gstreamer- at GST_MAJORMINOR@/gst/imx-mm
>   libgstfsl_ at GST_MAJORMINOR@include_HEADERS = \
> -- 
> 1.9.1
> 
> 
>

[Buildroot] [PATCH] gst-fsl-plugins: Refresh one patch to fix build

[Thomas Petazzoni]

Dear Vincent Stehl?,

On Fri, 4 Apr 2014 11:47:22 +0200, Vincent Stehl? wrote:
> This fixes the following patch application error when building for i.MX6:
> 
>   Applying gst-fsl-plugins-0004-Fix-libgstfsl-linkage-add-lrt-for-shared-memory-func.patch using patch:
>   patching file configure.ac
>   Hunk #1 succeeded at 178 with fuzz 2 (offset 5 lines).
>   patching file libs/Makefile.am
>   Hunk #1 FAILED at 12.
>   1 out of 1 hunk FAILED -- saving rejects to file libs/Makefile.am.rej
>   Patch failed!  Please fix gst-fsl-plugins-0004-Fix-libgstfsl-linkage-add-lrt-for-shared-memory-func.patch!
> 
> Signed-off-by: Vincent Stehl? <vincent.stehle@freescale.com>
> Cc: Peter Seiderer <ps.report@gmx.net>
> Cc: Eric Nelson <eric.nelson@boundarydevices.com>
> ---
>  ...gstfsl-linkage-add-lrt-for-shared-memory-func.patch | 18 +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)

Applied, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH] gst-fsl-plugins: Refresh one patch to fix build

[Thomas Petazzoni]

Dear Peter Seiderer,

On Fri, 4 Apr 2014 21:36:15 +0200, Peter Seiderer wrote:

> > - libgstfsl_ at GST_MAJORMINOR@_la_CFLAGS  = $(GST_BASE_CFLAGS) $(IPU_CFLAGS) -I../inc/common
> >   libgstfsl_ at GST_MAJORMINOR@_la_LDFLAGS = -version-info @GSTMXLIBS_VERSION@
> > --libgstfsl_ at GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) -lgstvideo- at GST_MAJORMINOR@ -lgstinterfaces-$(GST_MAJORMINOR) $(IPU_LIBS)
> > -+libgstfsl_ at GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) -lgstvideo- at GST_MAJORMINOR@ -lgstinterfaces-$(GST_MAJORMINOR) $(IPU_LIBS) $(SHM_LIBS)
> > +-libgstfsl_ at GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) -lgstvideo- at GST_MAJORMINOR@ -lgstinterfaces-$(GST_MAJORMINOR) $(IPU_LIBS) $(RT_LIBS)
> > ++libgstfsl_ at GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) -lgstvideo- at GST_MAJORMINOR@ -lgstinterfaces-$(GST_MAJORMINOR) $(IPU_LIBS) $(RT_LIBS) $(SHM_LIBS)
> >   
> 
> Looks like the latest freescale version of gst-fsl-plugins already adds '-lrt' (as I guess from the name RT_LIBS)?
> If so the whole patch is obsoleted...

Then can you send a followup patch that bumps the version of
gst-fsl-plugins? Vincent patch is still fixing an actual problem with
the current Buildroot, so it made sense to apply it, until additional
patches are sent to update gst-fsl-plugins.

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH] gst-fsl-plugins: Refresh one patch to fix build

[Peter Seiderer]

 Hello Thomas,

> Gesendet: Sonntag, 06. April 2014 um 14:37 Uhr
> Von: "Thomas Petazzoni" <thomas.petazzoni@free-electrons.com>
> An: "Peter Seiderer" <ps.report@gmx.net>
> Cc: "Vincent Stehl?" <vincent.stehle@freescale.com>, buildroot at busybox.net
> Betreff: Re: [Buildroot] [PATCH] gst-fsl-plugins: Refresh one patch to fix build
>
> Dear Peter Seiderer,
> 
> On Fri, 4 Apr 2014 21:36:15 +0200, Peter Seiderer wrote:
> 
> > > - libgstfsl_ at GST_MAJORMINOR@_la_CFLAGS  = $(GST_BASE_CFLAGS) $(IPU_CFLAGS) -I../inc/common
> > >   libgstfsl_ at GST_MAJORMINOR@_la_LDFLAGS = -version-info @GSTMXLIBS_VERSION@
> > > --libgstfsl_ at GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) -lgstvideo- at GST_MAJORMINOR@ -lgstinterfaces-$(GST_MAJORMINOR) $(IPU_LIBS)
> > > -+libgstfsl_ at GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) -lgstvideo- at GST_MAJORMINOR@ -lgstinterfaces-$(GST_MAJORMINOR) $(IPU_LIBS) $(SHM_LIBS)
> > > +-libgstfsl_ at GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) -lgstvideo- at GST_MAJORMINOR@ -lgstinterfaces-$(GST_MAJORMINOR) $(IPU_LIBS) $(RT_LIBS)
> > > ++libgstfsl_ at GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) -lgstvideo- at GST_MAJORMINOR@ -lgstinterfaces-$(GST_MAJORMINOR) $(IPU_LIBS) $(RT_LIBS) $(SHM_LIBS)
> > >   
> > 
> > Looks like the latest freescale version of gst-fsl-plugins already adds '-lrt' (as I guess from the name RT_LIBS)?
> > If so the whole patch is obsoleted...
> 
> Then can you send a followup patch that bumps the version of
> gst-fsl-plugins? Vincent patch is still fixing an actual problem with
> the current Buildroot, so it made sense to apply it, until additional
> patches are sent to update gst-fsl-plugins.
> 

....the gst-fsl-plugins version is already bumped since my patch by [1] and [2] (applied by merge [3])
from 3.0.1 to 3.5.7-1.0.0, thats the reason why the patch did not apply any more....

From the new patch context I guess the missing '-lrt' is already fixed in die gst-fsl-plugins 3.5.7-1.0.0 version? But someone else must (better: it would be nice if someone can) check, because my board is still
running with a 3.0.35 linux kernel based board support package. No (easy) chance to run the new (3.5.7
linux kernel based) freescale distribution and check the gst-fsl-plugins for runtime errors.... 

Maybe I can do a compile time check for the '-lrt' link time parameter for the plugins the next
days...

[1] http://git.buildroot.net/buildroot/commit/package/gstreamer/gst-fsl-plugins?id=0fa180aa8a0638c25a851f82658e88fbd954e5cd
[2] http://git.buildroot.net/buildroot/commit/package/gstreamer/gst-fsl-plugins?id=b0b72591d74c1a84b8c1b2e1990a2fe1dfe8c4ab
[3] http://git.buildroot.net/buildroot/commit/package/gstreamer/gst-fsl-plugins?id=b108fdcb83d457e5d43298fb93dbfd805d076f24

Regards,

Peter


> Thanks,
> 
> Thomas
> -- 
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux, Kernel and Android engineering
> http://free-electrons.com
>