Skip to Content.
Sympa Menu

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

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 (3ce4508b811006a882f6b160b296d7f8a35d4ddd)
  • Date: Tue, 6 Mar 2018 08:19:42 +0000

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

kde5-apps/latte-dock/DETAILS | 4 ++--
kde5-apps/latte-dock/HISTORY | 3 +++
libs/libdrm/BUILD | 30 ++++++++++--------------------
libs/libdrm/CONFIGURE | 14 ++++++++++----
libs/libdrm/DEPENDS | 31 +++++++++++++++++--------------
libs/libdrm/DETAILS | 3 ++-
libs/libdrm/HISTORY | 4 ++++
libs/libdrm/PRE_BUILD | 7 -------
libs/libdrm/PRE_SUB_DEPENDS | 13 +++++++++----
libs/libdrm/SUB_DEPENDS | 13 +++++++++----
10 files changed, 66 insertions(+), 56 deletions(-)

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

libdrm: => 2.4.91

commit 8a5c7ffb42f1faa2436cae3605087b860811d877
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

latte-dock: => 0.7.4

diff --git a/kde5-apps/latte-dock/DETAILS b/kde5-apps/latte-dock/DETAILS
index 51081d3..e1e2923 100755
--- a/kde5-apps/latte-dock/DETAILS
+++ b/kde5-apps/latte-dock/DETAILS
@@ -1,6 +1,6 @@
SPELL=latte-dock
- VERSION=0.7.2
-
SOURCE_HASH=sha512:a332bede2438c5af6ac1ebb4fffe6954a0aa319438ce503d739f4878a28e54bf98dfcb64ef96ab9250cabe6e22b5c16e8308f61699642103e7085a0fedecdb05
+ VERSION=0.7.4
+
SOURCE_HASH=sha512:d4c1fa35b0cf463db1a37234f2721ff3dd45dfd720a56f12663b535efa9a005555fe6d2cbefb288d148049633758a9451b64ce823779339cab9f94682225a36e
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=https://github.com/psifidotos/$SPELLX
diff --git a/kde5-apps/latte-dock/HISTORY b/kde5-apps/latte-dock/HISTORY
index 2f7fe82..34210b0 100644
--- a/kde5-apps/latte-dock/HISTORY
+++ b/kde5-apps/latte-dock/HISTORY
@@ -1,3 +1,6 @@
+2018-03-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.7.4
+
2017-11-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.7.2
url now at kde
diff --git a/libs/libdrm/BUILD b/libs/libdrm/BUILD
index c057409..5d71a38 100755
--- a/libs/libdrm/BUILD
+++ b/libs/libdrm/BUILD
@@ -1,21 +1,11 @@
-if [[ $LIBDRM_AMD == y ]]; then
- OPTS="--enable-amdgpu $OPTS"
-else
- OPTS="--disable-amdgpu $OPTS"
-fi &&
-if [[ $LIBDRM_NV == y ]]; then
- OPTS="--enable-nouveau $OPTS"
-else
- OPTS="--disable-nouveau $OPTS"
-fi &&
-if [[ $LIBDRM_INTEL == n ]]; then
- OPTS="--disable-intel $OPTS"
-else
- OPTS="--enable-intel $OPTS"
-fi &&
-if [[ $LIBDRM_RADEON == y ]]; then
- OPTS="--enable-radeon $OPTS"
-else
- OPTS="--disable-radeon $OPTS"
-fi &&
+PREFIX=$INSTALL_ROOT/usr &&
+for API in $DRM_API;do
+ OPTS+=" $API=true"
+done &&
+# exclude all others
+for EXC in $DRM_ALL;do
+ if ! list_find "$DRM_API" $EXC;then
+ OPTS+=" $EXC=false"
+ fi
+done &&
default_build
diff --git a/libs/libdrm/CONFIGURE b/libs/libdrm/CONFIGURE
index 41af049..636b3ef 100755
--- a/libs/libdrm/CONFIGURE
+++ b/libs/libdrm/CONFIGURE
@@ -1,4 +1,10 @@
-config_query LIBDRM_AMD 'Enable amdgpu KMS api?' n
-config_query LIBDRM_NV 'Enable nouveau KMS api?' n
-config_query LIBDRM_INTEL 'Enable intel KMS api?' n
-config_query LIBDRM_RADEON 'Enable radeon KMS api' n
+. $GRIMOIRE/config_query_multi.function &&
+. $GRIMOIRE/MESON_CONFIGURE &&
+persistent_add DRM_ALL
+DRM_ALL="amdgpu intel nouveau radeon"
+config_query_multi DRM_API 'which hardware to support' $DRM_ALL
+
+persistent_remove LIBDRM_AMD
+persistent_remove LIBDRM_NV
+persistent_remove LIBDRM_INTEL
+persistent_remove LIBDRM_RADEON
diff --git a/libs/libdrm/DEPENDS b/libs/libdrm/DEPENDS
index 61741ca..77b892b 100755
--- a/libs/libdrm/DEPENDS
+++ b/libs/libdrm/DEPENDS
@@ -1,18 +1,21 @@
+depends meson &&
+depends ninja-build-system &&
+depends python3 &&
depends libpciaccess &&

