Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (eee020559ce667f6264d4ddded0cdc38314519a3)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (eee020559ce667f6264d4ddded0cdc38314519a3)
  • Date: Sun, 30 Jun 2024 06:24:35 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

ChangeLog | 5 +++
FUNCTIONS | 4 ++
science/stellarium/BUILD | 4 --
science/stellarium/CONFIGURE | 1
science/stellarium/DEPENDS | 63
+++++++++++++++++++++++++++++++++----------
science/stellarium/DETAILS | 12 ++++----
science/stellarium/HISTORY | 6 ++++
video/obs-studio/BUILD | 1
video/obs-studio/DETAILS | 1
video/obs-studio/HISTORY | 6 ++++
video/obs-studio/PRE_BUILD | 8 -----
11 files changed, 78 insertions(+), 33 deletions(-)

New commits:
commit eee020559ce667f6264d4ddded0cdc38314519a3
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

stellarium 24.2

commit a1712e2a5a8471a5e9d46284f129fdbf22b883e1
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

obs-studio: Remove Qt6_DIR and LD_LIBRARY_PATH; PATCHLEVEL++

cmake_build now makes sure to add an rpath to the Qt6 libdir.

commit e0b03fadd74302fc75ea77cf922d9949ea22676b
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

FUNCTIONS: cmake_build: Make use of -rpath for spells using Qt6

commit af7131fc12af71aea3432536e66a68e5c2944d70
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

FUNCTIONS: Use CMAKE_INSTALL_ALWAYS

When re-casting, the rules generated by CMake interact badly with castfs,
as
they don't update unchanged files, something castfs requires; this
behaviour
is corrected by setting CMAKE_INSTSALL_ALWAYS.

diff --git a/ChangeLog b/ChangeLog
index 8973e03..d0a99cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-06-30 Ismael Luceno <ismael AT sourcemage.org>
+ * FUNCTIONS: added CMAKE_INSTALL_ALWAYS on cmake_install, otherwise
+ cmake interacts badly with castfs;
+ added -rpath to LDFLAGS in cmake_build for Qt6 spells
+
2024-06-29 Ismael Luceno <ismael AT sourcemage.org>
* libs/nlopt: new spell, library for nonlinear optimization

diff --git a/FUNCTIONS b/FUNCTIONS
index a9db9d5..3611abe 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -700,7 +700,8 @@ cmake_build() {

message INSTALL_PREFIX=$CMAKE_INSTALL_PREFIX &&

- if is_depends_enabled $SPELL qt6base;then
+ if is_depends_enabled $SPELL qt6base; then
+ LDFLAGS+=" -Wl,-rpath=$QT6DIR/lib" &&
OPTS+=" -DCMAKE_PREFIX_PATH=$QT6DIR/lib/cmake"
fi &&
if is_depends_enabled "$SPELL" samurai; then
@@ -718,6 +719,7 @@ cmake_build() {
}

function cmake_install() {
+ CMAKE_INSTALL_ALWAYS=1 \
cmake --install .
}

diff --git a/science/stellarium/BUILD b/science/stellarium/BUILD
deleted file mode 100755
index dac29d1..0000000
--- a/science/stellarium/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-QTDIR=$INSTALL_ROOT/usr &&
-PATH=$QTDIR/bin/qt4:$PATH &&
-cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr . &&
-make
diff --git a/science/stellarium/CONFIGURE b/science/stellarium/CONFIGURE
new file mode 100755
index 0000000..b1e2770
--- /dev/null
+++ b/science/stellarium/CONFIGURE
@@ -0,0 +1 @@
+. "$GRIMOIRE"/CMAKE_CONFIGURE
diff --git a/science/stellarium/DEPENDS b/science/stellarium/DEPENDS
index 65013c1..114e73e 100755
--- a/science/stellarium/DEPENDS
+++ b/science/stellarium/DEPENDS
@@ -1,14 +1,49 @@
-depends boost &&
-depends cmake &&
-depends curl &&
-depends freetype2 &&
-depends -sub CXX gcc &&
-depends gettext &&
-depends GLUT &&
-depends JPEG &&
-depends libpng &&
-depends OPENGL &&
-depends qt4 &&
-depends zlib &&
-depends libice &&
-depends libxext
+. "$GRIMOIRE"/VDEPENDS &&
+. "$GRIMOIRE"/CMAKE_DEPENDS &&
+
+optional_depends qxlsx \
+ -DENABLE_XLSX=ON \
+ -DENABLE_XLSX=OFF \
+ 'for OOXML Workbook (XLSX) support' &&
+
+vdepends <<! &&
+ GLUT
+ JPEG
+ OPENGL
+ QT
+ boost
+ curl
+ freetype2
+ gcc[CXX]
+ gettext
+ libice
+ libpng
+ libxext
+ nlopt
+ zlib
+!
+
+case "$(get_spell_provider "$SPELL" QT)" in
+ (qt6base)
+ vdepends <<!
+ qt6charts
+ qt6multimedia
+ qt6positioning
+ qt6serialport
+ qt6tools
+!
+ ;;
+ (qtbase)
+ vdepends <<!
+ qtcharts
+ qtmultimedia
+ qtpositioning
+ qtserialport
+ qttools
+!
+ ;;
+ (*)
+ message "${PROBLEM_COLOR}Not compatible with the selected QT" \
+ "provider.$NORMAL_COLOR"
+ ;;
+esac
diff --git a/science/stellarium/DETAILS b/science/stellarium/DETAILS
index eeaeff7..702f88a 100755
--- a/science/stellarium/DETAILS
+++ b/science/stellarium/DETAILS
@@ -1,12 +1,12 @@
# Watch: https://github.com/Stellarium/stellarium/releases/
+. "$GRIMOIRE"/CMAKE_FUNCTIONS
SPELL=stellarium
- VERSION=0.12.2
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=24.2
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-
SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/${SPELL}/Stellarium-sources/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:f9ec4df5d5ba39f302bc5253dabe0a95682ee7591ecde7a3a3861e3b563e28fdd996294019c92cf9df1d86a30c1e25baff7b6c2bb4f1f033decc7b07f020077a
-# SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
- LICENSE[0]=GPL
+
SOURCE_URL[0]=https://github.com/Stellarium/$SPELL/releases/download/v$VERSION/$SOURCE
+
SOURCE_HASH=sha512:621d16a70036e2ddea3900c0fcd0d4caadb8f821afda8a5d9818c82d2a846107840e1497a4d79a954ec2a76e434bc99b021e6f15c2af6de2cc4044fb70096929
+ LICENSE[0]=GPL-2.0-or-later
WEB_SITE=http://www.stellarium.org
KEYWORDS="opengl science"
ENTERED=20021208
diff --git a/science/stellarium/HISTORY b/science/stellarium/HISTORY
index a19b469..dd8d6f7 100644
--- a/science/stellarium/HISTORY
+++ b/science/stellarium/HISTORY
@@ -1,3 +1,9 @@
+2024-06-30 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS: updated spell to 24.2
+ fixed LICENSE
+ * DETAILS, CONFIGURE, DEPENDS: use CMAKE_*
+ * BUILD: removed, no longer needed
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)

