* [gentoo-commits] repo/gentoo:master commit in: dev-libs/sord/, dev-libs/sord/files/
@ 2020-09-23 10:55 Miroslav Šulc
0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2020-09-23 10:55 UTC (permalink / raw
To: gentoo-commits
commit: c574cc18eb7168adda8308d5f0bd727088d6b8c1
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 23 10:55:41 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Sep 23 10:55:41 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c574cc18
dev-libs/sord: removed obsolete 0.16.4-r1
Closes: https://bugs.gentoo.org/742707
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-libs/sord/Manifest | 1 -
dev-libs/sord/files/sord-0.16.4-gcc10.patch | 25 ------------
dev-libs/sord/sord-0.16.4-r1.ebuild | 61 -----------------------------
3 files changed, 87 deletions(-)
diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest
index edf099aea83..5044bb236a4 100644
--- a/dev-libs/sord/Manifest
+++ b/dev-libs/sord/Manifest
@@ -1,3 +1,2 @@
DIST drobilla-autowaf-6c6c1d29bfe4c28dd26b5cde7ea4a1a148ee700d.tar.gz 384589 BLAKE2B d643df2e133c2b70e00d85562d1c30f8a01190b4c1e1a512b732d016db3ae77ff543d4acafc00309edb173e7bbaaf17b0c2844bef2ffe786c02a51930f03f29a SHA512 50b2d063866630c7c566af9da07c9ac0da2cf86e70f76ad6af57973ae0b346d4687c0b4263cefa90f0c0ba9e853a60583457c9f8b1313db3f4298ca2f0cfc4d3
-DIST sord-0.16.4.tar.bz2 510920 BLAKE2B e52b659e8070dc63188225741d1bfa31480214e47b53b4834dd0bccc5dcd688b93fc65c894b25540d89dbb20b04d8fd1952dcc65999c2ae7b650065c80b387dc SHA512 98bb102cff5ab38d999c2f966597508076ccce54583a739810b0c28b4f3d570b2ef414605fc08361ecb11ac3184d3176f2f50c7c59c06cc50c3d522e26ed5576
DIST sord-81e138633076c2d7ef7e1691845757208d02f478.tar.gz 293332 BLAKE2B 794aed020b14f0cd4bae851de12f24fe54c87202b69c3f21cc26a86f0da092b05ea2244279be16ab3231431a8a5fb0cbab7236c2e761715e9a1759bb5b3ab54b SHA512 ba0dd8a8434a04be3548b959789b5b81491cd2f91f6125d3620fa17d4d38ae18015db7cd72af71900a0a17331c6b5400756719a25e09e596590ff943798a5991
diff --git a/dev-libs/sord/files/sord-0.16.4-gcc10.patch b/dev-libs/sord/files/sord-0.16.4-gcc10.patch
deleted file mode 100644
index a793b335a0a..00000000000
--- a/dev-libs/sord/files/sord-0.16.4-gcc10.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 616517f44ceeacb26592e50e2bf914aad2d93b90 Mon Sep 17 00:00:00 2001
-From: David Robillard <d@drobilla.net>
-Date: Fri, 17 Jul 2020 15:38:38 +0200
-Subject: [PATCH] Fix crash with optimized builds with GCC 10.1.0
-
----
- src/zix/btree.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/zix/btree.c b/src/zix/btree.c
-index 78a5a0d..d830008 100644
---- a/src/zix/btree.c
-+++ b/src/zix/btree.c
-@@ -689,7 +689,7 @@ zix_btree_begin(const ZixBTree* const t)
- ZIX_API bool
- zix_btree_iter_is_end(const ZixBTreeIter* const i)
- {
-- return !i || i->stack[0].node == NULL;
-+ return !i || (i->level == 0 && i->stack[0].node == NULL);
- }
-
- ZIX_API void
---
-2.28.0
-
diff --git a/dev-libs/sord/sord-0.16.4-r1.ebuild b/dev-libs/sord/sord-0.16.4-r1.ebuild
deleted file mode 100644
index 2c0d0b7cfc2..00000000000
--- a/dev-libs/sord/sord-0.16.4-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE='threads(+)'
-inherit python-any-r1 waf-utils multilib-build multilib-minimal
-
-DESCRIPTION="Library for storing RDF data in memory"
-HOMEPAGE="http://drobilla.net/software/sord/"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="doc static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/libpcre
- >=dev-libs/serd-0.30.0
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- doc? ( app-doc/doxygen )
- virtual/pkgconfig"
-
-DOCS=( "AUTHORS" "NEWS" "README.md" )
-
-PATCHES=(
- "${FILESDIR}/${P}-gcc10.patch"
-)
-
-src_prepare() {
- sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
- default
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- waf-utils_src_configure \
- --docdir=/usr/share/doc/${PF} \
- $(multilib_native_usex doc --docs "") \
- $(usex test --test "") \
- $(usex static-libs --static "")
-}
-
-multilib_src_test() {
- ./waf test || die
-}
-
-multilib_src_compile() {
- waf-utils_src_compile
- default
-}
-
-multilib_src_install() {
- waf-utils_src_install
- default
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/sord/, dev-libs/sord/files/
@ 2020-09-27 17:55 Miroslav Šulc
0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2020-09-27 17:55 UTC (permalink / raw
To: gentoo-commits
commit: 7b230dffe237b6e7868b26b6ba648df35d97c4b6
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 27 17:55:05 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Sep 27 17:55:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b230dff
dev-libs/sord: bump to 0.16.6 + updated live
Bug: https://bugs.gentoo.org/723150
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-libs/sord/Manifest | 1 +
dev-libs/sord/files/sord-0.16.6-x86_32.patch | 44 ++++++++++++++++++++++
.../sord/{sord-9999.ebuild => sord-0.16.6.ebuild} | 12 ++++--
dev-libs/sord/sord-9999.ebuild | 6 ++-
4 files changed, 58 insertions(+), 5 deletions(-)
diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest
index 5044bb236a4..27fbf386c7c 100644
--- a/dev-libs/sord/Manifest
+++ b/dev-libs/sord/Manifest
@@ -1,2 +1,3 @@
DIST drobilla-autowaf-6c6c1d29bfe4c28dd26b5cde7ea4a1a148ee700d.tar.gz 384589 BLAKE2B d643df2e133c2b70e00d85562d1c30f8a01190b4c1e1a512b732d016db3ae77ff543d4acafc00309edb173e7bbaaf17b0c2844bef2ffe786c02a51930f03f29a SHA512 50b2d063866630c7c566af9da07c9ac0da2cf86e70f76ad6af57973ae0b346d4687c0b4263cefa90f0c0ba9e853a60583457c9f8b1313db3f4298ca2f0cfc4d3
+DIST sord-0.16.6.tar.bz2 520690 BLAKE2B 7ec248a78e0d9e525d640363414ddd32acc3e32817e2ab86e791fd9232a46658538c9a4db936a5daa7eeb5ef9f7bf13e1aa1429ab6d9fc769e1391a014da919f SHA512 1d3c2bf47ff7e4b533e4e737e2ece8e29bace78bb00c41a252ad5c583abdcba3baa05b189cb8651c212861a2eea3c690354c99d684fd0f343b40e74c94572f98
DIST sord-81e138633076c2d7ef7e1691845757208d02f478.tar.gz 293332 BLAKE2B 794aed020b14f0cd4bae851de12f24fe54c87202b69c3f21cc26a86f0da092b05ea2244279be16ab3231431a8a5fb0cbab7236c2e761715e9a1759bb5b3ab54b SHA512 ba0dd8a8434a04be3548b959789b5b81491cd2f91f6125d3620fa17d4d38ae18015db7cd72af71900a0a17331c6b5400756719a25e09e596590ff943798a5991
diff --git a/dev-libs/sord/files/sord-0.16.6-x86_32.patch b/dev-libs/sord/files/sord-0.16.6-x86_32.patch
new file mode 100644
index 00000000000..3effc4d44dc
--- /dev/null
+++ b/dev-libs/sord/files/sord-0.16.6-x86_32.patch
@@ -0,0 +1,44 @@
+diff --git a/src/zix/digest.c b/src/zix/digest.c
+index 889cfde..00b9fcf 100644
+--- a/src/zix/digest.c
++++ b/src/zix/digest.c
+@@ -38,10 +38,12 @@ zix_digest_add(uint32_t hash, const void* const buf, const size_t len)
+ {
+ const uint8_t* str = (const uint8_t*)buf;
+
++#ifdef __x86_64__
+ for (size_t i = 0; i < (len / sizeof(uint64_t)); ++i) {
+ hash = (uint32_t)_mm_crc32_u64(hash, *(const uint64_t*)str);
+ str += sizeof(uint64_t);
+ }
++#endif
+ if (len & sizeof(uint32_t)) {
+ hash = _mm_crc32_u32(hash, *(const uint32_t*)str);
+ str += sizeof(uint32_t);
+@@ -57,6 +59,7 @@ zix_digest_add(uint32_t hash, const void* const buf, const size_t len)
+ return hash;
+ }
+
++#ifdef __x86_64__
+ ZIX_API uint32_t
+ zix_digest_add_64(uint32_t hash, const void* const buf, const size_t len)
+ {
+@@ -72,12 +75,17 @@ zix_digest_add_64(uint32_t hash, const void* const buf, const size_t len)
+
+ return hash;
+ }
++#endif
+
+ ZIX_API uint32_t
+ zix_digest_add_ptr(const uint32_t hash, const void* const ptr)
+ {
+ #if UINTPTR_MAX == UINT64_MAX
+- return (uint32_t)_mm_crc32_u64(hash, (uintptr_t)ptr);
++ #ifdef __x86_64__
++ return (uint32_t)_mm_crc32_u64(hash, (uintptr_t)ptr);
++ #else
++ return (uint32_t)_mm_crc32_u32(hash, (uintptr_t)ptr);
++ #endif
+ #else
+ return _mm_crc32_u32(hash, (uintptr_t)ptr);
+ #endif
diff --git a/dev-libs/sord/sord-9999.ebuild b/dev-libs/sord/sord-0.16.6.ebuild
similarity index 79%
copy from dev-libs/sord/sord-9999.ebuild
copy to dev-libs/sord/sord-0.16.6.ebuild
index e1388ab2877..bd3d4f728ec 100644
--- a/dev-libs/sord/sord-9999.ebuild
+++ b/dev-libs/sord/sord-0.16.6.ebuild
@@ -5,21 +5,21 @@ EAPI=6
PYTHON_COMPAT=( python3_{6,7,8} )
PYTHON_REQ_USE='threads(+)'
-inherit python-any-r1 waf-utils multilib-build multilib-minimal git-r3
+inherit python-any-r1 waf-utils multilib-build multilib-minimal
DESCRIPTION="Library for storing RDF data in memory"
HOMEPAGE="http://drobilla.net/software/sord/"
-EGIT_REPO_URI="https://github.com/drobilla/sord.git"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
LICENSE="ISC"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="doc static-libs test"
RESTRICT="!test? ( test )"
RDEPEND="
dev-libs/libpcre
- >=dev-libs/serd-0.30.0
+ dev-libs/serd
"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
@@ -28,6 +28,10 @@ DEPEND="${RDEPEND}
DOCS=( "AUTHORS" "NEWS" "README.md" )
+PATCHES=(
+ "${FILESDIR}/${P}-x86_32.patch"
+)
+
src_prepare() {
sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
default
diff --git a/dev-libs/sord/sord-9999.ebuild b/dev-libs/sord/sord-9999.ebuild
index e1388ab2877..acfd96a2744 100644
--- a/dev-libs/sord/sord-9999.ebuild
+++ b/dev-libs/sord/sord-9999.ebuild
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"
RDEPEND="
dev-libs/libpcre
- >=dev-libs/serd-0.30.0
+ dev-libs/serd
"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
@@ -28,6 +28,10 @@ DEPEND="${RDEPEND}
DOCS=( "AUTHORS" "NEWS" "README.md" )
+PATCHES=(
+ "${FILESDIR}/${P}-0.16.6-x86_32.patch"
+)
+
src_prepare() {
sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
default
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/sord/, dev-libs/sord/files/
@ 2021-04-14 19:39 Miroslav Šulc
0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2021-04-14 19:39 UTC (permalink / raw
To: gentoo-commits
commit: e2be84caf596edfce747ca9919b52fbb563198c7
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 14 19:37:31 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Apr 14 19:37:31 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2be84ca
dev-libs/sord: fixed gcc optimization issue
Closes: https://bugs.gentoo.org/782886
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
...ash-with-optimized-builds-with-gcc-10.1.0.patch | 25 ++++++++++++++++++++++
.../{sord-0.16.8.ebuild => sord-0.16.8-r1.ebuild} | 4 ++++
2 files changed, 29 insertions(+)
diff --git a/dev-libs/sord/files/sord-0.16.8-fix-crash-with-optimized-builds-with-gcc-10.1.0.patch b/dev-libs/sord/files/sord-0.16.8-fix-crash-with-optimized-builds-with-gcc-10.1.0.patch
new file mode 100644
index 00000000000..c7f3e66c79f
--- /dev/null
+++ b/dev-libs/sord/files/sord-0.16.8-fix-crash-with-optimized-builds-with-gcc-10.1.0.patch
@@ -0,0 +1,25 @@
+From 616517f44ceeacb26592e50e2bf914aad2d93b90 Mon Sep 17 00:00:00 2001
+From: David Robillard <d@drobilla.net>
+Date: Fri, 17 Jul 2020 15:38:38 +0200
+Subject: [PATCH] Fix crash with optimized builds with GCC 10.1.0
+
+---
+ src/zix/btree.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/zix/btree.c b/src/zix/btree.c
+index 78a5a0d..d830008 100644
+--- a/src/zix/btree.c
++++ b/src/zix/btree.c
+@@ -689,7 +689,7 @@ zix_btree_begin(const ZixBTree* const t)
+ ZIX_API bool
+ zix_btree_iter_is_end(const ZixBTreeIter* const i)
+ {
+- return !i || i->stack[0].node == NULL;
++ return !i || (i->level == 0 && i->stack[0].node == NULL);
+ }
+
+ ZIX_API void
+--
+GitLab
+
diff --git a/dev-libs/sord/sord-0.16.8.ebuild b/dev-libs/sord/sord-0.16.8-r1.ebuild
similarity index 93%
rename from dev-libs/sord/sord-0.16.8.ebuild
rename to dev-libs/sord/sord-0.16.8-r1.ebuild
index 26bfc0bacf6..1b9950ec3e5 100644
--- a/dev-libs/sord/sord-0.16.8.ebuild
+++ b/dev-libs/sord/sord-0.16.8-r1.ebuild
@@ -30,6 +30,10 @@ DEPEND="${RDEPEND}
"
DOCS=( "AUTHORS" "NEWS" "README.md" )
+PATCHES=(
+ "${FILESDIR}/${P}-fix-crash-with-optimized-builds-with-gcc-10.1.0.patch"
+)
+
src_prepare() {
sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
default
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-04-14 19:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-14 19:39 [gentoo-commits] repo/gentoo:master commit in: dev-libs/sord/, dev-libs/sord/files/ Miroslav Šulc
-- strict thread matches above, loose matches on Subject: below --
2020-09-27 17:55 Miroslav Šulc
2020-09-23 10:55 Miroslav Šulc
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox