[Buildroot] [PATCH v7] kodi: allow enablement of libamcodec as codec if selected

[Buildroot] [PATCH v7] kodi: allow enablement of libamcodec as codec if selected

[Dagg Stompler]

allow usage of amcodec if kodi is built and libamcodec is selected

Signed-off-by: Dagg Stompler <daggs@gmx.com>
---

v6 -> v7:
 - backport kodi patch from officail tree.
 - fix includes following Thomas's suggestion.

v5 -> v6:
 - simplify patch so it will fit kodi 17 too (Thomas Petazzoni)
 - allow multiple codecs enabled.

v4 -> v5:
 - add description and signed off to the kodi patch. (Thomas Petazzoni).

v3 -> v4:
 - properly define the includes for amcodec when cross compiling.

v2 -> v3:
 - fix change after kodi.mk was changed.

v1 -> v2:
 - fixed mail title and comment

 package/kodi/0012-Fix_includes_in_amcodec.patch | 34 +++++++++++++++++++++++++
 package/kodi/kodi.mk                            | 16 +++++++++---
 2 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100644 package/kodi/0012-Fix_includes_in_amcodec.patch

diff --git a/package/kodi/0012-Fix_includes_in_amcodec.patch b/package/kodi/0012-Fix_includes_in_amcodec.patch
new file mode 100644
index 0000000..4b6dab2
--- /dev/null
+++ b/package/kodi/0012-Fix_includes_in_amcodec.patch
@@ -0,0 +1,34 @@
+commit 4bbb21aa5cee6b2f40759aa8b1bd65246a237f79
+Author: Alex Deryskyba <alex@codesnake.com>
+Date:   Wed May 4 01:38:27 2016 +0200
+
+    [aml] Fix includes in amcodec/codec.h to make them relative
+
+diff --git a/tools/depends/target/libamplayer/libamplayer/include/amcodec/codec.h b/tools/depends/target/libamplayer/libamplayer/include/amcodec/codec.h
+index 187d4d5..632c24e 100644
+--- a/tools/depends/target/libamplayer/libamplayer/include/amcodec/codec.h
++++ b/tools/depends/target/libamplayer/libamplayer/include/amcodec/codec.h
+@@ -12,8 +12,8 @@
+ #ifndef CODEC_CTRL_H_
+ #define CODEC_CTRL_H_
+ 
+-#include <codec_type.h>
+-#include <codec_error.h>
++#include "codec_type.h"
++#include "codec_error.h"
+ 
+ 
+ int codec_init(codec_para_t *);
+diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in b/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in
+index a1a3447..1bf5a89 100644
+--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in
++++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in
+@@ -24,8 +24,6 @@ endif
+ ifeq (@USE_LIBAMCODEC@,1)
+ SRCS += AMLCodec.cpp
+ SRCS += DVDVideoCodecAmlogic.cpp
+-INCLUDES += -I$(prefix)/include/amcodec
+-INCLUDES += -I$(prefix)/include/amplayer
+ endif
+ 
+ ifeq (@USE_ANDROID@,1)
diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk
index e0361da..f9d1a11 100644
--- a/package/kodi/kodi.mk
+++ b/package/kodi/kodi.mk
@@ -96,9 +96,9 @@ endif
 ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
 KODI_DEPENDENCIES += rpi-userland
 KODI_CONF_OPTS += --with-platform=raspberry-pi --enable-player=omxplayer
-KODI_CONF_ENV += INCLUDES="-I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \
-	-I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux" \
-	LIBS="-lvcos -lvchostif"
+-I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \
+-I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux
+KODI_LIBS="-lvcos -lvchostif"
 endif
 
 ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
@@ -113,6 +113,16 @@ KODI_DEPENDENCIES += imx-vpuwrap
 KODI_CONF_OPTS += --enable-codec=imxvpu
 endif
 
