[gentoo-commits] repo/gentoo:master commit in: dev-libs/sord/, dev-libs/sord/files/ - gentoo-commits

From:	"Miroslav Šulc" <fordfrog@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: dev-libs/sord/, dev-libs/sord/files/
Date:	Sun, 27 Sep 2020 17:55:45
Message-Id:	`1601229336.7b230dffe237b6e7868b26b6ba648df35d97c4b6.fordfrog@gentoo`

1

commit:     7b230dffe237b6e7868b26b6ba648df35d97c4b6

2

Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>

3

AuthorDate: Sun Sep 27 17:55:05 2020 +0000

4

Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>

5

CommitDate: Sun Sep 27 17:55:36 2020 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b230dff

7

8

dev-libs/sord: bump to 0.16.6 + updated live

9

10

Bug: https://bugs.gentoo.org/723150

11

Package-Manager: Portage-3.0.8, Repoman-3.0.1

12

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

13

14

 dev-libs/sord/Manifest                             |  1 +

15

 dev-libs/sord/files/sord-0.16.6-x86_32.patch       | 44 ++++++++++++++++++++++

16

 .../sord/{sord-9999.ebuild => sord-0.16.6.ebuild}  | 12 ++++--

17

 dev-libs/sord/sord-9999.ebuild                     |  6 ++-

18

 4 files changed, 58 insertions(+), 5 deletions(-)

19

20

diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest

21

index 5044bb236a4..27fbf386c7c 100644

22

--- a/dev-libs/sord/Manifest

23

+++ b/dev-libs/sord/Manifest

24

@@ -1,2 +1,3 @@

25

 DIST drobilla-autowaf-6c6c1d29bfe4c28dd26b5cde7ea4a1a148ee700d.tar.gz 384589 BLAKE2B d643df2e133c2b70e00d85562d1c30f8a01190b4c1e1a512b732d016db3ae77ff543d4acafc00309edb173e7bbaaf17b0c2844bef2ffe786c02a51930f03f29a SHA512 50b2d063866630c7c566af9da07c9ac0da2cf86e70f76ad6af57973ae0b346d4687c0b4263cefa90f0c0ba9e853a60583457c9f8b1313db3f4298ca2f0cfc4d3

26

+DIST sord-0.16.6.tar.bz2 520690 BLAKE2B 7ec248a78e0d9e525d640363414ddd32acc3e32817e2ab86e791fd9232a46658538c9a4db936a5daa7eeb5ef9f7bf13e1aa1429ab6d9fc769e1391a014da919f SHA512 1d3c2bf47ff7e4b533e4e737e2ece8e29bace78bb00c41a252ad5c583abdcba3baa05b189cb8651c212861a2eea3c690354c99d684fd0f343b40e74c94572f98

27

 DIST sord-81e138633076c2d7ef7e1691845757208d02f478.tar.gz 293332 BLAKE2B 794aed020b14f0cd4bae851de12f24fe54c87202b69c3f21cc26a86f0da092b05ea2244279be16ab3231431a8a5fb0cbab7236c2e761715e9a1759bb5b3ab54b SHA512 ba0dd8a8434a04be3548b959789b5b81491cd2f91f6125d3620fa17d4d38ae18015db7cd72af71900a0a17331c6b5400756719a25e09e596590ff943798a5991

28

29

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

30

new file mode 100644

31

index 00000000000..3effc4d44dc

32

--- /dev/null

33

+++ b/dev-libs/sord/files/sord-0.16.6-x86_32.patch

34

@@ -0,0 +1,44 @@

35

+diff --git a/src/zix/digest.c b/src/zix/digest.c

36

+index 889cfde..00b9fcf 100644

37

+--- a/src/zix/digest.c

38

++++ b/src/zix/digest.c

39

+@@ -38,10 +38,12 @@ zix_digest_add(uint32_t hash, const void* const buf, const size_t len)

40

