From 721e451ec418e1712f6962404e111f0ebd487389 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 27 Dec 2024 06:30:35 +0000 Subject: gentoo auto-resync : 27:12:2024 - 06:30:34 --- games-engines/Manifest.gz | Bin 3706 -> 3705 bytes games-engines/odamex/Manifest | 4 +- games-engines/odamex/odamex-10.6.0-r1.ebuild | 89 ------------------------- games-engines/odamex/odamex-10.6.0-r2.ebuild | 90 ++++++++++++++++++++++++++ games-engines/odamex/odamex-10.6.0-r3.ebuild | 89 +++++++++++++++++++++++++ games-engines/odamex/odamex-10.6.0.ebuild | 90 -------------------------- games-engines/scummvm/Manifest | 2 +- games-engines/scummvm/scummvm-2.9.0-r1.ebuild | 2 +- 8 files changed, 183 insertions(+), 183 deletions(-) delete mode 100644 games-engines/odamex/odamex-10.6.0-r1.ebuild create mode 100644 games-engines/odamex/odamex-10.6.0-r2.ebuild create mode 100644 games-engines/odamex/odamex-10.6.0-r3.ebuild delete mode 100644 games-engines/odamex/odamex-10.6.0.ebuild (limited to 'games-engines') diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz index 39b1985eb322..7fb6036f5822 100644 Binary files a/games-engines/Manifest.gz and b/games-engines/Manifest.gz differ diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest index a9701c88b98b..cbbbffff29e3 100644 --- a/games-engines/odamex/Manifest +++ b/games-engines/odamex/Manifest @@ -1,6 +1,6 @@ AUX odamex-10.3.0-unbundle-fltk.patch 3556 BLAKE2B 8aa1fd752c465a89566edab409c2df03ce1bae7a3ae1fdf3749fbce90cef81d1315f1f677f3090d676ad514df957a043cfd02c497d03673c248d55b02ee89768 SHA512 3facbcb43f0bc516e85c6030d66fc03c2c0b11d25ed30bac1947cbffd1f3123e173c46e02b198215dc5b4aac7fccbf1bfe9aeaf54db6c0d159d7bd6d3abd3797 AUX odamex-10.6.0-odalaunch-sorting-crash.patch 865 BLAKE2B 90a775db8d469a6bd457c5a7c221e3bf8477e9739bbfb1af05e3f1bd482ac6019687262a9a678f33d7b42ceee4d1c99a878258cc4e7bbe4497bd60019e1445d6 SHA512 20f5f0c6bfd6f626bc269dce78827920f105bde882f490b6f716eac6a5a823d7f1d4b4b5bfaf0c68a17063937177dfe8ab94634c867247e8b1b0ab4a134052d8 DIST odamex-src-10.6.0.tar.xz 17560572 BLAKE2B eeb9742b587a7e45fa5d33ae7a96b767a4d6517732ffc82a58c68557edfd43305413667fdcc24f7256613c05421da85a81db2c5d36d7ad09b91e4b2d76fa1693 SHA512 c1269a9047199af16c64aee5d0520070cfa36c7a2488628bb19744024f13e083a6841b65f8dc18b930d3b0ef39cdebddfcf028ea44af98b4418319c364e806c0 -EBUILD odamex-10.6.0-r1.ebuild 2251 BLAKE2B 33457eb1d5e60474fd0cad16f84f9656b35915e58b01c0f53cae4ecff1acc9f450ed918df7cfe7196d208568ad136f97dfed0b7e52a3753573e9abe521f47448 SHA512 c25054a9a2971e13c9bf8532ec9bb2b1785b3d0c0f143e4f16dbdda837d053a23abd51998c4b289ca5de1d05e550ba931d0dc274a7dae6571ff9f0421b8ca9c7 -EBUILD odamex-10.6.0.ebuild 2303 BLAKE2B 64c65fa0fd3dea072adfdd119513b39e60619e6a6743d97bfb900530016646f8469a2020d7372c8d72ea51abf7424b47eecda5fe451f424a2172e3196afa7b24 SHA512 b7a670c1bbe4bc8ab6b22e5958567e12f328935070ef3bd27035e4e718c39a7365def360928b3424325278bfbc62516d3312564a87e17e5a824a7d1e4546546b +EBUILD odamex-10.6.0-r2.ebuild 2304 BLAKE2B 88336f12b2d8d682b6d07310fe5a72df7ca76cd2b5f576640734100e2c2a814effc8c580dcd4c7f8a843a7178bce747df6f0ffbd86ed16831410e3b69433516f SHA512 2791848df5b922b4a3a794d95fd3a61b48a9c1b8fe5f80ba1b8cf75bffe2284d939ee94ac6dfbee1328ef5c3df46aa0eb90c09b2f2bc49b39a5487297fb6290a +EBUILD odamex-10.6.0-r3.ebuild 2252 BLAKE2B 7aa765933ce5c53524bb64c09c757d7bb57088c1f1a40cb334665ba4599a5b26e301e225b25ead6313203138124c6e070e0b3e4cad314628505041883ab26380 SHA512 b4a9b3add899132fe28bf43a2457072939ddd1cd3ac09bc337f2db90e1b91be77100ecb1ae9782e3e7703e3c82bbb5b496c2a96066e8427bd355358f618b315b MISC metadata.xml 1438 BLAKE2B 2cd891e631cb9ee0182c30d9aa8a9e69089f32fb12b44f8e4a62372e40db8f89a9701411dcb3bb86937d50e035452359cb95d2bbd5b4a74d2057cb77872196ad SHA512 72f2858c111b40de8ba9da3b5d52f673ce0847fd4036e1582dc9ce56432b3e08a61ef650fc253072789a6d00167c8312158d8be374dbbfbdd5473ab75cb447af diff --git a/games-engines/odamex/odamex-10.6.0-r1.ebuild b/games-engines/odamex/odamex-10.6.0-r1.ebuild deleted file mode 100644 index 504ec274d098..000000000000 --- a/games-engines/odamex/odamex-10.6.0-r1.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -WX_GTK_VER="3.2-gtk3" -inherit cmake desktop prefix wxwidgets xdg - -DESCRIPTION="Online multiplayer free software engine for DOOM" -HOMEPAGE="https://odamex.net/" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${PN}-src-${PV}.tar.xz" -S="${WORKDIR}/${PN}-src-${PV}" -LICENSE="GPL-2+ MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="+client hidpi master +odalaunch portmidi server upnp" -REQUIRED_USE="|| ( client master server )" - -# protobuf is still bundled. Unfortunately an old version is required for C++98 -# compatibility. We could use C++11, but upstream is concerned about using a -# completely different protobuf version on a multiplayer-focused engine. - -RDEPEND=" - client? ( - media-libs/libpng:0= - media-libs/libsdl2[joystick,sound,video] - media-libs/sdl2-mixer - net-misc/curl - x11-libs/libX11 - !hidpi? ( x11-libs/fltk:1 ) - portmidi? ( media-libs/portmidi ) - ) - odalaunch? ( x11-libs/wxGTK:${WX_GTK_VER} ) - server? ( - dev-libs/jsoncpp:= - upnp? ( net-libs/miniupnpc:= ) - )" -DEPEND="${RDEPEND}" -BDEPEND="games-util/deutex" - -PATCHES=( - "${FILESDIR}"/${PN}-10.3.0-unbundle-fltk.patch - "${FILESDIR}"/${P}-odalaunch-sorting-crash.patch -) - -src_prepare() { - rm -r libraries/miniupnp || die - hprefixify common/d_main.cpp - - cmake_src_prepare -} - -src_configure() { - use odalaunch && setup-wxwidgets - - local mycmakeargs=( - -DUSE_INTERNAL_FLTK=$(usex hidpi) - -DUSE_INTERNAL_JSONCPP=0 - -DUSE_INTERNAL_LIBS=0 - -DUSE_INTERNAL_MINIUPNP=0 - -DBUILD_CLIENT=$(usex client) - -DBUILD_LAUNCHER=$(usex odalaunch) - -DBUILD_MASTER=$(usex master) - -DBUILD_SERVER=$(usex server) - -DBUILD_OR_FAIL=1 - -DENABLE_PORTMIDI=$(usex portmidi) - -DUSE_MINIUPNP=$(usex upnp) - ) - - cmake_src_configure -} - -src_install() { - if use client ; then - for size in 96 128 256 512; do - newicon -s ${size} "${S}/media/icon_${PN}_${size}.png" "${PN}.png" - done - make_desktop_entry "${PN}" "Odamex" - - if use odalaunch ; then - for size in 96 128 256 512; do - newicon -s ${size} "${S}/media/icon_odalaunch_${size}.png" "odalaunch.png" - done - make_desktop_entry odalaunch "Odamex Launcher" odalaunch - fi - fi - - cmake_src_install -} diff --git a/games-engines/odamex/odamex-10.6.0-r2.ebuild b/games-engines/odamex/odamex-10.6.0-r2.ebuild new file mode 100644 index 000000000000..c5b40b14bfe1 --- /dev/null +++ b/games-engines/odamex/odamex-10.6.0-r2.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# odalaunch crashes with 3.2. Check it before updating! +# https://github.com/odamex/odamex/issues/879 +WX_GTK_VER="3.0-gtk3" +inherit cmake desktop prefix wxwidgets xdg + +DESCRIPTION="Online multiplayer free software engine for DOOM" +HOMEPAGE="https://odamex.net/" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${PN}-src-${PV}.tar.xz" +S="${WORKDIR}/${PN}-src-${PV}" +LICENSE="GPL-2+ MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="+client hidpi master +odalaunch portmidi server upnp" +REQUIRED_USE="|| ( client master server )" + +# protobuf is still bundled. Unfortunately an old version is required for C++98 +# compatibility. We could use C++11, but upstream is concerned about using a +# completely different protobuf version on a multiplayer-focused engine. + +RDEPEND=" + client? ( + media-libs/libpng:0= + media-libs/libsdl2[joystick,sound,video] + media-libs/sdl2-mixer + net-misc/curl + x11-libs/libX11 + !hidpi? ( x11-libs/fltk:1= ) + portmidi? ( media-libs/portmidi ) + ) + odalaunch? ( x11-libs/wxGTK:${WX_GTK_VER} ) + server? ( + dev-libs/jsoncpp:= + upnp? ( net-libs/miniupnpc:= ) + )" +DEPEND="${RDEPEND}" +BDEPEND="games-util/deutex" + +PATCHES=( + "${FILESDIR}"/${PN}-10.3.0-unbundle-fltk.patch +) + +src_prepare() { + rm -r libraries/miniupnp || die + hprefixify common/d_main.cpp + + use odalaunch && setup-wxwidgets + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DUSE_INTERNAL_FLTK=$(usex hidpi) + -DUSE_INTERNAL_JSONCPP=0 + -DUSE_INTERNAL_LIBS=0 + -DUSE_INTERNAL_MINIUPNP=0 + -DBUILD_CLIENT=$(usex client) + -DBUILD_LAUNCHER=$(usex odalaunch) + -DBUILD_MASTER=$(usex master) + -DBUILD_SERVER=$(usex server) + -DBUILD_OR_FAIL=1 + -DENABLE_PORTMIDI=$(usex portmidi) + -DUSE_MINIUPNP=$(usex upnp) + ) + + cmake_src_configure +} + +src_install() { + if use client ; then + for size in 96 128 256 512; do + newicon -s ${size} "${S}/media/icon_${PN}_${size}.png" "${PN}.png" + done + make_desktop_entry "${PN}" "Odamex" + + if use odalaunch ; then + for size in 96 128 256 512; do + newicon -s ${size} "${S}/media/icon_odalaunch_${size}.png" "odalaunch.png" + done + make_desktop_entry odalaunch "Odamex Launcher" odalaunch + fi + fi + + cmake_src_install +} diff --git a/games-engines/odamex/odamex-10.6.0-r3.ebuild b/games-engines/odamex/odamex-10.6.0-r3.ebuild new file mode 100644 index 000000000000..2cb5b49ef1cd --- /dev/null +++ b/games-engines/odamex/odamex-10.6.0-r3.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WX_GTK_VER="3.2-gtk3" +inherit cmake desktop prefix wxwidgets xdg + +DESCRIPTION="Online multiplayer free software engine for DOOM" +HOMEPAGE="https://odamex.net/" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${PN}-src-${PV}.tar.xz" +S="${WORKDIR}/${PN}-src-${PV}" +LICENSE="GPL-2+ MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="+client hidpi master +odalaunch portmidi server upnp" +REQUIRED_USE="|| ( client master server )" + +# protobuf is still bundled. Unfortunately an old version is required for C++98 +# compatibility. We could use C++11, but upstream is concerned about using a +# completely different protobuf version on a multiplayer-focused engine. + +RDEPEND=" + client? ( + media-libs/libpng:0= + media-libs/libsdl2[joystick,sound,video] + media-libs/sdl2-mixer + net-misc/curl + x11-libs/libX11 + !hidpi? ( x11-libs/fltk:1= ) + portmidi? ( media-libs/portmidi ) + ) + odalaunch? ( x11-libs/wxGTK:${WX_GTK_VER} ) + server? ( + dev-libs/jsoncpp:= + upnp? ( net-libs/miniupnpc:= ) + )" +DEPEND="${RDEPEND}" +BDEPEND="games-util/deutex" + +PATCHES=( + "${FILESDIR}"/${PN}-10.3.0-unbundle-fltk.patch + "${FILESDIR}"/${P}-odalaunch-sorting-crash.patch +) + +src_prepare() { + rm -r libraries/miniupnp || die + hprefixify common/d_main.cpp + + cmake_src_prepare +} + +src_configure() { + use odalaunch && setup-wxwidgets + + local mycmakeargs=( + -DUSE_INTERNAL_FLTK=$(usex hidpi) + -DUSE_INTERNAL_JSONCPP=0 + -DUSE_INTERNAL_LIBS=0 + -DUSE_INTERNAL_MINIUPNP=0 + -DBUILD_CLIENT=$(usex client) + -DBUILD_LAUNCHER=$(usex odalaunch) + -DBUILD_MASTER=$(usex master) + -DBUILD_SERVER=$(usex server) + -DBUILD_OR_FAIL=1 + -DENABLE_PORTMIDI=$(usex portmidi) + -DUSE_MINIUPNP=$(usex upnp) + ) + + cmake_src_configure +} + +src_install() { + if use client ; then + for size in 96 128 256 512; do + newicon -s ${size} "${S}/media/icon_${PN}_${size}.png" "${PN}.png" + done + make_desktop_entry "${PN}" "Odamex" + + if use odalaunch ; then + for size in 96 128 256 512; do + newicon -s ${size} "${S}/media/icon_odalaunch_${size}.png" "odalaunch.png" + done + make_desktop_entry odalaunch "Odamex Launcher" odalaunch + fi + fi + + cmake_src_install +} diff --git a/games-engines/odamex/odamex-10.6.0.ebuild b/games-engines/odamex/odamex-10.6.0.ebuild deleted file mode 100644 index 4a70b03acc25..000000000000 --- a/games-engines/odamex/odamex-10.6.0.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# odalaunch crashes with 3.2. Check it before updating! -# https://github.com/odamex/odamex/issues/879 -WX_GTK_VER="3.0-gtk3" -inherit cmake desktop prefix wxwidgets xdg - -DESCRIPTION="Online multiplayer free software engine for DOOM" -HOMEPAGE="https://odamex.net/" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${PN}-src-${PV}.tar.xz" -S="${WORKDIR}/${PN}-src-${PV}" -LICENSE="GPL-2+ MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="+client hidpi master +odalaunch portmidi server upnp" -REQUIRED_USE="|| ( client master server )" - -# protobuf is still bundled. Unfortunately an old version is required for C++98 -# compatibility. We could use C++11, but upstream is concerned about using a -# completely different protobuf version on a multiplayer-focused engine. - -RDEPEND=" - client? ( - media-libs/libpng:0= - media-libs/libsdl2[joystick,sound,video] - media-libs/sdl2-mixer - net-misc/curl - x11-libs/libX11 - !hidpi? ( x11-libs/fltk:1 ) - portmidi? ( media-libs/portmidi ) - ) - odalaunch? ( x11-libs/wxGTK:${WX_GTK_VER} ) - server? ( - dev-libs/jsoncpp:= - upnp? ( net-libs/miniupnpc:= ) - )" -DEPEND="${RDEPEND}" -BDEPEND="games-util/deutex" - -PATCHES=( - "${FILESDIR}"/${PN}-10.3.0-unbundle-fltk.patch -) - -src_prepare() { - rm -r libraries/miniupnp || die - hprefixify common/d_main.cpp - - use odalaunch && setup-wxwidgets - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DUSE_INTERNAL_FLTK=$(usex hidpi) - -DUSE_INTERNAL_JSONCPP=0 - -DUSE_INTERNAL_LIBS=0 - -DUSE_INTERNAL_MINIUPNP=0 - -DBUILD_CLIENT=$(usex client) - -DBUILD_LAUNCHER=$(usex odalaunch) - -DBUILD_MASTER=$(usex master) - -DBUILD_SERVER=$(usex server) - -DBUILD_OR_FAIL=1 - -DENABLE_PORTMIDI=$(usex portmidi) - -DUSE_MINIUPNP=$(usex upnp) - ) - - cmake_src_configure -} - -src_install() { - if use client ; then - for size in 96 128 256 512; do - newicon -s ${size} "${S}/media/icon_${PN}_${size}.png" "${PN}.png" - done - make_desktop_entry "${PN}" "Odamex" - - if use odalaunch ; then - for size in 96 128 256 512; do - newicon -s ${size} "${S}/media/icon_odalaunch_${size}.png" "odalaunch.png" - done - make_desktop_entry odalaunch "Odamex Launcher" odalaunch - fi - fi - - cmake_src_install -} diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest index 925b6b107863..a7837756df0e 100644 --- a/games-engines/scummvm/Manifest +++ b/games-engines/scummvm/Manifest @@ -4,7 +4,7 @@ DIST scummvm-2.8.1.tar.xz 207711376 BLAKE2B 716503fbbd736e522918203400ccf777bc24 DIST scummvm-2.9.0.tar.xz 219893788 BLAKE2B bb9af6016e4849220b873f35f091d31b9648c3e87b3838f6b4605dc727d2a37687e1d8993218715f3579b400eb11a29c52671136e16fac86415fcbbb87f0c016 SHA512 51236557f93052f2c6f840a135fa775ec4396cfbe618ee74259f29be7e0f0aa6b62d40920e3f03b92991794434ae44ef6f4a26a4615c5e27b362c1545e33b536 EBUILD scummvm-2.8.0-r1.ebuild 3216 BLAKE2B b8c5e62c9e658a3be02d7aa5ebdf7608b5e894a7ae38e830d180c27c99bdf4a6ccda106b4485f5da2a2253d872e7cad38c29a2952d33357642ddba38ada01acb SHA512 2d1ac02a7a7dff08bba47ef29f1ea86895ae28631217fc0a0fe5542f4b85afb351974ff86d414833518fe9832840c81ab4b3b6bc86de31827fdf359b551d7d22 EBUILD scummvm-2.8.1-r1.ebuild 3271 BLAKE2B 45015b16784c174d874ee6a325f39a473285cf0ffbe7ea61e700b0e5aec4a2b9258ff298563b88fa881af83e81f81b64ad630875fa36f42aee2b1b534ecfdaee SHA512 8e22b221a5b0efc48ae3d50f41c1d4cf30c6743e67760aef8a3fd9078251cc3106a86abb1b47749993d5db326ccbe5d3f941d664bad69e4e8f9e001bbad2e1f5 -EBUILD scummvm-2.9.0-r1.ebuild 3662 BLAKE2B 63cf795964829e963f76b16f8e9e59a3b3124d22d84ea2ea09e86f31b09499ccef3171dadb91d8bb611984495e3c5a1915923c80873521e40834d7575e34964a SHA512 9935ef4b49f803c49f40edbf7f82932606ecb7d64a17a08c69b640a21d01358c4f8ebfae034ba416d9ffc8e0ea80ac8819c0ebe8b2a7947373e5959755c5066b +EBUILD scummvm-2.9.0-r1.ebuild 3669 BLAKE2B 010f3e975842c6cee15c3e55c5691aafc447f2e4e1bc593107e77ad269a1b8f83b0874561bde4e5f3ae1de6e04e8a0af138b877d4f94b9c4dcd8f722c61d5fc5 SHA512 bd2d0789529a8d494c7f7525bab35c3adcf0f34bd510d70e5eb1d46ba27c59dae79bc0a30d7a18ef96558da8201ff167e2abadcd1c84ba499147d6986c75d06a EBUILD scummvm-2.9.0.ebuild 3592 BLAKE2B c1e04af94706ce2b7b364dd689d8c3321db759b8a98c2511097d4d1a74b67d03bcd5aa614f800638861eb5325b85da6637356aa0c89618d1660bfc1c336fff9a SHA512 7eaf4424e978cebf69b1223b8bd2a70b586d87126e6d9536979e5a394da1fe4e006c377066ad9d576ce153cef36484fb6d2fbce9472fb2124136cdae3deeb491 EBUILD scummvm-9999.ebuild 3669 BLAKE2B 010f3e975842c6cee15c3e55c5691aafc447f2e4e1bc593107e77ad269a1b8f83b0874561bde4e5f3ae1de6e04e8a0af138b877d4f94b9c4dcd8f722c61d5fc5 SHA512 bd2d0789529a8d494c7f7525bab35c3adcf0f34bd510d70e5eb1d46ba27c59dae79bc0a30d7a18ef96558da8201ff167e2abadcd1c84ba499147d6986c75d06a MISC metadata.xml 1282 BLAKE2B fe6a5ed7b932c45c8c031b5747015e8348fa1823899d70d95fddb2b672c8b46ae2dd99d50f667db3b5bcf980010ae2f69d2447f4e4a1745304149e1a543df500 SHA512 3c16cf1d4360c503dbedf3f847fc91dff51fe7516abdd4a179a69ae74b3205bf42cb4d7f85fedc4245d67b1969886e21643b4edb988342b961c8650ce09c01d1 diff --git a/games-engines/scummvm/scummvm-2.9.0-r1.ebuild b/games-engines/scummvm/scummvm-2.9.0-r1.ebuild index 2f694a89ed71..db2d168193f0 100644 --- a/games-engines/scummvm/scummvm-2.9.0-r1.ebuild +++ b/games-engines/scummvm/scummvm-2.9.0-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://github.com/scummvm/scummvm" else SRC_URI="https://downloads.scummvm.org/frs/scummvm/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86" S=${WORKDIR}/${P/_/} fi -- cgit v1.2.3