[Buildroot] [PATCH v6 0/4] rpi-userland/xbmc fixes

[Buildroot] [PATCH v6 0/4] rpi-userland/xbmc fixes

[Samuel Martin]

Hi all,

Here is just more fixes about rpi-userland/xbmc and all.

Yours,
Samuel

Samuel Martin (3):
  xbmc: fix missing libraries from rpi-userland
  rpi-userland: add patch fix missing libvcilcs install rules
  rpi-userland: cleanup *_CONF_OPT

Yann E. MORIN (1):
  package/libcec: fix missing libraries from rpi-userland

 package/libcec/libcec.mk                           |  1 +
 ...vmcs_host-add-install-rules-for-libvcilcs.patch | 23 ++++++++++++++++++++++
 package/rpi-userland/rpi-userland.mk               |  2 +-
 package/xbmc/xbmc.mk                               |  3 ++-
 4 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 package/rpi-userland/rpi-userland-003-interface-vmcs_host-add-install-rules-for-libvcilcs.patch

--
2.0.0

[Buildroot] [PATCH v6 1/4] package/libcec: fix missing libraries from rpi-userland

[Samuel Martin]

From: "Yann E. MORIN" <yann.morin.1998@free.fr>

When rpi-userland libraries are built as shared-objects, not all needed
libraries are passed in the LD_FLAGS, leading to failure at linkage.

To avoid this issue, set the LIBS variable content in accordance with
INCLUDES variable value.

This is needed because libcec does not use pkg-config to look for the
ldflags needed for -lbcm_host, even though bcm_host provides a .pc
file (even a correct one!)

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Samuel Martin <s.martin49@gmail.com>
---
 package/libcec/libcec.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/libcec/libcec.mk b/package/libcec/libcec.mk
index 0aabb06..ad919fc 100644
--- a/package/libcec/libcec.mk
+++ b/package/libcec/libcec.mk
@@ -26,6 +26,7 @@ ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
 LIBCEC_CONF_OPT = --enable-rpi \
    --with-rpi-include-path=$(STAGING_DIR)/usr/include
 LIBCEC_DEPENDENCIES += rpi-userland
+LIBCEC_CONF_ENV += LIBS="-lvcos -lvchostif"
 else
 LIBCEC_CONF_OPT = --disable-rpi
 endif
-- 
2.0.0

[Buildroot] [PATCH v6 2/4] xbmc: fix missing libraries from rpi-userland

[Samuel Martin]

When rpi-userland libraries are built as shared-objects, not all needed
libraries are passed in the LD_FLAGS, leading to failure at linkage.

To avoid this issue, set the LIBS variable content in accordance with the
INCLUDES variable value.

The commit 5e3b1f31b3f82e3b163567f10d7131c9d649a2cf currently works
around this issue by forcing rpi-userland to be statically linked,
whereas it is actually a LIBS flags problem in xbmc package.

A follow-up patch fixes rpi-userland package.

Reported-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Cc: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Cc: "Yann E. MORIN" <yann.morin.1998@free.fr>

---
changes v5 -> v6:
- rebase

changes v4 -> v5:
- rebase
- extend commit message

changes v3 -> v4:
- rebase

changes v2 -> v3:
- new patch
---
 package/xbmc/xbmc.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/xbmc/xbmc.mk b/package/xbmc/xbmc.mk
index c7a4607..8c0146e 100644
--- a/package/xbmc/xbmc.mk
+++ b/package/xbmc/xbmc.mk
@@ -53,7 +53,8 @@ ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
 XBMC_DEPENDENCIES += rpi-userland
 XBMC_CONF_OPT += --with-platform=raspberry-pi --enable-player=omxplayer
 XBMC_CONF_ENV += INCLUDES="-I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \
-	-I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux"
+	-I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux" \
+	LIBS="-lvcos -lvchostif"
 endif
 
 ifeq ($(BR2_PACKAGE_DBUS),y)
-- 
2.0.0

[Buildroot] [PATCH v6 3/4] rpi-userland: add patch fix missing libvcilcs install rules

