Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (190568ff715c17f576c61266ddb25707031acf07)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (190568ff715c17f576c61266ddb25707031acf07)
  • Date: Wed, 13 Dec 2023 08:55:11 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

devel/pkgconfig/CONFLICTS | 4 +++-
devel/pkgconfig/HISTORY | 4 ++++
graphics-libs/jasper/DEPENDS | 8 ++++++++
graphics-libs/jasper/HISTORY | 3 +++
4 files changed, 18 insertions(+), 1 deletion(-)

New commits:
commit 190568ff715c17f576c61266ddb25707031acf07
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

jasper: proper dependency on doxygen/texlive

commit e90595e0a143e1ea962cea8eeb537e87db28d261
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

pkgconfig: make CONFLICTS not always fail

... when you actually intend to keep pkgconfig and did not switch
to pkgconf. Devel sorcery cares about that.

diff --git a/devel/pkgconfig/CONFLICTS b/devel/pkgconfig/CONFLICTS
index 2ef3192..95e5cb6 100755
--- a/devel/pkgconfig/CONFLICTS
+++ b/devel/pkgconfig/CONFLICTS
@@ -1,5 +1,7 @@
-persistent_read pkgconf PKG_CONFIG_SYMLINK PKG_CONFIG_SYMLINK &&
+if persistent_read pkgconf PKG_CONFIG_SYMLINK PKG_CONFIG_SYMLINK; then

if [[ $PKG_CONFIG_SYMLINK == y ]]; then
conflicts pkgconf
fi
+
+fi
diff --git a/devel/pkgconfig/HISTORY b/devel/pkgconfig/HISTORY
index 4543d9f..c856492 100644
--- a/devel/pkgconfig/HISTORY
+++ b/devel/pkgconfig/HISTORY
@@ -1,3 +1,7 @@
+2023-12-12 Thomas Orgis <sobukus AT sourcemage.org>
+ * CONFLICTS: avoid spell failure with sorcery that
+ actually checks nor non-zero CONFLICTS return
+
2022-07-22 Vlad Glagolev <stealth AT sourcemage.org>
* CONFLICTS: added, conflicts with pkgconf
* PROVIDES: added, provides PKG-CONFIG
diff --git a/graphics-libs/jasper/DEPENDS b/graphics-libs/jasper/DEPENDS
index 2619918..35c0c61 100755
--- a/graphics-libs/jasper/DEPENDS
+++ b/graphics-libs/jasper/DEPENDS
@@ -10,6 +10,14 @@ optional_depends GLUT
\
"-DJAS_ENABLE_OPENGL=false" \
"to build the jiv image display utility" &&

+optional_depends doxygen \
+ "-DJAS_ENABLE_DOC=true" \
+ "-DJAS_ENABLE_DOC=false" \
+ "for documentation (pulls in texlive, too)" &&
+if is_depends_enabled $SPELL doxygen; then
+ depends texlive
+fi &&
+
local GLUT_PROVIDER=$(get_spell_provider $SPELL GLUT) &&
if [[ $GLUT_PROVIDER ]]
then
diff --git a/graphics-libs/jasper/HISTORY b/graphics-libs/jasper/HISTORY
index fc0ada8..e6ae3dc 100644
--- a/graphics-libs/jasper/HISTORY
+++ b/graphics-libs/jasper/HISTORY
@@ -1,3 +1,6 @@
+2023-12-13 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: handle doxygen/latex dep
+
2019-10-06 Florian Franzmann <bwlf AT bandrate.org>
* BUILD, CONFIGURE, DEPENDS, DETAILS: use CMAKE_*
* DETAILS: version 2.0.14



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (190568ff715c17f576c61266ddb25707031acf07), Thomas Orgis, 12/13/2023

Archive powered by MHonArc 2.6.24.

Top of Page