Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (770539beb64da6ac6ad5a1114614a66587f21198)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (770539beb64da6ac6ad5a1114614a66587f21198)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (770539beb64da6ac6ad5a1114614a66587f21198)
  • Date: Sun, 13 Mar 2022 02:56:08 +0000
GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemaage.org>:

ChangeLog | 4 ++++
MESON_DEPENDS | 3 +++
MESON_FUNCTIONS | 12 ++++++++++--
graphics-libs/harfbuzz/DEPENDS | 2 +-
graphics-libs/harfbuzz/HISTORY | 3 +++
graphics-libs/mesa/DEPENDS | 4 +---
graphics-libs/mesa/HISTORY | 3 +++
libs/libdrm/DEPENDS | 4 +---
libs/libdrm/HISTORY | 3 +++
python-pypi/meson/DEPENDS | 2 +-
python-pypi/meson/HISTORY | 3 +++
video/pipewire/DEPENDS | 3 +--
video/pipewire/HISTORY | 3 +++
video/wireplumber/DEPENDS | 3 +--
video/wireplumber/HISTORY | 3 +++
15 files changed, 41 insertions(+), 14 deletions(-)

New commits:
commit 770539beb64da6ac6ad5a1114614a66587f21198
Author: Pavel Vinogradov <public AT sourcemaage.org>
Commit: Pavel Vinogradov <public AT sourcemaage.org>

video/wireplumber: use grimoire-wide MESON_DEPENDS

commit 0cb8848a6e320592c8007170ddfd7eb41fc566db
Author: Pavel Vinogradov <public AT sourcemaage.org>
Commit: Pavel Vinogradov <public AT sourcemaage.org>

video/pipewire: use grimoire-wide MESON_DEPENDS

commit 5db934f2cddac0b81f8ec73d16144001e52acf31
Author: Pavel Vinogradov <public AT sourcemaage.org>
Commit: Pavel Vinogradov <public AT sourcemaage.org>

graphics-libs/harfbuzz: use grimoire-wide MESON_DEPENDS

commit 33d14af7603870c29445921f6b5ac6886d57ddfc
Author: Pavel Vinogradov <public AT sourcemaage.org>
Commit: Pavel Vinogradov <public AT sourcemaage.org>

graphics-libs/mesa: use grimoire-wide MESON_DEPENDS

commit 70405fc2b9aff3f5953e152abececf60f0e4811d
Author: Pavel Vinogradov <public AT sourcemaage.org>
Commit: Pavel Vinogradov <public AT sourcemaage.org>

libs/libdrm: use grimoire-wide MESON_DEPENDS

commit 040632ec93e9b5fad2712a2d172eb8ec9b9d437f
Author: Pavel Vinogradov <public AT sourcemaage.org>
Commit: Pavel Vinogradov <public AT sourcemaage.org>

MESON_FUNCTIONS: added ability to work with samurai

commit 107c4ed033a2ce6dd1a344a93da570848b9583a4
Author: Pavel Vinogradov <public AT sourcemaage.org>
Commit: Pavel Vinogradov <public AT sourcemaage.org>

MESON_DEPENDS: added common dependencies for meson based spells

commit 296a1479cdf1c5d6abe265c02828e7144b949dd1
Author: Pavel Vinogradov <public AT sourcemaage.org>
Commit: Pavel Vinogradov <public AT sourcemaage.org>

python-pypi/meson: depends on NINJA-BUILD

diff --git a/ChangeLog b/ChangeLog
index 2dea87b..65441f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2022-03-12 Pavel Vinogradov <public AT sourcemage.org>
+ * MESON_DEPENDS: added common dependencies for meson based spells
+ * MESON_FUNCTIONS: added ability to work with samurai
+
2022-03-11 Treeve Jelbert <treeve AT sourcemage.org>
* lxqt/lxqt-runner: added
* lxqt/lxqt-themes: added
diff --git a/MESON_DEPENDS b/MESON_DEPENDS
new file mode 100755
index 0000000..795fcb9
--- /dev/null
+++ b/MESON_DEPENDS
@@ -0,0 +1,3 @@
+depends meson &&
+depends NINJA-BUILD &&
+depends python3
diff --git a/MESON_FUNCTIONS b/MESON_FUNCTIONS
index 94c6184..d09a247 100755
--- a/MESON_FUNCTIONS
+++ b/MESON_FUNCTIONS
@@ -12,12 +12,20 @@ meson_build () {
done
SCRIPT+=" . builddir/"
$SCRIPT &&
- ninja -j "$MAKE_NJOBS" -C builddir/
+
+ if type ninja >/dev/null 2>&1; then
+ NINJA="ninja"
+ else
+ NINJA="samu"
+ fi &&
+ export NINJA &&
+
+ ${NINJA} -j "$MAKE_NJOBS" -C builddir/
}

meson_install () {
cd $SOURCE_DIRECTORY
- ninja -C builddir/ install
+ ${NINJA} -C builddir/ install
}

