From 89e539d6adddde12982e392723443dcb410ec738 Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 12:09:46 +0200 Subject: [PATCH 01/11] removed-packages: sort list --- srcpkgs/removed-packages/template | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index b340882305e8..3c642d3ce935 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -27,6 +27,7 @@ replaces=" atom<=1.44.0_1 avogadro-devel<=1.2.0_8 avogadro<=1.2.0_8 + bgc<=1.0.1_1 bokken<=1.8_3 bomi<=0.9.11_17 burp-client<=1.4.40_13 @@ -37,10 +38,10 @@ replaces=" california<=0.4.0_4 capstone-python<=4.0.2_3 captain-ballard<=1.0.0_2 - cegui07<=0.7.9_8 cegui07-data<=0.7.9_8 cegui07-devel<=0.7.9_8 cegui07-doc<=0.7.9_8 + cegui07<=0.7.9_8 cgminer<=4.11.1_1 clamz<=0.5_4 couchdb<=1.7.1_2 @@ -76,9 +77,9 @@ replaces=" ebtables<=2.0.10.4_8 eclipse-ecj<=4.9_3 elasticsearch<=5.1.2_2 + electron10<=10.4.7_2 electron7<=7.3.3_1 electron9<=9.4.1_1 - electron10<=10.4.7_2 emacs-gtk2<=27.2_1 enventor<=1.0.0_2 epstopdf<=2.27_3 @@ -90,9 +91,9 @@ replaces=" fuse-usmb<=20130204_7 gandi-cli<=1.6_2 gconf-editor<=3.0.1_3 - gconfmm<=2.28.3_4 gconfmm-devel<=2.28.3_4 gconfmm-doc<=2.28.3_4 + gconfmm<=2.28.3_4 gegl3<=0.3.28_2 gens-gs<=2.16.7_2 geoip-data<=20171002_2 @@ -251,9 +252,9 @@ replaces=" librpcsecgss<=0.19_6 libshiboken-python3<=5.15.0_3 libspa-ffmpeg<=0.3.32_1 + libunique-devel<=3.0.2_11 libunique1-devel<=1.1.6_12 libunique1<=1.1.6_12 - libunique-devel<=3.0.2_11 libunique<=3.0.2_11 libxml2-python<=2.9.10_4 libxnoise<=0.2.21_4 @@ -307,8 +308,8 @@ replaces=" python-Babel<=2.8.0_4 python-M2Crypto<=0.35.2_7 python-Pillow<=6.2.2_3 - python-Pygments<=2.5.2_4 python-PyQt4<=4.12.1_4 + python-Pygments<=2.5.2_4 python-SecretStorage<=2.3.1_4 python-audit<=2.8.5_2 python-chardet<=4.0.0_3 @@ -322,8 +323,8 @@ replaces=" python-gntp<=1.0.3_7 python-gobject-devel<=3.36.1_2 python-gobject<=3.36.1_2 - python-isodate<=0.6.0_5 python-iso8601<=0.1.16_2 + python-isodate<=0.6.0_5 python-jellyfish<=0.6.1_2 python-lockfile<=0.12.2_7 python-lxml<=4.6.4_2 @@ -365,8 +366,8 @@ replaces=" python3-jaraco<=1.0_4 python3-jsonrpc-server<=0.4.0_2 python3-keepalive<=0.5_6 - python3-pgpdump<=1.5_10 python3-lockfile<=0.12.2_7 + python3-pgpdump<=1.5_10 python3-pyPEG2<=2.15.2_7 python3-pyenet<=5.15.0_2 python3-pyside-phonon<=5.15.0_2 @@ -424,6 +425,7 @@ replaces=" urlmatch-git<=20141116_2 uwsgi-python<=2.0.18_3 v8<=3.24.35.33_4 + vkd3d<=1.3_1 volnoti<=0.1_1 volume_key-python<=0.3.12_5 vte-devel<=0.28.2_16 @@ -439,9 +441,9 @@ replaces=" xlennart<=1.1.1_1 xmonad-contrib<=0.16_3 xmonad<=0.15_5 - xnp2<=0.86_2 xnoise-devel<=0.2.21_4 xnoise<=0.2.21_4 + xnp2<=0.86_2 yabause-gtk<=0.9.15_2 yt-play<=20140117_2 ytop<=0.6.2_1 @@ -450,8 +452,6 @@ replaces=" zou<=0.2.0_7 zuluplay-devel<=1.1_1 zuluplay<=1.1_1 - bgc<=1.0.1_1 - vkd3d<=1.3_1 " if [ "$XBPS_TARGET_LIBC" = "musl" ]; then From c645eef5d4378377997882656e264bc690e84996 Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 12:10:05 +0200 Subject: [PATCH 02/11] govendor: remove package --- srcpkgs/govendor/template | 16 ---------------- srcpkgs/removed-packages/template | 1 + 2 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 srcpkgs/govendor/template diff --git a/srcpkgs/govendor/template b/srcpkgs/govendor/template deleted file mode 100644 index e18a8fb0d11c..000000000000 --- a/srcpkgs/govendor/template +++ /dev/null @@ -1,16 +0,0 @@ -# Template file for 'govendor' -pkgname=govendor -version=1.0.9 -revision=3 -build_style=go -go_import_path="github.com/kardianos/govendor" -short_desc="Go vendor tool that works with the standard vendor file" -maintainer="lemmi " -license="BSD-3-Clause" -homepage="https://github.com/kardianos/govendor" -distfiles="https://github.com/kardianos/govendor/archive/v${version}.tar.gz" -checksum=d303abf194838792234a1451c3a1e87885d1b2cd21774867b592c1f7db00551e - -post_install() { - vlicense LICENSE -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 3c642d3ce935..b70f3299e6e7 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -115,6 +115,7 @@ replaces=" goat<=0.0.0.28022016_10 goffice0.8<=0.8.17_6 goproxy<=7.0_1 + govendor<=1.0.9_3 gradio<=7.2_1 grv<=0.3.1_3 gsettings-qt<=0.1+17.10.20170824_3 From 4fd5d04ebe0de480cf3392fa14dd4bddd23a464c Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 12:13:39 +0200 Subject: [PATCH 03/11] gx: remove package --- srcpkgs/gx/template | 16 ---------------- srcpkgs/removed-packages/template | 1 + 2 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 srcpkgs/gx/template diff --git a/srcpkgs/gx/template b/srcpkgs/gx/template deleted file mode 100644 index 7414b6bab10a..000000000000 --- a/srcpkgs/gx/template +++ /dev/null @@ -1,16 +0,0 @@ -# Template file for 'gx' -pkgname=gx -version=0.14.3 -revision=1 -build_style=go -go_import_path="github.com/whyrusleeping/gx" -short_desc="Language-agnostic, universal package manager around IPFS" -maintainer="lemmi " -license="MIT" -homepage="https://github.com/whyrusleeping/gx" -distfiles="https://github.com/whyrusleeping/gx/archive/v${version}.tar.gz" -checksum=2c0b90ddfd3152863f815c35b37e94d027216c6ba1c6653a94b722bf6e2b015d - -post_install() { - vlicense LICENSE -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index b70f3299e6e7..cd7d3d005ecb 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -125,6 +125,7 @@ replaces=" guile1.8-devel<=1.8.8_3 guile1.8<=1.8.8_3 gx-go<=1.9.0_1 + gx<=0.14.3_1 httperf<=0.9.0_9 icecat-i18n-ach<=78.6.1_1 icecat-i18n-af<=78.6.1_1 From 292f41d99832c2f677bdb392c2254e154006b198 Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 12:31:02 +0200 Subject: [PATCH 04/11] libpng12: remove package --- common/shlibs | 2 -- srcpkgs/libpng12-devel | 1 - srcpkgs/libpng12/template | 33 ------------------------------- srcpkgs/libpng12/update | 1 - srcpkgs/removed-packages/template | 1 + 5 files changed, 1 insertion(+), 37 deletions(-) delete mode 120000 srcpkgs/libpng12-devel delete mode 100644 srcpkgs/libpng12/template delete mode 100644 srcpkgs/libpng12/update diff --git a/common/shlibs b/common/shlibs index 48c63f2d0735..d38ee63d0bb2 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2915,8 +2915,6 @@ libite.so.5 libite-2.0.1_1 liblog4cplus-1.2.so.5 log4cplus-1.2.0_1 liblog4cplus-2.0.so.3 log4cplus-2.0.0_1 liblog4cplusU-2.0.so.3 log4cplus-2.0.3_1 -libpng12.so.0 libpng12-1.2.56_2 -libpng.so.3 libpng12-1.2.56_2 libcapnpc-0.9.1.so capnproto-0.9.1_1 libcapnp-json-0.9.1.so capnproto-0.9.1_1 libcapnp-rpc-0.9.1.so capnproto-0.9.1_1 diff --git a/srcpkgs/libpng12-devel b/srcpkgs/libpng12-devel deleted file mode 120000 index da491d9066b6..000000000000 --- a/srcpkgs/libpng12-devel +++ /dev/null @@ -1 +0,0 @@ -libpng12 \ No newline at end of file diff --git a/srcpkgs/libpng12/template b/srcpkgs/libpng12/template deleted file mode 100644 index 1efdb9e46098..000000000000 --- a/srcpkgs/libpng12/template +++ /dev/null @@ -1,33 +0,0 @@ -# Template build file for 'libpng12'. -pkgname=libpng12 -version=1.2.59 -revision=1 -wrksrc=libpng-${version} -build_style=gnu-configure -makedepends="zlib-devel" -short_desc="Library for manipulating PNG images, compatibility package" -maintainer="lemmi " -homepage="http://www.libpng.org/pub/png/libpng.html" -license="zlib" -distfiles="ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng12/libpng-${version}.tar.xz" -checksum=b4635f15b8adccc8ad0934eea485ef59cc4cae24d0f0300a9a941e51974ffcc7 - -post_install() { - rm -f ${DESTDIR}/usr/lib/*.la - vlicense LICENSE - mv $DESTDIR/usr/share/man/man5/png.5 $DESTDIR/usr/share/man/man5/png12.5 -} - -libpng12-devel_package() { - depends="${makedepends} libpng12>=${version}_${revision}" - short_desc+=" - development files" - conflicts="libpng-devel" - pkg_install() { - vmove "usr/bin/libpng*-config" - vmove usr/include - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" - vmove usr/lib/pkgconfig - vmove usr/share/man/man3 - } -} diff --git a/srcpkgs/libpng12/update b/srcpkgs/libpng12/update deleted file mode 100644 index 125db71da82d..000000000000 --- a/srcpkgs/libpng12/update +++ /dev/null @@ -1 +0,0 @@ -ignore="*beta*" diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index cd7d3d005ecb..8aae5500c2fb 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -246,6 +246,7 @@ replaces=" libmagick6<=6.9.12.12_2 libmpd-devel<=11.8.17_3 libmpd<=11.8.17_3 + libpng12<=1.2.59_1 libpyside-python3<=5.15.0_2 libqmatrixclient-devel<=0.5.3.2_1 libqmatrixclient<=0.5.3.2_1 From 6f7f7e9171e995887052881411b2b7a945a273cd Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 12:31:46 +0200 Subject: [PATCH 05/11] opencl-clhpp: remove package --- srcpkgs/opencl-clhpp/template | 13 ------------- srcpkgs/removed-packages/template | 1 + 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 srcpkgs/opencl-clhpp/template diff --git a/srcpkgs/opencl-clhpp/template b/srcpkgs/opencl-clhpp/template deleted file mode 100644 index c2213bb5f461..000000000000 --- a/srcpkgs/opencl-clhpp/template +++ /dev/null @@ -1,13 +0,0 @@ -# Template file for 'opencl-clhpp' -pkgname=opencl-clhpp -version=2.0.15 -revision=1 -wrksrc="OpenCL-CLHPP-${version}" -build_style=cmake -configure_args="-DBUILD_TESTS=OFF -DBUILD_EXAMPLES=OFF" -short_desc="OpenCL Host API C++ bindings (cl.hpp and cl2.hpp)" -maintainer="lemmi " -license="Apache-2.0" -homepage="http://www.khronos.org/registry/cl/" -distfiles="https://github.com/KhronosGroup/OpenCL-CLHPP/archive/v$version.tar.gz" -checksum=0175806508abc699586fc9a9387e01eb37bf812ca534e3b493ff3091ec2a9246 diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 8aae5500c2fb..9957fb8170b7 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -290,6 +290,7 @@ replaces=" oce-devel<=0.18.3_1 oce<=0.18.3_1 onionshare<=2.2_5 + opencl-clhpp<=2.0.15_1 orage<=4.12.1_7 paraview<=5.8.1_3 perl-Gtk2-Ex-Simple-List<=0.50_4 From c9cf396ffb6e8a5bb8073e2c83cab642f5a1bf63 Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 12:32:04 +0200 Subject: [PATCH 06/11] parallel-rust: remove package --- ...df810acae4ca04bc4c0291e9f0f00309c828.patch | 241 ------------------ srcpkgs/parallel-rust/template | 22 -- srcpkgs/removed-packages/template | 1 + 3 files changed, 1 insertion(+), 263 deletions(-) delete mode 100644 srcpkgs/parallel-rust/patches/c5a0df810acae4ca04bc4c0291e9f0f00309c828.patch delete mode 100644 srcpkgs/parallel-rust/template diff --git a/srcpkgs/parallel-rust/patches/c5a0df810acae4ca04bc4c0291e9f0f00309c828.patch b/srcpkgs/parallel-rust/patches/c5a0df810acae4ca04bc4c0291e9f0f00309c828.patch deleted file mode 100644 index f2a8f7a8267f..000000000000 --- a/srcpkgs/parallel-rust/patches/c5a0df810acae4ca04bc4c0291e9f0f00309c828.patch +++ /dev/null @@ -1,241 +0,0 @@ -From 04d2ac0b22851059ebeb476b953159faaf87c769 Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Mon, 4 Dec 2017 01:16:52 +0100 -Subject: [PATCH 1/3] bump arrayvec to 0.4 - -Signed-off-by: Igor Gnatenko ---- - Cargo.lock | 46 ++++++++++++++++++---------------------------- - Cargo.toml | 2 +- - 2 files changed, 19 insertions(+), 29 deletions(-) - -diff --git a/Cargo.lock b/Cargo.lock -index c01308d..ab76676 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1,25 +1,9 @@ --[root] --name = "parallel" --version = "0.11.2" --dependencies = [ -- "arrayvec 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)", -- "itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "num_cpus 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "numtoa 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "permutate 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "smallvec 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "sys-info 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", -- "wait-timeout 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", --] -- - [[package]] - name = "arrayvec" --version = "0.3.23" -+version = "0.4.6" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ -- "nodrop 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", -- "odds 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)", -+ "nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - ] - - [[package]] -@@ -48,11 +32,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - - [[package]] - name = "nodrop" --version = "0.1.9" -+version = "0.1.12" - source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "odds 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)", --] - - [[package]] - name = "num_cpus" -@@ -68,9 +49,19 @@ version = "0.0.7" - source = "registry+https://github.com/rust-lang/crates.io-index" - - [[package]] --name = "odds" --version = "0.2.25" --source = "registry+https://github.com/rust-lang/crates.io-index" -+name = "parallel" -+version = "0.11.3" -+dependencies = [ -+ "arrayvec 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num_cpus 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "numtoa 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "permutate 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "smallvec 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "sys-info 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wait-timeout 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+] - - [[package]] - name = "permutate" -@@ -125,15 +116,14 @@ version = "0.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - - [metadata] --"checksum arrayvec 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)" = "699e63a93b79d717e8c3b5eb1b28b7780d0d6d9e59a72eb769291c83b0c8dc67" -+"checksum arrayvec 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2f0ef4a9820019a0c91d918918c93dc71d469f581a49b47ddc1d285d4270bbe2" - "checksum gcc 0.3.50 (registry+https://github.com/rust-lang/crates.io-index)" = "5f837c392f2ea61cb1576eac188653df828c861b7137d74ea4a5caa89621f9e6" - "checksum itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eb2f404fbc66fd9aac13e998248505e7ecb2ad8e44ab6388684c5fb11c6c251c" - "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" - "checksum libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)" = "e7eb6b826bfc1fdea7935d46556250d1799b7fe2d9f7951071f4291710665e3e" --"checksum nodrop 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "52cd74cd09beba596430cc6e3091b74007169a56246e1262f0ba451ea95117b2" -+"checksum nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "9a2228dca57108069a5262f2ed8bd2e82496d2e074a06d1ccc7ce1687b6ae0a2" - "checksum num_cpus 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6e416ba127a4bb3ff398cb19546a8d0414f73352efe2857f4060d36f5fe5983a" - "checksum numtoa 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "5c8fcb09df1eba2d128cfc50bdb0c3f33ac4f91fdacc2d3ac039b3b192398f8f" --"checksum odds 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)" = "c3df9b730298cea3a1c3faa90b7e2f9df3a9c400d0936d6015e6165734eefcba" - "checksum permutate 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53b7d5b19a715ffab38693a9dd44b067fdfa2b18eef65bd93562dfe507022fae" - "checksum redox_syscall 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "3041aeb6000db123d2c9c751433f526e1f404b23213bd733167ab770c3989b4d" - "checksum smallvec 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2e40af10aafe98b4d8294ae8388d8a5cd0707c65d364872efe72d063ec44bee0" -diff --git a/Cargo.toml b/Cargo.toml -index ee5d106..c526834 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -14,7 +14,7 @@ itoa = "0.3" - numtoa = "0.0" - num_cpus = "1.5" - permutate = "0.3" --arrayvec = "0.3" -+arrayvec = "0.4" - time = "0.1" - smallvec = "0.4" - sys-info = "0.4" - -From 04e954d1adc3f8364f0c5f8edd6418941e5d48d4 Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Mon, 4 Dec 2017 01:18:23 +0100 -Subject: [PATCH 2/3] bump smallvec to 0.6 - -Signed-off-by: Igor Gnatenko ---- - Cargo.lock | 6 +++--- - Cargo.toml | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Cargo.lock b/Cargo.lock -index ab76676..5161560 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -57,7 +57,7 @@ dependencies = [ - "num_cpus 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "numtoa 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)", - "permutate 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "smallvec 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "smallvec 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sys-info 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", - "wait-timeout 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -75,7 +75,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - - [[package]] - name = "smallvec" --version = "0.4.0" -+version = "0.6.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - - [[package]] -@@ -126,7 +126,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - "checksum numtoa 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "5c8fcb09df1eba2d128cfc50bdb0c3f33ac4f91fdacc2d3ac039b3b192398f8f" - "checksum permutate 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53b7d5b19a715ffab38693a9dd44b067fdfa2b18eef65bd93562dfe507022fae" - "checksum redox_syscall 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "3041aeb6000db123d2c9c751433f526e1f404b23213bd733167ab770c3989b4d" --"checksum smallvec 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2e40af10aafe98b4d8294ae8388d8a5cd0707c65d364872efe72d063ec44bee0" -+"checksum smallvec 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44db0ecb22921ef790d17ae13a3f6d15784183ff5f2a01aa32098c7498d2b4b9" - "checksum sys-info 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "246f8bbb443ae0026c92266c26d997d04634c8b44c3baff9fa3bff445b40878c" - "checksum time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "ffd7ccbf969a892bf83f1e441126968a07a3941c24ff522a26af9f9f4585d1a3" - "checksum wait-timeout 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "b9f3bf741a801531993db6478b95682117471f76916f5e690dd8d45395b09349" -diff --git a/Cargo.toml b/Cargo.toml -index c526834..9c3047f 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -16,6 +16,6 @@ num_cpus = "1.5" - permutate = "0.3" - arrayvec = "0.4" - time = "0.1" --smallvec = "0.4" -+smallvec = "0.6" - sys-info = "0.4" - wait-timeout = "0.1" - -From fb63f1e132675f7c634200ccb2f997231f7f6112 Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Mon, 4 Dec 2017 01:19:07 +0100 -Subject: [PATCH 3/3] bump sys-info to 0.5 - -Signed-off-by: Igor Gnatenko ---- - Cargo.lock | 12 ++++++------ - Cargo.toml | 2 +- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/Cargo.lock b/Cargo.lock -index 5161560..cbc91ec 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -8,7 +8,7 @@ dependencies = [ - - [[package]] - name = "gcc" --version = "0.3.50" -+version = "0.3.54" - source = "registry+https://github.com/rust-lang/crates.io-index" - - [[package]] -@@ -58,7 +58,7 @@ dependencies = [ - "numtoa 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)", - "permutate 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "sys-info 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "sys-info 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", - "wait-timeout 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - ] -@@ -80,10 +80,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - - [[package]] - name = "sys-info" --version = "0.4.1" -+version = "0.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ -- "gcc 0.3.50 (registry+https://github.com/rust-lang/crates.io-index)", -+ "gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)", - ] - - [[package]] -@@ -117,7 +117,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - - [metadata] - "checksum arrayvec 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2f0ef4a9820019a0c91d918918c93dc71d469f581a49b47ddc1d285d4270bbe2" --"checksum gcc 0.3.50 (registry+https://github.com/rust-lang/crates.io-index)" = "5f837c392f2ea61cb1576eac188653df828c861b7137d74ea4a5caa89621f9e6" -+"checksum gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)" = "5e33ec290da0d127825013597dbdfc28bee4964690c7ce1166cbc2a7bd08b1bb" - "checksum itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eb2f404fbc66fd9aac13e998248505e7ecb2ad8e44ab6388684c5fb11c6c251c" - "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" - "checksum libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)" = "e7eb6b826bfc1fdea7935d46556250d1799b7fe2d9f7951071f4291710665e3e" -@@ -127,7 +127,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - "checksum permutate 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53b7d5b19a715ffab38693a9dd44b067fdfa2b18eef65bd93562dfe507022fae" - "checksum redox_syscall 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "3041aeb6000db123d2c9c751433f526e1f404b23213bd733167ab770c3989b4d" - "checksum smallvec 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44db0ecb22921ef790d17ae13a3f6d15784183ff5f2a01aa32098c7498d2b4b9" --"checksum sys-info 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "246f8bbb443ae0026c92266c26d997d04634c8b44c3baff9fa3bff445b40878c" -+"checksum sys-info 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f22142cf9c0a96da2db4db82df64fae9f220bd4226b6bd7d6a831c43b2c73a4e" - "checksum time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "ffd7ccbf969a892bf83f1e441126968a07a3941c24ff522a26af9f9f4585d1a3" - "checksum wait-timeout 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "b9f3bf741a801531993db6478b95682117471f76916f5e690dd8d45395b09349" - "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" -diff --git a/Cargo.toml b/Cargo.toml -index 9c3047f..1785ecd 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -17,5 +17,5 @@ permutate = "0.3" - arrayvec = "0.4" - time = "0.1" - smallvec = "0.6" --sys-info = "0.4" -+sys-info = "0.5" - wait-timeout = "0.1" diff --git a/srcpkgs/parallel-rust/template b/srcpkgs/parallel-rust/template deleted file mode 100644 index d2a746db9108..000000000000 --- a/srcpkgs/parallel-rust/template +++ /dev/null @@ -1,22 +0,0 @@ -# Template file for 'parallel-rust'. -pkgname=parallel-rust -version=0.11.3 -revision=2 -wrksrc="parallel-${version}" -build_style=cargo -short_desc="Inspired by GNU Parallel, a command-line CPU load balancer written in Rust" -maintainer="lemmi " -license="MIT" -homepage="https://github.com/mmstick/parallel" -distfiles="https://github.com/mmstick/parallel/archive/${version}.tar.gz" -checksum=70f09dcbf6d34486e505f3e4a04d4f5e30081ec6cd71920017a8e8090eabc242 - -pre_build() { - # default version too old for ppc musl systems - cargo update --package libc --precise 0.2.66 -} - -do_install() { - vlicense LICENSE - vbin target/${RUST_TARGET}/release/parallel parallel-rust -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 9957fb8170b7..78628056a56c 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -292,6 +292,7 @@ replaces=" onionshare<=2.2_5 opencl-clhpp<=2.0.15_1 orage<=4.12.1_7 + parallel-rust<=0.11.3_2 paraview<=5.8.1_3 perl-Gtk2-Ex-Simple-List<=0.50_4 perl-Gtk2-ImageView<=0.05_8 From d94ccd7be9c53cefc9a6b55bf77929636abb5ae1 Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 12:33:44 +0200 Subject: [PATCH 07/11] vapoursynth-mvtools: remove package --- srcpkgs/mpv/template | 2 +- srcpkgs/removed-packages/template | 1 + srcpkgs/vapoursynth-mvtools/files/example.py | 89 -------------------- srcpkgs/vapoursynth-mvtools/template | 21 ----- 4 files changed, 2 insertions(+), 111 deletions(-) delete mode 100644 srcpkgs/vapoursynth-mvtools/files/example.py delete mode 100644 srcpkgs/vapoursynth-mvtools/template diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template index 5d016e225da5..ded8c1bbe98f 100644 --- a/srcpkgs/mpv/template +++ b/srcpkgs/mpv/template @@ -22,7 +22,7 @@ makedepends="MesaLib-devel ffmpeg-devel harfbuzz-devel libXv-devel $(vopt_if vulkan "Vulkan-Headers vulkan-loader shaderc libplacebo-devel") $(vopt_if wayland "wayland-devel wayland-protocols libxkbcommon-devel") $(vopt_if x11 "libXScrnSaver-devel libXinerama-devel libXrandr-devel")" -depends="desktop-file-utils hicolor-icon-theme $(vopt_if vapoursynth vapoursynth-mvtools)" +depends="desktop-file-utils hicolor-icon-theme" short_desc="Video player based on MPlayer/mplayer2" maintainer="travankor " license="GPL-2.0-or-later" diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 78628056a56c..b5f2ec5bd367 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -430,6 +430,7 @@ replaces=" urlmatch-git<=20141116_2 uwsgi-python<=2.0.18_3 v8<=3.24.35.33_4 + vapoursynth-mvtools<=23_2 vkd3d<=1.3_1 volnoti<=0.1_1 volume_key-python<=0.3.12_5 diff --git a/srcpkgs/vapoursynth-mvtools/files/example.py b/srcpkgs/vapoursynth-mvtools/files/example.py deleted file mode 100644 index e23620456caa..000000000000 --- a/srcpkgs/vapoursynth-mvtools/files/example.py +++ /dev/null @@ -1,89 +0,0 @@ -import vapoursynth as vs - -# see http://avisynth.org.ru/mvtools/mvtools2.html -# these configs will have around 75% usage with an FX-8350 - -def main(): - # don't interpolate if input is close to 60fps anyway - if container_fps > 59: - video_in.set_output() - return - - # basic config - config = { - 'blksize': 16, - 'chroma': True, - 'search': 4, - 'searchparam': 4, - } - recalcconfig = { - 'blksize': 8, - 'chroma': True, - 'search': 5, - 'searchparam': 2, - } - - # use higher quality on 720p or lower - if video_in.width * video_in.height <= 1280*720: - config.update({ - 'search': 5, - 'searchparam': 16, - 'blksize': 32, - 'badsad': 1000, - 'badrange': 32, - 'divide': 2, - 'overlap': 8, - }) - recalcconfig.update({ - 'search': 3, - 'blksize': 16, - 'overlap': 8, - 'dct': 8, - }) - - interpolate(config, recalcconfig) - -# first pass -def analyse(sup, config): - core = vs.get_core() - bvec = core.mv.Analyse(sup, isb=True, **config) - fvec = core.mv.Analyse(sup, isb=False, **config) - return bvec, fvec - -# optional second pass -def recalculate(sup, bvec, fvec, config): - core = vs.get_core() - bvec = core.mv.Recalculate(sup, bvec, **config) - fvec = core.mv.Recalculate(sup, fvec, **config) - return bvec, fvec - -def interpolate(config, recalcconfig=None): - core = vs.get_core() - clip = video_in - - # Interpolating to fps higher than 60 is too CPU-expensive - # Use interpolation from opengl video output - dst_fps = display_fps - while (dst_fps > 60): - dst_fps /= 2 - - src_fps_num = int(container_fps * 1e8) - src_fps_den = int(1e8) - dst_fps_num = int(dst_fps * 1e4) - dst_fps_den = int(1e4) - - # Needed because clip FPS is missing - clip = core.std.AssumeFPS(clip, fpsnum = src_fps_num, fpsden = src_fps_den) - print("Reflowing from ",src_fps_num/src_fps_den," fps to ",dst_fps_num/dst_fps_den," fps.") - - pad = config.get('blksize', 8) - sup = core.mv.Super(clip, pel=1, hpad=pad, vpad=pad) - bvec, fvec = analyse(sup, config) - if recalcconfig: - bvec, fvec = recalculate(sup, bvec, fvec, recalcconfig) - clip = core.mv.FlowFPS(clip, sup, bvec, fvec, num=dst_fps_num, den=dst_fps_den, thscd2=90) - - clip.set_output() - -if __name__ == '__vapoursynth__': - main() diff --git a/srcpkgs/vapoursynth-mvtools/template b/srcpkgs/vapoursynth-mvtools/template deleted file mode 100644 index f6cd5e1cd9e4..000000000000 --- a/srcpkgs/vapoursynth-mvtools/template +++ /dev/null @@ -1,21 +0,0 @@ -# Template file for 'vapoursynth-mvtools' -pkgname=vapoursynth-mvtools -version=23 -revision=2 -archs="x86_64* i686*" -build_style=meson -hostmakedepends="pkg-config libtool nasm" -makedepends="fftw-devel vapoursynth-devel" -short_desc="Set of filters for motion estimation and compensation" -maintainer="lemmi " -license="GPL-2.0-or-later" -homepage="http://avisynth.org.ru/mvtools/mvtools2.html" -distfiles="https://github.com/dubhater/vapoursynth-mvtools/archive/v${version}.tar.gz" -checksum=3b5fdad2b52a2525764510a04af01eab3bc5e8fe6a02aba44b78955887a47d44 - -post_install() { - vdoc readme.rst - vsconf ${FILESDIR}/example.py - vmkdir /usr/lib/vapoursynth - mv ${DESTDIR}/usr/lib/{,vapoursynth/}libmvtools.so -} From ea24d2e9bbdd6a571eccd018aff0daeead2b218d Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 12:51:59 +0200 Subject: [PATCH 08/11] mp3gain: remove package --- srcpkgs/mp3gain/template | 19 ------------------- srcpkgs/mp3gain/update | 1 - srcpkgs/removed-packages/template | 1 + 3 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 srcpkgs/mp3gain/template delete mode 100644 srcpkgs/mp3gain/update diff --git a/srcpkgs/mp3gain/template b/srcpkgs/mp3gain/template deleted file mode 100644 index d69c2be8aee5..000000000000 --- a/srcpkgs/mp3gain/template +++ /dev/null @@ -1,19 +0,0 @@ -# Template file for 'mp3gain' -pkgname=mp3gain -version=1.6.2 -revision=2 -create_wrksrc=yes -build_style=gnu-makefile -make_build_args="OSTYPE=linux" -hostmakedepends="unzip" -makedepends="mpg123-devel" -short_desc="Lossless mp3 normalizer with statistical analysis" -maintainer="lemmi " -license="LGPL-2.1-or-later" -homepage="http://mp3gain.sourceforge.net" -distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version//./_}-src.zip" -checksum=5cc04732ef32850d5878b28fbd8b85798d979a025990654aceeaa379bcc9596d - -do_install() { - vbin mp3gain -} diff --git a/srcpkgs/mp3gain/update b/srcpkgs/mp3gain/update deleted file mode 100644 index cd25267403a2..000000000000 --- a/srcpkgs/mp3gain/update +++ /dev/null @@ -1 +0,0 @@ -pattern="${pkgname}-\K[\d_r]+(?=-src\.zip)" diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index b5f2ec5bd367..9c847ea1672c 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -278,6 +278,7 @@ replaces=" mirrorbits<=0.5.1_1 mongroup<=0.4.1_2 mozjs68<=68.11.0_1 + mp3gain<=1.6.2_2 mutagen<=1.43.0_3 nautilus-sendto<=3.8.6_2 ncdns<=0.0.2_12 From 74852886e117bcee5763a0e16e6bec78ca86ade6 Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 12:54:45 +0200 Subject: [PATCH 09/11] s6-dns: orphan --- srcpkgs/s6-dns/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/s6-dns/template b/srcpkgs/s6-dns/template index dae2279b0749..4d282185ce8a 100644 --- a/srcpkgs/s6-dns/template +++ b/srcpkgs/s6-dns/template @@ -9,7 +9,7 @@ configure_args="--prefix=/usr --libdir=/usr/lib $(vopt_if static --enable-static-libc)" makedepends="execline-devel skalibs-devel" short_desc="Suite of DNS client programs and libraries for Unix systems" -maintainer="lemmi " +maintainer="Orphaned " license="ISC" homepage="https://skarnet.org/software/s6-dns" distfiles="${homepage}/${pkgname}-${version}.tar.gz" From 1badfae9336000be19b7186fb07f1a44fb1c24d5 Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 12:54:58 +0200 Subject: [PATCH 10/11] s6-networking: orphan --- srcpkgs/s6-networking/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template index d06d52acf170..5a04b9abf01b 100644 --- a/srcpkgs/s6-networking/template +++ b/srcpkgs/s6-networking/template @@ -11,7 +11,7 @@ configure_args="--libdir=/usr/lib $(vopt_if libtls --enable-ssl=libtls) makedepends="execline-devel $(vopt_if libtls libtls-devel) skalibs-devel s6-devel s6-dns-devel $(vopt_if bearssl bearssl-devel)" short_desc="Suite of small network utilities for Unix systems" -maintainer="lemmi " +maintainer="Orphaned " license="ISC" homepage="https://skarnet.org/software/s6-networking" changelog="https://skarnet.org/software/s6-networking/upgrade.html" From bac92bf9c08977b935ec2170b0337d2bd9d1fca0 Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 13:25:37 +0200 Subject: [PATCH 11/11] swh-plugins: orphan candidate for removal, remaining reverse dependencies flowblade: not a hard dependency. swh-lv2 replacement not working at this point pulseaudio-equalizer-ladspa: last update 3 years ago --- srcpkgs/swh-plugins/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/swh-plugins/template b/srcpkgs/swh-plugins/template index 1bfa854e7507..1474dd61ba30 100644 --- a/srcpkgs/swh-plugins/template +++ b/srcpkgs/swh-plugins/template @@ -3,19 +3,19 @@ pkgname=swh-plugins version=0.4.17 revision=1 wrksrc="ladspa-${version}" -conflicts="swh-lv2" build_style=gnu-configure hostmakedepends="automake libtool pkg-config gettext-devel gettext perl-Locale-gettext perl-Locale-PO perl-XML-Parser" makedepends="fftw-devel libgsm-devel libxml2-devel" -maintainer="lemmi " +short_desc="SWH Plugins package for the LADSPA plugin system" +maintainer="Orphaned " +license="GPL-2.0-or-later" homepage="http://plugin.org.uk/" -short_desc="The SWH Plugins package for the LADSPA plugin system" -license="GPL-2" distfiles="https://github.com/swh/ladspa/archive/v${version}.tar.gz" checksum=d1b090feec4c5e8f9605334b47faaad72db7cc18fe91d792b9161a9e3b821ce7 +conflicts="swh-lv2" +CFLAGS="-fPIC" pre_configure() { autoreconf -fi } -