February 2022 - crux-commits

ports/contrib (3.6): p5-package-stash: 0.39 -> 0.40
by crux＠crux.nu 21 Feb '22

21 Feb '22

commit 183a754460c84e2a924478f789337d0a32e70194 Author: Tim Biermann <tbier(a)posteo.de> Date: Mon Feb 21 12:04:37 2022 +0100 p5-package-stash: 0.39 -> 0.40 diff --git a/p5-package-stash/.signature b/p5-package-stash/.signature index 7b2d4d329..058cc54ab 100644 --- a/p5-package-stash/.signature +++ b/p5-package-stash/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF32SPB+L3h+WTNiR37ze3bFH5Puq08lRZiggOX3rJGzqKR+WeMLI4atYWwRK6rregjXYVd+03GU20RgXwduvt8QA= -SHA256 (Pkgfile) = 180a4b0b5c8d2a57bd74414fe6a6d4189a4287f7ebefc7c8741ee3eecd4c1ad5 +RWSagIOpLGJF35W+KvLD9NB34wpfGhLY5gFRP1trpgsEw94JrTYH6b8fOrnm5FSq4EmReZmCJUnm/G//RrTXORsf74tmCFsO9wo= +SHA256 (Pkgfile) = c199e49b34ff90469c63dca4cf5030a8deca3ee90b582eeb82bd99a5b5e828f8 SHA256 (.footprint) = 165c28e1f10f4501c774333a16726e5d70f8ed708720e02b1e07446854638cf4 -SHA256 (Package-Stash-0.39.tar.gz) = 9165f555112e080493ce0e9129de0886da30b2593fb353a2abd1c76b2d2621b5 +SHA256 (Package-Stash-0.40.tar.gz) = 5a9722c6d9cb29ee133e5f7b08a5362762a0b5633ff5170642a5b0686e95e066 diff --git a/p5-package-stash/Pkgfile b/p5-package-stash/Pkgfile index 85ca8e641..08a0bab2a 100644 --- a/p5-package-stash/Pkgfile +++ b/p5-package-stash/Pkgfile @@ -4,7 +4,7 @@ # Depends on: p5-dist-checkconflicts p5-module-implementation p5-package-stash-xs name=p5-package-stash -version=0.39 +version=0.40 release=1 source=(https://cpan.metacpan.org/authors/id/E/ET/ETHER/Package-Stash-$vers…

1 0

ports/contrib (3.6): python3-platformdirs: 2.5.0 -> 2.5.1
by crux＠crux.nu 21 Feb '22

21 Feb '22

commit 28b256b7a7cb5a5c6af0c5d4b28db0a05baf31cb Author: Tim Biermann <tbier(a)posteo.de> Date: Mon Feb 21 12:04:32 2022 +0100 python3-platformdirs: 2.5.0 -> 2.5.1 diff --git a/python3-platformdirs/.footprint b/python3-platformdirs/.footprint index 38b5b711f..34fa92d19 100644 --- a/python3-platformdirs/.footprint +++ b/python3-platformdirs/.footprint @@ -2,13 +2,13 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/python3.9/ drwxr-xr-x root/root usr/lib/python3.9/site-packages/ -drwxr-xr-x root/root usr/lib/python3.9/site-packages/platformdirs-2.5.0-py3.9.egg-info/ --rw-r--r-- root/root usr/lib/python3.9/site-packages/platformdirs-2.5.0-py3.9.egg-info/PKG-INFO --rw-r--r-- root/root usr/lib/python3.9/site-packages/platformdirs-2.5.0-py3.9.egg-info/SOURCES.txt --rw-r--r-- root/root usr/lib/python3.9/site-packages/platformdirs-2.5.0-py3.9.egg-info/dependency_links.txt --rw-r--r-- root/root usr/lib/python3.9/site-packages/platformdirs-2.5.0-py3.9.egg-info/requires.txt --rw-r--r-- root/root usr/lib/python3.9/site-packages/platformdirs-2.5.0-py3.9.egg-info/top_level.txt --rw-r--r-- root/root usr/lib/python3.9/site-packages/platformdirs-2.5.0-py3.9.egg-info/zip-safe +drwxr-xr-x root/root usr/lib/python3.9/site-packages/platformdirs-2.5.1-py3.9.egg-info/ +-rw-r--r-- root/root usr/lib/python3.9/site-packages/platformdirs-2.5.1-py3.9.egg-info/PKG-INFO +-rw-r--r-- root/root usr/lib/python3.9/site-packages/platformdirs-2.5.1-py3.9.egg-info/SOURCES.txt +-rw-r--r-- root/root usr/lib/python3.9/site-packages/platformdirs-2.5.1-py3.9.egg-info/dependency_links.txt +-rw-r--r-- root/root usr/lib/python3.9/site-packages/platformdirs-2.5.1-py3.9.egg-info/requires.txt +-rw-r--r-- root/root usr/lib/python3.9/site-packages/platformdirs-2.5.1-py3.9.egg-info/top_level.txt +-rw-r--r-- root/root usr/lib/python3.9/site-packages/platformdirs-2.5.1-py3.9.egg-info/zip-safe drwxr-xr-x root/root usr/lib/python3.9/site-packages/platformdirs/ -rw-r--r-- root/root usr/lib/python3.9/site-packages/platformdirs/__init__.py -rw-r--r-- root/root usr/lib/python3.9/site-packages/platformdirs/__main__.py diff --git a/python3-platformdirs/.signature b/python3-platformdirs/.signature index 0fa046573..c168aa313 100644 --- a/python3-platformdirs/.signature +++ b/python3-platformdirs/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF39ZKW0XPG7JyWLYpklS0au+TUctPC4BHcKhVgBF+8ZsTGGDJAKnPbceBmQ557GaLK8MV8uKICkZWz+7QLiuHZgQ= -SHA256 (Pkgfile) = cf2b7d467fcfb28bbd7e46f4bf6385a913e5792f9dc11becca7e7737d4707651 -SHA256 (.footprint) = abe3d09adaa7f8ccdbacca8031f4cadfcf7edaa269783136d543dd59486f9b95 -SHA256 (platformdirs-2.5.0.tar.gz) = 8ec11dfba28ecc0715eb5fb0147a87b1bf325f349f3da9aab2cd6b50b96b692b +RWSagIOpLGJF36HYFnY68Y5FB6PoQhz7vulAA0quXLOtNPiQjE3O6odR51Bsi/7pK3wUJ6T6c9eS7FatK/k5LWNR/nuDQL/BigY= +SHA256 (Pkgfile) = e554180cac8fecc22cfcd650b230740c324c6ae21151806979b06473d932b33e +SHA256 (.footprint) = e12beb6329b5f0254531ea3e51f2863fc6db94664708af19f017f81dfbd8064e +SHA256 (platformdirs-2.5.1.tar.gz) = 7535e70dfa32e84d4b34996ea99c5e432fa29a708d0f4e394bbcb2a8faa4f16d diff --git a/python3-platformdirs/Pkgfile b/python3-platformdirs/Pkgfile index 0281361e7..144f181aa 100644 --- a/python3-platformdirs/Pkgfile +++ b/python3-platformdirs/Pkgfile @@ -4,7 +4,7 @@ # Depends on: python3-setuptools-scm name=python3-platformdirs -version=2.5.0 +version=2.5.1 release=1 source=(https://pypi.python.org/packages/source/p/platformdirs/platformdirs…