[Samuel Martin]

This change adds a patch fix the missing install rules for libvcilcs.

This is a pre-requisite to be able to build the shared libraries of the
rpi-userland package, and most importantly avoid linkage failure (at
link-time and/or runtime) in others libraries that link with it.

Reported-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

---
changes v5 -> v6:
- new patch
---
 ...vmcs_host-add-install-rules-for-libvcilcs.patch | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 package/rpi-userland/rpi-userland-003-interface-vmcs_host-add-install-rules-for-libvcilcs.patch

diff --git a/package/rpi-userland/rpi-userland-003-interface-vmcs_host-add-install-rules-for-libvcilcs.patch b/package/rpi-userland/rpi-userland-003-interface-vmcs_host-add-install-rules-for-libvcilcs.patch
new file mode 100644
index 0000000..05cf4b3
--- /dev/null
+++ b/package/rpi-userland/rpi-userland-003-interface-vmcs_host-add-install-rules-for-libvcilcs.patch
@@ -0,0 +1,23 @@
+From b60398837ddf39d4b605600abc167d4366e454a6 Mon Sep 17 00:00:00 2001
+From: Samuel Martin <s.martin49@gmail.com>
+Date: Thu, 5 Jun 2014 00:06:08 +0200
+Subject: [PATCH] interface/vmcs_host: add install rules for libvcilcs
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+---
+ interface/vmcs_host/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/interface/vmcs_host/CMakeLists.txt b/interface/vmcs_host/CMakeLists.txt
+index 64ba2f8..8510f81 100755
+--- a/interface/vmcs_host/CMakeLists.txt
++++ b/interface/vmcs_host/CMakeLists.txt
+@@ -33,4 +33,5 @@ target_link_libraries(vchostif vchiq_arm vcos vcfiled_check)
+ 
+ add_subdirectory(linux/vcfiled)
+ install(TARGETS vchostif DESTINATION lib)
++install(TARGETS vcilcs DESTINATION lib)
+ 
+-- 
+2.0.0
+
-- 
2.0.0

[Buildroot] [PATCH v6 4/4] rpi-userland: cleanup *_CONF_OPT

[Samuel Martin]

This change reverts the commit 5e3b1f31b3f82e3b163567f10d7131c9d649a2cf
because rpi-userland is correctly built whatever the value of the
BUILD_SHARED_LIBS CMake flags.

The cset 5e3b1f31b3f82e3b163567f10d7131c9d649a2cf originally intends to
fix linkage/runtime failure in xbmc package because of missing flags in
xbmc LIBS env. var. This has been fixed in the previous patch.

So, for rpi-userland package, BUILD_SHARED_LIBS does no longer need to
be forced to OFF, and can safely be driven by the CMake infrastructure.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Cc: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

---
changes v5 -> v6:
- rebase

changes v4 -> v5:
- rebase
- extend commit log (ThomasP)

changes v3 -> v4:
- rebase

changes v2 -> v3:
- new patch
---
 package/rpi-userland/rpi-userland.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk
index 8b225ba..2de6b92 100644
--- a/package/rpi-userland/rpi-userland.mk
+++ b/package/rpi-userland/rpi-userland.mk
@@ -9,7 +9,7 @@ RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION))
 RPI_USERLAND_LICENSE = BSD-3c
 RPI_USERLAND_LICENSE_FILES = LICENCE
 RPI_USERLAND_INSTALL_STAGING = YES
-RPI_USERLAND_CONF_OPT = -DVMCS_INSTALL_PREFIX=/usr -DBUILD_SHARED_LIBS=OFF
+RPI_USERLAND_CONF_OPT = -DVMCS_INSTALL_PREFIX=/usr
 
 RPI_USERLAND_PROVIDES = libegl libgles libopenmax libopenvg
 
-- 
2.0.0

[Buildroot] [PATCH v6 0/4] rpi-userland/xbmc fixes

[Yann E. MORIN]

Samuel, All,


