Gentoo Archives: gentoo-commits

From: Jory Pratt <anarchy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: media-tv/kodi/
Date: Sat, 05 Mar 2022 22:04:49
Message-Id: 1646517881.5400892b031351138d2d45fdd594bee8f00044c5.anarchy@gentoo
1 commit: 5400892b031351138d2d45fdd594bee8f00044c5
2 Author: Jory Pratt <anarchy <AT> gentoo <DOT> org>
3 AuthorDate: Sat Mar 5 22:04:41 2022 +0000
4 Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
5 CommitDate: Sat Mar 5 22:04:41 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=5400892b
7
8 media-tv/kodi: version bump
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
12
13 media-tv/kodi/Manifest | 1 +
14 media-tv/kodi/kodi-19.4.ebuild | 370 +++++++++++++++++++++++++++++++++++++++++
15 2 files changed, 371 insertions(+)
16
17 diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
18 index 7aef093b..511ce5ee 100644
19 --- a/media-tv/kodi/Manifest
20 +++ b/media-tv/kodi/Manifest
21 @@ -1,5 +1,6 @@
22 DIST ffmpeg-kodi-4.3.2-Matrix-19.1.tar.gz 13490949 BLAKE2B 90007f2c4bac0e0a52b419d9333cf75b00e291f1ea7447cbdc579ee2f860de7c436c924253600f3fbd6e3faaabe97aaf46db083a5bbd2f5f03badcca5d643e89 SHA512 d3719253d674b16638b873545583b82fba3176803c81ba8bcb37e90456dd956f1c2ee8996493840cff2d61c6399f06ed0524a759f46e4ce174bce23e9c6eda4a
23 DIST kodi-19.3-Matrix.tar.gz 52354039 BLAKE2B 33d9f0081391fcc37d5f2548d92e0746540394db5e495dfd43fed3e68e776091b505ef4ef21a5fa4c3bef74793642d81ad270c58414ab995ab51a20af76ad530 SHA512 ccb8f26ff8a9ca0cec50e069ff9c658de89a868093a8da25d6a55317d68656de6fd7107c5348c545b4f3cdd541293cfd58f8d171877bfa7533d39e072df68c04
24 +DIST kodi-19.4-Matrix.tar.gz 53487622 BLAKE2B 75432f0fe225d10548c9cbce1ec5a1722ce75e9bc6f19ba9a8deffc50874be94ca1552c5bd75b3ea1712344ebdf6f5934bca3ee315e6acccd2141df7de3304e9 SHA512 2804c57d85877873dae8e62f083b86f51fceebb802819523654a231f50f9850022956e1a9b91702e7c8b3f7ab437ceea7b10319239a8289dbf877ce94bba07c9
25 DIST libdvdcss-1.4.2-Leia-Beta-5.tar.gz 101068 BLAKE2B 283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da SHA512 5185dbdbeb1bd13ea9d8723f1f4ab599d6f3102f5ba1096cd085aa1cda252c045f327c719227bba8e1b742352ade5e335106c8d0c1637a5a6b93ce661620dd7e
26 DIST libdvdnav-6.0.0-Leia-Alpha-3.tar.gz 137942 BLAKE2B 7573434a0ae8e8ccabf48173f81fcde29074eb138e119a2ae9156cde3c3d8bfd716f5d0e605b97f2dcac21f570781137c8533c5ae306b51e3905822fda318355 SHA512 11c93eaacd156f8fd7dec7c43d366438b201f31ad55b2870463a9e286912b6ada08882319a021fb7992190f87b909a49f2b83e0321cc17aedc29f7fe5898fa72
27 DIST libdvdread-6.0.0-Leia-Alpha-3.tar.gz 130649 BLAKE2B 0c206acdaf0776841ab792c74e023af07d9539eb72e03ae164382a31ed950f60e5e15f1d055979d28f1398924471b294d11f064b11b8373353b3962a3777ff3c SHA512 b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7
28
29 diff --git a/media-tv/kodi/kodi-19.4.ebuild b/media-tv/kodi/kodi-19.4.ebuild
30 new file mode 100644
31 index 00000000..b8f2a887
32 --- /dev/null
33 +++ b/media-tv/kodi/kodi-19.4.ebuild
34 @@ -0,0 +1,370 @@
35 +# Copyright 1999-2022 Gentoo Authors
36 +# Distributed under the terms of the GNU General Public License v2
37 +
38 +EAPI=7
39 +
40 +PYTHON_REQ_USE="sqlite,ssl"
41 +LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5"
42 +LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3"
43 +LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
44 +FFMPEG_VERSION="4.3.2"
45 +CODENAME="Matrix"
46 +FFMPEG_KODI_VERSION="19.1"
47 +PYTHON_COMPAT=( python3_{8,9,10} )
48 +SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
49 + https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
50 + https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
51 + !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
52 +if [[ ${PV} == *9999 ]] ; then
53 + EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
54 + EGIT_BRANCH="Matrix"
55 + inherit git-r3
56 +else
57 + MY_PV=${PV/_p/_r}
58 + MY_PV=${MY_PV/_alpha/a}
59 + MY_PV=${MY_PV/_beta/b}
60 + MY_PV=${MY_PV/_rc/RC}
61 + MY_PV="${MY_PV}-${CODENAME}"
62 + MY_P="${PN}-${MY_PV}"
63 + SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
64 + KEYWORDS="~amd64 ~arm ~arm64 ~x86"
65 + S=${WORKDIR}/xbmc-${MY_PV}
66 +fi
67 +
68 +inherit autotools cmake desktop linux-info pax-utils python-single-r1 xdg
69 +
70 +DESCRIPTION="A free and open source media-player and entertainment hub"
71 +HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
72 +
73 +LICENSE="GPL-2+"
74 +SLOT="0"
75 +# use flag is called libusb so that it doesn't fool people in thinking that
76 +# it is _required_ for USB support. Otherwise they'll disable udev and
77 +# that's going to be worse.
78 +IUSE="airplay alsa bluetooth bluray caps cec +css dav1d dbus eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf"
79 +IUSE="${IUSE} cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon"
80 +REQUIRED_USE="
81 + ${PYTHON_REQUIRED_USE}
82 + || ( gbm wayland X )
83 + ?? ( mariadb mysql )
84 + bluray? ( udf )
85 + udev? ( !libusb )
86 + udisks? ( dbus )
87 + upower? ( dbus )
88 + power-control? ( dbus )
89 + vdpau? (
90 + X
91 + !gles
92 + !gbm
93 + )
94 + zeroconf? ( dbus )
95 +"
96 +RESTRICT="!test? ( test )"
97 +
98 +COMMON_DEPEND="
99 + >=dev-libs/lzo-2.04
100 + >=dev-libs/flatbuffers-1.12.0:=
101 + >=media-libs/libjpeg-turbo-2.0.4:=
102 + >=media-libs/libpng-1.6.26:0=
103 +"
104 +COMMON_TARGET_DEPEND="${PYTHON_DEPS}
105 + airplay? (
106 + >=app-pda/libplist-2.0.0
107 + net-libs/shairplay
108 + )
109 + alsa? ( >=media-libs/alsa-lib-1.1.4.1 )
110 + bluetooth? ( net-wireless/bluez )
111 + bluray? ( >=media-libs/libbluray-1.1.2 )
112 + caps? ( sys-libs/libcap )
113 + dbus? ( sys-apps/dbus )
114 + dev-db/sqlite
115 + dev-libs/crossguid
116 + >=dev-libs/fribidi-1.0.5
117 + cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] )
118 + dev-libs/libpcre[cxx]
119 + >=dev-libs/spdlog-1.5.0:=
120 + dev-libs/tinyxml[stl]
121 + $(python_gen_cond_dep '
122 + dev-python/pillow[${PYTHON_USEDEP}]
123 + dev-python/pycryptodome[${PYTHON_USEDEP}]
124 + ')
125 + >=dev-libs/libcdio-2.1.0[cxx]
126 + >=dev-libs/libfmt-6.1.2
127 + dev-libs/libfstrcmp
128 + gbm? (
129 + >=dev-libs/libinput-1.10.5
130 + media-libs/mesa[gbm(+)]
131 + x11-libs/libxkbcommon
132 + )
133 + gles? (
134 + !raspberry-pi? ( media-libs/mesa[gles2] )
135 + )
136 + lcms? ( media-libs/lcms:2 )
137 + libusb? ( virtual/libusb:1 )
138 + virtual/ttf-fonts
139 + media-fonts/roboto
140 + >=media-libs/freetype-2.10.1
141 + >=media-libs/libass-0.13.4
142 + !raspberry-pi? ( media-libs/mesa[egl(+)] )
143 + >=media-libs/taglib-1.11.1
144 + system-ffmpeg? (
145 + >=media-video/ffmpeg-${FFMPEG_VERSION}:=[dav1d?,encode,postproc]
146 + =media-video/ffmpeg-4*[openssl]
147 + )
148 + !system-ffmpeg? (
149 + app-arch/bzip2
150 + dav1d? ( media-libs/dav1d )
151 + )
152 + mysql? ( dev-db/mysql-connector-c:= )
153 + mariadb? ( dev-db/mariadb-connector-c:= )
154 + >=net-misc/curl-7.68.0[http2]
155 + nfs? ( >=net-fs/libnfs-2.0.0:= )
156 + !gles? ( media-libs/glu )
157 + >=dev-libs/openssl-1.1.1k:0=
158 + raspberry-pi? (
159 + || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] )
160 + )
161 + pulseaudio? ( media-sound/pulseaudio )
162 + samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
163 + >=sys-libs/zlib-1.2.11
164 + udf? ( >=dev-libs/libudfread-1.0.0 )
165 + udev? ( virtual/udev )
166 + vaapi? (
167 + x11-libs/libva:=
168 + !gles? ( x11-libs/libva[opengl] )
169 + system-ffmpeg? ( media-video/ffmpeg[vaapi] )
170 + vdpau? ( x11-libs/libva-vdpau-driver )
171 + wayland? ( x11-libs/libva[wayland] )
172 + X? ( x11-libs/libva[X] )
173 + )
174 + virtual/libiconv
175 + vdpau? (
176 + || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
177 + system-ffmpeg? ( media-video/ffmpeg[vdpau] )
178 + )
179 + wayland? (
180 + >=dev-cpp/waylandpp-0.2.3:=
181 + media-libs/mesa[wayland]
182 + >=dev-libs/wayland-protocols-1.7
183 + >=x11-libs/libxkbcommon-0.4.1
184 + )
185 + webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] )
186 + X? (
187 + media-libs/mesa[X]
188 + !gles? ( media-libs/libglvnd[X] )
189 + x11-libs/libX11
190 + x11-libs/libXrandr
191 + x11-libs/libXrender
192 + system-ffmpeg? ( media-video/ffmpeg[X] )
193 + )
194 + x11-libs/libdrm
195 + xslt? (
196 + dev-libs/libxslt
197 + >=dev-libs/libxml2-2.9.4
198 + )
199 + zeroconf? ( net-dns/avahi[dbus] )
200 +"
201 +RDEPEND="${COMMON_DEPEND} ${COMMON_TARGET_DEPEND}
202 + lirc? ( app-misc/lirc )
203 + power-control? ( || ( sys-apps/systemd sys-auth/elogind ) )
204 + udisks? ( sys-fs/udisks:2 )
205 + upower? ( sys-power/upower )
206 +"
207 +DEPEND="${COMMON_DEPEND} ${COMMON_TARGET_DEPEND}
208 + dev-libs/rapidjson
209 + test? ( >=dev-cpp/gtest-1.10.0 )
210 +"
211 +BDEPEND="${COMMON_DEPEND}
212 + dev-lang/swig
213 + dev-util/cmake
214 + media-libs/giflib
215 + >=dev-libs/flatbuffers-1.11.0
216 + >=media-libs/libjpeg-turbo-2.0.4:=
217 + >=media-libs/libpng-1.6.26:0=
218 + virtual/pkgconfig
219 + virtual/jre
220 +"
221 +
222 +CONFIG_CHECK="~IP_MULTICAST"
223 +ERROR_IP_MULTICAST="
224 +In some cases Kodi needs to access multicast addresses.
225 +Please consider enabling IP_MULTICAST under Networking options.
226 +"
227 +
228 +PATCHES=(
229 + "${FILESDIR}/musl/19.0/0001-add-missing-stdint.h.patch"
230 + "${FILESDIR}/musl/19.0/0002-fix-fileemu.patch"
231 + "${FILESDIR}/musl/19.0/0003-Use-stdint.h-defined-types-uint8_t-uint16_t-uint32_t.patch"
232 + "${FILESDIR}/musl/19.0/0004-Fix-ldt-for-musl.patch"
233 + "${FILESDIR}/musl/19.0/0005-Fix-fortify-sources.patch"
234 +)
235 +
236 +pkg_setup() {
237 + check_extra_config
238 + python-single-r1_pkg_setup
239 +}
240 +
241 +src_unpack() {
242 + if [[ ${PV} == *9999 ]] ; then
243 + git-r3_src_unpack
244 + else
245 + default
246 + fi
247 +}
248 +
249 +src_prepare() {
250 + cmake_src_prepare
251 +
252 + # avoid long delays when powerkit isn't running #348580
253 + sed -i \
254 + -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
255 + xbmc/platform/linux/*.cpp || die
256 +
257 + # Prepare tools and libs witch are configured with autotools during compile time
258 + AUTOTOOLS_DIRS=(
259 + "${S}"/tools/depends/native/TexturePacker/src
260 + "${S}"/tools/depends/native/JsonSchemaBuilder/src
261 + )
262 +
263 + local d
264 + for d in "${AUTOTOOLS_DIRS[@]}" ; do
265 + pushd ${d} >/dev/null || die
266 + AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
267 + popd >/dev/null || die
268 + done
269 + elibtoolize
270 +
271 + # Prevent autoreconf rerun
272 + sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
273 + "${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
274 + "${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
275 + || die
276 +}
277 +
278 +src_configure() {
279 + local platform=()
280 + use gbm && platform+=( gbm )
281 + use wayland && platform+=( wayland )
282 + use X && platform+=( x11 )
283 + local core_platform_name="${platform[@]}"
284 + local mycmakeargs=(
285 + -DENABLE_SSE=$(usex cpu_flags_x86_sse)
286 + -DENABLE_SSE2=$(usex cpu_flags_x86_sse2)
287 + -DENABLE_SSE3=$(usex cpu_flags_x86_sse3)
288 + -DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1)
289 + -DENABLE_SSE4_2=$(usex cpu_flags_x86_sse4_2)
290 + -DENABLE_AVX=$(usex cpu_flags_x86_avx)
291 + -DENABLE_AVX2=$(usex cpu_flags_x86_avx2)
292 + -DENABLE_NEON=$(usex cpu_flags_arm_neon)
293 + -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
294 + -DVERBOSE=ON
295 + -DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
296 + -DENABLE_ALSA=$(usex alsa)
297 + -DENABLE_AIRTUNES=$(usex airplay)
298 + -DENABLE_AVAHI=$(usex zeroconf)
299 + -DENABLE_BLUETOOTH=$(usex bluetooth)
300 + -DENABLE_BLURAY=$(usex bluray)
301 + -DENABLE_CCACHE=OFF
302 + -DENABLE_CLANGFORMAT=OFF
303 + -DENABLE_CLANGTIDY=OFF
304 + -DENABLE_CPPCHECK=OFF
305 + -DENABLE_ISO9660PP=$(usex optical)
306 + -DENABLE_CEC=$(usex cec)
307 + -DENABLE_DBUS=$(usex dbus)
308 + -DENABLE_DVDCSS=$(usex css)
309 + -DENABLE_EVENTCLIENTS=ON # alway enable to have 'kodi-send' and filter extra staff in 'src_install()'
310 + -DENABLE_INTERNAL_CROSSGUID=OFF
311 + -DENABLE_INTERNAL_RapidJSON=OFF
312 + -DENABLE_INTERNAL_FMT=OFF
313 + -DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
314 + -DENABLE_INTERNAL_FSTRCMP=OFF
315 + -DENABLE_INTERNAL_FLATBUFFERS=OFF
316 + -DENABLE_INTERNAL_DAV1D=OFF
317 + -DENABLE_INTERNAL_GTEST=OFF
318 + -DENABLE_INTERNAL_UDFREAD=OFF
319 + -DENABLE_INTERNAL_SPDLOG=OFF
320 + -DENABLE_CAP=$(usex caps)
321 + -DENABLE_LCMS2=$(usex lcms)
322 + -DENABLE_LIRCCLIENT=$(usex lirc)
323 + -DENABLE_MARIADBCLIENT=$(usex mariadb)
324 + -DENABLE_MDNS=OFF # used only on Android
325 + -DENABLE_MICROHTTPD=$(usex webserver)
326 + -DENABLE_MYSQLCLIENT=$(usex mysql)
327 + -DENABLE_NFS=$(usex nfs)
328 + -DENABLE_OPENGLES=$(usex gles)
329 + -DENABLE_OPENGL=$(usex !gles)
330 + -DENABLE_OPTICAL=$(usex optical)
331 + -DENABLE_PLIST=$(usex airplay)
332 + -DENABLE_PULSEAUDIO=$(usex pulseaudio)
333 + -DENABLE_SMBCLIENT=$(usex samba)
334 + -DENABLE_SNDIO=OFF
335 + -DENABLE_TESTING=$(usex test)
336 + -DENABLE_UDEV=$(usex udev)
337 + -DENABLE_UDFREAD=$(usex udf)
338 + -DENABLE_UPNP=$(usex upnp)
339 + -DENABLE_VAAPI=$(usex vaapi)
340 + -DENABLE_VDPAU=$(usex vdpau)
341 + -DENABLE_XSLT=$(usex xslt)
342 + -Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz"
343 + -Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz"
344 + -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz"
345 + -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
346 + -DPYTHON_LIBRARY="$(python_get_library_path)"
347 + -DAPP_RENDER_SYSTEM="$(usex gles gles gl)"
348 + -DCORE_PLATFORM_NAME="${core_platform_name}"
349 + )
350 +
351 + use !udev && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
352 +
353 + use X && use !gles && mycmakeargs+=( -DENABLE_GLX=ON )
354 +
355 + if use system-ffmpeg; then
356 + mycmakeargs+=( -DWITH_FFMPEG="yes" )
357 + else
358 + mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
359 + fi
360 +
361 + if ! echo "${CFLAGS}" | grep -Fwqe '-DNDEBUG' - && ! echo "${CFLAGS}" | grep -Fwqe '-D_DEBUG' - ; then
362 + CFLAGS+=' -DNDEBUG' # Kodi requires one of the 'NDEBUG' or '_DEBUG' defines
363 + CXXFLAGS+=' -DNDEBUG'
364 + fi
365 +
366 + cmake_src_configure
367 +}
368 +
369 +src_compile() {
370 + cmake_src_compile all
371 +}
372 +
373 +src_test() {
374 + local myctestargs=(
375 + # Known failing, unreliable test
376 + # bug #743938
377 + -E "(TestCPUInfo.GetCPUFrequency)"
378 + )
379 +
380 + # see https://github.com/xbmc/xbmc/issues/17860#issuecomment-630120213
381 + KODI_HOME="${BUILD_DIR}" cmake_build check
382 +}
383 +
384 +src_install() {
385 + cmake_src_install
386 +
387 + pax-mark Em "${ED}"/usr/$(get_libdir)/${PN}/${PN}.bin
388 +
389 + newicon media/icon48x48.png kodi.png
390 +
391 + rm "${ED}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
392 + dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
393 + usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
394 +
395 + if use !eventclients ; then
396 + rm -f "${ED}"/usr/bin/kodi-ps3remote || die
397 + rm -f "${D}"$(python_get_sitedir)/kodi/ps3_remote.py || die
398 + rm -rf "${D}"$(python_get_sitedir)/kodi/ps3 || die
399 + rm -rf "${D}"$(python_get_sitedir)/kodi/bt || die
400 + rm -rf "${ED}"/usr/share/doc/${PF}/kodi-eventclients-dev || die
401 + fi
402 +
403 + python_optimize "${D}$(python_get_sitedir)"
404 +}