[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/ - gentoo-commits

From:	Jimi Huotari <chiitoo@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] proj/qt:master commit in: dev-qt/qt3d/
Date:	Mon, 26 Aug 2019 10:50:48
Message-Id:	`1566816607.041c6d78f94e2ebc66ad2b9ef5cc60580212c504.chiitoo@gentoo`

1

commit:     041c6d78f94e2ebc66ad2b9ef5cc60580212c504

2

Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>

3

AuthorDate: Mon Aug 26 10:34:27 2019 +0000

4

Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>

5

CommitDate: Mon Aug 26 10:50:07 2019 +0000

6

URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=041c6d78

7

8

dev-qt/qt3d: add USE="gamepad"

9

10

Package-Manager: Portage-2.3.73, Repoman-2.3.17

11

Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>

12

13

 dev-qt/qt3d/metadata.xml          | 2 ++

14

 dev-qt/qt3d/qt3d-5.12.9999.ebuild | 6 ++++--

15

 dev-qt/qt3d/qt3d-5.13.9999.ebuild | 6 ++++--

16

 dev-qt/qt3d/qt3d-5.14.9999.ebuild | 6 ++++--

17

 dev-qt/qt3d/qt3d-5.9999.ebuild    | 6 ++++--

18

 5 files changed, 18 insertions(+), 8 deletions(-)

19

20

diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml

21

index 987a6dc2..bdb6f1b0 100644

22

--- a/dev-qt/qt3d/metadata.xml

23

+++ b/dev-qt/qt3d/metadata.xml

24

@@ -6,6 +6,8 @@

25

 		<name>Gentoo Qt Project</name>

26

 	</maintainer>

27

 	<use>

28

+		<flag name="gamepad">Add support for gamepad hardware via

29

+			<pkg>dev-qt/qtgamepad</pkg></flag>

30

 		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>

31

 		<flag name="qml">Build QML/QtQuick bindings</flag>

32

 	</use>

33

34

diff --git a/dev-qt/qt3d/qt3d-5.12.9999.ebuild b/dev-qt/qt3d/qt3d-5.12.9999.ebuild

35

index 0f61b942..431e2685 100644

36

--- a/dev-qt/qt3d/qt3d-5.12.9999.ebuild

37

+++ b/dev-qt/qt3d/qt3d-5.12.9999.ebuild

38

@@ -10,8 +10,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then

39

 	KEYWORDS="~amd64 ~arm64 ~x86"

40

fi

41

42

-# TODO: gamepad, tools

43

-IUSE="gles2 qml"

44

+# TODO: tools

45

+IUSE="gamepad gles2 qml"

46

47

 DEPEND="

48

 	~dev-qt/qtconcurrent-${PV}

49

@@ -19,6 +19,7 @@ DEPEND="

50

 	~dev-qt/qtgui-${PV}

51

 	~dev-qt/qtnetwork-${PV}

52

 	>=media-libs/assimp-4.0.0

53

+	gamepad? ( ~dev-qt/qtgamepad-${PV} )

54

 	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] )

55

"

56

 RDEPEND="${DEPEND}"

57

@@ -26,6 +27,7 @@ RDEPEND="${DEPEND}"

58

 src_prepare() {

59

 	rm -r src/3rdparty/assimp/{code,contrib,include} || die

60

61

+	qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri

62

 	qt_use_disable_mod qml quick src/src.pro

63

64

 	qt5-build_src_prepare

65

66

diff --git a/dev-qt/qt3d/qt3d-5.13.9999.ebuild b/dev-qt/qt3d/qt3d-5.13.9999.ebuild

67

index 0f61b942..431e2685 100644

68

--- a/dev-qt/qt3d/qt3d-5.13.9999.ebuild

69

+++ b/dev-qt/qt3d/qt3d-5.13.9999.ebuild

70

@@ -10,8 +10,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then

71

 	KEYWORDS="~amd64 ~arm64 ~x86"

72

fi

73

74

-# TODO: gamepad, tools

75

-IUSE="gles2 qml"

76

+# TODO: tools

77

+IUSE="gamepad gles2 qml"

78

79

 DEPEND="

80

 	~dev-qt/qtconcurrent-${PV}

81

@@ -19,6 +19,7 @@ DEPEND="

82

 	~dev-qt/qtgui-${PV}

83

 	~dev-qt/qtnetwork-${PV}

84

 	>=media-libs/assimp-4.0.0

85

+	gamepad? ( ~dev-qt/qtgamepad-${PV} )

86

 	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] )

87

"

88

 RDEPEND="${DEPEND}"

89

@@ -26,6 +27,7 @@ RDEPEND="${DEPEND}"