On June 5, 2014 1:04:09 AM CEST, Samuel Martin <s.martin49@gmail.com> wrote:
>Samuel Martin (3):
>  xbmc: fix missing libraries from rpi-userland
>  rpi-userland: add patch fix missing libvcilcs install rules
>  rpi-userland: cleanup *_CONF_OPT

You forgot to propagate my acked-and-tested tags on patches 1 and 3.

Regards,
Yann E. MORIN.

>Yann E. MORIN (1):
>  package/libcec: fix missing libraries from rpi-userland
>
> package/libcec/libcec.mk                           |  1 +
>...vmcs_host-add-install-rules-for-libvcilcs.patch | 23
>++++++++++++++++++++++
> package/rpi-userland/rpi-userland.mk               |  2 +-
> package/xbmc/xbmc.mk                               |  3 ++-
> 4 files changed, 27 insertions(+), 2 deletions(-)
>create mode 100644
>package/rpi-userland/rpi-userland-003-interface-vmcs_host-add-install-rules-for-libvcilcs.patch
>
>--
>2.0.0
>
>_______________________________________________
>buildroot mailing list
>buildroot at busybox.net
>http://lists.busybox.net/mailman/listinfo/buildroot

-- 
Sent from my Android device with K-9 Mail. Please excuse my brevity.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20140605/79256f66/attachment.html>

[Buildroot] [PATCH v6 0/4] rpi-userland/xbmc fixes

[Yann E. MORIN]

Samuel, All,

(Grr... K9 drops the text in the quoted part)

You forgot to propagate my tested-and-acked-tags to patches 1 and 3.

Regards,
Yann E  MORIN.

On June 5, 2014 1:04:09 AM CEST, Samuel Martin <s.martin49@gmail.com> wrote:
>Hi all,
>
>Here is just more fixes about rpi-userland/xbmc and all.
>
>Yours,
>Samuel
>
>Samuel Martin (3):
>  xbmc: fix missing libraries from rpi-userland
>  rpi-userland: add patch fix missing libvcilcs install rules
>  rpi-userland: cleanup *_CONF_OPT
>
>Yann E. MORIN (1):
>  package/libcec: fix missing libraries from rpi-userland
>
> package/libcec/libcec.mk                           |  1 +
>...vmcs_host-add-install-rules-for-libvcilcs.patch | 23
>++++++++++++++++++++++
> package/rpi-userland/rpi-userland.mk               |  2 +-
> package/xbmc/xbmc.mk                               |  3 ++-
> 4 files changed, 27 insertions(+), 2 deletions(-)
>create mode 100644
>package/rpi-userland/rpi-userland-003-interface-vmcs_host-add-install-rules-for-libvcilcs.patch
>
>--
>2.0.0
>
>_______________________________________________
>buildroot mailing list
>buildroot at busybox.net
>http://lists.busybox.net/mailman/listinfo/buildroot

-- 
Sent from my Android device with K-9 Mail. Please excuse my brevity.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20140605/3cba6747/attachment.html>

[Buildroot] [PATCH v6 0/4] rpi-userland/xbmc fixes

[Baruch Siach]

Hi Yann,

On Thu, Jun 05, 2014 at 08:45:16AM +0200, Yann E. MORIN wrote:
> (Grr... K9 drops the text in the quoted part)

