Message ID | 1370945921-23444-3-git-send-email-alexandre.belloni@free-electrons.com |
---|---|
State | Accepted |
Headers | show |
>>>>> "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/gst-plugin-x170/Config.in | 14 +++++++++++
Alexandre> .../gst-plugin-x170-01-correct-CFLAGS.patch | 28 ++++++++++++++++++++++
Alexandre> .../multimedia/gst-plugin-x170/gst-plugin-x170.mk | 18 ++++++++++++++
Alexandre> 4 files changed, 61 insertions(+)
Alexandre> create mode 100644 package/multimedia/gst-plugin-x170/Config.in
Alexandre> create mode 100644 package/multimedia/gst-plugin-x170/gst-plugin-x170-01-correct-CFLAGS.patch
Alexandre> create mode 100644 package/multimedia/gst-plugin-x170/gst-plugin-x170.mk
Alexandre> diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
Alexandre> index 4cb81bf..77c0a22 100644
Alexandre> --- a/package/multimedia/Config.in
Alexandre> +++ b/package/multimedia/Config.in
Alexandre> @@ -14,6 +14,7 @@ source "package/multimedia/gst-plugins-base/Config.in"
Alexandre> source "package/multimedia/gst-plugins-good/Config.in"
Alexandre> source "package/multimedia/gst-plugins-bad/Config.in"
Alexandre> source "package/multimedia/gst-plugins-ugly/Config.in"
Alexandre> +source "package/multimedia/gst-plugin-x170/Config.in"
Alexandre> source "package/multimedia/lame/Config.in"
Alexandre> source "package/multimedia/libvpx/Config.in"
Alexandre> source "package/multimedia/madplay/Config.in"
Alexandre> diff --git a/package/multimedia/gst-plugin-x170/Config.in b/package/multimedia/gst-plugin-x170/Config.in
Alexandre> new file mode 100644
Alexandre> index 0000000..0787013
Alexandre> --- /dev/null
Alexandre> +++ b/package/multimedia/gst-plugin-x170/Config.in
Alexandre> @@ -0,0 +1,14 @@
Alexandre> +config BR2_PACKAGE_GST_PLUGIN_X170
Alexandre> + bool "gst-plugin-x170"
Alexandre> + depends on BR2_PACKAGE_GSTREAMER
Alexandre> + depends on BR2_arm926t
Alexandre> + depends on (BR2_TOOLCHAIN_EXTERNAL_GLIBC || \
Alexandre> + BR2_TOOLCHAIN_CTNG_eglibc || \
Alexandre> + BR2_TOOLCHAIN_CTNG_glibc)
Alexandre> + select BR2_PACKAGE_ON2_8170_LIBS
Alexandre> + help
Alexandre> + GStreamer plug-in to use the Hantro X170 video decoder present on
Alexandre> + ATMEL AT91SAM9M10 SoC.
Alexandre> +
Alexandre> + http://www.at91.com/linux4sam/bin/view/Linux4SAM/SAM9M10Gstreamer
Alexandre> +
Dropped this empty line and added a comment where the glibc dependency
comes from and committed, thanks.
diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in index 4cb81bf..77c0a22 100644 --- a/package/multimedia/Config.in +++ b/package/multimedia/Config.in @@ -14,6 +14,7 @@ source "package/multimedia/gst-plugins-base/Config.in" source "package/multimedia/gst-plugins-good/Config.in" source "package/multimedia/gst-plugins-bad/Config.in" source "package/multimedia/gst-plugins-ugly/Config.in" +source "package/multimedia/gst-plugin-x170/Config.in" source "package/multimedia/lame/Config.in" source "package/multimedia/libvpx/Config.in" source "package/multimedia/madplay/Config.in" diff --git a/package/multimedia/gst-plugin-x170/Config.in b/package/multimedia/gst-plugin-x170/Config.in new file mode 100644 index 0000000..0787013 --- /dev/null +++ b/package/multimedia/gst-plugin-x170/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_GST_PLUGIN_X170 + bool "gst-plugin-x170" + depends on BR2_PACKAGE_GSTREAMER + depends on BR2_arm926t + depends on (BR2_TOOLCHAIN_EXTERNAL_GLIBC || \ + BR2_TOOLCHAIN_CTNG_eglibc || \ + BR2_TOOLCHAIN_CTNG_glibc) + select BR2_PACKAGE_ON2_8170_LIBS + help + GStreamer plug-in to use the Hantro X170 video decoder present on + ATMEL AT91SAM9M10 SoC. + + http://www.at91.com/linux4sam/bin/view/Linux4SAM/SAM9M10Gstreamer + diff --git a/package/multimedia/gst-plugin-x170/gst-plugin-x170-01-correct-CFLAGS.patch b/package/multimedia/gst-plugin-x170/gst-plugin-x170-01-correct-CFLAGS.patch new file mode 100644 index 0000000..9c32e46 --- /dev/null +++ b/package/multimedia/gst-plugin-x170/gst-plugin-x170-01-correct-CFLAGS.patch @@ -0,0 +1,28 @@ +The configure script is correctly getting the CFLAGS needed to compile a plugin +for gstreamer and storing them in GST_BASE_CFLAGS but the Makefiles are never +making use of those. + +We actually have to use AM_CPPFLAGS as AM_CFLAGS is used everywhere but on the +real compiling rule... + +Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> +--- + src/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 8cb51d1..6af5d91 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -5,6 +5,8 @@ + ############################################################################## + plugin_LTLIBRARIES = libgstx170.la + ++AM_CPPFLAGS = @GST_BASE_CFLAGS@ ++ + ############################################################################## + # for the next set of variables, rename the prefix if you renamed the .la, # + # e.g. libgstplugin_la_SOURCES => libmysomething_la_SOURCES # +-- +1.8.1.2 + diff --git a/package/multimedia/gst-plugin-x170/gst-plugin-x170.mk b/package/multimedia/gst-plugin-x170/gst-plugin-x170.mk new file mode 100644 index 0000000..a6143ed --- /dev/null +++ b/package/multimedia/gst-plugin-x170/gst-plugin-x170.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# gst-plugins-x170 +# +################################################################################ + +GST_PLUGIN_X170_VERSION = 1.0 +GST_PLUGIN_X170_SITE = ftp://ftp.linux4sam.org/pub/demo/linux4sam_1.9/codec/ + +GST_PLUGIN_X170_LICENSE = BSD-1c +#A license file is included but it is just a placeholder + +# There is no generated configure script in the tarball. +GST_PLUGIN_X170_AUTORECONF = YES +GST_PLUGIN_X170_AUTORECONF_OPT = -Im4/ +GST_PLUGIN_X170_DEPENDENCIES = gstreamer libglib2 on2-8170-libs + +$(eval $(autotools-package))
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> --- package/multimedia/Config.in | 1 + package/multimedia/gst-plugin-x170/Config.in | 14 +++++++++++ .../gst-plugin-x170-01-correct-CFLAGS.patch | 28 ++++++++++++++++++++++ .../multimedia/gst-plugin-x170/gst-plugin-x170.mk | 18 ++++++++++++++ 4 files changed, 61 insertions(+) create mode 100644 package/multimedia/gst-plugin-x170/Config.in create mode 100644 package/multimedia/gst-plugin-x170/gst-plugin-x170-01-correct-CFLAGS.patch create mode 100644 package/multimedia/gst-plugin-x170/gst-plugin-x170.mk