media-video/kikoplay: bump to 0.9.3

Signed-off-by: Huang Rui <vowstar@gmail.com>

6 files changed, 876 insertions, 13 deletions

diff --git a/media-video/kikoplay/Manifest b/media-video/kikoplay/Manifest
index e2f33fa1e..cc0e0a16d 100644
--- a/media-video/kikoplay/Manifest
+++ b/media-video/kikoplay/Manifest
@@ -1 +1,3 @@
 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 000000000..3fb00e7c8
--- /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 <vowstar@gmail.com>
+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 <vowstar@gmail.com>
+---
+ 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 <vowstar@gmail.com>
+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 <vowstar@gmail.com>
+---
+ 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 <vowstar@gmail.com>
+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 <vowstar@gmail.com>
+---
+ 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 <vowstar@gmail.com>
+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 <vowstar@gmail.com>
+---
+ 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 000000000..1f8a15000
--- /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 <vowstar@gmail.com>
+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 <vowstar@gmail.com>
+---
+ 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.9.3.ebuild b/media-video/kikoplay/kikoplay-0.9.3.ebuild
new file mode 100644
index 000000000..d8e86af6d
--- /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 b89015a7d..d8e86af6d 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 4a5d2d5fa..1f66f906b 100644
--- a/media-video/kikoplay/metadata.xml
+++ b/media-video/kikoplay/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Huang Rui</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">Protostars/KikoPlay</remote-id>
+		<remote-id type="github">KikoPlayProject/KikoPlay</remote-id>
 	</upstream>
 	<longdescription lang="en">
 	KikoPlay - A Full-Featured Danmu Player.