Fix build of Looper

This commit is contained in:
Zachary Hall 2024-11-20 09:23:50 -08:00
parent 1dc7ec0e70
commit b097fdaf79
6 changed files with 2029 additions and 4 deletions

View file

@ -27,6 +27,8 @@ src_configure() {
setup-wxwidgets setup-wxwidgets
local mycmakeargs=( local mycmakeargs=(
-DCOPY_WX_LIBS=0 -DCOPY_WX_LIBS=0
-DDISABLE_CXX=0
-DNO_CORE_PLUGINS=0
) )
cmake_src_configure cmake_src_configure
} }

View file

@ -0,0 +1,27 @@
diff --git a/startlxqtwayland.in b/startlxqtwayland.in
index c2e14d5..6fe60d0 100644
--- a/startlxqtwayland.in
+++ b/startlxqtwayland.in
@@ -83,18 +83,10 @@ valid_layouts=$(grep -A98 '! layout' /usr/share/X11/xkb/rules/base.lst | awk '{p
trylayout=$(echo $LANG | cut -c 1,2)
if [ -z "$COMPOSITOR" ]; then
- echo "No compositor configured yet in Session Settings, trying labwc..."
- COMPOSITOR=labwc
- export XDG_CURRENT_DESKTOP="LXQt:wlroots"
-
- # enable cursor on VM (systemd only)
- if type systemd-detect-virt > /dev/null 2>&1 && systemd-detect-virt --quiet; then
- export WLR_NO_HARDWARE_CURSORS=1
- echo "Running on virtualized hardware"
- fi
- exec $COMPOSITOR -C "$share_dir"/lxqt/wayland/firstrun -S lxqt-config-session
-
-elif [ "$COMPOSITOR" = "labwc" ]; then
+ echo "No compositor configured yet in Session Settings, trying wayfire..."
+ export COMPOSITOR=wayfire
+fi
+if [ "$COMPOSITOR" = "labwc" ]; then
# Copy default configuration if not existing and set keyboard layout if different from us
if [ ! -d "$XDG_CONFIG_HOME/labwc" ]; then
cp -av "$share_dir"/lxqt/wayland/labwc "$XDG_CONFIG_HOME"/ # use default location here

View file

@ -0,0 +1,24 @@
# Copyright 2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit git-r3 cmake
DESCRIPTION="LXQt wayland session"
HOMEPAGE="https://github.com/lxqt/lxqt-wayland-session"
EGIT_REPO_URI="https://github.com/lxqt/lxqt-wayland-session.git"
#SRC_URI=""
IUSE="compositor"
LICENSE="GPL3"
SLOT="0"
KEYWORDS="~amd64"
PATCHES=(
"${FILESDIR}/default-wayfire.patch"
)
DEPEND="lxqt-base/lxqt-session app-misc/qtxdg-tools kde-plasma/layer-shell-qt compositor? ( gui-wm/wayfire )"
RDEPEND="${DEPEND}"
BDEPEND="dev-util/lxqt-build-tools"

View file

@ -25,7 +25,6 @@ RESTRICT="test"
RDEPEND="app-crypt/libsecret RDEPEND="app-crypt/libsecret
gui? ( gui? (
>=dev-libs/protobuf-21.12:= >=dev-libs/protobuf-21.12:=
>=dev-libs/sentry-native-0.6.5-r1
dev-qt/qtbase:6=[gui,icu,widgets] dev-qt/qtbase:6=[gui,icu,widgets]
dev-qt/qtdeclarative:6=[widgets] dev-qt/qtdeclarative:6=[widgets]
dev-qt/qtsvg:6= dev-qt/qtsvg:6=

File diff suppressed because it is too large Load diff

View file

@ -32,6 +32,7 @@ HOMEPAGE="https://complecwaft.com/catmeow/looper/"
# Portage. # Portage.
EGIT_REPO_URI="https://complecwaft.com/catmeow/looper.git" EGIT_REPO_URI="https://complecwaft.com/catmeow/looper.git"
EGIT_SUBMODULES=(subprojects/vgmstream subprojects/SDL-Mixer-X backends/ui/imgui/imgui backends/imgui/IconFontsCppHeaders subprojects/jsoncpp subprojects/soundtouch subprojects/protobuf-c) EGIT_SUBMODULES=(subprojects/vgmstream subprojects/SDL-Mixer-X backends/ui/imgui/imgui backends/imgui/IconFontsCppHeaders subprojects/jsoncpp subprojects/soundtouch subprojects/protobuf-c)
PATCHES=( ${FILESDIR}/vgmstream.patch )
# Source directory; the dir where the sources can be found (automatically # Source directory; the dir where the sources can be found (automatically
# unpacked) inside ${WORKDIR}. The default value for S is ${WORKDIR}/${P} # unpacked) inside ${WORKDIR}. The default value for S is ${WORKDIR}/${P}
# If you don't need to change it, leave the S= line out of the ebuild # If you don't need to change it, leave the S= line out of the ebuild
@ -78,7 +79,7 @@ KEYWORDS="amd64"
# Comprehensive list of any and all USE flags leveraged in the ebuild, # Comprehensive list of any and all USE flags leveraged in the ebuild,
# with some exceptions, e.g., ARCH specific flags like "amd64" or "ppc". # with some exceptions, e.g., ARCH specific flags like "amd64" or "ppc".
# Not needed if the ebuild doesn't use any USE flags. # Not needed if the ebuild doesn't use any USE flags.
IUSE="" IUSE="+qt"
# A space delimited list of portage features to restrict. man 5 ebuild # A space delimited list of portage features to restrict. man 5 ebuild
# for details. Usually not needed. # for details. Usually not needed.
@ -98,7 +99,7 @@ RESTRICT="network-sandbox"
# Build-time dependencies that need to be binary compatible with the system # Build-time dependencies that need to be binary compatible with the system
# being built (CHOST). These include libraries that we link against. # being built (CHOST). These include libraries that we link against.
# The below is valid if the same run-time depends are required to compile. # The below is valid if the same run-time depends are required to compile.
DEPEND="media-libs/libsdl2 media-libs/sdl2-image dev-libs/jsoncpp media-sound/fluidsynth media-sound/mpg123 media-libs/libogg media-libs/opus media-libs/flac media-sound/wavpack media-libs/libmodplug dev-cpp/sdbus-c++ dev-libs/libfmt dev-libs/protobuf" DEPEND="media-libs/libsdl2 media-libs/sdl2-image dev-libs/jsoncpp media-sound/fluidsynth media-sound/mpg123 media-libs/libogg media-libs/opus media-libs/flac media-sound/wavpack media-libs/libmodplug dev-cpp/sdbus-c++ dev-libs/libfmt dev-libs/protobuf qt? ( dev-qt/qtcore:6 dev-qt/qtgui:6 dev-qt/qtwidgets:6 ) "
# Build-time dependencies that are executed during the emerge process, and # Build-time dependencies that are executed during the emerge process, and
# only need to be present in the native build system (CBUILD). Example: # only need to be present in the native build system (CBUILD). Example:
@ -107,7 +108,7 @@ BDEPEND="virtual/pkgconfig"
# The following src_configure function is implemented as default by portage, so # The following src_configure function is implemented as default by portage, so
# you only need to call it if you need a different behaviour. # you only need to call it if you need a different behaviour.
src_configure() { src_configure() {
declare -a mycmakeargs=( -DDISABLE_GTK_UI=ON -DBUILD_SOUNDTOUCH=ON -DBUILD_SHARED_LIBS=OFF -DSOUNDSTRETCH=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo ) declare -a mycmakeargs=( -DDISABLE_GTK_UI=ON -DBUILD_SOUNDTOUCH=ON -DBUILD_SHARED_LIBS=OFF -DSOUNDSTRETCH=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DUSE_VORBIS=OFF -DUSE_CELT=OFF -DUSE_ATRAC9=OFF -DUSE_G719=OFF -DUSE_MPEG=OFF -DUSE_SPEEX=OFF )
# Most open-source packages use GNU autoconf for configuration. # Most open-source packages use GNU autoconf for configuration.
cmake_src_configure cmake_src_configure
} }