-optional_depends DEVICE-MANAGER \
- "--enable-udev" \
- "--disable-udev" \
- "support for using udev instead of mknod" &&
+optional_depends eudev \
+ 'udev=true' \
+ 'udev=false' \
+ 'support for using udev instead of mknod' &&
optional_depends valgrind \
- --enable-valgrind \
- --disable-valgrind \
- 'detect leaks' &&
-optional_depends cairo \
- '--enable-cairo-tests' \
- '--disable-cairo-tests' \
- 'use Cairo in tests' &&
+ 'valgrind=true' \
+ 'valgrind=false' \
+ 'detect leaks' &&
+optional_depends cairo \
+ 'cairo-tests=true' \
+ 'cairo-tests=false' \
+ 'use Cairo in tests' &&
optional_depends libxslt \
- '--with-xsltproc' \
- '--without-xsltproc' \
- 'transforma of XML documents'
+ 'man-pages=true' \
+ 'man-pages=false' \
+ 'build man pages'
diff --git a/libs/libdrm/DETAILS b/libs/libdrm/DETAILS
index 63b4c6d..8a378bd 100755
--- a/libs/libdrm/DETAILS
+++ b/libs/libdrm/DETAILS
@@ -1,4 +1,5 @@
. "$GRIMOIRE/FUNCTIONS"
+. "$GRIMOIRE/MESON_FUNCTIONS"
SPELL=libdrm
if [[ $LIBDRM_BRANCH == scm ]]; then
VERSION="$(get_scm_version)"
@@ -8,7 +9,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/drm-git"
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=1
else
- VERSION=2.4.90
+ VERSION=2.4.91
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_URL[0]=https://dri.freedesktop.org/${SPELL}/${SOURCE}
SOURCE2=$SOURCE.sig
diff --git a/libs/libdrm/HISTORY b/libs/libdrm/HISTORY
index 1eaeb31..d3838a3 100644
--- a/libs/libdrm/HISTORY
+++ b/libs/libdrm/HISTORY
@@ -1,3 +1,7 @@
+2018-03-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.4.91
+ * *: convert to meson build
+
2018-02-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.4.90

diff --git a/libs/libdrm/PRE_BUILD b/libs/libdrm/PRE_BUILD
deleted file mode 100755
index e338b51..0000000
--- a/libs/libdrm/PRE_BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-if [[ $LIBDRM_BRANCH == scm ]]; then
- autoreconf -v --install
-# ./autogen.sh
-fi
diff --git a/libs/libdrm/PRE_SUB_DEPENDS b/libs/libdrm/PRE_SUB_DEPENDS
index 75a10ba..cc85288 100755
--- a/libs/libdrm/PRE_SUB_DEPENDS
+++ b/libs/libdrm/PRE_SUB_DEPENDS
@@ -1,8 +1,13 @@
+checkapi() {
+ if list_find "$DRM_API" $1;then
+ return 0
+ fi
+}
case $THIS_SUB_DEPENDS in
- AMD) [[ "$LIBDRM_AMD" == "y" ]] && return 0 ;;
- NV|NOUVEAU) [[ "$LIBDRM_NV" == "y" ]] && return 0 ;;
- INTEL) [[ "$LIBDRM_INTEL" == "y" ]] && return 0 ;;
- RADEON) [[ "$LIBDRM_RADEON" == "y" ]] && return 0 ;;
+ AMD) checkapi amdgpu && return 0 ;;
+ NV|NOUVEAU) checkapi nouveau && return 0 ;;
+ INTEL) checkapi intel && return 0 ;;
+ RADEON) checkapi radeon && return 0 ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
return 1;;
esac
diff --git a/libs/libdrm/SUB_DEPENDS b/libs/libdrm/SUB_DEPENDS
index 452aee9..bf9f0df 100755
--- a/libs/libdrm/SUB_DEPENDS
+++ b/libs/libdrm/SUB_DEPENDS
@@ -1,15 +1,20 @@
+force() {
+ if ! list_find "$DRM_API" $1;then
+ list_add DRM_API $1
+ fi
+}
case $THIS_SUB_DEPENDS in
AMD) message "${SPELL_COLOR}libdrm${DEFAULT_COLOR}${MESSAGE_COLOR}
requested with AMDGPU KMS API${DEFAULT_COLOR}" &&
- LIBDRM_AMD='y'
+ force amdgpu
;;
NV|NOUVEAU) message "${SPELL_COLOR}libdrm${DEFAULT_COLOR}${MESSAGE_COLOR}
requested with Nouveau KMS API${DEFAULT_COLOR}" &&
- LIBDRM_NV='y'
+ force nouveau
;;
INTEL) message "${SPELL_COLOR}libdrm${DEFAULT_COLOR}${MESSAGE_COLOR}
requested with Intel KMS API${DEFAULT_COLOR}" &&
- LIBDRM_INTEL='y'
+ force intel
;;
RADEON) message "${SPELL_COLOR}libdrm${DEFAULT_COLOR}${MESSAGE_COLOR}
requested with Radeon KMS API${DEFAULT_COLOR}" &&
- LIBDRM_RADEON='y'
+ force radeon
;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
return 1 ;;



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (3ce4508b811006a882f6b160b296d7f8a35d4ddd), Treeve Jelbert, 03/06/2018

Archive powered by MHonArc 2.6.24.

Top of Page