default_build() {
diff --git a/graphics-libs/harfbuzz/DEPENDS b/graphics-libs/harfbuzz/DEPENDS
index 7428ef0..c55116f 100755
--- a/graphics-libs/harfbuzz/DEPENDS
+++ b/graphics-libs/harfbuzz/DEPENDS
@@ -1,4 +1,4 @@
-depends meson &&
+. "${GRIMOIRE}/MESON_DEPENDS" &&
depends ragel &&

optional_depends glib2 \
diff --git a/graphics-libs/harfbuzz/HISTORY b/graphics-libs/harfbuzz/HISTORY
index b19f6e0..516c61d 100644
--- a/graphics-libs/harfbuzz/HISTORY
+++ b/graphics-libs/harfbuzz/HISTORY
@@ -1,3 +1,6 @@
+2022-03-12 Pavel Vinogradov <public AT sourcemage.org>
+ * DEPENDS: include grimoire-wide MESON_DEPENDS
+
2022-03-11 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 4.0.1

diff --git a/graphics-libs/mesa/DEPENDS b/graphics-libs/mesa/DEPENDS
index e03f179..d1e98fb 100755
--- a/graphics-libs/mesa/DEPENDS
+++ b/graphics-libs/mesa/DEPENDS
@@ -1,7 +1,5 @@
. "$GRIMOIRE"/VDEPENDS &&
-depends meson &&
-depends ninja-build-system &&
-depends python3 &&
+. "${GRIMOIRE}/MESON_DEPENDS" &&
depends -sub "CXX" gcc &&
depends bison &&
depends flex &&
diff --git a/graphics-libs/mesa/HISTORY b/graphics-libs/mesa/HISTORY
index ab3ba40..9a96912 100644
--- a/graphics-libs/mesa/HISTORY
+++ b/graphics-libs/mesa/HISTORY
@@ -1,3 +1,6 @@
+2022-03-12 Pavel Vinogradov <public AT sourcemage.org>
+ * DEPENDS: include grimoire-wide MESON_DEPENDS
+
2022-03-10 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 22.0.0
* CONFIGURE, BUILD: removed the DRI drivers code
diff --git a/libs/libdrm/DEPENDS b/libs/libdrm/DEPENDS
index e5f6748..ddce9a2 100755
--- a/libs/libdrm/DEPENDS
+++ b/libs/libdrm/DEPENDS
@@ -1,6 +1,4 @@
-depends meson &&
-depends ninja-build-system &&
-depends python3 &&
+. "${GRIMOIRE}/MESON_DEPENDS" &&
depends libpciaccess &&

optional_depends DEVICE-MANAGER \
diff --git a/libs/libdrm/HISTORY b/libs/libdrm/HISTORY
index 771acfd..1e16b56 100644
--- a/libs/libdrm/HISTORY
+++ b/libs/libdrm/HISTORY
@@ -1,3 +1,6 @@
+2022-03-12 Pavel Vinogradov <public AT sourcemage.org>
+ * DEPENDS: include grimoire-wide MESON_DEPENDS
+
2021-12-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.4.109

diff --git a/python-pypi/meson/DEPENDS b/python-pypi/meson/DEPENDS
index 0cab971..a0fd3bb 100755
--- a/python-pypi/meson/DEPENDS
+++ b/python-pypi/meson/DEPENDS
@@ -1,3 +1,3 @@
depends python3 &&
depends setuptools &&
-depends ninja-build-system
+depends NINJA-BUILD
diff --git a/python-pypi/meson/HISTORY b/python-pypi/meson/HISTORY
index e2505a7..aed7cb8 100644
--- a/python-pypi/meson/HISTORY
+++ b/python-pypi/meson/HISTORY
@@ -1,3 +1,6 @@
+2022-03-12 Pavel Vinogradov <public AT sourcemage.org>
+ * DEPENDS: ninja-build-system -> NINJA-BUILD
+
2022-03-12 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 0.61.2

diff --git a/video/pipewire/DEPENDS b/video/pipewire/DEPENDS
index 5a99e76..308ca65 100755
--- a/video/pipewire/DEPENDS
+++ b/video/pipewire/DEPENDS
@@ -1,5 +1,4 @@
-depends meson &&
-depends ninja-build-system &&
+. "${GRIMOIRE}/MESON_DEPENDS" &&
depends dbus &&
depends pkgconfig &&
depends DEVICE-MANAGER udev=enabled &&
diff --git a/video/pipewire/HISTORY b/video/pipewire/HISTORY
index 23f605e..2d0f366 100644
--- a/video/pipewire/HISTORY
+++ b/video/pipewire/HISTORY
@@ -1,3 +1,6 @@
+2022-03-12 Pavel Vinogradov <public AT sourcemage.org>
+ * DEPENDS: include grimoire-wide MESON_DEPENDS
+
2022-03-03 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 0.3.48

diff --git a/video/wireplumber/DEPENDS b/video/wireplumber/DEPENDS
index 7c9bc40..655a88a 100755
--- a/video/wireplumber/DEPENDS
+++ b/video/wireplumber/DEPENDS
@@ -1,8 +1,7 @@
if [[ "${WIREPLUMBER_BRANCH}" == scm ]]; then
depends git
fi &&
-depends meson &&
-depends ninja-build-system &&
+. "${GRIMOIRE}/MESON_DEPENDS" &&
depends glib2 &&
depends pipewire &&

diff --git a/video/wireplumber/HISTORY b/video/wireplumber/HISTORY
index 8747cab..9418a8a 100644
--- a/video/wireplumber/HISTORY
+++ b/video/wireplumber/HISTORY
@@ -1,3 +1,6 @@
+2022-03-12 Pavel Vinogradov <public AT sourcemage.org>
+ * DEPENDS: include grimoire-wide MESON_DEPENDS
+
2022-02-07 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 0.4.8
* DEPENDS: scm branch needs git


  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (770539beb64da6ac6ad5a1114614a66587f21198), Pavel Vinogradov, 03/12/2022

Archive powered by MHonArc 2.6.24.

Top of Page