Commit Graph

61 Commits

Author SHA1 Message Date
Guido Martínez
0772e28dbb package: matchbox-keyboard: use install instead of cp
in order to not depend on the previous permissions of the file

Signed-off-by: Guido Martínez <guido@vanguardiasur.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-11-22 19:47:06 +01:00
Jerzy Grzegorek
774ff0d13f package: indentation cleanup
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-25 01:11:26 +02:00
Jerzy Grzegorek
595bf30654 package: indentation cleanup
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-10-23 22:13:29 +02:00
Thomas De Schampheleire
aaffd209fa packages: rename FOO_CONF_OPT into FOO_CONF_OPTS
To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
make the same change for FOO_CONF_OPT.

Sed command used:
   find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g'

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-10-04 18:54:16 +02:00
Bernd Kuhls
7502da865b package/matchbox: Depends on MMU
Fixes matchbox-panel:
http://autobuild.buildroot.net/results/8d5/8d5ad404fab7ec2a501972ba9c08b0109e420b80/

and matchbox-desktop:
mbdesktop_win_plugin.o: In function `mbdesktop_win_plugin_load':
/home/br/br/output/build/matchbox-desktop-0.9.1/src/mbdesktop_win_plugin.c:22: undefined reference to `_fork'

and matchbox-wm:
matchbox-remote.o: In function `mbcommand':
/home/fli4l/br3/output/build/matchbox-wm-1.2/src/matchbox-remote.c:147: undefined reference to `_fork'

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-08-16 00:32:04 +02:00
Peter Korsgaard
39b926d968 matchbox-keyboard: fix dependencies
Correct a number of issues with matchbox-keyboard:
 - Missing dependencies on host-pkgconf and expat
 - Missing kconfig select on xlib_libXft
 - pango/cairo confusion, ensure cairo is built before if enabled
 - _CONF_OPT variable typo

Fixes:
http://autobuild.buildroot.net/results/473/47380d57e507ec395a1132dfd7b32d35459c1c7a//
http://autobuild.buildroot.net/results/d9a/d9aa2b6ddce920ea45fbd7093addfc0ee6b94467//
http://autobuild.buildroot.net/results/aad/aad393a81812df28cbc296f556de2acb4e6d114b//
http://autobuild.buildroot.net/results/124/124b28336ed61822fa6d5d2591b4e70d83b8a213//
and 17 other build errors, dating back to 2013-07-03

Reported-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-05-20 23:43:58 +02:00
Vicente Olivert Riera
b57b69cd65 matchbox-lib: apply upstream based patch to include a missing header
The upstream patch can't be applied as-is because the source code of
the file which is patched has changed. A version bump to the latest
release doesn't fix the problem because the upstream patch was applied
after the resease.

Upstream patch:
   http://git.yoctoproject.org/cgit/cgit.cgi/libmatchbox/commit/?id=9315bcce1f01e7d6c00161442d61d3c676794d9d

Fixes:
   http://autobuild.buildroot.net/results/e4d/e4d510ab6ba69f95401e3120ab90ccdff22deb91/

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-21 22:09:02 +01:00
Vicente Olivert Riera
6080b2228c matchbox-lib: rename patches to follow BR guidelines
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-21 22:08:59 +01:00
Jerzy Grzegorek
0e26991f79 package: fix white spaces
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-01-16 13:31:09 +01:00
Thomas De Schampheleire
35eaed8d07 Config.in files: use if/endif instead of 'depends on' for main symbol
In the Config.in file of package foo, it often happens that there are other
symbols besides BR2_PACKAGE_FOO. Typically, these symbols only make sense
when foo itself is enabled. There are two ways to express this: with
    depends on BR2_PACKAGE_FOO
in each extra symbol, or with
    if BR2_PACKAGE_FOO
        ...
    endif
around the entire set of extra symbols.

The if/endif approach avoids the repetition of 'depends on' statements on
multiple symbols, so this is clearly preferred. But even when there is only
one extra symbol, if/endif is a more logical choice:
- it is future-proof for when extra symbols are added
- it allows to have just one strategy instead of two (less confusion)

