Patchwork [PATCHv3,2/3] Add proprietary libraries for Hantro x170 HW decoding

login
register
mail settings
Submitter Alexandre Belloni
Date June 11, 2013, 10:18 a.m.
Message ID <1370945921-23444-2-git-send-email-alexandre.belloni@free-electrons.com>
Download mbox | patch
Permalink /patch/250523/
State Accepted
Headers show

Comments

Alexandre Belloni - June 11, 2013, 10:18 a.m.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 package/multimedia/Config.in                      |  1 +
 package/multimedia/on2-8170-libs/Config.in        | 12 ++++++++++++
 package/multimedia/on2-8170-libs/on2-8170-libs.mk | 24 +++++++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 100644 package/multimedia/on2-8170-libs/Config.in
 create mode 100644 package/multimedia/on2-8170-libs/on2-8170-libs.mk
Peter Korsgaard - June 15, 2013, 9:14 p.m.
>>>>> "Alexandre" == Alexandre Belloni <alexandre.belloni@free-electrons.com> writes:

 Alexandre> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
 Alexandre> ---
 Alexandre>  package/multimedia/Config.in                      |  1 +
 Alexandre>  package/multimedia/on2-8170-libs/Config.in        | 12 ++++++++++++
 Alexandre>  package/multimedia/on2-8170-libs/on2-8170-libs.mk | 24 +++++++++++++++++++++++
 Alexandre>  3 files changed, 37 insertions(+)
 Alexandre>  create mode 100644 package/multimedia/on2-8170-libs/Config.in
 Alexandre>  create mode 100644 package/multimedia/on2-8170-libs/on2-8170-libs.mk

 Alexandre> diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
 Alexandre> index dd74863..4cb81bf 100644
 Alexandre> --- a/package/multimedia/Config.in
 Alexandre> +++ b/package/multimedia/Config.in
 Alexandre> @@ -21,6 +21,7 @@ source "package/multimedia/mpd/Config.in"
 Alexandre>  source "package/multimedia/mpg123/Config.in"
 Alexandre>  source "package/multimedia/mplayer/Config.in"
 Alexandre>  source "package/multimedia/musepack/Config.in"
 Alexandre> +source "package/multimedia/on2-8170-libs/Config.in"
 Alexandre>  source "package/opus-tools/Config.in"
 Alexandre>  source "package/multimedia/pulseaudio/Config.in"
 Alexandre>  source "package/multimedia/tidsp-binaries/Config.in"
 Alexandre> diff --git a/package/multimedia/on2-8170-libs/Config.in b/package/multimedia/on2-8170-libs/Config.in
 Alexandre> new file mode 100644
 Alexandre> index 0000000..09ed808
 Alexandre> --- /dev/null
 Alexandre> +++ b/package/multimedia/on2-8170-libs/Config.in
 Alexandre> @@ -0,0 +1,12 @@
 Alexandre> +config BR2_PACKAGE_ON2_8170_LIBS
 Alexandre> +	#This is a binary only package which has been compiled for glibc
 Alexandre> +	depends on BR2_arm926t
 Alexandre> +	depends on (BR2_TOOLCHAIN_EXTERNAL_GLIBC || \
 Alexandre> +		BR2_TOOLCHAIN_CTNG_eglibc || \
 Alexandre> +		BR2_TOOLCHAIN_CTNG_glibc)
 Alexandre> +	bool "on2-8170-libs"

Presumably this doesn't do much without the kernel modules, so I changed
this to select on2-8170-modules.

 Alexandre> +	help
 Alexandre> +	  Libraries for Hantro X170 video decoder
 Alexandre> +
 Alexandre> +	  http://www.at91.com/linux4sam/bin/view/Linux4SAM/SAM9M10Gstreamer
 Alexandre> +
 Alexandre> diff --git a/package/multimedia/on2-8170-libs/on2-8170-libs.mk b/package/multimedia/on2-8170-libs/on2-8170-libs.mk
 Alexandre> new file mode 100644
 Alexandre> index 0000000..e04551d
 Alexandre> --- /dev/null
 Alexandre> +++ b/package/multimedia/on2-8170-libs/on2-8170-libs.mk
 Alexandre> @@ -0,0 +1,24 @@
 Alexandre> +################################################################################
 Alexandre> +#
 Alexandre> +# on2-8170-libs
 Alexandre> +#
 Alexandre> +################################################################################
 Alexandre> +
 Alexandre> +ON2_8170_LIBS_VERSION = 1.0
 Alexandre> +ON2_8170_LIBS_SITE = ftp://ftp.linux4sam.org/pub/demo/linux4sam_1.9/codec/
 Alexandre> +
 Alexandre> +ON2_8170_LICENSE = PROPRIETARY
 Alexandre> +# No license file is included in the archive
 Alexandre> +
 Alexandre> +ON2_8170_LIBS_INSTALL_STAGING = YES
 Alexandre> +
 Alexandre> +define ON2_8170_LIBS_INSTALL_STAGING_CMDS