Your text appears correctly in the plaintext part of your email 
(http://lists.busybox.net/pipermail/buildroot/2014-June/098501.html), but not 
the on HTML part 
(http://article.gmane.org/gmane.comp.lib.uclibc.buildroot/86031).

baruch

> You forgot to propagate my tested-and-acked-tags to patches 1 and 3.
> 
> Regards,
> Yann E  MORIN.
> 
> On June 5, 2014 1:04:09 AM CEST, Samuel Martin <s.martin49@gmail.com> wrote:
> >Hi all,
> >
> >Here is just more fixes about rpi-userland/xbmc and all.
> >
> >Yours,
> >Samuel
> >
> >Samuel Martin (3):
> >  xbmc: fix missing libraries from rpi-userland
> >  rpi-userland: add patch fix missing libvcilcs install rules
> >  rpi-userland: cleanup *_CONF_OPT
> >
> >Yann E. MORIN (1):
> >  package/libcec: fix missing libraries from rpi-userland
> >
> > package/libcec/libcec.mk                           |  1 +
> >...vmcs_host-add-install-rules-for-libvcilcs.patch | 23
> >++++++++++++++++++++++
> > package/rpi-userland/rpi-userland.mk               |  2 +-
> > package/xbmc/xbmc.mk                               |  3 ++-
> > 4 files changed, 27 insertions(+), 2 deletions(-)
> >create mode 100644
> >package/rpi-userland/rpi-userland-003-interface-vmcs_host-add-install-rules-for-libvcilcs.patch
> >
> >--
> >2.0.0

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

[Buildroot] [PATCH v6 2/4] xbmc: fix missing libraries from rpi-userland

[Yann E. MORIN]

Samuel, All,

On 2014-06-05 01:04 +0200, Samuel Martin spake thusly:
> When rpi-userland libraries are built as shared-objects, not all needed
> libraries are passed in the LD_FLAGS, leading to failure at linkage.
> 
> To avoid this issue, set the LIBS variable content in accordance with the
> INCLUDES variable value.
> 
> The commit 5e3b1f31b3f82e3b163567f10d7131c9d649a2cf currently works
> around this issue by forcing rpi-userland to be statically linked,
> whereas it is actually a LIBS flags problem in xbmc package.
> 
> A follow-up patch fixes rpi-userland package.
> 
> Reported-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
> Cc: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
> Cc: "Yann E. MORIN" <yann.morin.1998@free.fr>

Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
> changes v5 -> v6:
> - rebase
> 
> changes v4 -> v5:
> - rebase
> - extend commit message
> 
> changes v3 -> v4:
> - rebase
> 
> changes v2 -> v3:
> - new patch
> ---
>  package/xbmc/xbmc.mk | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/package/xbmc/xbmc.mk b/package/xbmc/xbmc.mk
> index c7a4607..8c0146e 100644
> --- a/package/xbmc/xbmc.mk
> +++ b/package/xbmc/xbmc.mk
> @@ -53,7 +53,8 @@ ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
>  XBMC_DEPENDENCIES += rpi-userland
>  XBMC_CONF_OPT += --with-platform=raspberry-pi --enable-player=omxplayer
>  XBMC_CONF_ENV += INCLUDES="-I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \
> -	-I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux"
> +	-I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux" \
> +	LIBS="-lvcos -lvchostif"
>  endif
>  
>  ifeq ($(BR2_PACKAGE_DBUS),y)
> -- 
> 2.0.0
> 

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH v6 3/4] rpi-userland: add patch fix missing libvcilcs install rules

[Yann E. MORIN]

Samuel, All,

On 2014-06-05 01:04 +0200, Samuel Martin spake thusly:
> This change adds a patch fix the missing install rules for libvcilcs.
> 
> This is a pre-requisite to be able to build the shared libraries of the
> rpi-userland package, and most importantly avoid linkage failure (at
> link-time and/or runtime) in others libraries that link with it.
> 
> Reported-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
> Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
> changes v5 -> v6:
> - new patch
> ---
>  ...vmcs_host-add-install-rules-for-libvcilcs.patch | 23 ++++++++++++++++++++++
>  1 file changed, 23 insertions(+)
>  create mode 100644 package/rpi-userland/rpi-userland-003-interface-vmcs_host-add-install-rules-for-libvcilcs.patch
> 
> diff --git a/package/rpi-userland/rpi-userland-003-interface-vmcs_host-add-install-rules-for-libvcilcs.patch b/package/rpi-userland/rpi-userland-003-interface-vmcs_host-add-install-rules-for-libvcilcs.patch
> new file mode 100644
> index 0000000..05cf4b3
> --- /dev/null
> +++ b/package/rpi-userland/rpi-userland-003-interface-vmcs_host-add-install-rules-for-libvcilcs.patch
> @@ -0,0 +1,23 @@
> +From b60398837ddf39d4b605600abc167d4366e454a6 Mon Sep 17 00:00:00 2001
> +From: Samuel Martin <s.martin49@gmail.com>
> +Date: Thu, 5 Jun 2014 00:06:08 +0200
> +Subject: [PATCH] interface/vmcs_host: add install rules for libvcilcs
> +
> +Signed-off-by: Samuel Martin <s.martin49@gmail.com>
> +---
> + interface/vmcs_host/CMakeLists.txt | 1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/interface/vmcs_host/CMakeLists.txt b/interface/vmcs_host/CMakeLists.txt
> +index 64ba2f8..8510f81 100755
> +--- a/interface/vmcs_host/CMakeLists.txt
> ++++ b/interface/vmcs_host/CMakeLists.txt
> +@@ -33,4 +33,5 @@ target_link_libraries(vchostif vchiq_arm vcos vcfiled_check)
> + 
> + add_subdirectory(linux/vcfiled)
> + install(TARGETS vchostif DESTINATION lib)
> ++install(TARGETS vcilcs DESTINATION lib)
> + 
> +-- 
> +2.0.0
> +
> -- 
> 2.0.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH v6 4/4] rpi-userland: cleanup *_CONF_OPT