90

 src_prepare() {

91

 	rm -r src/3rdparty/assimp/{code,contrib,include} || die

92

93

+	qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri

94

 	qt_use_disable_mod qml quick src/src.pro

95

96

 	qt5-build_src_prepare

97

98

diff --git a/dev-qt/qt3d/qt3d-5.14.9999.ebuild b/dev-qt/qt3d/qt3d-5.14.9999.ebuild

99

index 0f61b942..431e2685 100644

100

--- a/dev-qt/qt3d/qt3d-5.14.9999.ebuild

101

+++ b/dev-qt/qt3d/qt3d-5.14.9999.ebuild

102

@@ -10,8 +10,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then

103

 	KEYWORDS="~amd64 ~arm64 ~x86"

104

fi

105

106

-# TODO: gamepad, tools

107

-IUSE="gles2 qml"

108

+# TODO: tools

109

+IUSE="gamepad gles2 qml"

110

111

 DEPEND="

112

 	~dev-qt/qtconcurrent-${PV}

113

@@ -19,6 +19,7 @@ DEPEND="

114

 	~dev-qt/qtgui-${PV}

115

 	~dev-qt/qtnetwork-${PV}

116

 	>=media-libs/assimp-4.0.0

117

+	gamepad? ( ~dev-qt/qtgamepad-${PV} )

118

 	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] )

119

"

120

 RDEPEND="${DEPEND}"

121

@@ -26,6 +27,7 @@ RDEPEND="${DEPEND}"

122

 src_prepare() {

123

 	rm -r src/3rdparty/assimp/{code,contrib,include} || die

124

125

+	qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri

126

 	qt_use_disable_mod qml quick src/src.pro

127

128

 	qt5-build_src_prepare

129

130

diff --git a/dev-qt/qt3d/qt3d-5.9999.ebuild b/dev-qt/qt3d/qt3d-5.9999.ebuild

131

index 0f61b942..431e2685 100644

132

--- a/dev-qt/qt3d/qt3d-5.9999.ebuild

133

+++ b/dev-qt/qt3d/qt3d-5.9999.ebuild

134

@@ -10,8 +10,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then

135

 	KEYWORDS="~amd64 ~arm64 ~x86"

136

fi

137

138

-# TODO: gamepad, tools

139

-IUSE="gles2 qml"

140

+# TODO: tools

141

+IUSE="gamepad gles2 qml"

142

143

 DEPEND="

144

 	~dev-qt/qtconcurrent-${PV}

145

@@ -19,6 +19,7 @@ DEPEND="

146

 	~dev-qt/qtgui-${PV}

147

 	~dev-qt/qtnetwork-${PV}

148

 	>=media-libs/assimp-4.0.0

149

+	gamepad? ( ~dev-qt/qtgamepad-${PV} )

150

 	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] )

151

"

152

 RDEPEND="${DEPEND}"

153

@@ -26,6 +27,7 @@ RDEPEND="${DEPEND}"