1 0

ports/contrib (3.6): rust-analyzer: 20220214 -> 20220221
by crux＠crux.nu 21 Feb '22

21 Feb '22

commit 50b679f1b8e417339c3898f96b99d0f58ca973e0 Author: Tim Biermann <tbier(a)posteo.de> Date: Mon Feb 21 12:04:13 2022 +0100 rust-analyzer: 20220214 -> 20220221 diff --git a/rust-analyzer/.signature b/rust-analyzer/.signature index f12d9ef4c..b98f4f00c 100644 --- a/rust-analyzer/.signature +++ b/rust-analyzer/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3yOw4i58O1eo3avVQYo+i8q3TaqPmanoHggnAOe5ccqkCKqIkD0cHMv4ikdboNt+2cJKq56pEntQQqjhsJ74AwY= -SHA256 (Pkgfile) = f5122c4d10c0e4c2474f8d8cdafc1fa465d06f45b03ef5609693565f585d9dae +RWSagIOpLGJF38XFk5o2xlQZMtOQWTBTOTMlX2QZQvAkuz1cK6RSb/avSuKAsDq+THEYoFyjGdou+FLM+JalfG6iwUCC1zBCoQ4= +SHA256 (Pkgfile) = 20e93bf34903b4a0591d9f6bba3bfd6b460e9432f89ab8e0c8e2933934e251eb SHA256 (.footprint) = 0b298544e01b8fbc5119583b3aa96f10232e4b267ef9f2d069810f8011b6ee34 -SHA256 (rust-analyzer-20220214.tar.gz) = eb287b16b7b5ecd8be3864e6d54d2396886820f105986566c9f54be804f93f6c +SHA256 (rust-analyzer-20220221.tar.gz) = 34c299628a91cc53223498d19eb257d7d2659651288aa9e5e66461bf1c78b8a3 diff --git a/rust-analyzer/Pkgfile b/rust-analyzer/Pkgfile index b3ddf03b5..6993c7bb6 100644 --- a/rust-analyzer/Pkgfile +++ b/rust-analyzer/Pkgfile @@ -4,7 +4,7 @@ # Depends on: rust name=rust-analyzer -version=20220214 +version=20220221 _version=${version::4}-${version:4:2}-${version:6:2} release=1 source=(https://github.com/rust-analyzer/rust-analyzer/archive/$_version/$n…

1 0

ports/core (3.7): libtirpc: move·path·for·rpcbind.sock·to·/run
by crux＠crux.nu 20 Feb '22

20 Feb '22