To ensure the destination directories exists I've added mkdir -p's for
those.

Committed with that fixed.
Alexandre Belloni - June 15, 2013, 10:18 p.m.
Dear Peter,


On 15/06/2013 23:14, Peter Korsgaard wrote:
>  Alexandre> diff --git a/package/multimedia/on2-8170-libs/Config.in b/package/multimedia/on2-8170-libs/Config.in
>  Alexandre> new file mode 100644
>  Alexandre> index 0000000..09ed808
>  Alexandre> --- /dev/null
>  Alexandre> +++ b/package/multimedia/on2-8170-libs/Config.in
>  Alexandre> @@ -0,0 +1,12 @@
>  Alexandre> +config BR2_PACKAGE_ON2_8170_LIBS
>  Alexandre> +	#This is a binary only package which has been compiled for glibc
>  Alexandre> +	depends on BR2_arm926t
>  Alexandre> +	depends on (BR2_TOOLCHAIN_EXTERNAL_GLIBC || \
>  Alexandre> +		BR2_TOOLCHAIN_CTNG_eglibc || \
>  Alexandre> +		BR2_TOOLCHAIN_CTNG_glibc)
>  Alexandre> +	bool "on2-8170-libs"
>
> Presumably this doesn't do much without the kernel modules, so I changed
> this to select on2-8170-modules.

Hum, Is that really a good idea ? I can imagine people building their
kernel out of buildroot and then not being able to select on2-8170-libs.
Peter Korsgaard - June 16, 2013, 7:47 a.m.
>>>>> "Alexandre" == Alexandre Belloni <alexandre.belloni@free-electrons.com> writes:

Hi,

 >> Presumably this doesn't do much without the kernel modules, so I changed
 >> this to select on2-8170-modules.

 Alexandre> Hum, Is that really a good idea ? I can imagine people
 Alexandre> building their kernel out of buildroot and then not being
 Alexandre> able to select on2-8170-libs.

Well, it's consistent with how we do it for E.G. linux-fusion and the
recently proposed ti-gfx. But if people agree, we could change it to
simply do:

       select BR2_PACKAGE_ON2_8170_MODULES if BR2_LINUX_KERNEL

E.G. you're on your own if you don't build the kernel in buildroot.

Patch

diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index dd74863..4cb81bf 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -21,6 +21,7 @@  source "package/multimedia/mpd/Config.in"
 source "package/multimedia/mpg123/Config.in"
 source "package/multimedia/mplayer/Config.in"
 source "package/multimedia/musepack/Config.in"
+source "package/multimedia/on2-8170-libs/Config.in"
 source "package/opus-tools/Config.in"
 source "package/multimedia/pulseaudio/Config.in"
 source "package/multimedia/tidsp-binaries/Config.in"
diff --git a/package/multimedia/on2-8170-libs/Config.in b/package/multimedia/on2-8170-libs/Config.in
new file mode 100644
index 0000000..09ed808
--- /dev/null
+++ b/package/multimedia/on2-8170-libs/Config.in
@@ -0,0 +1,12 @@ 
+config BR2_PACKAGE_ON2_8170_LIBS
+	#This is a binary only package which has been compiled for glibc
+	depends on BR2_arm926t
+	depends on (BR2_TOOLCHAIN_EXTERNAL_GLIBC || \
+		BR2_TOOLCHAIN_CTNG_eglibc || \
+		BR2_TOOLCHAIN_CTNG_glibc)
+	bool "on2-8170-libs"
+	help
+	  Libraries for Hantro X170 video decoder
+
+	  http://www.at91.com/linux4sam/bin/view/Linux4SAM/SAM9M10Gstreamer
+
diff --git a/package/multimedia/on2-8170-libs/on2-8170-libs.mk b/package/multimedia/on2-8170-libs/on2-8170-libs.mk
new file mode 100644
index 0000000..e04551d
--- /dev/null
+++ b/package/multimedia/on2-8170-libs/on2-8170-libs.mk
@@ -0,0 +1,24 @@ 
+################################################################################
+#
+# on2-8170-libs
+#
+################################################################################
+
+ON2_8170_LIBS_VERSION = 1.0
+ON2_8170_LIBS_SITE = ftp://ftp.linux4sam.org/pub/demo/linux4sam_1.9/codec/
+
+ON2_8170_LICENSE = PROPRIETARY
+# No license file is included in the archive
+
+ON2_8170_LIBS_INSTALL_STAGING = YES
+
+define ON2_8170_LIBS_INSTALL_STAGING_CMDS
+	cp -dpf $(@D)/*.a $(@D)/*.so $(STAGING_DIR)/usr/lib
+	cp -dpf $(@D)/*.h $(STAGING_DIR)/usr/include
+endef
+
+define ON2_8170_LIBS_INSTALL_TARGET_CMDS
+	cp -dpf $(@D)/*.so $(TARGET_DIR)/usr/lib
+endef
+
+$(eval $(generic-package))