[Yann E. MORIN]

Samuel, All,

On 2014-06-05 01:04 +0200, Samuel Martin spake thusly:
> This change reverts the commit 5e3b1f31b3f82e3b163567f10d7131c9d649a2cf
> because rpi-userland is correctly built whatever the value of the
> BUILD_SHARED_LIBS CMake flags.
> 
> The cset 5e3b1f31b3f82e3b163567f10d7131c9d649a2cf originally intends to
> fix linkage/runtime failure in xbmc package because of missing flags in
> xbmc LIBS env. var. This has been fixed in the previous patch.
> 
> So, for rpi-userland package, BUILD_SHARED_LIBS does no longer need to
> be forced to OFF, and can safely be driven by the CMake infrastructure.
> 
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
> Cc: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
> changes v5 -> v6:
> - rebase
> 
> changes v4 -> v5:
> - rebase
> - extend commit log (ThomasP)
> 
> changes v3 -> v4:
> - rebase
> 
> changes v2 -> v3:
> - new patch
> ---
>  package/rpi-userland/rpi-userland.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk
> index 8b225ba..2de6b92 100644
> --- a/package/rpi-userland/rpi-userland.mk
> +++ b/package/rpi-userland/rpi-userland.mk
> @@ -9,7 +9,7 @@ RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION))
>  RPI_USERLAND_LICENSE = BSD-3c
>  RPI_USERLAND_LICENSE_FILES = LICENCE
>  RPI_USERLAND_INSTALL_STAGING = YES
> -RPI_USERLAND_CONF_OPT = -DVMCS_INSTALL_PREFIX=/usr -DBUILD_SHARED_LIBS=OFF
> +RPI_USERLAND_CONF_OPT = -DVMCS_INSTALL_PREFIX=/usr
>  
>  RPI_USERLAND_PROVIDES = libegl libgles libopenmax libopenvg
>  
> -- 
> 2.0.0
> 

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH v6 2/4] xbmc: fix missing libraries from rpi-userland

[Maxime Hadjinlian]

Hi all,

Tested-by: "Maxime Hadjinlian" <maxime.hadjinlian@gmail.com>

On Thu, Jun 5, 2014 at 9:27 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> Samuel, All,
>
> On 2014-06-05 01:04 +0200, Samuel Martin spake thusly:
>> When rpi-userland libraries are built as shared-objects, not all needed
>> libraries are passed in the LD_FLAGS, leading to failure at linkage.
>>
>> To avoid this issue, set the LIBS variable content in accordance with the
>> INCLUDES variable value.
>>
>> The commit 5e3b1f31b3f82e3b163567f10d7131c9d649a2cf currently works
>> around this issue by forcing rpi-userland to be statically linked,
>> whereas it is actually a LIBS flags problem in xbmc package.
>>
>> A follow-up patch fixes rpi-userland package.
>>
>> Reported-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
>> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
>> Cc: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
>> Cc: "Yann E. MORIN" <yann.morin.1998@free.fr>
>
> Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
>
> Regards,
> Yann E. MORIN.
>
>> ---
>> changes v5 -> v6:
>> - rebase
>>
>> changes v4 -> v5:
>> - rebase
>> - extend commit message
>>
>> changes v3 -> v4:
>> - rebase
>>
>> changes v2 -> v3:
>> - new patch
>> ---
>>  package/xbmc/xbmc.mk | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/package/xbmc/xbmc.mk b/package/xbmc/xbmc.mk
>> index c7a4607..8c0146e 100644
>> --- a/package/xbmc/xbmc.mk
>> +++ b/package/xbmc/xbmc.mk
>> @@ -53,7 +53,8 @@ ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
>>  XBMC_DEPENDENCIES += rpi-userland
>>  XBMC_CONF_OPT += --with-platform=raspberry-pi --enable-player=omxplayer
>>  XBMC_CONF_ENV += INCLUDES="-I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \
>> -     -I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux"
>> +     -I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux" \
>> +     LIBS="-lvcos -lvchostif"
>>  endif
>>
>>  ifeq ($(BR2_PACKAGE_DBUS),y)
>> --
>> 2.0.0
>>
>
> --
> .-----------------.--------------------.------------------.--------------------.
> |  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> | +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
> | +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
> '------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH v6 4/4] rpi-userland: cleanup *_CONF_OPT

[Maxime Hadjinlian]

Hi all,

Tested-by: "Maxime Hadjinlian" <maxime.hadjinlian@gmail.com>

On Thu, Jun 5, 2014 at 9:28 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> Samuel, All,
>
> On 2014-06-05 01:04 +0200, Samuel Martin spake thusly:
>> This change reverts the commit 5e3b1f31b3f82e3b163567f10d7131c9d649a2cf
>> because rpi-userland is correctly built whatever the value of the
>> BUILD_SHARED_LIBS CMake flags.
>>
>> The cset 5e3b1f31b3f82e3b163567f10d7131c9d649a2cf originally intends to
>> fix linkage/runtime failure in xbmc package because of missing flags in
>> xbmc LIBS env. var. This has been fixed in the previous patch.
>>
>> So, for rpi-userland package, BUILD_SHARED_LIBS does no longer need to
>> be forced to OFF, and can safely be driven by the CMake infrastructure.
>>
>> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
>> Cc: "Yann E. MORIN" <yann.morin.1998@free.fr>
>> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
>
> Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
>
> Regards,
> Yann E. MORIN.
>
>> ---
>> changes v5 -> v6:
>> - rebase
>>
>> changes v4 -> v5:
>> - rebase
>> - extend commit log (ThomasP)
>>
>> changes v3 -> v4:
>> - rebase
>>
>> changes v2 -> v3:
>> - new patch
>> ---
>>  package/rpi-userland/rpi-userland.mk | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk
>> index 8b225ba..2de6b92 100644
>> --- a/package/rpi-userland/rpi-userland.mk
>> +++ b/package/rpi-userland/rpi-userland.mk
>> @@ -9,7 +9,7 @@ RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION))
>>  RPI_USERLAND_LICENSE = BSD-3c
>>  RPI_USERLAND_LICENSE_FILES = LICENCE
>>  RPI_USERLAND_INSTALL_STAGING = YES
>> -RPI_USERLAND_CONF_OPT = -DVMCS_INSTALL_PREFIX=/usr -DBUILD_SHARED_LIBS=OFF
>> +RPI_USERLAND_CONF_OPT = -DVMCS_INSTALL_PREFIX=/usr
>>
>>  RPI_USERLAND_PROVIDES = libegl libgles libopenmax libopenvg
>>
>> --
>> 2.0.0
>>
>
> --
> .-----------------.--------------------.------------------.--------------------.
> |  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> | +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
> | +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
> '------------------------------^-------^------------------^--------------------'
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

