* [Buildroot] [PATCH 0/5] freescale: update userspace packages
@ 2014-06-19 4:03 Gary Bisson
2014-06-19 4:03 ` [Buildroot] [PATCH 1/5] freescale-imx: bump to version 3.10.17-1.0.0 Gary Bisson
` (5 more replies)
0 siblings, 6 replies; 25+ messages in thread
From: Gary Bisson @ 2014-06-19 4:03 UTC (permalink / raw)
To: buildroot
Yann, all,
All the packages are now updated to their latest stable version. Here is a serie of patches to update them all at once to be in sync.
It is to be noted that the packages version described in the release notes are wrong, therefore I used the versions from the Yocto layer tag 1.6 (daisy):
https://github.com/Freescale/meta-fsl-arm/tree/1.6/recipes-bsp
https://github.com/Freescale/meta-fsl-arm/tree/1.6/recipes-multimedia
https://github.com/Freescale/meta-fsl-arm/tree/1.6/recipes-graphics
Testing has been done on a Nitrogen6x using the kernel patch committed last week.
GPU test (gpu-viv-bin-mx6q):
# cd /usr/share/examples/viv_samples/vdk/
# ./tutorial7
VPU test (libfslvpuwrap, libfslcodec, gst-fsl-plugins, imx-vpu):
# gst-launch-0.10 filesrc location=trailer_1080p_h264_mp3.avi ! avidemux ! vpudec ! mfw_isink
If needed the output of the above tests as well as the video file (big buck bunny) can be provided.
Regards,
Gary
Gary Bisson (5):
freescale-imx: bump to version 3.10.17-1.0.0
libfslvpuwrap: bump to version 1.0.46
libfslcodec: bump to version 3.0.11
libfslparser: bump to version 3.0.11
gst-fsl-plugins: bump to version 3.0.11
package/freescale-imx/Config.in | 1 +
package/freescale-imx/freescale-imx.mk | 2 +-
package/freescale-imx/imx-lib/imx-lib.mk | 26 +-
package/freescale-imx/imx-vpu/Config.in | 53 ++
.../imx-vpu-0001-fix-IOSystemInit-failure.patch | 21 +
package/freescale-imx/imx-vpu/imx-vpu.mk | 57 ++
...gins-0002-Fix-bashism-in-configure-script.patch | 25 +-
.../gst-fsl-plugins-0003-Use-proper-objdump.patch | 6 +-
...sl-linkage-add-lrt-for-shared-memory-func.patch | 2 +-
...-plugins-0005-build-Fix-out-of-tree-build.patch | 616 +++++++++++++++++++++
.../gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk | 13 +-
package/libfslcodec/libfslcodec.mk | 2 +-
package/libfslparser/libfslparser.mk | 2 +-
package/libfslvpuwrap/Config.in | 2 +-
package/libfslvpuwrap/libfslvpuwrap.mk | 4 +-
15 files changed, 777 insertions(+), 55 deletions(-)
create mode 100644 package/freescale-imx/imx-vpu/Config.in
create mode 100644 package/freescale-imx/imx-vpu/imx-vpu-0001-fix-IOSystemInit-failure.patch
create mode 100644 package/freescale-imx/imx-vpu/imx-vpu.mk
create mode 100644 package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0005-build-Fix-out-of-tree-build.patch
--
2.0.0
^ permalink raw reply [flat|nested] 25+ messages in thread* [Buildroot] [PATCH 1/5] freescale-imx: bump to version 3.10.17-1.0.0 2014-06-19 4:03 [Buildroot] [PATCH 0/5] freescale: update userspace packages Gary Bisson @ 2014-06-19 4:03 ` Gary Bisson 2014-06-19 16:20 ` Yann E. MORIN 2014-06-19 4:03 ` [Buildroot] [PATCH 2/5] libfslvpuwrap: bump to version 1.0.46 Gary Bisson ` (4 subsequent siblings) 5 siblings, 1 reply; 25+ messages in thread From: Gary Bisson @ 2014-06-19 4:03 UTC (permalink / raw) To: buildroot Signed-off-by: Gary Bisson <bisson.gary@gmail.com> --- package/freescale-imx/Config.in | 1 + package/freescale-imx/freescale-imx.mk | 2 +- package/freescale-imx/imx-lib/imx-lib.mk | 26 ++-------- package/freescale-imx/imx-vpu/Config.in | 53 ++++++++++++++++++++ .../imx-vpu-0001-fix-IOSystemInit-failure.patch | 21 ++++++++ package/freescale-imx/imx-vpu/imx-vpu.mk | 57 ++++++++++++++++++++++ 6 files changed, 138 insertions(+), 22 deletions(-) create mode 100644 package/freescale-imx/imx-vpu/Config.in create mode 100644 package/freescale-imx/imx-vpu/imx-vpu-0001-fix-IOSystemInit-failure.patch create mode 100644 package/freescale-imx/imx-vpu/imx-vpu.mk diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in index 7c22f79..0b3af89 100644 --- a/package/freescale-imx/Config.in +++ b/package/freescale-imx/Config.in @@ -2,6 +2,7 @@ menu "Freescale i.MX libraries" depends on BR2_arm source "package/freescale-imx/imx-lib/Config.in" +source "package/freescale-imx/imx-vpu/Config.in" source "package/freescale-imx/firmware-imx/Config.in" source "package/freescale-imx/gpu-viv-bin-mx6q/Config.in" diff --git a/package/freescale-imx/freescale-imx.mk b/package/freescale-imx/freescale-imx.mk index 39ffa8a..843ba61 100644 --- a/package/freescale-imx/freescale-imx.mk +++ b/package/freescale-imx/freescale-imx.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREESCALE_IMX_VERSION = 3.5.7-1.0.0 +FREESCALE_IMX_VERSION = 3.10.17-1.0.0 FREESCALE_IMX_SITE = http://www.freescale.com/lgfiles/NMG/MAD/YOCTO/ include $(sort $(wildcard package/freescale-imx/*/*.mk)) diff --git a/package/freescale-imx/imx-lib/imx-lib.mk b/package/freescale-imx/imx-lib/imx-lib.mk index 4f605d7..253ed31 100644 --- a/package/freescale-imx/imx-lib/imx-lib.mk +++ b/package/freescale-imx/imx-lib/imx-lib.mk @@ -6,18 +6,19 @@ IMX_LIB_VERSION = $(FREESCALE_IMX_VERSION) IMX_LIB_SITE = $(FREESCALE_IMX_SITE) -IMX_LIB_LICENSE = Freescale License (vpu), LGPLv2.1+ (the rest) +IMX_LIB_LICENSE = LGPLv2.1+ IMX_LIB_LICENSE_FILES = EULA -IMX_LIB_SOURCE = imx-lib-$(IMX_LIB_VERSION).bin +IMX_LIB_SOURCE = imx-lib-$(IMX_LIB_VERSION).tar.gz IMX_LIB_INSTALL_STAGING = YES # imx-lib needs access to imx-specific kernel headers IMX_LIB_DEPENDENCIES += linux IMX_LIB_INCLUDE = \ + -I$(LINUX_DIR)/include/uapi \ + -I$(LINUX_DIR)/include \ -I$(LINUX_DIR)/drivers/mxc/security/rng/include \ - -I$(LINUX_DIR)/drivers/mxc/security/sahara2/include \ - -idirafter $(LINUX_DIR)/include + -I$(LINUX_DIR)/drivers/mxc/security/sahara2/include IMX_LIB_MAKE_ENV = \ $(TARGET_MAKE_ENV) \ @@ -26,23 +27,6 @@ IMX_LIB_MAKE_ENV = \ PLATFORM=$(BR2_PACKAGE_IMX_LIB_PLATFORM) \ INCLUDE="$(IMX_LIB_INCLUDE)" -# The archive is a shell-self-extractor of a bzipped tar. It happens -# to extract in the correct directory (imx-lib-x.y.z) -# The --force makes sure it doesn't fail if the source dir already exists. -# The --auto-accept skips the license check - not needed for us -# because we have legal-info -# Since there's a EULA in the bin file, extract it to imx-lib-x.y.z/EULA -# -define IMX_LIB_EXTRACT_CMDS - awk 'BEGIN { start=0; } \ - /^EOEULA/ { start = 0; } \ - { if (start) print; } \ - /<<EOEULA/ { start=1; }'\ - $(DL_DIR)/$(IMX_LIB_SOURCE) > $(@D)/EULA - cd $(BUILD_DIR); \ - sh $(DL_DIR)/$(IMX_LIB_SOURCE) --force --auto-accept -endef - define IMX_LIB_BUILD_CMDS $(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D) endef diff --git a/package/freescale-imx/imx-vpu/Config.in b/package/freescale-imx/imx-vpu/Config.in new file mode 100644 index 0000000..e3e5823 --- /dev/null +++ b/package/freescale-imx/imx-vpu/Config.in @@ -0,0 +1,53 @@ +comment "imx-vpu needs an imx-specific Linux kernel to be built" + depends on BR2_arm && !BR2_LINUX_KERNEL + +config BR2_PACKAGE_IMX_VPU + bool "imx-vpu" + depends on BR2_LINUX_KERNEL + depends on BR2_arm # Only relevant for i.MX + help + Library of userspace helpers specific for the Freescale i.MX + platform. It wraps the kernel interfaces for the i.MX platform + Video Processing Unit (VPU) driver. It requires a kernel that + includes the i.MX specific headers to be built. + + This library is provided by Freescale as-is and doesn't have + an upstream. + +if BR2_PACKAGE_IMX_VPU +choice + prompt "i.MX platform" + +config BR2_PACKAGE_IMX_VPU_PLATFORM_IMX25_3STACK + bool "imx25-3stack" + +config BR2_PACKAGE_IMX_VPU_PLATFORM_IMX27ADS + bool "imx27ads" + +config BR2_PACKAGE_IMX_VPU_PLATFORM_IMX37_3STACK + bool "imx37-3stack" + +config BR2_PACKAGE_IMX_VPU_PLATFORM_IMX50 + bool "imx50" + +config BR2_PACKAGE_IMX_VPU_PLATFORM_IMX51 + bool "imx51" + +config BR2_PACKAGE_IMX_VPU_PLATFORM_IMX53 + bool "imx53" + +config BR2_PACKAGE_IMX_VPU_PLATFORM_IMX6Q + bool "imx6q" + +endchoice + +config BR2_PACKAGE_IMX_VPU_PLATFORM + string + default "IMX25_3STACK" if BR2_PACKAGE_IMX_VPU_PLATFORM_IMX25_3STACK + default "IMX27ADS" if BR2_PACKAGE_IMX_VPU_PLATFORM_IMX27ADS + default "IMX37_3STACK" if BR2_PACKAGE_IMX_VPU_PLATFORM_IMX37_3STACK + default "IMX50" if BR2_PACKAGE_IMX_VPU_PLATFORM_IMX50 + default "IMX51" if BR2_PACKAGE_IMX_VPU_PLATFORM_IMX51 + default "IMX53" if BR2_PACKAGE_IMX_VPU_PLATFORM_IMX53 + default "IMX6Q" if BR2_PACKAGE_IMX_VPU_PLATFORM_IMX6Q +endif diff --git a/package/freescale-imx/imx-vpu/imx-vpu-0001-fix-IOSystemInit-failure.patch b/package/freescale-imx/imx-vpu/imx-vpu-0001-fix-IOSystemInit-failure.patch new file mode 100644 index 0000000..b73a959 --- /dev/null +++ b/package/freescale-imx/imx-vpu/imx-vpu-0001-fix-IOSystemInit-failure.patch @@ -0,0 +1,21 @@ +[PATCH] fix IOSystemInit failure + +Signed-off-by: Gary Bisson <bisson.gary@gmail.com> +--- + vpu/vpu_io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/vpu/vpu_io.c b/vpu/vpu_io.c +index 8cbb571..14759da 100644 +--- a/vpu/vpu_io.c ++++ b/vpu/vpu_io.c +@@ -265,7 +265,7 @@ int IOSystemInit(void *callback) + goto err; + } + +- if (IOGetVirtMem(&bit_work_addr) <= 0) ++ if (IOGetVirtMem(&bit_work_addr) == -1) + goto err; + #endif + UnlockVpu(vpu_semap); + diff --git a/package/freescale-imx/imx-vpu/imx-vpu.mk b/package/freescale-imx/imx-vpu/imx-vpu.mk new file mode 100644 index 0000000..fb72203 --- /dev/null +++ b/package/freescale-imx/imx-vpu/imx-vpu.mk @@ -0,0 +1,57 @@ +################################################################################ +# +# imx-vpu +# +################################################################################ + +IMX_VPU_VERSION = $(FREESCALE_IMX_VERSION) +IMX_VPU_SITE = $(FREESCALE_IMX_SITE) +IMX_VPU_LICENSE = Freescale License +IMX_VPU_LICENSE_FILES = EULA +IMX_VPU_SOURCE = imx-vpu-$(IMX_VPU_VERSION).bin + +IMX_VPU_INSTALL_STAGING = YES + +# imx-vpu needs access to imx-specific kernel headers +IMX_VPU_DEPENDENCIES += linux +IMX_VPU_INCLUDE = \ + -I$(LINUX_DIR)/include/uapi \ + -I$(LINUX_DIR)/include + +IMX_VPU_MAKE_ENV = \ + $(TARGET_MAKE_ENV) \ + $(TARGET_CONFIGURE_OPTS) \ + CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)" \ + PLATFORM=$(BR2_PACKAGE_IMX_VPU_PLATFORM) \ + INCLUDE="$(IMX_VPU_INCLUDE)" + +# The archive is a shell-self-extractor of a bzipped tar. It happens +# to extract in the correct directory (imx-vpu-x.y.z) +# The --force makes sure it doesn't fail if the source dir already exists. +# The --auto-accept skips the license check - not needed for us +# because we have legal-info +# Since there's a EULA in the bin file, extract it to imx-vpu-x.y.z/EULA +# +define IMX_VPU_EXTRACT_CMDS + awk 'BEGIN { start=0; } \ + /^EOEULA/ { start = 0; } \ + { if (start) print; } \ + /<<EOEULA/ { start=1; }'\ + $(DL_DIR)/$(IMX_VPU_SOURCE) > $(@D)/EULA + cd $(BUILD_DIR); \ + sh $(DL_DIR)/$(IMX_VPU_SOURCE) --force --auto-accept +endef + +define IMX_VPU_BUILD_CMDS + $(IMX_VPU_MAKE_ENV) $(MAKE1) -C $(@D) +endef + +define IMX_VPU_INSTALL_STAGING_CMDS + $(IMX_VPU_MAKE_ENV) $(MAKE1) -C $(@D) DEST_DIR=$(STAGING_DIR) install +endef + +define IMX_VPU_INSTALL_TARGET_CMDS + $(IMX_VPU_MAKE_ENV) $(MAKE1) -C $(@D) DEST_DIR=$(TARGET_DIR) install +endef + +$(eval $(generic-package)) -- 2.0.0 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 1/5] freescale-imx: bump to version 3.10.17-1.0.0 2014-06-19 4:03 ` [Buildroot] [PATCH 1/5] freescale-imx: bump to version 3.10.17-1.0.0 Gary Bisson @ 2014-06-19 16:20 ` Yann E. MORIN 2014-06-20 2:40 ` Gary Bisson 0 siblings, 1 reply; 25+ messages in thread From: Yann E. MORIN @ 2014-06-19 16:20 UTC (permalink / raw) To: buildroot Gary, All, On 2014-06-18 21:03 -0700, Gary Bisson spake thusly: > Signed-off-by: Gary Bisson <bisson.gary@gmail.com> Please, provide a detailed commit log. This patch does more than 'just' bumping the version, since it: - bumps the version, - adds a new package (imx-vpu), - changes the build commands of imx-libs, - breaks libfslvpuwrap as it changed versionning scheme. I have a few comments for each parts, see below. I'm a bit sceptic as to whether we should introduce imx-vpu in this patch, or introduce it with its own patch... Peter, what's your opinion? > diff --git a/package/freescale-imx/freescale-imx.mk b/package/freescale-imx/freescale-imx.mk > index 39ffa8a..843ba61 100644 > --- a/package/freescale-imx/freescale-imx.mk > +++ b/package/freescale-imx/freescale-imx.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -FREESCALE_IMX_VERSION = 3.5.7-1.0.0 > +FREESCALE_IMX_VERSION = 3.10.17-1.0.0 This change breaks libfslvpuwrap, because it does not exist in this new version. I think it would be better to bump libfslvpywrap before this bump, or at least: 1- change libfslvpuwrap to use its own version string (3.5.7-1.0.0) 2- bump the freescale packages (this patch) to 3.10.17-1.0.0 3- bump libfslvpuwrap to its own version number. It might even make sense to do patch 2+3 together... > FREESCALE_IMX_SITE = http://www.freescale.com/lgfiles/NMG/MAD/YOCTO/ > > include $(sort $(wildcard package/freescale-imx/*/*.mk)) > diff --git a/package/freescale-imx/imx-lib/imx-lib.mk b/package/freescale-imx/imx-lib/imx-lib.mk > index 4f605d7..253ed31 100644 > --- a/package/freescale-imx/imx-lib/imx-lib.mk > +++ b/package/freescale-imx/imx-lib/imx-lib.mk > @@ -6,18 +6,19 @@ > > IMX_LIB_VERSION = $(FREESCALE_IMX_VERSION) > IMX_LIB_SITE = $(FREESCALE_IMX_SITE) > -IMX_LIB_LICENSE = Freescale License (vpu), LGPLv2.1+ (the rest) > +IMX_LIB_LICENSE = LGPLv2.1+ > IMX_LIB_LICENSE_FILES = EULA > -IMX_LIB_SOURCE = imx-lib-$(IMX_LIB_VERSION).bin > +IMX_LIB_SOURCE = imx-lib-$(IMX_LIB_VERSION).tar.gz Yeah! They switched! :-) > IMX_LIB_INSTALL_STAGING = YES > > # imx-lib needs access to imx-specific kernel headers > IMX_LIB_DEPENDENCIES += linux > IMX_LIB_INCLUDE = \ > + -I$(LINUX_DIR)/include/uapi \ > + -I$(LINUX_DIR)/include \ > -I$(LINUX_DIR)/drivers/mxc/security/rng/include \ > - -I$(LINUX_DIR)/drivers/mxc/security/sahara2/include \ > - -idirafter $(LINUX_DIR)/include > + -I$(LINUX_DIR)/drivers/mxc/security/sahara2/include This change is dubious. We really do want the include dirs from the kernel to only come _after_ the standard search dirs, hence the existing -idirafter directive. Searching in the kernel dir is ugly, because those are non-sanitised headers, and we do favour headers from the toolchain (which are userland-clean) over those from the kernel tree. Also, I think only using the uapi include dir should be enough. > diff --git a/package/freescale-imx/imx-vpu/Config.in b/package/freescale-imx/imx-vpu/Config.in > new file mode 100644 > index 0000000..e3e5823 > --- /dev/null > +++ b/package/freescale-imx/imx-vpu/Config.in > @@ -0,0 +1,53 @@ > +comment "imx-vpu needs an imx-specific Linux kernel to be built" > + depends on BR2_arm && !BR2_LINUX_KERNEL > + > +config BR2_PACKAGE_IMX_VPU > + bool "imx-vpu" > + depends on BR2_LINUX_KERNEL > + depends on BR2_arm # Only relevant for i.MX > + help > + Library of userspace helpers specific for the Freescale i.MX > + platform. It wraps the kernel interfaces for the i.MX platform > + Video Processing Unit (VPU) driver. It requires a kernel that > + includes the i.MX specific headers to be built. > + > + This library is provided by Freescale as-is and doesn't have > + an upstream. > + > +if BR2_PACKAGE_IMX_VPU > +choice > + prompt "i.MX platform" > + > +config BR2_PACKAGE_IMX_VPU_PLATFORM_IMX25_3STACK > + bool "imx25-3stack" > + > +config BR2_PACKAGE_IMX_VPU_PLATFORM_IMX27ADS > + bool "imx27ads" > + > +config BR2_PACKAGE_IMX_VPU_PLATFORM_IMX37_3STACK > + bool "imx37-3stack" > + > +config BR2_PACKAGE_IMX_VPU_PLATFORM_IMX50 > + bool "imx50" > + > +config BR2_PACKAGE_IMX_VPU_PLATFORM_IMX51 > + bool "imx51" > + > +config BR2_PACKAGE_IMX_VPU_PLATFORM_IMX53 > + bool "imx53" > + > +config BR2_PACKAGE_IMX_VPU_PLATFORM_IMX6Q > + bool "imx6q" > + > +endchoice We already have this choice in the imx-lib package: - if it no longer relevant to imx-lib, just remove it from imx-lib and keep it in imx-vpu - if it is still valide for imx-lib, then we should make it a common choice, valid for both imx-lib and imx-vpu. In the latter case, you'd have to move it into: package/freescale-imx/Config.in Rename options so they are no longer imx-lib specific, and use those new options both in imx-lib and imx-vpu. The new names could be somethng like (for example, with i.MX6Q): BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q Also applies to the following block, of course: > +config BR2_PACKAGE_IMX_VPU_PLATFORM > + string > + default "IMX25_3STACK" if BR2_PACKAGE_IMX_VPU_PLATFORM_IMX25_3STACK > + default "IMX27ADS" if BR2_PACKAGE_IMX_VPU_PLATFORM_IMX27ADS > + default "IMX37_3STACK" if BR2_PACKAGE_IMX_VPU_PLATFORM_IMX37_3STACK > + default "IMX50" if BR2_PACKAGE_IMX_VPU_PLATFORM_IMX50 > + default "IMX51" if BR2_PACKAGE_IMX_VPU_PLATFORM_IMX51 > + default "IMX53" if BR2_PACKAGE_IMX_VPU_PLATFORM_IMX53 > + default "IMX6Q" if BR2_PACKAGE_IMX_VPU_PLATFORM_IMX6Q > +endif > diff --git a/package/freescale-imx/imx-vpu/imx-vpu-0001-fix-IOSystemInit-failure.patch b/package/freescale-imx/imx-vpu/imx-vpu-0001-fix-IOSystemInit-failure.patch > new file mode 100644 > index 0000000..b73a959 > --- /dev/null > +++ b/package/freescale-imx/imx-vpu/imx-vpu-0001-fix-IOSystemInit-failure.patch > @@ -0,0 +1,21 @@ > +[PATCH] fix IOSystemInit failure Please provide a more detailed comit log. Why do we need this? > +Signed-off-by: Gary Bisson <bisson.gary@gmail.com> > +--- > + vpu/vpu_io.c | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/vpu/vpu_io.c b/vpu/vpu_io.c > +index 8cbb571..14759da 100644 > +--- a/vpu/vpu_io.c > ++++ b/vpu/vpu_io.c > +@@ -265,7 +265,7 @@ int IOSystemInit(void *callback) > + goto err; > + } > + > +- if (IOGetVirtMem(&bit_work_addr) <= 0) > ++ if (IOGetVirtMem(&bit_work_addr) == -1) > + goto err; > + #endif > + UnlockVpu(vpu_semap); > + > diff --git a/package/freescale-imx/imx-vpu/imx-vpu.mk b/package/freescale-imx/imx-vpu/imx-vpu.mk > new file mode 100644 > index 0000000..fb72203 > --- /dev/null > +++ b/package/freescale-imx/imx-vpu/imx-vpu.mk > @@ -0,0 +1,57 @@ > +################################################################################ > +# > +# imx-vpu > +# > +################################################################################ > + > +IMX_VPU_VERSION = $(FREESCALE_IMX_VERSION) > +IMX_VPU_SITE = $(FREESCALE_IMX_SITE) > +IMX_VPU_LICENSE = Freescale License > +IMX_VPU_LICENSE_FILES = EULA > +IMX_VPU_SOURCE = imx-vpu-$(IMX_VPU_VERSION).bin > + > +IMX_VPU_INSTALL_STAGING = YES > + > +# imx-vpu needs access to imx-specific kernel headers > +IMX_VPU_DEPENDENCIES += linux > +IMX_VPU_INCLUDE = \ > + -I$(LINUX_DIR)/include/uapi \ > + -I$(LINUX_DIR)/include Again, I believe this should be -idirafter instead of -I . > +IMX_VPU_MAKE_ENV = \ > + $(TARGET_MAKE_ENV) \ > + $(TARGET_CONFIGURE_OPTS) \ > + CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)" \ > + PLATFORM=$(BR2_PACKAGE_IMX_VPU_PLATFORM) \ > + INCLUDE="$(IMX_VPU_INCLUDE)" > + > +# The archive is a shell-self-extractor of a bzipped tar. It happens > +# to extract in the correct directory (imx-vpu-x.y.z) > +# The --force makes sure it doesn't fail if the source dir already exists. > +# The --auto-accept skips the license check - not needed for us > +# because we have legal-info > +# Since there's a EULA in the bin file, extract it to imx-vpu-x.y.z/EULA > +# > +define IMX_VPU_EXTRACT_CMDS > + awk 'BEGIN { start=0; } \ > + /^EOEULA/ { start = 0; } \ > + { if (start) print; } \ > + /<<EOEULA/ { start=1; }'\ > + $(DL_DIR)/$(IMX_VPU_SOURCE) > $(@D)/EULA > + cd $(BUILD_DIR); \ > + sh $(DL_DIR)/$(IMX_VPU_SOURCE) --force --auto-accept > +endef > + > +define IMX_VPU_BUILD_CMDS > + $(IMX_VPU_MAKE_ENV) $(MAKE1) -C $(@D) > +endef > + > +define IMX_VPU_INSTALL_STAGING_CMDS > + $(IMX_VPU_MAKE_ENV) $(MAKE1) -C $(@D) DEST_DIR=$(STAGING_DIR) install > +endef > + > +define IMX_VPU_INSTALL_TARGET_CMDS > + $(IMX_VPU_MAKE_ENV) $(MAKE1) -C $(@D) DEST_DIR=$(TARGET_DIR) install > +endef > + > +$(eval $(generic-package)) Otherwise, looks good. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------' ^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 1/5] freescale-imx: bump to version 3.10.17-1.0.0 2014-06-19 16:20 ` Yann E. MORIN @ 2014-06-20 2:40 ` Gary Bisson 2014-06-20 21:01 ` Yann E. MORIN 0 siblings, 1 reply; 25+ messages in thread From: Gary Bisson @ 2014-06-20 2:40 UTC (permalink / raw) To: buildroot Hi Yann, Thanks for all the feedback! My comments below. On Thu, Jun 19, 2014 at 9:20 AM, Yann E. MORIN <yann.morin.1998@free.fr> wrote: > Gary, All, > > On 2014-06-18 21:03 -0700, Gary Bisson spake thusly: > > Signed-off-by: Gary Bisson <bisson.gary@gmail.com> > > Please, provide a detailed commit log. > > This patch does more than 'just' bumping the version, since it: > - bumps the version, > - adds a new package (imx-vpu), > - changes the build commands of imx-libs, > - breaks libfslvpuwrap as it changed versionning scheme. > Next time I'll try to be more talkative ;-) > > I have a few comments for each parts, see below. > > I'm a bit sceptic as to whether we should introduce imx-vpu in this > patch, or introduce it with its own patch... Peter, what's your opinion? > I almost made it in 2/3 commits, as the new package was implied by the change of version I figured it'd be ok. But it makes sense to separate the bump from the inside packages modifications. > > > diff --git a/package/freescale-imx/freescale-imx.mk > b/package/freescale-imx/freescale-imx.mk > > index 39ffa8a..843ba61 100644 > > --- a/package/freescale-imx/freescale-imx.mk > > +++ b/package/freescale-imx/freescale-imx.mk > > @@ -4,7 +4,7 @@ > > # > > > ################################################################################ > > > > -FREESCALE_IMX_VERSION = 3.5.7-1.0.0 > > +FREESCALE_IMX_VERSION = 3.10.17-1.0.0 > > This change breaks libfslvpuwrap, because it does not exist in this new > version. > > I think it would be better to bump libfslvpywrap before this bump, or at > least: > 1- change libfslvpuwrap to use its own version string (3.5.7-1.0.0) > 2- bump the freescale packages (this patch) to 3.10.17-1.0.0 > 3- bump libfslvpuwrap to its own version number. > > It might even make sense to do patch 2+3 together... > Ok will re-order and separate those commits. > > > FREESCALE_IMX_SITE = http://www.freescale.com/lgfiles/NMG/MAD/YOCTO/ > > > > include $(sort $(wildcard package/freescale-imx/*/*.mk)) > > diff --git a/package/freescale-imx/imx-lib/imx-lib.mk > b/package/freescale-imx/imx-lib/imx-lib.mk > > index 4f605d7..253ed31 100644 > > --- a/package/freescale-imx/imx-lib/imx-lib.mk > > +++ b/package/freescale-imx/imx-lib/imx-lib.mk > > @@ -6,18 +6,19 @@ > > > > IMX_LIB_VERSION = $(FREESCALE_IMX_VERSION) > > IMX_LIB_SITE = $(FREESCALE_IMX_SITE) > > -IMX_LIB_LICENSE = Freescale License (vpu), LGPLv2.1+ (the rest) > > +IMX_LIB_LICENSE = LGPLv2.1+ > > IMX_LIB_LICENSE_FILES = EULA > > -IMX_LIB_SOURCE = imx-lib-$(IMX_LIB_VERSION).bin > > +IMX_LIB_SOURCE = imx-lib-$(IMX_LIB_VERSION).tar.gz > > Yeah! They switched! :-) > > > IMX_LIB_INSTALL_STAGING = YES > > > > # imx-lib needs access to imx-specific kernel headers > > IMX_LIB_DEPENDENCIES += linux > > IMX_LIB_INCLUDE = \ > > + -I$(LINUX_DIR)/include/uapi \ > > + -I$(LINUX_DIR)/include \ > > -I$(LINUX_DIR)/drivers/mxc/security/rng/include \ > > - -I$(LINUX_DIR)/drivers/mxc/security/sahara2/include \ > > - -idirafter $(LINUX_DIR)/include > > + -I$(LINUX_DIR)/drivers/mxc/security/sahara2/include > > This change is dubious. We really do want the include dirs from the > kernel to only come _after_ the standard search dirs, hence the existing > -idirafter directive. > > Searching in the kernel dir is ugly, because those are non-sanitised > headers, and we do favour headers from the toolchain (which are > userland-clean) over those from the kernel tree. > > Also, I think only using the uapi include dir should be enough. > My bad, I actually just applied the same parameters as the Yocto recipe without even thinking about the -idirafter (which I didn't know). I will remove it. > > > diff --git a/package/freescale-imx/imx-vpu/Config.in > b/package/freescale-imx/imx-vpu/Config.in > > new file mode 100644 > > index 0000000..e3e5823 > > --- /dev/null > > +++ b/package/freescale-imx/imx-vpu/Config.in > > @@ -0,0 +1,53 @@ > > +comment "imx-vpu needs an imx-specific Linux kernel to be built" > > + depends on BR2_arm && !BR2_LINUX_KERNEL > > + > > +config BR2_PACKAGE_IMX_VPU > > + bool "imx-vpu" > > + depends on BR2_LINUX_KERNEL > > + depends on BR2_arm # Only relevant for i.MX > > + help > > + Library of userspace helpers specific for the Freescale i.MX > > + platform. It wraps the kernel interfaces for the i.MX platform > > + Video Processing Unit (VPU) driver. It requires a kernel that > > + includes the i.MX specific headers to be built. > > + > > + This library is provided by Freescale as-is and doesn't have > > + an upstream. > > + > > +if BR2_PACKAGE_IMX_VPU > > +choice > > + prompt "i.MX platform" > > + > > +config BR2_PACKAGE_IMX_VPU_PLATFORM_IMX25_3STACK > > + bool "imx25-3stack" > > + > > +config BR2_PACKAGE_IMX_VPU_PLATFORM_IMX27ADS > > + bool "imx27ads" > > + > > +config BR2_PACKAGE_IMX_VPU_PLATFORM_IMX37_3STACK > > + bool "imx37-3stack" > > + > > +config BR2_PACKAGE_IMX_VPU_PLATFORM_IMX50 > > + bool "imx50" > > + > > +config BR2_PACKAGE_IMX_VPU_PLATFORM_IMX51 > > + bool "imx51" > > + > > +config BR2_PACKAGE_IMX_VPU_PLATFORM_IMX53 > > + bool "imx53" > > + > > +config BR2_PACKAGE_IMX_VPU_PLATFORM_IMX6Q > > + bool "imx6q" > > + > > +endchoice > > We already have this choice in the imx-lib package: > - if it no longer relevant to imx-lib, just remove it from imx-lib > and keep it in imx-vpu > - if it is still valide for imx-lib, then we should make it a common > choice, valid for both imx-lib and imx-vpu. > > In the latter case, you'd have to move it into: > package/freescale-imx/Config.in > > Rename options so they are no longer imx-lib specific, and use those > new options both in imx-lib and imx-vpu. The new names could be somethng > like (for example, with i.MX6Q): > BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q > > Makes sense, it looked weird in the menu to be able to select imx6q for imx-lib and something else for imx-vpu. FYI, imx-lib still needs the differentiation between the iMX platforms (IPU etc...) > Also applies to the following block, of course: > > > +config BR2_PACKAGE_IMX_VPU_PLATFORM > > + string > > + default "IMX25_3STACK" if BR2_PACKAGE_IMX_VPU_PLATFORM_IMX25_3STACK > > + default "IMX27ADS" if BR2_PACKAGE_IMX_VPU_PLATFORM_IMX27ADS > > + default "IMX37_3STACK" if BR2_PACKAGE_IMX_VPU_PLATFORM_IMX37_3STACK > > + default "IMX50" if BR2_PACKAGE_IMX_VPU_PLATFORM_IMX50 > > + default "IMX51" if BR2_PACKAGE_IMX_VPU_PLATFORM_IMX51 > > + default "IMX53" if BR2_PACKAGE_IMX_VPU_PLATFORM_IMX53 > > + default "IMX6Q" if BR2_PACKAGE_IMX_VPU_PLATFORM_IMX6Q > > +endif > > diff --git > a/package/freescale-imx/imx-vpu/imx-vpu-0001-fix-IOSystemInit-failure.patch > b/package/freescale-imx/imx-vpu/imx-vpu-0001-fix-IOSystemInit-failure.patch > > new file mode 100644 > > index 0000000..b73a959 > > --- /dev/null > > +++ > b/package/freescale-imx/imx-vpu/imx-vpu-0001-fix-IOSystemInit-failure.patch > > @@ -0,0 +1,21 @@ > > +[PATCH] fix IOSystemInit failure > > Please provide a more detailed comit log. Why do we need this? > As I said in the first patch I used the nitrogen6x to do my testing, there is one "big" difference between freescale and boundary kernel which is the memory split (2G/2G for FSL, 3G/1G for Boundary). Clearly the VPU code has only been tested on Freescale kernels because there is no way it works on kernel with the latter splitting. The VPU init function returns an error if the allocated buffer address is < 0 which does not make any sense. Instead the test should be against MAP_FAILED (-1). Only after that patch I've been able to get the VPU decoding working. I will change the -1 into MAP_FAILED for the next patch. > > > +Signed-off-by: Gary Bisson <bisson.gary@gmail.com> > > +--- > > + vpu/vpu_io.c | 2 +- > > + 1 file changed, 1 insertion(+), 1 deletion(-) > > + > > +diff --git a/vpu/vpu_io.c b/vpu/vpu_io.c > > +index 8cbb571..14759da 100644 > > +--- a/vpu/vpu_io.c > > ++++ b/vpu/vpu_io.c > > +@@ -265,7 +265,7 @@ int IOSystemInit(void *callback) > > + goto err; > > + } > > + > > +- if (IOGetVirtMem(&bit_work_addr) <= 0) > > ++ if (IOGetVirtMem(&bit_work_addr) == -1) > > + goto err; > > + #endif > > + UnlockVpu(vpu_semap); > > + > > diff --git a/package/freescale-imx/imx-vpu/imx-vpu.mk > b/package/freescale-imx/imx-vpu/imx-vpu.mk > > new file mode 100644 > > index 0000000..fb72203 > > --- /dev/null > > +++ b/package/freescale-imx/imx-vpu/imx-vpu.mk > > @@ -0,0 +1,57 @@ > > > +################################################################################ > > +# > > +# imx-vpu > > +# > > > +################################################################################ > > + > > +IMX_VPU_VERSION = $(FREESCALE_IMX_VERSION) > > +IMX_VPU_SITE = $(FREESCALE_IMX_SITE) > > +IMX_VPU_LICENSE = Freescale License > > +IMX_VPU_LICENSE_FILES = EULA > > +IMX_VPU_SOURCE = imx-vpu-$(IMX_VPU_VERSION).bin > > + > > +IMX_VPU_INSTALL_STAGING = YES > > + > > +# imx-vpu needs access to imx-specific kernel headers > > +IMX_VPU_DEPENDENCIES += linux > > +IMX_VPU_INCLUDE = \ > > + -I$(LINUX_DIR)/include/uapi \ > > + -I$(LINUX_DIR)/include > > Again, I believe this should be -idirafter instead of -I . > Same as above, will fix it. > > > +IMX_VPU_MAKE_ENV = \ > > + $(TARGET_MAKE_ENV) \ > > + $(TARGET_CONFIGURE_OPTS) \ > > + CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)" \ > > + PLATFORM=$(BR2_PACKAGE_IMX_VPU_PLATFORM) \ > > + INCLUDE="$(IMX_VPU_INCLUDE)" > > + > > +# The archive is a shell-self-extractor of a bzipped tar. It happens > > +# to extract in the correct directory (imx-vpu-x.y.z) > > +# The --force makes sure it doesn't fail if the source dir already > exists. > > +# The --auto-accept skips the license check - not needed for us > > +# because we have legal-info > > +# Since there's a EULA in the bin file, extract it to imx-vpu-x.y.z/EULA > > +# > > +define IMX_VPU_EXTRACT_CMDS > > + awk 'BEGIN { start=0; } \ > > + /^EOEULA/ { start = 0; } \ > > + { if (start) print; } \ > > + /<<EOEULA/ { start=1; }'\ > > + $(DL_DIR)/$(IMX_VPU_SOURCE) > $(@D)/EULA > > + cd $(BUILD_DIR); \ > > + sh $(DL_DIR)/$(IMX_VPU_SOURCE) --force --auto-accept > > +endef > > + > > +define IMX_VPU_BUILD_CMDS > > + $(IMX_VPU_MAKE_ENV) $(MAKE1) -C $(@D) > > +endef > > + > > +define IMX_VPU_INSTALL_STAGING_CMDS > > + $(IMX_VPU_MAKE_ENV) $(MAKE1) -C $(@D) DEST_DIR=$(STAGING_DIR) > install > > +endef > > + > > +define IMX_VPU_INSTALL_TARGET_CMDS > > + $(IMX_VPU_MAKE_ENV) $(MAKE1) -C $(@D) DEST_DIR=$(TARGET_DIR) > install > > +endef > > + > > +$(eval $(generic-package)) > > Otherwise, looks good. > > Regards, > Yann E. MORIN. > > -- > .-----------------.--------------------.------------------.- > -------------------. > | 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. | > '------------------------------^-------^------------------^- > -------------------' Thanks, Gary -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20140619/786584ce/attachment.html> ^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 1/5] freescale-imx: bump to version 3.10.17-1.0.0 2014-06-20 2:40 ` Gary Bisson @ 2014-06-20 21:01 ` Yann E. MORIN 2014-06-21 3:44 ` Eric Nelson 0 siblings, 1 reply; 25+ messages in thread From: Yann E. MORIN @ 2014-06-20 21:01 UTC (permalink / raw) To: buildroot Gary, All, On 2014-06-19 19:40 -0700, Gary Bisson spake thusly: > > > diff --git > > a/package/freescale-imx/imx-vpu/imx-vpu-0001-fix-IOSystemInit-failure.patch > > b/package/freescale-imx/imx-vpu/imx-vpu-0001-fix-IOSystemInit-failure.patch > > > new file mode 100644 > > > index 0000000..b73a959 > > > --- /dev/null > > > +++ > > b/package/freescale-imx/imx-vpu/imx-vpu-0001-fix-IOSystemInit-failure.patch > > > @@ -0,0 +1,21 @@ > > > +[PATCH] fix IOSystemInit failure > > > > Please provide a more detailed comit log. Why do we need this? > > > > As I said in the first patch I used the nitrogen6x to do my testing, there > is one "big" difference between freescale and boundary kernel which is the > memory split (2G/2G for FSL, 3G/1G for Boundary). Clearly the VPU code has > only been tested on Freescale kernels because there is no way it works on > kernel with the latter splitting. The VPU init function returns an error if > the allocated buffer address is < 0 which does not make any sense. Instead > the test should be against MAP_FAILED (-1). Only after that patch I've been > able to get the VPU decoding working. I will change the -1 into MAP_FAILED > for the next patch. OK, I see. You should also repeat this in the patch description, like: vpu-io: fix IOSystemInit failure There is one "big" difference between freescale and boundary kernel which is the memory split (2G/2G for FSL, 3G/1G for Boundary). Clearly the VPU code has only been tested on Freescale kernels because there is no way it works on kernel with the latter splitting. The VPU init function returns an error if the allocated buffer address is < 0, which happens with the 3G/1G split. Fix the test by checking against MAP_FAILED instead. Signed-off-by: You <you@there> Thanks! :-) Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------' ^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 1/5] freescale-imx: bump to version 3.10.17-1.0.0 2014-06-20 21:01 ` Yann E. MORIN @ 2014-06-21 3:44 ` Eric Nelson 0 siblings, 0 replies; 25+ messages in thread From: Eric Nelson @ 2014-06-21 3:44 UTC (permalink / raw) To: buildroot Hi Yann and Gary, On 06/20/2014 02:01 PM, Yann E. MORIN wrote: > Gary, All, > > On 2014-06-19 19:40 -0700, Gary Bisson spake thusly: >>>> diff --git >>> a/package/freescale-imx/imx-vpu/imx-vpu-0001-fix-IOSystemInit-failure.patch >>> b/package/freescale-imx/imx-vpu/imx-vpu-0001-fix-IOSystemInit-failure.patch >>>> new file mode 100644 >>>> index 0000000..b73a959 >>>> --- /dev/null >>>> +++ >>> b/package/freescale-imx/imx-vpu/imx-vpu-0001-fix-IOSystemInit-failure.patch >>>> @@ -0,0 +1,21 @@ >>>> +[PATCH] fix IOSystemInit failure >>> >>> Please provide a more detailed comit log. Why do we need this? >>> >> >> As I said in the first patch I used the nitrogen6x to do my testing, there >> is one "big" difference between freescale and boundary kernel which is the >> memory split (2G/2G for FSL, 3G/1G for Boundary). Clearly the VPU code has >> only been tested on Freescale kernels because there is no way it works on >> kernel with the latter splitting. The VPU init function returns an error if >> the allocated buffer address is < 0 which does not make any sense. Instead >> the test should be against MAP_FAILED (-1). Only after that patch I've been >> able to get the VPU decoding working. I will change the -1 into MAP_FAILED >> for the next patch. Nice catch. I do think this should be split into a separate patch though. A quick scan of this code shows that there are four other places that have the test for IOGetVirtMem() <= 0. > > OK, I see. You should also repeat this in the patch description, like: > > vpu-io: fix IOSystemInit failure > > There is one "big" difference between freescale and boundary kernel > which is the memory split (2G/2G for FSL, 3G/1G for Boundary). > > Clearly the VPU code has only been tested on Freescale kernels > because there is no way it works on kernel with the latter > splitting. The VPU init function returns an error if the allocated > buffer address is < 0, which happens with the 3G/1G split. > > Fix the test by checking against MAP_FAILED instead. > > Signed-off-by: You <you@there> > > Thanks! :-) > > Regards, > Yann E. MORIN. > ^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 2/5] libfslvpuwrap: bump to version 1.0.46 2014-06-19 4:03 [Buildroot] [PATCH 0/5] freescale: update userspace packages Gary Bisson 2014-06-19 4:03 ` [Buildroot] [PATCH 1/5] freescale-imx: bump to version 3.10.17-1.0.0 Gary Bisson @ 2014-06-19 4:03 ` Gary Bisson 2014-06-19 4:03 ` [Buildroot] [PATCH 3/5] libfslcodec: bump to version 3.0.11 Gary Bisson ` (3 subsequent siblings) 5 siblings, 0 replies; 25+ messages in thread From: Gary Bisson @ 2014-06-19 4:03 UTC (permalink / raw) To: buildroot Signed-off-by: Gary Bisson <bisson.gary@gmail.com> --- package/libfslvpuwrap/Config.in | 2 +- package/libfslvpuwrap/libfslvpuwrap.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libfslvpuwrap/Config.in b/package/libfslvpuwrap/Config.in index 9cf7633..fa85ce5 100644 --- a/package/libfslvpuwrap/Config.in +++ b/package/libfslvpuwrap/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_LIBFSLVPUWRAP bool "libfslvpuwrap" depends on BR2_LINUX_KERNEL depends on BR2_arm # Only relevant for i.MX - select BR2_PACKAGE_IMX_LIB + select BR2_PACKAGE_IMX_VPU help Wrapper library for the vpu library, giving it a different API. diff --git a/package/libfslvpuwrap/libfslvpuwrap.mk b/package/libfslvpuwrap/libfslvpuwrap.mk index 75c9887..c3a5c1c 100644 --- a/package/libfslvpuwrap/libfslvpuwrap.mk +++ b/package/libfslvpuwrap/libfslvpuwrap.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFSLVPUWRAP_VERSION = $(FREESCALE_IMX_VERSION) +LIBFSLVPUWRAP_VERSION = 1.0.46 LIBFSLVPUWRAP_SITE = $(FREESCALE_IMX_SITE) LIBFSLVPUWRAP_SOURCE = libfslvpuwrap-$(LIBFSLVPUWRAP_VERSION).bin LIBFSLVPUWRAP_LICENSE = Freescale Semiconductor Software License Agreement @@ -14,7 +14,7 @@ LIBFSLVPUWRAP_REDISTRIBUTE = NO LIBFSLVPUWRAP_INSTALL_STAGING = YES -LIBFSLVPUWRAP_DEPENDENCIES += imx-lib +LIBFSLVPUWRAP_DEPENDENCIES += imx-vpu # The archive is a shell-self-extractor of a bzipped tar. It happens # to extract in the correct directory (libfslvpuwrap-x.y.z) -- 2.0.0 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 3/5] libfslcodec: bump to version 3.0.11 2014-06-19 4:03 [Buildroot] [PATCH 0/5] freescale: update userspace packages Gary Bisson 2014-06-19 4:03 ` [Buildroot] [PATCH 1/5] freescale-imx: bump to version 3.10.17-1.0.0 Gary Bisson 2014-06-19 4:03 ` [Buildroot] [PATCH 2/5] libfslvpuwrap: bump to version 1.0.46 Gary Bisson @ 2014-06-19 4:03 ` Gary Bisson 2014-06-19 4:03 ` [Buildroot] [PATCH 4/5] libfslparser: " Gary Bisson ` (2 subsequent siblings) 5 siblings, 0 replies; 25+ messages in thread From: Gary Bisson @ 2014-06-19 4:03 UTC (permalink / raw) To: buildroot Signed-off-by: Gary Bisson <bisson.gary@gmail.com> --- package/libfslcodec/libfslcodec.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libfslcodec/libfslcodec.mk b/package/libfslcodec/libfslcodec.mk index d52158c..1a364bb 100644 --- a/package/libfslcodec/libfslcodec.mk +++ b/package/libfslcodec/libfslcodec.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFSLCODEC_VERSION = $(FREESCALE_IMX_VERSION) +LIBFSLCODEC_VERSION = 3.0.11 LIBFSLCODEC_SITE = $(FREESCALE_IMX_SITE) LIBFSLCODEC_SOURCE = libfslcodec-$(LIBFSLCODEC_VERSION).bin LIBFSLCODEC_LICENSE = Freescale Semiconductor Software License Agreement, BSD-3c (flac, ogg headers) -- 2.0.0 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 4/5] libfslparser: bump to version 3.0.11 2014-06-19 4:03 [Buildroot] [PATCH 0/5] freescale: update userspace packages Gary Bisson ` (2 preceding siblings ...) 2014-06-19 4:03 ` [Buildroot] [PATCH 3/5] libfslcodec: bump to version 3.0.11 Gary Bisson @ 2014-06-19 4:03 ` Gary Bisson 2014-06-19 4:03 ` [Buildroot] [PATCH 5/5] gst-fsl-plugins: " Gary Bisson 2014-06-27 5:24 ` [Buildroot] [PATCH v2 00/11] freescale: update userspace packages Gary Bisson 5 siblings, 0 replies; 25+ messages in thread From: Gary Bisson @ 2014-06-19 4:03 UTC (permalink / raw) To: buildroot Signed-off-by: Gary Bisson <bisson.gary@gmail.com> --- package/libfslparser/libfslparser.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libfslparser/libfslparser.mk b/package/libfslparser/libfslparser.mk index 0d92e02..d52b151 100644 --- a/package/libfslparser/libfslparser.mk +++ b/package/libfslparser/libfslparser.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFSLPARSER_VERSION = $(FREESCALE_IMX_VERSION) +LIBFSLPARSER_VERSION = 3.0.11 LIBFSLPARSER_SITE = $(FREESCALE_IMX_SITE) LIBFSLPARSER_SOURCE = libfslparser-$(LIBFSLPARSER_VERSION).bin LIBFSLPARSER_LICENSE = Freescale Semiconductor Software License Agreement -- 2.0.0 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 5/5] gst-fsl-plugins: bump to version 3.0.11 2014-06-19 4:03 [Buildroot] [PATCH 0/5] freescale: update userspace packages Gary Bisson ` (3 preceding siblings ...) 2014-06-19 4:03 ` [Buildroot] [PATCH 4/5] libfslparser: " Gary Bisson @ 2014-06-19 4:03 ` Gary Bisson 2014-06-20 21:12 ` Yann E. MORIN 2014-06-27 5:24 ` [Buildroot] [PATCH v2 00/11] freescale: update userspace packages Gary Bisson 5 siblings, 1 reply; 25+ messages in thread From: Gary Bisson @ 2014-06-19 4:03 UTC (permalink / raw) To: buildroot Signed-off-by: Gary Bisson <bisson.gary@gmail.com> --- ...gins-0002-Fix-bashism-in-configure-script.patch | 25 +- .../gst-fsl-plugins-0003-Use-proper-objdump.patch | 6 +- ...sl-linkage-add-lrt-for-shared-memory-func.patch | 2 +- ...-plugins-0005-build-Fix-out-of-tree-build.patch | 616 +++++++++++++++++++++ .../gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk | 13 +- 5 files changed, 634 insertions(+), 28 deletions(-) create mode 100644 package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0005-build-Fix-out-of-tree-build.patch diff --git a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0002-Fix-bashism-in-configure-script.patch b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0002-Fix-bashism-in-configure-script.patch index 8af3644..35617cd 100644 --- a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0002-Fix-bashism-in-configure-script.patch +++ b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0002-Fix-bashism-in-configure-script.patch @@ -9,29 +9,14 @@ have the default dash as /bin/sh define a variable ending with Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> --- - configure.ac | 22 +++++++++++----------- - 1 file changed, 11 insertions(+), 11 deletions(-) + configure.ac | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 5968eb6..1a31a06 100755 --- a/configure.ac +++ b/configure.ac -@@ -60,10 +60,10 @@ AC_DEFUN([CHECK_DISABLE_FEATURE], - [use_[$1]=yes]) - if test "$use_[$1]" = "yes"; then - SAVE_CPPFLAGS="$CPPFLAGS" -- CPPFLAGS=`$PKG_CONFIG --cflags libfslaudiocodec` -- CPPFLAGS+=`$PKG_CONFIG --cflags libfslvideocodec` -- CPPFLAGS+=`$PKG_CONFIG --cflags libfslparser` -- CPPFLAGS+=`$PKG_CONFIG --cflags libfslvpuwrap` -+ CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags libfslaudiocodec`" -+ CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags libfslvideocodec`" -+ CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags libfslparser`" -+ CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags libfslvpuwrap`" - AC_CHECK_HEADERS([$4], HAVE_[$3]=yes, HAVE_[$3]=no && break) - CPPFLAGS="$SAVE_CPPFLAGS" - if test "x$HAVE_[$3]" = "xyes"; then -@@ -157,7 +157,7 @@ AC_SUBST(GST_PLUGINS_BASE_LIBS) +@@ -152,7 +152,7 @@ AC_SUBST(GST_PLUGINS_BASE_LIBS) AC_CHECK_HEADERS([vpu_lib.h], [HAVE_VPU_LIB=yes], [HAVE_VPU_LIB=no]) if test "x$HAVE_VPU_LIB" = "xyes"; then VPU_LIBS=`$PKG_CONFIG --libs libfslvpuwrap 2>/dev/null` @@ -40,8 +25,8 @@ index 5968eb6..1a31a06 100755 fi AC_SUBST(VPU_LIBS) -@@ -173,15 +173,15 @@ AC_SUBST(IPU_CFLAGS) - AC_SUBST(IPU_LIBS) +@@ -176,15 +176,15 @@ AC_SUBST(RT_CFLAGS) + AC_SUBST(RT_LIBS) FSL_MM_CORE_CFLAGS=`$PKG_CONFIG --cflags libfslaudiocodec 2>/dev/null` -FSL_MM_CORE_CFLAGS+=`$PKG_CONFIG --cflags libfslvideocodec 2>/dev/null` diff --git a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0003-Use-proper-objdump.patch b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0003-Use-proper-objdump.patch index 8fce239..b7b8c9f 100644 --- a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0003-Use-proper-objdump.patch +++ b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0003-Use-proper-objdump.patch @@ -18,16 +18,16 @@ index 1a31a06..cc7557d 100755 @@ -17,7 +17,7 @@ AC_DEFUN([FIND_PARSER_SONAME], AC_MSG_CHECKING([for lib_$1_parser_$2_elinux.3.0.so soname]) path=`$PKG_CONFIG --variable=libdir libfslparser` - SONAME=$( $CC -print-file-name=$path/lib_$1_parser_$2_elinux.so | \ + SONAME=$( $CC -print-file-name=$PKG_CONFIG_SYSROOT_DIR$path/lib_$1_parser_$2_elinux.so | \ - while read output; do objdump -p $output | \ + while read output; do $OBJDUMP -p $output | \ grep "SONAME" | \ sed -e 's/ \+SONAME \+//'; done 2> /dev/null ) if [[ -z "$SONAME" ]]; then -@@ -37,7 +37,7 @@ AC_DEFUN([FIND_ACODEC_SONAME], +@@ -36,7 +36,7 @@ AC_DEFUN([FIND_ACODEC_SONAME], AC_MSG_CHECKING([for lib_$1_wrap_$2_elinux.so soname]) path=`$PKG_CONFIG --variable=libdir libfslaudiocodec` - SONAME=$( $CC -print-file-name=$path/wrap/lib_$1_wrap_$2_elinux.so | \ + SONAME=$( $CC -print-file-name=$PKG_CONFIG_SYSROOT_DIR$path/wrap/lib_$1_wrap_$2_elinux.so | \ - while read output; do objdump -p $output | \ + while read output; do $OBJDUMP -p $output | \ grep "SONAME" | \ 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 e58467e..763703c 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 @@ -18,7 +18,7 @@ diff --git a/configure.ac b/configure.ac 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 +@@ -170,6 +170,9 @@ AC_CHECK_LIB(ipu, mxc_ipu_lib_task_init, [IPU_LIBS=-lipu], [echo "No libipu arou AC_SUBST(IPU_CFLAGS) AC_SUBST(IPU_LIBS) diff --git a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0005-build-Fix-out-of-tree-build.patch b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0005-build-Fix-out-of-tree-build.patch new file mode 100644 index 0000000..469c1cc --- /dev/null +++ b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0005-build-Fix-out-of-tree-build.patch @@ -0,0 +1,616 @@ +From 223dfa376d97b4a1d1aed12cecc3332df69635da Mon Sep 17 00:00:00 2001 +From: Otavio Salvador <otavio@ossystems.com.br> +Date: Thu, 1 May 2014 15:44:51 -0300 +Subject: [PATCH 5/5] build: Fix out of tree build + +The build system had relative include paths which didn't take into +account the origial source path makes it impossible to do out of tree +builds. To fix it, every relative include path was replaced with +$(top_srcdir) so it works independetly of build diretory location. + +Upstream-Status: Pending + +Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> +--- + libs/Makefile.am | 2 +- + src/audio/aac_dec/src/Makefile.am | 2 +- + src/audio/aacplus_dec/src/Makefile.am | 2 +- + src/audio/ac3_dec/src/Makefile.am | 2 +- + src/audio/amr_dec/src/Makefile.am | 2 +- + src/audio/amr_dec/src/Makefile.in | 2 +- + src/audio/amr_enc/src/Makefile.am | 2 +- + src/audio/amr_enc/src/Makefile.in | 2 +- + src/audio/audio_pp/src/Makefile.am | 2 +- + src/audio/beep/src/Makefile.am | 8 ++++---- + src/audio/down_mix/src/Makefile.am | 2 +- + src/audio/mp3_dec/src/Makefile.am | 8 ++++---- + src/audio/mp3_enc/src/Makefile.am | 8 ++++---- + src/audio/spdif_rx/src/Makefile.am | 2 +- + src/audio/spdif_tx/src/Makefile.am | 2 +- + src/audio/vorbis_dec/src/Makefile.am | 2 +- + src/audio/wma10_dec/src/Makefile.am | 8 ++++---- + src/audio/wma8_enc/src/Makefile.am | 2 +- + src/misc/i_sink/src/Makefile.am | 2 +- + src/misc/tvsrc/src/Makefile.am | 2 +- + src/misc/v4l_sink/src/Makefile.am | 16 ++++++++-------- + src/misc/v4l_source/src/Makefile.am | 2 +- + src/parser/aiur/src/Makefile.am | 2 +- + src/video/deinterlace/src/Makefile.am | 2 +- + src/video/h264_dec/src/Makefile.am | 8 ++++---- + src/video/ipu_csc/src/Makefile.am | 2 +- + src/video/mpeg2_dec/src/Makefile.am | 2 +- + src/video/mpeg4asp_dec/src/Makefile.am | 8 ++++---- + src/video/vpu/src/Makefile.am | 2 +- + src/video/vpu_dec.full/src/Makefile.am | 2 +- + src/video/vpu_enc/src/Makefile.am | 2 +- + src/video/wmv9mp_dec/src/Makefile.am | 2 +- + src/video/wmv_dec/src/Makefile.am | 2 +- + 33 files changed, 58 insertions(+), 58 deletions(-) + +diff --git a/libs/Makefile.am b/libs/Makefile.am +index 0af9d6b..89699f8 100755 +--- a/libs/Makefile.am ++++ b/libs/Makefile.am +@@ -35,7 +35,7 @@ endif + endif + + +-libgstfsl_ at GST_MAJORMINOR@_la_CFLAGS = $(GST_BASE_CFLAGS) $(IPU_CFLAGS) -I../inc/common ++libgstfsl_ at GST_MAJORMINOR@_la_CFLAGS = $(GST_BASE_CFLAGS) $(IPU_CFLAGS) -I$(top_srcdir)/inc/common + + if PLATFORM_IS_MX5X + libgstfsl_ at GST_MAJORMINOR@_la_CFLAGS += -DIPULIB +diff --git a/src/audio/aac_dec/src/Makefile.am b/src/audio/aac_dec/src/Makefile.am +index 143f0b3..85a3b07 100755 +--- a/src/audio/aac_dec/src/Makefile.am ++++ b/src/audio/aac_dec/src/Makefile.am +@@ -22,7 +22,7 @@ libmfw_gst_aacdec_la_SOURCES = mfw_gst_aacdec.c + # flags used to compile this plugin + # we use the GST_LIBS flags because we might be using plug-in libs + libmfw_gst_aacdec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -DMPEG4 -DARM_OPT_MACROS -DLC -DPUSH_MODE -fno-omit-frame-pointer -fPIC +-libmfw_gst_aacdec_la_CPPFLAGS = $(GST_LIBS_CPPFLAGS) $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin ++libmfw_gst_aacdec_la_CPPFLAGS = $(GST_LIBS_CPPFLAGS) $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin + + + if PLATFORM_IS_MX2X +diff --git a/src/audio/aacplus_dec/src/Makefile.am b/src/audio/aacplus_dec/src/Makefile.am +index a5453f9..9d8adfe 100755 +--- a/src/audio/aacplus_dec/src/Makefile.am ++++ b/src/audio/aacplus_dec/src/Makefile.am +@@ -35,7 +35,7 @@ libmfw_gst_aacplusdec_la_SOURCES = mfw_gst_aacplusdec.c + # flags used to compile this plugin + # we use the GST_LIBS flags because we might be using plug-in libs + libmfw_gst_aacplusdec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -DMPEG4 -DARM_OPT_MACROS -DLC -DPUSH_MODE -fno-omit-frame-pointer -fPIC +-libmfw_gst_aacplusdec_la_CPPFLAGS = $(GST_LIBS_CPPFLAGS) $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin ++libmfw_gst_aacplusdec_la_CPPFLAGS = $(GST_LIBS_CPPFLAGS) $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin + if PLATFORM_IS_MX2X + libmfw_gst_aacplusdec_la_CFLAGS += -march=armv5te -mcpu=arm926ej-s + libmfw_gst_aacplusdec_la_CPPFLAGS += -march=armv5te -mcpu=arm926ej-s +diff --git a/src/audio/ac3_dec/src/Makefile.am b/src/audio/ac3_dec/src/Makefile.am +index 4916a32..0e2632d 100755 +--- a/src/audio/ac3_dec/src/Makefile.am ++++ b/src/audio/ac3_dec/src/Makefile.am +@@ -10,7 +10,7 @@ libmfw_gst_ac3dec_la_SOURCES = mfw_gst_ac3dec.c + + # flags used to compile this plugin + # we use the GST_LIBS flags because we might be using plug-in libs +-libmfw_gst_ac3dec_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_BASE_CFLAGS) -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin ++libmfw_gst_ac3dec_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_BASE_CFLAGS) -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin + libmfw_gst_ac3dec_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) -lgstaudio-$(GST_MAJORMINOR) -l_ac3_dec_arm11_elinux + libmfw_gst_ac3dec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(FSL_MM_CORE_LIBS) -lgstriff- at GST_MAJORMINOR@ + # headers we need but don't want installed +diff --git a/src/audio/amr_dec/src/Makefile.am b/src/audio/amr_dec/src/Makefile.am +index bf32d57..095a659 100755 +--- a/src/audio/amr_dec/src/Makefile.am ++++ b/src/audio/amr_dec/src/Makefile.am +@@ -19,7 +19,7 @@ libmfw_gst_amrdec_la_SOURCES = mfw_gst_amrdec.c + # flags used to compile this plugin + # we use the GST_LIBS flags because we might be using plug-in libs + libmfw_gst_amrdec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -DMPEG4 -DARM_OPT_MACROS -DLC -fno-omit-frame-pointer -fPIC +-libmfw_gst_amrdec_la_CPPFLAGS = $(GST_LIBS_CPPFLAGS) $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../inc/core_lib ++libmfw_gst_amrdec_la_CPPFLAGS = $(GST_LIBS_CPPFLAGS) $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/core_lib + libmfw_gst_amrdec_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) $(CORELIB) -lgstaudio-$(GST_MAJORMINOR) + libmfw_gst_amrdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(FSL_MM_CORE_LIBS) -lgstriff- at GST_MAJORMINOR@ + +diff --git a/src/audio/amr_dec/src/Makefile.in b/src/audio/amr_dec/src/Makefile.in +index 2b02e0c..9b1c090 100644 +--- a/src/audio/amr_dec/src/Makefile.in ++++ b/src/audio/amr_dec/src/Makefile.in +@@ -286,7 +286,7 @@ libmfw_gst_amrdec_la_SOURCES = mfw_gst_amrdec.c + # flags used to compile this plugin + # we use the GST_LIBS flags because we might be using plug-in libs + libmfw_gst_amrdec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -DMPEG4 -DARM_OPT_MACROS -DLC -fno-omit-frame-pointer -fPIC +-libmfw_gst_amrdec_la_CPPFLAGS = $(GST_LIBS_CPPFLAGS) $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../inc/core_lib ++libmfw_gst_amrdec_la_CPPFLAGS = $(GST_LIBS_CPPFLAGS) $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/core_lib + libmfw_gst_amrdec_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) $(CORELIB) -lgstaudio-$(GST_MAJORMINOR) + libmfw_gst_amrdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(FSL_MM_CORE_LIBS) -lgstriff- at GST_MAJORMINOR@ + +diff --git a/src/audio/amr_enc/src/Makefile.am b/src/audio/amr_enc/src/Makefile.am +index 4dcc25e..a4d56c9 100755 +--- a/src/audio/amr_enc/src/Makefile.am ++++ b/src/audio/amr_enc/src/Makefile.am +@@ -19,7 +19,7 @@ libmfw_gst_amrenc_la_SOURCES = mfw_gst_amrenc.c + # flags used to compile this plugin + # we use the GST_LIBS flags because we might be using plug-in libs + libmfw_gst_amrenc_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -DMPEG4 -DARM_OPT_MACROS -DLC -fno-omit-frame-pointer -fPIC +-libmfw_gst_amrenc_la_CPPFLAGS = $(GST_LIBS_CPPFLAGS) $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin ++libmfw_gst_amrenc_la_CPPFLAGS = $(GST_LIBS_CPPFLAGS) $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin + libmfw_gst_amrenc_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) $(CORELIB) -lgstaudio-$(GST_MAJORMINOR) + libmfw_gst_amrenc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(FSL_MM_CORE_LIBS) -lgstriff- at GST_MAJORMINOR@ + +diff --git a/src/audio/amr_enc/src/Makefile.in b/src/audio/amr_enc/src/Makefile.in +index 398e69b..162aa56 100644 +--- a/src/audio/amr_enc/src/Makefile.in ++++ b/src/audio/amr_enc/src/Makefile.in +@@ -286,7 +286,7 @@ libmfw_gst_amrenc_la_SOURCES = mfw_gst_amrenc.c + # flags used to compile this plugin + # we use the GST_LIBS flags because we might be using plug-in libs + libmfw_gst_amrenc_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -DMPEG4 -DARM_OPT_MACROS -DLC -fno-omit-frame-pointer -fPIC +-libmfw_gst_amrenc_la_CPPFLAGS = $(GST_LIBS_CPPFLAGS) $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin ++libmfw_gst_amrenc_la_CPPFLAGS = $(GST_LIBS_CPPFLAGS) $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin + libmfw_gst_amrenc_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) $(CORELIB) -lgstaudio-$(GST_MAJORMINOR) + libmfw_gst_amrenc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(FSL_MM_CORE_LIBS) -lgstriff- at GST_MAJORMINOR@ + +diff --git a/src/audio/audio_pp/src/Makefile.am b/src/audio/audio_pp/src/Makefile.am +index 42365a0..32569fe 100755 +--- a/src/audio/audio_pp/src/Makefile.am ++++ b/src/audio/audio_pp/src/Makefile.am +@@ -1,7 +1,7 @@ + plugin_LTLIBRARIES = libmfw_gst_audio_pp.la + + libmfw_gst_audio_pp_la_SOURCES = mfw_gst_audio_pp.c +-libmfw_gst_audio_pp_la_CFLAGS = -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../inc/core_lib ++libmfw_gst_audio_pp_la_CFLAGS = -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/core_lib + libmfw_gst_audio_pp_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -l_peq_arm11_elinux + libmfw_gst_audio_pp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(FSL_MM_CORE_LIBS) + +diff --git a/src/audio/beep/src/Makefile.am b/src/audio/beep/src/Makefile.am +index fdd6669..4e92b92 100755 +--- a/src/audio/beep/src/Makefile.am ++++ b/src/audio/beep/src/Makefile.am +@@ -8,24 +8,24 @@ libmfw_gst_beep_la_SOURCES = beep.c beepregistry.c beepdec.c beeptypefind.c + # flags used to compile this plugin + # we use the GST_LIBS flags because we might be using plug-in libs + if PLATFORM_IS_MX2X +-libmfw_gst_beep_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../libs -I../../../../inc/core_lib/uni_audio -D_ARM9 -march=armv5te -mcpu=arm926ej-s ++libmfw_gst_beep_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/libs -I$(top_srcdir)/inc/core_lib/uni_audio -D_ARM9 -march=armv5te -mcpu=arm926ej-s + libmfw_gst_beep_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -lgstaudio-$(GST_MAJORMINOR) -lgstriff- at GST_MAJORMINOR@ -lgsttag- at GST_MAJORMINOR@ -ldl ../../../../libs/libgstfsl- at GST_MAJORMINOR@.la + endif + + + if PLATFORM_IS_MX3X +-libmfw_gst_beep_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../libs -I../../../../inc/core_lib/uni_audio -D_ARM11 ++libmfw_gst_beep_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/libs -I$(top_srcdir)/inc/core_lib/uni_audio -D_ARM11 + libmfw_gst_beep_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -lgstaudio-$(GST_MAJORMINOR) -lgstriff- at GST_MAJORMINOR@ -lgsttag- at GST_MAJORMINOR@ -ldl ../../../../libs/libgstfsl- at GST_MAJORMINOR@.la + endif + + + if PLATFORM_IS_MX5X +-libmfw_gst_beep_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../libs -I../../../../inc/core_lib/uni_audio -D_ARM12 ++libmfw_gst_beep_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/libs -I$(top_srcdir)/inc/core_lib/uni_audio -D_ARM12 + libmfw_gst_beep_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -lgstaudio-$(GST_MAJORMINOR) -lgstriff- at GST_MAJORMINOR@ -lgsttag- at GST_MAJORMINOR@ -ldl ../../../../libs/libgstfsl- at GST_MAJORMINOR@.la + endif + + if PLATFORM_IS_MX6X +-libmfw_gst_beep_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../libs -I../../../../inc/core_lib/uni_audio -D_ARM12 ++libmfw_gst_beep_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/libs -I$(top_srcdir)/inc/core_lib/uni_audio -D_ARM12 + libmfw_gst_beep_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -lgstaudio-$(GST_MAJORMINOR) -lgstriff- at GST_MAJORMINOR@ -lgsttag- at GST_MAJORMINOR@ -ldl ../../../../libs/libgstfsl- at GST_MAJORMINOR@.la + endif + +diff --git a/src/audio/down_mix/src/Makefile.am b/src/audio/down_mix/src/Makefile.am +index 9fa392c..ff7b589 100755 +--- a/src/audio/down_mix/src/Makefile.am ++++ b/src/audio/down_mix/src/Makefile.am +@@ -1,7 +1,7 @@ + plugin_LTLIBRARIES = libmfw_gst_downmix.la + + libmfw_gst_downmix_la_SOURCES = mfw_gst_downmix.c +-libmfw_gst_downmix_la_CFLAGS = -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../inc/core_lib ++libmfw_gst_downmix_la_CFLAGS = -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/core_lib + libmfw_gst_downmix_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -l_downmix_arm11_elinux + libmfw_gst_downmix_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(FSL_MM_CORE_LIBS) + +diff --git a/src/audio/mp3_dec/src/Makefile.am b/src/audio/mp3_dec/src/Makefile.am +index 9361da7..bd79288 100755 +--- a/src/audio/mp3_dec/src/Makefile.am ++++ b/src/audio/mp3_dec/src/Makefile.am +@@ -27,23 +27,23 @@ libmfw_gst_mp3dec_la_SOURCES = mfw_gst_mp3dec.c + # flags used to compile this plugin + # we use the GST_LIBS flags because we might be using plug-in libs + if PLATFORM_IS_MX2X +-libmfw_gst_mp3dec_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -DMP3D_HUF_DEQ_BYTEBUF_OPT_C -DMPEGLAYER2 -DPUSH_MODE $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -march=armv5te -mcpu=arm926ej-s ++libmfw_gst_mp3dec_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -DMP3D_HUF_DEQ_BYTEBUF_OPT_C -DMPEGLAYER2 -DPUSH_MODE $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -march=armv5te -mcpu=arm926ej-s + libmfw_gst_mp3dec_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) -l$(CORELIB) -l_mp3_parser_arm9_elinux + endif + + + + if PLATFORM_IS_MX3X +-libmfw_gst_mp3dec_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -DMP3D_HUF_DEQ_BYTEBUF_OPT_C -DMPEGLAYER2 -DPUSH_MODE $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin ++libmfw_gst_mp3dec_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -DMP3D_HUF_DEQ_BYTEBUF_OPT_C -DMPEGLAYER2 -DPUSH_MODE $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin + libmfw_gst_mp3dec_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) -l$(CORELIB) -l_mp3_parser_arm11_elinux + endif + + if PLATFORM_IS_MX5X +-libmfw_gst_mp3dec_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -DMP3D_HUF_DEQ_BYTEBUF_OPT_C -DMPEGLAYER2 -DPUSH_MODE $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin ++libmfw_gst_mp3dec_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -DMP3D_HUF_DEQ_BYTEBUF_OPT_C -DMPEGLAYER2 -DPUSH_MODE $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin + libmfw_gst_mp3dec_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) -l$(CORELIB) -l_mp3_parser_arm11_elinux + endif + if PLATFORM_IS_MX6X +-libmfw_gst_mp3dec_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -DMP3D_HUF_DEQ_BYTEBUF_OPT_C -DMPEGLAYER2 -DPUSH_MODE $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin ++libmfw_gst_mp3dec_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -DMP3D_HUF_DEQ_BYTEBUF_OPT_C -DMPEGLAYER2 -DPUSH_MODE $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin + libmfw_gst_mp3dec_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) -l$(CORELIB) -l_mp3_parser_arm11_elinux + endif + +diff --git a/src/audio/mp3_enc/src/Makefile.am b/src/audio/mp3_enc/src/Makefile.am +index 0d9b79c..934fc80 100755 +--- a/src/audio/mp3_enc/src/Makefile.am ++++ b/src/audio/mp3_enc/src/Makefile.am +@@ -26,19 +26,19 @@ libmfw_gst_mp3enc_la_SOURCES = mfw_gst_mp3enc.c + # flags used to compile this plugin + # add other _CFLAGS and _LIBS as needed + if PLATFORM_IS_MX2X +-libmfw_gst_mp3enc_la_CFLAGS = $(GST_CFLAGS) $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../inc/core_lib -march=armv5te -mcpu=arm926ej-s ++libmfw_gst_mp3enc_la_CFLAGS = $(GST_CFLAGS) $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/core_lib -march=armv5te -mcpu=arm926ej-s + endif + + + if PLATFORM_IS_MX3X +-libmfw_gst_mp3enc_la_CFLAGS = $(GST_CFLAGS) $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../inc/core_lib ++libmfw_gst_mp3enc_la_CFLAGS = $(GST_CFLAGS) $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/core_lib + endif + + if PLATFORM_IS_MX5X +-libmfw_gst_mp3enc_la_CFLAGS = $(GST_CFLAGS) $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../inc/core_lib ++libmfw_gst_mp3enc_la_CFLAGS = $(GST_CFLAGS) $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/core_lib + endif + if PLATFORM_IS_MX6X +-libmfw_gst_mp3enc_la_CFLAGS = $(GST_CFLAGS) $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../inc/core_lib ++libmfw_gst_mp3enc_la_CFLAGS = $(GST_CFLAGS) $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/core_lib + endif + + +diff --git a/src/audio/spdif_rx/src/Makefile.am b/src/audio/spdif_rx/src/Makefile.am +index 80dfb73..f22c6fb 100755 +--- a/src/audio/spdif_rx/src/Makefile.am ++++ b/src/audio/spdif_rx/src/Makefile.am +@@ -1,7 +1,7 @@ + plugin_LTLIBRARIES = libmfw_gst_spdifrx.la + + libmfw_gst_spdifrx_la_SOURCES = mfw_gst_spdifrx.c +-libmfw_gst_spdifrx_la_CFLAGS = -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -I../../../../inc/plugin ++libmfw_gst_spdifrx_la_CFLAGS = -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -I$(top_srcdir)/inc/plugin + libmfw_gst_spdifrx_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) + libmfw_gst_spdifrx_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -lgstriff- at GST_MAJORMINOR@ + +diff --git a/src/audio/spdif_tx/src/Makefile.am b/src/audio/spdif_tx/src/Makefile.am +index 6b17886..a330e5d 100755 +--- a/src/audio/spdif_tx/src/Makefile.am ++++ b/src/audio/spdif_tx/src/Makefile.am +@@ -1,7 +1,7 @@ + plugin_LTLIBRARIES = libmfw_gst_spdiftx.la + + libmfw_gst_spdiftx_la_SOURCES = mfw_gst_spdiftx.c +-libmfw_gst_spdiftx_la_CFLAGS = -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -I../../../../inc/plugin ++libmfw_gst_spdiftx_la_CFLAGS = -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -I$(top_srcdir)/inc/plugin + libmfw_gst_spdiftx_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) + libmfw_gst_spdiftx_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -lgstriff- at GST_MAJORMINOR@ + +diff --git a/src/audio/vorbis_dec/src/Makefile.am b/src/audio/vorbis_dec/src/Makefile.am +index f43751b..9fc922d 100755 +--- a/src/audio/vorbis_dec/src/Makefile.am ++++ b/src/audio/vorbis_dec/src/Makefile.am +@@ -10,7 +10,7 @@ libmfw_gst_vorbisdec_la_SOURCES = mfw_gst_vorbisdec.c + # flags used to compile this plugin + # we use the GST_LIBS flags because we might be using plug-in libs + libmfw_gst_vorbisdec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -DMPEG4 -DARM_OPT_MACROS -DLC -DPUSH_MODE -fno-omit-frame-pointer -fPIC +-libmfw_gst_vorbisdec_la_CPPFLAGS = $(GST_LIBS_CPPFLAGS) $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin ++libmfw_gst_vorbisdec_la_CPPFLAGS = $(GST_LIBS_CPPFLAGS) $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin + + + libmfw_gst_vorbisdec_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -lgstaudio-$(GST_MAJORMINOR) -l$(CORELIB) +diff --git a/src/audio/wma10_dec/src/Makefile.am b/src/audio/wma10_dec/src/Makefile.am +index 50f5314..ab9147f 100755 +--- a/src/audio/wma10_dec/src/Makefile.am ++++ b/src/audio/wma10_dec/src/Makefile.am +@@ -26,21 +26,21 @@ libmfw_gst_wma10dec_la_SOURCES = mfw_gst_wma10dec.c + # flags used to compile this plugin + # we use the GST_LIBS flags because we might be using plug-in libs + if PLATFORM_IS_MX2X +-libmfw_gst_wma10dec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -DGST_API -DGST_RAW_DECODER $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -march=armv5te -mcpu=arm926ej-s ++libmfw_gst_wma10dec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -DGST_API -DGST_RAW_DECODER $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -march=armv5te -mcpu=arm926ej-s + endif + + + if PLATFORM_IS_MX3X +-libmfw_gst_wma10dec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -DGST_API -DGST_RAW_DECODER $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin ++libmfw_gst_wma10dec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -DGST_API -DGST_RAW_DECODER $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin + endif + + + + if PLATFORM_IS_MX5X +-libmfw_gst_wma10dec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -DGST_API -DGST_RAW_DECODER $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin ++libmfw_gst_wma10dec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -DGST_API -DGST_RAW_DECODER $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin + endif + if PLATFORM_IS_MX6X +-libmfw_gst_wma10dec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -DGST_API -DGST_RAW_DECODER $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin ++libmfw_gst_wma10dec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -DGST_API -DGST_RAW_DECODER $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin + endif + + +diff --git a/src/audio/wma8_enc/src/Makefile.am b/src/audio/wma8_enc/src/Makefile.am +index 82ed82e..04c93bb 100755 +--- a/src/audio/wma8_enc/src/Makefile.am ++++ b/src/audio/wma8_enc/src/Makefile.am +@@ -11,7 +11,7 @@ libmfw_gst_wma8enc_la_SOURCES = mfw_gst_wma8enc.c + + # flags used to compile this plugin + # add other _CFLAGS and _LIBS as needed +-libmfw_gst_wma8enc_la_CFLAGS = $(GST_CFLAGS) $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../inc/core_lib ++libmfw_gst_wma8enc_la_CFLAGS = $(GST_CFLAGS) $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/core_lib + libmfw_gst_wma8enc_la_LIBADD = $(GST_LIBS) -l_wma_muxer_arm11_ELINUX -lgstbase-$(GST_MAJORMINOR) -l_wma8_enc_arm11_elinux + libmfw_gst_wma8enc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(FSL_MM_CORE_LIBS) + +diff --git a/src/misc/i_sink/src/Makefile.am b/src/misc/i_sink/src/Makefile.am +index 721d10c..a6dfaf5 100755 +--- a/src/misc/i_sink/src/Makefile.am ++++ b/src/misc/i_sink/src/Makefile.am +@@ -6,7 +6,7 @@ endif + plugin_LTLIBRARIES = libmfw_gst_isink.la + + libmfw_gst_isink_la_SOURCES = mfw_gst_isink.c +-libmfw_gst_isink_la_CFLAGS = -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer $(IPU_CFLAGS) -D_$(PLATFORM) -I../../../../inc/plugin -I../../../../inc/common -I../../../../libs/vss -I../../../../libs/gstbufmeta -I../../../../libs/hbuf_alloc -I$(FBHEADER_PATH) -I. -I/usr/src/linux-headers-2.6.35-1000-linaro-imx5/include ++libmfw_gst_isink_la_CFLAGS = -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer $(IPU_CFLAGS) -D_$(PLATFORM) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/common -I$(top_srcdir)/libs/vss -I$(top_srcdir)/libs/gstbufmeta -I$(top_srcdir)/libs/hbuf_alloc -I$(FBHEADER_PATH) -I. -I/usr/src/linux-headers-2.6.35-1000-linaro-imx5/include + libmfw_gst_isink_la_LIBADD = $(GST_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR) + libmfw_gst_isink_la_LIBADD += ../../../../libs/libgstfsl- at GST_MAJORMINOR@.la + libmfw_gst_isink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +diff --git a/src/misc/tvsrc/src/Makefile.am b/src/misc/tvsrc/src/Makefile.am +index dfe080b..a765e87 100755 +--- a/src/misc/tvsrc/src/Makefile.am ++++ b/src/misc/tvsrc/src/Makefile.am +@@ -7,7 +7,7 @@ endif + plugin_LTLIBRARIES = libmfw_gst_tvsrc.la + + libmfw_gst_tvsrc_la_SOURCES = mfw_gst_tvsrc.c +-libmfw_gst_tvsrc_la_CFLAGS = $(GST_BASE_CFLAGS) -fno-omit-frame-pointer $(IPU_CFLAGS) -D$(PLATFORM) -I$(FBHEADER_PATH) -I. -I../../../../inc/plugin -I../../../../libs/gstbufmeta ++libmfw_gst_tvsrc_la_CFLAGS = $(GST_BASE_CFLAGS) -fno-omit-frame-pointer $(IPU_CFLAGS) -D$(PLATFORM) -I$(FBHEADER_PATH) -I. -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/libs/gstbufmeta + libmfw_gst_tvsrc_la_LIBADD = $(GST_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR) ../../../../libs/libgstfsl- at GST_MAJORMINOR@.la + libmfw_gst_tvsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) + +diff --git a/src/misc/v4l_sink/src/Makefile.am b/src/misc/v4l_sink/src/Makefile.am +index 4489cc4..a1f6cb8 100755 +--- a/src/misc/v4l_sink/src/Makefile.am ++++ b/src/misc/v4l_sink/src/Makefile.am +@@ -3,32 +3,32 @@ plugin_LTLIBRARIES = libmfw_gst_v4lsink.la + libmfw_gst_v4lsink_la_SOURCES = mfw_gst_fb.c mfw_gst_v4l.c mfw_gst_v4l_buffer.c mfw_gst_v4lsink.c + libmfw_gst_v4lsink_la_CFLAGS = -I/usr/src/linux-headers-2.6.35-1000-linaro-imx5/include + if PLATFORM_IS_MX233 +-libmfw_gst_v4lsink_la_CFLAGS += -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -D_$(PLATFORM) -I../../../../inc/plugin -I../../../../inc/misc -march=armv5te ++libmfw_gst_v4lsink_la_CFLAGS += -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -D_$(PLATFORM) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/misc -march=armv5te + endif + if PLATFORM_IS_MX25 +-libmfw_gst_v4lsink_la_CFLAGS += -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -D_$(PLATFORM) -I../../../../inc/plugin -I../../../../inc/misc -march=armv5te ++libmfw_gst_v4lsink_la_CFLAGS += -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -D_$(PLATFORM) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/misc -march=armv5te + endif + if PLATFORM_IS_MX27 +-libmfw_gst_v4lsink_la_CFLAGS += -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -DENABLE_TVOUT -D_$(PLATFORM) -I../../../../inc/plugin -I../../../../inc/misc -march=armv5te ++libmfw_gst_v4lsink_la_CFLAGS += -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -DENABLE_TVOUT -D_$(PLATFORM) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/misc -march=armv5te + endif + if PLATFORM_IS_MX28 +-libmfw_gst_v4lsink_la_CFLAGS += -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -D_$(PLATFORM) -I../../../../inc/plugin -I../../../../inc/misc -march=armv5te ++libmfw_gst_v4lsink_la_CFLAGS += -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -D_$(PLATFORM) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/misc -march=armv5te + endif + + if PLATFORM_IS_MX3X +-libmfw_gst_v4lsink_la_CFLAGS += -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -DENABLE_TVOUT -D_$(PLATFORM) -I../../../../inc/plugin -I../../../../inc/misc ++libmfw_gst_v4lsink_la_CFLAGS += -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -DENABLE_TVOUT -D_$(PLATFORM) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/misc + endif + if PLATFORM_IS_MX5X +-libmfw_gst_v4lsink_la_CFLAGS += -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -DENABLE_TVOUT -D_$(PLATFORM) -I../../../../inc/plugin -I../../../../inc/misc ++libmfw_gst_v4lsink_la_CFLAGS += -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -DENABLE_TVOUT -D_$(PLATFORM) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/misc + endif + if PLATFORM_IS_MX6X +-libmfw_gst_v4lsink_la_CFLAGS += -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -DENABLE_TVOUT -D_$(PLATFORM) -I../../../../inc/plugin -I../../../../inc/misc ++libmfw_gst_v4lsink_la_CFLAGS += -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -DENABLE_TVOUT -D_$(PLATFORM) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/misc + endif + + libmfw_gst_v4lsink_la_LIBADD = $(GST_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR) ../../../../libs/libgstfsl- at GST_MAJORMINOR@.la + + +-libmfw_gst_v4lsink_la_CFLAGS += $(IPU_CFLAGS) -I. -I../../../../libs/gstbufmeta ++libmfw_gst_v4lsink_la_CFLAGS += $(IPU_CFLAGS) -I. -I$(top_srcdir)/libs/gstbufmeta + + if USE_X11 + libmfw_gst_v4lsink_la_SOURCES += mfw_gst_v4l_xlib.c mfw_gst_xlib.c mfw_gst_v4l_suspend.c +diff --git a/src/misc/v4l_source/src/Makefile.am b/src/misc/v4l_source/src/Makefile.am +index b80d27e..4ef1351 100755 +--- a/src/misc/v4l_source/src/Makefile.am ++++ b/src/misc/v4l_source/src/Makefile.am +@@ -7,7 +7,7 @@ endif + plugin_LTLIBRARIES = libmfw_gst_v4lsrc.la + + libmfw_gst_v4lsrc_la_SOURCES = mfw_gst_v4lsrc.c +-libmfw_gst_v4lsrc_la_CFLAGS = $(GST_BASE_CFLAGS) -fno-omit-frame-pointer $(IPU_CFLAGS) -D$(PLATFORM) -I$(FBHEADER_PATH) -I. -I../../../../inc/plugin -I../../../../libs/gstbufmeta ++libmfw_gst_v4lsrc_la_CFLAGS = $(GST_BASE_CFLAGS) -fno-omit-frame-pointer $(IPU_CFLAGS) -D$(PLATFORM) -I$(FBHEADER_PATH) -I. -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/libs/gstbufmeta + libmfw_gst_v4lsrc_la_LIBADD = $(GST_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR) ../../../../libs/libgstfsl- at GST_MAJORMINOR@.la + libmfw_gst_v4lsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) + +diff --git a/src/parser/aiur/src/Makefile.am b/src/parser/aiur/src/Makefile.am +index 24ac78e..752a155 100755 +--- a/src/parser/aiur/src/Makefile.am ++++ b/src/parser/aiur/src/Makefile.am +@@ -4,7 +4,7 @@ plugin_LTLIBRARIES = libmfw_gst_aiur_demux.la + # for the next set of variables, rename the prefix if you renamed the .la + # sources used to compile this plug-in + libmfw_gst_aiur_demux_la_SOURCES = aiur.c aiurregistry.c aiurstreamcache.c aiuridxtab.c aiurdemux.c aiurtypefind.c +-libmfw_gst_aiur_demux_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -DFSL_AVI_DRM_SUPPORT $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../inc/core_lib/parser -I../../../../libs ++libmfw_gst_aiur_demux_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -DFSL_AVI_DRM_SUPPORT $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/core_lib/parser -I$(top_srcdir)/libs + libmfw_gst_aiur_demux_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -lgstriff- at GST_MAJORMINOR@ -lgsttag- at GST_MAJORMINOR@ -ldl ../../../../libs/libgstfsl- at GST_MAJORMINOR@.la + libmfw_gst_aiur_demux_la_CPPFLAGS = $(GST_LIBS_CPPFLAGS) + libmfw_gst_aiur_demux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(FSL_MM_CORE_LIBS) +diff --git a/src/video/deinterlace/src/Makefile.am b/src/video/deinterlace/src/Makefile.am +index 08150f9..4f20d58 100755 +--- a/src/video/deinterlace/src/Makefile.am ++++ b/src/video/deinterlace/src/Makefile.am +@@ -1,7 +1,7 @@ + plugin_LTLIBRARIES = libmfw_gst_deinterlace.la + + libmfw_gst_deinterlace_la_SOURCES = mfw_gst_deinterlace.c +-libmfw_gst_deinterlace_la_CFLAGS = -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -I../../../../inc/plugin -I../../../../inc/core_lib $(FSL_MM_CORE_CFLAGS) ++libmfw_gst_deinterlace_la_CFLAGS = -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/core_lib $(FSL_MM_CORE_CFLAGS) + libmfw_gst_deinterlace_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -l_deinterlace_arm11_elinux + libmfw_gst_deinterlace_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(FSL_MM_CORE_LIBS) + +diff --git a/src/video/h264_dec/src/Makefile.am b/src/video/h264_dec/src/Makefile.am +index af2b3ac..278f748 100755 +--- a/src/video/h264_dec/src/Makefile.am ++++ b/src/video/h264_dec/src/Makefile.am +@@ -28,21 +28,21 @@ libmfw_gst_h264dec_la_SOURCES = mfw_gst_h264dec.c + # flags used to compile this plugin + # we use the GST_LIBS flags because we might be using plug-in libs + if PLATFORM_IS_MX2X +-libmfw_gst_h264dec_la_CFLAGS = $(GST_BASE_CFLAGS) -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -O2 -DDPB_FIX -D_$(PLATFORM) -DDIRECT_RENDER_VERSION=2 -DFRAMEDROPING_ENALBED -march=armv5te -mcpu=arm926ej-s -I../../../../libs/me -I../../../../libs/gstbufmeta ++libmfw_gst_h264dec_la_CFLAGS = $(GST_BASE_CFLAGS) -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -O2 -DDPB_FIX -D_$(PLATFORM) -DDIRECT_RENDER_VERSION=2 -DFRAMEDROPING_ENALBED -march=armv5te -mcpu=arm926ej-s -I$(top_srcdir)/libs/me -I$(top_srcdir)/libs/gstbufmeta + endif + + + if PLATFORM_IS_MX3X +-libmfw_gst_h264dec_la_CFLAGS = $(GST_BASE_CFLAGS) -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../inc/core_lib -O2 -DDPB_FIX -DDIRECT_RENDER_VERSION=2 -DFRAMEDROPING_ENALBED -I../../../../libs/me -I../../../../libs/gstbufmeta ++libmfw_gst_h264dec_la_CFLAGS = $(GST_BASE_CFLAGS) -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/core_lib -O2 -DDPB_FIX -DDIRECT_RENDER_VERSION=2 -DFRAMEDROPING_ENALBED -I$(top_srcdir)/libs/me -I$(top_srcdir)/libs/gstbufmeta + endif + + + if PLATFORM_IS_MX5X +-libmfw_gst_h264dec_la_CFLAGS = $(GST_BASE_CFLAGS) -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../inc/core_lib -O2 -DDPB_FIX -DDIRECT_RENDER_VERSION=2 -DFRAMEDROPING_ENALBED -I../../../../libs/me -I../../../../libs/gstbufmeta ++libmfw_gst_h264dec_la_CFLAGS = $(GST_BASE_CFLAGS) -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/core_lib -O2 -DDPB_FIX -DDIRECT_RENDER_VERSION=2 -DFRAMEDROPING_ENALBED -I$(top_srcdir)/libs/me -I$(top_srcdir)/libs/gstbufmeta + endif + + if PLATFORM_IS_MX6X +-libmfw_gst_h264dec_la_CFLAGS = $(GST_BASE_CFLAGS) -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../inc/core_lib -O2 -DDPB_FIX -DDIRECT_RENDER_VERSION=2 -DFRAMEDROPING_ENALBED -I../../../../libs/me -I../../../../libs/gstbufmeta ++libmfw_gst_h264dec_la_CFLAGS = $(GST_BASE_CFLAGS) -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/core_lib -O2 -DDPB_FIX -DDIRECT_RENDER_VERSION=2 -DFRAMEDROPING_ENALBED -I$(top_srcdir)/libs/me -I$(top_srcdir)/libs/gstbufmeta + endif + + libmfw_gst_h264dec_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -l$(CORELIB) +diff --git a/src/video/ipu_csc/src/Makefile.am b/src/video/ipu_csc/src/Makefile.am +index 8015448..12b44a1 100755 +--- a/src/video/ipu_csc/src/Makefile.am ++++ b/src/video/ipu_csc/src/Makefile.am +@@ -6,7 +6,7 @@ endif + plugin_LTLIBRARIES = libmfw_gst_ipu_csc.la + + libmfw_gst_ipu_csc_la_SOURCES = mfw_gst_ipu_csc.c +-libmfw_gst_ipu_csc_la_CFLAGS = -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -I../../../../inc/plugin -I../../../../ ++libmfw_gst_ipu_csc_la_CFLAGS = -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -I$(top_srcdir)/inc/plugin -I$(top_srcdir) + libmfw_gst_ipu_csc_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) $(IPU_LIBS) ../../../../libs/libgstfsl- at GST_MAJORMINOR@.la + libmfw_gst_ipu_csc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) + +diff --git a/src/video/mpeg2_dec/src/Makefile.am b/src/video/mpeg2_dec/src/Makefile.am +index 006f740..d44a9b0 100755 +--- a/src/video/mpeg2_dec/src/Makefile.am ++++ b/src/video/mpeg2_dec/src/Makefile.am +@@ -7,7 +7,7 @@ libmfw_gst_mpeg2dec_la_SOURCES = mfw_gst_mpeg2dec.c + + # flags used to compile this plugin + # we use the GST_LIBS flags because we might be using plug-in libs +-libmfw_gst_mpeg2dec_la_CFLAGS = $(GST_BASE_CFLAGS) -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../inc/core_lib -DDIRECT_RENDER_VERSION=2 -I../../../../libs/me -I../../../../libs/gstbufmeta ++libmfw_gst_mpeg2dec_la_CFLAGS = $(GST_BASE_CFLAGS) -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/core_lib -DDIRECT_RENDER_VERSION=2 -I$(top_srcdir)/libs/me -I$(top_srcdir)/libs/gstbufmeta + libmfw_gst_mpeg2dec_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -l_mpeg2_dec_arm11_elinux + libmfw_gst_mpeg2dec_la_LIBADD += ../../../../libs/libgstfsl- at GST_MAJORMINOR@.la + libmfw_gst_mpeg2dec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(FSL_MM_CORE_LIBS) +diff --git a/src/video/mpeg4asp_dec/src/Makefile.am b/src/video/mpeg4asp_dec/src/Makefile.am +index 97dd578..394d42d 100755 +--- a/src/video/mpeg4asp_dec/src/Makefile.am ++++ b/src/video/mpeg4asp_dec/src/Makefile.am +@@ -28,19 +28,19 @@ libmfw_gst_mpeg4aspdec_la_SOURCES = mfw_gst_mpeg4asp_dec.c + # flags used to compile this plugin + # we use the GST_LIBS flags because we might be using plug-in libs + if PLATFORM_IS_MX2X +-libmfw_gst_mpeg4aspdec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -fPIC -DPADDED_OUTPUT -DOUTPUT_BUFFER_CHANGES $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../inc/core_lib -DDIRECT_RENDER_VERSION=2 -DFRAMEDROPING_ENALBED -march=armv5te -mcpu=arm926ej-s -I../../../../libs/me -I../../../../libs/gstbufmeta ++libmfw_gst_mpeg4aspdec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -fPIC -DPADDED_OUTPUT -DOUTPUT_BUFFER_CHANGES $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/core_lib -DDIRECT_RENDER_VERSION=2 -DFRAMEDROPING_ENALBED -march=armv5te -mcpu=arm926ej-s -I$(top_srcdir)/libs/me -I$(top_srcdir)/libs/gstbufmeta + endif + + if PLATFORM_IS_MX3X +-libmfw_gst_mpeg4aspdec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -fPIC -DPADDED_OUTPUT -DOUTPUT_BUFFER_CHANGES $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../inc/core_lib -DDIRECT_RENDER_VERSION=2 -DFRAMEDROPING_ENALBED -I../../../../libs/me -I../../../../libs/gstbufmeta ++libmfw_gst_mpeg4aspdec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -fPIC -DPADDED_OUTPUT -DOUTPUT_BUFFER_CHANGES $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/core_lib -DDIRECT_RENDER_VERSION=2 -DFRAMEDROPING_ENALBED -I$(top_srcdir)/libs/me -I$(top_srcdir)/libs/gstbufmeta + endif + + if PLATFORM_IS_MX5X +-libmfw_gst_mpeg4aspdec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -fPIC -DPADDED_OUTPUT -DOUTPUT_BUFFER_CHANGES $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../inc/core_lib -DDIRECT_RENDER_VERSION=2 -DFRAMEDROPING_ENALBED -I../../../../libs/me -I../../../../libs/gstbufmeta ++libmfw_gst_mpeg4aspdec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -fPIC -DPADDED_OUTPUT -DOUTPUT_BUFFER_CHANGES $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/core_lib -DDIRECT_RENDER_VERSION=2 -DFRAMEDROPING_ENALBED -I$(top_srcdir)/libs/me -I$(top_srcdir)/libs/gstbufmeta + endif + + if PLATFORM_IS_MX6X +-libmfw_gst_mpeg4aspdec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -fPIC -DPADDED_OUTPUT -DOUTPUT_BUFFER_CHANGES $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../inc/core_lib -DDIRECT_RENDER_VERSION=2 -DFRAMEDROPING_ENALBED -I../../../../libs/me -I../../../../libs/gstbufmeta ++libmfw_gst_mpeg4aspdec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -fPIC -DPADDED_OUTPUT -DOUTPUT_BUFFER_CHANGES $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/core_lib -DDIRECT_RENDER_VERSION=2 -DFRAMEDROPING_ENALBED -I$(top_srcdir)/libs/me -I$(top_srcdir)/libs/gstbufmeta + endif + + +diff --git a/src/video/vpu/src/Makefile.am b/src/video/vpu/src/Makefile.am +index c8b64ea..cb66817 100755 +--- a/src/video/vpu/src/Makefile.am ++++ b/src/video/vpu/src/Makefile.am +@@ -8,7 +8,7 @@ libmfw_vpu_la_SOURCES = vpu.c vpudec.c vpuenc.c + # flags used to compile this plugin + # we use the GST_LIBS flags because we might be using plug-in libs + +-libmfw_vpu_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../libs/me -I../../../../libs/gstbufmeta -I../../../../libs/gstsutils -I../../../../libs/gstnext -I../../../../inc/core_lib ++libmfw_vpu_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/libs/me -I$(top_srcdir)/libs/gstbufmeta -I$(top_srcdir)/libs/gstsutils -I$(top_srcdir)/libs/gstnext -I$(top_srcdir)/inc/core_lib + libmfw_vpu_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -lgstriff- at GST_MAJORMINOR@ -lgsttag- at GST_MAJORMINOR@ + + libmfw_vpu_la_LIBADD += ../../../../libs/libgstfsl- at GST_MAJORMINOR@.la +diff --git a/src/video/vpu_dec.full/src/Makefile.am b/src/video/vpu_dec.full/src/Makefile.am +index 7c878a8..be682fd 100755 +--- a/src/video/vpu_dec.full/src/Makefile.am ++++ b/src/video/vpu_dec.full/src/Makefile.am +@@ -27,7 +27,7 @@ libmfw_gst_vpu_dec_la_SOURCES = mfw_gst_vpu_decoder.c mfw_gst_vpu_thread.c + + # flags used to compile this plugin + # we use the GST_LIBS flags because we might be using plug-in libs +-libmfw_gst_vpu_dec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 $(VPU_CFLAGS) -I../../../../inc/plugin $(GST_PLATFORM_FLAGS) -DREALMEDIA -DDIVX -I../../../../libs/me -I../../../../libs/gstbufmeta ++libmfw_gst_vpu_dec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 $(VPU_CFLAGS) -I$(top_srcdir)/inc/plugin $(GST_PLATFORM_FLAGS) -DREALMEDIA -DDIVX -I$(top_srcdir)/libs/me -I$(top_srcdir)/libs/gstbufmeta + libmfw_gst_vpu_dec_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) -lvpu -lgstvideo-0.10 + libmfw_gst_vpu_dec_la_LIBADD += ../../../../libs/libgstfsl- at GST_MAJORMINOR@.la + libmfw_gst_vpu_dec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(VPU_LIBS) +diff --git a/src/video/vpu_enc/src/Makefile.am b/src/video/vpu_enc/src/Makefile.am +index ac8f272..a1da20b 100755 +--- a/src/video/vpu_enc/src/Makefile.am ++++ b/src/video/vpu_enc/src/Makefile.am +@@ -10,7 +10,7 @@ libmfw_gst_vpu_enc_la_SOURCES = mfw_gst_vpu_encoder.c + + # flags used to compile this plugin + # we use the GST_LIBS flags because we might be using plug-in libs +-libmfw_gst_vpu_enc_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 $(VPU_CFLAGS) -I../../../../inc/plugin -DVPU_$(PLATFORM) -I../../../../libs/gstbufmeta -I../../../../libs/vss -I../../../../libs/hbuf_alloc -I../../../../libs/me ++libmfw_gst_vpu_enc_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 $(VPU_CFLAGS) -I$(top_srcdir)/inc/plugin -DVPU_$(PLATFORM) -I$(top_srcdir)/libs/gstbufmeta -I$(top_srcdir)/libs/vss -I$(top_srcdir)/libs/hbuf_alloc -I$(top_srcdir)/libs/me + + libmfw_gst_vpu_enc_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) -lvpu + libmfw_gst_vpu_enc_la_LIBADD += ../../../../libs/libgstfsl- at GST_MAJORMINOR@.la +diff --git a/src/video/wmv9mp_dec/src/Makefile.am b/src/video/wmv9mp_dec/src/Makefile.am +index 49c0953..4bd7bda 100755 +--- a/src/video/wmv9mp_dec/src/Makefile.am ++++ b/src/video/wmv9mp_dec/src/Makefile.am +@@ -7,7 +7,7 @@ libmfw_gst_wmv9mpdec_la_SOURCES = mfw_gst_wmv9mpdec.c + + # flags used to compile this plugin + # we use the GST_LIBS flags because we might be using plug-in libs +-libmfw_gst_wmv9mpdec_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -fPIC -DOUTPUT_BUFFER_CHANGES -DPADDED_OUTPUT $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../inc/core_lib -DDIRECT_RENDER_VERSION=2 -DFRAMEDROPING_ENALBED -I../../../../libs/gstbufmeta ++libmfw_gst_wmv9mpdec_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -fPIC -DOUTPUT_BUFFER_CHANGES -DPADDED_OUTPUT $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/core_lib -DDIRECT_RENDER_VERSION=2 -DFRAMEDROPING_ENALBED -I$(top_srcdir)/libs/gstbufmeta + libmfw_gst_wmv9mpdec_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) -l_WMV9MP_dec_MP_arm11_elinux ../../../../libs/libgstfsl- at GST_MAJORMINOR@.la + libmfw_gst_wmv9mpdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(FSL_MM_CORE_LIBS) -lgstriff- at GST_MAJORMINOR@ + +diff --git a/src/video/wmv_dec/src/Makefile.am b/src/video/wmv_dec/src/Makefile.am +index 95d563a..3e87976 100755 +--- a/src/video/wmv_dec/src/Makefile.am ++++ b/src/video/wmv_dec/src/Makefile.am +@@ -7,7 +7,7 @@ libmfw_gst_wmvdec_la_SOURCES = mfw_gst_wmvdec.c + + # flags used to compile this plugin + # we use the GST_LIBS flags because we might be using plug-in libs +-libmfw_gst_wmvdec_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -fPIC -DOUTPUT_BUFFER_CHANGES -DWMV9_SIMPLE_ONLY -DPADDED_OUTPUT $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../inc/core_lib ++libmfw_gst_wmvdec_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -fPIC -DOUTPUT_BUFFER_CHANGES -DWMV9_SIMPLE_ONLY -DPADDED_OUTPUT $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/core_lib + libmfw_gst_wmvdec_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) -l_WMV789_dec_arm11_elinux + libmfw_gst_wmvdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(FSL_MM_CORE_LIBS) -lgstriff- at GST_MAJORMINOR@ + +-- +2.0.0 + diff --git a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk index 9ec92d8..5b12ced 100644 --- a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk +++ b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST_FSL_PLUGINS_VERSION = $(FREESCALE_IMX_VERSION) +GST_FSL_PLUGINS_VERSION = 3.0.11 GST_FSL_PLUGINS_SITE = $(FREESCALE_IMX_SITE) # Most is LGPLv2+, but some sources are copied from upstream and are @@ -16,13 +16,18 @@ GST_FSL_PLUGINS_INSTALL_STAGING = YES GST_FSL_PLUGINS_AUTORECONF = YES GST_FSL_PLUGINS_DEPENDENCIES += host-pkgconf gstreamer gst-plugins-base \ - libfslvpuwrap imx-lib libfslparser libfslcodec + libfslvpuwrap imx-lib imx-vpu libfslparser libfslcodec -GST_FSL_PLUGINS_CONF_ENV = PLATFORM=$(BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM) +GST_FSL_PLUGINS_CONF_ENV = \ + PLATFORM=$(BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM) \ + CROSS_ROOT="$(STAGING_DIR)" # needs access to imx-specific kernel headers GST_FSL_PLUGINS_DEPENDENCIES += linux -GST_FSL_PLUGINS_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -idirafter $(LINUX_DIR)/include" +GST_FSL_PLUGINS_INCLUDE = \ + -I$(LINUX_DIR)/include/uapi \ + -I$(LINUX_DIR)/include +GST_FSL_PLUGINS_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) $(GST_FSL_PLUGINS_INCLUDE)" ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) GST_FSL_PLUGINS_DEPENDENCIES += xlib_libX11 -- 2.0.0 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 5/5] gst-fsl-plugins: bump to version 3.0.11 2014-06-19 4:03 ` [Buildroot] [PATCH 5/5] gst-fsl-plugins: " Gary Bisson @ 2014-06-20 21:12 ` Yann E. MORIN 0 siblings, 0 replies; 25+ messages in thread From: Yann E. MORIN @ 2014-06-20 21:12 UTC (permalink / raw) To: buildroot Gary, All, On 2014-06-18 21:03 -0700, Gary Bisson spake thusly: > Signed-off-by: Gary Bisson <bisson.gary@gmail.com> > --- > ...gins-0002-Fix-bashism-in-configure-script.patch | 25 +- > .../gst-fsl-plugins-0003-Use-proper-objdump.patch | 6 +- > ...sl-linkage-add-lrt-for-shared-memory-func.patch | 2 +- > ...-plugins-0005-build-Fix-out-of-tree-build.patch | 616 +++++++++++++++++++++ In Buildroot, we're not doing out-of-tree builds of packages, so we do not need the 0005 patch. Since it is a biggish piece, it's better to leave it out. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------' ^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH v2 00/11] freescale: update userspace packages 2014-06-19 4:03 [Buildroot] [PATCH 0/5] freescale: update userspace packages Gary Bisson ` (4 preceding siblings ...) 2014-06-19 4:03 ` [Buildroot] [PATCH 5/5] gst-fsl-plugins: " Gary Bisson @ 2014-06-27 5:24 ` Gary Bisson 2014-06-27 5:24 ` [Buildroot] [PATCH v2 01/11] libfslvpuwrap: change version to be independent Gary Bisson ` (11 more replies) 5 siblings, 12 replies; 25+ messages in thread From: Gary Bisson @ 2014-06-27 5:24 UTC (permalink / raw) To: buildroot Yann, all, Here is the rework which I hope covers all the previous remarks. This time I tried to be more talkative in every patch but here is a summary: 1- first libfslvpuwrap gets independent as suggested 2- simply bump FREESCALE_IMX_VERSION to 3.10.17-1.0.0 3- update imx-lib: using idirafter just for uapi folder + remove unnecessary EULA 4- make the platform choice as a common option: made BR2_PACKAGE_FREESCALE_IMX a menuconfig not to get BR2_PACKAGE_FREESCALE_IMX_PLATFORM set in every config. 5- just adding the imx-vpu package from Freescale with no modification but using idirafter for uapi folder only 6- bump libfslvpuwrap: now depends on imx-vpu 7- bump libfslcodec: nothing special 8- bump libfslparser: same 9- gst-fsl-plugins: now depends on imx-vpu as well 10/11- fix imx-vpu for the IOGetVirtMem in case of a 3G/1G split: I finally decided not to go with the MAP_FAILED as the return value is an int. I think using -1 is as clear and avoids useless cast. That function could have been written in a simpler way but I didn't want to change the code too much. Same as last time, testing has been done on a Nitrogen6x using the kernel patch committed previously. GPU test (gpu-viv-bin-mx6q): # cd /usr/share/examples/viv_samples/vdk/ # ./tutorial7 VPU test (libfslvpuwrap, libfslcodec, gst-fsl-plugins, imx-vpu): # VSALPHA=1 gst-launch-0.10 filesrc location=trailer_1080p_h264_mp3.avi ! avidemux ! vpudec ! mfw_isink Thanks, Gary Gary Bisson (11): libfslvpuwrap: change version to be independent freescale-imx: bump to version 3.10.17-1.0.0 freescale-imx: update imx-lib package freescale-imx: change platform choice to be common freescale-imx: add imx-vpu package libfslvpuwrap: bump to version 1.0.46 libfslcodec: bump to version 3.0.11 libfslparser: bump to version 3.0.11 gst-fsl-plugins: bump to version 3.0.11 imx-vpu: fix IOSystemInit failure imx-vpu: fix IOGetVirtMem return value checks package/freescale-imx/Config.in | 39 ++++++++++++++++ package/freescale-imx/freescale-imx.mk | 2 +- package/freescale-imx/imx-lib/Config.in | 37 --------------- package/freescale-imx/imx-lib/imx-lib.mk | 25 ++-------- package/freescale-imx/imx-vpu/Config.in | 16 +++++++ ...-vpu-0001-vpu-io-fix-IOSystemInit-failure.patch | 24 ++++++++++ ...-lib-fix-IOGetVirtMem-return-value-checks.patch | 51 +++++++++++++++++++++ package/freescale-imx/imx-vpu/imx-vpu.mk | 53 ++++++++++++++++++++++ package/gstreamer/gst-fsl-plugins/Config.in | 1 + ...gins-0002-Fix-bashism-in-configure-script.patch | 25 ++-------- .../gst-fsl-plugins-0003-Use-proper-objdump.patch | 6 +-- ...sl-linkage-add-lrt-for-shared-memory-func.patch | 2 +- .../gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk | 10 ++-- package/libfslcodec/libfslcodec.mk | 2 +- package/libfslparser/libfslparser.mk | 2 +- package/libfslvpuwrap/Config.in | 2 +- package/libfslvpuwrap/libfslvpuwrap.mk | 4 +- 17 files changed, 209 insertions(+), 92 deletions(-) create mode 100644 package/freescale-imx/imx-vpu/Config.in create mode 100644 package/freescale-imx/imx-vpu/imx-vpu-0001-vpu-io-fix-IOSystemInit-failure.patch create mode 100644 package/freescale-imx/imx-vpu/imx-vpu-0002-vpu-lib-fix-IOGetVirtMem-return-value-checks.patch create mode 100644 package/freescale-imx/imx-vpu/imx-vpu.mk -- 2.0.0 ^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH v2 01/11] libfslvpuwrap: change version to be independent 2014-06-27 5:24 ` [Buildroot] [PATCH v2 00/11] freescale: update userspace packages Gary Bisson @ 2014-06-27 5:24 ` Gary Bisson 2014-06-29 19:01 ` Yann E. MORIN 2014-06-27 5:24 ` [Buildroot] [PATCH v2 02/11] freescale-imx: bump to version 3.10.17-1.0.0 Gary Bisson ` (10 subsequent siblings) 11 siblings, 1 reply; 25+ messages in thread From: Gary Bisson @ 2014-06-27 5:24 UTC (permalink / raw) To: buildroot in future releases, libfslvpuwrap will have a version number independent from freescale-imx package. Signed-off-by: Gary Bisson <bisson.gary@gmail.com> --- package/libfslvpuwrap/libfslvpuwrap.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libfslvpuwrap/libfslvpuwrap.mk b/package/libfslvpuwrap/libfslvpuwrap.mk index 75c9887..2299032 100644 --- a/package/libfslvpuwrap/libfslvpuwrap.mk +++ b/package/libfslvpuwrap/libfslvpuwrap.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFSLVPUWRAP_VERSION = $(FREESCALE_IMX_VERSION) +LIBFSLVPUWRAP_VERSION = 3.5.7-1.0.0 LIBFSLVPUWRAP_SITE = $(FREESCALE_IMX_SITE) LIBFSLVPUWRAP_SOURCE = libfslvpuwrap-$(LIBFSLVPUWRAP_VERSION).bin LIBFSLVPUWRAP_LICENSE = Freescale Semiconductor Software License Agreement -- 2.0.0 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH v2 01/11] libfslvpuwrap: change version to be independent 2014-06-27 5:24 ` [Buildroot] [PATCH v2 01/11] libfslvpuwrap: change version to be independent Gary Bisson @ 2014-06-29 19:01 ` Yann E. MORIN 0 siblings, 0 replies; 25+ messages in thread From: Yann E. MORIN @ 2014-06-29 19:01 UTC (permalink / raw) To: buildroot Gary, All, On 2014-06-26 22:24 -0700, Gary Bisson spake thusly: > in future releases, libfslvpuwrap will have a version number independent > from freescale-imx package. > > Signed-off-by: Gary Bisson <bisson.gary@gmail.com> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Regards, Yann E. MORIN. > --- > package/libfslvpuwrap/libfslvpuwrap.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/libfslvpuwrap/libfslvpuwrap.mk b/package/libfslvpuwrap/libfslvpuwrap.mk > index 75c9887..2299032 100644 > --- a/package/libfslvpuwrap/libfslvpuwrap.mk > +++ b/package/libfslvpuwrap/libfslvpuwrap.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBFSLVPUWRAP_VERSION = $(FREESCALE_IMX_VERSION) > +LIBFSLVPUWRAP_VERSION = 3.5.7-1.0.0 > LIBFSLVPUWRAP_SITE = $(FREESCALE_IMX_SITE) > LIBFSLVPUWRAP_SOURCE = libfslvpuwrap-$(LIBFSLVPUWRAP_VERSION).bin > LIBFSLVPUWRAP_LICENSE = Freescale Semiconductor Software License Agreement > -- > 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. | '------------------------------^-------^------------------^--------------------' ^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH v2 02/11] freescale-imx: bump to version 3.10.17-1.0.0 2014-06-27 5:24 ` [Buildroot] [PATCH v2 00/11] freescale: update userspace packages Gary Bisson 2014-06-27 5:24 ` [Buildroot] [PATCH v2 01/11] libfslvpuwrap: change version to be independent Gary Bisson @ 2014-06-27 5:24 ` Gary Bisson 2014-06-27 5:24 ` [Buildroot] [PATCH v2 03/11] freescale-imx: update imx-lib package Gary Bisson ` (9 subsequent siblings) 11 siblings, 0 replies; 25+ messages in thread From: Gary Bisson @ 2014-06-27 5:24 UTC (permalink / raw) To: buildroot Signed-off-by: Gary Bisson <bisson.gary@gmail.com> --- package/freescale-imx/freescale-imx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/freescale-imx/freescale-imx.mk b/package/freescale-imx/freescale-imx.mk index 39ffa8a..843ba61 100644 --- a/package/freescale-imx/freescale-imx.mk +++ b/package/freescale-imx/freescale-imx.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREESCALE_IMX_VERSION = 3.5.7-1.0.0 +FREESCALE_IMX_VERSION = 3.10.17-1.0.0 FREESCALE_IMX_SITE = http://www.freescale.com/lgfiles/NMG/MAD/YOCTO/ include $(sort $(wildcard package/freescale-imx/*/*.mk)) -- 2.0.0 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH v2 03/11] freescale-imx: update imx-lib package 2014-06-27 5:24 ` [Buildroot] [PATCH v2 00/11] freescale: update userspace packages Gary Bisson 2014-06-27 5:24 ` [Buildroot] [PATCH v2 01/11] libfslvpuwrap: change version to be independent Gary Bisson 2014-06-27 5:24 ` [Buildroot] [PATCH v2 02/11] freescale-imx: bump to version 3.10.17-1.0.0 Gary Bisson @ 2014-06-27 5:24 ` Gary Bisson 2014-06-27 5:24 ` [Buildroot] [PATCH v2 04/11] freescale-imx: change platform choice to be common Gary Bisson ` (8 subsequent siblings) 11 siblings, 0 replies; 25+ messages in thread From: Gary Bisson @ 2014-06-27 5:24 UTC (permalink / raw) To: buildroot imx-lib no longer includes VPU code and therefore is now free from Freescale License. Signed-off-by: Gary Bisson <bisson.gary@gmail.com> --- package/freescale-imx/imx-lib/imx-lib.mk | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/package/freescale-imx/imx-lib/imx-lib.mk b/package/freescale-imx/imx-lib/imx-lib.mk index 4f605d7..2a94430 100644 --- a/package/freescale-imx/imx-lib/imx-lib.mk +++ b/package/freescale-imx/imx-lib/imx-lib.mk @@ -6,9 +6,9 @@ IMX_LIB_VERSION = $(FREESCALE_IMX_VERSION) IMX_LIB_SITE = $(FREESCALE_IMX_SITE) -IMX_LIB_LICENSE = Freescale License (vpu), LGPLv2.1+ (the rest) +IMX_LIB_LICENSE = LGPLv2.1+ IMX_LIB_LICENSE_FILES = EULA -IMX_LIB_SOURCE = imx-lib-$(IMX_LIB_VERSION).bin +IMX_LIB_SOURCE = imx-lib-$(IMX_LIB_VERSION).tar.gz IMX_LIB_INSTALL_STAGING = YES @@ -17,7 +17,7 @@ IMX_LIB_DEPENDENCIES += linux IMX_LIB_INCLUDE = \ -I$(LINUX_DIR)/drivers/mxc/security/rng/include \ -I$(LINUX_DIR)/drivers/mxc/security/sahara2/include \ - -idirafter $(LINUX_DIR)/include + -idirafter $(LINUX_DIR)/include/uapi IMX_LIB_MAKE_ENV = \ $(TARGET_MAKE_ENV) \ @@ -26,23 +26,6 @@ IMX_LIB_MAKE_ENV = \ PLATFORM=$(BR2_PACKAGE_IMX_LIB_PLATFORM) \ INCLUDE="$(IMX_LIB_INCLUDE)" -# The archive is a shell-self-extractor of a bzipped tar. It happens -# to extract in the correct directory (imx-lib-x.y.z) -# The --force makes sure it doesn't fail if the source dir already exists. -# The --auto-accept skips the license check - not needed for us -# because we have legal-info -# Since there's a EULA in the bin file, extract it to imx-lib-x.y.z/EULA -# -define IMX_LIB_EXTRACT_CMDS - awk 'BEGIN { start=0; } \ - /^EOEULA/ { start = 0; } \ - { if (start) print; } \ - /<<EOEULA/ { start=1; }'\ - $(DL_DIR)/$(IMX_LIB_SOURCE) > $(@D)/EULA - cd $(BUILD_DIR); \ - sh $(DL_DIR)/$(IMX_LIB_SOURCE) --force --auto-accept -endef - define IMX_LIB_BUILD_CMDS $(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D) endef -- 2.0.0 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH v2 04/11] freescale-imx: change platform choice to be common 2014-06-27 5:24 ` [Buildroot] [PATCH v2 00/11] freescale: update userspace packages Gary Bisson ` (2 preceding siblings ...) 2014-06-27 5:24 ` [Buildroot] [PATCH v2 03/11] freescale-imx: update imx-lib package Gary Bisson @ 2014-06-27 5:24 ` Gary Bisson 2014-06-27 5:24 ` [Buildroot] [PATCH v2 05/11] freescale-imx: add imx-vpu package Gary Bisson ` (7 subsequent siblings) 11 siblings, 0 replies; 25+ messages in thread From: Gary Bisson @ 2014-06-27 5:24 UTC (permalink / raw) To: buildroot that way all the packages can inherit from that information plus the Vivante package will only be available for iMX6Q platforms. Signed-off-by: Gary Bisson <bisson.gary@gmail.com> --- package/freescale-imx/Config.in | 47 ++++++++++++++++++++++++++++++-- package/freescale-imx/imx-lib/Config.in | 37 ------------------------- package/freescale-imx/imx-lib/imx-lib.mk | 2 +- 3 files changed, 46 insertions(+), 40 deletions(-) diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in index 7c22f79..0626a74 100644 --- a/package/freescale-imx/Config.in +++ b/package/freescale-imx/Config.in @@ -1,8 +1,51 @@ -menu "Freescale i.MX libraries" +menuconfig BR2_PACKAGE_FREESCALE_IMX + bool "Freescale i.MX libraries" depends on BR2_arm + help + Those packages provide hardware acceleration for GPU or VPU, hardware + optimization or some hardware tools for Freescale i.MX platforms. + +if BR2_PACKAGE_FREESCALE_IMX +choice + prompt "i.MX platform" + +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX25_3STACK + bool "imx25-3stack" + +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX27ADS + bool "imx27ads" + +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX37_3STACK + bool "imx37-3stack" + +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX50 + bool "imx50" + +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX51 + bool "imx51" + +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53 + bool "imx53" + +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q + bool "imx6q" + +endchoice + +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM + string + default "IMX25_3STACK" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX25_3STACK + default "IMX27ADS" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX27ADS + default "IMX37_3STACK" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX37_3STACK + default "IMX50" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX50 + default "IMX51" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX51 + default "IMX53" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53 + default "IMX6Q" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q source "package/freescale-imx/imx-lib/Config.in" source "package/freescale-imx/firmware-imx/Config.in" +if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q source "package/freescale-imx/gpu-viv-bin-mx6q/Config.in" +endif -endmenu +endif diff --git a/package/freescale-imx/imx-lib/Config.in b/package/freescale-imx/imx-lib/Config.in index 444060b..3b0f7a9 100644 --- a/package/freescale-imx/imx-lib/Config.in +++ b/package/freescale-imx/imx-lib/Config.in @@ -14,40 +14,3 @@ config BR2_PACKAGE_IMX_LIB This library is provided by Freescale as-is and doesn't have an upstream. -if BR2_PACKAGE_IMX_LIB -choice - prompt "i.MX platform" - -config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX25_3STACK - bool "imx25-3stack" - -config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX27ADS - bool "imx27ads" - -config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX37_3STACK - bool "imx37-3stack" - -config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX50 - bool "imx50" - -config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX51 - bool "imx51" - -config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX53 - bool "imx53" - -config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX6Q - bool "imx6q" - -endchoice - -config BR2_PACKAGE_IMX_LIB_PLATFORM - string - default "IMX25_3STACK" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX25_3STACK - default "IMX27ADS" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX27ADS - default "IMX37_3STACK" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX37_3STACK - default "IMX50" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX50 - default "IMX51" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX51 - default "IMX53" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX53 - default "IMX6Q" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX6Q -endif diff --git a/package/freescale-imx/imx-lib/imx-lib.mk b/package/freescale-imx/imx-lib/imx-lib.mk index 2a94430..0d66759 100644 --- a/package/freescale-imx/imx-lib/imx-lib.mk +++ b/package/freescale-imx/imx-lib/imx-lib.mk @@ -23,7 +23,7 @@ IMX_LIB_MAKE_ENV = \ $(TARGET_MAKE_ENV) \ $(TARGET_CONFIGURE_OPTS) \ CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)" \ - PLATFORM=$(BR2_PACKAGE_IMX_LIB_PLATFORM) \ + PLATFORM=$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM) \ INCLUDE="$(IMX_LIB_INCLUDE)" define IMX_LIB_BUILD_CMDS -- 2.0.0 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH v2 05/11] freescale-imx: add imx-vpu package 2014-06-27 5:24 ` [Buildroot] [PATCH v2 00/11] freescale: update userspace packages Gary Bisson ` (3 preceding siblings ...) 2014-06-27 5:24 ` [Buildroot] [PATCH v2 04/11] freescale-imx: change platform choice to be common Gary Bisson @ 2014-06-27 5:24 ` Gary Bisson 2014-06-27 5:24 ` [Buildroot] [PATCH v2 06/11] libfslvpuwrap: bump to version 1.0.46 Gary Bisson ` (6 subsequent siblings) 11 siblings, 0 replies; 25+ messages in thread From: Gary Bisson @ 2014-06-27 5:24 UTC (permalink / raw) To: buildroot as of 3.10.17-1.0.0 release, VPU code is now in its own package. Signed-off-by: Gary Bisson <bisson.gary@gmail.com> --- package/freescale-imx/Config.in | 1 + package/freescale-imx/imx-vpu/Config.in | 16 ++++++++++ package/freescale-imx/imx-vpu/imx-vpu.mk | 53 ++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+) create mode 100644 package/freescale-imx/imx-vpu/Config.in create mode 100644 package/freescale-imx/imx-vpu/imx-vpu.mk diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in index 0626a74..d8c6efc 100644 --- a/package/freescale-imx/Config.in +++ b/package/freescale-imx/Config.in @@ -43,6 +43,7 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM default "IMX6Q" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q source "package/freescale-imx/imx-lib/Config.in" +source "package/freescale-imx/imx-vpu/Config.in" source "package/freescale-imx/firmware-imx/Config.in" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q source "package/freescale-imx/gpu-viv-bin-mx6q/Config.in" diff --git a/package/freescale-imx/imx-vpu/Config.in b/package/freescale-imx/imx-vpu/Config.in new file mode 100644 index 0000000..575383f --- /dev/null +++ b/package/freescale-imx/imx-vpu/Config.in @@ -0,0 +1,16 @@ +comment "imx-vpu needs an imx-specific Linux kernel to be built" + depends on BR2_arm && !BR2_LINUX_KERNEL + +config BR2_PACKAGE_IMX_VPU + bool "imx-vpu" + depends on BR2_LINUX_KERNEL + depends on BR2_arm # Only relevant for i.MX + help + Library of userspace helpers specific for the Freescale i.MX + platform. It wraps the kernel interfaces for the i.MX platform + Video Processing Unit (VPU) driver. It requires a kernel that + includes the i.MX specific headers to be built. + + This library is provided by Freescale as-is and doesn't have + an upstream. + diff --git a/package/freescale-imx/imx-vpu/imx-vpu.mk b/package/freescale-imx/imx-vpu/imx-vpu.mk new file mode 100644 index 0000000..10c7d8b --- /dev/null +++ b/package/freescale-imx/imx-vpu/imx-vpu.mk @@ -0,0 +1,53 @@ +################################################################################ +# +# imx-vpu +# +################################################################################ + +IMX_VPU_VERSION = $(FREESCALE_IMX_VERSION) +IMX_VPU_SITE = $(FREESCALE_IMX_SITE) +IMX_VPU_LICENSE = Freescale License +IMX_VPU_LICENSE_FILES = EULA +IMX_VPU_SOURCE = imx-vpu-$(IMX_VPU_VERSION).bin + +IMX_VPU_INSTALL_STAGING = YES + +# imx-vpu needs access to imx-specific kernel headers +IMX_VPU_DEPENDENCIES += linux +IMX_VPU_MAKE_ENV = \ + $(TARGET_MAKE_ENV) \ + $(TARGET_CONFIGURE_OPTS) \ + CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)" \ + PLATFORM=$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM) \ + INCLUDE="-idirafter $(LINUX_DIR)/include" + +# The archive is a shell-self-extractor of a bzipped tar. It happens +# to extract in the correct directory (imx-vpu-x.y.z) +# The --force makes sure it doesn't fail if the source dir already exists. +# The --auto-accept skips the license check - not needed for us +# because we have legal-info +# Since there's a EULA in the bin file, extract it to imx-vpu-x.y.z/EULA +# +define IMX_VPU_EXTRACT_CMDS + awk 'BEGIN { start=0; } \ + /^EOEULA/ { start = 0; } \ + { if (start) print; } \ + /<<EOEULA/ { start=1; }'\ + $(DL_DIR)/$(IMX_VPU_SOURCE) > $(@D)/EULA + cd $(BUILD_DIR); \ + sh $(DL_DIR)/$(IMX_VPU_SOURCE) --force --auto-accept +endef + +define IMX_VPU_BUILD_CMDS + $(IMX_VPU_MAKE_ENV) $(MAKE1) -C $(@D) +endef + +define IMX_VPU_INSTALL_STAGING_CMDS + $(IMX_VPU_MAKE_ENV) $(MAKE1) -C $(@D) DEST_DIR=$(STAGING_DIR) install +endef + +define IMX_VPU_INSTALL_TARGET_CMDS + $(IMX_VPU_MAKE_ENV) $(MAKE1) -C $(@D) DEST_DIR=$(TARGET_DIR) install +endef + +$(eval $(generic-package)) -- 2.0.0 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH v2 06/11] libfslvpuwrap: bump to version 1.0.46 2014-06-27 5:24 ` [Buildroot] [PATCH v2 00/11] freescale: update userspace packages Gary Bisson ` (4 preceding siblings ...) 2014-06-27 5:24 ` [Buildroot] [PATCH v2 05/11] freescale-imx: add imx-vpu package Gary Bisson @ 2014-06-27 5:24 ` Gary Bisson 2014-06-27 5:24 ` [Buildroot] [PATCH v2 07/11] libfslcodec: bump to version 3.0.11 Gary Bisson ` (5 subsequent siblings) 11 siblings, 0 replies; 25+ messages in thread From: Gary Bisson @ 2014-06-27 5:24 UTC (permalink / raw) To: buildroot as VPU code is no longer in imx-lib, this package now depends on imx-vpu package. Signed-off-by: Gary Bisson <bisson.gary@gmail.com> --- package/libfslvpuwrap/Config.in | 2 +- package/libfslvpuwrap/libfslvpuwrap.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libfslvpuwrap/Config.in b/package/libfslvpuwrap/Config.in index 9cf7633..fa85ce5 100644 --- a/package/libfslvpuwrap/Config.in +++ b/package/libfslvpuwrap/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_LIBFSLVPUWRAP bool "libfslvpuwrap" depends on BR2_LINUX_KERNEL depends on BR2_arm # Only relevant for i.MX - select BR2_PACKAGE_IMX_LIB + select BR2_PACKAGE_IMX_VPU help Wrapper library for the vpu library, giving it a different API. diff --git a/package/libfslvpuwrap/libfslvpuwrap.mk b/package/libfslvpuwrap/libfslvpuwrap.mk index 2299032..c3a5c1c 100644 --- a/package/libfslvpuwrap/libfslvpuwrap.mk +++ b/package/libfslvpuwrap/libfslvpuwrap.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFSLVPUWRAP_VERSION = 3.5.7-1.0.0 +LIBFSLVPUWRAP_VERSION = 1.0.46 LIBFSLVPUWRAP_SITE = $(FREESCALE_IMX_SITE) LIBFSLVPUWRAP_SOURCE = libfslvpuwrap-$(LIBFSLVPUWRAP_VERSION).bin LIBFSLVPUWRAP_LICENSE = Freescale Semiconductor Software License Agreement @@ -14,7 +14,7 @@ LIBFSLVPUWRAP_REDISTRIBUTE = NO LIBFSLVPUWRAP_INSTALL_STAGING = YES -LIBFSLVPUWRAP_DEPENDENCIES += imx-lib +LIBFSLVPUWRAP_DEPENDENCIES += imx-vpu # The archive is a shell-self-extractor of a bzipped tar. It happens # to extract in the correct directory (libfslvpuwrap-x.y.z) -- 2.0.0 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH v2 07/11] libfslcodec: bump to version 3.0.11 2014-06-27 5:24 ` [Buildroot] [PATCH v2 00/11] freescale: update userspace packages Gary Bisson ` (5 preceding siblings ...) 2014-06-27 5:24 ` [Buildroot] [PATCH v2 06/11] libfslvpuwrap: bump to version 1.0.46 Gary Bisson @ 2014-06-27 5:24 ` Gary Bisson 2014-06-27 5:24 ` [Buildroot] [PATCH v2 08/11] libfslparser: " Gary Bisson ` (4 subsequent siblings) 11 siblings, 0 replies; 25+ messages in thread From: Gary Bisson @ 2014-06-27 5:24 UTC (permalink / raw) To: buildroot this package version is now independent from freescale-imx package. Signed-off-by: Gary Bisson <bisson.gary@gmail.com> --- package/libfslcodec/libfslcodec.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libfslcodec/libfslcodec.mk b/package/libfslcodec/libfslcodec.mk index d52158c..1a364bb 100644 --- a/package/libfslcodec/libfslcodec.mk +++ b/package/libfslcodec/libfslcodec.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFSLCODEC_VERSION = $(FREESCALE_IMX_VERSION) +LIBFSLCODEC_VERSION = 3.0.11 LIBFSLCODEC_SITE = $(FREESCALE_IMX_SITE) LIBFSLCODEC_SOURCE = libfslcodec-$(LIBFSLCODEC_VERSION).bin LIBFSLCODEC_LICENSE = Freescale Semiconductor Software License Agreement, BSD-3c (flac, ogg headers) -- 2.0.0 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH v2 08/11] libfslparser: bump to version 3.0.11 2014-06-27 5:24 ` [Buildroot] [PATCH v2 00/11] freescale: update userspace packages Gary Bisson ` (6 preceding siblings ...) 2014-06-27 5:24 ` [Buildroot] [PATCH v2 07/11] libfslcodec: bump to version 3.0.11 Gary Bisson @ 2014-06-27 5:24 ` Gary Bisson 2014-06-27 5:24 ` [Buildroot] [PATCH v2 09/11] gst-fsl-plugins: " Gary Bisson ` (3 subsequent siblings) 11 siblings, 0 replies; 25+ messages in thread From: Gary Bisson @ 2014-06-27 5:24 UTC (permalink / raw) To: buildroot this package version is now independent from freescale-imx package. Signed-off-by: Gary Bisson <bisson.gary@gmail.com> --- package/libfslparser/libfslparser.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libfslparser/libfslparser.mk b/package/libfslparser/libfslparser.mk index 0d92e02..d52b151 100644 --- a/package/libfslparser/libfslparser.mk +++ b/package/libfslparser/libfslparser.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFSLPARSER_VERSION = $(FREESCALE_IMX_VERSION) +LIBFSLPARSER_VERSION = 3.0.11 LIBFSLPARSER_SITE = $(FREESCALE_IMX_SITE) LIBFSLPARSER_SOURCE = libfslparser-$(LIBFSLPARSER_VERSION).bin LIBFSLPARSER_LICENSE = Freescale Semiconductor Software License Agreement -- 2.0.0 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH v2 09/11] gst-fsl-plugins: bump to version 3.0.11 2014-06-27 5:24 ` [Buildroot] [PATCH v2 00/11] freescale: update userspace packages Gary Bisson ` (7 preceding siblings ...) 2014-06-27 5:24 ` [Buildroot] [PATCH v2 08/11] libfslparser: " Gary Bisson @ 2014-06-27 5:24 ` Gary Bisson 2014-06-27 5:24 ` [Buildroot] [PATCH v2 10/11] imx-vpu: fix IOSystemInit failure Gary Bisson ` (2 subsequent siblings) 11 siblings, 0 replies; 25+ messages in thread From: Gary Bisson @ 2014-06-27 5:24 UTC (permalink / raw) To: buildroot as the VPU code is now apart from imx-lib, this package also depends on imx-vpu. Signed-off-by: Gary Bisson <bisson.gary@gmail.com> --- package/gstreamer/gst-fsl-plugins/Config.in | 1 + ...gins-0002-Fix-bashism-in-configure-script.patch | 25 +++++----------------- .../gst-fsl-plugins-0003-Use-proper-objdump.patch | 6 +++--- ...sl-linkage-add-lrt-for-shared-memory-func.patch | 2 +- .../gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk | 10 +++++---- 5 files changed, 16 insertions(+), 28 deletions(-) diff --git a/package/gstreamer/gst-fsl-plugins/Config.in b/package/gstreamer/gst-fsl-plugins/Config.in index 19fa0da..fc0184e 100644 --- a/package/gstreamer/gst-fsl-plugins/Config.in +++ b/package/gstreamer/gst-fsl-plugins/Config.in @@ -13,6 +13,7 @@ config BR2_PACKAGE_GST_FSL_PLUGINS select BR2_PACKAGE_GST_PLUGINS_BASE select BR2_PACKAGE_LIBFSLVPUWRAP select BR2_PACKAGE_IMX_LIB + select BR2_PACKAGE_IMX_VPU select BR2_PACKAGE_LIBFSLPARSER select BR2_PACKAGE_LIBFSLCODEC help diff --git a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0002-Fix-bashism-in-configure-script.patch b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0002-Fix-bashism-in-configure-script.patch index 8af3644..35617cd 100644 --- a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0002-Fix-bashism-in-configure-script.patch +++ b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0002-Fix-bashism-in-configure-script.patch @@ -9,29 +9,14 @@ have the default dash as /bin/sh define a variable ending with Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> --- - configure.ac | 22 +++++++++++----------- - 1 file changed, 11 insertions(+), 11 deletions(-) + configure.ac | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 5968eb6..1a31a06 100755 --- a/configure.ac +++ b/configure.ac -@@ -60,10 +60,10 @@ AC_DEFUN([CHECK_DISABLE_FEATURE], - [use_[$1]=yes]) - if test "$use_[$1]" = "yes"; then - SAVE_CPPFLAGS="$CPPFLAGS" -- CPPFLAGS=`$PKG_CONFIG --cflags libfslaudiocodec` -- CPPFLAGS+=`$PKG_CONFIG --cflags libfslvideocodec` -- CPPFLAGS+=`$PKG_CONFIG --cflags libfslparser` -- CPPFLAGS+=`$PKG_CONFIG --cflags libfslvpuwrap` -+ CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags libfslaudiocodec`" -+ CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags libfslvideocodec`" -+ CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags libfslparser`" -+ CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags libfslvpuwrap`" - AC_CHECK_HEADERS([$4], HAVE_[$3]=yes, HAVE_[$3]=no && break) - CPPFLAGS="$SAVE_CPPFLAGS" - if test "x$HAVE_[$3]" = "xyes"; then -@@ -157,7 +157,7 @@ AC_SUBST(GST_PLUGINS_BASE_LIBS) +@@ -152,7 +152,7 @@ AC_SUBST(GST_PLUGINS_BASE_LIBS) AC_CHECK_HEADERS([vpu_lib.h], [HAVE_VPU_LIB=yes], [HAVE_VPU_LIB=no]) if test "x$HAVE_VPU_LIB" = "xyes"; then VPU_LIBS=`$PKG_CONFIG --libs libfslvpuwrap 2>/dev/null` @@ -40,8 +25,8 @@ index 5968eb6..1a31a06 100755 fi AC_SUBST(VPU_LIBS) -@@ -173,15 +173,15 @@ AC_SUBST(IPU_CFLAGS) - AC_SUBST(IPU_LIBS) +@@ -176,15 +176,15 @@ AC_SUBST(RT_CFLAGS) + AC_SUBST(RT_LIBS) FSL_MM_CORE_CFLAGS=`$PKG_CONFIG --cflags libfslaudiocodec 2>/dev/null` -FSL_MM_CORE_CFLAGS+=`$PKG_CONFIG --cflags libfslvideocodec 2>/dev/null` diff --git a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0003-Use-proper-objdump.patch b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0003-Use-proper-objdump.patch index 8fce239..b7b8c9f 100644 --- a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0003-Use-proper-objdump.patch +++ b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0003-Use-proper-objdump.patch @@ -18,16 +18,16 @@ index 1a31a06..cc7557d 100755 @@ -17,7 +17,7 @@ AC_DEFUN([FIND_PARSER_SONAME], AC_MSG_CHECKING([for lib_$1_parser_$2_elinux.3.0.so soname]) path=`$PKG_CONFIG --variable=libdir libfslparser` - SONAME=$( $CC -print-file-name=$path/lib_$1_parser_$2_elinux.so | \ + SONAME=$( $CC -print-file-name=$PKG_CONFIG_SYSROOT_DIR$path/lib_$1_parser_$2_elinux.so | \ - while read output; do objdump -p $output | \ + while read output; do $OBJDUMP -p $output | \ grep "SONAME" | \ sed -e 's/ \+SONAME \+//'; done 2> /dev/null ) if [[ -z "$SONAME" ]]; then -@@ -37,7 +37,7 @@ AC_DEFUN([FIND_ACODEC_SONAME], +@@ -36,7 +36,7 @@ AC_DEFUN([FIND_ACODEC_SONAME], AC_MSG_CHECKING([for lib_$1_wrap_$2_elinux.so soname]) path=`$PKG_CONFIG --variable=libdir libfslaudiocodec` - SONAME=$( $CC -print-file-name=$path/wrap/lib_$1_wrap_$2_elinux.so | \ + SONAME=$( $CC -print-file-name=$PKG_CONFIG_SYSROOT_DIR$path/wrap/lib_$1_wrap_$2_elinux.so | \ - while read output; do objdump -p $output | \ + while read output; do $OBJDUMP -p $output | \ grep "SONAME" | \ 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 e58467e..763703c 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 @@ -18,7 +18,7 @@ diff --git a/configure.ac b/configure.ac 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 +@@ -170,6 +170,9 @@ AC_CHECK_LIB(ipu, mxc_ipu_lib_task_init, [IPU_LIBS=-lipu], [echo "No libipu arou AC_SUBST(IPU_CFLAGS) AC_SUBST(IPU_LIBS) diff --git a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk index 9ec92d8..1ae6596 100644 --- a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk +++ b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST_FSL_PLUGINS_VERSION = $(FREESCALE_IMX_VERSION) +GST_FSL_PLUGINS_VERSION = 3.0.11 GST_FSL_PLUGINS_SITE = $(FREESCALE_IMX_SITE) # Most is LGPLv2+, but some sources are copied from upstream and are @@ -16,13 +16,15 @@ GST_FSL_PLUGINS_INSTALL_STAGING = YES GST_FSL_PLUGINS_AUTORECONF = YES GST_FSL_PLUGINS_DEPENDENCIES += host-pkgconf gstreamer gst-plugins-base \ - libfslvpuwrap imx-lib libfslparser libfslcodec + libfslvpuwrap imx-lib imx-vpu libfslparser libfslcodec -GST_FSL_PLUGINS_CONF_ENV = PLATFORM=$(BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM) +GST_FSL_PLUGINS_CONF_ENV = \ + PLATFORM=$(BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM) \ + CROSS_ROOT="$(STAGING_DIR)" # needs access to imx-specific kernel headers GST_FSL_PLUGINS_DEPENDENCIES += linux -GST_FSL_PLUGINS_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -idirafter $(LINUX_DIR)/include" +GST_FSL_PLUGINS_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -idirafter $(LINUX_DIR)/include/uapi" ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) GST_FSL_PLUGINS_DEPENDENCIES += xlib_libX11 -- 2.0.0 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH v2 10/11] imx-vpu: fix IOSystemInit failure 2014-06-27 5:24 ` [Buildroot] [PATCH v2 00/11] freescale: update userspace packages Gary Bisson ` (8 preceding siblings ...) 2014-06-27 5:24 ` [Buildroot] [PATCH v2 09/11] gst-fsl-plugins: " Gary Bisson @ 2014-06-27 5:24 ` Gary Bisson 2014-06-27 5:24 ` [Buildroot] [PATCH v2 11/11] imx-vpu: fix IOGetVirtMem return value checks Gary Bisson 2014-06-29 19:04 ` [Buildroot] [PATCH v2 00/11] freescale: update userspace packages Yann E. MORIN 11 siblings, 0 replies; 25+ messages in thread From: Gary Bisson @ 2014-06-27 5:24 UTC (permalink / raw) To: buildroot buffer address can be < 0 when using a 3G/1G split which makes IOSystemInit fail. Fix the test by checking against -1 instead. Signed-off-by: Gary Bisson <bisson.gary@gmail.com> --- ...-vpu-0001-vpu-io-fix-IOSystemInit-failure.patch | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 package/freescale-imx/imx-vpu/imx-vpu-0001-vpu-io-fix-IOSystemInit-failure.patch diff --git a/package/freescale-imx/imx-vpu/imx-vpu-0001-vpu-io-fix-IOSystemInit-failure.patch b/package/freescale-imx/imx-vpu/imx-vpu-0001-vpu-io-fix-IOSystemInit-failure.patch new file mode 100644 index 0000000..d8d2a69 --- /dev/null +++ b/package/freescale-imx/imx-vpu/imx-vpu-0001-vpu-io-fix-IOSystemInit-failure.patch @@ -0,0 +1,24 @@ +[PATCH] vpu-io: fix IOSystemInit failure + +buffer address can be < 0 when using a 3G/1G split which makes +IOSystemInit fail. Fix the test by checking against -1 instead. + +Signed-off-by: Gary Bisson <bisson.gary@gmail.com> +--- + vpu/vpu_io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/vpu/vpu_io.c b/vpu/vpu_io.c +index 8cbb571..14759da 100644 +--- a/vpu/vpu_io.c ++++ b/vpu/vpu_io.c +@@ -265,7 +265,7 @@ int IOSystemInit(void *callback) + goto err; + } + +- if (IOGetVirtMem(&bit_work_addr) <= 0) ++ if (IOGetVirtMem(&bit_work_addr) == -1) + goto err; + #endif + UnlockVpu(vpu_semap); + -- 2.0.0 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH v2 11/11] imx-vpu: fix IOGetVirtMem return value checks 2014-06-27 5:24 ` [Buildroot] [PATCH v2 00/11] freescale: update userspace packages Gary Bisson ` (9 preceding siblings ...) 2014-06-27 5:24 ` [Buildroot] [PATCH v2 10/11] imx-vpu: fix IOSystemInit failure Gary Bisson @ 2014-06-27 5:24 ` Gary Bisson 2014-06-29 19:04 ` [Buildroot] [PATCH v2 00/11] freescale: update userspace packages Yann E. MORIN 11 siblings, 0 replies; 25+ messages in thread From: Gary Bisson @ 2014-06-27 5:24 UTC (permalink / raw) To: buildroot buffer address can be < 0 when using a 3G/1G split. Fix the test by checking against -1 instead. Signed-off-by: Gary Bisson <bisson.gary@gmail.com> --- ...-lib-fix-IOGetVirtMem-return-value-checks.patch | 51 ++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 package/freescale-imx/imx-vpu/imx-vpu-0002-vpu-lib-fix-IOGetVirtMem-return-value-checks.patch diff --git a/package/freescale-imx/imx-vpu/imx-vpu-0002-vpu-lib-fix-IOGetVirtMem-return-value-checks.patch b/package/freescale-imx/imx-vpu/imx-vpu-0002-vpu-lib-fix-IOGetVirtMem-return-value-checks.patch new file mode 100644 index 0000000..306524f --- /dev/null +++ b/package/freescale-imx/imx-vpu/imx-vpu-0002-vpu-lib-fix-IOGetVirtMem-return-value-checks.patch @@ -0,0 +1,51 @@ +[PATCH] vpu-lib: fix IOGetVirtMem return value checks + +buffer address can be < 0 when using a 3G/1G split. Fix the test by +checking against -1 instead. + +Signed-off-by: Gary Bisson <bisson.gary@gmail.com> +--- + vpu/vpu_lib.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/vpu/vpu_lib.c b/vpu/vpu_lib.c +index 1fb731b..7a7f42d 100644 +--- a/vpu/vpu_lib.c ++++ b/vpu/vpu_lib.c +@@ -1764,7 +1764,7 @@ RetCode vpu_EncStartOneFrame(EncHandle handle, EncParam * param) + err_msg("Unable to obtain physical mem\n"); + return RETCODE_FAILURE; + } +- if (IOGetVirtMem(&pEncInfo->picParaBaseMem) <= 0) { ++ if (IOGetVirtMem(&pEncInfo->picParaBaseMem) == -1) { + IOFreePhyMem(&pEncInfo->picParaBaseMem); + pEncInfo->picParaBaseMem.phy_addr = 0; + err_msg("Unable to obtain virtual mem\n"); +@@ -2982,7 +2982,7 @@ RetCode vpu_DecGetInitialInfo(DecHandle handle, DecInitialInfo * info) + UnlockVpu(vpu_semap); + return RETCODE_FAILURE; + } +- if (IOGetVirtMem(&pDecInfo->userDataBufMem) <= 0) { ++ if (IOGetVirtMem(&pDecInfo->userDataBufMem) == -1) { + IOFreePhyMem(&pDecInfo->userDataBufMem); + pDecInfo->userDataBufMem.phy_addr = 0; + err_msg("Unable to obtain virtual mem\n"); +@@ -4017,7 +4017,7 @@ RetCode vpu_DecStartOneFrame(DecHandle handle, DecParam * param) + UnlockVpu(vpu_semap); + return RETCODE_FAILURE; + } +- if (IOGetVirtMem(&pDecInfo->picParaBaseMem) <= 0) { ++ if (IOGetVirtMem(&pDecInfo->picParaBaseMem) == -1) { + IOFreePhyMem(&pDecInfo->picParaBaseMem); + pDecInfo->picParaBaseMem.phy_addr = 0; + err_msg("Unable to obtain virtual mem\n"); +@@ -4057,7 +4057,7 @@ RetCode vpu_DecStartOneFrame(DecHandle handle, DecParam * param) + UnlockVpu(vpu_semap); + return RETCODE_FAILURE; + } +- if (IOGetVirtMem(&pDecInfo->userDataBufMem) <= 0) { ++ if (IOGetVirtMem(&pDecInfo->userDataBufMem) == -1) { + IOFreePhyMem(&pDecInfo->userDataBufMem); + pDecInfo->userDataBufMem.phy_addr = 0; + err_msg("Unable to obtain virtual mem\n"); + -- 2.0.0 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH v2 00/11] freescale: update userspace packages 2014-06-27 5:24 ` [Buildroot] [PATCH v2 00/11] freescale: update userspace packages Gary Bisson ` (10 preceding siblings ...) 2014-06-27 5:24 ` [Buildroot] [PATCH v2 11/11] imx-vpu: fix IOGetVirtMem return value checks Gary Bisson @ 2014-06-29 19:04 ` Yann E. MORIN 11 siblings, 0 replies; 25+ messages in thread From: Yann E. MORIN @ 2014-06-29 19:04 UTC (permalink / raw) To: buildroot Gary, All, On 2014-06-26 22:24 -0700, Gary Bisson spake thusly: > Here is the rework which I hope covers all the previous remarks. This time I tried to be more talkative in every patch but here is a summary: > 1- first libfslvpuwrap gets independent as suggested > 2- simply bump FREESCALE_IMX_VERSION to 3.10.17-1.0.0 > 3- update imx-lib: using idirafter just for uapi folder + remove unnecessary EULA > 4- make the platform choice as a common option: made BR2_PACKAGE_FREESCALE_IMX a menuconfig not to get BR2_PACKAGE_FREESCALE_IMX_PLATFORM set in every config. > 5- just adding the imx-vpu package from Freescale with no modification but using idirafter for uapi folder only > 6- bump libfslvpuwrap: now depends on imx-vpu > 7- bump libfslcodec: nothing special > 8- bump libfslparser: same > 9- gst-fsl-plugins: now depends on imx-vpu as well > 10/11- fix imx-vpu for the IOGetVirtMem in case of a 3G/1G split: I finally decided not to go with the MAP_FAILED as the return value is an int. I think using -1 is as clear and avoids useless cast. That function could have been written in a simpler way but I didn't want to change the code too much. Great work! I still have a few comments on this series, but I'll do the changes and repost an updated version. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------' ^ permalink raw reply [flat|nested] 25+ messages in thread
end of thread, other threads:[~2014-06-29 19:04 UTC | newest] Thread overview: 25+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-06-19 4:03 [Buildroot] [PATCH 0/5] freescale: update userspace packages Gary Bisson 2014-06-19 4:03 ` [Buildroot] [PATCH 1/5] freescale-imx: bump to version 3.10.17-1.0.0 Gary Bisson 2014-06-19 16:20 ` Yann E. MORIN 2014-06-20 2:40 ` Gary Bisson 2014-06-20 21:01 ` Yann E. MORIN 2014-06-21 3:44 ` Eric Nelson 2014-06-19 4:03 ` [Buildroot] [PATCH 2/5] libfslvpuwrap: bump to version 1.0.46 Gary Bisson 2014-06-19 4:03 ` [Buildroot] [PATCH 3/5] libfslcodec: bump to version 3.0.11 Gary Bisson 2014-06-19 4:03 ` [Buildroot] [PATCH 4/5] libfslparser: " Gary Bisson 2014-06-19 4:03 ` [Buildroot] [PATCH 5/5] gst-fsl-plugins: " Gary Bisson 2014-06-20 21:12 ` Yann E. MORIN 2014-06-27 5:24 ` [Buildroot] [PATCH v2 00/11] freescale: update userspace packages Gary Bisson 2014-06-27 5:24 ` [Buildroot] [PATCH v2 01/11] libfslvpuwrap: change version to be independent Gary Bisson 2014-06-29 19:01 ` Yann E. MORIN 2014-06-27 5:24 ` [Buildroot] [PATCH v2 02/11] freescale-imx: bump to version 3.10.17-1.0.0 Gary Bisson 2014-06-27 5:24 ` [Buildroot] [PATCH v2 03/11] freescale-imx: update imx-lib package Gary Bisson 2014-06-27 5:24 ` [Buildroot] [PATCH v2 04/11] freescale-imx: change platform choice to be common Gary Bisson 2014-06-27 5:24 ` [Buildroot] [PATCH v2 05/11] freescale-imx: add imx-vpu package Gary Bisson 2014-06-27 5:24 ` [Buildroot] [PATCH v2 06/11] libfslvpuwrap: bump to version 1.0.46 Gary Bisson 2014-06-27 5:24 ` [Buildroot] [PATCH v2 07/11] libfslcodec: bump to version 3.0.11 Gary Bisson 2014-06-27 5:24 ` [Buildroot] [PATCH v2 08/11] libfslparser: " Gary Bisson 2014-06-27 5:24 ` [Buildroot] [PATCH v2 09/11] gst-fsl-plugins: " Gary Bisson 2014-06-27 5:24 ` [Buildroot] [PATCH v2 10/11] imx-vpu: fix IOSystemInit failure Gary Bisson 2014-06-27 5:24 ` [Buildroot] [PATCH v2 11/11] imx-vpu: fix IOGetVirtMem return value checks Gary Bisson 2014-06-29 19:04 ` [Buildroot] [PATCH v2 00/11] freescale: update userspace packages Yann E. MORIN
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.