diff --git a/video/obs-studio/BUILD b/video/obs-studio/BUILD
index 4899313..8a1f1c6 100755
--- a/video/obs-studio/BUILD
+++ b/video/obs-studio/BUILD
@@ -9,5 +9,4 @@ if ! is_depends_enabled $SPELL python3 && !
is_depends_enabled $SPELL luajit; th
OPTS="-DENABLE_SCRIPTING=OFF $OPTS"
fi &&

-OPTS+=" Qt6_DIR=$INSTALL_ROOT/opt/qt6/cmake/Qt6" &&
default_build
diff --git a/video/obs-studio/DETAILS b/video/obs-studio/DETAILS
index 0c9446b..132ca36 100755
--- a/video/obs-studio/DETAILS
+++ b/video/obs-studio/DETAILS
@@ -2,6 +2,7 @@
. "$GRIMOIRE"/CMAKE_FUNCTIONS
SPELL=obs-studio
VERSION=30.1.2
+ PATCHLEVEL=1
SOURCE="$SPELL-$VERSION.tar.gz"

SOURCE_URL[0]=https://github.com/obsproject/$SPELL/archive/refs/tags/$VERSION.tar.gz

SOURCE_HASH=sha512:8d6102f3431c1c6c530f22b09612cb955c1877e5aba07aa0ba1d7b014471ebf9f0c1f8e898eb9373c64417455e75d8b9cf2ae4d9010b6a09330bac9f4e5aa01e
diff --git a/video/obs-studio/HISTORY b/video/obs-studio/HISTORY
index 8ce63ec..5c8fb45 100644
--- a/video/obs-studio/HISTORY
+++ b/video/obs-studio/HISTORY
@@ -1,3 +1,9 @@
+2024-06-30 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD: removed Qt6_DIR; not needed
+ * PRE_BUILD: removed LD_LIBRARY_PATH from .desktop file; not needed
+ (cmake_build now adds an rpath for Qt6)
+ * DETAILS: PATCHLEVEL++
+
2024-06-23 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 30.1.2
* BUILD, DEPENDS: removed Qt5; not compatible anymore
diff --git a/video/obs-studio/PRE_BUILD b/video/obs-studio/PRE_BUILD
index da84b57..12c2106 100755
--- a/video/obs-studio/PRE_BUILD
+++ b/video/obs-studio/PRE_BUILD
@@ -15,10 +15,4 @@ mv obs-websocket-6fd18a7ef1ecb149e8444154af1daab61d4241a9
obs-websocket &&
rm -d "${SOURCE_DIRECTORY}/plugins/obs-websocket/deps/qr" &&
cd "${SOURCE_DIRECTORY}/plugins/obs-websocket/deps/" &&
unpack_file 4 &&
-mv QR-Code-generator-8518684c0f33d004fa93971be2c6a8eca3167d1e qr &&
-
-if is_depends_enabled $SPELL qt6base; then
- cd "${SOURCE_DIRECTORY}" &&
- sed -i 's#Exec=obs#Exec=env LD_LIBRARY_PATH=/opt/qt6/lib:$LD_LIBRARY_PATH
obs#' \
- UI/xdg-data/com.obsproject.Studio.desktop
-fi
+mv QR-Code-generator-8518684c0f33d004fa93971be2c6a8eca3167d1e qr


  • [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (eee020559ce667f6264d4ddded0cdc38314519a3), Ismael Luceno, 06/30/2024

Archive powered by MHonArc 2.6.24.

Top of Page