[Buildroot] [PATCH v6 3/4] rpi-userland: add patch fix missing libvcilcs install rules

[Maxime Hadjinlian]

Hi all,

Tested-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>

On Thu, Jun 5, 2014 at 9:27 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> Samuel, All,
>
> On 2014-06-05 01:04 +0200, Samuel Martin spake thusly:
>> This change adds a patch fix the missing install rules for libvcilcs.
>>
>> This is a pre-requisite to be able to build the shared libraries of the
>> rpi-userland package, and most importantly avoid linkage failure (at
>> link-time and/or runtime) in others libraries that link with it.
>>
>> Reported-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
>> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
>> Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
>
> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
>
> Regards,
> Yann E. MORIN.
>
>> ---
>> changes v5 -> v6:
>> - new patch
>> ---
>>  ...vmcs_host-add-install-rules-for-libvcilcs.patch | 23 ++++++++++++++++++++++
>>  1 file changed, 23 insertions(+)
>>  create mode 100644 package/rpi-userland/rpi-userland-003-interface-vmcs_host-add-install-rules-for-libvcilcs.patch
>>
>> diff --git a/package/rpi-userland/rpi-userland-003-interface-vmcs_host-add-install-rules-for-libvcilcs.patch b/package/rpi-userland/rpi-userland-003-interface-vmcs_host-add-install-rules-for-libvcilcs.patch
>> new file mode 100644
>> index 0000000..05cf4b3
>> --- /dev/null
>> +++ b/package/rpi-userland/rpi-userland-003-interface-vmcs_host-add-install-rules-for-libvcilcs.patch
>> @@ -0,0 +1,23 @@
>> +From b60398837ddf39d4b605600abc167d4366e454a6 Mon Sep 17 00:00:00 2001
>> +From: Samuel Martin <s.martin49@gmail.com>
>> +Date: Thu, 5 Jun 2014 00:06:08 +0200
>> +Subject: [PATCH] interface/vmcs_host: add install rules for libvcilcs
>> +
>> +Signed-off-by: Samuel Martin <s.martin49@gmail.com>
>> +---
>> + interface/vmcs_host/CMakeLists.txt | 1 +
>> + 1 file changed, 1 insertion(+)
>> +
>> +diff --git a/interface/vmcs_host/CMakeLists.txt b/interface/vmcs_host/CMakeLists.txt
>> +index 64ba2f8..8510f81 100755
>> +--- a/interface/vmcs_host/CMakeLists.txt
>> ++++ b/interface/vmcs_host/CMakeLists.txt
>> +@@ -33,4 +33,5 @@ target_link_libraries(vchostif vchiq_arm vcos vcfiled_check)
>> +
>> + add_subdirectory(linux/vcfiled)
>> + install(TARGETS vchostif DESTINATION lib)
>> ++install(TARGETS vcilcs DESTINATION lib)
>> +
>> +--
>> +2.0.0
>> +
>> --
>> 2.0.0
>>
>> _______________________________________________
>> buildroot mailing list
>> buildroot at busybox.net
>> http://lists.busybox.net/mailman/listinfo/buildroot
>
> --
> .-----------------.--------------------.------------------.--------------------.
> |  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> | +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
> | +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
> '------------------------------^-------^------------------^--------------------'
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

[Buildroot] [PATCH v6 1/4] package/libcec: fix missing libraries from rpi-userland

[Maxime Hadjinlian]

Hi all,

This time on the right patch :)

Tested-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>