commit 57d228ac73d5c16705a0677ebe7f96087d8ea0fa Author: Juergen Daubert <jue(a)jue.li> Date: Sun Feb 20 18:18:10 2022 +0100 libtirpc: move·path·for·rpcbind.sock·to·/run diff --git a/libtirpc/.signature b/libtirpc/.signature index f2877636..ccce7085 100644 --- a/libtirpc/.signature +++ b/libtirpc/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqsIhaXVw0grDfyTJCD3k3fyK0Bce+21n6gdExBnTi3yClo0LUEL+5gBk1jvJaCe1K5tmUo10jUA9Sqani3FFsQQ= -SHA256 (Pkgfile) = 8056f732f8bd3d0afacb55ba1e8b9268518496a760cb81e4d8acb36cd63ece1a +RWRJc1FUaeVeqrPHOEsoArRJUvO3et6yRwUFG/P4lbzyrGVtn4i24HwFhLmEIzqCLkwOwpwlLbmuOVswiv2715I7qIsQw+1ijwY= +SHA256 (Pkgfile) = ad21b57b7f71c9d1aa89090098fbe088d06bc2fe2ead093313b6979ff13d5140 SHA256 (.footprint) = dfffa90037e87e2954aec95c896e466e6be48fc6a8e9bc80b72d6aab0b64bdd7 SHA256 (libtirpc-1.3.2.tar.bz2) = e24eb88b8ce7db3b7ca6eb80115dd1284abc5ec32a8deccfed2224fc2532b9fd diff --git a/libtirpc/Pkgfile b/libtirpc/Pkgfile index 8547e6ca..b3461c3a 100644 --- a/libtirpc/Pkgfile +++ b/libtirpc/Pkgfile @@ -4,12 +4,15 @@ name=libtirpc version=1.3.2 -release=1 -source=(http://downloads.sourceforge.net/project/$name/$name/$version/$name-$version.tar.bz2) +release=2 +source=(https://downloads.sourceforge.net/project/$name/$name/$version/$name-$version.tar.bz2) build() { cd $name-$version + # move path for rpcbind.sock to /run + sed 's|/var/run|/run|' -i tirpc/rpc/rpcb_prot.h + ./configure \ --prefix=/usr \ --sysconfdir=/etc \

1 0

ports/opt (3.7): consolekit: pam-foreground-compat.ck: move TAGDIR to /run/console
by crux＠crux.nu 20 Feb '22

20 Feb '22

commit bc0afb2b70e42ce5535294299dea873090a77d47 Author: Juergen Daubert <jue(a)jue.li> Date: Sun Feb 20 17:39:45 2022 +0100 consolekit: pam-foreground-compat.ck: move TAGDIR to /run/console diff --git a/consolekit/.signature b/consolekit/.signature index 11d7cb09f..86783c791 100644 --- a/consolekit/.signature +++ b/consolekit/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/Whdlipdgpa6Zqis1G7CZzE/k71uDXGLmE2T2tm0IjUabd0p4oLnu+MRz7Z0DyJh3ipN0RF0V8e+wrblBZ8tHw8= +RWSE3ohX2g5d/UVyvoId5RvfNtPO1CH8m+TSk9YgAXkVlhmj4E0YLPmDmGJEbRAw2+SS6AEt2qtRSJ/VvBA5xTMFFUtIqotsDQU= SHA256 (Pkgfile) = 044ad71477214481dbc7582f1659e22f8f2bc63f3b5788f00e1556d31cda27cf SHA256 (.footprint) = a76501ec28824822f18e0f12f6c18ecc29b51575746951061351fe839170838a SHA256 (ConsoleKit2-1.2.4.tar.gz) = 7c5ca07cc7ecb2743446c4ab5a66ae02667acab6214268d76f0fdf73eaf141e8 SHA256 (system-session) = 599613516a16ac997a4121b4f20dd3a9c8480403614848f1aa97a0a0f1c6a236 -SHA256 (pam-foreground-compat.ck) = ca94a7640cc7c2e3bf9222b6060f01dc8f83ca3444aa430f23d08db6dcb02e34 +SHA256 (pam-foreground-compat.ck) = 1d04e519c84963e5af2e7a82397212b5b65aa0055e9834d954ce6888d7a8d035 diff --git a/consolekit/pam-foreground-compat.ck b/consolekit/pam-foreground-compat.ck index 94b68a04d..e6ef49348 100644 --- a/consolekit/pam-foreground-compat.ck +++ b/consolekit/pam-foreground-compat.ck @@ -1,6 +1,6 @@ #!/bin/sh -TAGDIR=/var/run/console +TAGDIR=/run/console [ -n "$CK_SESSION_USER_UID" ] || exit 1 [ "$CK_SESSION_IS_LOCAL" = "true" ] || exit 0

1 0

ports/opt (3.7): cups-filters: move rundir to /run
by crux＠crux.nu 20 Feb '22

20 Feb '22

commit 36067139edb16440d7683a7c8216019297e90f7a Author: Juergen Daubert <jue(a)jue.li> Date: Sun Feb 20 16:32:59 2022 +0100 cups-filters: move rundir to /run diff --git a/cups-filters/.signature b/cups-filters/.signature index ffd02b7b8..bb35b79da 100644 --- a/cups-filters/.signature +++ b/cups-filters/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/d5CcFLwoXt5oyPmZzCySXYI0qATXFXWo68X/a1PzRVeEwzsHbkEcR8TqJOXbbBNTVcws+IAAERtT7aeWfqSnAQ= -SHA256 (Pkgfile) = 57638bad67381e41bba9f254ef7b71bdd5357409e12ce0a65bcd19e400df7307 +RWSE3ohX2g5d/V45HtRhLE4PJzNLhZoIoUKasKmVy+butMMdAl4aUSaz3aUfTO1RrBNgr6fM0iQPnb/sqN558L4GZgjGb4i/LQA= +SHA256 (Pkgfile) = 75f27922552500add6e5f51fddceb7230173959ea48ccd32549da1755a772052 SHA256 (.footprint) = 85c5125df89cfab5d8151fe0af1cef180e76ee60b39bd5399f0097070481e837 SHA256 (cups-filters-1.28.12.tar.xz) = 46e2ea3d884ad222bb863ce6511e59cf390ef8e835295be44a80e500b2a33a3a -SHA256 (cups-browsed) = 4c4900ee88d488078da20a5cabc949921382fa69bc28bb2a7f89fa5ae01afb5b +SHA256 (cups-browsed) = 48e0ee7f0e3060912f9d0e510789b6cfe9a3b28349f5e24be971978f75ba4327 diff --git a/cups-filters/Pkgfile b/cups-filters/Pkgfile index a1ba78ed9..187f7cae7 100644 --- a/cups-filters/Pkgfile +++ b/cups-filters/Pkgfile @@ -5,7 +5,7 @@ name=cups-filters version=1.28.12 -release=1 +release=2 source=(https://www.openprinting.org/download/$name/$name-$version.tar.xz cups-browsed) @@ -15,6 +15,8 @@ build() { ./configure \ --prefix=/usr \ --sysconfdir=/etc \ + --runstatedir=/run \ + --with-cups-rundir=/run/cups \ --without-php \ --disable-avahi \ --disable-dbus \ diff --git a/cups-filters/cups-browsed b/cups-filters/cups-browsed index ee541eca0..1b7233e6c 100755 --- a/cups-filters/cups-browsed +++ b/cups-filters/cups-browsed @@ -5,7 +5,7 @@ SSD=/sbin/start-stop-daemon PROG=/usr/sbin/cups-browsed -PID=/var/run/cups-browsed.pid +PID=/run/cups-browsed.pid case $1 in start)

1 0

ports/opt (3.7): cups: move rundir to /run/cups
by crux＠crux.nu 20 Feb '22

20 Feb '22

commit 7e3e04aee2caef6c82960aad53a61034c8405891 Author: Juergen Daubert <jue(a)jue.li> Date: Sun Feb 20 16:32:18 2022 +0100 cups: move rundir to /run/cups diff --git a/cups/.footprint b/cups/.footprint index 4eeac288d..0b63082b5 100644 --- a/cups/.footprint +++ b/cups/.footprint @@ -421,9 +421,6 @@ drwxrwx--- root/lp var/cache/cups/ drwxrwxr-x root/lp var/cache/cups/rss/ drwxr-xr-x root/root var/log/ drwxr-xr-x root/root var/log/cups/ -drwxr-xr-x root/root var/run/ -drwxr-xr-x root/root var/run/cups/ -drwx--x--x daemon/sys var/run/cups/certs/ drwxr-xr-x root/root var/spool/ drwx--x--- root/lp var/spool/cups/ drwxrwx--T root/lp var/spool/cups/tmp/ diff --git a/cups/.signature b/cups/.signature index 47a431741..b5b6ca34c 100644 --- a/cups/.signature +++ b/cups/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/YTqCYIemBHzsrDcKqHdT0C//IWAma+48EFN1Skff+qL/nHqfomIjNacx9bI/PVNffAu1HulbqppnHDX6J2SwQ8= -SHA256 (Pkgfile) = ff6927d788b71c41c66457f145bc63ef722611f3d9c322ce169bd5fad1639698 -SHA256 (.footprint) = 4e61ecfae10fcfa983ab77366b5ea91def9bc9a8ed9a4a5340b3edbc497962a0 +RWSE3ohX2g5d/TKhJUE/PJwQwLYYKV5pI6QagA9ZOdbnddJ6C8ImllMYnDyKyE33jtxhGbzeZLcBxL5vaKNL/zYOtURq1XDADgc= +SHA256 (Pkgfile) = 29101f26070ec6ab9b433e9587771d542bd7f66637a5bd34118291a22dd4a93f +SHA256 (.footprint) = ea70a89b84a4ee614fb8fd9bad840768a4259b0f58d0ad2e439762bf9c4938bb SHA256 (cups-2.4.1-source.tar.gz) = c7339f75f8d4f2dec50c673341a45fc06b6885bb6d4366d6bf59a4e6c10ae178 -SHA256 (cups.rc) = 61a1deceebcee0437e5c3f987621abf24642b6517961336ed4f26384ddab5639 +SHA256 (cups.rc) = 050ec2210c1d05bb0a1b659705c9cf2a6967a7eabb9f71100309f15124e49e9f SHA256 (cups.pam) = 46b6b6e42e77c82435c0680405a45c66a37ec3d727af6aa6f036dd1d60215479 diff --git a/cups/Pkgfile b/cups/Pkgfile index 1c75f659d..b0b80f4cf 100644 --- a/cups/Pkgfile +++ b/cups/Pkgfile @@ -6,7 +6,7 @@ name=cups version=2.4.1 -release=1 +release=2 source=(https://github.com/OpenPrinting/cups/releases/download/v$version/$n… cups.rc cups.pam) @@ -21,6 +21,7 @@ build() { --sysconfdir=/etc \ --libdir=/usr/lib \ --localstatedir=/var \ + --with-rundir=/run/cups \ --with-docdir=/usr/share/cups/doc \ --with-logdir=/var/log/cups \ --with-cups-user=daemon \ @@ -38,7 +39,8 @@ build() { rm -r $PKG/usr/share/cups/{banners,data} # cleanup - rm -rf $PKG/usr/share/{applications,icons} + rm -r $PKG/usr/share/{applications,icons} + rm -r $PKG/run chmod 0755 $PKG/var/{cache,spool} chmod -R +w $PKG diff --git a/cups/cups.rc b/cups/cups.rc index 0cb52ff11..c9a73506e 100644 --- a/cups/cups.rc +++ b/cups/cups.rc @@ -5,11 +5,12 @@ SSD=/sbin/start-stop-daemon PROG=/usr/sbin/cupsd -PID=/var/run/cups.pid +PID=/run/cups/cupsd.pid OPTS="-f" case $1 in start) + install -o root -g lp -m 0755 -d /run/cups $SSD --start -bm --pidfile $PID --exec $PROG -- $OPTS ;; stop)

1 0

ports/contrib (3.6): lfs: 1.4.0 -> 2.0.0
by crux＠crux.nu 20 Feb '22

20 Feb '22

commit 118a1d1a6bd39e486346f3680fff9e734b562ed6 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Feb 20 16:12:55 2022 +0100 lfs: 1.4.0 -> 2.0.0 diff --git a/lfs/.signature b/lfs/.signature index d3701821a..fe91a687e 100644 --- a/lfs/.signature +++ b/lfs/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF36Xx26qqUekOULpzlQgP5nuyFaZeoRsS4dj5HV7VJJaQQRKgdNzUyTaCdmk9s0g5Jtiux0yYrZ/THUa5jxbEiQY= -SHA256 (Pkgfile) = 06fb821bb9c691429e0298ecd3d8c9b775284e7813b1d764c080966c8bf8cf03 +RWSagIOpLGJF3/+59pBH1JKrirvSmUDqoMmyxvwmikjC+/RxQmAgk4Gz19iG1eswJdQNbl9NMFXDLzST30FqoZH7Utsg9AkXCQw= +SHA256 (Pkgfile) = cc8f0d7ecd2024be86bdec203aa7fe65fc9d1f5fdc2ae0339054983c0313a435 SHA256 (.footprint) = 79ccffc31e81e056e99987d40c46c8a4bd47aa98638e5a3ef0a506a11a61149e -SHA256 (lfs-1.4.0.tar.gz) = 266f895949beee615ca2a39b027cbe39a8017284ce025b3b2638f65cb9d364e3 +SHA256 (lfs-2.0.0.tar.gz) = e890253b12b40989e1b25cd52464f47a724a0eb713b76c05e69bf545709814e6 diff --git a/lfs/Pkgfile b/lfs/Pkgfile index a7c1fa148..c83281387 100644 --- a/lfs/Pkgfile +++ b/lfs/Pkgfile @@ -4,7 +4,7 @@ # Depends on: rust name=lfs -version=1.4.0 +version=2.0.0 release=1 source=(https://github.com/Canop/lfs/archive/v$version/$name-$version.tar.g…

1 0

ports/opt (3.6): gegl: fix build with ffmpeg 5
by crux＠crux.nu 20 Feb '22

20 Feb '22

commit dd0925a689f1a43531f00a7b00bd32d1584d50a6 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Feb 20 13:21:52 2022 +0100 gegl: fix build with ffmpeg 5 diff --git a/gegl/.footprint b/gegl/.footprint index de720b215..daed566da 100644 --- a/gegl/.footprint +++ b/gegl/.footprint @@ -8,17 +8,16 @@ drwxr-xr-x root/root usr/include/gegl-0.4/ -rw-r--r-- root/root usr/include/gegl-0.4/gegl-audio-fragment.h -rw-r--r-- root/root usr/include/gegl-0.4/gegl-buffer-backend.h -rw-r--r-- root/root usr/include/gegl-0.4/gegl-buffer-enums.h --rw-r--r-- root/root usr/include/gegl-0.4/gegl-buffer.h -rw-r--r-- root/root usr/include/gegl-0.4/gegl-buffer-iterator.h -rw-r--r-- root/root usr/include/gegl-0.4/gegl-buffer-matrix2.h -rw-r--r-- root/root usr/include/gegl-0.4/gegl-buffer-swap.h +-rw-r--r-- root/root usr/include/gegl-0.4/gegl-buffer.h -rw-r--r-- root/root usr/include/gegl-0.4/gegl-color.h -rw-r--r-- root/root usr/include/gegl-0.4/gegl-cpuaccel.h -rw-r--r-- root/root usr/include/gegl-0.4/gegl-curve.h -rw-r--r-- root/root usr/include/gegl-0.4/gegl-debug.h -rw-r--r-- root/root usr/include/gegl-0.4/gegl-enums.h -rw-r--r-- root/root usr/include/gegl-0.4/gegl-graph-debug.h --rw-r--r-- root/root usr/include/gegl-0.4/gegl.h -rw-r--r-- root/root usr/include/gegl-0.4/gegl-init.h -rw-r--r-- root/root usr/include/gegl-0.4/gegl-lookup.h -rw-r--r-- root/root usr/include/gegl-0.4/gegl-math.h @@ -28,8 +27,8 @@ drwxr-xr-x root/root usr/include/gegl-0.4/ -rw-r--r-- root/root usr/include/gegl-0.4/gegl-metadatahash.h -rw-r--r-- root/root usr/include/gegl-0.4/gegl-metadatastore.h -rw-r--r-- root/root usr/include/gegl-0.4/gegl-node.h --rw-r--r-- root/root usr/include/gegl-0.4/gegl-operations-util.h -rw-r--r-- root/root usr/include/gegl-0.4/gegl-op.h +-rw-r--r-- root/root usr/include/gegl-0.4/gegl-operations-util.h -rw-r--r-- root/root usr/include/gegl-0.4/gegl-parallel.h -rw-r--r-- root/root usr/include/gegl-0.4/gegl-paramspecs.h -rw-r--r-- root/root usr/include/gegl-0.4/gegl-path.h @@ -39,53 +38,54 @@ drwxr-xr-x root/root usr/include/gegl-0.4/ -rw-r--r-- root/root usr/include/gegl-0.4/gegl-rectangle.h -rw-r--r-- root/root usr/include/gegl-0.4/gegl-scratch.h -rw-r--r-- root/root usr/include/gegl-0.4/gegl-tile-backend.h --rw-r--r-- root/root usr/include/gegl-0.4/gegl-tile.h -rw-r--r-- root/root usr/include/gegl-0.4/gegl-tile-handler.h -rw-r--r-- root/root usr/include/gegl-0.4/gegl-tile-source.h +-rw-r--r-- root/root usr/include/gegl-0.4/gegl-tile.h -rw-r--r-- root/root usr/include/gegl-0.4/gegl-types.h -rw-r--r-- root/root usr/include/gegl-0.4/gegl-utils.h -rw-r--r-- root/root usr/include/gegl-0.4/gegl-version.h +-rw-r--r-- root/root usr/include/gegl-0.4/gegl.h drwxr-xr-x root/root usr/include/gegl-0.4/npd/ -rw-r--r-- root/root usr/include/gegl-0.4/npd/deformation.h -rw-r--r-- root/root usr/include/gegl-0.4/npd/graphics.h -rw-r--r-- root/root usr/include/gegl-0.4/npd/lattice_cut.h +-rw-r--r-- root/root usr/include/gegl-0.4/npd/npd.h -rw-r--r-- root/root usr/include/gegl-0.4/npd/npd_common.h -rw-r--r-- root/root usr/include/gegl-0.4/npd/npd_debug.h -rw-r--r-- root/root usr/include/gegl-0.4/npd/npd_gegl.h --rw-r--r-- root/root usr/include/gegl-0.4/npd/npd.h -rw-r--r-- root/root usr/include/gegl-0.4/npd/npd_math.h drwxr-xr-x root/root usr/include/gegl-0.4/opencl/ +-rw-r--r-- root/root usr/include/gegl-0.4/opencl/cl.h -rw-r--r-- root/root usr/include/gegl-0.4/opencl/cl_d3d10.h -rw-r--r-- root/root usr/include/gegl-0.4/opencl/cl_ext.h --rw-r--r-- root/root usr/include/gegl-0.4/opencl/cl_gl_ext.h -rw-r--r-- root/root usr/include/gegl-0.4/opencl/cl_gl.h --rw-r--r-- root/root usr/include/gegl-0.4/opencl/cl.h +-rw-r--r-- root/root usr/include/gegl-0.4/opencl/cl_gl_ext.h -rw-r--r-- root/root usr/include/gegl-0.4/opencl/cl_platform.h -rw-r--r-- root/root usr/include/gegl-0.4/opencl/gegl-cl-color.h --rw-r--r-- root/root usr/include/gegl-0.4/opencl/gegl-cl.h -rw-r--r-- root/root usr/include/gegl-0.4/opencl/gegl-cl-init.h -rw-r--r-- root/root usr/include/gegl-0.4/opencl/gegl-cl-random.h -rw-r--r-- root/root usr/include/gegl-0.4/opencl/gegl-cl-types.h +-rw-r--r-- root/root usr/include/gegl-0.4/opencl/gegl-cl.h -rw-r--r-- root/root usr/include/gegl-0.4/opencl/opencl.h drwxr-xr-x root/root usr/include/gegl-0.4/operation/ -rw-r--r-- root/root usr/include/gegl-0.4/operation/gegl-extension-handler.h -rw-r--r-- root/root usr/include/gegl-0.4/operation/gegl-operation-area-filter.h --rw-r--r-- root/root usr/include/gegl-0.4/operation/gegl-operation-composer3.h -rw-r--r-- root/root usr/include/gegl-0.4/operation/gegl-operation-composer.h +-rw-r--r-- root/root usr/include/gegl-0.4/operation/gegl-operation-composer3.h -rw-r--r-- root/root usr/include/gegl-0.4/operation/gegl-operation-context.h -rw-r--r-- root/root usr/include/gegl-0.4/operation/gegl-operation-filter.h --rw-r--r-- root/root usr/include/gegl-0.4/operation/gegl-operation.h -rw-r--r-- root/root usr/include/gegl-0.4/operation/gegl-operation-handlers.h --rw-r--r-- root/root usr/include/gegl-0.4/operation/gegl-operation-meta.h -rw-r--r-- root/root usr/include/gegl-0.4/operation/gegl-operation-meta-json.h --rw-r--r-- root/root usr/include/gegl-0.4/operation/gegl-operation-point-composer3.h +-rw-r--r-- root/root usr/include/gegl-0.4/operation/gegl-operation-meta.h -rw-r--r-- root/root usr/include/gegl-0.4/operation/gegl-operation-point-composer.h +-rw-r--r-- root/root usr/include/gegl-0.4/operation/gegl-operation-point-composer3.h -rw-r--r-- root/root usr/include/gegl-0.4/operation/gegl-operation-point-filter.h -rw-r--r-- root/root usr/include/gegl-0.4/operation/gegl-operation-point-render.h -rw-r--r-- root/root usr/include/gegl-0.4/operation/gegl-operation-property-keys.h -rw-r--r-- root/root usr/include/gegl-0.4/operation/gegl-operation-sink.h -rw-r--r-- root/root usr/include/gegl-0.4/operation/gegl-operation-source.h -rw-r--r-- root/root usr/include/gegl-0.4/operation/gegl-operation-temporal.h +-rw-r--r-- root/root usr/include/gegl-0.4/operation/gegl-operation.h drwxr-xr-x root/root usr/include/gegl-0.4/sc/ -rw-r--r-- root/root usr/include/gegl-0.4/sc/sc-common.h -rw-r--r-- root/root usr/include/gegl-0.4/sc/sc-context.h @@ -126,9 +126,9 @@ drwxr-xr-x root/root usr/lib/gegl-0.4/ -rwxr-xr-x root/root usr/lib/gegl-0.4/vector-stroke.so drwxr-xr-x root/root usr/lib/girepository-1.0/ -rw-r--r-- root/root usr/lib/girepository-1.0/Gegl-0.4.typelib --rwxr-xr-x root/root usr/lib/libgegl-0.4.so.0.433.1 -lrwxrwxrwx root/root usr/lib/libgegl-0.4.so.0 -> libgegl-0.4.so.0.433.1 lrwxrwxrwx root/root usr/lib/libgegl-0.4.so -> libgegl-0.4.so.0 +lrwxrwxrwx root/root usr/lib/libgegl-0.4.so.0 -> libgegl-0.4.so.0.433.1 +-rwxr-xr-x root/root usr/lib/libgegl-0.4.so.0.433.1 -rwxr-xr-x root/root usr/lib/libgegl-npd-0.4.so -rwxr-xr-x root/root usr/lib/libgegl-sc-0.4.so drwxr-xr-x root/root usr/lib/pkgconfig/ diff --git a/gegl/.signature b/gegl/.signature index 535adfa22..0189e9d04 100644 --- a/gegl/.signature +++ b/gegl/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/fN9PIVEoPrc5DjezaH91lH1SZogIp1r2JG9l6e6KAGL4zOMBiJyaXAKHOlBaCsAFZj9LM7fVoKaO7mb0++Cvgs= -SHA256 (Pkgfile) = 7aaee38c899b3ab437a73da0dd7bfe229865a2deee96386c3c4937b32b1c30bb -SHA256 (.footprint) = eb678944f1d5b9f1d67cc24c93c341b69c122e3d28bc839543193c304883dc12 +RWSE3ohX2g5d/ffJz/oLLkfgj5MaqYhS/JYNQBUCWVVUWpnosqfarTYFEx3gHx3tfqsmYT+tye7aNb31tQBnq0S+EeHDlriacQU= +SHA256 (Pkgfile) = 9494c210f5435c3848004037d46724224752f0189668f27c24ba6dfd00b9f5f5 +SHA256 (.footprint) = 20bcaf417a0e74879bf8564c30fd802d721c87d4fa41f4d52e66530aa72cf7d8 SHA256 (gegl-0.4.34.tar.xz) = ef63f0bca5b431c6119addd834ca7fbb507c900c4861c57b3667b6f4ccfcaaaa diff --git a/gegl/Pkgfile b/gegl/Pkgfile index e2b232148..46458359a 100644 --- a/gegl/Pkgfile +++ b/gegl/Pkgfile @@ -2,7 +2,7 @@ # URL: https://gegl.org/ # Maintainer: Tim Biermann, tbier at posteo dot de # Depends on: babl gexiv2 json-glib librsvg poppler-glib graphviz -# Optional: asciidoc ffmpeg gtk-doc jasper lcms2 ruby libsdl2 libspiro libwebp umfpack v4l-utils vala lensfun libopenraw libumfpack luajit openexr +# Optional: asciidoc ffmpeg4 gtk-doc jasper lcms2 ruby libsdl2 libspiro libwebp umfpack v4l-utils vala lensfun libopenraw libumfpack luajit openexr name=gegl version=0.4.34 @@ -11,6 +11,7 @@ source=(https://download.gimp.org/pub/$name/${version%.*}/$name-$version.ta… build() { prt-get isinst vala || PKGMK_GEGL+=' -D vapigen=disabled' + prt-get isinst ffmpeg && export PKG_CONFIG_PATH='/usr/lib/ffmpeg4/pkgconfig' meson setup build $name-$version $PKGMK_GEGL \ --prefix=/usr \ --buildtype=plain \

1 0

ports/compat-32 (3.6): vulkan-validation-layers-32: 1.2.198.0 -> 1.3.204.0
by crux＠crux.nu 20 Feb '22

20 Feb '22

commit fd7e68e72e7f11cbbf7829e4eb53ed1d05f72f38 Author: Danny Rawlins <contact(a)romster.me> Date: Sun Feb 20 23:06:05 2022 +1100 vulkan-validation-layers-32: 1.2.198.0 -> 1.3.204.0 diff --git a/vulkan-validation-layers-32/.signature b/vulkan-validation-layers-32/.signature index fc37e33..0673267 100644 --- a/vulkan-validation-layers-32/.signature +++ b/vulkan-validation-layers-32/.signature @@ -1,9 +1,9 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXecRxSR5arDBK2fSqkaDVD5/fXnNDsCVP7Z6OSBHoB3kWOk5IhtDt0BYqpoRc3F3Rzq36nnRSVOLWbk9AEz+DQg= -SHA256 (Pkgfile) = 753264ae60cbecb965a9cb0dbb9770de376d40fc201ce44345205e96c2140908 +RWSwxGo/zH7eXfdrhJs5ZLNDgfPfWx5Zs9jm+2/xS5+7o+dG6cFbQTK0z9Q3jj+685z6jzruDbJFE1Qp1NtTyU968ysfLCRrlgY= +SHA256 (Pkgfile) = 2945229c848905d44066b65a85813260faf092113795125d4834862cda4e1fd2 SHA256 (.footprint) = 5c3e1cb61d0d5070cc1d278ec445757e1913b70cdec30985988d48c2f6ded070 -SHA256 (Vulkan-ValidationLayers-1.2.198.0.tar.gz) = 4a70cc5da26baf873fcf69b081eeeda545515dd66e5904f18fee32b4d275593a -SHA256 (SPIRV-Headers-814e728b30ddd0f4509233099a3ad96fd4318c07.tar.gz) = c262d3c0c36ad5c87fbe3572aa292d2aed4dcd9b1ca4868eff9ec180e3f994f2 -SHA256 (robin-hood-hashing-3.11.3.tar.gz) = dcf2b7fa9ef9dd0c67102d94c28e8df3effbe1845e0ed1f31f4772ca5e857fc4 +SHA256 (Vulkan-ValidationLayers-1.3.204.0.tar.gz) = 82b59c4622e9d1dbe267c4651bb2514b6b89bee90e512ae7d1d7abc76c833a1d +SHA256 (SPIRV-Headers-b42ba6d92faf6b4938e6f22ddd186dbdacc98d78.tar.gz) = d58e8e65ea4b4f1e421caaad68f88ce7b713ac3519bd49e7b71b6a5690489eb6 SHA256 (add-missing-export.patch) = 6ce7222099403dea8425b1dd305b9ebc43e747c32aca2a24cfc7f67ddd34cebf SHA256 (fix_shared.patch) = 840af33ab26638c8c29da4a7f284eae6aeb40e01d506eef9851d7e6ee4a8bed0 +SHA256 (vulkan-layers-1.3.204-Fix-dependency-detection.patch) = 9aff42a5d6fc5073fbcb6c0dde45b4eba49083317a4bee0cd6db011c92b4744c diff --git a/vulkan-validation-layers-32/Pkgfile b/vulkan-validation-layers-32/Pkgfile index c0b9049..11f200a 100644 --- a/vulkan-validation-layers-32/Pkgfile +++ b/vulkan-validation-layers-32/Pkgfile @@ -1,32 +1,29 @@ # Description: Vulkan validation layers, 32bit # URL: https://www.khronos.org/vulkan/ # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu -# Depends on: spirv-tools-32 xorg-libxcb-32 xorg-libx11-32 xorg-libxrandr-32 vulkan-validation-layers +# Depends on: spirv-tools-32 vulkan-validation-layers xorg-libxrandr-32 # Optional: wayland-32 name=vulkan-validation-layers-32 -version=1.2.198.0 -_spirv_headers=814e728b30ddd0f4509233099a3ad96fd4318c07 -_robin_hood=3.11.3 +version=1.3.204.0 +_spirv_headers=b42ba6d92faf6b4938e6f22ddd186dbdacc98d78 release=2 source=(https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk… https://github.com/KhronosGroup/SPIRV-Headers/archive/$_spirv_headers/SPIRV… - https://github.com/martinus/robin-hood-hashing/archive/$_robin_hood/robin-h… add-missing-export.patch - fix_shared.patch) + fix_shared.patch + vulkan-layers-1.3.204-Fix-dependency-detection.patch) build() { ( cd Vulkan-ValidationLayers-sdk-$version - mkdir -p \ - headers/external/spirv-headers \ - robin_hood/external/robin-hood-hashing + mkdir -p headers/external/spirv-headers cp -r $SRC/SPIRV-Headers-$_spirv_headers/* headers/external/spirv-headers - cp -r $SRC/robin-hood-hashing-$_robin_hood/* robin_hood/external/robin-hood-hashing patch -p1 -i $SRC/add-missing-export.patch patch -p1 -i $SRC/fix_shared.patch + patch -p1 -i $SRC/vulkan-layers-1.3.204-Fix-dependency-detection.patch ) prt-get isinst ninja && PKGMK_VULKAN_VALIDATION_LAYERS+=' -G Ninja' @@ -39,8 +36,7 @@ build() { -D CMAKE_CXX_FLAGS_RELEASE="${CXXFLAGS}" \ -D BUILD_TESTS=OFF \ -D BUILD_LAYER_SUPPORT_FILES=ON \ - -D GLSLANG_INSTALL_DIR:PATH='/usr/include/glslang' \ - -D ROBIN_HOOD_HASHING_INSTALL_DIR:PATH="$SRC/Vulkan-ValidationLayers-sdk-$version/robin_hood/external/robin-hood-hashing" \ + -D USE_ROBIN_HOOD_HASHING=ON \ -D SPIRV_HEADERS_INSTALL_DIR:PATH="$SRC/Vulkan-ValidationLayers-sdk-$version/headers/external/spirv-headers" \ -Wno-dev diff --git a/vulkan-validation-layers-32/vulkan-layers-1.3.204-Fix-dependency-detection.patch b/vulkan-validation-layers-32/vulkan-layers-1.3.204-Fix-dependency-detection.patch new file mode 100644 index 0000000..25f3b4b --- /dev/null +++ b/vulkan-validation-layers-32/vulkan-layers-1.3.204-Fix-dependency-detection.patch @@ -0,0 +1,90 @@ +From 534810e26e0be782b2c702a97bf726af250b8cd6 Mon Sep 17 00:00:00 2001 +From: Jeremy Gebben <jeremyg(a)lunarg.com> +Date: Thu, 17 Feb 2022 15:26:25 -0700 +Subject: [PATCH] build: Handle many permutations of SPIRV-Headers locations + +If the SPIRV-Headers package is not found, fall back to looking for +headers in SPIRV_HEADERS_INSTALL_DIR or SPIRV_HEADERS_INCLUDE_DIR. + +Fixes #3765 +--- + CMakeLists.txt | 19 ++++++++++++++++--- + layers/CMakeLists.txt | 7 +------ + tests/CMakeLists.txt | 6 +++--- + 3 files changed, 20 insertions(+), 12 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d4ca786ca07..58a966f03d6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -256,10 +256,23 @@ if (USE_ROBIN_HOOD_HASHING) + endif() + endif() + +-set(SPIRV_HEADERS_INCLUDE_DIR "" CACHE STRING "") + if(BUILD_LAYERS OR BUILD_TESTS) +- if (SPIRV_HEADERS_INCLUDE_DIR STREQUAL "") +- find_package(SPIRV-Headers REQUIRED CONFIG) ++ find_package(SPIRV-Headers CONFIG QUIET) ++ if(SPIRV-Headers_FOUND) ++ # pefer the package if found. Note that if SPIRV_HEADERS_INSTALL_DIR points at an 'installed' ++ # version of SPIRV-Headers, the package will be found. ++ get_target_property(SPIRV_HEADERS_INCLUDE_DIR SPIRV-Headers::SPIRV-Headers INTERFACE_INCLUDE_DIRECTORIES) ++ elseif(SPIRV_HEADERS_INCLUDE_DIR) ++ # This is set by SPIRV-Tools (in parent scope!) and also some packages that include VVL with add_subdirectory ++ if (NOT EXISTS "${SPIRV_HEADERS_INCLUDE_DIR}/spirv/unified1/spirv.h") ++ message(FATAL_ERROR "Cannot find SPIRV-Headers from SPIRV_HEADERS_INCLUDE_DIR: ${SPIRV_HEADERS_INCLUDE_DIR}") ++ endif() ++ elseif(SPIRV_HEADERS_INSTALL_DIR) ++ # This is our official variable for setting SPIRV-Headers location, but pointing at the raw source of SPIRV-Headers ++ if (NOT EXISTS "${SPIRV_HEADERS_INSTALL_DIR}/include/spirv/unified1/spirv.h") ++ message(FATAL_ERROR "Cannot find SPIRV-Headers from SPIRV_HEADERS_INSTALL_DIR: ${SPIRV_HEADERS_INSTALL_DIR}") ++ endif() ++ set(SPIRV_HEADERS_INCLUDE_DIR "${SPIRV_HEADERS_INSTALL_DIR}/include") + endif() + endif() + +diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt +index 6edcf6eb5ab..59e294a0793 100644 +--- a/layers/CMakeLists.txt ++++ b/layers/CMakeLists.txt +@@ -309,12 +309,7 @@ if(BUILD_LAYERS) + if (USE_ROBIN_HOOD_HASHING) + target_include_directories(VkLayer_khronos_validation PRIVATE ${ROBIN_HOOD_HASHING_INCLUDE_DIR}) + endif() +- if (SPIRV_HEADERS_INCLUDE_DIR STREQUAL "") +- target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Headers::SPIRV-Headers) +- else() +- target_include_directories(VkLayer_khronos_validation PRIVATE ${SPIRV_HEADERS_INCLUDE_DIR}) +- endif() +- ++ target_include_directories(VkLayer_khronos_validation PRIVATE ${SPIRV_HEADERS_INCLUDE_DIR}) + target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Tools-static SPIRV-Tools-opt) + + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 2b98d109b7f..780c0538486 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -1,6 +1,6 @@ + # ~~~ +-# Copyright (c) 2014-2021 Valve Corporation +-# Copyright (c) 2014-2021 LunarG, Inc. ++# Copyright (c) 2014-2022 Valve Corporation ++# Copyright (c) 2014-2022 LunarG, Inc. + # + # Licensed under the Apache License, Version 2.0 (the "License"); + # you may not use this file except in compliance with the License. +@@ -149,11 +149,11 @@ if (NOT MSVC) + target_compile_options(vk_layer_validation_tests PRIVATE "-Wno-sign-compare") + endif() + ++target_include_directories(vk_layer_validation_tests PRIVATE ${SPIRV_HEADERS_INCLUDE_DIR}) + # Specify target_link_libraries + target_link_libraries(vk_layer_validation_tests + PRIVATE VkLayer_utils + ${GLSLANG_LIBRARIES} +- SPIRV-Headers::SPIRV-Headers + SPIRV-Tools-static SPIRV-Tools-opt + GTest::gtest GTest::gtest_main) +

1 0