Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (bc5a612edd6c54e5271a061b9babff6b106762a4)

Chronological Thread  
    < 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 (bc5a612edd6c54e5271a061b9babff6b106762a4)
  • Date: Wed, 25 Oct 2023 16:23:03 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

audio-libs/openal-soft/DEPENDS | 6 +++++-
audio-libs/openal-soft/DETAILS | 4 ++--
audio-libs/openal-soft/HISTORY | 4 ++++
plasma/plasma-workspace/DETAILS | 4 ++--
plasma/plasma-workspace/HISTORY | 3 +++
utils/avahi/DEPENDS | 9 +--------
utils/avahi/HISTORY | 4 ++++
utils/avahi/PRE_BUILD | 1 -
utils/avahi/PRE_SUB_DEPENDS | 2 --
utils/avahi/SUB_DEPENDS | 3 ---
utils/avahi/qt.patch | 20 --------------------
video/ffmpeg-svn/CONFLICTS | 1 +
video/ffmpeg-svn/HISTORY | 3 +++
video/ffmpeg/CONFLICTS | 1 +
video/ffmpeg/HISTORY | 3 +++
video/ffmpeg5/CONFLICTS | 1 +
video/ffmpeg5/HISTORY | 3 +++
17 files changed, 33 insertions(+), 39 deletions(-)

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

ffmpeg* conflicts

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

avahi - drop qt4 support

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

openal-soft: => 1.23.1

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

plasma-workspace: => 23.08.9.1

diff --git a/audio-libs/openal-soft/DEPENDS b/audio-libs/openal-soft/DEPENDS
index 9b227d7..a421e62 100755
--- a/audio-libs/openal-soft/DEPENDS
+++ b/audio-libs/openal-soft/DEPENDS
@@ -20,4 +20,8 @@ optional_depends portaudio19
"-DALSOFT_REQUIRE_PORTAUDIO=on" \

optional_depends pulseaudio "-DALSOFT_REQUIRE_PULSEAUDIO=on" \
"-DALSOFT_REQUIRE_PULSEAUDIO=off" \
- "for a pulseaudio backend"
+ "for a pulseaudio backend" &&
+
+optional_depends pipewire "-DALSOFT_BACKEND_PIPEWIRE=ON" \
+ "-DALSOFT_BACKEND_PIPEWIRE=OFF"
+ "Pipewire support"
diff --git a/audio-libs/openal-soft/DETAILS b/audio-libs/openal-soft/DETAILS
index 0cae244..ca9a853 100755
--- a/audio-libs/openal-soft/DETAILS
+++ b/audio-libs/openal-soft/DETAILS
@@ -1,7 +1,7 @@
source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=openal-soft
- VERSION=1.22.2
-
SOURCE_HASH=sha512:2084c15254b047a7fb46f3e8e7cff92a71bbc702e2f356bb366b7ab3b7d03d917475ec5a6e50a88ac5204c6e9c12ab0d0370a88d563b4a5eb333365836489b7b
+ VERSION=1.23.1
+
SOURCE_HASH=sha512:21f768484978e4321b733004988cb5ecf43d908e7e08f2d421a338633fcfb2ade722d035de73742470ff135ab538d6b9b56df14020976adb1d1e081dfb095c6b
SOURCE="${SPELL}-${VERSION}.tar.gz"

SOURCE_URL[0]=https://github.com/kcat/openal-soft/archive/${VERSION}.tar.gz
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
diff --git a/audio-libs/openal-soft/HISTORY b/audio-libs/openal-soft/HISTORY
index e10b836..1aa289d 100644
--- a/audio-libs/openal-soft/HISTORY
+++ b/audio-libs/openal-soft/HISTORY
@@ -1,3 +1,7 @@
+2023-10-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.23.1
+ * DEPENDS: add pipewire
+
2022-06-30 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 1.22.2

