| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
(From OE-Core rev: cdf6172830bf052ca3a53d439f05ee40574e3968)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
pulseaudio_fix_for_x32.patch removed;
included in upstream.
general recipe clean-up (multiple src URI removed,
inheritance grouping, dependency grouping).
parallel make is now active (was disabled in version 0.9).
(From OE-Core rev: c6a503f05505cd5d842ae1c1b558be04e233072c)
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
| |
(From OE-Core rev: 4c32a6af7dfd16cf9c652ca2735cd8d24d204e29)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
|
|
| |
* they are autodetected from sysroot
(From OE-Core rev: b253bbe742c016a07b67cfaa65b28895118c5bd8)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
|
| |
* jack is autodetected from sysroot
(From OE-Core rev: 00872ded9e4f492f146175be41435902aaf45ad7)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
|
|
|
| |
Add IT instructions so that it builds with thumb tunes. ARM mode won't
be affected since IT is a pseudo-instruction in ARM mode.
(From OE-Core rev: b5187fa61b34ff94513fcf8f64ff5c588c211d06)
Signed-off-by: Sen Zhang <sen.zhang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Only adds avahi dependency when zeroconf is in DISTRO_FEATURES.
(From OE-Core rev: dcb6d36b26359eb7672abd72fcb089bfa83459aa)
Signed-off-by: Felipe F. Tonello <eu@felipetonello.com>
Added missing '' in base_contains()
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
|
|
| |
This is necessary since pacmd uses this module.
(From OE-Core rev: ebf900455e4a0aafdee5a8b04cef91f8071fa3ca)
Signed-off-by: Felipe F. Tonello <eu@felipetonello.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
|
|
|
| |
- obsolete_automake_macros.patch no longer needed; removed;
already integrated in upstream;
- switched to tar.xz archive format.
(From OE-Core rev: 04568c35c989f0b28769d3b00ee902cb3a6ef2bc)
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
|
|
|
| |
* glib-genmarshal is needed during do_compile:
| /bin/bash: line 1: glib-genmarshal: command not found
(From OE-Core rev: 50fdebe819e4d51bc8ba011a0d4a090a8ded64b8)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
* do_configure fails without native glib-compile-schemas:
| checking for glib-compile-schemas... no
| configure: error: glib-compile-schemas not found.
(From OE-Core rev: c8ba0ab9ba2a13eab3fdc6aed148c5ee3b53e253)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The compile step ends regenerating the configure scripts included in
the source subdirs, for it to properly work we need to pass the
ACLOCAL_FLAGS or the .m4 files won't be found.
,----[ Build error ]
| ./ac3dec
| aclocal: warning: autoconf input should be named 'configure.ac', not 'configure.in'
| configure.in:18: warning: macro 'AM_PATH_ALSA' not found in library
| automake: warning: autoconf input should be named 'configure.ac', not 'configure.in'
| configure.in:9: warning: AM_INIT_AUTOMAKE: two- and three-arguments forms are deprecated. For more info, see:
| configure.in:9: http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation
| automake: warning: autoconf input should be named 'configure.ac', not 'configure.in'
| test/Makefile.am:1: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
| configure.in:18: error: possibly undefined macro: AM_PATH_ALSA
| If this token and others are legitimate, please use m4_pattern_allow.
| See the Autoconf documentation.
| make: *** [all] Error 1
| ERROR: oe_runmake failed
`----
Reported-by: Rogerio Nunes <rogerio.nunes@freescale.com>
(From OE-Core rev: dde80e6fac83ca55644cb1b56cb55b2ba01c6564)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Using --with-plugins means you only get the elements you enable, so we were
dropping vast numbers of useful plugins such as the MPEG muxers.
Instead, follow gst-plugins-base by using PACKAGECONFIG to enable/disable
plugins with optional dependencies.
(From OE-Core rev: 7722fd48995d5d430d58b94ecf69a6ad9f1c741b)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Use PACKAGECONFIG to control the X11 elements, and add statements for the
elements that we don't always enable.
Remove the freetype dependency as it's apparently (but not really) only needed
by the examples.
(From OE-Core rev: d40606de85a42c48327dead5d6e4c9a1de2cc39c)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
| |
(From OE-Core rev: 6e149551a36825ac5e25b14dbaa62b794154c11d)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
| |
(From OE-Core rev: 82eab38f2bf1dac3e3414a5a20b8e51f871e07ce)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Pass --cpu to libav config when we're building ppc, or else there are
errors like:
You need a compiler that supports {} in AltiVec vector declarations.
Also patch libav configure to have knowledge of more ppc CPUs.
(From OE-Core rev: a825781fc822f4630bc29906ca1ca79b8fad4836)
Signed-off-by: Jesse Zhang <sen.zhang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
eglibc could be configured to build without the wordexp feature. To
ensure that the wordexp feature could be used, the configure script must
check if wordexp() is supported in libc in addition to checking if
wordexp.h exists.
(From OE-Core rev: 3c3fe1d139fc84d7ff125f87a4692fac6dfc04e6)
Signed-off-by: Hong H. Pham <hong.pham@windriver.com>
Signed-off-by: Jesse Zhang <sen.zhang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
"extern __inline__ function()" is the inlined version that
can be used in this compilation unit, but there will be another
definition of this function somewhere, so compiler will not emit
any code for the function body. This causes problem in -O0,
where functions are never inlined, the function call is preserved,
but linker can't find the symbol, thus the error happens.
since no packages provide atomic_add and atomic_sub, and -O0
Optimize is hoped to keep for debug, we can change extern to
static to fix this problem.
(From OE-Core rev: d0af30c92fdea6f48afb4ab1fde69f1b636e8203)
Signed-off-by: Roy.Li <rongqing.li@windriver.com>
Signed-off-by: Jesse Zhang <sen.zhang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Originally from the https://github.com/dv1/meta-gstreamer1.0 repository,
the patches were copied with only one change:
gstreamer1.0-plugins-package.inc was removed, since gst-plugins-package.inc
is identical except for the LIBV variable.
(From OE-Core rev: e200e61529fa5a78354cde67442e90ace4b3857c)
Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
upgrade from 1.6.1 -> 1.6.2
- removed patch contained upstream
- minor changes in png.h and LICENSE file ( changes
regarding the date )
(From OE-Core rev: c71a175add6493a2a419e46ab0ef96cbd3fcb70a)
Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
|
|
|
| |
Since gst-plugins-package.inc is going to be used by the following
GStreamer 1.0 recipes as well, LIBV has to be set outside of the .inc file.
(From OE-Core rev: 3cda3f1e3081ce51d8e964feff29e44558076522)
Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The -meta packages were depending on non-existing packages,
like -glib and -apps. The fix checks if packages in the PACKAGES list
are empty. If so, they are omitted from the rdepends list.
(From OE-Core rev: 7c556a1f437c0a5b472727f89ff6c3d5f835b63d)
Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
aclocal is being called here directly,
not called by autotools.bbclass wrapper.
aclocal files are installed in sysroot,
and are removed while build is still running.
This translates to a possible race condition during the build.
Fixes [YOCTO #4358].
(From OE-Core rev: dea66ade1184cef6aeb242d87867759ca44a8895)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
| |
(From OE-Core rev: 43b2a2f375e2201be7a9bb6a9c5c0a9fc61f3361)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
| |
(From OE-Core rev: 89be8aa7c6d49c6372df687798d006d8cfe12943)
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
|
|
| |
Since version 0.9.2, Bellagio's components (vorbis, mad, also, ...) are shipped in separate packages.
(From OE-Core rev: 680215b6f2b0514ea106b53e8993549985684b56)
Signed-off-by: Matthieu Crapet <mcrapet@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
18575b082a4042376fd1575465e69562dea04ddc added bash as a dependency of
alsa-utils-alsaconf so that the script interpreter will be available at
run time. However, this has the undesirable side effect of making bash
be a build dependency for alsa-utils and, for those folks who don't need
alsaconf but do want some other part of alsa-utils, this cure is worse
than the original disease.
Fix this by moving alsaconf to a separate recipe so that the bash
dependency only applies when alsaconf is specifically requested.
(From OE-Core rev: 7317c8055cf3af8912a66badb3074f0a60f75ec2)
Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
| |
(From OE-Core rev: 6bcc2eab5ddf584e6a26353ff259045a35fe4c87)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
libpng 1.6.0/1.6.1 emits warnings about function ordering when there isn't a
problem, which causes Cairo to fail loading images. Take the patch from
upstream to fix this.
(From OE-Core rev: 50f823557cb5857dfe585a9da88bb8f61ebfba99)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This attempts to fix [YOCTO #4060] - connman-applet spews warnings, but with this one PNG images still don't work in weston :(
The ARM NEON option was added because the autodetection code in configure.ac is broken:
/usr/lib/weston/weston-desktop-shell: symbol lookup error: /usr/lib/libpng16.so.16: undefined symbol: png_init_filter_functions_neon
License checksums update due to date and package version changes:
index e95d359..d86a7da 100644
(From OE-Core rev: e31ef0211c2cb18c322517a44b714895e51284e1)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
|
| |
These data files are required for module-alsa-card to load properly
(From OE-Core rev: 8dda0dc79f5c90f8d40450ba6215f44edcbacb8f)
Signed-off-by: George Kiagiadakis <george.kiagiadakis@collabora.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
| |
Otherwise this setting "floats" and leads to non-determinstic builds.
(From OE-Core rev: 4eea01e9d775f2e56958a8bb194aadd8a242946d)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
| |
(From OE-Core rev: b92a3e9d093bc9421aa38a40bc6bfd559a16b3be)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
| |
(From OE-Core rev: 2c948d1cfdd070c8ce6bf0ee940a345a31407663)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This prepend was cding to ${S}, which then breaks base_do_compile as it assumes
it's in ${B}. The cd is pointless as all of the operations use absolute paths,
so remove it.
The result of this was that base_do_compile was failing to find the makefiles,
so the compilation happened in do_install.
(From OE-Core rev: ac3a8ce0b672d1488c9074bde1a1d062e0c5fd33)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
|
| |
I blew my #if expression!
(From OE-Core rev: b458309845185a3cd473daa0969ce17e2ff5c602)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The gst-ffmpeg build shows the following warning:
configure: WARNING: unrecognized options: --disable-yasm
which means that the following test in configure always fails and
--disable-yasm never gets passed to the embedded ffmpeg build:
'if test "x$disable_yasm" = "xyes"; then'
embffmpeg_configure_args="$embffmpeg_configure_args --disable-yasm"
commit 4d309730 ['gst-ffmpeg: configure-fix patch used wrong test']
actually fixed the obviously backwards syntax by reversing the test -
prior to that, --disable-yasm would always unconditionally be passed
into the embedded ffmpeg config.
This fixes things so that the variable actually exists and makes the
test meaningful.
(From OE-Core rev: da9515621134c26e54f43b96cdad0c6e6c5876bf)
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
| |
(From OE-Core rev: d07bf78a11c5aee37da653404f8aaf413cf14e8f)
Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
librsvg depends on gtk+, which in turn does not support framebuffer
as backend in current version (2.15.24). This patch disables librsvg
when x11 is not in the distro.
(From OE-Core rev: 022cc0d3f0f7468428d708c27dbc561f619ee841)
Signed-off-by: Rogerio Nunes <ronunes@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Current verion of gtk+ (2.15.24) does not accept pure framebuffer as
backend and some alsa-tools sub-modules depend on gtk+.
This patch removes those sub-modules from the build only when x11 is not
set in DISTRO_FEATURES.
(From OE-Core rev: e611bba7bba02ba167b2ae3671b00cc99e4fb29c)
Signed-off-by: Rogerio Nunes <ronunes@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
|
| |
[YOCTO #4051]
(From OE-Core rev: 67f1083a10f7435aeb861ba2e872d6498375d927)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
| |
(From OE-Core rev: eca6309556086f8c6b0e8525749477c8210f83b0)
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The patch to Poky (git://git.yoctoproject.org/poky) commit
bd73fa69f532ca3d81ec2452a79e7a333b3543c2 titled: "recipes: Fix
ALLOW_EMPTY with no package specified" breaks this recipe. This patch
specifies the allowed empty packages.
(From OE-Core rev: 375ed2eaef10dd7d8f46badca6d779708724e5f6)
Signed-off-by: Jeremy Stashluk <jstashluk@dekaresearch.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
| |
(From OE-Core rev: 26c2eed11d9293a7a3b8e2177be76d2457d69efd)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
|
|
| |
This is in meta-multimedia now, so remove from oe-core.
(From OE-Core rev: 62a2f7e9fad6cd6863670ba2376f73c0e929f075)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
| |
(From OE-Core rev: 7376f4685899708fced56f212467e78325c99095)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
| |
(From OE-Core rev: 4287440721bc692e8039ee775e6ee272e1349b3e)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
| |
alsaconf clearly is packaged, remove obsolete comment
(From OE-Core rev: 9420ffd8bea1dd862ec26443f6197cdc7617a25a)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
|
|
|
|
| |
(From OE-Core rev: aca6a67527d97b57b3d16848057bc29fff7c19d0)
Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|