@@ -576,9 +576,6 @@ source "package/libdvbsi/Config.in"
source "package/libdvdread/Config.in"
source "package/libdvdnav/Config.in"
source "package/libebml/Config.in"
-source "package/libfslcodec/Config.in"
-source "package/libfslparser/Config.in"
-source "package/libfslvpuwrap/Config.in"
source "package/libmatroska/Config.in"
source "package/libmms/Config.in"
source "package/libmpeg2/Config.in"
@@ -4,5 +4,8 @@ menu "Freescale i.MX libraries"
source "package/freescale-imx/imx-lib/Config.in"
source "package/freescale-imx/firmware-imx/Config.in"
source "package/freescale-imx/gpu-viv-bin-mx6q/Config.in"
+source "package/freescale-imx/libfslcodec/Config.in"
+source "package/freescale-imx/libfslparser/Config.in"
+source "package/freescale-imx/libfslvpuwrap/Config.in"
endmenu
new file mode 100644
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LIBFSLCODEC
+ bool "libfslcodec"
+ depends on BR2_arm # Only relevant for i.MX
+ help
+ Binary codec libraries for the Freescale i.MX SoCs.
+
+ This library is provided by Freescale as-is and doesn't have
+ an upstream.
new file mode 100644
@@ -0,0 +1,40 @@
+################################################################################
+#
+# libfslcodec
+#
+################################################################################
+
+LIBFSLCODEC_VERSION = 3.0.1
+# No official download site from freescale, just this mirror
+LIBFSLCODEC_SITE = http://download.ossystems.com.br/bsp/freescale/source
+LIBFSLCODEC_SOURCE = libfslcodec-$(LIBFSLCODEC_VERSION).bin
+LIBFSLCODEC_LICENSE = Freescale Semiconductor Software License Agreement, BSD-3c (flac, ogg headers)
+LIBFSLCODEC_LICENSE_FILES = EULA EULA.txt
+# This is a legal minefield: the EULA in the bin file specifies that
+# the Board Support Package includes software and hardware (sic!)
+# for which a separate license is needed...
+LIBFSLCODEC_REDISTRIBUTE = NO
+
+LIBFSLCODEC_INSTALL_STAGING = YES
+
+# The archive is a shell-self-extractor of a bzipped tar. It happens
+# to extract in the correct directory (libfslcodec-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 the EULA in the bin file differs from the one in the tar file,
+# extract the one from the bin file as well.
+define LIBFSLCODEC_EXTRACT_CMDS
+ awk 'BEGIN { start=0; } \
+ /^EOEULA/ { start = 0; } \
+ { if (start) print; } \
+ /<<EOEULA/ { start=1; }'\
+ $(DL_DIR)/$(LIBFSLCODEC_SOURCE) > $(@D)/EULA
+ cd $(BUILD_DIR); \
+ sh $(DL_DIR)/$(LIBFSLCODEC_SOURCE) --force --auto-accept
+endef
+
+# FIXME The Makefile installs both the arm9 and arm11 versions of the
+# libraries, but we only need one of them.
+
+$(eval $(autotools-package))
new file mode 100644
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LIBFSLPARSER
+ bool "libfslparser"
+ depends on BR2_arm # Only relevant for i.MX
+ help
+ Binary parser libraries for the Freescale i.MX SoCs.
+
+ This library is provided by Freescale as-is and doesn't have
+ an upstream.
new file mode 100644
@@ -0,0 +1,40 @@
+################################################################################
+#
+# libfslparser
+#
+################################################################################
+
+LIBFSLPARSER_VERSION = 3.0.1
+# No official download site from freescale, just this mirror
+LIBFSLPARSER_SITE = http://download.ossystems.com.br/bsp/freescale/source
+LIBFSLPARSER_SOURCE = libfslparser-$(LIBFSLPARSER_VERSION).bin
+LIBFSLPARSER_LICENSE = Freescale Semiconductor Software License Agreement
+LIBFSLPARSER_LICENSE_FILES = EULA EULA.txt
+# This is a legal minefield: the EULA in the bin file specifies that
+# the Board Support Package includes software and hardware (sic!)
+# for which a separate license is needed...
+LIBFSLPARSER_REDISTRIBUTE = NO
+
+LIBFSLPARSER_INSTALL_STAGING = YES
+
+# The archive is a shell-self-extractor of a bzipped tar. It happens
+# to extract in the correct directory (libfslparser-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 the EULA in the bin file differs from the one in the tar file,
+# extract the one from the bin file as well.
+define LIBFSLPARSER_EXTRACT_CMDS
+ awk 'BEGIN { start=0; } \
+ /^EOEULA/ { start = 0; } \
+ { if (start) print; } \
+ /<<EOEULA/ { start=1; }'\
+ $(DL_DIR)/$(LIBFSLPARSER_SOURCE) > $(@D)/EULA
+ cd $(BUILD_DIR); \
+ sh $(DL_DIR)/$(LIBFSLPARSER_SOURCE) --force --auto-accept
+endef
+
+# The Makefile installs several versions of the libraries, but we only
+# need one of them, depending on the platform.
+
+$(eval $(autotools-package))
new file mode 100644
@@ -0,0 +1,13 @@
+comment "libfslvpuwrap needs an imx-specific kernel to be built"
+ depends on BR2_arm && !BR2_LINUX_KERNEL
+
+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
+ help
+ Wrapper library for the vpu library, giving it a different API.
+
+ This library is provided by Freescale as-is and doesn't have
+ an upstream.
new file mode 100644
@@ -0,0 +1,18 @@
+################################################################################
+#
+# libfslvpuwrap
+#
+################################################################################
+
+LIBFSLVPUWRAP_VERSION = 1.0.17
+# No official download site from freescale, just this mirror
+LIBFSLVPUWRAP_SITE = http://download.ossystems.com.br/bsp/freescale/source
+LIBFSLVPUWRAP_LICENSE = Freescale Semiconductor Software License Agreement
+LIBFSLVPUWRAP_LICENSE_FILES = EULA.txt
+LIBFSLVPUWRAP_REDISTRIBUTE = NO
+
+LIBFSLVPUWRAP_INSTALL_STAGING = YES
+
+LIBFSLVPUWRAP_DEPENDENCIES += imx-lib
+
+$(eval $(autotools-package))
deleted file mode 100644
@@ -1,8 +0,0 @@
-config BR2_PACKAGE_LIBFSLCODEC
- bool "libfslcodec"
- depends on BR2_arm # Only relevant for i.MX
- help
- Binary codec libraries for the Freescale i.MX SoCs.
-
- This library is provided by Freescale as-is and doesn't have
- an upstream.
deleted file mode 100644
@@ -1,40 +0,0 @@
-################################################################################
-#
-# libfslcodec
-#
-################################################################################
-
-LIBFSLCODEC_VERSION = 3.0.1
-# No official download site from freescale, just this mirror
-LIBFSLCODEC_SITE = http://download.ossystems.com.br/bsp/freescale/source
-LIBFSLCODEC_SOURCE = libfslcodec-$(LIBFSLCODEC_VERSION).bin
-LIBFSLCODEC_LICENSE = Freescale Semiconductor Software License Agreement, BSD-3c (flac, ogg headers)
-LIBFSLCODEC_LICENSE_FILES = EULA EULA.txt
-# This is a legal minefield: the EULA in the bin file specifies that
-# the Board Support Package includes software and hardware (sic!)
-# for which a separate license is needed...
-LIBFSLCODEC_REDISTRIBUTE = NO
-
-LIBFSLCODEC_INSTALL_STAGING = YES
-
-# The archive is a shell-self-extractor of a bzipped tar. It happens
-# to extract in the correct directory (libfslcodec-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 the EULA in the bin file differs from the one in the tar file,
-# extract the one from the bin file as well.
-define LIBFSLCODEC_EXTRACT_CMDS
- awk 'BEGIN { start=0; } \
- /^EOEULA/ { start = 0; } \
- { if (start) print; } \
- /<<EOEULA/ { start=1; }'\
- $(DL_DIR)/$(LIBFSLCODEC_SOURCE) > $(@D)/EULA
- cd $(BUILD_DIR); \
- sh $(DL_DIR)/$(LIBFSLCODEC_SOURCE) --force --auto-accept
-endef
-
-# FIXME The Makefile installs both the arm9 and arm11 versions of the
-# libraries, but we only need one of them.
-
-$(eval $(autotools-package))
deleted file mode 100644
@@ -1,8 +0,0 @@
-config BR2_PACKAGE_LIBFSLPARSER
- bool "libfslparser"
- depends on BR2_arm # Only relevant for i.MX
- help
- Binary parser libraries for the Freescale i.MX SoCs.
-
- This library is provided by Freescale as-is and doesn't have
- an upstream.
deleted file mode 100644
@@ -1,40 +0,0 @@
-################################################################################
-#
-# libfslparser
-#
-################################################################################
-
-LIBFSLPARSER_VERSION = 3.0.1
-# No official download site from freescale, just this mirror
-LIBFSLPARSER_SITE = http://download.ossystems.com.br/bsp/freescale/source
-LIBFSLPARSER_SOURCE = libfslparser-$(LIBFSLPARSER_VERSION).bin
-LIBFSLPARSER_LICENSE = Freescale Semiconductor Software License Agreement
-LIBFSLPARSER_LICENSE_FILES = EULA EULA.txt
-# This is a legal minefield: the EULA in the bin file specifies that
-# the Board Support Package includes software and hardware (sic!)
-# for which a separate license is needed...
-LIBFSLPARSER_REDISTRIBUTE = NO
-
-LIBFSLPARSER_INSTALL_STAGING = YES
-
-# The archive is a shell-self-extractor of a bzipped tar. It happens
-# to extract in the correct directory (libfslparser-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 the EULA in the bin file differs from the one in the tar file,
-# extract the one from the bin file as well.
-define LIBFSLPARSER_EXTRACT_CMDS
- awk 'BEGIN { start=0; } \
- /^EOEULA/ { start = 0; } \
- { if (start) print; } \
- /<<EOEULA/ { start=1; }'\
- $(DL_DIR)/$(LIBFSLPARSER_SOURCE) > $(@D)/EULA
- cd $(BUILD_DIR); \
- sh $(DL_DIR)/$(LIBFSLPARSER_SOURCE) --force --auto-accept
-endef
-
-# The Makefile installs several versions of the libraries, but we only
-# need one of them, depending on the platform.
-
-$(eval $(autotools-package))
deleted file mode 100644
@@ -1,13 +0,0 @@
-comment "libfslvpuwrap needs an imx-specific kernel to be built"
- depends on BR2_arm && !BR2_LINUX_KERNEL
-
-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
- help
- Wrapper library for the vpu library, giving it a different API.
-
- This library is provided by Freescale as-is and doesn't have
- an upstream.
deleted file mode 100644
@@ -1,18 +0,0 @@
-################################################################################
-#
-# libfslvpuwrap
-#
-################################################################################
-
-LIBFSLVPUWRAP_VERSION = 1.0.17
-# No official download site from freescale, just this mirror
-LIBFSLVPUWRAP_SITE = http://download.ossystems.com.br/bsp/freescale/source
-LIBFSLVPUWRAP_LICENSE = Freescale Semiconductor Software License Agreement
-LIBFSLVPUWRAP_LICENSE_FILES = EULA.txt
-LIBFSLVPUWRAP_REDISTRIBUTE = NO
-
-LIBFSLVPUWRAP_INSTALL_STAGING = YES
-
-LIBFSLVPUWRAP_DEPENDENCIES += imx-lib
-
-$(eval $(autotools-package))
Packages libfslcodec, libfslparser, and libfslvpuwrap each share URLs and versioning information with other packages in the freescale-imx/ directory. By moving these packages there, it's easier to keep them up to date and easier for users to locate related components. Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com> --- package/Config.in | 3 -- package/freescale-imx/Config.in | 3 ++ package/freescale-imx/libfslcodec/Config.in | 8 +++++ package/freescale-imx/libfslcodec/libfslcodec.mk | 40 ++++++++++++++++++++++ package/freescale-imx/libfslparser/Config.in | 8 +++++ package/freescale-imx/libfslparser/libfslparser.mk | 40 ++++++++++++++++++++++ package/freescale-imx/libfslvpuwrap/Config.in | 13 +++++++ .../freescale-imx/libfslvpuwrap/libfslvpuwrap.mk | 18 ++++++++++ package/libfslcodec/Config.in | 8 ----- package/libfslcodec/libfslcodec.mk | 40 ---------------------- package/libfslparser/Config.in | 8 ----- package/libfslparser/libfslparser.mk | 40 ---------------------- package/libfslvpuwrap/Config.in | 13 ------- package/libfslvpuwrap/libfslvpuwrap.mk | 18 ---------- 14 files changed, 130 insertions(+), 130 deletions(-) create mode 100644 package/freescale-imx/libfslcodec/Config.in create mode 100644 package/freescale-imx/libfslcodec/libfslcodec.mk create mode 100644 package/freescale-imx/libfslparser/Config.in create mode 100644 package/freescale-imx/libfslparser/libfslparser.mk create mode 100644 package/freescale-imx/libfslvpuwrap/Config.in create mode 100644 package/freescale-imx/libfslvpuwrap/libfslvpuwrap.mk delete mode 100644 package/libfslcodec/Config.in delete mode 100644 package/libfslcodec/libfslcodec.mk delete mode 100644 package/libfslparser/Config.in delete mode 100644 package/libfslparser/libfslparser.mk delete mode 100644 package/libfslvpuwrap/Config.in delete mode 100644 package/libfslvpuwrap/libfslvpuwrap.mk