diff --git a/plasma/plasma-workspace/DETAILS b/plasma/plasma-workspace/DETAILS
index 95136a7..4da37e3 100755
--- a/plasma/plasma-workspace/DETAILS
+++ b/plasma/plasma-workspace/DETAILS
@@ -1,9 +1,9 @@
source $GRIMOIRE/KDE_VERSIONS
SPELL=plasma-workspace
- VERSION=$PLASMA_VERSION
+ VERSION=23.08.9.1
SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.xz
-
SOURCE_URL=https://download.kde.org/$PLASMA_BRANCH/plasma/${VERSION}/$SOURCE
+
SOURCE_URL=https://download.kde.org/$PLASMA_BRANCH/plasma/${VERSION%.?}/$SOURCE
SOURCE2=$SOURCE.sig
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
diff --git a/plasma/plasma-workspace/HISTORY b/plasma/plasma-workspace/HISTORY
index 3e1e48e..7f58505 100644
--- a/plasma/plasma-workspace/HISTORY
+++ b/plasma/plasma-workspace/HISTORY
@@ -1,3 +1,6 @@
+2023-10-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 23.08.9.1
+
2023-02-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: fix obsolete change

diff --git a/utils/avahi/DEPENDS b/utils/avahi/DEPENDS
index 7977d43..b0bee23 100755
--- a/utils/avahi/DEPENDS
+++ b/utils/avahi/DEPENDS
@@ -1,11 +1,5 @@

# stuff from SUB_DEPENDS
-optional_depends qt4 \
- "--enable-qt4" "--disable-qt4" \
- "Build Qt4Core mainloop integration?" &&
-if is_depends_enabled $SPELL qt4; then
- depends -sub CXX gcc
-fi &&
optional_depends qtbase \
"--enable-qt5" "--disable-qt5" \
"Build Qt5Core mainloop integration?" &&
@@ -32,8 +26,7 @@ optional_depends glib2 \
"--enable-glib" "--disable-glib --disable-gobject" \
"Enable glib bindings?" &&

