diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2020-06-27 08:16:32 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2020-06-27 08:21:12 +0300 |
| commit | c87764fefff10735006a31fab72d76c243a3eb40 (patch) | |
| tree | a1536c529ff12a4cd591ef528e4857d4f2fe9572 /meta-openembedded/meta-oe | |
| parent | 064f75b35a14f3bd6e99ce65a7f7609b973036d5 (diff) | |
| download | openbmc-c87764fefff10735006a31fab72d76c243a3eb40.tar.xz | |
meta-openembedded: subtree update:fe77eaab8f..629696b64b
Alex Kiernan (4):
zstd: Upgrade 1.4.4 -> 1.4.5
libxmlb: Add recipe
libjcat: Add recipe
gcab: Add recipe
Andreas Müller (14):
libdvdcss: upgrade 1.3.0 -> 1.4.2
vlc: upgrade 3.0.10 -> 3.0.11
netdata: upgrade 1.17.0 -> 1.22.1
libsass: upgrade 3.6.3 -> 3.6.4 / rename recipe
gnome-desktop3: upgrade 3.36.2 -> 3.36.3.1
evince: upgrade 3.36.3 -> 3.36.5
gnome-control-center: upgrade 3.36.2 -> 3.36.3
redis: upgrade 5.0.9 -> 6.0.4
squid: upgrade 4.9 -> 4.12
libgit2: upgrade 1.0.0 -> 1.0.1
openh264: upgrade 2.1.0 -> 2.1.1
tcpreplay: upgrade 4.3.2 -> 4.3.3
asio: upgrade 1.12.2 -> 1.16.1
Revert "packagegroup-xfce-base: add RDEPEND packagegroup-core-x11"
Anuj Mittal (2):
opencl: move headers and loader recipe to common directory
opencl-clhpp: add recipe
Armin Kuster (9):
python3-configobj: Add package
python3-croniter: add package
python3-flask-versioned: Add package
python3-huey: Add package
python3-sqlsoup: add package
python3-smpplib: add package
python3-pyrad: add package
libuv: pkg now in core, remove
ntp: update 4.2.8p15
Christian Eggers (1):
linuxptp: Fix segmentation fault on 32 bit platforms with 64 bit time_t
Konrad Weihmann (1):
libtalloc: fix upstream url
Leon Anavi (82):
python3-packaging: Consolidate in a single file
python3-packaging: Upgrade 20.3 -> 20.4
python3-parse-type: Consolidate in a single file
python3-parse-type: Upgrade 0.4.2 -> 0.5.2
python3-javaobj-py3: Consolidate in a single file
python3-jsonpointer: Consolidate in a single file
python3-kconfiglib: Consolidate in a single file
python3-twisted: Consolidate in a single file
python3-twisted: Upgrade 19.10.0 -> 20.3.0
protobuf: Upgrade 3.11.4 -> 3.12.3
xscreensaver: Upgrade 5.39 -> 5.44
python3-iso8601: Consolidate in a single file
python3-isodate: Consolidate in a single file
python3-incremental: Consolidate in a single file
python3-itsdangerous: Consolidate in a single file
python3-importlib-metadata: Consolidate in a single file
python3-importlib-metadata: Upgrade 1.5.2 -> 1.6.1
python3-can: Upgrade 3.3.2 -> 3.3.3
python3-psutil: Consolidate in a single file
python3-protobuf: Consolidate in a single file
python3-protobuf: Upgrade 3.11.3 -> 3.12.2
python-kconfiglib.inc: Remove
sip3: Consolidate in a single file
sip3: Upgrade 4.19.19 -> 4.19.23
python3-pexpect: Consolidate in a single file
python3-periphery: Consolidate in a single file
python3-periphery: Upgrade 2.0.1 -> 2.1.0
python3-pocketsphinx: Inherit features_check
python3-parse: Consolidate in a single file
python3-passlib: Consolidate in a single file
python3-pathlib2: Consolidate in a single file
python3-pretend: Consolidate in a single file
python3-prompt-toolkit: Consolidate in a single file
python3-prompt-toolkit: Upgrade 2.0.10 -> 3.0.5
python3-ptyprocess: Consolidate in a single file
python3-booleanpy: Upgrade 3.7 to 3.8
python3-toml: Upgrade 0.10.0 -> 0.10.1
python3-msgpack: Upgrade 0.6.2 -> 1.0.0
lirc: Add python3 to the run-time dependencies
python3-sqlalchemy: Upgrade 1.3.12 -> 1.3.17
python3-sh: Upgrade 1.12.14 -> 1.13.1
python3-certifi: Upgrade 2019.11.28 -> 2020.6.20
python3-setuptools-scm: Upgrade 3.5.0 -> 4.1.2
python3-more-itertools: Upgrade 8.3.0 -> 8.4.0
python3-configparser: Upgrade 4.0.2 -> 5.0.0
python3-pytest-timeout: Upgrade 1.3.4 -> 1.4.1
python3-semver: Upgrade 2.8.1 -> 2.10.2
python3-spidev: Upgrade 3.4 -> 3.5
python3-pint: Upgrade 0.12 -> 0.13
python3-xxhash: Upgrade 1.4.3 -> 1.4.4
python3-networkx: Consolidate in a single file
python3-netifaces: Consolidate in a single file
python3-netaddr: Consolidate in a single file
python3-netaddr: Upgrade 0.7.19 -> 0.7.20
python3-ndg-httpsclient: Consolidate in a single file
python3-lazy-object-proxy: Consolidate in a single file
python3-lazy-object-proxy: Upgrade 1.4.3 -> 1.5.0
python3-license-expression: Consolidate in a single file
python3-license-expression: Upgrade 1.0 -> 1.2
python3-wcwidth: Upgrade 0.2.4 -> 0.2.5
python3-ordered-set: Upgrade 3.1.1 -> 4.0.2
python3-cheetah: Upgrade 3.2.4 -> 3.2.5
python3-cmd2: Upgrade 0.9.23 -> 1.1.0
python3-pyrsistent: Upgrade 0.15.7 -> 0.16.0
python3-requests-file: Upgrade 1.4.3 -> 1.5.1
python3-msk: Upgrade 0.3.13 -> 0.3.15
python3-pyperf: Upgrade 1.7.1 -> 2.0.0
python3-padatious: Upgrade 0.4.7 -> 0.4.8
python3-croniter: Upgrade 0.3.33 -> 0.3.34
python3-lrparsing: Consolidate in a single file
python3-pytun: Consolidate in a single file
python3-jsonpatch: Upgrade 1.25 -> 1.26
python3-socketio: Upgrade 4.5.1 -> 4.6.0
python3-twine: Upgrade 3.1.1 -> 3.2.0
python3-pyexpect: Upgrade 1.0.19 -> 1.0.20
python3-pyjks: Upgrade 19.0.0 -> 20.0.0
python3-ruamel-yaml: Upgrade 0.16.5 0> 0.16.10
python3-pandas: Upgrade 1.0.3 -> 1.0.5
python3-matplotlib: Upgrade 3.2.1 -> 3.2.2
python3-coverage: Upgrade 5.0.2 -> 5.1
python3-coloredlogs: Upgrade 10.0 -> 14.0
python3-astroid: Upgrade 2.3.3 -> 2.4.2
Liwei Song (1):
pm-graph: add flags support for RT kernel
Madhavan Krishnan (1):
libcamera: Bumped to latest source revision
Martin Jansa (1):
ace: fix installation paths when usrmerge is used
Mingli Yu (1):
opencv: make ts module external
Ovidiu Panait (1):
freediameter: upgrade 1.3.2 -> 1.4.0
Paul Eggleton (1):
protobuf-c: disable parallelism to avoid race condition
Peace Lee (1):
Update commit for version 3.9.7
Pierre-Jean Texier (3):
rsnapshot: upgrade 1.4.2 -> 1.4.3
libzip: upgrade 1.7.0 -> 1.7.1
fuse3: upgrade 3.9.1 -> 3.9.2
Ryan Rowe (3):
python3-typeguard: Upgrade 2.7.1 -> 2.9.1
add python3-dynamic-dispatch
add python3-argexec
Sakib Sajal (1):
python3-requests-toolbelt: add recipe for v0.9.1
Trevor Gamblin (1):
python3-django: upgrade 2.2.7 -> 2.2.13
Wang Mingyu (4):
openipmi: upgrade 2.0.28 -> 2.0.29
twm: upgrade 1.0.10 -> 1.0.11
python3-wtforms: upgrade 2.2.1 -> 2.3.1
python3-py: upgrade 1.8.1 -> 1.8.2
Zang Ruochen (6):
python3-geojson: Enable ptest
python3-intervals: Enable ptest
python3-ipy: Enable ptest
python3-iso3166: Enable ptest
python-html2text: Enable ptest
python3-gunicorn: Enable ptest
Zheng Ruoqin (3):
python3-cachetools: Enable ptest
python3-dnspython: Enable ptest
python3-dominate: Enable ptest
lumag (1):
lmsensors: do not depend on lmsensors-isatools on non-x86
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I66b8b206b1f74dab49ef7c266e145127ba27869b
Diffstat (limited to 'meta-openembedded/meta-oe')
41 files changed, 489 insertions, 158 deletions
diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bb index 52d6adb56..2843cdf95 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bb @@ -82,7 +82,7 @@ do_install_append() { PACKAGES =+ "${PN}-contrib ${PN}-exec ${PN}-plugins ${PN}-python" -RDEPENDS_${PN} = "bash" +RDEPENDS_${PN} = "bash python3" RDEPENDS_${PN}-exec = "${PN}" RDEPENDS_${PN}-python = "python3-shell python3-pyyaml python3-datetime python3-netclient python3-stringold" diff --git a/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb index 890db55bc..9c561e9f4 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb @@ -95,7 +95,7 @@ RDEPENDS_${PN} += " \ ${PN}-sensorsdetect \ ${PN}-sensorsconfconvert \ ${PN}-pwmconfig \ - ${PN}-isatools \ + ${@bb.utils.contains('MACHINE_FEATURES', 'x86', '${PN}-isatools', '', d)} \ " # libsensors packages diff --git a/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.8.bb b/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.8.bb index 24315320e..e35bce7f3 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.8.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.8.bb @@ -24,6 +24,8 @@ inherit pkgconfig CXXFLAGS_append = " -fpermissive -Wnodeprecated-declarations" +EXTRA_OEMAKE += "INSTALL_LIB=${baselib}" + do_install() { export D="${D}" oe_runmake install diff --git a/meta-openembedded/meta-oe/recipes-connectivity/ace/files/ace_config.patch b/meta-openembedded/meta-oe/recipes-connectivity/ace/files/ace_config.patch index 207b85ab9..1b8e21865 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/ace/files/ace_config.patch +++ b/meta-openembedded/meta-oe/recipes-connectivity/ace/files/ace_config.patch @@ -6,7 +6,6 @@ diff -ruN ACE_wrappers1/ace/config.h ACE_wrappers/ace/config.h diff -ruN ACE_wrappers1/include/makeinclude/platform_macros.GNU ACE_wrappers/include/makeinclude/platform_macros.GNU --- ACE_wrappers1/include/makeinclude/platform_macros.GNU 1970-01-01 02:00:00.000000000 +0200 +++ ACE_wrappers/include/makeinclude/platform_macros.GNU 2018-10-31 15:11:18.265392460 +0200 -@@ -0,0 +1,3 @@ +@@ -0,0 +1,2 @@ +INSTALL_PREFIX = $(D)$(exec_prefix) -+INSTALL_LIB = $(base_libdir) +include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libuv/libuv_1.38.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/libuv/libuv_1.38.0.bb deleted file mode 100644 index afc9b2f2e..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/libuv/libuv_1.38.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "A multi-platform support library with a focus on asynchronous I/O" -HOMEPAGE = "https://github.com/libuv/libuv" -BUGTRACKER = "https://github.com/libuv/libuv/issues" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a68902a430e32200263d182d44924d47" - -SRCREV = "1ab9ea3790378f9f25c4e78e9e2b511c75f9c9ed" -SRC_URI = "git://github.com/libuv/libuv;branch=v1.x" - -S = "${WORKDIR}/git" - -inherit autotools - -do_configure() { - ${S}/autogen.sh || bbnote "${PN} failed to autogen.sh" - oe_runconf -} - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/time_t_maybe_long_long.patch b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/time_t_maybe_long_long.patch new file mode 100644 index 000000000..af99d2b7f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/time_t_maybe_long_long.patch @@ -0,0 +1,135 @@ +Fix printf if time_t is long long + +On some platforms, time_t has recently switched from "long" to "long +long" [1]. For these platforms it is necessary to use "%lld" as printf +format specifier because the ABI differs between "long" and "long long". + +I found no way for creating something similar to PRId64 for time_t. No +idea how to determine whether it's "long" or "long long". So I cast +everything to "long long" instead. + +[1] https://git.musl-libc.org/cgit/musl/commit/?id=38143339646a4ccce8afe298c34467767c899f51 + +Upstream-Status: Accepted [next version is after 2.0] +Upstream-Patch: https://github.com/richardcochran/linuxptp/commit/7de73fefc378cc42b9ed1115b3afa409d0250a48 + +Signed-off-by: Christian Eggers <ceggers@arri.de> +--- +diff -Naur linuxptp-2.0.org/phc_ctl.c linuxptp-2.0/phc_ctl.c +--- linuxptp-2.0.org/phc_ctl.c 2018-08-12 23:08:43.000000000 +0200 ++++ linuxptp-2.0/phc_ctl.c 2020-05-29 21:34:26.166519963 +0200 +@@ -230,8 +230,8 @@ + strerror(errno)); + return -1; + } else { +- pr_notice("set clock time to %ld.%09ld or %s", +- ts.tv_sec, ts.tv_nsec, ctime(&ts.tv_sec)); ++ pr_notice("set clock time to %lld.%09ld or %s", ++ (long long)ts.tv_sec, ts.tv_nsec, ctime(&ts.tv_sec)); + } + + return args_to_eat; +@@ -248,8 +248,8 @@ + + return -1; + } else { +- pr_notice("clock time is %ld.%09lu or %s", +- ts.tv_sec, ts.tv_nsec, ctime(&ts.tv_sec)); ++ pr_notice("clock time is %lld.%09lu or %s", ++ (long long)ts.tv_sec, ts.tv_nsec, ctime(&ts.tv_sec)); + } + + /* get operation does not require any arguments */ +diff -Naur linuxptp-2.0.org/print.c linuxptp-2.0/print.c +--- linuxptp-2.0.org/print.c 2018-08-12 23:08:43.000000000 +0200 ++++ linuxptp-2.0/print.c 2020-05-29 21:34:26.166519963 +0200 +@@ -73,16 +73,16 @@ + + if (verbose) { + f = level >= LOG_NOTICE ? stdout : stderr; +- fprintf(f, "%s[%ld.%03ld]: %s%s%s\n", ++ fprintf(f, "%s[%lld.%03ld]: %s%s%s\n", + progname ? progname : "", +- ts.tv_sec, ts.tv_nsec / 1000000, ++ (long long)ts.tv_sec, ts.tv_nsec / 1000000, + message_tag ? message_tag : "", message_tag ? " " : "", + buf); + fflush(f); + } + if (use_syslog) { +- syslog(level, "[%ld.%03ld] %s%s%s", +- ts.tv_sec, ts.tv_nsec / 1000000, ++ syslog(level, "[%lld.%03ld] %s%s%s", ++ (long long)ts.tv_sec, ts.tv_nsec / 1000000, + message_tag ? message_tag : "", message_tag ? " " : "", + buf); + } +diff -Naur linuxptp-2.0.org/unicast_service.c linuxptp-2.0/unicast_service.c +--- linuxptp-2.0.org/unicast_service.c 2018-08-12 23:08:43.000000000 +0200 ++++ linuxptp-2.0/unicast_service.c 2020-05-29 21:36:23.170497415 +0200 +@@ -209,9 +209,9 @@ + tmo = now.tv_sec + req->durationField; + if (tmo > client->grant_tmo) { + client->grant_tmo = tmo; +- pr_debug("%s grant of 0x%x extended to %ld", ++ pr_debug("%s grant of 0x%x extended to %lld", + pid2str(&client->portIdentity), +- client->message_types, tmo); ++ client->message_types, (long long)tmo); + } + } + +@@ -226,8 +226,8 @@ + interval = pqueue_peek(p->unicast_service->queue); + if (interval) { + tmo.it_value = interval->tmo; +- pr_debug("arming timer tmo={%ld,%ld}", +- interval->tmo.tv_sec, interval->tmo.tv_nsec); ++ pr_debug("arming timer tmo={%lld,%ld}", ++ (long long)interval->tmo.tv_sec, interval->tmo.tv_nsec); + } else { + pr_debug("stopping unicast service timer"); + } +@@ -499,8 +499,8 @@ + + while ((interval = pqueue_peek(p->unicast_service->queue)) != NULL) { + +- pr_debug("peek i={2^%d} tmo={%ld,%ld}", interval->log_period, +- interval->tmo.tv_sec, interval->tmo.tv_nsec); ++ pr_debug("peek i={2^%d} tmo={%lld,%ld}", interval->log_period, ++ (long long)interval->tmo.tv_sec, interval->tmo.tv_nsec); + + if (timespec_compare(&now, &interval->tmo) >= 0) { + break; +@@ -519,8 +519,8 @@ + } + + interval_increment(interval); +- pr_debug("next i={2^%d} tmo={%ld,%ld}", interval->log_period, +- interval->tmo.tv_sec, interval->tmo.tv_nsec); ++ pr_debug("next i={2^%d} tmo={%lld,%ld}", interval->log_period, ++ (long long)interval->tmo.tv_sec, interval->tmo.tv_nsec); + pqueue_insert(p->unicast_service->queue, interval); + } + +diff -Naur linuxptp-2.0.org/unicast_client.c linuxptp-2.0/unicast_client.c +--- linuxptp-2.0.org/unicast_client.c 2018-08-12 23:08:43.000000000 +0200 ++++ linuxptp-2.0/unicast_client.c 2020-06-02 11:13:06.922997844 +0200 +@@ -216,7 +216,7 @@ + long duration) + { + struct timespec now; +- long tmo; ++ time_t tmo; + + if (clock_gettime(CLOCK_MONOTONIC, &now)) { + pr_err("clock_gettime failed: %m"); +@@ -226,7 +226,7 @@ + tmo = now.tv_sec + duration; + if (!master->renewal_tmo || tmo < master->renewal_tmo) { + master->renewal_tmo = tmo; +- pr_debug("port %d: renewal timeout at %ld", portnum(p), tmo); ++ pr_debug("port %d: renewal timeout at %lld", portnum(p), (long long)tmo); + } + } + diff --git a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb index eb262d36b..930c6673d 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb @@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "http://sourceforge.net/projects/linuxptp/files/v${PV}/linuxptp-${PV}.tgz \ file://build-Allow-CC-and-prefix-to-be-overriden.patch \ file://no-incdefs-using-host-headers.patch \ + file://time_t_maybe_long_long.patch \ " SRC_URI[md5sum] = "d8bb7374943bb747db7786ac26f17f11" diff --git a/meta-openembedded/meta-oe/recipes-core/ocl-icd/ocl-icd_git.bb b/meta-openembedded/meta-oe/recipes-core/opencl/ocl-icd_git.bb index d14ec53e3..d14ec53e3 100644 --- a/meta-openembedded/meta-oe/recipes-core/ocl-icd/ocl-icd_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/opencl/ocl-icd_git.bb diff --git a/meta-openembedded/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb new file mode 100644 index 000000000..a4f292475 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb @@ -0,0 +1,23 @@ +SUMMARY = "OpenCL API C++ bindings" +DESCRIPTION = "OpenCL API C++ bindings from Khronos" + +SRC_URI = "git://github.com/KhronosGroup/OpenCL-CLHPP.git;protocol=https" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" + +PV = "2.0.11+git${SRCPV}" +SRCREV = "432b551429b362a877ed9b647b7114022b332be0" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE = " \ + -DBUILD_DOCS=OFF \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_TESTS=OFF \ + " + +# Headers only so PN is empty +RDEPENDS_${PN}-dev = "" diff --git a/meta-openembedded/meta-oe/recipes-core/opencl-headers/opencl-headers_git.bb b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-headers_git.bb index dec1bea56..dec1bea56 100644 --- a/meta-openembedded/meta-oe/recipes-core/opencl-headers/opencl-headers_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-headers_git.bb diff --git a/meta-openembedded/meta-oe/recipes-core/opencl-icd-loader/opencl-icd-loader_git.bb b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb index 7c49c8d55..7c49c8d55 100644 --- a/meta-openembedded/meta-oe/recipes-core/opencl-icd-loader/opencl-icd-loader_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb diff --git a/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.7.bb b/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.7.bb index 2b799fd5e..88fad936b 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.7.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.7.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2c1c00f9d3ed9e24fa69b932b7e7aff2" PV = "3.9.7+git${SRCPV}" SRC_URI = "git://github.com/iipeace/${BPN}" -SRCREV = "c87269d6d4669d12c99a2a7b9b07c39a5dd24ac6" +SRCREV = "459b5189a46023fc98e19888b196bdc2674022fd" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb index bb8aecded..6fef0bed2 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb @@ -22,6 +22,11 @@ S = "${WORKDIR}/git" inherit autotools pkgconfig +# After several fix attempts there is still a race between generating +# t.test-full.pb.h and compiling cxx_generate_packed_data.c despite +# BUILT_SOURCES and explicit dependencies. +PARALLEL_MAKE = "" + PACKAGE_BEFORE_PN = "${PN}-compiler" FILES_${PN}-compiler = "${bindir}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch index 0a2e5e2df..934c98193 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch @@ -1,4 +1,4 @@ -From a28e15092a298e0c73c6fc1ded0913275cf27cb0 Mon Sep 17 00:00:00 2001 +From e5340f816aa273cfda36998466739ca0748caafb Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Fri, 28 Jun 2019 13:50:52 +0000 Subject: [PATCH] examples/Makefile: respect CXX,LDFLAGS variables, fix build @@ -23,12 +23,13 @@ Subject: [PATCH] examples/Makefile: respect CXX,LDFLAGS variables, fix build Upstream-Status: Pending Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> --- examples/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/examples/Makefile b/examples/Makefile -index 4ad605641..31d887639 100644 +index e9f9635ae..b2fbe2de1 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -2,6 +2,8 @@ @@ -44,13 +45,16 @@ index 4ad605641..31d887639 100644 add_person_cpp: add_person.cc protoc_middleman pkg-config --cflags protobuf # fails if protobuf is not installed -- c++ add_person.cc addressbook.pb.cc -o add_person_cpp `pkg-config --cflags --libs protobuf` +- c++ -std=c++11 add_person.cc addressbook.pb.cc -o add_person_cpp `pkg-config --cflags --libs protobuf` + $(CXX) $(CXXFLAGS) $(LDFLAGS) ../src/google/protobuf/.libs/timestamp.pb.o $(PROTOBUF) add_person.cc addressbook.pb.cc -o add_person_cpp list_people_cpp: list_people.cc protoc_middleman pkg-config --cflags protobuf # fails if protobuf is not installed -- c++ list_people.cc addressbook.pb.cc -o list_people_cpp `pkg-config --cflags --libs protobuf` +- c++ -std=c++11 list_people.cc addressbook.pb.cc -o list_people_cpp `pkg-config --cflags --libs protobuf` + $(CXX) $(CXXFLAGS) $(LDFLAGS) ../src/google/protobuf/.libs/timestamp.pb.o $(PROTOBUF) list_people.cc addressbook.pb.cc -o list_people_cpp add_person_dart: add_person.dart protoc_middleman_dart +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.11.4.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.12.3.bb index 4d6c5b255..21ad7a460 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.11.4.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.12.3.bb @@ -10,9 +10,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b" DEPENDS = "zlib" DEPENDS_append_class-target = " protobuf-native" -SRCREV = "d0bfd5221182da1a7cc280f3337b5e41a89539cf" +SRCREV = "31ebe2ac71400344a5db91ffc13c4ddfb7589f92" -SRC_URI = "git://github.com/google/protobuf.git;branch=3.11.x \ +SRC_URI = "git://github.com/protocolbuffers/protobuf.git \ file://run-ptest \ file://0001-protobuf-fix-configure-error.patch \ file://0001-Makefile.am-include-descriptor.cc-when-building-libp.patch \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/sip/sip3_4.19.19.bb b/meta-openembedded/meta-oe/recipes-devtools/sip/sip3_4.19.19.bb deleted file mode 100644 index 010fa30fe..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/sip/sip3_4.19.19.bb +++ /dev/null @@ -1,11 +0,0 @@ -require sip.inc - -DEPENDS = "python3" - -inherit python3-dir python3native - -PACKAGES += "python3-sip3" - -FILES_python3-sip3 = "${libdir}/${PYTHON_DIR}/site-packages/" -FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/.debug" - diff --git a/meta-openembedded/meta-oe/recipes-devtools/sip/sip.inc b/meta-openembedded/meta-oe/recipes-devtools/sip/sip3_4.19.23.bb index d8e32a768..320755b84 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/sip/sip.inc +++ b/meta-openembedded/meta-oe/recipes-devtools/sip/sip3_4.19.23.bb @@ -1,16 +1,22 @@ SUMMARY = "SIP is a C++/Python Wrapper Generator" -HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip" +HOMEPAGE = "https://riverbankcomputing.com/software/sip/" SECTION = "devel" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://LICENSE-GPL2;md5=e91355d8a6f8bd8f7c699d62863c7303" SRC_URI = "https://www.riverbankcomputing.com/static/Downloads/sip/${PV}/sip-${PV}.tar.gz \ " -SRC_URI[md5sum] = "98111479309dc472410f26080d6d4a88" -SRC_URI[sha256sum] = "5436b61a78f48c7e8078e93a6b59453ad33780f80c644e5f3af39f94be1ede44" +SRC_URI[md5sum] = "70adc0c9734e2d9dcd241d3f931dfc74" +SRC_URI[sha256sum] = "22ca9bcec5388114e40d4aafd7ccd0c4fe072297b628d0c5cdfa2f010c0bc7e7" + +inherit python3-dir python3native S = "${WORKDIR}/sip-${PV}" +DEPENDS = "python3" + +PACKAGES += "python3-sip3" + BBCLASSEXTEND = "native" do_configure_prepend_class-target() { @@ -22,6 +28,7 @@ do_configure_prepend_class-target() { echo "sip_sip_dir = ${D}/${datadir}/sip" >> sip.cfg ${PYTHON} configure.py --configuration sip.cfg --sip-module PyQt5.sip --sysroot ${STAGING_DIR_HOST} CC="${CC}" CXX="${CXX}" LINK="${CXX}" STRIP="" LINK_SHLIB="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LFLAGS="${LDFLAGS}" } + do_configure_prepend_class-native() { echo "py_platform = linux" > sip.cfg echo "py_inc_dir = ${includedir}/python%(py_major).%(py_minor)${PYTHON_ABI}" >> sip.cfg @@ -31,6 +38,10 @@ do_configure_prepend_class-native() { echo "sip_sip_dir = ${D}/${datadir}/sip" >> sip.cfg ${PYTHON} configure.py --configuration sip.cfg --sip-module PyQt5.sip --sysroot=${STAGING_DIR_NATIVE} } + do_install() { oe_runmake install } + +FILES_python3-sip3 = "${libdir}/${PYTHON_DIR}/site-packages/" +FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/.debug" diff --git a/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.7.0.bb b/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.7.1.bb index e7cb6a06d..1a9cd8f10 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.7.1.bb @@ -15,4 +15,4 @@ inherit cmake SRC_URI = "https://libzip.org/download/libzip-${PV}.tar.xz" -SRC_URI[sha256sum] = "d26b2952426d2518f3db5cdeda4fe3cd668fc5bb38a598781e4d1d3f7f8ca7be" +SRC_URI[sha256sum] = "a020dc1b17a79faa748e43a05f8605d65e403813e8e97ad3a300a90ddba097ac" diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch index 421f306de..878cd3697 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch @@ -11,20 +11,25 @@ Signed-off-by: Venture Research <tech@ventureresearch.com> Update to work with 4.0.8 Signed-off-by: Alistair Francis <alistair.francis@wdc.com> +Reworked for 6.0.4 +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> --- - deps/hiredis/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + deps/hiredis/Makefile | 2 -- + 1 file changed, 2 deletions(-) diff --git a/deps/hiredis/Makefile b/deps/hiredis/Makefile -index 9a4de836..271c06ba 100644 +index 25ac154..569f82b 100644 --- a/deps/hiredis/Makefile +++ b/deps/hiredis/Makefile -@@ -36,7 +36,7 @@ endef +@@ -42,8 +42,6 @@ endef export REDIS_TEST_CONFIG # Fallback to gcc when $CC is not in $PATH. --CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc') -+CC?=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc') - CXX:=$(shell sh -c 'type $(CXX) >/dev/null 2>/dev/null && echo $(CXX) || echo g++') +-CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc') +-CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++') OPTIMIZATION?=-O3 - WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings + WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers + DEBUG_FLAGS?= -g -ggdb +-- +2.21.3 + diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_5.0.9.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.4.bb index d04293369..ffa28ccfe 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis_5.0.9.bb +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.4.bb @@ -17,8 +17,8 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ file://GNU_SOURCE.patch \ " -SRC_URI[md5sum] = "c94523c9f4ee662027ddf90575d0e058" -SRC_URI[sha256sum] = "53d0ae164cd33536c3d4b720ae9a128ea6166ebf04ff1add3b85f1242090cb85" +SRC_URI[md5sum] = "37200b25c282f94da4521bc510d79ced" +SRC_URI[sha256sum] = "3337005a1e0c3aa293c87c313467ea8ac11984921fab08807998ba765c9943de" inherit autotools-brokensep update-rc.d systemd useradd diff --git a/meta-openembedded/meta-oe/recipes-extended/zstd/zstd/0001-Fix-legacy-build-after-2103.patch b/meta-openembedded/meta-oe/recipes-extended/zstd/zstd/0001-Fix-legacy-build-after-2103.patch new file mode 100644 index 000000000..c701554b8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/zstd/zstd/0001-Fix-legacy-build-after-2103.patch @@ -0,0 +1,27 @@ +From 93cec0c1d6d0be8dd3a9d01d3e7f2099f1728df7 Mon Sep 17 00:00:00 2001 +From: Orivej Desh <orivej@gmx.fr> +Date: Fri, 22 May 2020 12:48:02 +0000 +Subject: [PATCH] Fix legacy build after #2103 + +Upstream-Status: Backport +Signed-of-by: Alex Kiernan <alex.kiernan@gmail.com> +--- + lib/legacy/zstd_v04.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/legacy/zstd_v04.c b/lib/legacy/zstd_v04.c +index 56bf45222498..19fda8980abf 100644 +--- a/lib/legacy/zstd_v04.c ++++ b/lib/legacy/zstd_v04.c +@@ -74,7 +74,7 @@ extern "C" { + /*-************************************* + * Debug + ***************************************/ +-#include "debug.h" ++#include "../common/debug.h" + #ifndef assert + # define assert(condition) ((void)0) + #endif +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.4.bb b/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.5.bb index eb201f413..cd0b471e1 100644 --- a/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.4.bb +++ b/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.5.bb @@ -9,9 +9,11 @@ LICENSE = "BSD-3-Clause & GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32 \ file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0" -SRC_URI = "git://github.com/facebook/zstd.git;nobranch=1" +SRC_URI = "git://github.com/facebook/zstd.git;nobranch=1 \ + file://0001-Fix-legacy-build-after-2103.patch \ + " -SRCREV = "10f0e6993f9d2f682da6d04aa2385b7d53cbb4ee" +SRCREV = "b706286adbba780006a47ef92df0ad7a785666b6" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-gnome/gcab/gcab/run-ptest b/meta-openembedded/meta-oe/recipes-gnome/gcab/gcab/run-ptest new file mode 100644 index 000000000..0cdb48ea3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-gnome/gcab/gcab/run-ptest @@ -0,0 +1,3 @@ +#! /bin/sh + +gnome-desktop-testing-runner libgcab diff --git a/meta-openembedded/meta-oe/recipes-gnome/gcab/gcab_1.4.bb b/meta-openembedded/meta-oe/recipes-gnome/gcab/gcab_1.4.bb new file mode 100644 index 000000000..68f52bf92 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-gnome/gcab/gcab_1.4.bb @@ -0,0 +1,24 @@ +SUMMARY = "A GObject library to create cabinet files" +HOMEPAGE = "https://gitlab.gnome.org/GNOME/gcab" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = "glib-2.0" + +SRC_URI = "\ + ${GNOME_MIRROR}/gcab/${PV}/gcab-${PV}.tar.xz \ + file://run-ptest \ +" +SRC_URI[sha256sum] = "67a5fa9be6c923fbc9197de6332f36f69a33dadc9016a2b207859246711c048f" + +inherit gobject-introspection gtk-doc manpages meson ptest-gnome vala + +PACKAGECONFIG ??= "\ + ${@bb.utils.contains('USE_NLS', 'yes', 'nls', '', d)} \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ +" +PACKAGECONFIG[manpages] = "" +PACKAGECONFIG[nls] = "-Dnls=true,-Dnls=false" +PACKAGECONFIG[tests] = "-Dtests=true -Dinstalled_tests=true,-Dtests=false -Dinstalled_tests=false" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat/run-ptest b/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat/run-ptest new file mode 100644 index 000000000..14980a7d0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat/run-ptest @@ -0,0 +1,3 @@ +#! /bin/sh + +gnome-desktop-testing-runner libjcat diff --git a/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.2.bb b/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.2.bb new file mode 100644 index 000000000..10f5a800b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.2.bb @@ -0,0 +1,34 @@ +SUMMARY = "Library for reading and writing Jcat files" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1803fa9c2c3ce8cb06b4861d75310742" + +DEPENDS = "\ + glib-2.0 \ + json-glib \ +" + +SRC_URI = "\ + git://github.com/hughsie/libjcat.git \ + file://run-ptest \ +" +SRCREV = "1a509ac60b7446254c3bd1f45ea53e6cffba30ac" +S = "${WORKDIR}/git" + +inherit gobject-introspection gtk-doc meson ptest-gnome vala + +PACKAGECONFIG ??= "\ + gpg \ + pkcs7 \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ +" +PACKAGECONFIG[gpg] = "-Dgpg=true,-Dgpg=false,gpgme" +PACKAGECONFIG[pkcs7] = "-Dpkcs7=true,-Dpkcs7=false,gnutls gnutls-native" +PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false" + +# manpage generation is broken because help2man needs to run the target binary on the host... +EXTRA_OEMESON = "-Dman=false" +GTKDOC_MESON_OPTION = "gtkdoc" + +RDEPENDS_${PN}_class-target = "\ + ${@bb.utils.contains('PACKAGECONFIG', 'gpg', 'gnupg', '', d)} \ +" diff --git a/meta-openembedded/meta-oe/recipes-gnome/libxmlb/libxmlb/run-ptest b/meta-openembedded/meta-oe/recipes-gnome/libxmlb/libxmlb/run-ptest new file mode 100644 index 000000000..6d0bb95d3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-gnome/libxmlb/libxmlb/run-ptest @@ -0,0 +1,3 @@ +#! /bin/sh + +gnome-desktop-testing-runner libxmlb diff --git a/meta-openembedded/meta-oe/recipes-gnome/libxmlb/libxmlb_0.1.15.bb b/meta-openembedded/meta-oe/recipes-gnome/libxmlb/libxmlb_0.1.15.bb new file mode 100644 index 000000000..c54599317 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-gnome/libxmlb/libxmlb_0.1.15.bb @@ -0,0 +1,19 @@ +SUMMARY = "A library to help create and query binary XML blobs" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1803fa9c2c3ce8cb06b4861d75310742" + +SRC_URI = "\ + git://github.com/hughsie/libxmlb.git \ + file://run-ptest \ +" +SRCREV = "ee4aafdd97844f1c73021a4978a43460f0835d5c" +S = "${WORKDIR}/git" + +inherit gobject-introspection gtk-doc meson ptest-gnome + +PACKAGECONFIG ??= "\ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ +" +PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false" + +GTKDOC_MESON_OPTION = "gtkdoc" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/twm_1.0.10.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/twm_1.0.11.bb index 3a2267ae9..45caaacf2 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/twm_1.0.10.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/twm_1.0.11.bb @@ -5,8 +5,9 @@ DEPENDS += " libxext libxt libxmu bison-native" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=4c6d42ef60e8166aa26606524c0b9586" -SRC_URI[md5sum] = "e322c08eeb635f924ede5b8eba3db54e" -SRC_URI[sha256sum] = "6449eadca16ce0f0d900605b0cc020b95f40619261b7beccfb46bcc1836445d7" +SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.gz" +SRC_URI[md5sum] = "48e83210b39a7bfb492604ba0bcfb19e" +SRC_URI[sha256sum] = "410ecabac54e6db7afd5c20a78d89c0134f3c74b149bee71b1fec775e6e060cc" FILES_${PN} += "${datadir}/X11/twm/system.twmrc" ALTERNATIVE_NAME = "x-window-manager" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/fix-buildscripts.patch b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/fix-buildscripts.patch index 3a50eff83..afc8bc8e7 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/fix-buildscripts.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/fix-buildscripts.patch @@ -1,5 +1,5 @@ ---- xscreensaver-5.39.orig/configure.in -+++ xscreensaver-5.39/configure.in +--- xscreensaver-5.44.orig/configure.in 2020-06-16 12:49:55.384675395 +0000 ++++ xscreensaver-5.44/configure.in 2020-06-16 12:51:49.451826729 +0000 @@ -14,6 +14,9 @@ # ############################################################################### @@ -10,38 +10,9 @@ AH_TOP([ /* config.h.in --- xscreensaver, Copyright (c) 1991-2014 Jamie Zawinski. * -@@ -422,12 +425,12 @@ - - OBJCC="$CC" - -- AC_MSG_CHECKING([whether the compiler works on ANSI C]) -- AC_TRY_RUN([ main(int ac, char **av) { return 0; } ], -- AC_MSG_RESULT(yes), -- AC_MSG_RESULT(no) -- AC_MSG_ERROR(Couldn't build even a trivial ANSI C program: check CC.), -- AC_MSG_ERROR(Couldn't build even a trivial ANSI C program: check CC.)) -+# AC_MSG_CHECKING([whether the compiler works on ANSI C]) -+# AC_TRY_RUN([ main(int ac, char **av) { return 0; } ], -+# AC_MSG_RESULT(yes), -+# AC_MSG_RESULT(no) -+# AC_MSG_ERROR(Couldn't build even a trivial ANSI C program: check CC.), -+# AC_MSG_ERROR(Couldn't build even a trivial ANSI C program: check CC.)) - - if test -n "$GCC"; then - AC_MSG_RESULT(Turning on gcc compiler warnings.) ---- xscreensaver-5.39.orig/Makefile.in -+++ xscreensaver-5.39/Makefile.in -@@ -6,7 +6,7 @@ - VPATH = @srcdir@ - - SHELL = /bin/sh --SUBDIRS = utils jwxyz hacks/images hacks hacks/glx driver po -+SUBDIRS = utils jwxyz hacks/images hacks driver - SUBDIRS2 = $(SUBDIRS) OSX android - TARFILES = README README.hacking README.VMS INSTALL \ - configure configure.in Makefile.in config.h.in \ ---- xscreensaver-5.39.orig/driver/Makefile.in -+++ xscreensaver-5.39/driver/Makefile.in +diff -Naur xscreensaver-5.44.orig/driver/Makefile.in xscreensaver-5.44/driver/Makefile.in +--- xscreensaver-5.44.orig/driver/Makefile.in 2020-06-16 12:49:55.388675365 +0000 ++++ xscreensaver-5.44/driver/Makefile.in 2020-06-16 12:53:36.331038333 +0000 @@ -10,7 +10,7 @@ top_srcdir = @top_srcdir@ top_builddir = .. @@ -51,7 +22,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ -@@ -221,7 +221,7 @@ +@@ -228,7 +228,7 @@ SCRIPTS_1 = xscreensaver-getimage-file xscreensaver-getimage-video \ xscreensaver-text SCRIPTS_OSX = xscreensaver-getimage-desktop @@ -60,8 +31,9 @@ HDRS = XScreenSaver_ad.h XScreenSaver_Xm_ad.h \ xscreensaver.h prefs.h remote.h exec.h \ ---- xscreensaver-5.39.orig/hacks/Makefile.in -+++ xscreensaver-5.39/hacks/Makefile.in +diff -Naur xscreensaver-5.44.orig/hacks/Makefile.in xscreensaver-5.44/hacks/Makefile.in +--- xscreensaver-5.44.orig/hacks/Makefile.in 2020-06-16 12:49:55.532674285 +0000 ++++ xscreensaver-5.44/hacks/Makefile.in 2020-06-16 12:58:54.364719996 +0000 @@ -10,7 +10,7 @@ top_srcdir = @top_srcdir@ top_builddir = .. @@ -71,40 +43,40 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ -@@ -122,7 +122,7 @@ - asm6502.c abstractile.c lcdscrub.c hexadrop.c \ +@@ -124,7 +124,7 @@ tessellimage.c delaunay.c recanim.c binaryring.c \ - webcollage-cocoa.m webcollage-helper-cocoa.m testx11.c + glitchpeg.c vfeedback.c scooter.c webcollage-cocoa.m \ + webcollage-helper-cocoa.m testx11.c -SCRIPTS = vidwhacker webcollage ljlatest +#SCRIPTS = vidwhacker webcollage ljlatest # Programs that are mentioned in XScreenSaver.ad, and that have XML files, # but that are not shipped with xscreensaver itself. -@@ -163,7 +163,13 @@ - lcdscrub.o hexadrop.o tessellimage.o delaunay.o recanim.o \ - binaryring.o testx11.o +@@ -166,7 +166,13 @@ + tessellimage.o delaunay.o recanim.o binaryring.o \ + glitchpeg.o vfeedback.o scooter.o testx11.o -EXES = attraction blitspin bouboule braid decayscreen deco \ -+EXES = fontglide -+JPEG_EXES = webcollage-helper ++EXES = fontglide ++JPEG_EXES = webcollage-helper + -+RETIRED_EXES = ant bubbles critical flag forest hyperball hypercube laser \ -+ lightning lisa lissie lmorph rotor sphere spiral t3d vines \ -+ whirlygig worm xsublim juggle testx11 \ -+ attraction blitspin bouboule braid decayscreen deco \ ++RETIRED_EXES = ant bubbles critical flag forest hyperball hypercube laser \ ++ lightning lisa lissie lmorph rotor sphere spiral t3d vines \ ++ whirlygig worm xsublim juggle testx11 \ ++ attraction blitspin bouboule braid decayscreen deco \ drift flame galaxy grav greynetic halo \ helix hopalong ifs imsmap julia kaleidescope \ maze moire noseguy pedal \ -@@ -179,17 +185,12 @@ +@@ -182,17 +188,12 @@ speedmine vermiculate twang apollonian euler2d \ polyominoes thornbird fluidballs anemone halftone \ metaballs eruption popsquares barcode piecewise cloudlife \ -- fontglide apple2 xanalogtv pong wormhole \ -+ apple2 xanalogtv pong wormhole \ +- fontglide apple2 xanalogtv pong filmleader wormhole \ ++ apple2 xanalogtv pong filmleader wormhole \ pacman fuzzyflakes anemotaxis memscroller substrate \ intermomentary fireworkx fiberlamp boxfit interaggregate \ celtic cwaves m6502 abstractile lcdscrub hexadrop \ - tessellimage binaryring \ + tessellimage binaryring glitchpeg vfeedback scooter \ @JPEG_EXES@ -JPEG_EXES = webcollage-helper - @@ -114,3 +86,15 @@ HACK_OBJS_1 = fps.o $(UTILS_BIN)/resources.o $(UTILS_BIN)/visual.o \ $(UTILS_BIN)/usleep.o $(UTILS_BIN)/yarandom.o \ +diff -Naur xscreensaver-5.44.orig/Makefile.in xscreensaver-5.44/Makefile.in +--- xscreensaver-5.44.orig/Makefile.in 2020-06-16 12:49:55.384675395 +0000 ++++ xscreensaver-5.44/Makefile.in 2020-06-16 12:52:49.395383836 +0000 +@@ -6,7 +6,7 @@ + VPATH = @srcdir@ + + SHELL = /bin/sh +-SUBDIRS = utils jwxyz hacks/images hacks hacks/glx driver po ++SUBDIRS = utils jwxyz hacks/images hacks driver + SUBDIRS2 = $(SUBDIRS) OSX android + TARFILES = README README.hacking README.VMS INSTALL \ + configure configure.in Makefile.in config.h.in \ diff --git a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/tweak-app-defaults.patch b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/tweak-app-defaults.patch index 099a0b2f4..0f2e09aec 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/tweak-app-defaults.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/tweak-app-defaults.patch @@ -1,5 +1,5 @@ ---- xscreensaver-5.39.orig/driver/XScreenSaver.ad.in -+++ xscreensaver-5.39/driver/XScreenSaver.ad.in +--- xscreensaver-5.44.orig/driver/XScreenSaver.ad.in 2020-06-16 13:13:14.950970569 +0000 ++++ xscreensaver-5.44/driver/XScreenSaver.ad.in 2020-06-16 13:19:35.777000937 +0000 @@ -29,7 +29,7 @@ ! /* (xrdb prevention kludge: whole file) @@ -31,10 +31,10 @@ +*splash: False *splashDuration: 0:00:05 *visualID: default - *captureStderr: True -@@ -158,236 +158,8 @@ - ! screen savers interactively. - ! + *installColormap: True +@@ -343,246 +343,8 @@ + !============================================================================= + *programs: \ - maze -root \n\ -@GL_KLUDGE@ GL: superquadrics -root \n\ @@ -138,6 +138,7 @@ -@GL_KLUDGE@ GL: menger -root \n\ -@GL_KLUDGE@ GL: molecule -root \n\ - rotzoomer -root \n\ +- scooter -root \n\ - speedmine -root \n\ -@GL_KLUDGE@ GL: starwars -root \n\ -@GL_KLUDGE@ GL: stonerview -root \n\ @@ -262,12 +263,21 @@ -@GL_KLUDGE@ GL: esper -root \n\ -@GL_KLUDGE@ GL: vigilance -root \n\ -@GL_KLUDGE@ GL: crumbler -root \n\ +- filmleader -root \n\ +- glitchpeg -root \n\ +-@GL_KLUDGE@ GL: handsy -root \n\ -@GL_KLUDGE@ GL: maze3d -root \n\ -@GL_KLUDGE@ GL: peepers -root \n\ --@GL_KLUDGE@ GL: razzledazzle -root \n +-@GL_KLUDGE@ GL: razzledazzle -root \n\ +- vfeedback -root \n\ +-@GL_KLUDGE@ GL: deepstars -root \n\ +-@GL_KLUDGE@ GL: gravitywell -root \n\ +-@GL_KLUDGE@ GL: etruscanvenus -root \n\ +-@GL_KLUDGE@ GL: gibson -root \n - -+- fontglide -root -program "date +'%F %H:%M %z'" \n\ -+ gifview --window $XSCREENSAVER_WINDOW /usr/share/logo/bosch-black.gif \n - +- ++- fontglide -root -program "date +'%F %H:%M %z'" ++ gifview --window $XSCREENSAVER_WINDOW /usr/share/logo/bosch-black.gif !============================================================================= + ! diff --git a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.44.bb index b8c1881d9..6cad97f15 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.44.bb @@ -1,11 +1,11 @@ SUMMARY = "X screen saver and locker" LICENSE = "BSD-0-Clause" -LIC_FILES_CHKSUM = "file://driver/xscreensaver.h;endline=10;md5=e141ab5822fb2d43694e1e47b59fc0df" +LIC_FILES_CHKSUM = "file://driver/xscreensaver.h;endline=10;md5=2b97002f72fbfc9329b4336e798f2463" SRC_URI = "https://www.jwz.org/${BPN}/${BP}.tar.gz" -SRC_URI[md5sum] = "a5da62b91271f4e8afcc73d44697364b" -SRC_URI[sha256sum] = "48ce1880f18b5321182be0c033aeceb5ec5628a1505b9d1ff69dbf06093c2426" +SRC_URI[md5sum] = "9f764e561f9939f8684a66ec98b27cba" +SRC_URI[sha256sum] = "73d8089cfc7d7363b5dac99b5b01dffb3429d0a855e6af16ce9a4b7777017b95" SRC_URI += " \ file://xscreensaver.service \ @@ -15,7 +15,10 @@ SRC_URI += " \ DEPENDS = "intltool-native libx11 libxext libxt libxft glib-2.0-native bc-native" # These are only needed as part of the stopgap screensaver implementation: -RDEPENDS_${PN} += "liberation-fonts" +RDEPENDS_${PN} = " \ + liberation-fonts \ + xuser-account \ +" inherit systemd perlnative pkgconfig gettext autotools-brokensep features_check diff --git a/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph-add-support-for-RT-kernel-ftrace-flags.patch b/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph-add-support-for-RT-kernel-ftrace-flags.patch new file mode 100644 index 000000000..f7f8bc068 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph-add-support-for-RT-kernel-ftrace-flags.patch @@ -0,0 +1,42 @@ +From 47a1db21f6c5d17c94c58c3fe0dcce35c623dbf4 Mon Sep 17 00:00:00 2001 +From: Liwei Song <liwei.song@windriver.com> +Date: Tue, 23 Jun 2020 04:47:20 +0000 +Subject: [PATCH] sleepgraph: add support for RT kernel ftrace flags + +with PREEMPT_RT enabled in kernel, ftrace have a different +flags format: + + _-----=> irqs-off + / _----=> need-resched + | / _----=> need-resched + || / _---=> hardirq/softirq + ||| / _--=> preempt-depth + ||||/ delay +TASK-PID CPU# ||||| TIMESTAMP FUNCTION + | | | ||||| | | + +add support for this. + +Upstream-Status: Submitted [https://github.com/intel/pm-graph/pull/18] + +Signed-off-by: Liwei Song <liwei.song@windriver.com> +--- + sleepgraph.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sleepgraph.py b/sleepgraph.py +index cfed8e09e0e6..561f165cf9be 100755 +--- a/sleepgraph.py ++++ b/sleepgraph.py +@@ -2689,7 +2689,7 @@ class TestProps: + '[ +!#\*@$]*(?P<dur>[0-9\.]*) .*\| (?P<msg>.*)' + ftrace_line_fmt_nop = \ + ' *(?P<proc>.*)-(?P<pid>[0-9]*) *\[(?P<cpu>[0-9]*)\] *'+\ +- '(?P<flags>.{4}) *(?P<time>[0-9\.]*): *'+\ ++ '(?P<flags>.{4,7}) *(?P<time>[0-9\.]*): *'+\ + '(?P<msg>.*)' + def __init__(self): + self.stamp = '' +-- +2.24.1 + diff --git a/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb b/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb index a1378866a..4526eeed3 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb @@ -9,6 +9,7 @@ SRCREV = "cf59527dc24fdd2f314ae4dcaeb3d68a117988f6" SRC_URI = "git://github.com/intel/pm-graph.git \ file://0001-Makefile-fix-multilib-build-failure.patch \ file://0001-sleepgraph.py-use-python3.patch \ + file://0001-sleepgraph-add-support-for-RT-kernel-ftrace-flags.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/asio/asio_1.12.2.bb b/meta-openembedded/meta-oe/recipes-support/asio/asio_1.16.1.bb index 35f875fdc..f381d12fb 100644 --- a/meta-openembedded/meta-oe/recipes-support/asio/asio_1.12.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/asio/asio_1.16.1.bb @@ -1,3 +1,4 @@ +SUMMARY = "Asio is C++ library for network and low-level I/O programming" DESCRIPTION = "Asio is a cross-platform C++ library for network and low-level \ I/O programming that provides developers with a consistent asynchronous \ model using a modern C++ approach." @@ -14,10 +15,10 @@ inherit autotools ALLOW_EMPTY_${PN} = "1" -LIC_FILES_CHKSUM = "file://COPYING;md5=3e73f311a3af69e6df275e8c3b1c09b5" +LIC_FILES_CHKSUM = "file://COPYING;md5=de86c8210a433f72bd3cc98e797a6084" -SRC_URI[md5sum] = "312e53385e2daad10f08d57f91ad3431" -SRC_URI[sha256sum] = "4e27dcb37456ba707570334b91f4798721111ed67b69915685eac141895779aa" +SRC_URI[md5sum] = "569f4b082c652ae8a8ad94fb470016f9" +SRC_URI[sha256sum] = "e271db76dbbcda9835ed1c9c94deb2ba3f4589c3ebcaa71d99ac694b8d62638c" SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${BP}.tar.bz2" diff --git a/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_1.0.0.bb b/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_1.0.1.bb index 74343683f..363ed4d65 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_1.0.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_1.0.1.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5b002a195fb7ea2d8d583f07eaff3a8e" DEPENDS = "curl openssl zlib libssh2 libgcrypt libpcre2" SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.0" -SRCREV = "7d3c7057f0e774aecd6fc4ef8333e69e5c4873e0" +SRCREV = "0ced29612dacb67eefe0c562a5c1d3aab21cce96" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch new file mode 100644 index 000000000..d56b8ae67 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch @@ -0,0 +1,42 @@ +From 11bbf909e08594628bd757d989ae34cf1bfe200b Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Thu, 18 Jun 2020 05:51:38 +0000 +Subject: [PATCH] Make ts module external + +Make ts module external + +Reference: https://github.com/qbonnard/opencv/commit/6b229c5834cb9a0930425e762a6c7b03244d7abb + +Upstream-Status: Submitted [https://github.com/opencv/opencv/issues/8408] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + modules/ts/CMakeLists.txt | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/modules/ts/CMakeLists.txt b/modules/ts/CMakeLists.txt +index f95bed0793..66f315bcca 100644 +--- a/modules/ts/CMakeLists.txt ++++ b/modules/ts/CMakeLists.txt +@@ -4,9 +4,6 @@ if(NOT BUILD_opencv_ts AND NOT BUILD_TESTS AND NOT BUILD_PERF_TESTS) + ocv_module_disable(ts) + endif() + +-set(OPENCV_MODULE_TYPE STATIC) +-set(OPENCV_MODULE_IS_PART_OF_WORLD FALSE) +- + if(WINRT) + # WINRT doesn't have access to environment variables + # so adding corresponding macros during CMake run +@@ -16,7 +13,7 @@ endif() + + ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef) + +-ocv_add_module(ts INTERNAL opencv_core opencv_imgproc opencv_imgcodecs opencv_videoio opencv_highgui) ++ocv_add_module(ts opencv_core opencv_imgproc opencv_imgcodecs opencv_videoio opencv_highgui) + + ocv_glob_module_sources() + ocv_module_include_directories() +-- +2.24.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0002-Make-opencv-ts-create-share-library-intead-of-static.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0002-Make-opencv-ts-create-share-library-intead-of-static.patch deleted file mode 100644 index 20d54d407..000000000 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0002-Make-opencv-ts-create-share-library-intead-of-static.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 78e2fc167fd27ab17175dcfd6eccf6f74bd5e1c7 Mon Sep 17 00:00:00 2001 -From: Bian Naimeng <biannm@cn.fujitsu.com> -Date: Wed, 19 Apr 2017 03:11:37 +0900 -Subject: [PATCH] Make opencv-ts create share library intead of static. - -Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> - ---- - modules/ts/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/ts/CMakeLists.txt b/modules/ts/CMakeLists.txt -index f95bed0793..ee67858df8 100644 ---- a/modules/ts/CMakeLists.txt -+++ b/modules/ts/CMakeLists.txt -@@ -4,7 +4,7 @@ if(NOT BUILD_opencv_ts AND NOT BUILD_TESTS AND NOT BUILD_PERF_TESTS) - ocv_module_disable(ts) - endif() - --set(OPENCV_MODULE_TYPE STATIC) -+#set(OPENCV_MODULE_TYPE STATIC) - set(OPENCV_MODULE_IS_PART_OF_WORLD FALSE) - - if(WINRT) diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.3.0.bb b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.3.0.bb index 2587b189c..7927ce25f 100644 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.3.0.bb @@ -44,11 +44,11 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg \ git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=face;name=face \ file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ - file://0002-Make-opencv-ts-create-share-library-intead-of-static.patch \ file://0003-To-fix-errors-as-following.patch \ file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \ file://0001-Dont-use-isystem.patch \ file://download.patch \ + file://0001-Make-ts-module-external.patch \ " PV = "4.3.0" diff --git a/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb b/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb index efe95b101..dcadede0e 100644 --- a/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb @@ -20,8 +20,8 @@ RDEPENDS_${PN} = "rsync \ perl-module-overloading \ " -SRCREV = "27209563f924a22f510698ea225f53ea52f07cb4" -PV = "1.4.2+git${SRCPV}" +SRCREV = "a9e29850fc33c503c289e245c7bad350eed746d9" +PV = "1.4.3+git${SRCPV}" SRC_URI = "git://github.com/DrHyde/${BPN};branch=master;protocol=git \ file://configure-fix-cmd_rsync.patch \ diff --git a/meta-openembedded/meta-oe/recipes-support/sass/libsass_3.6.3.bb b/meta-openembedded/meta-oe/recipes-support/sass/libsass_git.bb index d893be223..9cba3a890 100644 --- a/meta-openembedded/meta-oe/recipes-support/sass/libsass_3.6.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/sass/libsass_git.bb @@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8f34396ca205f5e119ee77aae91fa27d" inherit autotools SRC_URI = "git://github.com/sass/libsass.git;branch=master" -SRCREV = "e1c16e09b4a953757a15149deaaf28a3fd81dc97" +SRCREV = "8d312a1c91bb7dd22883ebdfc829003f75a82396" +PV = "3.6.4" S = "${WORKDIR}/git" |