On Thu, Jun 5, 2014 at 1:04 AM, Samuel Martin <s.martin49@gmail.com> wrote:
> From: "Yann E. MORIN" <yann.morin.1998@free.fr>
>
> When rpi-userland libraries are built as shared-objects, not all needed
> libraries are passed in the LD_FLAGS, leading to failure at linkage.
>
> To avoid this issue, set the LIBS variable content in accordance with
> INCLUDES variable value.
>
> This is needed because libcec does not use pkg-config to look for the
> ldflags needed for -lbcm_host, even though bcm_host provides a .pc
> file (even a correct one!)
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: Samuel Martin <s.martin49@gmail.com>
> ---
>  package/libcec/libcec.mk | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/package/libcec/libcec.mk b/package/libcec/libcec.mk
> index 0aabb06..ad919fc 100644
> --- a/package/libcec/libcec.mk
> +++ b/package/libcec/libcec.mk
> @@ -26,6 +26,7 @@ ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
>  LIBCEC_CONF_OPT = --enable-rpi \
>     --with-rpi-include-path=$(STAGING_DIR)/usr/include
>  LIBCEC_DEPENDENCIES += rpi-userland
> +LIBCEC_CONF_ENV += LIBS="-lvcos -lvchostif"
>  else
>  LIBCEC_CONF_OPT = --disable-rpi
>  endif
> --
> 2.0.0
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

[Buildroot] [PATCH v6 4/4] rpi-userland: cleanup *_CONF_OPT

[Yann E. MORIN]

Samuel, All,

On 2014-06-05 01:04 +0200, Samuel Martin spake thusly:
> This change reverts the commit 5e3b1f31b3f82e3b163567f10d7131c9d649a2cf
> because rpi-userland is correctly built whatever the value of the
> BUILD_SHARED_LIBS CMake flags.
> 
> The cset 5e3b1f31b3f82e3b163567f10d7131c9d649a2cf originally intends to
> fix linkage/runtime failure in xbmc package because of missing flags in
> xbmc LIBS env. var. This has been fixed in the previous patch.
> 
> So, for rpi-userland package, BUILD_SHARED_LIBS does no longer need to
> be forced to OFF, and can safely be driven by the CMake infrastructure.

Fixes:
    http://autobuild.buildroot.net/results/6f3/6f36ad6a78d9c0e204d617ec6d15e7b577542c28/
    http://autobuild.buildroot.net/results/789/789fd88c66f898d0a2fd22acc27e9378dd4147af/
    http://autobuild.buildroot.net/results/588/58823900673d4b5304255c1c08ad529c262dd1ee/

Regards,
Yann E. MORIN.

> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
> Cc: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> 
> ---
> changes v5 -> v6:
> - rebase
> 
> changes v4 -> v5:
> - rebase
> - extend commit log (ThomasP)
> 
> changes v3 -> v4:
> - rebase
> 
> changes v2 -> v3:
> - new patch
> ---
>  package/rpi-userland/rpi-userland.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk
> index 8b225ba..2de6b92 100644
> --- a/package/rpi-userland/rpi-userland.mk
> +++ b/package/rpi-userland/rpi-userland.mk
> @@ -9,7 +9,7 @@ RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION))
>  RPI_USERLAND_LICENSE = BSD-3c
>  RPI_USERLAND_LICENSE_FILES = LICENCE
>  RPI_USERLAND_INSTALL_STAGING = YES
> -RPI_USERLAND_CONF_OPT = -DVMCS_INSTALL_PREFIX=/usr -DBUILD_SHARED_LIBS=OFF
> +RPI_USERLAND_CONF_OPT = -DVMCS_INSTALL_PREFIX=/usr
>  
>  RPI_USERLAND_PROVIDES = libegl libgles libopenmax libopenvg
>  
> -- 
> 2.0.0
> 

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH v6 0/4] rpi-userland/xbmc fixes

[Thomas Petazzoni]

Dear Samuel Martin,

On Thu,  5 Jun 2014 01:04:09 +0200, Samuel Martin wrote:

> Samuel Martin (3):
>   xbmc: fix missing libraries from rpi-userland
>   rpi-userland: add patch fix missing libvcilcs install rules
>   rpi-userland: cleanup *_CONF_OPT
> 
> Yann E. MORIN (1):
>   package/libcec: fix missing libraries from rpi-userland

Series applied, thanks.

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