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/recipes-graphics | |
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/recipes-graphics')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-graphics/xorg-app/twm_1.0.11.bb (renamed from meta-openembedded/meta-oe/recipes-graphics/xorg-app/twm_1.0.10.bb) | 5 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/fix-buildscripts.patch | 90 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/tweak-app-defaults.patch | 30 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.44.bb (renamed from meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb) | 11 |
4 files changed, 67 insertions, 69 deletions
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 3a2267ae92..45caaacf2f 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 3a50eff83c..afc8bc8e74 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 099a0b2f4a..0f2e09aec7 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 b8c1881d97..6cad97f154 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 |