-if ( is_depends_enabled $SPELL qt4 ) || \
- ( is_depends_enabled $SPELL qtbase ) || \
+if ( is_depends_enabled $SPELL qtbase ) || \
( is_depends_enabled $SPELL mono ) || ( is_depends_enabled $SPELL gtk+2 )
|| \
( is_depends_enabled $SPELL glib2 ); then
AVAHI_CLIENT=y
diff --git a/utils/avahi/HISTORY b/utils/avahi/HISTORY
index 36552d0..4105901 100644
--- a/utils/avahi/HISTORY
+++ b/utils/avahi/HISTORY
@@ -1,3 +1,7 @@
+2023-10-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS SUB_DEPENDS PRE_SUB_DEPENDS PRE_BUILD: drop qt4 support
+ * qt.patch: deleted
+
2021-12-29 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.8
* SUB_DEPENDS PRE_SUB_DEPENDS DEPENDS: add qt5 support
diff --git a/utils/avahi/PRE_BUILD b/utils/avahi/PRE_BUILD
index d14e782..af50ea9 100755
--- a/utils/avahi/PRE_BUILD
+++ b/utils/avahi/PRE_BUILD
@@ -1,6 +1,5 @@
default_pre_build &&
cd "${SOURCE_DIRECTORY}" &&
-patch -p1 < $SPELL_DIRECTORY/qt.patch &&
create_group netdev &&
create_group avahi &&
create_account avahi &&
diff --git a/utils/avahi/PRE_SUB_DEPENDS b/utils/avahi/PRE_SUB_DEPENDS
index e83c71b..ae51dd7 100755
--- a/utils/avahi/PRE_SUB_DEPENDS
+++ b/utils/avahi/PRE_SUB_DEPENDS
@@ -1,8 +1,6 @@
case $THIS_SUB_DEPENDS in
MONO)
if is_depends_enabled $SPELL mono; then return 0; fi;;
- QT4)
- if is_depends_enabled $SPELL qt4; then return 0; fi;;
QT5)
if is_depends_enabled $SPELL qtbase; then return 0; fi;;
GTK2)
diff --git a/utils/avahi/SUB_DEPENDS b/utils/avahi/SUB_DEPENDS
index 4cabe50..0c9b29a 100755
--- a/utils/avahi/SUB_DEPENDS
+++ b/utils/avahi/SUB_DEPENDS
@@ -2,9 +2,6 @@ case $THIS_SUB_DEPENDS in
MONO) echo "mono bindings requested, forcing them." &&
depends mono '--enable-mono'
;;
-QT4) echo "qt4 bindings requested, forcing them." &&
- depends qt4 '--enable-qt4'
- ;;
QT5) echo "qt5 bindings requested, forcing them." &&
depends qtbase '--enable-qt5'
;;
diff --git a/utils/avahi/qt.patch b/utils/avahi/qt.patch
deleted file mode 100644
index d02a2f2..0000000
--- a/utils/avahi/qt.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- avahi-0.6.31/configure 2012-02-14 17:36:33.221047221 -0500
-+++ avahi-0.6.31.o/configure 2012-06-13 00:55:43.876468604 -0400
-@@ -20670,7 +20670,7 @@
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $QT3_PREFIX
-+for as_dir in /usr/bin
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-@@ -20840,7 +20840,7 @@
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $QT4_PREFIX
-+for as_dir in /usr/bin/qt4
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
diff --git a/video/ffmpeg-svn/CONFLICTS b/video/ffmpeg-svn/CONFLICTS
index 7470c6e..931059e 100755
--- a/video/ffmpeg-svn/CONFLICTS
+++ b/video/ffmpeg-svn/CONFLICTS
@@ -1,2 +1,3 @@
conflicts ffmpeg
conflicts ffmpeg5
+conflicts ffmpeg6
diff --git a/video/ffmpeg-svn/HISTORY b/video/ffmpeg-svn/HISTORY
index d485198..e46e98a 100644
--- a/video/ffmpeg-svn/HISTORY
+++ b/video/ffmpeg-svn/HISTORY
@@ -1,3 +1,6 @@
+2023-10-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFLICTS: add ffmpeg6
+
2023-03-25 Pavel Vinogradov <public AT sourcemage.org>
* DEPENDS: added optional vulkan-loader (with spirv-tools and
glslang) and
libplacebo
diff --git a/video/ffmpeg/CONFLICTS b/video/ffmpeg/CONFLICTS
index 4890d7d..ecde5e5 100755
--- a/video/ffmpeg/CONFLICTS
+++ b/video/ffmpeg/CONFLICTS
@@ -1,2 +1,3 @@
conflicts ffmpeg-svn
conflicts ffmpeg5
+conflicts ffmpeg6
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index aaf4917..37b0708 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,6 @@
+2023-10-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFLICTS: add ffmpeg6
+
2022-10-21 Ismael Luceno <ismael AT iodev.co.uk>
* PREPARE, PRE_BUILD, freetype.patch: removed, no longer needed
* CONFIGURE, DEPENDS, DETAILS, SUB_DEPENDS: removed branch choice
diff --git a/video/ffmpeg5/CONFLICTS b/video/ffmpeg5/CONFLICTS
index 939893f..7b00fd5 100755
--- a/video/ffmpeg5/CONFLICTS
+++ b/video/ffmpeg5/CONFLICTS
@@ -1,2 +1,3 @@
conflicts ffmpeg-svn
conflicts ffmpeg
+conflicts ffmpeg6
diff --git a/video/ffmpeg5/HISTORY b/video/ffmpeg5/HISTORY
index bc17f2a..9f73a01 100644
--- a/video/ffmpeg5/HISTORY
+++ b/video/ffmpeg5/HISTORY
@@ -1,3 +1,6 @@
+2023-10-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFLICTS: add ffmpeg6
+
2023-06-17 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 5.1.3
*
patches/hwcontext_vulkan-remove-optional-encode-decode-extensions.patch:
removed


  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (bc5a612edd6c54e5271a061b9babff6b106762a4), Treeve Jelbert, 10/25/2023

Archive powered by MHonArc 2.6.24.

Top of Page