Skip to Content.
Sympa Menu

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

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 (fce51e894346ecccaf38de93d4525df9097ff88b)
  • Date: Fri, 15 Dec 2023 13:01:22 +0000

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

graphics-libs/ilmbase/CONFLICTS | 3 +++
graphics-libs/ilmbase/HISTORY | 4 ++++
graphics-libs/imath/CONFLICTS | 2 ++
graphics-libs/imath/DETAILS | 1 +
graphics-libs/imath/HISTORY | 5 +++++
graphics/imagemagick/DEPENDS | 2 +-
graphics/imagemagick/DETAILS | 1 +
graphics/imagemagick/HISTORY | 4 ++++
graphics/openexr/CONFLICTS | 4 +---
graphics/openexr/DETAILS | 1 +
graphics/openexr/HISTORY | 7 ++++++-
11 files changed, 29 insertions(+), 5 deletions(-)

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

openexr, ilmbase, imath, imagemagick: try to fix up the ilmbase-imath mess

You need a clean state with openexr built with imath but not ilmbase
present
to get dependents happy again. Old ilmbase headers screw up modern C++
builds.

diff --git a/graphics-libs/ilmbase/CONFLICTS b/graphics-libs/ilmbase/CONFLICTS
new file mode 100755
index 0000000..f0725b8
--- /dev/null
+++ b/graphics-libs/ilmbase/CONFLICTS
@@ -0,0 +1,3 @@
+# Not installing same files, but breaking spells since same headers
+# are present in different location.
+conflicts imath
diff --git a/graphics-libs/ilmbase/HISTORY b/graphics-libs/ilmbase/HISTORY
index f60c9eb..a801287 100644
--- a/graphics-libs/ilmbase/HISTORY
+++ b/graphics-libs/ilmbase/HISTORY
@@ -1,3 +1,7 @@
+2023-12-15 Thomas Orgis <sobukus AT sourcemage.org>
+ * CONFLICTS: added conflict with imath, as things break
+ when dependents confuse the headers
+
2022-05-28 Florian Franzmann <bwlf AT bandrate.org>
* BUILD: set C++ version to C++14 to avoid build error

diff --git a/graphics-libs/imath/CONFLICTS b/graphics-libs/imath/CONFLICTS
new file mode 100755
index 0000000..c30658f
--- /dev/null
+++ b/graphics-libs/imath/CONFLICTS
@@ -0,0 +1,2 @@
+# Not same files, but header confusion with the earlier ilmbase.
+conflicts ilmbase
diff --git a/graphics-libs/imath/DETAILS b/graphics-libs/imath/DETAILS
index 5d1e47b..e091f9b 100755
--- a/graphics-libs/imath/DETAILS
+++ b/graphics-libs/imath/DETAILS
@@ -1,6 +1,7 @@
source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=imath
VERSION=3.1.3
+ PATCHLEVEL=1

SOURCE_HASH=sha512:a11f5e736bc49098d735c7903f186c15b03efbec082a8cf2e6635546368035cec0d36c7ae64bfd01bd8eeffb2dd247b8dab19e440a3e1fe33008edacc1268f75
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/Imath-$VERSION
diff --git a/graphics-libs/imath/HISTORY b/graphics-libs/imath/HISTORY
index 0bd4664..f33d72c 100644
--- a/graphics-libs/imath/HISTORY
+++ b/graphics-libs/imath/HISTORY
@@ -1,3 +1,8 @@
+2023-12-15 Thomas Orgis <sobukus AT sourcemage.org>
+ * CONFLICTS: added conflict with ilmbase, as things break
+ when dependents confuse the headers
+ * DETAILS: ++PATCHLEVEL for the above
+
2021-11-15 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.1.3
spell created
diff --git a/graphics/imagemagick/DEPENDS b/graphics/imagemagick/DEPENDS
index a99aff3..629edd2 100755
--- a/graphics/imagemagick/DEPENDS
+++ b/graphics/imagemagick/DEPENDS
@@ -1,6 +1,6 @@
depends xorgproto &&
depends libtool &&
-depends ilmbase &&
+depends imath &&

optional_depends libx11 '--with-x' '--without-x' 'for X11 support' &&
if is_depends_enabled $SPELL libx11; then
diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index 5f3c816..68adf86 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -1,6 +1,7 @@
SPELL=imagemagick
SPELLX=ImageMagick
VERSION=7.1.1-15
+ PATCHLEVEL=1

SOURCE_HASH=sha512:2b9ade9907916fdee9eae7685aecd167ee24cf43fa13639d2d66eb85dd08ece2e2e9230f9d03717f1a0cba34a61c0a67aa5753c83b21d38937fcaca12e6490d6
SECURITY_PATCH=6
SOURCE=$SPELLX-$VERSION.tar.gz
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index 1c98098..6ca1f47 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,7 @@
+2023-12-15 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: imath replaces ilmbase
+ * DETAILS: ++PATCHLEVEL to pick up the imath transition
+
2023-08-10 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 7.1.1-15

diff --git a/graphics/openexr/CONFLICTS b/graphics/openexr/CONFLICTS
index 39a7966..8697b2d 100755
--- a/graphics/openexr/CONFLICTS
+++ b/graphics/openexr/CONFLICTS
@@ -1,3 +1 @@
-# Uses installed headers in build, breaking on version updates.
-# Stupid.
-conflicts $SPELL y
+conflicts ilmbase
diff --git a/graphics/openexr/DETAILS b/graphics/openexr/DETAILS
index 6862d5a..1dca247 100755
--- a/graphics/openexr/DETAILS
+++ b/graphics/openexr/DETAILS
@@ -2,6 +2,7 @@ source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=openexr
VERSION=3.2.1
SECURITY_PATCH=8
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=https://github.com/openexr/openexr/archive/v${VERSION}.tar.gz
diff --git a/graphics/openexr/HISTORY b/graphics/openexr/HISTORY
index ed96bb3..61fa669 100644
--- a/graphics/openexr/HISTORY
+++ b/graphics/openexr/HISTORY
@@ -1,6 +1,11 @@
+2023-12-15 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: ++PATCHLEVEL as hotfix to get a rebuild for the unclean
+ ilmbase removal
+ * CONFLICTS: ilmbase (things break if imath and ilmbase are present)
+
2023-11-11 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: version 3.2.1
- * DEPENDS: libdeflate and imatha
+ * DEPENDS: libdeflate and imath
* BUILD: do not build tests (pulls images from github), remove
non-existing variables




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

Archive powered by MHonArc 2.6.24.

Top of Page