We want to use SPDX identifier for license strings as much as possible.
SPDX short identifier for GPLv2/GPLv2+ is GPL-2.0/GPL-2.0+.
This change is done by using following command.
find . -name "*.mk" | xargs sed -ri '/LICENSE( )?[\+:]?=/s/\<GPLv2\>/GPL-2.0/g'
Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
matchbox can use xlib_libXfixes to completely and really hide the
cursor, so build-depend on it if enabled.
Reported-by: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
matchbox selects xlib-libXcursor, but does not build-depend on it.
But xlib-libXcursor is only an optional dependency.
Fix that by removing the select, and properly build-depend on it when
it is enabled.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
xlib-libXft is only needed when building a 'standalone' matchbox, which
means not using matchbox-lib.
But we *are* building matchbox-lib, and we do not support the standalone
mode (and probably won't, as even upstream says it is ugly, by lack of
theming).
Similarly, xlib-libXext is only used for its 'xsync' extension, for
which support is entirely commented-out in matchbox.
So, drop the dependency on xlib-libXft, and make it explicit we're not
building either standalone modes; drop xlib-libXext.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Since this is a non-obvious dependency, just select the appropriate
library.
Also, add a comment to act as a separator between matchbox' options
and the other matchbox packages.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Building with the experimental support for compositing is broken:
/home/ymorin/dev/buildroot/O/host/usr/bin/arm-linux-gnueabihf-gcc
-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-Os -o matchbox-window-manager main.o wm.o base_client.o main_client.o
toolbar_client.o toolbar_client_alt.o dockbar_client.o dialog_client.o
select_client.o desktop_client.o ewmh.o misc.o client_common.o keys.o
list.o stack.o composite-engine.o session.o mbtheme.o xml.o
-lmb -lX11
-L/home/ymorin/dev/buildroot/O/host/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/lib
-lXext -lXcomposite -lXdamage -lXfixes -lXrender
-L/home/ymorin/dev/buildroot/O/host/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/lib
-lX11 -lexpat
-L/home/ymorin/dev/buildroot/O/host/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/lib
-lXfixes
composite-engine.o: In function `gaussian':
/home/ymorin/dev/buildroot/O/build/matchbox-1.2/src/composite-engine.c:65:
undefined reference to `exp'
That's because it forgets to link with -lm.
However, adding "MATCHBOX_CONF_ENV = -lm" does not solve the issue, as
it still does not link with -lm at all.
Furthermore, the package does not autoreconf, since it is missing the
gconf m4 macros, and Buildroot does not have a package for gconf, hence
we can not even patch Makefile.am and autoreconf.
Patching Makefile.in (in addition to .am) could be a solution, but
support for compositing is explicitly marked as being experimental.
So, just forcibly disable it altogether.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Buildroot does not have a gconf package, so explicitly disable gconf
support (to avoid it ends up picking the host one).
Reported-by: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
We usually do not have a sub-directory for a family of related
packages, so move matchbox packages one directory higher, so they
all are in packages/
Also re-order packages alphabetically.
Reported-by: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Currently, the matchbox entry in the menu is a non-package entry, that
forcibly selects the matchbox-wm package, which is the real matchbox WM.
So, get rid of the current matchbox option, rename the existing
matchbox-wm to simply matchbox, so we have a real package from the
onset.
Since we're re-using the previous option for the WM package, there is no
need for an entry in the legacy menu.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Now that the matchbox package no longer forcibly add entries to the
PACKAGES list, and entirely relies on having proper packages, we can
safely include all matchbox sub-packages .mk files, and the pkg-infra
will take care of building only those that are enabled.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Similarly to what we just did for matchbox-lib, we make matchbox-wm a
real package.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Currently, the matchbox package is using weird, legacy constructs to
build its different parts.
Notably, it adds matchbox-lib to the list of packages to build, even
though it is not a real package since it does not have a Kconfig entry.
Fix that:
- add a Kconfig entry for matchbox-lib
- select it from the top-level matchbox package
Note that matchbox-common already depends on matchbox-lib.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
For clarity, this commit renames the TARGETS variable to the more
meaningful PACKAGES variable. Indeed, only packages (handled by one of
the package infrastructures) should be listed in this variable, and
not other random non-package targets.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Make 3.82 no longer sort the result of wildcards (see
http://comments.gmane.org/gmane.comp.gnu.make.bugs/4260). This may break
build reproducibility.
This patch sort results of wildcards to ensure reproducibility.
Signed-off-by: Jérôme Pouiller <jezz@sysmic.org>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Real targets should not depend on phony targets, otherwise they get
rebuilt every time.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
matchbox-desktop fails to build because it tries to read
/usr/lib/libxcb.la, which doesn't exist on a very basic system with no
development files instead. The buildroot-libtool.patch must therefore
be applied.
Unfortunately, matchbox doesn't yet use the autotools infrastructure,
so we have to manually apply the patch.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
We have been passing -q to ./configure when using 'make -s' for
packages using Makefile.autotools.in for some time. Do the same
for packages using autotools, but not using the
Makefile.autotools.in infrastructure, taking care to not do it
for packages with hand written configure scripts.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
A C library will have been built by the toolchain makefiles, so there is no
need for packages to explicitly depend on uclibc.
Signed-off-by: Will Newton <will.newton@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Several issues were encountered when trying to build Matchbox. This
patches fixes these issues :
* Selecting BR2_PACKAGE_MATCHBOX should select BR2_PACKAGE_XORG7,
otherwise the x11r7 mk files are not included, and matchbox.mk
refers to non-existing dependencies (such as xlib_libXtst).
* In matchbox.mk, wrong dependencies for Matchbox keyboard. When
pango is available, use it through --enable-pango, otherwise, add
the dependency to xlib_libXft
* Enable AUTORECONF for libXfont and libXft, otherwise the libtool
Buildroot patch has no effect, and these packages fail to build
without the libtool hack.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
The host versions shouldn't be visible in Kconfig, so remove the
reference to BR2_PACKAGE_PKGCONFIG everywhere and prefix the host targets
with host-.
At the same time add pkgconfig for the target (E.G. for development) and
let BR2_PACKAGE_PKGCONFIG control that package.
Notice: all defconfigs in the tree have been updated, but make sure to
disable the pkgconfig package (unless you want it) if you use an external
config, otherwise you'll end up with pkgconfig and glib2 in the target.
Fix matchbox build
This patch fixes various failures in the Matchbox build:
* libmatchbox and matchbox-panel were using a now legacy index()
function, which is not part of every uClibc build nowadays
(depending on the configuration). As this function doesn't exist
anymore in all builds, use strchr() instead, which is the
recommended replacement for index(). Two patches, one for
libmatchbox, one for matchbox-panel, are added to fix this problem.
Closes bug http://bugs.uclibc.org/view.php?id=5484
* Do not override the CFLAGS and LDFLAGS values, they are already set
by TARGET_CONFIGURE_OPTS. It caused build failures.
* Mangle the library paths in the .la file of libmatchbox, after
installation in the staging dir.
It would probably be nice to switch Matchbox over to the new
Makefile.autotools.in.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
