Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (a04221ecadba050a9b226b580688ae32317de648)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (a04221ecadba050a9b226b580688ae32317de648)
  • Date: Sat, 8 Oct 2022 12:38:19 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

libs/libva/BUILD | 3 ---
libs/libva/DEPENDS | 13 ++++++-------
libs/libva/DETAILS | 1 +
libs/libva/HISTORY | 2 ++
libs/libva/PRE_BUILD | 4 ----
libs/libva/REPAIR^all^PRE_SUB_DEPENDS | 17 +++++++++++++----
libs/libva/SUB_DEPENDS | 6 +++---
7 files changed, 25 insertions(+), 21 deletions(-)

New commits:
commit a04221ecadba050a9b226b580688ae32317de648
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libva - use meson build

diff --git a/libs/libva/BUILD b/libs/libva/BUILD
deleted file mode 100755
index d22e99f..0000000
--- a/libs/libva/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-make_single &&
-default_build &&
-make_normal
diff --git a/libs/libva/DEPENDS b/libs/libva/DEPENDS
index dc783f9..d927fa50 100755
--- a/libs/libva/DEPENDS
+++ b/libs/libva/DEPENDS
@@ -1,15 +1,14 @@
-depends autoconf &&
-depends automake &&
+source $GRIMOIRE/MESON_DEPENDS &&

-optional_depends doxygen "--enable-docs" "--disable-docs" "build docs"
&&
-optional_depends MESA "--enable-glx" "--disable-glx" "VA/GLX API
support" &&
-optional_depends libdrm "--enable-drm" "--disable-drm" "DRM driver"
&&
+optional_depends doxygen enable_docs={true,false} "build docs" &&
+optional_depends MESA with_glx={yes,no} "VA/GLX API support" &&
+optional_depends libdrm disable_drm={false,true} "DRM driver" &&

# Those should be optional in future. Interdependencies of the
# different APIs should be assessed.
-optional_depends libx11 "--enable-x11" "--disable-x11" "X11 driver"
&&
+optional_depends libx11 with_x11={yes,no} "X11 driver" &&
if is_depends_enabled $SPELL libx11; then
depends libxfixes &&
depends libxext
fi &&
-optional_depends wayland "--enable-wayland" "--disable-wayland" "Wayland
driver"
+optional_depends wayland with_wayland={yes,no} "Wayland driver"
diff --git a/libs/libva/DETAILS b/libs/libva/DETAILS
index 8210c06..227407d 100755
--- a/libs/libva/DETAILS
+++ b/libs/libva/DETAILS
@@ -1,3 +1,4 @@
+source $GRIMOIRE/MESON_FUNCTIONS
SPELL=libva
VERSION=2.16.0

SOURCE_HASH=sha512:08a1481ac693ee9de639f2abd483e1fabfee87f9c04ead066dfce5c24cc7f1d1a29d8664707bb534ce4cc25e52086c5e4a0ecfe704ca59590ce41353fda31c2a
diff --git a/libs/libva/HISTORY b/libs/libva/HISTORY
index 7b9998f..d00743e 100644
--- a/libs/libva/HISTORY
+++ b/libs/libva/HISTORY
@@ -1,5 +1,7 @@
2022-10-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.16.0
+ * *: use meson build
+ * PRE_BUILD BUILD: deleted

2022-07-06 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 2.15.0
diff --git a/libs/libva/PRE_BUILD b/libs/libva/PRE_BUILD
deleted file mode 100755
index 2c7959e..0000000
--- a/libs/libva/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-autoreconf -fi
diff --git a/libs/libva/REPAIR^all^PRE_SUB_DEPENDS
b/libs/libva/REPAIR^all^PRE_SUB_DEPENDS
index 72cae9c..ee61e76 100755
--- a/libs/libva/REPAIR^all^PRE_SUB_DEPENDS
+++ b/libs/libva/REPAIR^all^PRE_SUB_DEPENDS
@@ -1,6 +1,15 @@
case $THIS_SUB_DEPENDS in
- DRM) is_depends_enabled $SPELL libdrm && return 0 ;;
- X11) is_depends_enabled $SPELL libx11 && return 0 ;;
- WAYLAND) is_depends_enabled $SPELL wayland && return 0 ;;
+ DRM) message "${MESSAGE_COLOR}DRM support requested, enforcing
it.$DEFAULT_COLOR" &&
+ depends libdrm "disable_drm=false"
+ ;;
+ X11) message "${MESSAGE_COLOR}X11 support requested, enforcing
it.$DEFAULT_COLOR" &&
+ depends libx11 "with_x11=yes" &&
+ depends libxfixes &&
+ depends libxext
+ ;;
+ WAYLAND) message "${MESSAGE_COLOR}Wayland support requested, enforcing
it.$DEFAULT_COLOR" &&
+ depends wayland "with_wayland=yes"
+ ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
esac
-return 1
diff --git a/libs/libva/SUB_DEPENDS b/libs/libva/SUB_DEPENDS
index a289797..ee61e76 100755
--- a/libs/libva/SUB_DEPENDS
+++ b/libs/libva/SUB_DEPENDS
@@ -1,14 +1,14 @@
case $THIS_SUB_DEPENDS in
DRM) message "${MESSAGE_COLOR}DRM support requested, enforcing
it.$DEFAULT_COLOR" &&
- depends libdrm "--enable-drm"
+ depends libdrm "disable_drm=false"
;;
X11) message "${MESSAGE_COLOR}X11 support requested, enforcing
it.$DEFAULT_COLOR" &&
- depends libx11 "--enable-x11" &&
+ depends libx11 "with_x11=yes" &&
depends libxfixes &&
depends libxext
;;
WAYLAND) message "${MESSAGE_COLOR}Wayland support requested, enforcing
it.$DEFAULT_COLOR" &&
- depends wayland "--enable-wayland"
+ depends wayland "with_wayland=yes"
;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
return 1;;



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (a04221ecadba050a9b226b580688ae32317de648), Treeve Jelbert, 10/08/2022

Archive powered by MHonArc 2.6.24.

Top of Page