154

 src_prepare() {

155

 	rm -r src/3rdparty/assimp/{code,contrib,include} || die

156

157

+	qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri

158

 	qt_use_disable_mod qml quick src/src.pro

159

160

 	qt5-build_src_prepare

1	commit: 041c6d78f94e2ebc66ad2b9ef5cc60580212c504
2	Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
3	AuthorDate: Mon Aug 26 10:34:27 2019 +0000
4	Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
5	CommitDate: Mon Aug 26 10:50:07 2019 +0000
6	URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=041c6d78
7
8	dev-qt/qt3d: add USE="gamepad"
9
10	Package-Manager: Portage-2.3.73, Repoman-2.3.17
11	Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
12
13	dev-qt/qt3d/metadata.xml \| 2 ++
14	dev-qt/qt3d/qt3d-5.12.9999.ebuild \| 6 ++++--
15	dev-qt/qt3d/qt3d-5.13.9999.ebuild \| 6 ++++--
16	dev-qt/qt3d/qt3d-5.14.9999.ebuild \| 6 ++++--
17	dev-qt/qt3d/qt3d-5.9999.ebuild \| 6 ++++--
18	5 files changed, 18 insertions(+), 8 deletions(-)
19
20	diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml
21	index 987a6dc2..bdb6f1b0 100644
22	--- a/dev-qt/qt3d/metadata.xml
23	+++ b/dev-qt/qt3d/metadata.xml
24	@@ -6,6 +6,8 @@
25	<name>Gentoo Qt Project</name>
26	</maintainer>
27	<use>
28	+ <flag name="gamepad">Add support for gamepad hardware via
29	+ <pkg>dev-qt/qtgamepad</pkg></flag>
30	<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
31	<flag name="qml">Build QML/QtQuick bindings</flag>
32	</use>
33
34	diff --git a/dev-qt/qt3d/qt3d-5.12.9999.ebuild b/dev-qt/qt3d/qt3d-5.12.9999.ebuild
35	index 0f61b942..431e2685 100644
36	--- a/dev-qt/qt3d/qt3d-5.12.9999.ebuild
37	+++ b/dev-qt/qt3d/qt3d-5.12.9999.ebuild
38	@@ -10,8 +10,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
39	KEYWORDS="~amd64 ~arm64 ~x86"
40	fi
41
42	-# TODO: gamepad, tools
43	-IUSE="gles2 qml"
44	+# TODO: tools
45	+IUSE="gamepad gles2 qml"
46
47	DEPEND="
48	~dev-qt/qtconcurrent-${PV}
49	@@ -19,6 +19,7 @@ DEPEND="
50	~dev-qt/qtgui-${PV}
51	~dev-qt/qtnetwork-${PV}
52	>=media-libs/assimp-4.0.0
53	+ gamepad? ( ~dev-qt/qtgamepad-${PV} )
54	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] )
55	"
56	RDEPEND="${DEPEND}"
57	@@ -26,6 +27,7 @@ RDEPEND="${DEPEND}"
58	src_prepare() {
59	rm -r src/3rdparty/assimp/{code,contrib,include} \|\| die
60
61	+ qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri
62	qt_use_disable_mod qml quick src/src.pro
63
64	qt5-build_src_prepare
65
66	diff --git a/dev-qt/qt3d/qt3d-5.13.9999.ebuild b/dev-qt/qt3d/qt3d-5.13.9999.ebuild
67	index 0f61b942..431e2685 100644
68	--- a/dev-qt/qt3d/qt3d-5.13.9999.ebuild
69	+++ b/dev-qt/qt3d/qt3d-5.13.9999.ebuild
70	@@ -10,8 +10,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
71	KEYWORDS="~amd64 ~arm64 ~x86"
72	fi
73
74	-# TODO: gamepad, tools
75	-IUSE="gles2 qml"
76	+# TODO: tools
77	+IUSE="gamepad gles2 qml"
78
79	DEPEND="
80	~dev-qt/qtconcurrent-${PV}
81	@@ -19,6 +19,7 @@ DEPEND="
82	~dev-qt/qtgui-${PV}
83	~dev-qt/qtnetwork-${PV}
84	>=media-libs/assimp-4.0.0
85	+ gamepad? ( ~dev-qt/qtgamepad-${PV} )
86	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] )
87	"
88	RDEPEND="${DEPEND}"
89	@@ -26,6 +27,7 @@ RDEPEND="${DEPEND}"
90	src_prepare() {
91	rm -r src/3rdparty/assimp/{code,contrib,include} \|\| die
92
93	+ qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri
94	qt_use_disable_mod qml quick src/src.pro
95
96	qt5-build_src_prepare
97
98	diff --git a/dev-qt/qt3d/qt3d-5.14.9999.ebuild b/dev-qt/qt3d/qt3d-5.14.9999.ebuild
99	index 0f61b942..431e2685 100644
100	--- a/dev-qt/qt3d/qt3d-5.14.9999.ebuild
101	+++ b/dev-qt/qt3d/qt3d-5.14.9999.ebuild
102	@@ -10,8 +10,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
103	KEYWORDS="~amd64 ~arm64 ~x86"
104	fi
105
106	-# TODO: gamepad, tools
107	-IUSE="gles2 qml"
108	+# TODO: tools
109	+IUSE="gamepad gles2 qml"
110
111	DEPEND="
112	~dev-qt/qtconcurrent-${PV}
113	@@ -19,6 +19,7 @@ DEPEND="
114	~dev-qt/qtgui-${PV}
115	~dev-qt/qtnetwork-${PV}
116	>=media-libs/assimp-4.0.0
117	+ gamepad? ( ~dev-qt/qtgamepad-${PV} )
118	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] )
119	"
120	RDEPEND="${DEPEND}"
121	@@ -26,6 +27,7 @@ RDEPEND="${DEPEND}"
122	src_prepare() {
123	rm -r src/3rdparty/assimp/{code,contrib,include} \|\| die
124
125	+ qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri
126	qt_use_disable_mod qml quick src/src.pro
127
128	qt5-build_src_prepare
129
130	diff --git a/dev-qt/qt3d/qt3d-5.9999.ebuild b/dev-qt/qt3d/qt3d-5.9999.ebuild
131	index 0f61b942..431e2685 100644
132	--- a/dev-qt/qt3d/qt3d-5.9999.ebuild
133	+++ b/dev-qt/qt3d/qt3d-5.9999.ebuild
134	@@ -10,8 +10,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
135	KEYWORDS="~amd64 ~arm64 ~x86"
136	fi
137
138	-# TODO: gamepad, tools
139	-IUSE="gles2 qml"
140	+# TODO: tools
141	+IUSE="gamepad gles2 qml"
142
143	DEPEND="
144	~dev-qt/qtconcurrent-${PV}
145	@@ -19,6 +19,7 @@ DEPEND="
146	~dev-qt/qtgui-${PV}
147	~dev-qt/qtnetwork-${PV}
148	>=media-libs/assimp-4.0.0
149	+ gamepad? ( ~dev-qt/qtgamepad-${PV} )
150	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] )
151	"
152	RDEPEND="${DEPEND}"
153	@@ -26,6 +27,7 @@ RDEPEND="${DEPEND}"
154	src_prepare() {
155	rm -r src/3rdparty/assimp/{code,contrib,include} \|\| die
156
157	+ qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri
158	qt_use_disable_mod qml quick src/src.pro
159
160	qt5-build_src_prepare

Gentoo Archives: gentoo-commits