diff --git a/app-emulation/86BoxManagerX/86BoxManagerX-9999.ebuild b/app-emulation/86BoxManagerX/86BoxManagerX-9999.ebuild new file mode 100644 index 0000000000..873188466a --- /dev/null +++ b/app-emulation/86BoxManagerX/86BoxManagerX-9999.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop git-r3 +EGIT_REPO_URI="https://github.com/RetBox/86BoxManagerX.git" +DESCRIPTION="A (cross-platform) configuration manager for the 86Box emulator" +HOMEPAGE="https://github.com/RetBox/86BoxManagerX" + +DEPEND="app-emulation/86Box + dev-dotnet/dotnet-sdk-bin +" + +LICENSE="MIT" +SLOT="0" + +src_unpack() { + git-r3_checkout + cd "${S}" + dotnet publish 86BoxManager -r linux-x64 +} + +src_compile () { + dotnet publish 86BoxManager -r linux-x64 -c Release --self-contained true -o 86BoxManagerX +} + +src_install() { + #Install binary and alias command + insinto /opt && doins -r "${WORKDIR}/${P}/86BoxManagerX" + insinto /opt/bin/ && doins "${FILESDIR}/86BoxManagerX" + fperms +x /opt/86BoxManagerX/86Manager /opt/bin/86BoxManagerX /opt/86BoxManagerX/*.dll + + #Icon and Desktop File + doicon "${FILESDIR}/86BoxManagerX.png" + domenu "${FILESDIR}/86BoxManagerX.desktop" +} diff --git a/app-emulation/86BoxManagerX/files/86BoxManagerX b/app-emulation/86BoxManagerX/files/86BoxManagerX new file mode 100644 index 0000000000..b6a9495cc7 --- /dev/null +++ b/app-emulation/86BoxManagerX/files/86BoxManagerX @@ -0,0 +1,2 @@ +#!/bin/sh +/opt/86BoxManagerX/86Manager \ No newline at end of file diff --git a/app-emulation/86BoxManagerX/files/86BoxManagerX.desktop b/app-emulation/86BoxManagerX/files/86BoxManagerX.desktop new file mode 100644 index 0000000000..03fede380f --- /dev/null +++ b/app-emulation/86BoxManagerX/files/86BoxManagerX.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=86BoxManagerX +StartupNotify=true +Exec=/opt/86BoxManagerX/86Manager +Terminal=false +Icon=86BoxManagerX +Type=Application \ No newline at end of file diff --git a/app-emulation/86BoxManagerX/files/86BoxManagerX.png b/app-emulation/86BoxManagerX/files/86BoxManagerX.png new file mode 100644 index 0000000000..b1025062b8 Binary files /dev/null and b/app-emulation/86BoxManagerX/files/86BoxManagerX.png differ diff --git a/app-emulation/86BoxManagerX/metadata.xml b/app-emulation/86BoxManagerX/metadata.xml new file mode 100644 index 0000000000..ea76ec447c --- /dev/null +++ b/app-emulation/86BoxManagerX/metadata.xml @@ -0,0 +1,11 @@ + + + + + gonegrier.duarte@gmail.com + Gonçalo Negrier Duarte + + + RetBox/86BoxManagerX + + \ No newline at end of file diff --git a/app-emulation/LookingGlass/LookingGlass-1_beta6.ebuild b/app-emulation/LookingGlass/LookingGlass-1_beta6.ebuild index fba1470839..90b1c633e8 100644 --- a/app-emulation/LookingGlass/LookingGlass-1_beta6.ebuild +++ b/app-emulation/LookingGlass/LookingGlass-1_beta6.ebuild @@ -44,12 +44,12 @@ src_prepare () { # Base on build.rst from the project # doc/build.rst - MYCMAKEARGS=( - -DENABLE_BACKTRACE=$(usex binutils) \ - -DENABLE_X11=$(usex X) -DENABLE_WAYLAND=$(usex wayland) \ + MYCMAKEARGS=( + -DENABLE_BACKTRACE=$(usex binutils) \ + -DENABLE_X11=$(usex X) -DENABLE_WAYLAND=$(usex wayland) \ -DENABLE_PIPEWIRE=$(usex pipewire) \ -DENABLE_PULSEAUDIO=$(usex pulseaudio) \ - -DENABLE_LIBDECOR=$(usex gnome) + -DENABLE_LIBDECOR=$(usex gnome) ) cmake_src_prepare diff --git a/app-emulation/LookingGlass/LookingGlass-9999.ebuild b/app-emulation/LookingGlass/LookingGlass-9999.ebuild index c26f797c28..e7ce49f17f 100644 --- a/app-emulation/LookingGlass/LookingGlass-9999.ebuild +++ b/app-emulation/LookingGlass/LookingGlass-9999.ebuild @@ -43,12 +43,12 @@ src_prepare () { # Base on build.rst from the project # doc/build.rst - MYCMAKEARGS=( - -DENABLE_BACKTRACE=$(usex binutils) \ - -DENABLE_X11=$(usex X) -DENABLE_WAYLAND=$(usex wayland) \ + MYCMAKEARGS=( + -DENABLE_BACKTRACE=$(usex binutils) \ + -DENABLE_X11=$(usex X) -DENABLE_WAYLAND=$(usex wayland) \ -DENABLE_PIPEWIRE=$(usex pipewire) \ -DENABLE_PULSEAUDIO=$(usex pulseaudio) \ - -DENABLE_LIBDECOR=$(usex gnome) + -DENABLE_LIBDECOR=$(usex gnome) ) cmake_src_prepare diff --git a/app-emulation/LookingGlass/metadata.xml b/app-emulation/LookingGlass/metadata.xml index 9b22b17c81..d000f650d8 100644 --- a/app-emulation/LookingGlass/metadata.xml +++ b/app-emulation/LookingGlass/metadata.xml @@ -5,6 +5,10 @@ build backtrace support enable media-video/pipewire support + + gonegrier.duarte@gmail.com + Gonçalo Negrier Duarte + gnif/LookingGlass diff --git a/app-text/Lorien-bin/metadata.xml b/app-text/Lorien-bin/metadata.xml index bf000af3b5..8c89d94bba 100644 --- a/app-text/Lorien-bin/metadata.xml +++ b/app-text/Lorien-bin/metadata.xml @@ -1,6 +1,10 @@ + + gonegrier.duarte@gmail.com + Gonçalo Negrier Duarte + mbrlabs/Lorien diff --git a/app-text/sioyek/metadata.xml b/app-text/sioyek/metadata.xml index f85aa3197c..3e093267ca 100644 --- a/app-text/sioyek/metadata.xml +++ b/app-text/sioyek/metadata.xml @@ -1,6 +1,10 @@ + + gonegrier.duarte@gmail.com + Gonçalo Negrier Duarte + ahrm/sioyek diff --git a/dev-python/steam/Manifest b/dev-python/steam/Manifest index cdd4791df1..35bdfd271a 100644 --- a/dev-python/steam/Manifest +++ b/dev-python/steam/Manifest @@ -1 +1 @@ -DIST v1.4.4.tar.gz 878478 BLAKE2B 755b37f0cae19f0f3eb7609931f79c15421a6c37f2ef178d809251394227b777f8626c8535d13b72257eaa9255eded27150a1018a4bff1d24cf29217224e7cab SHA512 86ddbdc9b4d9bb2b1717f81b003a6884bbe44b55e632ea0d03ddc1866215210d4d3394f35773f0cba95623d7d94f6b270e3133eab80663947c07018094af5b45 +DIST steam-1.4.4.tar.gz 878478 BLAKE2B 755b37f0cae19f0f3eb7609931f79c15421a6c37f2ef178d809251394227b777f8626c8535d13b72257eaa9255eded27150a1018a4bff1d24cf29217224e7cab SHA512 86ddbdc9b4d9bb2b1717f81b003a6884bbe44b55e632ea0d03ddc1866215210d4d3394f35773f0cba95623d7d94f6b270e3133eab80663947c07018094af5b45 diff --git a/dev-python/steam/metadata.xml b/dev-python/steam/metadata.xml index 7ca0874cc9..79d8d284e4 100644 --- a/dev-python/steam/metadata.xml +++ b/dev-python/steam/metadata.xml @@ -1,6 +1,10 @@ + + gonegrier.duarte@gmail.com + Gonçalo Negrier Duarte + ValvePython/steam diff --git a/dev-python/steam/steam-1.4.4.ebuild b/dev-python/steam/steam-1.4.4.ebuild index 9e2842f67d..bfa9155433 100644 --- a/dev-python/steam/steam-1.4.4.ebuild +++ b/dev-python/steam/steam-1.4.4.ebuild @@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{9..12} ) inherit distutils-r1 -SRC_URI="https://github.com/ValvePython/steam/archive/refs/tags/v${PV}.tar.gz" +SRC_URI="https://github.com/ValvePython/steam/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" DESCRIPTION="Python package for interacting with Steam" HOMEPAGE="https://github.com/ValvePython/steam" diff --git a/dev-python/undervolt/Manifest b/dev-python/undervolt/Manifest index 4bc0c031f7..c1cad1b70e 100644 --- a/dev-python/undervolt/Manifest +++ b/dev-python/undervolt/Manifest @@ -1 +1 @@ -DIST 0.3.0.tar.gz 9161 BLAKE2B 4e23f591c2c765a996bec6f9d4c17d80a4fa8de96648549522a259c63b455833b46554e33024d19768d161c2000bc6ee01a8d183c742a6c689c05c5fecc263ed SHA512 154590a5172bb305e32d464b340ef8c96fc081464dc1090deda364ad47e4eaba010376ab7cb8d001103b64d44bc38c34aff6f9a1bd6125ce5b149ccb6c96065f +DIST undervolt-0.3.0.tar.gz 9161 BLAKE2B 4e23f591c2c765a996bec6f9d4c17d80a4fa8de96648549522a259c63b455833b46554e33024d19768d161c2000bc6ee01a8d183c742a6c689c05c5fecc263ed SHA512 154590a5172bb305e32d464b340ef8c96fc081464dc1090deda364ad47e4eaba010376ab7cb8d001103b64d44bc38c34aff6f9a1bd6125ce5b149ccb6c96065f diff --git a/dev-python/undervolt/metadata.xml b/dev-python/undervolt/metadata.xml index 8796d312c1..3fac1e4100 100644 --- a/dev-python/undervolt/metadata.xml +++ b/dev-python/undervolt/metadata.xml @@ -1,6 +1,10 @@ + + gonegrier.duarte@gmail.com + Gonçalo Negrier Duarte + georgewhewell/undervolt diff --git a/dev-python/undervolt/undervolt-0.3.0.ebuild b/dev-python/undervolt/undervolt-0.3.0.ebuild index ea4396824f..7116387848 100644 --- a/dev-python/undervolt/undervolt-0.3.0.ebuild +++ b/dev-python/undervolt/undervolt-0.3.0.ebuild @@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{9..12} ) inherit distutils-r1 -SRC_URI="https://github.com/georgewhewell/undervolt/archive/refs/tags/${PV}.tar.gz" +SRC_URI="https://github.com/georgewhewell/undervolt/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" DESCRIPTION="Undervolt Intel CPUs under Linux" HOMEPAGE="https://github.com/georgewhewell/undervolt" diff --git a/dev-util/lua-language-server/Manifest b/dev-util/lua-language-server/Manifest index 1a84e70623..c6fe53c197 100644 --- a/dev-util/lua-language-server/Manifest +++ b/dev-util/lua-language-server/Manifest @@ -1 +1 @@ -DIST lua-language-server-3.6.23.zip 31241611 BLAKE2B 59ead98e1c95170f7739e5b8812dd3d7db9de8e101e90feee70cb55996b09dfc2aac64be8c9b0349b9b78fa93958b25ca7abba0aa3b12690f3a064ddc60b2364 SHA512 1c69ffd08fa8c7e8a93d3373080e79228a38544776dc41af7b4fbea011d8d6194d75111ce9edac0ef15563316486b95f345b3a8b0cfa762c770258b21ef66f7a +DIST lua-language-server-3.6.25.zip 31287196 BLAKE2B 0035e231cfa46035c227a8803e426e6ac294245b961ffb5957d0ce716c44bdeee8c54df17e6789bef1c3cee7c11bc7b731ff4f23e58f2008c16c1f4e87f3f778 SHA512 13e12c84330df4d85c2b1dcdcd7af945bebe2fd2d35df0f591e6e73e780982ba3b4902538011f52ea732e3ceca2c5ebdea560697d2d79df3570dcf93b3456005 diff --git a/dev-util/lua-language-server/files/build.ninja.patch b/dev-util/lua-language-server/files/build.ninja.patch index 8f83ef7ebe..bb9891e2d0 100644 --- a/dev-util/lua-language-server/files/build.ninja.patch +++ b/dev-util/lua-language-server/files/build.ninja.patch @@ -1,21 +1,19 @@ --- a/build/build.ninja +++ b/build/build.ninja -@@ -12,8 +12,8 @@ - 3rd/bee.lua/compile/config.lua 3rd/bee.lua/compile/common.lua $ +@@ -14,7 +14,7 @@ make/code_format.lua rule c_source_bee -- command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall -Werror $ + command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $ - -fvisibility=hidden -I$builddir/lua54 -DNDEBUG -fPIC -o $out -c $in -+ command = $cc -MMD -MT $out -MF $out.d -std=c11 -Wall $ + -fvisibility=hidden -I$builddir/lua54 -DNDEBUG -fPIC -o $out -c $in CFLAGS description = Compile C $out deps = gcc depfile = $out.d -@@ -21,14 +21,14 @@ +@@ -22,14 +22,14 @@ 3rd/bee.lua/3rd/lua-seri/lua-seri.c rule cxx_source_bee command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ -- -Werror -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in +- -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in + -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in CXXFLAGS description = Compile C++ $out deps = gcc @@ -23,56 +21,48 @@ build $obj/source_bee/format.obj: cxx_source_bee 3rd/bee.lua/3rd/fmt/format.cc rule cxx_source_bee_1 command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ -- -Werror -fvisibility=hidden -I3rd/bee.lua -DNDEBUG -fPIC -o $out -c $in +- -fvisibility=hidden -I3rd/bee.lua -DNDEBUG -fPIC -o $out -c $in + -fvisibility=hidden -I3rd/bee.lua -DNDEBUG -fPIC -o $out -c $in CXXFLAGS description = Compile C++ $out deps = gcc depfile = $out.d -@@ -61,8 +61,8 @@ - 3rd/bee.lua/bee/utility/path_helper.cpp +@@ -65,7 +65,7 @@ rule cxx_source_bee_2 command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ -- -Werror -fvisibility=hidden -I3rd/bee.lua -I$builddir/lua54 $ -- -DBEE_STATIC -DNDEBUG -fPIC -o $out -c $in -+ -fvisibility=hidden -I3rd/bee.lua -I$builddir/lua54 $ -+ -DBEE_STATIC -DNDEBUG -fPIC -o $out -c $in CXXFLAGS + -fvisibility=hidden -I3rd/bee.lua -I$builddir/lua54 -DBEE_STATIC $ +- -DNDEBUG -fPIC -o $out -c $in ++ -DNDEBUG -fPIC -o $out -c $in CXXFLAGS description = Compile C++ $out deps = gcc depfile = $out.d -@@ -83,17 +83,17 @@ - build $obj/source_bee/lua_time.obj: cxx_source_bee_2 $ +@@ -87,7 +87,7 @@ 3rd/bee.lua/binding/lua_time.cpp rule c_source_lua -- command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall -Werror $ + command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $ - -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in -+ command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $ + -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in CFLAGS description = Compile C $out deps = gcc depfile = $out.d - build $obj/source_lua/utf8_crt.obj: c_source_lua $ +@@ -95,7 +95,7 @@ 3rd/bee.lua/3rd/lua/utf8_crt.c rule c_source_lua_1 -- command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall -Werror $ -+ command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $ - -DMAKE_LIB -DLUA_USE_LINUX -DNDEBUG -Wno-maybe-uninitialized -fPIC -o $ -- $out -c $in -+ $out -c $in CFLAGS + command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall -DMAKE_LIB $ +- -DLUA_USE_LINUX -DNDEBUG -Wno-maybe-uninitialized -fPIC -o $out -c $in ++ -DLUA_USE_LINUX -DNDEBUG -Wno-maybe-uninitialized -fPIC -o $out -c $in CFLAGS description = Compile C $out deps = gcc depfile = $out.d -@@ -101,8 +101,8 @@ - build $obj/source_lua/onelua.obj: c_source_lua_1 3rd/bee.lua/3rd/lua/onelua.c +@@ -104,7 +104,7 @@ rule cxx_source_bootstrap command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ -- -Werror -fvisibility=hidden -I3rd/bee.lua/3rd/lua -I3rd/bee.lua $ -- -DLUA_USE_LINUX -DNDEBUG -fPIC -o $out -c $in -+ -fvisibility=hidden -I3rd/bee.lua/3rd/lua -I3rd/bee.lua $ -+ -DLUA_USE_LINUX -DNDEBUG -fPIC -o $out -c $in CXXFLAGS + -fvisibility=hidden -I3rd/bee.lua/3rd/lua -I3rd/bee.lua -DLUA_USE_LINUX $ +- -DNDEBUG -fPIC -o $out -c $in ++ -DNDEBUG -fPIC -o $out -c $in CXXFLAGS description = Compile C++ $out deps = gcc depfile = $out.d -@@ -110,7 +110,7 @@ +@@ -112,7 +112,7 @@ 3rd/bee.lua/bootstrap/main.cpp rule link_bootstrap command = $cc $in -o $out -Wl,-E -static-libgcc -lm -ldl -lstdc++fs $ @@ -81,7 +71,7 @@ description = Link Exe $out build $bin/bootstrap: link_bootstrap $obj/source_bootstrap/main.obj $ $obj/source_bee/lua-seri.obj $obj/source_bee/format.obj $ -@@ -152,8 +152,8 @@ +@@ -155,8 +155,8 @@ -fvisibility=hidden -I3rd/EmmyLuaCodeStyle/Util/include $ -I3rd/EmmyLuaCodeStyle/CodeFormatCore/include $ -I3rd/EmmyLuaCodeStyle/LuaParser/include -I3rd/bee.lua/3rd/lua $ @@ -92,7 +82,7 @@ description = Compile C++ $out deps = gcc depfile = $out.d -@@ -256,7 +256,7 @@ +@@ -259,7 +259,7 @@ rule c_lpeglabel command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $ -fvisibility=hidden -I3rd/bee.lua/3rd/lua -DMAXRECLEVEL=1000 -DNDEBUG $ @@ -101,7 +91,7 @@ description = Compile C $out deps = gcc depfile = $out.d -@@ -268,7 +268,7 @@ +@@ -271,7 +271,7 @@ rule cxx_lua_language_server command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall $ -fvisibility=hidden -I3rd/bee.lua -I3rd/bee.lua/3rd/lua -DCODE_FORMAT $ @@ -110,7 +100,7 @@ description = Compile C++ $out deps = gcc depfile = $out.d -@@ -276,7 +276,7 @@ +@@ -279,7 +279,7 @@ make/modules.cpp rule link_lua_language_server command = $cc $in -o $out -lm -ldl -lstdc++fs -pthread -Wl,-Bstatic $ diff --git a/dev-util/lua-language-server/files/linux.ninja.patch b/dev-util/lua-language-server/files/linux.ninja.patch index fe2d89f610..c45d290518 100644 --- a/dev-util/lua-language-server/files/linux.ninja.patch +++ b/dev-util/lua-language-server/files/linux.ninja.patch @@ -1,90 +1,79 @@ --- a/3rd/luamake/compile/ninja/linux.ninja +++ b/3rd/luamake/compile/ninja/linux.ninja -@@ -2,26 +2,26 @@ +@@ -2,12 +2,12 @@ builddir = build/linux bin = $builddir/bin obj = $builddir/obj -cc = gcc +-ar = ar +cc = REPLACE_ME ++ar = REPLACE_AR luamake = luamake rule c_source_bee -- command = $cc -MMD -MT $out -MF $out.d -O2 -Wall -Werror $ + command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $ - -fvisibility=hidden -Itools/lua54 -DNDEBUG -fPIC -o $out -c $in -+ command = $cc -MMD -MT $out -MF $out.d -Wall $ + -fvisibility=hidden -Itools/lua54 -DNDEBUG -fPIC -o $out -c $in CFLAGS description = Compile C $out deps = gcc depfile = $out.d - build $obj/source_bee/lua-seri.obj: c_source_bee $ +@@ -15,14 +15,14 @@ bee.lua/3rd/lua-seri/lua-seri.c rule cxx_source_bee -- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ -- -Werror -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in -+ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -Wall $ + command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ +- -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in + -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in CXXFLAGS description = Compile C++ $out deps = gcc depfile = $out.d build $obj/source_bee/format.obj: cxx_source_bee bee.lua/3rd/fmt/format.cc rule cxx_source_bee_1 -- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ -- -Werror -fvisibility=hidden -Ibee.lua -DNDEBUG -fPIC -o $out -c $in -+ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -Wall $ + command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ +- -fvisibility=hidden -Ibee.lua -DNDEBUG -fPIC -o $out -c $in + -fvisibility=hidden -Ibee.lua -DNDEBUG -fPIC -o $out -c $in CXXFLAGS description = Compile C++ $out deps = gcc depfile = $out.d -@@ -46,9 +46,9 @@ - build $obj/source_bee/path_helper.obj: cxx_source_bee_1 $ - bee.lua/bee/utility/path_helper.cpp +@@ -57,7 +57,7 @@ rule cxx_source_bee_2 -- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ -- -Werror -fvisibility=hidden -Ibee.lua -Itools/lua54 -DBEE_STATIC $ -- -DNDEBUG -fPIC -o $out -c $in -+ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -Wall $ -+ -fvisibility=hidden -Ibee.lua -Itools/lua54 -DBEE_STATIC $ -+ -DNDEBUG -fPIC -o $out -c $in CXXFLAGS + command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ + -fvisibility=hidden -Ibee.lua -Itools/lua54 -DBEE_STATIC -DNDEBUG -fPIC $ +- -o $out -c $in ++ -o $out -c $in CXXFLAGS description = Compile C++ $out deps = gcc depfile = $out.d -@@ -69,24 +69,24 @@ - build $obj/source_bee/lua_time.obj: cxx_source_bee_2 $ - bee.lua/binding/lua_time.cpp +@@ -80,14 +80,14 @@ rule c_source_lua -- command = $cc -MMD -MT $out -MF $out.d -O2 -Wall -Werror $ -- -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in -+ command = $cc -MMD -MT $out -MF $out.d -Wall $ -+ -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in CFLAGS - description = Compile C $out + command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $ + -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in +- description = Compile C $out ++ description = Compile C $out CFLAGS deps = gcc depfile = $out.d build $obj/source_lua/utf8_crt.obj: c_source_lua bee.lua/3rd/lua/utf8_crt.c rule c_source_lua_1 -- command = $cc -MMD -MT $out -MF $out.d -O2 -Wall -Werror -DMAKE_LIB $ -- -DLUA_USE_LINUX -DNDEBUG -Wno-maybe-uninitialized -fPIC -o $out -c $in -+ command = $cc -MMD -MT $out -MF $out.d -Wall -DMAKE_LIB $ -+ -DLUA_USE_LINUX -DNDEBUG -Wno-maybe-uninitialized -fPIC -o $out -c $in CFLAGS - description = Compile C $out + command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall -DMAKE_LIB $ + -DLUA_USE_LINUX -DNDEBUG -Wno-maybe-uninitialized -fPIC -o $out -c $in +- description = Compile C $out ++ description = Compile C $out CFLAGS deps = gcc depfile = $out.d build $obj/source_lua/linit.obj: c_source_lua_1 bee.lua/3rd/lua/linit.c - build $obj/source_lua/onelua.obj: c_source_lua_1 bee.lua/3rd/lua/onelua.c +@@ -95,7 +95,7 @@ rule cxx_source_bootstrap -- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ -- -Werror -fvisibility=hidden -Ibee.lua/3rd/lua -Ibee.lua -DLUA_USE_LINUX $ + command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ + -fvisibility=hidden -Ibee.lua/3rd/lua -Ibee.lua -DLUA_USE_LINUX $ - -DNDEBUG -fPIC -o $out -c $in -+ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -Wall $ -+ -fvisibility=hidden -Ibee.lua/3rd/lua -Ibee.lua -DLUA_USE_LINUX $ + -DNDEBUG -fPIC -o $out -c $in CXXFLAGS description = Compile C++ $out deps = gcc depfile = $out.d -@@ -96,7 +96,7 @@ - bee.lua/bootstrap/progdir.cpp +@@ -103,7 +103,7 @@ + bee.lua/bootstrap/main.cpp rule link_bootstrap command = $cc $in -o $out -Wl,-E -static-libgcc -lm -ldl -lstdc++fs $ - -pthread -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s + -pthread -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic LDFLAGS description = Link Exe $out build $bin/bootstrap: link_bootstrap $obj/source_bootstrap/main.obj $ - $obj/source_bootstrap/progdir.obj $obj/source_bee/lua-seri.obj $ + $obj/source_bee/lua-seri.obj $obj/source_bee/format.obj $ diff --git a/dev-util/lua-language-server/lua-language-server-3.6.23.ebuild b/dev-util/lua-language-server/lua-language-server-3.6.25.ebuild similarity index 94% rename from dev-util/lua-language-server/lua-language-server-3.6.23.ebuild rename to dev-util/lua-language-server/lua-language-server-3.6.25.ebuild index 7defc27b06..c9b9fbf32e 100644 --- a/dev-util/lua-language-server/lua-language-server-3.6.23.ebuild +++ b/dev-util/lua-language-server/lua-language-server-3.6.25.ebuild @@ -37,6 +37,7 @@ src_prepare() { eapply "${FILESDIR}/linux.ninja.patch" eapply_user sed -i -e "s/^cc = REPLACE_ME/cc = $(tc-getCC)/" \ + -e "s/^ar = REPLACE_AR/ar = $(tc-getAR)/" \ -e "s/CFLAGS/${CFLAGS}/" \ -e "s/CXXFLAGS/${CXXFLAGS}/" \ -e "s/LDFLAGS/${LDFLAGS}/" \ @@ -52,16 +53,16 @@ src_compile() { # Generated file doesn't respect CFLAGS/CXXFLAGS/LDFLAGS sed -i -e "s/^cc =.*./cc = REPLACE_ME/" \ - -e "s/^luamake =.*./luamake = LUAMAKE_PATH/" \ + -e "s/^ar =.*./ar = REPLACE_AR/" \ build/build.ninja || die eapply "${FILESDIR}/build.ninja.patch" sed -i -e "s/REPLACE_ME/$(tc-getCC)/" \ + -e "s/REPLACE_AR/$(tc-getAR)/" \ -e "s|LUAMAKE_PATH|${S}/3rd/luamake/luamake|" \ -e "s/CFLAGS/${CFLAGS}/" \ -e "s/CXXFLAGS/${CXXFLAGS}/" \ -e "s/LDFLAGS/${LDFLAGS}/" \ - -e "7d" \ build/build.ninja || die use test && eninja -f build/build.ninja || eninja -f build/build.ninja all diff --git a/games-emulation/citra/citra-9999.ebuild b/games-emulation/citra/citra-9999.ebuild index 3c78946d39..a197c09e94 100644 --- a/games-emulation/citra/citra-9999.ebuild +++ b/games-emulation/citra/citra-9999.ebuild @@ -41,7 +41,9 @@ DEPEND="${RDEPEND}" BDEPEND=" dev-cpp/cpp-httplib dev-cpp/cpp-jwt - dev-cpp/robin-map" + dev-cpp/robin-map + dev-util/spirv-headers +" REQUIRED_USE="|| ( gui sdl )" src_unpack() { diff --git a/games-util/HeroicGamesLauncher-bin/HeroicGamesLauncher-bin-2.9.0.ebuild b/games-util/HeroicGamesLauncher-bin/HeroicGamesLauncher-bin-2.9.0.ebuild new file mode 100644 index 0000000000..57a1ac448a --- /dev/null +++ b/games-util/HeroicGamesLauncher-bin/HeroicGamesLauncher-bin-2.9.0.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop +SRC_URI="https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/releases/download/v${PV}/heroic-${PV}.tar.xz" +DESCRIPTION="A Native GOG and Epic Games Launcher for Linux, Windows and Mac." +HOMEPAGE="https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher" + +LICENSE="GPL-3" +SLOT="0" + +RDEPEND="gamescope? ( gui-wm/gamescope )" + +KEYWORDS="~amd64" + +S="${WORKDIR}/heroic-${PV}" + +IUSE="gamescope" + +src_install() { + mv "${S}" "${WORKDIR}/heroic" + insinto /opt + doins -r "${WORKDIR}/heroic" + insinto /opt/bin + doins "${FILESDIR}/heroic" + fperms +x /opt/heroic/heroic /opt/bin/heroic + + #fix login error both EPIC and GOG + fperms +x /opt/heroic/resources/app.asar.unpacked/build/bin/linux/legendary \ + /opt/heroic/resources/app.asar.unpacked/build/bin/linux/gogdl + + domenu "${FILESDIR}/HeroicGamesLauncher.desktop" + newicon "${WORKDIR}/heroic/resources/app.asar.unpacked/build/icon.png" heroic.png + if use gamescope; then + #Start Heroic as gamescope window + domenu "${FILESDIR}/HeroicGamesLauncher-gamescope.desktop" + fi +} diff --git a/games-util/HeroicGamesLauncher-bin/Manifest b/games-util/HeroicGamesLauncher-bin/Manifest index c217b00ded..800876e922 100644 --- a/games-util/HeroicGamesLauncher-bin/Manifest +++ b/games-util/HeroicGamesLauncher-bin/Manifest @@ -1 +1,2 @@ DIST heroic-2.8.0.tar.xz 98002940 BLAKE2B 43059c4be66e86a3a3bb8b1b93fb41259dfc8a773ccaacb4e91a5eb955e602dab21100840eded9a710950d2b9d8f1df7c2c62a48f37738ed7f1ab5a40cc46198 SHA512 e0bd8e4b36149766d4f5485ba19752058a689d234f90caa89ca707e46295bf52b52e454768da6e298608894fdca0cd44128a56b0974ff93aac49f9fbce58dd05 +DIST heroic-2.9.0.tar.xz 101442852 BLAKE2B ffdf1410c5f0647095aab7a8b3a8a3f02b0cb5a0b94a8c3dfdced00200fa4ef48d7a35eca12e3878f19b8a7ef7b8d784b2ac202a267e4950132fcd3ce6b612a1 SHA512 6cd030683eca84e39bc6d21ea19c6e3e48a61eeb95425822e5338f0c916ee0579d606c5e263d42f4e5528246a0dce4d62aa935448c8d3e426e1ae729109776b1 diff --git a/games-util/HeroicGamesLauncher-bin/metadata.xml b/games-util/HeroicGamesLauncher-bin/metadata.xml index 9710ed5ed4..4027598026 100644 --- a/games-util/HeroicGamesLauncher-bin/metadata.xml +++ b/games-util/HeroicGamesLauncher-bin/metadata.xml @@ -4,6 +4,10 @@ Efficient micro-compositor for running games + + gonegrier.duarte@gmail.com + Gonçalo Negrier Duarte + Heroic-Games-Launcher/HeroicGamesLauncher diff --git a/games-util/ProtonUp-Qt/Manifest b/games-util/ProtonUp-Qt/Manifest index 2d81551439..aab49744fd 100644 --- a/games-util/ProtonUp-Qt/Manifest +++ b/games-util/ProtonUp-Qt/Manifest @@ -1 +1 @@ -DIST v2.8.1.tar.gz 753488 BLAKE2B 878bdf08d1098dbd3b2a5ae52bea347f23930fa20d356faf4bc0c74a79acc25fd22ea408bf81b1fe7f57a5266b6cdf56ae8729324dcdb27b291dae676d4c7c76 SHA512 2e1426b61c5c6f1bfc9814795ac4f0c0170235e43252403bb4b2ab4422d6b493c8c6c920ddace4dcbaee6379f747fc9953c8b7222e770541f694ad0f5be6e508 +DIST ProtonUp-Qt-2.8.1.tar.gz 753488 BLAKE2B 878bdf08d1098dbd3b2a5ae52bea347f23930fa20d356faf4bc0c74a79acc25fd22ea408bf81b1fe7f57a5266b6cdf56ae8729324dcdb27b291dae676d4c7c76 SHA512 2e1426b61c5c6f1bfc9814795ac4f0c0170235e43252403bb4b2ab4422d6b493c8c6c920ddace4dcbaee6379f747fc9953c8b7222e770541f694ad0f5be6e508 diff --git a/games-util/ProtonUp-Qt/ProtonUp-Qt-2.8.1.ebuild b/games-util/ProtonUp-Qt/ProtonUp-Qt-2.8.1.ebuild index 4624ce201b..1ae7726746 100644 --- a/games-util/ProtonUp-Qt/ProtonUp-Qt-2.8.1.ebuild +++ b/games-util/ProtonUp-Qt/ProtonUp-Qt-2.8.1.ebuild @@ -11,7 +11,7 @@ EPYTHON=python3 inherit distutils-r1 desktop xdg-utils -SRC_URI="https://github.com/DavidoTek/ProtonUp-Qt/archive/refs/tags/v${PV}.tar.gz" +SRC_URI="https://github.com/DavidoTek/ProtonUp-Qt/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" DESCRIPTION="Install and manage GE-Proton, Luxtorpeda & more for Steam Lutris and Heroic." HOMEPAGE="https://davidotek.github.io/protonup-qt" diff --git a/games-util/ProtonUp-Qt/metadata.xml b/games-util/ProtonUp-Qt/metadata.xml index b981f65b53..9aa3eff5b1 100644 --- a/games-util/ProtonUp-Qt/metadata.xml +++ b/games-util/ProtonUp-Qt/metadata.xml @@ -1,6 +1,10 @@ + + gonegrier.duarte@gmail.com + Gonçalo Negrier Duarte + DavidoTek/ProtonUp-Qt diff --git a/games-util/protonup/Manifest b/games-util/protonup/Manifest index 55cc015024..41661d80c9 100644 --- a/games-util/protonup/Manifest +++ b/games-util/protonup/Manifest @@ -1 +1 @@ -DIST 0.1.5.tar.gz 17868 BLAKE2B 6ca242e86916e478282bf6a66f4a98911db5e993485b09c631640083ae71f2669fe5b64972b34ab7f97be460877c9493ba99398c1aad9c0e12b02a82f5599d92 SHA512 81b0337ba355ddb5c48adefc736fb6599f04beff59aeabf950844233aea01673d442617f477c7392fde30d818c629b8e807fea820b1119fa22df512523edbd20 +DIST protonup-0.1.5.tar.gz 17868 BLAKE2B 6ca242e86916e478282bf6a66f4a98911db5e993485b09c631640083ae71f2669fe5b64972b34ab7f97be460877c9493ba99398c1aad9c0e12b02a82f5599d92 SHA512 81b0337ba355ddb5c48adefc736fb6599f04beff59aeabf950844233aea01673d442617f477c7392fde30d818c629b8e807fea820b1119fa22df512523edbd20 diff --git a/games-util/protonup/metadata.xml b/games-util/protonup/metadata.xml index 535dc7c174..a10db36300 100644 --- a/games-util/protonup/metadata.xml +++ b/games-util/protonup/metadata.xml @@ -1,6 +1,10 @@ + + gonegrier.duarte@gmail.com + Gonçalo Negrier Duarte + AUNaseef/protonup diff --git a/games-util/protonup/protonup-0.1.5.ebuild b/games-util/protonup/protonup-0.1.5.ebuild index a9bb75f5b0..37f6612d29 100644 --- a/games-util/protonup/protonup-0.1.5.ebuild +++ b/games-util/protonup/protonup-0.1.5.ebuild @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{9..12} ) EPYTHON=python3 inherit distutils-r1 -SRC_URI="https://github.com/AUNaseef/protonup/archive/refs/tags/${PV}.tar.gz" +SRC_URI="https://github.com/AUNaseef/protonup/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" DESCRIPTION="Install and Update Proton-GE" HOMEPAGE="https://github.com/AUNaseef/protonup" diff --git a/gui-apps/ReGreet/ReGreet-9999.ebuild b/gui-apps/ReGreet/ReGreet-9999.ebuild index 29243da3af..ea74dc30ad 100644 --- a/gui-apps/ReGreet/ReGreet-9999.ebuild +++ b/gui-apps/ReGreet/ReGreet-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cargo git-r3 +inherit cargo git-r3 EGIT_REPO_URI="https://github.com/rharish101/ReGreet.git" @@ -30,7 +30,7 @@ IUSE="gtk4 logs cage sway" REQUIRED_USE="|| ( cage sway ) cage? ( !sway ) sway? ( !cage )" src_unpack() { - git-r3_src_unpack + git-r3_src_unpack cargo_live_src_unpack } @@ -48,21 +48,21 @@ src_compile() { } src_install() { - newbin ${WORKDIR}/${P}/target/release/regreet regreet + newbin "${WORKDIR}/${P}/target/release/regreet" regreet if use cage; then - insinto /etc/greetd/ && newins ${FILESDIR}/config-cage.toml config.toml + insinto /etc/greetd/ && newins "${FILESDIR}/config-cage.toml" config.toml echo "Restart cage service to verify if works (Only activate on TTY1)" fi if use sway; then - insinto /etc/greetd/ && newins ${FILESDIR}/config-sway.toml config.toml - insinto /etc/greetd/ && doins ${FILESDIR}/sway-config + insinto /etc/greetd/ && newins "${FILESDIR}/config-sway.toml" config.toml + insinto /etc/greetd/ && doins "${FILESDIR}/sway-config" echo "Restart cage service to verify if works (Only activate on TTY1)" fi } src_post_install () { if use logs; then - insinto /etc/tmpfiles.d/ && newins ${WORKDIR}/${P}/systemd-tmpfiles.conf regreet.conf + insinto /etc/tmpfiles.d/ && newins "${WORKDIR}/${P}/systemd-tmpfiles.conf" regreet.conf systemd-tmpfiles --create "$PWD/systemd-tmpfiles.conf" fi } diff --git a/gui-apps/ReGreet/metadata.xml b/gui-apps/ReGreet/metadata.xml index fcf77a1fa9..c9bf2cad19 100644 --- a/gui-apps/ReGreet/metadata.xml +++ b/gui-apps/ReGreet/metadata.xml @@ -7,6 +7,10 @@ Use sway to start ReGreet Compile logs support ReGreet (debug) + + gonegrier.duarte@gmail.com + Gonçalo Negrier Duarte + rharish101/ReGreet diff --git a/gui-apps/eww/metadata.xml b/gui-apps/eww/metadata.xml index 93c4db7f37..6159c93a8f 100644 --- a/gui-apps/eww/metadata.xml +++ b/gui-apps/eww/metadata.xml @@ -9,6 +9,10 @@ pascal.jaeger@leimstift.de Pascal Jäger + + gonegrier.duarte@gmail.com + Gonçalo Negrier Duarte + https://elkowar.github.io/eww https://github.com/elkowar/eww/issues diff --git a/gui-apps/gtklock-extras/gtklock-extras-9999.ebuild b/gui-apps/gtklock-extras/gtklock-extras-9999.ebuild index ca9b6c8ea6..4968627f30 100644 --- a/gui-apps/gtklock-extras/gtklock-extras-9999.ebuild +++ b/gui-apps/gtklock-extras/gtklock-extras-9999.ebuild @@ -16,7 +16,7 @@ RDEPEND="gui-apps/gtklock" BDEPEND="x11-libs/gtk+ virtual/pkgconfig playerctl? ( dev-go/act ) - playerctl? ( net-libs/libsoup ) + playerctl? ( net-libs/libsoup:2.4 ) playerctl? ( media-sound/playerctl ) userinfo? ( sys-apps/accountsservice ) " @@ -33,11 +33,11 @@ src_compile() { popd || die fi - #if use playerctl; then - # pushd gtklock-playerctl-module || die - # emake - # popd || die - #fi + if use playerctl; then + pushd gtklock-playerctl-module || die + emake + popd || die + fi if use userinfo; then pushd gtklock-userinfo-module || die @@ -54,11 +54,11 @@ src_install() { popd || die fi - #if use playerctl; then - # pushd gtklock-playerctl-module || die - # insinto /usr/local/lib/gtklock && doins playerctl-module.so - # popd || die - #fi + if use playerctl; then + pushd gtklock-playerctl-module || die + insinto /usr/local/lib/gtklock && doins playerctl-module.so + popd || die + fi if use userinfo; then pushd gtklock-userinfo-module || die @@ -66,11 +66,3 @@ src_install() { popd || die fi } - -pkg_postinst() { - if use playerctl; then - ewarn "The MAKEFILE for playerctl gtklock module is broken i will try to fixit later" - ewarn "For now the useflag will be disable on guru overlay to prevent the package failing to build" - ewarn "If you have a idea on how to fix open a issue here:https://github.com/MrDuartePT/mrduarte-ebuilds" - fi -} diff --git a/gui-apps/gtklock-extras/metadata.xml b/gui-apps/gtklock-extras/metadata.xml index 156af3f9f9..a028a6b59b 100644 --- a/gui-apps/gtklock-extras/metadata.xml +++ b/gui-apps/gtklock-extras/metadata.xml @@ -6,6 +6,10 @@ gtklock module adding media player controls to the lockscreen gtklock module adding user info to the lockscreen + + gonegrier.duarte@gmail.com + Gonçalo Negrier Duarte + MrDuartePT/gtklock-modules-gentoo diff --git a/gui-libs/libdecor/metadata.xml b/gui-libs/libdecor/metadata.xml index fce1053054..67df2efa9f 100644 --- a/gui-libs/libdecor/metadata.xml +++ b/gui-libs/libdecor/metadata.xml @@ -5,6 +5,10 @@ Enable dbus to query current cursor theme Build and install examples + + gonegrier.duarte@gmail.com + Gonçalo Negrier Duarte + libdecor/libdecor diff --git a/media-video/kikoplay/Manifest b/media-video/kikoplay/Manifest index e2f33fa1ee..7e7a788670 100644 --- a/media-video/kikoplay/Manifest +++ b/media-video/kikoplay/Manifest @@ -1 +1,2 @@ -DIST kikoplay-0.8.2.tar.gz 10138252 BLAKE2B dbbf902fc60a8907b2b3840536510efed00cfab789432eba8cc7855c8fb8ebec345153848d1ad206deefb891659711c1184baee560636769cc314f11a1613dbd SHA512 6c823d16983df7ea8c4fb01df99bc750f58d791235c56e7e694bafa4db9a83bf8499b08ca1690a5c843c5a0c935992311ea502b9ed95026d5aca5e76b995a6ce +DIST kikoplay-0.9.3.tar.gz 11287161 BLAKE2B bcf2ece1613bb8707f311be72337f2f80155ea30cd64a2926bc475558523fe690795a6d682450484c6ab70e033b68c934783d7c9ceac740508a48d492d33dcf5 SHA512 65cc3b025ccdcc611aeae3f37ba268fddc7d3720d5b809bf64d25d807e7c0fb838f0008374f3b600c1ba37365c6b3210d90c22a511b7f0bb488becde44591569 +DIST kikoplayscript-38f98d24133132f99b61dbeca26178aad45917e2.tar.gz 137732 BLAKE2B 70d677440ab351c1f3a4a36341b38dfdf0f875dba508ffbb5c0e1469b1907a38e91d669d01c33fb9ecf1d4b88935f9fcdbd98335cbb3f65f4fb805719aceec23 SHA512 c6ee8faed21e51f262f13493cca970427a0ed13857f07d5f1d704b9d92ea20cafe949216c9da39d3049599ec9c56cc5275a77745f695beb012765b9dece2b335 diff --git a/media-video/kikoplay/files/kikoplay-0.9.3-cmake-fix.patch b/media-video/kikoplay/files/kikoplay-0.9.3-cmake-fix.patch new file mode 100644 index 0000000000..3fb00e7c88 --- /dev/null +++ b/media-video/kikoplay/files/kikoplay-0.9.3-cmake-fix.patch @@ -0,0 +1,344 @@ +From e22ef4e28a8f38c19845381cc3fb3589739c9621 Mon Sep 17 00:00:00 2001 +From: Huang Rui +Date: Wed, 26 Jul 2023 15:41:55 +0800 +Subject: [PATCH 2/5] CMakeLists.txt: Simplify the script and fix build issues + under linux + +- Simplifies scripts, eliminates synchronization issues +- Facilitates maintenance +- Get the list of source code files from the pro file + +Signed-off-by: Huang Rui +--- + CMakeLists.txt | 199 +++++++++---------------------------------------- + 1 file changed, 34 insertions(+), 165 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d16e14a..18f6572 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -21,176 +21,46 @@ find_package(Qt5 COMPONENTS Widgets Core Gui Network Concurrent Sql Svg REQUIRED + find_package(ZLIB REQUIRED) + add_subdirectory(Script/lua) + ++function(include_sub_directories_recursively ROOT_DIR) ++ if (IS_DIRECTORY ${ROOT_DIR}) ++ include_directories(${ROOT_DIR}) ++ endif() ++ ++ file(GLOB SUB_LIST RELATIVE ${ROOT_DIR} ${ROOT_DIR}/*) ++ foreach(SUB ${SUB_LIST}) ++ if (IS_DIRECTORY ${ROOT_DIR}/${SUB}) ++ include_sub_directories_recursively(${ROOT_DIR}/${SUB}) ++ endif() ++ endforeach() ++endfunction() ++ ++set (CMAKE_PROJECT_SEARCH_PATH ++ ${CMAKE_SOURCE_DIR}/Common ++ ${CMAKE_SOURCE_DIR}/Download ++ ${CMAKE_SOURCE_DIR}/LANServer ++ ${CMAKE_SOURCE_DIR}/MediaLibrary ++ ${CMAKE_SOURCE_DIR}/Play ++ ${CMAKE_SOURCE_DIR}/Script ++ ${CMAKE_SOURCE_DIR}/UI ++) ++ ++foreach(SEARCH_PATH ${CMAKE_PROJECT_SEARCH_PATH}) ++ include_sub_directories_recursively(${SEARCH_PATH}) ++endforeach() ++ ++file(READ "KikoPlay.pro" KIKOPLAY_PRO_CONTENTS) ++ ++string(REGEX MATCHALL "[A-Za-z0-9_\\/]+\\.cpp" CMAKE_PROJECT_SOURCE_FILES "${KIKOPLAY_PRO_CONTENTS}") ++message("add sources: " "${CMAKE_PROJECT_SOURCE_FILES}") ++ + add_executable(${PROJECT_NAME} +- Common/counter.cpp +- Common/logger.cpp +- Common/notifier.cpp +- Download/autodownloadmanager.cpp +- Download/peermodel.cpp +- Download/trackersubscriber.cpp +- LANServer/apihandler.cpp +- LANServer/dlna/dlnamediacontroller.cpp +- LANServer/dlna/dlnamediaitem.cpp +- LANServer/dlna/dlnamediaserver.cpp +- LANServer/dlna/upnp.cpp +- LANServer/dlna/upnpctrlpoint.cpp +- LANServer/dlna/upnpdevice.cpp +- LANServer/dlna/upnpservice.cpp +- LANServer/filehandler.cpp +- LANServer/httpserver/httpconnectionhandler.cpp +- LANServer/httpserver/httpconnectionhandlerpool.cpp +- LANServer/httpserver/httpcookie.cpp +- LANServer/httpserver/httpglobal.cpp +- LANServer/httpserver/httplistener.cpp +- LANServer/httpserver/httprequest.cpp +- LANServer/httpserver/httprequesthandler.cpp +- LANServer/httpserver/httpresponse.cpp +- LANServer/httpserver/httpsession.cpp +- LANServer/httpserver/httpsessionstore.cpp +- LANServer/httpserver/staticfilecontroller.cpp +- LANServer/router.cpp +- MediaLibrary/animeinfo.cpp +- MediaLibrary/animelistmodel.cpp +- MediaLibrary/animeprovider.cpp +- MediaLibrary/episodeitem.cpp +- MediaLibrary/tagnode.cpp +- Play/Danmu/Render/livedanmuitemdelegate.cpp +- Play/Danmu/Render/livedanmulistmodel.cpp +- Play/Danmu/danmuprovider.cpp +- Play/Danmu/eventanalyzer.cpp +- Play/Video/mpvpreview.cpp +- Play/Video/simpleplayer.cpp +- Script/bgmcalendarscript.cpp +- Script/danmuscript.cpp +- Script/libraryscript.cpp +- Script/luatablemodel.cpp +- Script/modules/lua_htmlparser.cpp +- Script/modules/lua_net.cpp +- Script/modules/lua_regex.cpp +- Script/modules/lua_util.cpp +- Script/modules/lua_xmlreader.cpp +- Script/modules/modulebase.cpp +- Script/playgroundscript.cpp +- Script/resourcescript.cpp +- Script/scriptbase.cpp +- Script/scriptmanager.cpp +- Script/scriptmodel.cpp +- Script/scriptsettingmodel.cpp +- UI/addpool.cpp +- UI/addrule.cpp +- UI/animebatchaction.cpp +- UI/animedetailinfopage.cpp +- UI/animeinfoeditor.cpp +- UI/animesearch.cpp +- UI/autodownloadwindow.cpp +- UI/charactereditor.cpp +- UI/danmulaunch.cpp +- UI/danmuview.cpp +- UI/dlnadiscover.cpp +- UI/gifcapture.cpp +- UI/inputdialog.cpp +- UI/logwindow.cpp +- UI/luatableviewer.cpp +- UI/scriptplayground.cpp +- UI/settings.cpp +- UI/settings/downloadpage.cpp +- UI/settings/lanserverpage.cpp +- UI/settings/mpvpage.cpp +- UI/settings/mpvshortcutpage.cpp +- UI/settings/scriptpage.cpp +- UI/settings/stylepage.cpp +- UI/settings/settingpage.cpp +- UI/snippetcapture.cpp +- UI/stylemanager.cpp +- UI/widgets/backgroundfadewidget.cpp +- UI/widgets/backgroundwidget.cpp +- UI/widgets/clickslider.cpp +- UI/widgets/colorpicker.cpp +- UI/widgets/colorslider.cpp +- UI/widgets/danmustatiswidget.cpp +- UI/widgets/dialogtip.cpp +- UI/widgets/elidelineedit.cpp +- UI/widgets/fonticonbutton.cpp +- UI/widgets/loadingicon.cpp +- UI/widgets/optionslider.cpp +- UI/widgets/scriptsearchoptionpanel.cpp +- UI/widgets/smoothscrollbar.cpp +- main.cpp +- UI/mainwindow.cpp +- UI/framelesswindow.cpp +- Play/Danmu/Layouts/bottomlayout.cpp +- Play/Danmu/Layouts/rolllayout.cpp +- Play/Danmu/Layouts/toplayout.cpp +- Play/Danmu/danmupool.cpp +- globalobjects.cpp +- Play/Playlist/playlist.cpp +- Play/Video/mpvplayer.cpp +- UI/list.cpp +- UI/player.cpp +- UI/pooleditor.cpp +- UI/framelessdialog.cpp +- Play/Danmu/Provider/localprovider.cpp +- UI/adddanmu.cpp +- UI/matcheditor.cpp +- UI/selectepisode.cpp +- Play/Danmu/blocker.cpp +- UI/blockeditor.cpp +- UI/capture.cpp +- UI/mediainfo.cpp +- Play/Danmu/common.cpp +- UI/about.cpp +- Common/network.cpp +- Common/htmlparsersax.cpp +- MediaLibrary/animeitemdelegate.cpp +- UI/librarywindow.cpp +- MediaLibrary/episodesmodel.cpp +- Download/util.cpp +- Download/aria2jsonrpc.cpp +- UI/widgets/dirselectwidget.cpp +- Download/downloaditemdelegate.cpp +- Download/downloadmodel.cpp +- Download/torrent.cpp +- UI/downloadwindow.cpp +- UI/adduritask.cpp +- UI/selecttorrentfile.cpp +- UI/poolmanager.cpp +- UI/checkupdate.cpp +- Common/flowlayout.cpp +- UI/timelineedit.cpp +- LANServer/lanserver.cpp +- Play/Playlist/playlistitem.cpp +- Play/Playlist/playlistprivate.cpp +- Play/Danmu/Render/cacheworker.cpp +- Play/Danmu/Render/danmurender.cpp +- Play/Danmu/Manager/danmumanager.cpp +- Play/Danmu/Manager/nodeinfo.cpp +- Play/Danmu/Manager/managermodel.cpp +- MediaLibrary/animeworker.cpp +- MediaLibrary/animemodel.cpp +- MediaLibrary/labelmodel.cpp +- MediaLibrary/animefilterproxymodel.cpp +- MediaLibrary/labelitemdelegate.cpp +- Download/BgmList/bgmlist.cpp +- UI/bgmlistwindow.cpp +- UI/ressearchwindow.cpp +- Play/Danmu/Manager/pool.cpp +- MediaLibrary/capturelistmodel.cpp +- UI/captureview.cpp +- UI/tip.cpp ++ ${CMAKE_PROJECT_SOURCE_FILES} + res.qrc + kikoplay.rc + ) + + target_include_directories(${PROJECT_NAME} +-PRIVATE +- Common +- Download +- LANServer +- MediaLibrary +- Play +- Script +- UI +- UI/settings/ ++PRIVATE + . + ) + +@@ -240,4 +110,3 @@ if (UNIX) + ${mpv_LIBRARIES} + ) + endif() +- + +From 6c7efdded98af99c0de8612298eb9972581c83ee Mon Sep 17 00:00:00 2001 +From: Huang Rui +Date: Wed, 26 Jul 2023 16:42:33 +0800 +Subject: [PATCH 3/5] CMakeLists.txt: set default install dir under linux + +Signed-off-by: Huang Rui +--- + CMakeLists.txt | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 18f6572..10486aa 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.16.0) + + # If QT is installed in your system, it can be FALSE + option(USE_VCPKG_QT "Use vcpkg to add QT dependency" ON) ++# Set default overridable parameters for "/usr/share" ++set(CMAKE_INSTALL_SHAREDIR "/usr/share" CACHE STRING "The default share path") + + if (USE_VCPKG_QT) + list(APPEND VCPKG_MANIFEST_FEATURES "qt-dependencies") +@@ -109,4 +111,9 @@ if (UNIX) + PRIVATE + ${mpv_LIBRARIES} + ) ++ ++ install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") ++ install(FILES kikoplay.png kikoplay.xpm DESTINATION "${CMAKE_INSTALL_SHAREDIR}/pixmaps") ++ install(FILES kikoplay.desktop DESTINATION "${CMAKE_INSTALL_SHAREDIR}/applications") ++ install(DIRECTORY web DESTINATION "${CMAKE_INSTALL_SHAREDIR}/kikoplay") + endif() + +From 8daede285ba9d0651193e529d7a8805680ee10b5 Mon Sep 17 00:00:00 2001 +From: Huang Rui +Date: Wed, 26 Jul 2023 17:37:14 +0800 +Subject: [PATCH 4/5] CMakeLists.txt: set CONFIG_UNIX_DATA = ON when linux + build + +Signed-off-by: Huang Rui +--- + CMakeLists.txt | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 10486aa..e4ee0ee 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,8 +2,6 @@ cmake_minimum_required(VERSION 3.16.0) + + # If QT is installed in your system, it can be FALSE + option(USE_VCPKG_QT "Use vcpkg to add QT dependency" ON) +-# Set default overridable parameters for "/usr/share" +-set(CMAKE_INSTALL_SHAREDIR "/usr/share" CACHE STRING "The default share path") + + if (USE_VCPKG_QT) + list(APPEND VCPKG_MANIFEST_FEATURES "qt-dependencies") +@@ -100,6 +98,11 @@ if (WIN32) + endif() + + if (UNIX) ++ # Set default overridable parameters for "/usr/share" ++ set(CMAKE_INSTALL_SHAREDIR "/usr/share" CACHE STRING "The default share path") ++ # Set default unix data option ++ option(CONFIG_UNIX_DATA "Use unix data path" ON) ++ + include(FindPkgConfig) + pkg_check_modules(mpv QUIET mpv) + +@@ -112,6 +115,11 @@ if (UNIX) + ${mpv_LIBRARIES} + ) + ++ if (CONFIG_UNIX_DATA) ++ message("CONFIG_UNIX_DATA = ON") ++ target_compile_definitions(${PROJECT_NAME} PRIVATE CONFIG_UNIX_DATA=1) ++ endif() ++ + install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") + install(FILES kikoplay.png kikoplay.xpm DESTINATION "${CMAKE_INSTALL_SHAREDIR}/pixmaps") + install(FILES kikoplay.desktop DESTINATION "${CMAKE_INSTALL_SHAREDIR}/applications") + +From 0cf76e451e7a2a4914e2af94c8d32e5984151a13 Mon Sep 17 00:00:00 2001 +From: Huang Rui +Date: Wed, 26 Jul 2023 19:53:57 +0800 +Subject: [PATCH 5/5] kikoplay.desktop: force QT_QPA_PLATFORM=xcb under linux + +- Fix the problem of window splitting in wayland environment + +Signed-off-by: Huang Rui +--- + kikoplay.desktop | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kikoplay.desktop b/kikoplay.desktop +index 6171559..cff68d8 100644 +--- a/kikoplay.desktop ++++ b/kikoplay.desktop +@@ -3,7 +3,7 @@ Type=Application + Name=KikoPlay + Comment=KikoPlay is a full-featured danmu player! + TryExec=KikoPlay +-Exec=KikoPlay ++Exec=env QT_QPA_PLATFORM=xcb KikoPlay + Icon=/usr/share/pixmaps/kikoplay.png + Terminal=false + StartupNotify=true diff --git a/media-video/kikoplay/files/kikoplay-0.9.3-qmake-fix.patch b/media-video/kikoplay/files/kikoplay-0.9.3-qmake-fix.patch new file mode 100644 index 0000000000..1f8a150007 --- /dev/null +++ b/media-video/kikoplay/files/kikoplay-0.9.3-qmake-fix.patch @@ -0,0 +1,423 @@ +From c46aca80e4b9e0f63e7e285ad7d38e82c8d9b2ab Mon Sep 17 00:00:00 2001 +From: Huang Rui +Date: Wed, 26 Jul 2023 15:40:12 +0800 +Subject: [PATCH 1/3] KikoPlay.pro: sort files to easily find missing items + +- Facilitate the maintenance of subsequent additions and deletions + +Signed-off-by: Huang Rui +--- + KikoPlay.pro | 267 ++++++++++++++++++++++++++------------------------- + 1 file changed, 134 insertions(+), 133 deletions(-) + +diff --git a/KikoPlay.pro b/KikoPlay.pro +index 82a3ca2..c6973d3 100644 +--- a/KikoPlay.pro ++++ b/KikoPlay.pro +@@ -39,11 +39,21 @@ CONFIG(debug, debug|release) { + + SOURCES += \ + Common/counter.cpp \ ++ Common/flowlayout.cpp \ ++ Common/htmlparsersax.cpp \ + Common/logger.cpp \ ++ Common/network.cpp \ + Common/notifier.cpp \ ++ Download/aria2jsonrpc.cpp \ + Download/autodownloadmanager.cpp \ ++ Download/BgmList/bgmlist.cpp \ ++ Download/downloaditemdelegate.cpp \ ++ Download/downloadmodel.cpp \ + Download/peermodel.cpp \ ++ Download/torrent.cpp \ + Download/trackersubscriber.cpp \ ++ Download/util.cpp \ ++ globalobjects.cpp \ + LANServer/apihandler.cpp \ + LANServer/dlna/dlnamediacontroller.cpp \ + LANServer/dlna/dlnamediaitem.cpp \ +@@ -64,16 +74,43 @@ SOURCES += \ + LANServer/httpserver/httpsession.cpp \ + LANServer/httpserver/httpsessionstore.cpp \ + LANServer/httpserver/staticfilecontroller.cpp \ ++ LANServer/lanserver.cpp \ + LANServer/router.cpp \ ++ main.cpp \ ++ MediaLibrary/animefilterproxymodel.cpp \ + MediaLibrary/animeinfo.cpp \ ++ MediaLibrary/animeitemdelegate.cpp \ + MediaLibrary/animelistmodel.cpp \ ++ MediaLibrary/animemodel.cpp \ + MediaLibrary/animeprovider.cpp \ ++ MediaLibrary/animeworker.cpp \ ++ MediaLibrary/capturelistmodel.cpp \ + MediaLibrary/episodeitem.cpp \ ++ MediaLibrary/episodesmodel.cpp \ ++ MediaLibrary/labelitemdelegate.cpp \ ++ MediaLibrary/labelmodel.cpp \ + MediaLibrary/tagnode.cpp \ +- Play/Danmu/Render/livedanmuitemdelegate.cpp \ +- Play/Danmu/Render/livedanmulistmodel.cpp \ ++ Play/Danmu/blocker.cpp \ ++ Play/Danmu/common.cpp \ ++ Play/Danmu/danmupool.cpp \ + Play/Danmu/danmuprovider.cpp \ + Play/Danmu/eventanalyzer.cpp \ ++ Play/Danmu/Layouts/bottomlayout.cpp \ ++ Play/Danmu/Layouts/rolllayout.cpp \ ++ Play/Danmu/Layouts/toplayout.cpp \ ++ Play/Danmu/Manager/danmumanager.cpp \ ++ Play/Danmu/Manager/managermodel.cpp \ ++ Play/Danmu/Manager/nodeinfo.cpp \ ++ Play/Danmu/Manager/pool.cpp \ ++ Play/Danmu/Provider/localprovider.cpp \ ++ Play/Danmu/Render/cacheworker.cpp \ ++ Play/Danmu/Render/danmurender.cpp \ ++ Play/Danmu/Render/livedanmuitemdelegate.cpp \ ++ Play/Danmu/Render/livedanmulistmodel.cpp \ ++ Play/Playlist/playlist.cpp \ ++ Play/Playlist/playlistitem.cpp \ ++ Play/Playlist/playlistprivate.cpp \ ++ Play/Video/mpvplayer.cpp \ + Play/Video/mpvpreview.cpp \ + Play/Video/simpleplayer.cpp \ + Script/bgmcalendarscript.cpp \ +@@ -92,31 +129,56 @@ SOURCES += \ + Script/scriptmanager.cpp \ + Script/scriptmodel.cpp \ + Script/scriptsettingmodel.cpp \ ++ UI/about.cpp \ ++ UI/adddanmu.cpp \ + UI/addpool.cpp \ + UI/addrule.cpp \ ++ UI/adduritask.cpp \ + UI/animebatchaction.cpp \ + UI/animedetailinfopage.cpp \ + UI/animeinfoeditor.cpp \ + UI/animesearch.cpp \ + UI/autodownloadwindow.cpp \ ++ UI/bgmlistwindow.cpp \ ++ UI/blockeditor.cpp \ ++ UI/capture.cpp \ ++ UI/captureview.cpp \ + UI/charactereditor.cpp \ ++ UI/checkupdate.cpp \ + UI/danmulaunch.cpp \ + UI/danmuview.cpp \ + UI/dlnadiscover.cpp \ ++ UI/downloadwindow.cpp \ ++ UI/framelessdialog.cpp \ ++ UI/framelesswindow.cpp \ + UI/gifcapture.cpp \ + UI/inputdialog.cpp \ ++ UI/librarywindow.cpp \ ++ UI/list.cpp \ + UI/logwindow.cpp \ + UI/luatableviewer.cpp \ ++ UI/mainwindow.cpp \ ++ UI/matcheditor.cpp \ ++ UI/mediainfo.cpp \ ++ UI/player.cpp \ ++ UI/pooleditor.cpp \ ++ UI/poolmanager.cpp \ ++ UI/ressearchwindow.cpp \ + UI/scriptplayground.cpp \ ++ UI/selectepisode.cpp \ ++ UI/selecttorrentfile.cpp \ + UI/settings.cpp \ + UI/settings/downloadpage.cpp \ + UI/settings/lanserverpage.cpp \ + UI/settings/mpvpage.cpp \ + UI/settings/mpvshortcutpage.cpp \ + UI/settings/scriptpage.cpp \ ++ UI/settings/settingpage.cpp \ + UI/settings/stylepage.cpp \ + UI/snippetcapture.cpp \ + UI/stylemanager.cpp \ ++ UI/timelineedit.cpp \ ++ UI/tip.cpp \ + UI/widgets/backgroundfadewidget.cpp \ + UI/widgets/backgroundwidget.cpp \ + UI/widgets/clickslider.cpp \ +@@ -124,84 +186,36 @@ SOURCES += \ + UI/widgets/colorslider.cpp \ + UI/widgets/danmustatiswidget.cpp \ + UI/widgets/dialogtip.cpp \ ++ UI/widgets/dirselectwidget.cpp \ + UI/widgets/elidelineedit.cpp \ + UI/widgets/fonticonbutton.cpp \ + UI/widgets/loadingicon.cpp \ + UI/widgets/optionslider.cpp \ + UI/widgets/scriptsearchoptionpanel.cpp \ +- UI/widgets/smoothscrollbar.cpp \ +- main.cpp \ +- UI/mainwindow.cpp \ +- UI/framelesswindow.cpp \ +- Play/Danmu/Layouts/bottomlayout.cpp \ +- Play/Danmu/Layouts/rolllayout.cpp \ +- Play/Danmu/Layouts/toplayout.cpp \ +- Play/Danmu/danmupool.cpp \ +- globalobjects.cpp \ +- Play/Playlist/playlist.cpp \ +- Play/Video/mpvplayer.cpp \ +- UI/list.cpp \ +- UI/player.cpp \ +- UI/pooleditor.cpp \ +- UI/framelessdialog.cpp \ +- Play/Danmu/Provider/localprovider.cpp \ +- UI/adddanmu.cpp \ +- UI/matcheditor.cpp \ +- UI/selectepisode.cpp \ +- Play/Danmu/blocker.cpp \ +- UI/blockeditor.cpp \ +- UI/capture.cpp \ +- UI/mediainfo.cpp \ +- Play/Danmu/common.cpp \ +- UI/about.cpp \ +- Common/network.cpp \ +- Common/htmlparsersax.cpp \ +- MediaLibrary/animeitemdelegate.cpp \ +- UI/librarywindow.cpp \ +- MediaLibrary/episodesmodel.cpp \ +- Download/util.cpp \ +- Download/aria2jsonrpc.cpp \ +- UI/widgets/dirselectwidget.cpp \ +- Download/downloaditemdelegate.cpp \ +- Download/downloadmodel.cpp \ +- Download/torrent.cpp \ +- UI/downloadwindow.cpp \ +- UI/adduritask.cpp \ +- UI/selecttorrentfile.cpp \ +- UI/poolmanager.cpp \ +- UI/checkupdate.cpp \ +- Common/flowlayout.cpp \ +- UI/timelineedit.cpp \ +- LANServer/lanserver.cpp \ +- Play/Playlist/playlistitem.cpp \ +- Play/Playlist/playlistprivate.cpp \ +- Play/Danmu/Render/cacheworker.cpp \ +- Play/Danmu/Render/danmurender.cpp \ +- Play/Danmu/Manager/danmumanager.cpp \ +- Play/Danmu/Manager/nodeinfo.cpp \ +- Play/Danmu/Manager/managermodel.cpp \ +- MediaLibrary/animeworker.cpp \ +- MediaLibrary/animemodel.cpp \ +- MediaLibrary/labelmodel.cpp \ +- MediaLibrary/animefilterproxymodel.cpp \ +- MediaLibrary/labelitemdelegate.cpp \ +- Download/BgmList/bgmlist.cpp \ +- UI/bgmlistwindow.cpp \ +- UI/ressearchwindow.cpp \ +- Play/Danmu/Manager/pool.cpp \ +- MediaLibrary/capturelistmodel.cpp \ +- UI/captureview.cpp \ +- UI/tip.cpp ++ UI/widgets/smoothscrollbar.cpp + + HEADERS += \ + Common/counter.h \ ++ Common/flowlayout.h \ ++ Common/htmlparsersax.h \ + Common/logger.h \ + Common/lrucache.h \ ++ Common/network.h \ + Common/notifier.h \ ++ Common/threadtask.h \ ++ Common/zconf.h \ ++ Common/zlib.h \ ++ Download/aria2jsonrpc.h \ + Download/autodownloadmanager.h \ ++ Download/BgmList/bgmlist.h \ ++ Download/downloaditemdelegate.h \ ++ Download/downloadmodel.h \ + Download/peerid.h \ + Download/peermodel.h \ ++ Download/torrent.h \ + Download/trackersubscriber.h \ ++ Download/util.h \ ++ globalobjects.h \ + LANServer/apihandler.h \ + LANServer/dlna/dlnamediacontroller.h \ + LANServer/dlna/dlnamediaitem.h \ +@@ -222,16 +236,44 @@ HEADERS += \ + LANServer/httpserver/httpsession.h \ + LANServer/httpserver/httpsessionstore.h \ + LANServer/httpserver/staticfilecontroller.h \ ++ LANServer/lanserver.h \ + LANServer/router.h \ ++ MediaLibrary/animefilterproxymodel.h \ ++ MediaLibrary/animeinfo.h \ ++ MediaLibrary/animeitemdelegate.h \ + MediaLibrary/animelistmodel.h \ ++ MediaLibrary/animemodel.h \ + MediaLibrary/animeprovider.h \ ++ MediaLibrary/animeworker.h \ ++ MediaLibrary/capturelistmodel.h \ + MediaLibrary/episodeitem.h \ ++ MediaLibrary/episodesmodel.h \ ++ MediaLibrary/labelitemdelegate.h \ ++ MediaLibrary/labelmodel.h \ + MediaLibrary/tagnode.h \ +- Play/Danmu/Render/livedanmuitemdelegate.h \ +- Play/Danmu/Render/livedanmulistmodel.h \ ++ Play/Danmu/blocker.h \ ++ Play/Danmu/common.h \ ++ Play/Danmu/danmupool.h \ + Play/Danmu/danmuprovider.h \ + Play/Danmu/danmuviewmodel.h \ + Play/Danmu/eventanalyzer.h \ ++ Play/Danmu/Layouts/bottomlayout.h \ ++ Play/Danmu/Layouts/danmulayout.h \ ++ Play/Danmu/Layouts/rolllayout.h \ ++ Play/Danmu/Layouts/toplayout.h \ ++ Play/Danmu/Manager/danmumanager.h \ ++ Play/Danmu/Manager/managermodel.h \ ++ Play/Danmu/Manager/nodeinfo.h \ ++ Play/Danmu/Manager/pool.h \ ++ Play/Danmu/Provider/localprovider.h \ ++ Play/Danmu/Render/cacheworker.h \ ++ Play/Danmu/Render/danmurender.h \ ++ Play/Danmu/Render/livedanmuitemdelegate.h \ ++ Play/Danmu/Render/livedanmulistmodel.h \ ++ Play/Playlist/playlist.h \ ++ Play/Playlist/playlistitem.h \ ++ Play/Playlist/playlistprivate.h \ ++ Play/Video/mpvplayer.h \ + Play/Video/mpvpreview.h \ + Play/Video/simpleplayer.h \ + Script/bgmcalendarscript.h \ +@@ -250,29 +292,44 @@ HEADERS += \ + Script/scriptmanager.h \ + Script/scriptmodel.h \ + Script/scriptsettingmodel.h \ ++ UI/about.h \ ++ UI/adddanmu.h \ + UI/addpool.h \ + UI/addrule.h \ ++ UI/adduritask.h \ + UI/animebatchaction.h \ + UI/animedetailinfopage.h \ + UI/animeinfoeditor.h \ + UI/animesearch.h \ + UI/autodownloadwindow.h \ ++ UI/bgmlistwindow.h \ ++ UI/blockeditor.h \ ++ UI/capture.h \ ++ UI/captureview.h \ + UI/charactereditor.h \ ++ UI/checkupdate.h \ + UI/danmulaunch.h \ + UI/danmuview.h \ + UI/dlnadiscover.h \ ++ UI/downloadwindow.h \ ++ UI/framelessdialog.h \ ++ UI/framelesswindow.h \ + UI/gifcapture.h \ + UI/inputdialog.h \ ++ UI/librarywindow.h \ ++ UI/list.h \ + UI/logwindow.h \ + UI/luatableviewer.h \ + UI/mainwindow.h \ +- UI/framelesswindow.h \ +- Play/Danmu/Layouts/bottomlayout.h \ +- Play/Danmu/Layouts/danmulayout.h \ +- Play/Danmu/Layouts/rolllayout.h \ +- Play/Danmu/Layouts/toplayout.h \ +- Play/Danmu/danmupool.h \ ++ UI/matcheditor.h \ ++ UI/mediainfo.h \ ++ UI/player.h \ ++ UI/pooleditor.h \ ++ UI/poolmanager.h \ ++ UI/ressearchwindow.h \ + UI/scriptplayground.h \ ++ UI/selectepisode.h \ ++ UI/selecttorrentfile.h \ + UI/settings.h \ + UI/settings/downloadpage.h \ + UI/settings/lanserverpage.h \ +@@ -283,6 +340,8 @@ HEADERS += \ + UI/settings/stylepage.h \ + UI/snippetcapture.h \ + UI/stylemanager.h \ ++ UI/timelineedit.h \ ++ UI/tip.h \ + UI/widgets/backgroundfadewidget.h \ + UI/widgets/backgroundwidget.h \ + UI/widgets/clickslider.h \ +@@ -290,71 +349,13 @@ HEADERS += \ + UI/widgets/colorslider.h \ + UI/widgets/danmustatiswidget.h \ + UI/widgets/dialogtip.h \ ++ UI/widgets/dirselectwidget.h \ + UI/widgets/elidelineedit.h \ + UI/widgets/fonticonbutton.h \ + UI/widgets/loadingicon.h \ + UI/widgets/optionslider.h \ + UI/widgets/scriptsearchoptionpanel.h \ +- UI/widgets/smoothscrollbar.h \ +- globalobjects.h \ +- Play/Playlist/playlist.h \ +- Play/Video/mpvplayer.h \ +- UI/list.h \ +- UI/player.h \ +- UI/pooleditor.h \ +- UI/framelessdialog.h \ +- Play/Danmu/Provider/localprovider.h \ +- UI/adddanmu.h \ +- Play/Danmu/common.h \ +- UI/matcheditor.h \ +- UI/selectepisode.h \ +- Play/Danmu/blocker.h \ +- UI/blockeditor.h \ +- UI/capture.h \ +- UI/mediainfo.h \ +- UI/about.h \ +- Common/network.h \ +- Common/htmlparsersax.h \ +- MediaLibrary/animeinfo.h \ +- MediaLibrary/animeitemdelegate.h \ +- UI/librarywindow.h \ +- MediaLibrary/episodesmodel.h \ +- Download/util.h \ +- Download/aria2jsonrpc.h \ +- UI/widgets/dirselectwidget.h \ +- Download/downloaditemdelegate.h \ +- Download/downloadmodel.h \ +- Download/torrent.h \ +- UI/downloadwindow.h \ +- UI/adduritask.h \ +- UI/selecttorrentfile.h \ +- UI/poolmanager.h \ +- UI/checkupdate.h \ +- Common/zconf.h \ +- Common/zlib.h \ +- Common/flowlayout.h \ +- UI/timelineedit.h \ +- LANServer/lanserver.h \ +- Play/Playlist/playlistitem.h \ +- Play/Playlist/playlistprivate.h \ +- Play/Danmu/Render/cacheworker.h \ +- Play/Danmu/Render/danmurender.h \ +- Play/Danmu/Manager/danmumanager.h \ +- Play/Danmu/Manager/nodeinfo.h \ +- Play/Danmu/Manager/managermodel.h \ +- MediaLibrary/animeworker.h \ +- MediaLibrary/animemodel.h \ +- MediaLibrary/labelmodel.h \ +- MediaLibrary/animefilterproxymodel.h \ +- MediaLibrary/labelitemdelegate.h \ +- Download/BgmList/bgmlist.h \ +- UI/bgmlistwindow.h \ +- UI/ressearchwindow.h \ +- Play/Danmu/Manager/pool.h \ +- Common/threadtask.h \ +- MediaLibrary/capturelistmodel.h \ +- UI/captureview.h \ +- UI/tip.h ++ UI/widgets/smoothscrollbar.h + + INCLUDEPATH += \ + Play/Video \ + diff --git a/media-video/kikoplay/kikoplay-0.8.2.ebuild b/media-video/kikoplay/kikoplay-0.8.2.ebuild deleted file mode 100644 index d7a4364e4d..0000000000 --- a/media-video/kikoplay/kikoplay-0.8.2.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -GIT_PN="KikoPlay" - -LUA_COMPAT=( lua5-3 ) - -inherit lua-single qmake-utils xdg - -DESCRIPTION="KikoPlay is a full-featured danmu player" -HOMEPAGE=" - https://kikoplay.fun - https://github.com/Protostars/KikoPlay -" - -if [[ "${PV}" == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/Protostars/${GIT_PN}.git" -else - SRC_URI="https://github.com/Protostars/${GIT_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~m68k ~mips ~ppc ~ppc64 ~x86" - S="${WORKDIR}/${GIT_PN}-${PV}" -fi - -LICENSE="GPL-3" -SLOT="0" - -RDEPEND=" - ${LUA_DEPS} - dev-libs/qhttpengine:5 - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsql:5 - dev-qt/qtwidgets:5 - media-video/mpv[libmpv,-lua] - net-misc/aria2 -" - -DEPEND=" - ${RDEPEND} -" - -BDEPEND=" - virtual/pkgconfig -" - -src_configure() { - eqmake5 PREFIX="${EPREFIX}/usr" -} - -src_install() { - # Can't use default, set INSTALL_ROOT - emake INSTALL_ROOT="${D}" install -} diff --git a/media-video/kikoplay/kikoplay-0.9.3.ebuild b/media-video/kikoplay/kikoplay-0.9.3.ebuild new file mode 100644 index 0000000000..d8e86af6dd --- /dev/null +++ b/media-video/kikoplay/kikoplay-0.9.3.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +GIT_PN="KikoPlay" +GIT_SCRIPT_PN="KikoPlayScript" +GIT_SCRIPT_PV="38f98d24133132f99b61dbeca26178aad45917e2" + +inherit cmake xdg + +DESCRIPTION="KikoPlay is a full-featured danmu player" +HOMEPAGE=" + https://kikoplay.fun + https://github.com/KikoPlayProject/KikoPlay +" + +if [[ "${PV}" == "9999" ]] ; then + inherit git-r3 + EGIT_REPO_URI=" + https://github.com/KikoPlayProject/${GIT_PN}.git + https://github.com/KikoPlayProject/${GIT_SCRIPT_PN}.git + " + S_SCRIPT="${WORKDIR}/${GIT_SCRIPT_PN}" +else + SRC_URI=" + https://github.com/KikoPlayProject/${GIT_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz + https://github.com/KikoPlayProject/${GIT_SCRIPT_PN}/archive/${GIT_SCRIPT_PV}.tar.gz \ + -> kikoplayscript-${GIT_SCRIPT_PV}.tar.gz + " + KEYWORDS="~amd64 ~arm ~m68k ~mips ~ppc ~ppc64 ~x86" + S="${WORKDIR}/${GIT_PN}-${PV}" + S_SCRIPT="${WORKDIR}/${GIT_SCRIPT_PN}-${GIT_SCRIPT_PV}" +fi + +LICENSE="GPL-3" +SLOT="0" + +RDEPEND=" + dev-libs/qhttpengine:5 + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtsql:5 + dev-qt/qtwidgets:5 + media-video/mpv[libmpv] + net-misc/aria2 +" + +DEPEND=" + ${RDEPEND} +" + +BDEPEND=" + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}/${PN}-0.9.3-qmake-fix.patch" + "${FILESDIR}/${PN}-0.9.3-cmake-fix.patch" +) + +src_configure() { + local mycmakeargs=( + -D USE_VCPKG_QT=OFF + ) + cmake_src_configure +} + +src_install() { + default + cmake_src_install + insinto "/usr/share/${PN}/script" + doins -r "${S_SCRIPT}"/* +} diff --git a/media-video/kikoplay/kikoplay-9999.ebuild b/media-video/kikoplay/kikoplay-9999.ebuild index b89015a7d7..d8e86af6dd 100644 --- a/media-video/kikoplay/kikoplay-9999.ebuild +++ b/media-video/kikoplay/kikoplay-9999.ebuild @@ -1,34 +1,42 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" GIT_PN="KikoPlay" +GIT_SCRIPT_PN="KikoPlayScript" +GIT_SCRIPT_PV="38f98d24133132f99b61dbeca26178aad45917e2" -LUA_COMPAT=( lua5-3 ) - -inherit lua-single qmake-utils xdg +inherit cmake xdg DESCRIPTION="KikoPlay is a full-featured danmu player" HOMEPAGE=" https://kikoplay.fun - https://github.com/Protostars/KikoPlay + https://github.com/KikoPlayProject/KikoPlay " if [[ "${PV}" == "9999" ]] ; then inherit git-r3 - EGIT_REPO_URI="https://github.com/Protostars/${GIT_PN}.git" + EGIT_REPO_URI=" + https://github.com/KikoPlayProject/${GIT_PN}.git + https://github.com/KikoPlayProject/${GIT_SCRIPT_PN}.git + " + S_SCRIPT="${WORKDIR}/${GIT_SCRIPT_PN}" else - SRC_URI="https://github.com/Protostars/${GIT_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI=" + https://github.com/KikoPlayProject/${GIT_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz + https://github.com/KikoPlayProject/${GIT_SCRIPT_PN}/archive/${GIT_SCRIPT_PV}.tar.gz \ + -> kikoplayscript-${GIT_SCRIPT_PV}.tar.gz + " KEYWORDS="~amd64 ~arm ~m68k ~mips ~ppc ~ppc64 ~x86" S="${WORKDIR}/${GIT_PN}-${PV}" + S_SCRIPT="${WORKDIR}/${GIT_SCRIPT_PN}-${GIT_SCRIPT_PV}" fi LICENSE="GPL-3" SLOT="0" RDEPEND=" - ${LUA_DEPS} dev-libs/qhttpengine:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 @@ -48,11 +56,21 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}/${PN}-0.9.3-qmake-fix.patch" + "${FILESDIR}/${PN}-0.9.3-cmake-fix.patch" +) + src_configure() { - eqmake5 PREFIX="${EPREFIX}/usr" + local mycmakeargs=( + -D USE_VCPKG_QT=OFF + ) + cmake_src_configure } src_install() { - # Can't use default, set INSTALL_ROOT - emake INSTALL_ROOT="${D}" install + default + cmake_src_install + insinto "/usr/share/${PN}/script" + doins -r "${S_SCRIPT}"/* } diff --git a/media-video/kikoplay/metadata.xml b/media-video/kikoplay/metadata.xml index 4a5d2d5fa2..1f66f906bb 100644 --- a/media-video/kikoplay/metadata.xml +++ b/media-video/kikoplay/metadata.xml @@ -6,7 +6,7 @@ Huang Rui - Protostars/KikoPlay + KikoPlayProject/KikoPlay KikoPlay - A Full-Featured Danmu Player. diff --git a/sys-firmware/LenovoLegionLinux/LenovoLegionLinux-9999.ebuild b/sys-firmware/LenovoLegionLinux/LenovoLegionLinux-9999.ebuild index de5f1723a2..95c2640e73 100644 --- a/sys-firmware/LenovoLegionLinux/LenovoLegionLinux-9999.ebuild +++ b/sys-firmware/LenovoLegionLinux/LenovoLegionLinux-9999.ebuild @@ -75,12 +75,12 @@ src_install() { insinto /etc/legion_linux && newins "${FILESDIR}/radeon" .env fi #NVIDIA (need dowgrade because nvidia-smi -pl was removed) - if use downgrade-nvidia; then + if use downgrade-nvidia; then insinto /usr/share/legion_linux && newins "${FILESDIR}/nvidia" .env insinto /etc/legion_linux && newins "${FILESDIR}/nvidia" .env fi - if use ryzenadj; then + if use ryzenadj; then insinto /usr/share/legion_linux && newins "${FILESDIR}/cpu" .env insinto /etc/legion_linux && newins "${FILESDIR}/cpu" .env fi diff --git a/sys-firmware/LenovoLegionLinux/metadata.xml b/sys-firmware/LenovoLegionLinux/metadata.xml index 660ba14f53..aa2aa2365c 100644 --- a/sys-firmware/LenovoLegionLinux/metadata.xml +++ b/sys-firmware/LenovoLegionLinux/metadata.xml @@ -9,6 +9,10 @@ [AMD] CPU and APU control using ryzenadj (systemd-service) [INTEL] CPU and APU control using undervolt (systemd-service) + + gonegrier.duarte@gmail.com + Gonçalo Negrier Duarte + johnfanv2/LenovoLegionLinux https://github.com/johnfanv2/LenovoLegionLinux/issues