mirror of
https://codeberg.org/flk/meta-wayland.git
synced 2026-04-09 14:22:30 +02:00
Compare commits
19 Commits
c03515aa19
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e8a2e78ab8 | ||
|
|
d106def4a6 | ||
|
|
d5f1c316f0 | ||
|
|
7a6b64b8f4 | ||
|
|
89d68d982d | ||
|
|
6afe98be51 | ||
|
|
05a505d714 | ||
|
|
4b144de8c9 | ||
|
|
3e82b957b5 | ||
|
|
d6afc97c55 | ||
|
|
60e53fe03c | ||
|
|
a187026d46 | ||
|
|
2eb070afba | ||
|
|
0fa24c1b9b | ||
|
|
4e6a6d46d5 | ||
|
|
940bd41690 | ||
|
|
8c9d2cf0d0 | ||
|
|
1ec642d68f | ||
|
|
68a51d23a0 |
@@ -4,7 +4,7 @@ LICENSE = "Apache-2.0"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
|
||||
|
||||
SRC_URI = "gitsm://github.com/luvit/luv.git;protocol=https;branch=master"
|
||||
SRCREV = "4c9fbc6cf6f3338bb0e0426710cf885ee557b540"
|
||||
SRCREV = "f65fe9d7616f9fbcd20227fc7a73b38d1c5c180d"
|
||||
|
||||
DEPENDS = "luajit-native libuv"
|
||||
|
||||
@@ -3,14 +3,14 @@ HOMEPAGE = "https://gitlab.com/mobian1/callaudiod"
|
||||
LICENSE = "GPL-3.0-only"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
|
||||
|
||||
DEPENDS = "glib-2.0 alsa-lib pulseaudio"
|
||||
DEPENDS = "appstream glib-2.0 alsa-lib pulseaudio"
|
||||
RDEPENDS:${PN} += "pulseaudio-server"
|
||||
|
||||
inherit meson pkgconfig
|
||||
|
||||
SRC_URI = "git://gitlab.com/mobian1/callaudiod.git;protocol=https;branch=master"
|
||||
|
||||
SRCREV = "56831297817afb6b30062b7cee3e40225ac39cac"
|
||||
SRCREV = "8d262597f41ff787359059ec6a15acd48b7433f6"
|
||||
|
||||
FILES:${PN} += "${datadir}"
|
||||
|
||||
@@ -19,9 +19,9 @@ inherit meson pkgconfig features_check gobject-introspection vala
|
||||
|
||||
SRC_URI = "gitsm://source.puri.sm/Librem5/feedbackd.git;protocol=https;nobranch=1"
|
||||
|
||||
SRCREV = "09396c7d64ee047849e65eb7ce1b7aa88763a902"
|
||||
SRCREV = "f14642cb0408af9b6bf963eff3bc61eff6b0a1b2"
|
||||
|
||||
EXTRA_OEMESON += "-Dtests=false"
|
||||
|
||||
FILES:${PN} += "${datadir}"
|
||||
FILES:${PN} += "${datadir} ${systemd_user_unitdir}"
|
||||
|
||||
@@ -7,7 +7,7 @@ inherit meson pkgconfig gobject-introspection vala
|
||||
DEPENDS = "glib-2.0 json-glib"
|
||||
|
||||
SRC_URI = "git://gitlab.gnome.org/World/Phosh/gmobile.git;protocol=https;branch=main"
|
||||
SRCREV = "fb21129f5d31a6e640225415a25118d8f16363a1"
|
||||
SRCREV = "917e02110c90b9704d2c25e1479aa1b3762c8420"
|
||||
|
||||
do_install:append() {
|
||||
install -m 0644 ${B}/gm-config.h ${D}${includedir}
|
||||
@@ -1,33 +0,0 @@
|
||||
From 02fee99a4be76b1db07f27cad68986061168e7e1 Mon Sep 17 00:00:00 2001
|
||||
From: Markus Volk <f_l_k@t-online.de>
|
||||
Date: Tue, 20 Aug 2024 11:57:39 +0200
|
||||
Subject: [PATCH] build as package
|
||||
|
||||
Upstream-Status: Pending
|
||||
---
|
||||
meson.build | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index d33614b..d3e068d 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -19,6 +19,8 @@ systemduserdir = join_paths(systemddir, 'user')
|
||||
|
||||
root_inc = include_directories('.')
|
||||
|
||||
+pkgconfig = import ('pkgconfig')
|
||||
+
|
||||
cc = meson.get_compiler('c')
|
||||
|
||||
global_c_args = []
|
||||
@@ -113,4 +115,6 @@ summary = [
|
||||
'-----------',
|
||||
]
|
||||
|
||||
+pkgconfig.generate(call_ui_lib)
|
||||
+
|
||||
message('\n'.join(summary))
|
||||
--
|
||||
2.45.2
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
SUMMARY = "Libcall-ui carries common user interface parts for call handling. It is meant to be used as a git submodule."
|
||||
HOMEPAGE = "https://gitlab.gnome.org/World/Phosh/libcall-ui"
|
||||
LICENSE = "LGPL-2.1-only"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
|
||||
|
||||
DEPENDS = "glib-2.0 libhandy gtk+3 callaudiod"
|
||||
|
||||
inherit meson pkgconfig gi-docgen gobject-introspection
|
||||
|
||||
SRC_URI = " \
|
||||
git://gitlab.gnome.org/World/Phosh/libcall-ui.git;protocol=https;branch=libcall-ui-0.1.x \
|
||||
file://0001-build-as-package.patch \
|
||||
"
|
||||
|
||||
SRCREV = "5bb3fc2d662285681a54ce4b5bc2ed29a47c8c74"
|
||||
|
||||
GIR_MESON_OPTION = ''
|
||||
|
||||
do_install:append() {
|
||||
install -d ${D}${includedir}
|
||||
install -m 0644 ${B}/src/libcall-ui.a ${D}${libdir}
|
||||
cp -rf ${B}/src/libcall-ui.a.p ${D}${libdir}
|
||||
install -m 0644 ${B}/cui-config.h ${D}${includedir}
|
||||
install -m 0644 ${S}/src/*.h ${D}${includedir}
|
||||
install -m 0644 ${B}/src/*.h ${D}${includedir}
|
||||
}
|
||||
|
||||
FILES:${PN} += "${libdir}/libcall-ui.a.p"
|
||||
21
recipes-extended/qrcodegen/qrcodegen.bb
Normal file
21
recipes-extended/qrcodegen/qrcodegen.bb
Normal file
@@ -0,0 +1,21 @@
|
||||
SUMMARY = "QR Code generator library"
|
||||
HOMEPAGE = "https://github.com/nayuki/QR-Code-generator"
|
||||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://Readme.markdown;md5=2302d7e7d711345cc441b7eb593bbb95"
|
||||
|
||||
SRC_URI = "git://github.com/nayuki/QR-Code-generator;protocol=https;nobranch=1;name=qrcodegen"
|
||||
SRC_URI += "git://github.com/EasyCoding/qrcodegen-cmake;protocol=https;name=qrcodegen-cmake;subdir=${S}/qrcodegen-cmake;nobranch=1"
|
||||
SRCREV_qrcodegen = "720f62bddb7226106071d4728c292cb1df519ceb"
|
||||
SRCREV_qrcodegen-cmake = "53c28a05c2a97abacbcdb60924b2db7eb5779d89"
|
||||
SRCREV_FORMAT = "qrcodegen"
|
||||
|
||||
inherit cmake
|
||||
|
||||
do_configure:prepend() {
|
||||
cp -rf ${S}/qrcodegen-cmake/* ${S}
|
||||
}
|
||||
|
||||
EXTRA_OECMAKE = " \
|
||||
-DCMAKE_BUILD_TYPE=None \
|
||||
-DBUILD_SHARED_LIBS=ON \
|
||||
"
|
||||
@@ -12,7 +12,7 @@ DEPENDS = " \
|
||||
wayland-protocols \
|
||||
"
|
||||
|
||||
SRCREV = "7342c53343bed06b22456eb45182e40e0f80ea83"
|
||||
SRCREV = "4de75e73b40ba9e953eaec9eaa7773e6c31ab08a"
|
||||
|
||||
inherit meson pkgconfig
|
||||
|
||||
|
||||
@@ -25,9 +25,11 @@ DEPENDS = " \
|
||||
sofia-sip \
|
||||
"
|
||||
|
||||
SRC_URI = "gitsm://gitlab.gnome.org/GNOME/calls.git;protocol=https;nobranch=1"
|
||||
|
||||
SRCREV = "798c698463aa5781d56f2f77bd7abd97129a2c23"
|
||||
SRC_URI = "gitsm://gitlab.gnome.org/GNOME/calls.git;protocol=https;nobranch=1;name=calls"
|
||||
SRC_URI += "git://gitlab.gnome.org/World/Phosh/libcall-ui;protocol=https;subdir=${S}/subprojects/libcall-ui;name=libcall-ui;nobranch=1"
|
||||
SRCREV_calls = "271ab5a5acccbc6de44995414ab2093c1f6688ec"
|
||||
SRCREV_libcall-ui = "3a2044f8e7c45387954ed35d22c6b6309e6751d6"
|
||||
SRCREV_FORMAT = "calls"
|
||||
|
||||
inherit meson vala pkgconfig mime-xdg gtk-icon-cache
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
SUMMARY = "libgnome-volume-control is a copy library"
|
||||
HOMEPAGE = "http://www.gimp.org"
|
||||
SECTION = "graphics"
|
||||
LICENSE = "GPL-2.0-only"
|
||||
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
|
||||
|
||||
DEPENDS = " \
|
||||
glib-2.0 \
|
||||
pulseaudio \
|
||||
"
|
||||
|
||||
inherit meson pkgconfig
|
||||
|
||||
SRC_URI = " \
|
||||
git://gitlab.gnome.org/GNOME/libgnome-volume-control.git;protocol=https;branch=master \
|
||||
file://0001-build-as-package.patch \
|
||||
"
|
||||
|
||||
SRCREV = "5f9768a2eac29c1ed56f1fbb449a77a3523683b6"
|
||||
|
||||
do_install:append() {
|
||||
install -d ${D}${includedir}
|
||||
install -m 0644 ${B}/libgvc.a ${D}${libdir}
|
||||
cp -rf ${B}/libgvc.a.p ${D}${libdir}
|
||||
install -m 0644 ${S}/*.h ${D}${includedir}
|
||||
install -m 0644 ${B}/*.h ${D}${includedir}
|
||||
}
|
||||
|
||||
FILES:${PN} += "${libdir}/libgvc.a.p"
|
||||
@@ -1,41 +0,0 @@
|
||||
From db03d3455c9db082c373318c08f2377c03a62e99 Mon Sep 17 00:00:00 2001
|
||||
From: Markus Volk <f_l_k@t-online.de>
|
||||
Date: Tue, 20 Aug 2024 12:22:55 +0200
|
||||
Subject: [PATCH] meson.build: allow shared build
|
||||
|
||||
Signed-off-by: Markus Volk <f_l_k@t-online.de>
|
||||
|
||||
Upstream-Status: Pending
|
||||
---
|
||||
meson.build | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index a1a2af5..97f43c1 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -3,12 +3,14 @@ project('gvc', 'c',
|
||||
default_options: ['static=true']
|
||||
)
|
||||
|
||||
-assert(meson.is_subproject(), 'This project is only intended to be used as a subproject!')
|
||||
+#assert(meson.is_subproject(), 'This project is only intended to be used as a subproject!')
|
||||
|
||||
gnome = import('gnome')
|
||||
|
||||
pkglibdir = get_option('pkglibdir')
|
||||
pkgdatadir = get_option('pkgdatadir')
|
||||
+pkgconfig = import ('pkgconfig')
|
||||
+
|
||||
|
||||
cdata = configuration_data()
|
||||
cdata.set_quoted('GETTEXT_PACKAGE', get_option('package_name'))
|
||||
@@ -135,3 +137,5 @@ configure_file(
|
||||
output: 'config.h',
|
||||
configuration: cdata
|
||||
)
|
||||
+
|
||||
+pkgconfig.generate(libgvc)
|
||||
--
|
||||
2.45.2
|
||||
|
||||
@@ -16,7 +16,7 @@ RDEPENDS:${PN} = "\
|
||||
|
||||
inherit setuptools3
|
||||
|
||||
SRCREV = "e2fdb413dbfccecf795039209a092c321636a419"
|
||||
SRCREV = "ba3d64293f0f4a09f95b15f881363da2521b5849"
|
||||
|
||||
do_install:append() {
|
||||
install -d ${D}${datadir}/pixmaps ${D}${datadir}/applications
|
||||
@@ -5,15 +5,7 @@
|
||||
# running the update-modules task.
|
||||
|
||||
SRC_URI += "\
|
||||
gomod://github.com/davecgh/go-spew;version=v1.1.0;mod=1;sha256sum=bcb29393251237b79a17b6c19bf29134f43e8f438c3198988fcd461a1cdf05cc \
|
||||
gomod://github.com/davecgh/go-spew;version=v1.1.1;mod=1;sha256sum=bcb29393251237b79a17b6c19bf29134f43e8f438c3198988fcd461a1cdf05cc \
|
||||
gomod://github.com/gotk3/gotk3;version=v0.6.5-0.20240618185848-ff349ae13f56;sha256sum=e04ed18899d987861438ca15d95dfb9e4d981bbf89063f2612f6545b0e05583b \
|
||||
gomod://github.com/pmezard/go-difflib;version=v1.0.0;mod=1;sha256sum=74b2e766eb215377864d587badf57e95521f692d2a7860b3c7759093f9c9bec2 \
|
||||
gomod://github.com/sirupsen/logrus;version=v1.9.3;sha256sum=4501f4e6b858bfdd997671fcdd2f647a3178b29b6b4d1344caa7c07517121dd0 \
|
||||
gomod://github.com/stretchr/objx;version=v0.1.0;mod=1;sha256sum=1350354d52d2287a62336ecc0d56232d4c47699af9bba49c67c2b48254da98f1 \
|
||||
gomod://github.com/stretchr/testify;version=v1.7.0;mod=1;sha256sum=fff8168d98e6a07156c454a1b6e925509f3177e96c155516d7f96b4079cca3bf \
|
||||
gomod://golang.org/x/sys;version=v0.0.0-20220715151400-c0bba94af5f8;mod=1;sha256sum=f033333096fe198f3151deed93f2deba74e50bbfe7739134045bc3b7ce4a5024 \
|
||||
gomod://golang.org/x/sys;version=v0.33.0;sha256sum=182df79c87135f6dbd0d45656b6527e9221e28899ee44cc6cc7e7a396aedaef9 \
|
||||
gomod://gopkg.in/check.v1;version=v0.0.0-20161208181325-20d25e280405;mod=1;sha256sum=5c306e0d633cd66a11b40e2e5fbbc6da42110db7d72ea3c1524ceb45ee40c33f \
|
||||
gomod://gopkg.in/yaml.v3;version=v3.0.0-20200313102051-9f266ea9e77c;mod=1;sha256sum=21579860a20306fcf43b1bd234d1fba319499c77611b71c05f9bf3ba90dab939 \
|
||||
"
|
||||
|
||||
@@ -8,7 +8,7 @@ RDEPENDS:${PN} = "xcur2png go-runtime"
|
||||
GO_IMPORT = "github.com/nwg-piotr/nwg-look"
|
||||
|
||||
SRC_URI = "git://${GO_IMPORT};destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/${GO_IMPORT};branch=main;protocol=https"
|
||||
SRCREV = "1282e6422491ea912ac22c5f532277eb011cc5bb"
|
||||
SRCREV = "0c27cd31853474e1f49002ec82a543d193888a0e"
|
||||
|
||||
require ${PN}-go-mods.inc ${PN}-licenses.inc
|
||||
|
||||
|
||||
39
recipes-gtk/phosh/phosh-mobile-settings_0.54.0.bb
Normal file
39
recipes-gtk/phosh/phosh-mobile-settings_0.54.0.bb
Normal file
@@ -0,0 +1,39 @@
|
||||
SUMMARY = "Mobile Settings App for phosh and related components"
|
||||
HOMEPAGE = "https://gitlab.gnome.org/World/Phosh/phosh-mobile-settings"
|
||||
LICENSE = "GPL-3.0-only"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a"
|
||||
|
||||
DEPENDS = " \
|
||||
glib-2.0 \
|
||||
gmobile \
|
||||
gtk4 \
|
||||
libadwaita \
|
||||
gnome-desktop \
|
||||
json-glib \
|
||||
libportal \
|
||||
phosh \
|
||||
wayland \
|
||||
wayland-native \
|
||||
wayland-protocols \
|
||||
desktop-file-utils-native \
|
||||
"
|
||||
|
||||
PACKAGECONFIG ?= ""
|
||||
PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,python3-docutils-native"
|
||||
|
||||
inherit gsettings meson pkgconfig gtk-icon-cache manpages gobject-introspection
|
||||
|
||||
SRC_URI = "git://gitlab.gnome.org/World/Phosh/phosh-mobile-settings.git;protocol=https;nobranch=1;name=phosh-mobile-settings"
|
||||
SRC_URI += "git://gitlab.gnome.org/GNOME/libgnome-volume-control.git;protocol=https;subdir=${S}/subprojects/gvc;name=gvc;nobranch=1"
|
||||
SRC_URI += "git://gitlab.freedesktop.org/devrtz/cellbroadcastd.git;protocol=https;subdir=${S}/subprojects/libcellbroadcast;name=libcellbroadcast;nobranch=1"
|
||||
SRC_URI += "git://gitlab.gnome.org/GNOME/gvdb.git;protocol=https;subdir=${S}/subprojects/libcellbroadcast/subprojects/gvdb;name=gvdb;nobranch=1"
|
||||
SRCREV_phosh-mobile-settings = "3426b7ea439921983b80accc8286a3ee74e918b7"
|
||||
SRCREV_gvc = "d2442f455844e5292cb4a74ffc66ecc8d7595a9f"
|
||||
SRCREV_libcellbroadcast = "c13213ee71a189f4bc74d5754c645bc12bf52c01"
|
||||
SRCREV_gvdb = "4758f6fb7f889e074e13df3f914328f3eecb1fd3"
|
||||
SRCREV_FORMAT = "phosh-mobile-settings"
|
||||
|
||||
EXTRA_OEMESON += "--buildtype=release"
|
||||
|
||||
FILES:${PN} += "${datadir}"
|
||||
|
||||
@@ -1,76 +0,0 @@
|
||||
From da96ea97125c7486eb3604844ef453d2b8b2442c Mon Sep 17 00:00:00 2001
|
||||
From: Markus Volk <f_l_k@t-online.de>
|
||||
Date: Tue, 20 Aug 2024 12:41:01 +0200
|
||||
Subject: [PATCH] meson: build without subproject wrap
|
||||
|
||||
Signed-off-by: Markus Volk <f_l_k@t-online.de>
|
||||
|
||||
Upstream-Status: Pending
|
||||
---
|
||||
meson.build | 38 +++++++++++++++++++-------------------
|
||||
1 file changed, 19 insertions(+), 19 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index d3c2c10a..0964f9ba 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -147,13 +147,13 @@ gsettings_desktop_schemas_dep = dependency('gsettings-desktop-schemas', version:
|
||||
gtk_dep = dependency('gtk+-3.0', version: '>=3.22')
|
||||
gtk_wayland_dep = dependency('gtk+-wayland-3.0', version: '>=3.22')
|
||||
gudev_dep = dependency('gudev-1.0')
|
||||
-libcall_ui = subproject('libcall-ui',
|
||||
- default_options: [
|
||||
- 'examples=false',
|
||||
- 'gtk_doc=false',
|
||||
- 'tests=false',
|
||||
- 'install-i18n=@0@'.format(get_option('callui-i18n')),
|
||||
- ])
|
||||
+#libcall_ui = subproject('libcall-ui',
|
||||
+# default_options: [
|
||||
+# 'examples=false',
|
||||
+# 'gtk_doc=false',
|
||||
+# 'tests=false',
|
||||
+# 'install-i18n=@0@'.format(get_option('callui-i18n')),
|
||||
+# ])
|
||||
libfeedback_dep = dependency('libfeedback-0.0',
|
||||
version: '>= 0.4.0',
|
||||
fallback: ['libfeedback', 'libfeedback_dep'],
|
||||
@@ -163,23 +163,23 @@ libfeedback_dep = dependency('libfeedback-0.0',
|
||||
'gtk_doc=false',
|
||||
'tests=false'],
|
||||
)
|
||||
-libgvc = subproject('gvc',
|
||||
- default_options: [
|
||||
- 'package_name=' + meson.project_name(),
|
||||
- 'package_version=' + meson.project_version(),
|
||||
- 'pkgdatadir=' + pkgdatadir,
|
||||
- 'pkglibdir=' + pkglibdir,
|
||||
- 'static=true',
|
||||
- 'introspection=false',
|
||||
- 'alsa=false'
|
||||
- ])
|
||||
-libgvc_dep = libgvc.get_variable('libgvc_dep')
|
||||
+#libgvc = subproject('gvc',
|
||||
+# default_options: [
|
||||
+# 'package_name=' + meson.project_name(),
|
||||
+# 'package_version=' + meson.project_version(),
|
||||
+# 'pkgdatadir=' + pkgdatadir,
|
||||
+# 'pkglibdir=' + pkglibdir,
|
||||
+# 'static=true',
|
||||
+# 'introspection=false',
|
||||
+# 'alsa=false'
|
||||
+# ])
|
||||
+libgvc_dep = dependency('gvc')
|
||||
libhandy_dep = dependency('libhandy-1',
|
||||
version: '>=1.1.90',
|
||||
fallback: ['libhandy', 'libhandy_dep'],
|
||||
default_options: ['introspection=disabled']
|
||||
)
|
||||
-libcall_ui_dep = libcall_ui.get_variable('libcall_ui_dep')
|
||||
+libcall_ui_dep = dependency('call-ui')
|
||||
libnm_dep = dependency('libnm', version: '>= 1.14')
|
||||
libpolkit_agent_dep = dependency('polkit-agent-1', version: '>= 0.122')
|
||||
libsoup_dep = dependency('libsoup-3.0', version: '>= 3.6')
|
||||
--
|
||||
2.47.1
|
||||
|
||||
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
|
||||
REQUIRED_DISTRO_FEATURES = "wayland polkit pam pulseaudio"
|
||||
|
||||
DEPENDS = " \
|
||||
libcall-ui \
|
||||
callaudiod \
|
||||
evolution-data-server \
|
||||
evince \
|
||||
feedbackd \
|
||||
@@ -19,11 +19,11 @@ DEPENDS = " \
|
||||
gcr3 \
|
||||
libgudev \
|
||||
libhandy \
|
||||
libgnome-volume-control \
|
||||
libsecret \
|
||||
networkmanager \
|
||||
polkit \
|
||||
pulseaudio \
|
||||
qrcodegen \
|
||||
libsoup \
|
||||
upower \
|
||||
wayland \
|
||||
@@ -50,12 +50,14 @@ PACKAGECONFIG ?= ""
|
||||
|
||||
inherit features_check gsettings meson pkgconfig gtk-icon-cache gobject-introspection gi-docgen
|
||||
|
||||
SRC_URI = " \
|
||||
git://gitlab.gnome.org/World/Phosh/phosh.git;protocol=https;nobranch=1 \
|
||||
file://0001-meson-build-without-subproject-wrap.patch \
|
||||
"
|
||||
SRC_URI = "git://gitlab.gnome.org/World/Phosh/phosh.git;protocol=https;nobranch=1;name=phosh"
|
||||
SRC_URI += "git://gitlab.gnome.org/GNOME/libgnome-volume-control.git;protocol=https;subdir=${S}/subprojects/gvc;name=gvc;nobranch=1"
|
||||
SRC_URI += "git://gitlab.gnome.org/World/Phosh/libcall-ui;protocol=https;subdir=${S}/subprojects/libcall-ui;name=libcall-ui;nobranch=1"
|
||||
SRCREV_phosh = "484333d2b0536bb0eb1aae61884bcdd978bad49f"
|
||||
SRCREV_gvc = "d2442f455844e5292cb4a74ffc66ecc8d7595a9f"
|
||||
SRCREV_libcall-ui = "7389b4ae90e101620ef8e790e76a98e434bd920c"
|
||||
SRCREV_FORMAT = "phosh"
|
||||
|
||||
SRCREV = "2ac03f70f8d42b729def38e282f5b600286655fb"
|
||||
|
||||
EXTRA_OEMESON += "--buildtype=release"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
require cage.inc
|
||||
|
||||
DEPENDS += "\
|
||||
wlroots-0.19 \
|
||||
wlroots-0.20 \
|
||||
"
|
||||
|
||||
SRCREV = "a1e5bf3789ece68ee703e93f3843906d29cad394"
|
||||
SRCREV = "94904c714d1fcc3c9dc9d74ef8c5c597e8bd9d7a"
|
||||
|
||||
@@ -1,72 +0,0 @@
|
||||
From 596cf2f2e1cbe68ce5673711d84cbfd576d40db1 Mon Sep 17 00:00:00 2001
|
||||
From: Markus Volk <f_l_k@t-online.de>
|
||||
Date: Sun, 23 Jul 2023 10:19:54 +0200
|
||||
Subject: [PATCH] hyprland: update
|
||||
|
||||
Upstream-Status: Pending
|
||||
---
|
||||
meson.build | 17 +----------------
|
||||
src/meson.build | 6 +++---
|
||||
2 files changed, 4 insertions(+), 19 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 81d6e403..04503a3c 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -33,20 +33,7 @@ if cpp_compiler.check_header('execinfo.h')
|
||||
add_project_arguments('-DHAS_EXECINFO', language: 'cpp')
|
||||
endif
|
||||
|
||||
-wlroots = subproject('wlroots', default_options: ['examples=false', 'renderers=gles2'])
|
||||
-have_xwlr = wlroots.get_variable('features').get('xwayland')
|
||||
-xcb_dep = dependency('xcb', required: get_option('xwayland'))
|
||||
-
|
||||
-cmake = import('cmake')
|
||||
-udis = cmake.subproject('udis86')
|
||||
-udis86 = udis.dependency('libudis86')
|
||||
-
|
||||
-if get_option('xwayland').enabled() and not have_xwlr
|
||||
- error('Cannot enable Xwayland in Hyprland: wlroots has been built without Xwayland support')
|
||||
-endif
|
||||
-have_xwayland = xcb_dep.found() and have_xwlr
|
||||
-
|
||||
-if not have_xwayland
|
||||
+if get_option('xwayland').disabled()
|
||||
add_project_arguments('-DNO_XWAYLAND', language: 'cpp')
|
||||
endif
|
||||
|
||||
@@ -69,8 +56,6 @@ if get_option('buildtype') == 'debug'
|
||||
add_project_arguments('-DHYPRLAND_DEBUG', language: 'cpp')
|
||||
endif
|
||||
|
||||
-version_h = run_command('sh', '-c', 'scripts/generateVersion.sh')
|
||||
-
|
||||
globber = run_command('find', 'src', '-name', '*.h*', check: true)
|
||||
headers = globber.stdout().strip().split('\n')
|
||||
foreach file : headers
|
||||
diff --git a/src/meson.build b/src/meson.build
|
||||
index 59771fcf..a77349c4 100644
|
||||
--- a/src/meson.build
|
||||
+++ b/src/meson.build
|
||||
@@ -9,7 +9,7 @@ executable('Hyprland', src,
|
||||
server_protos,
|
||||
dependency('wayland-server'),
|
||||
dependency('wayland-client'),
|
||||
- wlroots.get_variable('wlroots'),
|
||||
+ dependency('wlroots'),
|
||||
dependency('cairo'),
|
||||
dependency('hyprcursor'),
|
||||
dependency('hyprlang', version: '>= 0.3.2'),
|
||||
@@ -17,10 +17,10 @@ executable('Hyprland', src,
|
||||
dependency('egl'),
|
||||
dependency('xkbcommon'),
|
||||
dependency('libinput'),
|
||||
- xcb_dep,
|
||||
+ dependency('xcb', required: get_option('xwayland')),
|
||||
backtrace_dep,
|
||||
systemd_dep,
|
||||
- udis86,
|
||||
+ dependency('udis86'),
|
||||
|
||||
dependency('pixman-1'),
|
||||
dependency('gl', 'opengl'),
|
||||
@@ -1,55 +0,0 @@
|
||||
SUMMARY = "A Wayland WM"
|
||||
HOMEPAGE = "https://hyprland.org/"
|
||||
SECTION = "graphics"
|
||||
LICENSE = "BSD-3-Clause"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=e5285450935e9c47f839569c8cbd4e29"
|
||||
|
||||
REQUIRED_DISTRO_FEATURES = "wayland opengl"
|
||||
|
||||
DEPENDS += " \
|
||||
cairo \
|
||||
hyprcursor \
|
||||
hyprlang \
|
||||
jq-native \
|
||||
hwdata-native \
|
||||
libdisplay-info \
|
||||
libliftoff \
|
||||
libdrm \
|
||||
libinput \
|
||||
libxkbcommon \
|
||||
pango \
|
||||
pixman \
|
||||
seatd \
|
||||
tomlplusplus \
|
||||
virtual/egl \
|
||||
wayland \
|
||||
wayland-native \
|
||||
"
|
||||
|
||||
RRECOMMENDS:${PN} ?= " \
|
||||
foot \
|
||||
jq \
|
||||
grim \
|
||||
slurp \
|
||||
wl-clipboard \
|
||||
hyprland-contrib \
|
||||
"
|
||||
|
||||
SRC_URI = "gitsm://github.com/hyprwm/Hyprland.git;protocol=https;branch=v0.38.1-b"
|
||||
|
||||
SRCREV = "360ede79d124ffdeebbe8401f1ac4bc0dbec2c91"
|
||||
|
||||
inherit meson pkgconfig features_check
|
||||
|
||||
PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd xwayland', d)}"
|
||||
|
||||
PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled"
|
||||
PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,libxcb xcb-util-wm xcb-util-renderutil xwayland,xwayland"
|
||||
PACKAGECONFIG[legacy_renderer] = "-Dlegacy_renderer=enabled,-Dlegacy_renderer=disabled"
|
||||
|
||||
do_configure:prepend() {
|
||||
cd ${S} && scripts/generateVersion.sh
|
||||
}
|
||||
|
||||
FILES:${PN} += "${datadir}"
|
||||
@@ -1,61 +0,0 @@
|
||||
SUMMARY = "A Wayland WM"
|
||||
HOMEPAGE = "https://hyprland.org/"
|
||||
SECTION = "graphics"
|
||||
LICENSE = "BSD-3-Clause"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=e5285450935e9c47f839569c8cbd4e29"
|
||||
|
||||
REQUIRED_DISTRO_FEATURES = "wayland opengl"
|
||||
|
||||
DEPENDS += " \
|
||||
cairo \
|
||||
hyprcursor \
|
||||
hyprlang \
|
||||
hyprutils \
|
||||
jq-native \
|
||||
hwdata-native \
|
||||
libdisplay-info \
|
||||
libliftoff \
|
||||
libdrm \
|
||||
libinput \
|
||||
libxkbcommon \
|
||||
pango \
|
||||
pixman \
|
||||
seatd \
|
||||
tomlplusplus \
|
||||
util-linux-libuuid \
|
||||
virtual/egl \
|
||||
wayland \
|
||||
wayland-native \
|
||||
xcb-util-errors \
|
||||
hyprwayland-scanner-native \
|
||||
"
|
||||
|
||||
RRECOMMENDS:${PN} ?= " \
|
||||
foot \
|
||||
jq \
|
||||
grim \
|
||||
slurp \
|
||||
wl-clipboard \
|
||||
hyprland-contrib \
|
||||
"
|
||||
|
||||
SRC_URI = "gitsm://github.com/hyprwm/Hyprland.git;protocol=https;branch=main"
|
||||
|
||||
SRCREV = "918d8340afd652b011b937d29d5eea0be08467f5"
|
||||
PV = "0.41.2"
|
||||
|
||||
inherit meson pkgconfig features_check
|
||||
|
||||
PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd xwayland', d)}"
|
||||
|
||||
PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled"
|
||||
PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,libxcb xcb-util-wm xcb-util-renderutil xwayland,xwayland"
|
||||
PACKAGECONFIG[legacy_renderer] = "-Dlegacy_renderer=enabled,-Dlegacy_renderer=disabled"
|
||||
|
||||
do_configure:prepend() {
|
||||
cd ${S} && scripts/generateVersion.sh
|
||||
}
|
||||
|
||||
FILES:${PN} += "${datadir}"
|
||||
|
||||
@@ -20,13 +20,15 @@ DEPENDS += " \
|
||||
wayland \
|
||||
wayland-native \
|
||||
wayland-protocols \
|
||||
wlroots-0.18 \
|
||||
wlroots-0.19 \
|
||||
"
|
||||
|
||||
SRC_URI = " \
|
||||
git://gitlab.gnome.org/World/Phosh/phoc.git;protocol=https;nobranch=1"
|
||||
SRC_URI = "git://gitlab.gnome.org/World/Phosh/phoc.git;protocol=https;nobranch=1;name=phoc"
|
||||
SRC_URI += "git://gitlab.gnome.org/GNOME/gvdb.git;protocol=https;subdir=${S}/subprojects/gvdb;name=gvdb;nobranch=1"
|
||||
|
||||
SRCREV = "1046f9b6c84efcec21d3df0b9767bc61a2c1f1b3"
|
||||
SRCREV_phoc = "c95299804a7be6eda53afa2ac6f37f6d97e57081"
|
||||
SRCREV_gvdb = "4758f6fb7f889e074e13df3f914328f3eecb1fd3"
|
||||
SRCREV_FORMAT = "phoc"
|
||||
|
||||
inherit features_check gsettings meson pkgconfig
|
||||
|
||||
@@ -48,5 +48,5 @@ CFLAGS += "-Wno-calloc-transposed-args"
|
||||
|
||||
do_install:append() {
|
||||
install -d ${D}${bindir}
|
||||
install -m 0755 ${B}/tinywl/tinywl ${D}${bindir}/tinywl-0.16
|
||||
install -m 0755 ${B}/tinywl/tinywl ${D}${bindir}/tinywl-${PV}
|
||||
}
|
||||
|
||||
@@ -47,5 +47,5 @@ EXTRA_OEMESON += "--buildtype release"
|
||||
|
||||
do_install:append() {
|
||||
install -d ${D}${bindir}
|
||||
install -m 0755 ${B}/tinywl/tinywl ${D}${bindir}/tinywl-0.17
|
||||
install -m 0755 ${B}/tinywl/tinywl ${D}${bindir}/tinywl-${PV}
|
||||
}
|
||||
|
||||
@@ -48,7 +48,7 @@ EXTRA_OEMESON += "--buildtype release"
|
||||
|
||||
do_install:append() {
|
||||
install -d ${D}${bindir}
|
||||
install -m 0755 ${B}/tinywl/tinywl ${D}${bindir}/tinywl-0.18
|
||||
install -m 0755 ${B}/tinywl/tinywl ${D}${bindir}/tinywl-${PV}
|
||||
}
|
||||
|
||||
FILES:${PN} += "${libdir}/libwlroots-*.so"
|
||||
|
||||
@@ -49,7 +49,7 @@ EXTRA_OEMESON += "--buildtype release"
|
||||
|
||||
do_install:append() {
|
||||
install -d ${D}${bindir}
|
||||
install -m 0755 ${B}/tinywl/tinywl ${D}${bindir}
|
||||
install -m 0755 ${B}/tinywl/tinywl ${D}${bindir}/tinywl-${PV}
|
||||
}
|
||||
|
||||
FILES:${PN} += "${libdir}/libwlroots-*.so"
|
||||
|
||||
@@ -50,7 +50,7 @@ EXTRA_OEMESON += "--buildtype release"
|
||||
|
||||
do_install:append() {
|
||||
install -d ${D}${bindir}
|
||||
install -m 0755 ${B}/tinywl/tinywl ${D}${bindir}
|
||||
install -m 0755 ${B}/tinywl/tinywl ${D}${bindir}/tinywl-${PV}
|
||||
}
|
||||
|
||||
FILES:${PN} += "${libdir}/libwlroots-*.so"
|
||||
|
||||
@@ -50,7 +50,7 @@ EXTRA_OEMESON += "--buildtype release"
|
||||
|
||||
do_install:append() {
|
||||
install -d ${D}${bindir}
|
||||
install -m 0755 ${B}/tinywl/tinywl ${D}${bindir}
|
||||
install -m 0755 ${B}/tinywl/tinywl ${D}${bindir}/tinywl-${PV}
|
||||
}
|
||||
|
||||
FILES:${PN} += "${libdir}/libwlroots-*.so"
|
||||
|
||||
Reference in New Issue
Block a user