restructure our recipe tree
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
@@ -1,35 +0,0 @@
|
||||
SUMMARY = "Compton is a compositor for X"
|
||||
LICENSE = "NTP & MIT"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=51f8a6ef7a22968bea284609c6093146"
|
||||
|
||||
REQUIRED_DISTRO_FEATURES = "x11"
|
||||
|
||||
inherit autotools-brokensep
|
||||
|
||||
DEPENDS = " \
|
||||
virtual/libx11 \
|
||||
libxcomposite \
|
||||
libxdamage \
|
||||
libxfixes \
|
||||
libxext \
|
||||
libxrender \
|
||||
libxrandr \
|
||||
libpcre \
|
||||
libconfig \
|
||||
libxinerama \
|
||||
libdrm \
|
||||
dbus \
|
||||
"
|
||||
|
||||
SRC_URI = " \
|
||||
git://github.com/chjj/compton.git \
|
||||
file://0001-Makefile-use-pkgconfig-to-find-libpcre.patch \
|
||||
file://0002-Makefile-don-t-build-manpages.patch \
|
||||
"
|
||||
SRCREV = "86266e00e2bdac46d0a8dabfc1db3e29af91640e"
|
||||
PV = "v0.1-beta2+git${SRCPV}"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
# there are not many machines around supporting gl
|
||||
EXTRA_OEMAKE = "NO_VSYNC_OPENGL=1"
|
||||
@@ -1,33 +0,0 @@
|
||||
From 40fff6e760920d6b31dc98dbcbde081845ac26b0 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Wed, 26 Aug 2015 22:31:35 +0200
|
||||
Subject: [PATCH 1/2] Makefile: use pkgconfig to find libpcre
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
Makefile | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index e66f322..d9737f7 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -39,8 +39,8 @@ endif
|
||||
# Enables support for PCRE regular expression pattern in window conditions
|
||||
ifeq "$(NO_REGEX_PCRE)" ""
|
||||
CFG += -DCONFIG_REGEX_PCRE
|
||||
- LIBS += $(shell pcre-config --libs)
|
||||
- INCS += $(shell pcre-config --cflags)
|
||||
+ LIBS += $(shell pkg-config --libs libpcre)
|
||||
+ INCS += $(shell pkg-config --cflags libpcre)
|
||||
# Enables JIT support in libpcre
|
||||
ifeq "$(NO_REGEX_PCRE_JIT)" ""
|
||||
CFG += -DCONFIG_REGEX_PCRE_JIT
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
From c5fbed297f765b222d92c4eca15743c8f8b4741d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Wed, 26 Aug 2015 23:04:41 +0200
|
||||
Subject: [PATCH 2/2] Makefile: don't build manpages
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
we don't have all these tools neccessary in oe
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
Makefile | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index e66f322..94d595c 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -126,8 +126,6 @@ INCS += $(shell pkg-config --cflags $(PACKAGES))
|
||||
CFLAGS += -Wall
|
||||
|
||||
BINS = compton bin/compton-trans
|
||||
-MANPAGES = man/compton.1 man/compton-trans.1
|
||||
-MANPAGES_HTML = $(addsuffix .html,$(MANPAGES))
|
||||
|
||||
# === Recipes ===
|
||||
.DEFAULT_GOAL := compton
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
From 45038115cf962f0b5923a74ae362e3a430ec5a3b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Sat, 21 Feb 2015 16:35:40 +0100
|
||||
Subject: [PATCH] fix qml install dir
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
components/CMakeLists.txt | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
|
||||
index bf95f4c..ac75b90 100644
|
||||
--- a/components/CMakeLists.txt
|
||||
+++ b/components/CMakeLists.txt
|
||||
@@ -1,8 +1,8 @@
|
||||
configure_file("${COMPONENTS_VERSION}/LayoutBox.qml" "${COMPONENTS_VERSION}/LayoutBox.qml")
|
||||
configure_file("common/qmldir" "common/qmldir")
|
||||
|
||||
-install(DIRECTORY "${COMPONENTS_VERSION}/" DESTINATION "${QT_IMPORTS_DIR}/SddmComponents")
|
||||
-install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${COMPONENTS_VERSION}/" DESTINATION "${QT_IMPORTS_DIR}/SddmComponents")
|
||||
+install(DIRECTORY "${COMPONENTS_VERSION}/" DESTINATION "${QML_INSTALL_DIR}/SddmComponents")
|
||||
+install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${COMPONENTS_VERSION}/" DESTINATION "${QML_INSTALL_DIR}/SddmComponents")
|
||||
|
||||
-install(DIRECTORY "common/" DESTINATION "${QT_IMPORTS_DIR}/SddmComponents")
|
||||
-install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/common/" DESTINATION "${QT_IMPORTS_DIR}/SddmComponents")
|
||||
+install(DIRECTORY "common/" DESTINATION "${QML_INSTALL_DIR}/SddmComponents")
|
||||
+install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/common/" DESTINATION "${QML_INSTALL_DIR}/SddmComponents")
|
||||
--
|
||||
1.9.3
|
||||
|
||||
@@ -1,84 +0,0 @@
|
||||
[Autologin]
|
||||
# Autologin again on session exit
|
||||
#Relogin=false
|
||||
|
||||
# Autologin session
|
||||
#Session=
|
||||
|
||||
# Autologin user
|
||||
#User=
|
||||
|
||||
|
||||
[General]
|
||||
# Halt command
|
||||
HaltCommand=/bin/systemctl poweroff
|
||||
|
||||
# Initial NumLock state
|
||||
# Valid values: on|off|none
|
||||
# If property is set to none, numlock won't be changed
|
||||
#Numlock=none
|
||||
|
||||
# Reboot command
|
||||
RebootCommand=/bin/systemctl reboot
|
||||
|
||||
|
||||
[Theme]
|
||||
# Current theme name
|
||||
Current=maui
|
||||
|
||||
# Cursor theme
|
||||
#CursorTheme=
|
||||
|
||||
# Face icon directory
|
||||
# The files should be in username.face.icon format
|
||||
FacesDir=/usr/share/sddm/faces
|
||||
|
||||
# Theme directory path
|
||||
ThemeDir=/usr/share/sddm/themes
|
||||
|
||||
|
||||
[Users]
|
||||
# Default $PATH
|
||||
DefaultPath=/usr/bin:/usr/bin/qt5
|
||||
|
||||
# Hidden shells
|
||||
# Users with these shells as their default won't be listed
|
||||
#HideShells=
|
||||
|
||||
# Hidden users
|
||||
#HideUsers=
|
||||
|
||||
# Maximum user id for displayed users
|
||||
#MaximumUid=65000
|
||||
|
||||
# Minimum user id for displayed users
|
||||
MinimumUid=1000
|
||||
|
||||
# Remember the session of the last successfully logged in user
|
||||
#RememberLastSession=true
|
||||
|
||||
# Remember the last successfully logged in user
|
||||
#RememberLastUser=true
|
||||
|
||||
|
||||
[XDisplay]
|
||||
# Xsetup script path
|
||||
# A script to execute when starting the display server
|
||||
#DisplayCommand=/usr/share/sddm/scripts/Xsetup
|
||||
|
||||
# Minimum VT
|
||||
# The lowest virtual terminal number that will be used.
|
||||
#MinimumVT=1
|
||||
|
||||
# X server path
|
||||
ServerPath=/usr/bin/X
|
||||
|
||||
# Xsession script path
|
||||
# A script to execute when starting the desktop session
|
||||
#SessionCommand=/etc/X11/xinit/Xsession
|
||||
|
||||
# Session description directory
|
||||
SessionDir=/usr/share/xsessions
|
||||
|
||||
# Xauth path
|
||||
XauthPath=/usr/bin/xauth
|
||||
@@ -1,17 +0,0 @@
|
||||
#%PAM-1.0
|
||||
|
||||
auth requisite pam_nologin.so
|
||||
auth required pam_env.so
|
||||
#auth required pam_unix.so
|
||||
# To deny passwordless login comment next line and uncomment previous line
|
||||
auth required pam_unix.so nullok
|
||||
|
||||
account required pam_unix.so
|
||||
|
||||
session required pam_limits.so
|
||||
session required pam_unix.so
|
||||
-session optional pam_systemd.so
|
||||
-session optional pam_kwallet.so
|
||||
|
||||
password required pam_unix.so
|
||||
|
||||
@@ -1,55 +0,0 @@
|
||||
SUMMARY = "SDDM is a modern display manager for X11"
|
||||
LICENSE = "GPLv2 & CC-BY-3.0 & CC-BY-NC-SA-3.0"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
||||
file://COPYING-CC-BY-3.0;md5=3f91257948001a369d427b9028de84b2 \
|
||||
file://COPYING-CC-BY-SA-3.0;md5=c0e44077d8998dd1cd1324f7bc4d7b67 \
|
||||
"
|
||||
|
||||
REQUIRED_DISTRO_FEATURES = "x11"
|
||||
|
||||
inherit cmake_qt5 pkgconfig systemd useradd distro_features_check
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative qttools-native libxcb"
|
||||
# REVISIT optionals
|
||||
DEPENDS += "libpam"
|
||||
|
||||
SRC_URI = " \
|
||||
git://github.com/sddm/${BPN}.git;protocol=git;branch=master \
|
||||
file://0001-fix-qml-install-dir.patch \
|
||||
file://sddm.pam \
|
||||
file://sddm.conf \
|
||||
"
|
||||
SRCREV = "19780278b30ac5f50e78f4acd3f01f79b759b9cc"
|
||||
PV = "0.11.0+git${SRCPV}"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
EXTRA_OECMAKE += "-DQML_INSTALL_DIR=${OE_QMAKE_PATH_QML}"
|
||||
|
||||
do_install_append() {
|
||||
install -d ${D}/${sysconfdir}
|
||||
install -m 644 ${WORKDIR}/sddm.conf ${D}/${sysconfdir}
|
||||
|
||||
install -d ${D}${sysconfdir}/pam.d
|
||||
install -m 644 ${WORKDIR}/sddm.pam ${D}${sysconfdir}/pam.d/sddm
|
||||
|
||||
install -d ${D}${localstatedir}/lib/sddm
|
||||
chown -R sddm:sddm ${D}${localstatedir}/lib/sddm
|
||||
chmod 0750 ${D}${localstatedir}/lib/sddm
|
||||
}
|
||||
|
||||
FILES_${PN} += "${OE_QMAKE_PATH_QML}"
|
||||
|
||||
SYSTEMD_SERVICE_${PN} = "${BPN}.service"
|
||||
|
||||
USERADD_PACKAGES = "${PN}"
|
||||
USERADD_PARAM_${PN} = "--system --home ${localstatedir}/lib/sddm --shell /bin/false --user-group --groups video sddm"
|
||||
|
||||
RDEPENDS_${PN} += " \
|
||||
qtbase-plugins \
|
||||
qtbase-fonts \
|
||||
qtdeclarative-plugins \
|
||||
qtdeclarative-qmlplugins \
|
||||
"
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
require recipes-graphics/xorg-lib/xcb-util.inc
|
||||
|
||||
DEPENDS += "xcb-util xcb-util-renderutil xcb-util-image"
|
||||
|
||||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=ce469b61c70ff8d7cce0547476891974"
|
||||
|
||||
SRC_URI[md5sum] = "88e70d92ff5616d406ce5b1b62e0c58b"
|
||||
SRC_URI[sha256sum] = "ed65367b810d47ab637011585135f4a84dd12e235dddcd3b26e0cfb3be21fb3a"
|
||||
Reference in New Issue
Block a user