+ifeq ($(BR2_PACKAGE_LIBAMCODEC),y)
+KODI_DEPENDENCIES += libamcodec
+KODI_CONF_OPTS += --enable-codec=amcodec
+KODI_INCLUDES += -I$(STAGING_DIR)/usr/include/amcodec
+endif
+
+KODI_CONF_ENV += \
+INCLUDES="$(KODI_INCLUDES)" \
+LIBS="$(KODI_LIBS)"
+
 ifeq ($(BR2_PACKAGE_LIBCAP),y)
 KODI_CONF_OPTS += --enable-libcap
 KODI_DEPENDENCIES += libcap
-- 
2.10.2

[Buildroot] [PATCH v7] kodi: allow enablement of libamcodec as codec if selected

[Thomas Petazzoni]

Hello,

On Wed,  9 Nov 2016 21:07:33 +0200, Dagg Stompler wrote:
> allow usage of amcodec if kodi is built and libamcodec is selected
> 
> Signed-off-by: Dagg Stompler <daggs@gmx.com>

I've applied to next, but it would be really really good if you could
review your own patches before sending them. There was an obvious big
mistake in your patch, see below.


> diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk
> index e0361da..f9d1a11 100644
> --- a/package/kodi/kodi.mk
> +++ b/package/kodi/kodi.mk
> @@ -96,9 +96,9 @@ endif
>  ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
>  KODI_DEPENDENCIES += rpi-userland
>  KODI_CONF_OPTS += --with-platform=raspberry-pi --enable-player=omxplayer
> -KODI_CONF_ENV += INCLUDES="-I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \
> -	-I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux" \
> -	LIBS="-lvcos -lvchostif"
> +-I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \
> +-I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux

How do you expect those two lines to work? You don't even tell make
that this value should be assigned to the KODI_INCLUDES variable.
Clearly you didn't review your patch carefully enough here.

> +KODI_LIBS="-lvcos -lvchostif"

Space before/after the = sign, and double quotes not needed.

> +KODI_CONF_ENV += \
> +INCLUDES="$(KODI_INCLUDES)" \
> +LIBS="$(KODI_LIBS)"

The values should have been indented with on tab.

Applied with those issues fixed. Thanks!

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

[Buildroot] [PATCH v7] kodi: allow enablement of libamcodec as codec if selected

[daggs]

Greetings Thomas,

> Hello,
> 
> On Wed,  9 Nov 2016 21:07:33 +0200, Dagg Stompler wrote:
> > allow usage of amcodec if kodi is built and libamcodec is selected
> > 
> > Signed-off-by: Dagg Stompler <daggs@gmx.com>
> 
> I've applied to next, but it would be really really good if you could
> review your own patches before sending them. There was an obvious big
> mistake in your patch, see below.
I did tested the patch, it worked without any problems.
maybe there was something bad if the diff which I've mis copied.
regardless, I'll pay more attention in the future.

Thanks.

> 
> 
> > diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk
> > index e0361da..f9d1a11 100644
> > --- a/package/kodi/kodi.mk
> > +++ b/package/kodi/kodi.mk
> > @@ -96,9 +96,9 @@ endif
> >  ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
> >  KODI_DEPENDENCIES += rpi-userland
> >  KODI_CONF_OPTS += --with-platform=raspberry-pi --enable-player=omxplayer
> > -KODI_CONF_ENV += INCLUDES="-I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \
> > -	-I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux" \
> > -	LIBS="-lvcos -lvchostif"
> > +-I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \
> > +-I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux
> 
> How do you expect those two lines to work? You don't even tell make
> that this value should be assigned to the KODI_INCLUDES variable.
> Clearly you didn't review your patch carefully enough here.
> 
> > +KODI_LIBS="-lvcos -lvchostif"
> 
> Space before/after the = sign, and double quotes not needed.
> 
> > +KODI_CONF_ENV += \
> > +INCLUDES="$(KODI_INCLUDES)" \
> > +LIBS="$(KODI_LIBS)"
> 
> The values should have been indented with on tab.
> 
> Applied with those issues fixed. Thanks!
> 
> Thomas
> -- 
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux and Kernel engineering
> http://free-electrons.com
>