This patch modifies the Config.in files accordingly.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2013-12-25 12:21:39 +01:00
Gustavo Zacarias
70da2ae5ff matchbox-lib: patch up support for libpng 1.5+
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-10-26 11:07:59 +02:00
Jérôme Pouiller
741cbccb74 Fix build reproducibility in Make 3.82
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>
2013-09-06 23:27:42 +02:00
Jerzy Grzegorek
5a57148657 fix header package name
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2013-07-27 15:21:03 +02:00
Jerzy Grzegorek
e0d9d33cc2 fix white spaces
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-07-20 21:13:57 +02:00
Alexandre Belloni
8dfd59d114 Normalize separator size to 80
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-06 22:30:24 +02:00
Alexandre Belloni
702704014d Fix package headers to comply with coding style
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-06 17:26:35 +02:00
Peter Korsgaard
e8008c961c matchbox-lib: pango backend needs Xft support in pango
Fixes http://autobuild.buildroot.net/results/7f5e56790028b96626e6f0a69ddce08667b712eb/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-05-12 10:53:38 +02:00
Peter Korsgaard
32ceab7ec0 matchbox-wm: fix mbtheme build issue when png support is disabled
Fixes http://autobuild.buildroot.net/results/c02af7b66ae2c14d94edaa940f9edfcde9a9fad5

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-02-21 10:59:06 +01:00
Peter Korsgaard
30876b26a7 matchbox-desktop: needs zlib
Otherwise the build fails with:

In file included from mbdesktop_win_plugin.c:1:0:
mbdesktop.h:31:18: fatal error: zlib.h: No such file or directory

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-02-21 10:55:57 +01:00
Samuel Martin
3a8e6fc86f matchbox-lib: fix license info
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-12-31 16:49:43 +01:00
Thomas Petazzoni
50bdab9025 matchbox-desktop: fix link issue against libdl
matchbox-desktop uses dlopen(), so it needs to link against libdl. The
configure.ac and Makefile.am have the necessary provisions to do so,
but the included configure script does not replace LIBADD_DL in
src/Makefile.am as it should.

Therefore, we force the autoreconf of the package, which solves the
problem.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-12-18 22:09:05 +01:00
Samuel Martin
7364f0cb22 matchbox packages: add license info
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-11-30 14:30:08 -08:00
Samuel Martin
4b0b177b26 matchbox packages: fix broken urls
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-11-30 13:07:43 -08:00
Markos Chandras
cc6da8b28e matchbox-lib: Append -lX11 to the linker
Fixes building with binutils-2.22
http://autobuild.buildroot.net/results/b4b26dd9c7d7bebe45638ba125fb49a5f5d0cc14/build-end.log

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-11-30 11:54:03 -08:00
Gustavo Zacarias
019a581f89 packages: switch to host-pkgconf
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-10-29 22:02:55 +01:00
Arnout Vandecappelle (Essensium/Mind)
e1502ebc0c all packages: rename XXXTARGETS to xxx-package
Also remove the redundant $(call ...).

This is a purely mechanical change, performed with
find package linux toolchain boot -name \*.mk | \
  xargs sed -i -e 's/$(eval $(call GENTARGETS))/$(eval $(generic-package))/' \
               -e 's/$(eval $(call AUTOTARGETS))/$(eval $(autotools-package))/' \
               -e 's/$(eval $(call CMAKETARGETS))/$(eval $(cmake-package))/'

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-07-17 20:23:05 +02:00
Thomas Petazzoni
300f9c9c9d package: remove useless arguments from AUTOTARGETS
Thanks to the pkgparentdir and pkgname functions, we can rewrite the
AUTOTARGETS macro in a way that avoids the need for each package to
repeat its name and the directory in which it is present.

[Peter: pkgdir->pkgparentdir]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-09-29 23:12:27 +02:00
Peter Korsgaard
0be744e495 package: apply libtool patch where possible
Now that we have libtool-2.2.x patch support, we can get rid of a bunch
of _LIBTOOL_PATH = NO, fixing (potential) cross link issues.

Notice: php not changed, as it uses a very old 1.5 version for the
embedded sqlite, where our buildroot-libtool-v1.5.patch doesn't apply.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-02-17 14:02:52 +01:00
Paulius Zaleckas
c2d6095f9f matchbox-common was missing in Config.in
While at it add option to install PDA style desktop folders.

Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-11-05 10:24:18 +01:00
Darius Augulis
b64a031bad Fix build of matchbox-keyboard and matchbox-wm
These packages have buggy configure script. It adds -L/lib flag
for linker and thus wrong libraries are linked in.
Workaround this issue by setting expat=yes in configure
environment.

Signed-off-by: Darius Augulis <augulis.darius@gmail.com>
Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-01 22:11:41 +02:00
Paulius Zaleckas
c03c626ecb matchbox-desktop: fix compilation and installation
Libtool patch applies just fine.
mbdesktop_modules is installed by the matchbox-desktop and we
don't have to overwrite it with our copy(contains wrong paths).

Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-08 07:40:01 +02:00
Will Wagner
f94830d0e5 matchbox: convert to autotools, fix build with start-notification, libxft
Signed-off-by: Will Wagner <will_wagner@carallon.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-03 13:45:23 +02:00
Thomas Petazzoni
ec5ab1dbd7 matchbox: fix dependency to not always rebuilt libmatchbox
Real targets should not depend on phony targets, otherwise they get
rebuilt every time.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-02-23 20:34:35 +01:00
Thomas Petazzoni
b5e742a642 matchbox: apply libtool patch to matchbox-desktop
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>
2010-02-23 20:34:35 +01:00
Thomas Petazzoni
6dc336b293 host-pkgconfig is now host-pkg-config
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-12-15 19:57:31 +01:00
Peter Korsgaard
41aaacd53d matchbox: depend on x11 support, rather than selecting it
Packages should depend on BR2_PACKAGE_XORG7 rather than selecting it,
because:
 - X brings in a lot of dependencies, so shouldn't get implicitly enabled
 - Select doesn't check dependencies, so build breaks if XORG dependencies
   aren't met (locale/wchar)

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-11-23 09:51:46 +01:00
Peter Korsgaard
3fdf0bffb8 buildroot: silence ./configure step when building with 'make -s'
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>
2009-10-01 21:24:42 +02:00
Will Newton
422ce6536b package: Remove unnecessary dependencies on uclibc.
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>
2009-09-03 20:22:38 +02:00
Thomas Petazzoni
d776138bff matchbox: fix dependencies
A dependency on BR2_PACKAGE_XORG7 is enough, no need to depend on
BR2_PACKAGE_XORG_XSERVER.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-24 23:26:46 +02:00
Thomas Petazzoni
51ef5b8122 Fix Matchbox build
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>
2009-07-01 14:24:47 +02:00
Peter Korsgaard
77754571b2 pkgconfig: add pkgconfig package for target
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.
2009-03-18 19:19:10 +00:00
Peter Korsgaard
4a7bfd2775 package/: convert to DOWNLOAD helper 2009-01-16 11:42:52 +00:00
Peter Korsgaard
ac1d92c425 package/: get rid of unneeded $(strip ..) 2008-12-08 08:15:27 +00:00
Peter Korsgaard
e0c4ea8276 matchbox: fix prefix
Closes #5946.
2008-11-04 22:29:02 +00:00
Peter Korsgaard
2cb9654f05 matchbox: fix mb-applet-startup-monitor compilation (TRUE/FALSE issue) 2008-11-04 22:28:58 +00:00
Peter Korsgaard
3d098dd622 Fix matchbox build
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>
2008-10-27 15:15:52 +00:00
Peter Korsgaard
785d6cc6d0 package: remove redundant pkg-config variables
Also remove some redundant or predefined configure/make args in these
packages.

Patch by Markus Heidelberg.
2008-10-26 19:57:55 +00:00
Peter Korsgaard
e320fc667a package/matchbox: fix BR2_PACKAGE_MATCHBOX_KEYBOARD Kconfig
Fix typo and wrong information in help text (not a cvs snapshot)
2008-10-19 07:44:25 +00:00
Peter Korsgaard
f69afd8bd6 matchbox: fix long help text lines 2008-08-27 20:19:26 +00:00
Peter Korsgaard
4683420c4c Kconfig: remove 'default n'
'default n' is the default, so there's no need to say it explicitly.
2008-07-17 20:01:44 +00:00