+ {

41

+ 	const uint8_t* str = (const uint8_t*)buf;

42

+

43

++#ifdef __x86_64__

44

+ 	for (size_t i = 0; i < (len / sizeof(uint64_t)); ++i) {

45

+ 		hash = (uint32_t)_mm_crc32_u64(hash, *(const uint64_t*)str);

46

+ 		str += sizeof(uint64_t);

47

+ 	}

48

++#endif

49

+ 	if (len & sizeof(uint32_t)) {

50

+ 		hash = _mm_crc32_u32(hash, *(const uint32_t*)str);

51

+ 		str += sizeof(uint32_t);

52

+@@ -57,6 +59,7 @@ zix_digest_add(uint32_t hash, const void* const buf, const size_t len)

53

+ 	return hash;

54

+ }

55

+

56

++#ifdef __x86_64__

57

+ ZIX_API uint32_t

58

+ zix_digest_add_64(uint32_t hash, const void* const buf, const size_t len)

59

+ {

60

+@@ -72,12 +75,17 @@ zix_digest_add_64(uint32_t hash, const void* const buf, const size_t len)

61

+

62

+ 	return hash;

63

+ }

64

++#endif

65

+

66

+ ZIX_API uint32_t

67

+ zix_digest_add_ptr(const uint32_t hash, const void* const ptr)

68

+ {

69

+ #if UINTPTR_MAX == UINT64_MAX

70

+-	return (uint32_t)_mm_crc32_u64(hash, (uintptr_t)ptr);

71

++	#ifdef __x86_64__

72

++		return (uint32_t)_mm_crc32_u64(hash, (uintptr_t)ptr);

73

++	#else

74

++		return (uint32_t)_mm_crc32_u32(hash, (uintptr_t)ptr);

75

++	#endif

76

+ #else

77

+ 	return _mm_crc32_u32(hash, (uintptr_t)ptr);

78

+ #endif

79

80

diff --git a/dev-libs/sord/sord-9999.ebuild b/dev-libs/sord/sord-0.16.6.ebuild

81

similarity index 79%

82

copy from dev-libs/sord/sord-9999.ebuild

83

copy to dev-libs/sord/sord-0.16.6.ebuild

84

index e1388ab2877..bd3d4f728ec 100644

85

--- a/dev-libs/sord/sord-9999.ebuild

86

+++ b/dev-libs/sord/sord-0.16.6.ebuild

87

@@ -5,21 +5,21 @@ EAPI=6

88

89

 PYTHON_COMPAT=( python3_{6,7,8} )

90

 PYTHON_REQ_USE='threads(+)'

91

-inherit python-any-r1 waf-utils multilib-build multilib-minimal git-r3

92

+inherit python-any-r1 waf-utils multilib-build multilib-minimal

93

94

 DESCRIPTION="Library for storing RDF data in memory"

95

 HOMEPAGE="http://drobilla.net/software/sord/"

96

-EGIT_REPO_URI="https://github.com/drobilla/sord.git"

97

+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"

98

99

 LICENSE="ISC"

100

 SLOT="0"

101

-KEYWORDS=""

102

+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"

103

 IUSE="doc static-libs test"

104

 RESTRICT="!test? ( test )"

105

106

 RDEPEND="

107

 	dev-libs/libpcre

108

-	>=dev-libs/serd-0.30.0

109

+	dev-libs/serd

110

"

111

 DEPEND="${RDEPEND}

112

 	${PYTHON_DEPS}

113

@@ -28,6 +28,10 @@ DEPEND="${RDEPEND}

114

115

 DOCS=( "AUTHORS" "NEWS" "README.md" )

116

117

+PATCHES=(

118

+	"${FILESDIR}/${P}-x86_32.patch"

119

+)

120

+

121

 src_prepare() {

122

 	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die

123

 	default

124

125

diff --git a/dev-libs/sord/sord-9999.ebuild b/dev-libs/sord/sord-9999.ebuild

126

index e1388ab2877..acfd96a2744 100644

127

--- a/dev-libs/sord/sord-9999.ebuild

128

+++ b/dev-libs/sord/sord-9999.ebuild

129

@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"

130

131

 RDEPEND="

132

 	dev-libs/libpcre

133

-	>=dev-libs/serd-0.30.0

134

+	dev-libs/serd

135

"

136

 DEPEND="${RDEPEND}

137

 	${PYTHON_DEPS}

138

@@ -28,6 +28,10 @@ DEPEND="${RDEPEND}

139

140

 DOCS=( "AUTHORS" "NEWS" "README.md" )

141

142

+PATCHES=(

143

+	"${FILESDIR}/${P}-0.16.6-x86_32.patch"

144

+)

145

+

146

 src_prepare() {

147

 	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die

148

 	default

1	commit: 7b230dffe237b6e7868b26b6ba648df35d97c4b6
2	Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3	AuthorDate: Sun Sep 27 17:55:05 2020 +0000
4	Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5	CommitDate: Sun Sep 27 17:55:36 2020 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b230dff
7
8	dev-libs/sord: bump to 0.16.6 + updated live
9
10	Bug: https://bugs.gentoo.org/723150
11	Package-Manager: Portage-3.0.8, Repoman-3.0.1
12	Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
13
14	dev-libs/sord/Manifest \| 1 +
15	dev-libs/sord/files/sord-0.16.6-x86_32.patch \| 44 ++++++++++++++++++++++
16	.../sord/{sord-9999.ebuild => sord-0.16.6.ebuild} \| 12 ++++--
17	dev-libs/sord/sord-9999.ebuild \| 6 ++-
18	4 files changed, 58 insertions(+), 5 deletions(-)
19
20	diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest
21	index 5044bb236a4..27fbf386c7c 100644
22	--- a/dev-libs/sord/Manifest
23	+++ b/dev-libs/sord/Manifest
24	@@ -1,2 +1,3 @@
25	DIST drobilla-autowaf-6c6c1d29bfe4c28dd26b5cde7ea4a1a148ee700d.tar.gz 384589 BLAKE2B d643df2e133c2b70e00d85562d1c30f8a01190b4c1e1a512b732d016db3ae77ff543d4acafc00309edb173e7bbaaf17b0c2844bef2ffe786c02a51930f03f29a SHA512 50b2d063866630c7c566af9da07c9ac0da2cf86e70f76ad6af57973ae0b346d4687c0b4263cefa90f0c0ba9e853a60583457c9f8b1313db3f4298ca2f0cfc4d3
26	+DIST sord-0.16.6.tar.bz2 520690 BLAKE2B 7ec248a78e0d9e525d640363414ddd32acc3e32817e2ab86e791fd9232a46658538c9a4db936a5daa7eeb5ef9f7bf13e1aa1429ab6d9fc769e1391a014da919f SHA512 1d3c2bf47ff7e4b533e4e737e2ece8e29bace78bb00c41a252ad5c583abdcba3baa05b189cb8651c212861a2eea3c690354c99d684fd0f343b40e74c94572f98
27	DIST sord-81e138633076c2d7ef7e1691845757208d02f478.tar.gz 293332 BLAKE2B 794aed020b14f0cd4bae851de12f24fe54c87202b69c3f21cc26a86f0da092b05ea2244279be16ab3231431a8a5fb0cbab7236c2e761715e9a1759bb5b3ab54b SHA512 ba0dd8a8434a04be3548b959789b5b81491cd2f91f6125d3620fa17d4d38ae18015db7cd72af71900a0a17331c6b5400756719a25e09e596590ff943798a5991
28
29	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
30	new file mode 100644
31	index 00000000000..3effc4d44dc
32	--- /dev/null
33	+++ b/dev-libs/sord/files/sord-0.16.6-x86_32.patch
34	@@ -0,0 +1,44 @@
35	+diff --git a/src/zix/digest.c b/src/zix/digest.c
36	+index 889cfde..00b9fcf 100644
37	+--- a/src/zix/digest.c
38	++++ b/src/zix/digest.c
39	+@@ -38,10 +38,12 @@ zix_digest_add(uint32_t hash, const void* const buf, const size_t len)
40	+ {
41	+ const uint8_t* str = (const uint8_t*)buf;
42	+
43	++#ifdef __x86_64__
44	+ for (size_t i = 0; i < (len / sizeof(uint64_t)); ++i) {
45	+ hash = (uint32_t)_mm_crc32_u64(hash, (const uint64_t)str);
46	+ str += sizeof(uint64_t);
47	+ }
48	++#endif
49	+ if (len & sizeof(uint32_t)) {
50	+ hash = _mm_crc32_u32(hash, (const uint32_t)str);
51	+ str += sizeof(uint32_t);
52	+@@ -57,6 +59,7 @@ zix_digest_add(uint32_t hash, const void* const buf, const size_t len)
53	+ return hash;
54	+ }
55	+
56	++#ifdef __x86_64__
57	+ ZIX_API uint32_t
58	+ zix_digest_add_64(uint32_t hash, const void* const buf, const size_t len)
59	+ {
60	+@@ -72,12 +75,17 @@ zix_digest_add_64(uint32_t hash, const void* const buf, const size_t len)
61	+
62	+ return hash;
63	+ }
64	++#endif
65	+
66	+ ZIX_API uint32_t
67	+ zix_digest_add_ptr(const uint32_t hash, const void* const ptr)
68	+ {
69	+ #if UINTPTR_MAX == UINT64_MAX
70	+- return (uint32_t)_mm_crc32_u64(hash, (uintptr_t)ptr);
71	++ #ifdef __x86_64__
72	++ return (uint32_t)_mm_crc32_u64(hash, (uintptr_t)ptr);
73	++ #else
74	++ return (uint32_t)_mm_crc32_u32(hash, (uintptr_t)ptr);
75	++ #endif
76	+ #else
77	+ return _mm_crc32_u32(hash, (uintptr_t)ptr);
78	+ #endif
79
80	diff --git a/dev-libs/sord/sord-9999.ebuild b/dev-libs/sord/sord-0.16.6.ebuild
81	similarity index 79%
82	copy from dev-libs/sord/sord-9999.ebuild
83	copy to dev-libs/sord/sord-0.16.6.ebuild
84	index e1388ab2877..bd3d4f728ec 100644
85	--- a/dev-libs/sord/sord-9999.ebuild
86	+++ b/dev-libs/sord/sord-0.16.6.ebuild
87	@@ -5,21 +5,21 @@ EAPI=6
88
89	PYTHON_COMPAT=( python3_{6,7,8} )
90	PYTHON_REQ_USE='threads(+)'
91	-inherit python-any-r1 waf-utils multilib-build multilib-minimal git-r3
92	+inherit python-any-r1 waf-utils multilib-build multilib-minimal
93
94	DESCRIPTION="Library for storing RDF data in memory"
95	HOMEPAGE="http://drobilla.net/software/sord/"
96	-EGIT_REPO_URI="https://github.com/drobilla/sord.git"
97	+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
98
99	LICENSE="ISC"
100	SLOT="0"
101	-KEYWORDS=""
102	+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
103	IUSE="doc static-libs test"
104	RESTRICT="!test? ( test )"
105
106	RDEPEND="
107	dev-libs/libpcre
108	- >=dev-libs/serd-0.30.0
109	+ dev-libs/serd
110	"
111	DEPEND="${RDEPEND}
112	${PYTHON_DEPS}
113	@@ -28,6 +28,10 @@ DEPEND="${RDEPEND}
114
115	DOCS=( "AUTHORS" "NEWS" "README.md" )
116
117	+PATCHES=(
118	+ "${FILESDIR}/${P}-x86_32.patch"
119	+)
120	+
121	src_prepare() {
122	sed -i -e 's/^.*run_ldconfig/#\0/' wscript \|\| die
123	default
124
125	diff --git a/dev-libs/sord/sord-9999.ebuild b/dev-libs/sord/sord-9999.ebuild
126	index e1388ab2877..acfd96a2744 100644
127	--- a/dev-libs/sord/sord-9999.ebuild
128	+++ b/dev-libs/sord/sord-9999.ebuild
129	@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"
130
131	RDEPEND="
132	dev-libs/libpcre
133	- >=dev-libs/serd-0.30.0
134	+ dev-libs/serd
135	"
136	DEPEND="${RDEPEND}
137	${PYTHON_DEPS}
138	@@ -28,6 +28,10 @@ DEPEND="${RDEPEND}
139
140	DOCS=( "AUTHORS" "NEWS" "README.md" )
141
142	+PATCHES=(
143	+ "${FILESDIR}/${P}-0.16.6-x86_32.patch"
144	+)
145	+
146	src_prepare() {
147	sed -i -e 's/^.*run_ldconfig/#\0/' wscript \|\| die
148	default

Gentoo Archives: gentoo-commits