[oe-commits] Ross Burton : libmatchbox: upgrade to 1.11
git at git.openembedded.org
git at git.openembedded.org
Fri Aug 16 10:04:30 UTC 2013
Module: openembedded-core.git
Branch: master
Commit: 4f51bf23346947cd47e7ac9e1290e799f3c20708
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=4f51bf23346947cd47e7ac9e1290e799f3c20708
Author: Ross Burton <ross.burton at intel.com>
Date: Wed Aug 14 12:40:11 2013 +0100
libmatchbox: upgrade to 1.11
Remove check.m4 as libmatchbox uses the check.pc instead of a m4 file now.
Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
meta/recipes-graphics/libmatchbox/files/check.m4 | 133 --------------------
.../{libmatchbox_1.10.bb => libmatchbox_1.11.bb} | 15 +--
2 files changed, 3 insertions(+), 145 deletions(-)
diff --git a/meta/recipes-graphics/libmatchbox/files/check.m4 b/meta/recipes-graphics/libmatchbox/files/check.m4
deleted file mode 100644
index 97bfd9c..0000000
--- a/meta/recipes-graphics/libmatchbox/files/check.m4
+++ /dev/null
@@ -1,133 +0,0 @@
-dnl AM_PATH_CHECK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for check, and define CHECK_CFLAGS and CHECK_LIBS
-dnl
-
-AC_DEFUN(AM_PATH_CHECK,
-[
- AC_ARG_WITH(check,
- [ --with-check=PATH prefix where check is installed [default=auto]])
-
- min_check_version=ifelse([$1], ,0.8.2,$1)
-
- AC_MSG_CHECKING(for check - version >= $min_check_version)
-
- if test x$with_check = xno; then
- AC_MSG_RESULT(disabled)
- ifelse([$3], , AC_MSG_ERROR([disabling check is not supported]), [$3])
- else
- if test "x$with_check" != x; then
- CHECK_CFLAGS="-I$with_check/include"
- CHECK_LIBS="-L$with_check/lib -lcheck"
- else
- CHECK_CFLAGS=""
- CHECK_LIBS="-lcheck"
- fi
-
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
-
- CFLAGS="$CFLAGS $CHECK_CFLAGS"
- LIBS="$CHECK_LIBS $LIBS"
-
- rm -f conf.check-test
- AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <check.h>
-
-int main ()
-{
- int major, minor, micro;
- char *tmp_version;
-
- system ("touch conf.check-test");
-
- /* HP/UX 9 (%@#!) writes to sscanf strings */
- tmp_version = strdup("$min_check_version");
- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
- printf("%s, bad version string\n", "$min_check_version");
- return 1;
- }
-
- if ((CHECK_MAJOR_VERSION != check_major_version) ||
- (CHECK_MINOR_VERSION != check_minor_version) ||
- (CHECK_MICRO_VERSION != check_micro_version))
- {
- printf("\n*** The check header file (version %d.%d.%d) does not match\n",
- CHECK_MAJOR_VERSION, CHECK_MINOR_VERSION, CHECK_MICRO_VERSION);
- printf("*** the check library (version %d.%d.%d).\n",
- check_major_version, check_minor_version, check_micro_version);
- return 1;
- }
-
- if ((check_major_version > major) ||
- ((check_major_version == major) && (check_minor_version > minor)) ||
- ((check_major_version == major) && (check_minor_version == minor) && (check_micro_version >= micro)))
- {
- return 0;
- }
- else
- {
- printf("\n*** An old version of check (%d.%d.%d) was found.\n",
- check_major_version, check_minor_version, check_micro_version);
- printf("*** You need a version of check being at least %d.%d.%d.\n", major, minor, micro);
- printf("***\n");
- printf("*** If you have already installed a sufficiently new version, this error\n");
- printf("*** probably means that the wrong copy of the check library and header\n");
- printf("*** file is being found. Rerun configure with the --with-check=PATH option\n");
- printf("*** to specify the prefix where the correct version was installed.\n");
- }
-
- return 1;
-}
-],, no_check=yes, [echo $ac_n "cross compiling; assumed OK... $ac_c"])
-
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
-
- if test "x$no_check" = x ; then
- AC_MSG_RESULT(yes)
- ifelse([$2], , :, [$2])
- else
- AC_MSG_RESULT(no)
- if test -f conf.check-test ; then
- :
- else
- echo "*** Could not run check test program, checking why..."
- CFLAGS="$CFLAGS $CHECK_CFLAGS"
- LIBS="$CHECK_LIBS $LIBS"
- AC_TRY_LINK([
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <check.h>
-], , [ echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding check. You'll need to set your"
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
- echo "*** to the installed location Also, make sure you have run ldconfig if that"
- echo "*** is required on your system"
- echo "***"
- echo "*** If you have an old version installed, it is best to remove it, although"
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
- [ echo "*** The test program failed to compile or link. See the file config.log for"
- echo "*** the exact error that occured." ])
-
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
-
- CHECK_CFLAGS=""
- CHECK_LIBS=""
-
- rm -f conf.check-test
- ifelse([$3], , AC_MSG_ERROR([check not found]), [$3])
- fi
-
- AC_SUBST(CHECK_CFLAGS)
- AC_SUBST(CHECK_LIBS)
-
- rm -f conf.check-test
-
- fi
-])
diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox_1.10.bb b/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb
similarity index 70%
rename from meta/recipes-graphics/libmatchbox/libmatchbox_1.10.bb
rename to meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb
index a1531b8..244a495 100644
--- a/meta/recipes-graphics/libmatchbox/libmatchbox_1.10.bb
+++ b/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb
@@ -10,19 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \
DEPENDS = "virtual/libx11 libxext expat libxft jpeg libpng zlib libxsettings-client startup-notification"
-SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/${BPN}/${PV}/${BPN}-${PV}.tar.gz \
- file://check.m4"
-SRC_URI[md5sum] = "042c5874631dfb95151aa793dc1434b8"
-SRC_URI[sha256sum] = "d14d4844840e3e1e4faa9f9e90060915d39b6033f6979464ab3ea3fe1c4f9293"
-
-PR = "r0"
+SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/${BPN}/${PV}/${BPN}-${PV}.tar.bz2"
+SRC_URI[md5sum] = "fc6cc807f55a3e7c752d8013176875d7"
+SRC_URI[sha256sum] = "254cab52e304a3512c8df4be59d690cf3921bbb68a28ede7fe26b93534217b53"
inherit autotools pkgconfig
-S = "${WORKDIR}/libmatchbox-${PV}"
-
-do_configure_prepend () {
- cp ${WORKDIR}/check.m4 ${S}/
-}
-
EXTRA_OECONF = "--enable-jpeg --enable-expat --enable-xsettings --enable-startup-notification"
More information about the Openembedded-commits
mailing list