* [PR PATCH] ART: update to 1.20, New package: mimalloc-2.1.2
@ 2023-06-18 14:31 paper42
2023-06-20 7:43 ` wangp
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: paper42 @ 2023-06-18 14:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1338 bytes --]
There is a new pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages art-1.20
https://github.com/void-linux/void-packages/pull/44503
ART: update to 1.20, New package: mimalloc-2.1.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
the mimalloc commit is taken from #37688, updated and fixed
cc @wangp
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/44503.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-art-1.20-44503.patch --]
[-- Type: text/x-diff, Size: 4756 bytes --]
From 4faf5044ecddb6e17fc591d58497942cfe91f151 Mon Sep 17 00:00:00 2001
From: Peter Wang <novalazy@gmail.com>
Date: Sun, 8 Jan 2023 11:21:49 +1100
Subject: [PATCH 1/2] New package: mimalloc-2.1.2
---
common/shlibs | 1 +
srcpkgs/mimalloc-devel | 1 +
.../mimalloc/patches/unify-library-name.patch | 20 +++++++++++
srcpkgs/mimalloc/template | 36 +++++++++++++++++++
4 files changed, 58 insertions(+)
create mode 120000 srcpkgs/mimalloc-devel
create mode 100644 srcpkgs/mimalloc/patches/unify-library-name.patch
create mode 100644 srcpkgs/mimalloc/template
diff --git a/common/shlibs b/common/shlibs
index 494e99b89550..320e9f68e308 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4272,3 +4272,4 @@ libplayerctl.so.2 playerctl-2.4.1_1
libwireplumber-0.4.so.0 wireplumber-0.4.14_1
libjodycode.so.2 libjodycode-2.0.1_1
libgsoapssl++-2.8.124.so gsoap-2.8.124_1
+libmimalloc.so.2 mimalloc-2.0.9_1
diff --git a/srcpkgs/mimalloc-devel b/srcpkgs/mimalloc-devel
new file mode 120000
index 000000000000..9af584a917a5
--- /dev/null
+++ b/srcpkgs/mimalloc-devel
@@ -0,0 +1 @@
+mimalloc
\ No newline at end of file
diff --git a/srcpkgs/mimalloc/patches/unify-library-name.patch b/srcpkgs/mimalloc/patches/unify-library-name.patch
new file mode 100644
index 000000000000..c8cddbef17b8
--- /dev/null
+++ b/srcpkgs/mimalloc/patches/unify-library-name.patch
@@ -0,0 +1,20 @@
+make sure the library name is the same no matter whether is't built as
+secure or not
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -343,15 +343,6 @@ else()
+ endif()
+
+ set(mi_basename "mimalloc")
+-if(MI_SECURE)
+- set(mi_basename "${mi_basename}-secure")
+-endif()
+-if(MI_TRACK_VALGRIND)
+- set(mi_basename "${mi_basename}-valgrind")
+-endif()
+-if(MI_TRACK_ASAN)
+- set(mi_basename "${mi_basename}-asan")
+-endif()
+ string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LC)
+ if(NOT(CMAKE_BUILD_TYPE_LC MATCHES "^(release|relwithdebinfo|minsizerel|none)$"))
+ set(mi_basename "${mi_basename}-${CMAKE_BUILD_TYPE_LC}") #append build type (e.g. -debug) if not a release version
diff --git a/srcpkgs/mimalloc/template b/srcpkgs/mimalloc/template
new file mode 100644
index 000000000000..1c8872823b15
--- /dev/null
+++ b/srcpkgs/mimalloc/template
@@ -0,0 +1,36 @@
+# Template file for 'mimalloc'
+pkgname=mimalloc
+version=2.1.2
+revision=1
+build_style=cmake
+configure_args="$(vopt_bool secure MI_SECURE)"
+short_desc="General purpose allocator with excellent performance characteristics"
+maintainer="Peter Wang <novalazy@gmail.com>"
+license="MIT"
+homepage="https://github.com/microsoft/mimalloc"
+distfiles="https://github.com/microsoft/mimalloc/archive/v${version}.tar.gz"
+checksum=2b1bff6f717f9725c70bf8d79e4786da13de8a270059e4ba0bdd262ae7be46eb
+
+build_options="secure"
+build_options_default="secure"
+desc_option_secure="Build mimalloc in secure mode"
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
+
+post_install() {
+ vlicense LICENSE
+}
+
+mimalloc-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/libmimalloc.so
+ vmove usr/lib/mimalloc-${version%.*}
+ vmove usr/lib/pkgconfig
+ }
+}
From b23b1d52630d1d54c4bb589e511a837762e1fb2b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 2 Jun 2023 20:26:08 +0200
Subject: [PATCH 2/2] ART: update to 1.20.
---
srcpkgs/ART/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/ART/template b/srcpkgs/ART/template
index a15bf7a9bdd1..a94c90455303 100644
--- a/srcpkgs/ART/template
+++ b/srcpkgs/ART/template
@@ -1,15 +1,16 @@
# Template file for 'ART'
pkgname=ART
-version=1.13
-revision=2
+version=1.20
+revision=1
build_style=cmake
hostmakedepends="pkg-config"
makedepends="fftw-devel gtkmm-devel lensfun-devel libatomic-devel
- libcanberra-devel libgomp-devel libiptcdata-devel librsvg-devel exiv2-devel"
+ libcanberra-devel libgomp-devel libiptcdata-devel librsvg-devel exiv2-devel
+ mimalloc-devel libraw-devel opencolorio-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Fork of RawTherapee with additional features"
maintainer="notthewave <winklbauer_m@zoho.eu>"
license="GPL-3.0-or-later"
homepage="https://bitbucket.org/agriggio/art/wiki/Home"
-distfiles="https://bitbucket.org/agriggio/art/downloads/${pkgname}-${version}.tar.xz"
-checksum=7a6ade552c42d45970fe6618be61e61621e0867a7a2baef2d3d7092badba36e5
+distfiles="https://bitbucket.org/agriggio/art/downloads/ART-${version}.tar.xz"
+checksum=ab89138288b9213b46de9e8172f262a6164f7565893a7b1b7c6e1e24df2fa020
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: ART: update to 1.20, New package: mimalloc-2.1.2
2023-06-18 14:31 [PR PATCH] ART: update to 1.20, New package: mimalloc-2.1.2 paper42
@ 2023-06-20 7:43 ` wangp
2023-08-26 8:03 ` sgn
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: wangp @ 2023-06-20 7:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 208 bytes --]
New comment by wangp on void-packages repository
https://github.com/void-linux/void-packages/pull/44503#issuecomment-1598280714
Comment:
Thanks, I copied your mimalloc-2.1.2 changes into my branch as well.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: ART: update to 1.20, New package: mimalloc-2.1.2
2023-06-18 14:31 [PR PATCH] ART: update to 1.20, New package: mimalloc-2.1.2 paper42
2023-06-20 7:43 ` wangp
@ 2023-08-26 8:03 ` sgn
2023-08-26 8:37 ` paper42
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: sgn @ 2023-08-26 8:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 198 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/44503#issuecomment-1694220280
Comment:
I think mimalloc has been merged. What is the status of ART?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: ART: update to 1.20, New package: mimalloc-2.1.2
2023-06-18 14:31 [PR PATCH] ART: update to 1.20, New package: mimalloc-2.1.2 paper42
2023-06-20 7:43 ` wangp
2023-08-26 8:03 ` sgn
@ 2023-08-26 8:37 ` paper42
2023-09-23 13:13 ` [PR PATCH] [Updated] " paper42
2023-09-25 9:12 ` [PR PATCH] [Merged]: " paper42
4 siblings, 0 replies; 6+ messages in thread
From: paper42 @ 2023-08-26 8:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 322 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/44503#issuecomment-1694229364
Comment:
> I think mimalloc has been merged. What is the status of ART?
I don't have an opportunity to rebase and merge this PR, but it should be ready once the mimalloc commit is dropped.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] ART: update to 1.20, New package: mimalloc-2.1.2
2023-06-18 14:31 [PR PATCH] ART: update to 1.20, New package: mimalloc-2.1.2 paper42
` (2 preceding siblings ...)
2023-08-26 8:37 ` paper42
@ 2023-09-23 13:13 ` paper42
2023-09-25 9:12 ` [PR PATCH] [Merged]: " paper42
4 siblings, 0 replies; 6+ messages in thread
From: paper42 @ 2023-09-23 13:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1343 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages art-1.20
https://github.com/void-linux/void-packages/pull/44503
ART: update to 1.20, New package: mimalloc-2.1.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
the mimalloc commit is taken from #37688, updated and fixed
cc @wangp
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/44503.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-art-1.20-44503.patch --]
[-- Type: text/x-diff, Size: 1409 bytes --]
From 4dbb28da372f516b0a2151103b80094cd1398587 Mon Sep 17 00:00:00 2001
From: Emi Vasilek <emi.vasilek@gmail.com>
Date: Fri, 2 Jun 2023 20:26:08 +0200
Subject: [PATCH] ART: update to 1.20.
---
srcpkgs/ART/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/ART/template b/srcpkgs/ART/template
index b26f13334653c..b6c47fc6c4cdf 100644
--- a/srcpkgs/ART/template
+++ b/srcpkgs/ART/template
@@ -1,15 +1,16 @@
# Template file for 'ART'
pkgname=ART
-version=1.13
-revision=2
+version=1.20.2
+revision=1
build_style=cmake
hostmakedepends="pkg-config"
makedepends="fftw-devel gtkmm-devel lensfun-devel
- libcanberra-devel libgomp-devel libiptcdata-devel librsvg-devel exiv2-devel"
+ libcanberra-devel libgomp-devel libiptcdata-devel librsvg-devel exiv2-devel
+ mimalloc-devel libraw-devel opencolorio-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Fork of RawTherapee with additional features"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://bitbucket.org/agriggio/art/wiki/Home"
-distfiles="https://bitbucket.org/agriggio/art/downloads/${pkgname}-${version}.tar.xz"
-checksum=7a6ade552c42d45970fe6618be61e61621e0867a7a2baef2d3d7092badba36e5
+distfiles="https://bitbucket.org/agriggio/art/downloads/ART-${version}.tar.xz"
+checksum=5f2e5ff4a02469bea813ac81d1322a117d80af31a00aa37955bdae3054062a21
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: ART: update to 1.20, New package: mimalloc-2.1.2
2023-06-18 14:31 [PR PATCH] ART: update to 1.20, New package: mimalloc-2.1.2 paper42
` (3 preceding siblings ...)
2023-09-23 13:13 ` [PR PATCH] [Updated] " paper42
@ 2023-09-25 9:12 ` paper42
4 siblings, 0 replies; 6+ messages in thread
From: paper42 @ 2023-09-25 9:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1186 bytes --]
There's a merged pull request on the void-packages repository
ART: update to 1.20, New package: mimalloc-2.1.2
https://github.com/void-linux/void-packages/pull/44503
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
the mimalloc commit is taken from #37688, updated and fixed
cc @wangp
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-09-25 9:12 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-18 14:31 [PR PATCH] ART: update to 1.20, New package: mimalloc-2.1.2 paper42
2023-06-20 7:43 ` wangp
2023-08-26 8:03 ` sgn
2023-08-26 8:37 ` paper42
2023-09-23 13:13 ` [PR PATCH] [Updated] " paper42
2023-09-25 9:12 ` [PR PATCH] [Merged]: " paper42
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).