Skip to Content.
Sympa Menu

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

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 (7c618bb4a8e652219c22427a9b40394f7567d91a)
  • Date: Thu, 2 Nov 2023 21:08:24 +0000

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

ChangeLog | 3
kde5-extra/kquickimageeditor/DETAILS | 2
kde5-extra/kquickimageeditor/HISTORY | 3
kde5-extra/kuserfeedback/DETAILS | 11
kde5-extra/kuserfeedback/HISTORY | 5
kde5-extra/libqaccessibilityclient/DETAILS | 2
kde5-extra/libqaccessibilityclient/HISTORY | 3
libs/libmd/DETAILS | 4
libs/libmd/HISTORY | 3
qt5-cmake/phonon-backend-vlc/BUILD | 6
qt5-cmake/phonon-backend-vlc/CONFIGURE | 1
qt5-cmake/phonon-backend-vlc/CONFLICTS | 1
qt5-cmake/phonon-backend-vlc/DEPENDS | 3
qt5-cmake/phonon-backend-vlc/DETAILS | 17
qt5-cmake/phonon-backend-vlc/HISTORY | 35 +
qt5-cmake/phonon/BUILD | 8
qt5-cmake/phonon/DEPENDS | 27 -
qt5-cmake/phonon/DETAILS | 2
qt5-cmake/phonon/HISTORY | 4
qt5-cmake/phonon4qt5-gstreamer/BUILD | 1
qt5-cmake/phonon4qt5-gstreamer/CONFIGURE | 1
qt5-cmake/phonon4qt5-gstreamer/CONFLICTS | 1
qt5-cmake/phonon4qt5-gstreamer/DEPENDS | 10
qt5-cmake/phonon4qt5-gstreamer/DETAILS | 19
qt5-cmake/phonon4qt5-gstreamer/DOWNLOAD | 1
qt5-cmake/phonon4qt5-gstreamer/HISTORY | 21 -
qt5-cmake/phonon4qt5-gstreamer/INSTALL | 1
qt5-cmake/phonon4qt5-gstreamer/PRE_BUILD | 1
qt5-cmake/phonon4qt5-gstreamer/PROVIDES | 1
qt5-cmake/phonon4qt5-gstreamer/UP_TRIGGERS | 1
qt5-cmake/phonon4qt5-vlc/CONFIGURE | 1
qt5-cmake/phonon4qt5-vlc/DEPENDS | 5
qt5-cmake/phonon4qt5-vlc/DETAILS | 18
qt5-cmake/phonon4qt5-vlc/HISTORY | 29 -
video/ffmpeg6/BUILD | 49 ++
video/ffmpeg6/CONFIGURE | 24 +
video/ffmpeg6/CONFLICTS | 3
video/ffmpeg6/DEPENDS | 289
+++++++++++++++
video/ffmpeg6/DETAILS | 22 +
video/ffmpeg6/HISTORY | 6
video/ffmpeg6/INSTALL | 5
video/ffmpeg6/PRE_BUILD | 3
video/ffmpeg6/PROVIDES | 1
video/ffmpeg6/TRIGGERS | 8
video/ffmpeg6/UP_TRIGGERS | 19
video/ffmpeg6/patches/ffmpeg-6.0-binutils_2.41-1.patch | 80 ++++
video/ffmpeg6/patches/ffmpeg-6.0-chromium_method-1.patch | 42 ++
47 files changed, 683 insertions(+), 119 deletions(-)

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

kquickimageeditor: => 0.3.0

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

add ffmpeg6 6.0.0

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

deprecate qt5-cmake/phonon4qt5-gstreamer [replaced by phonon-backend-vlc]

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

phonon-backend-vlc: => 0.12.0

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

kuserfeedback: => 1.3.0

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

libqaccessibilityclient: => 0.5.0

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

phonon qt6 support

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

phonon: => 4.12.0

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

libmd: => 1.1.0

diff --git a/ChangeLog b/ChangeLog
index 8ffa470..9eae627 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2023-11-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * video/ffmpeg6: added
+
2023-11-01 Treeve Jelbert <treeve AT sourcemage.org>
* libs/x86-simd-sort: added

diff --git a/kde5-extra/kquickimageeditor/DETAILS
b/kde5-extra/kquickimageeditor/DETAILS
index db43905..7893976 100755
--- a/kde5-extra/kquickimageeditor/DETAILS
+++ b/kde5-extra/kquickimageeditor/DETAILS
@@ -1,5 +1,5 @@
SPELL=kquickimageeditor
- VERSION=0.2.0
+ VERSION=0.3.0
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL=https://download.kde.org/stable/$SPELL/$SOURCE
SOURCE2=$SOURCE.sig
diff --git a/kde5-extra/kquickimageeditor/HISTORY
b/kde5-extra/kquickimageeditor/HISTORY
index 92d0759..d45d3a2 100644
--- a/kde5-extra/kquickimageeditor/HISTORY
+++ b/kde5-extra/kquickimageeditor/HISTORY
@@ -1,3 +1,6 @@
+2023-11-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.3.0
+
2023-07-10 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: add qt6 support

diff --git a/kde5-extra/kuserfeedback/DETAILS
b/kde5-extra/kuserfeedback/DETAILS
index df35fea..6eebf3f 100755
--- a/kde5-extra/kuserfeedback/DETAILS
+++ b/kde5-extra/kuserfeedback/DETAILS
@@ -1,10 +1,13 @@
SPELL=kuserfeedback
- VERSION=1.2.0
-
SOURCE_HASH=sha512:15e3b571f639667e469a98db09ab505522403ac3a3bdedb9a8d0ccb6f6b1ad77de80889f33e0da6ee57af6bb9f7014743f23872d717b47f2f0b2a8df8a442a8a
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=1.3.0
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=https://github.com/KDE/kuserfeedback
- SOURCE_URL=$WEB_SITE/archive/refs/tags/v$VERSION.tar.gz
+ SOURCE_URL[0]=https://download.kde.org/stable/$SPELL/$SOURCE
+ SOURCE2=$SOURCE.sig
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
+ SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
ENTERED=2020705
LICENSE[0]=MIT
KEYWORDS="kde5"
diff --git a/kde5-extra/kuserfeedback/HISTORY
b/kde5-extra/kuserfeedback/HISTORY
index fa86118..d652ebe 100644
--- a/kde5-extra/kuserfeedback/HISTORY
+++ b/kde5-extra/kuserfeedback/HISTORY
@@ -1,3 +1,8 @@
+2023-11-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: add gpg checking
+ * DETAILS: version 1.3.0
+ download frm KDE
+
2022-07-07 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: delete junk

diff --git a/kde5-extra/libqaccessibilityclient/DETAILS
b/kde5-extra/libqaccessibilityclient/DETAILS
index 435bbed..a66e719 100755
--- a/kde5-extra/libqaccessibilityclient/DETAILS
+++ b/kde5-extra/libqaccessibilityclient/DETAILS
@@ -1,5 +1,5 @@
SPELL=libqaccessibilityclient
- VERSION=0.4.1
+ VERSION=0.5.0
SOURCE_HASH=sha512:
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE2=$SOURCE.sig
diff --git a/kde5-extra/libqaccessibilityclient/HISTORY
b/kde5-extra/libqaccessibilityclient/HISTORY
index 10a15ba..0de805b 100644
--- a/kde5-extra/libqaccessibilityclient/HISTORY
+++ b/kde5-extra/libqaccessibilityclient/HISTORY
@@ -1,3 +1,6 @@
+2023-11-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.5.0
+
2019-05-19 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.4.1

diff --git a/libs/libmd/DETAILS b/libs/libmd/DETAILS
index 6fc4dc6..0bb70ca 100755
--- a/libs/libmd/DETAILS
+++ b/libs/libmd/DETAILS
@@ -1,8 +1,8 @@
SPELL=libmd
- VERSION=1.0.3
+ VERSION=1.1.0
SOURCE="${SPELL}-${VERSION}.tar.xz"
SOURCE_URL[0]=https://archive.hadrons.org/software/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:f4b5a86bea7b9fac9f7f173032ee436d1e7141f760c1a114a785d31644edbf6802fe8193cc4cf3b5c66d38963be919c05055780bdf6bf5a47927690490ff5966
+
SOURCE_HASH=sha512:5d0da3337038e474fae7377bbc646d17214e72dc848a7aadc157f49333ce7b5ac1456e45d13674bd410ea08477c6115fc4282fed6c8e6a0bf63537a418c0df96
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="https://www.hadrons.org/software/libmd/";
LICENSE[0]=BSD
diff --git a/libs/libmd/HISTORY b/libs/libmd/HISTORY
index 3cd7a3e..8a27959 100644
--- a/libs/libmd/HISTORY
+++ b/libs/libmd/HISTORY
@@ -1,3 +1,6 @@
+2023-10-31 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.1.0
+
2021-06-04 Florian Franzmann <bwlf AT bandrate.org>
* DEPENDS, DETAILS: spell created

diff --git a/qt5-cmake/phonon-backend-vlc/BUILD
b/qt5-cmake/phonon-backend-vlc/BUILD
new file mode 100755
index 0000000..62461aa
--- /dev/null
+++ b/qt5-cmake/phonon-backend-vlc/BUILD
@@ -0,0 +1,6 @@
+if is_depends_enabled $SPELL qt6base;then
+ OPTS+=" -DPHONON_BUILD_QT5=OFF"
+else
+ OPTS+=" -DPHONON_BUILD_QT6=OFF"
+fi &&
+default_build
diff --git a/qt5-cmake/phonon-backend-vlc/CONFIGURE
b/qt5-cmake/phonon-backend-vlc/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/qt5-cmake/phonon-backend-vlc/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/qt5-cmake/phonon-backend-vlc/CONFLICTS
b/qt5-cmake/phonon-backend-vlc/CONFLICTS
new file mode 100755
index 0000000..36ebe3e
--- /dev/null
+++ b/qt5-cmake/phonon-backend-vlc/CONFLICTS
@@ -0,0 +1 @@
+conflicts phonon4qt5-vlc y
diff --git a/qt5-cmake/phonon-backend-vlc/DEPENDS
b/qt5-cmake/phonon-backend-vlc/DEPENDS
new file mode 100755
index 0000000..c3ec23a
--- /dev/null
+++ b/qt5-cmake/phonon-backend-vlc/DEPENDS
@@ -0,0 +1,3 @@
+source $GRIMOIRE/KDE_DEPENDS &&
+depends phonon &&
+depends vlc
diff --git a/qt5-cmake/phonon-backend-vlc/DETAILS
b/qt5-cmake/phonon-backend-vlc/DETAILS
new file mode 100755
index 0000000..fdc7d24
--- /dev/null
+++ b/qt5-cmake/phonon-backend-vlc/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=phonon-backend-vlc
+ VERSION=0.12.0
+ SOURCE=$SPELL-$VERSION.tar.xz
+
SOURCE_URL[0]=https://download.kde.org/stable/phonon/$SPELL/$VERSION/$SOURCE
+ SOURCE2=$SOURCE.sig
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
+ SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=https://phonon.kde.org/
+ LICENSE[0]=LGPL
+ ENTERED=20141104
+ KEYWORDS="kde multimedia"
+ SHORT="VLC backend for phonon"
+cat << EOF
+VLC backend for phonon
+EOF
diff --git a/qt5-cmake/phonon-backend-vlc/HISTORY
b/qt5-cmake/phonon-backend-vlc/HISTORY
new file mode 100644
index 0000000..56cf36b
--- /dev/null
+++ b/qt5-cmake/phonon-backend-vlc/HISTORY
@@ -0,0 +1,35 @@
+2023-11-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.12.0
+ spell renamed
+ * CONFLICTS BUILD: added
+ * DEPENDS: tweaked
+
+2022-05-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: use phonon
+
+2021-03-31 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.11.3
+
+2021-02-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.11.2
+
+2019-09-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.11.0
+
+2018-03-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.10.1
+
+2017-02-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.1
+
+ * DETAILS: add gpg checking
+
+2016=-4-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.0
+
+2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: depends -sub CXX gcc (half-automated)
+
+2014-11-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.8.1
+ new spell
diff --git a/qt5-cmake/phonon/BUILD b/qt5-cmake/phonon/BUILD
index 0f9e45d..62461aa 100755
--- a/qt5-cmake/phonon/BUILD
+++ b/qt5-cmake/phonon/BUILD
@@ -1,4 +1,6 @@
-OPTS+=" -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=1" &&
-OPTS+=" -D__KDE_HAVE_GCC_VISIBILITY=NO" &&
+if is_depends_enabled $SPELL qt6base;then
+ OPTS+=" -DPHONON_BUILD_QT5=OFF"
+else
+ OPTS+=" -DPHONON_BUILD_QT6=OFF"
+fi &&
default_build
-
diff --git a/qt5-cmake/phonon/DEPENDS b/qt5-cmake/phonon/DEPENDS
index fe82b86..1545b1a 100755
--- a/qt5-cmake/phonon/DEPENDS
+++ b/qt5-cmake/phonon/DEPENDS
@@ -1,13 +1,16 @@
-depends cmake &&
-depends -sub CXX gcc &&
-depends qtbase '-DPHONON_BUILD_PHONON4QT5=1' &&
-depends libx11 &&
-depends libice &&
-depends libxext &&
-depends libxcb &&
-depends glib2 &&
-optional_depends qttools '' '' 'build Designer plugin' &&
+source $GRIMOIRE/KDE_DEPENDS &&
+if is_depends_enabled $SPELL qt6base;then
+ depends qt5compat &&
+ optional_depends qt6tools '' '' 'build Designer plugin'
+else
+ optional_depends qttools '' '' 'build Designer plugin'
+fi &&
+depends libx11 &&
+depends libice &&
+depends libxext &&
+depends libxcb &&
+depends glib2 &&
optional_depends libxml2 '' '' 'xml support' &&
-optional_depends OPENGL '' '' 'improved graphics' &&
-optional_depends pulseaudio -DWITH_PulseAudio={ON,OFF} \
- 'for playback via the PulseAudio soundserver'
+optional_depends pulseaudio ' -DWITH_PulseAudio=ON' \
+ ' -DWITH_PulseAudio=OFF'\
+ 'playback via the PulseAudio soundserver'
diff --git a/qt5-cmake/phonon/DETAILS b/qt5-cmake/phonon/DETAILS
index 10a1e44..3d56718 100755
--- a/qt5-cmake/phonon/DETAILS
+++ b/qt5-cmake/phonon/DETAILS
@@ -1,5 +1,5 @@
SPELL=phonon
- VERSION=4.11.1
+ VERSION=4.12.0
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=https://download.kde.org/stable/phonon/$VERSION/$SOURCE
SOURCE2=$SOURCE.sig
diff --git a/qt5-cmake/phonon/HISTORY b/qt5-cmake/phonon/HISTORY
index 12d0116..3a6bf5d 100644
--- a/qt5-cmake/phonon/HISTORY
+++ b/qt5-cmake/phonon/HISTORY
@@ -1,3 +1,7 @@
+2023-11-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.12.0
+ * BUILD DEPENDS: updated for qt6 support
+
2022-01-07 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.11.1

diff --git a/qt5-cmake/phonon4qt5-gstreamer/BUILD
b/qt5-cmake/phonon4qt5-gstreamer/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/qt5-cmake/phonon4qt5-gstreamer/BUILD
@@ -0,0 +1 @@
+true
diff --git a/qt5-cmake/phonon4qt5-gstreamer/CONFIGURE
b/qt5-cmake/phonon4qt5-gstreamer/CONFIGURE
deleted file mode 100755
index b2f02c3..0000000
--- a/qt5-cmake/phonon4qt5-gstreamer/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/qt5-cmake/phonon4qt5-gstreamer/CONFLICTS
b/qt5-cmake/phonon4qt5-gstreamer/CONFLICTS
new file mode 100755
index 0000000..1bd6927
--- /dev/null
+++ b/qt5-cmake/phonon4qt5-gstreamer/CONFLICTS
@@ -0,0 +1 @@
+conflicts phonon4qt5-gstreamer y
diff --git a/qt5-cmake/phonon4qt5-gstreamer/DEPENDS
b/qt5-cmake/phonon4qt5-gstreamer/DEPENDS
index bd5268c..80a8b65 100755
--- a/qt5-cmake/phonon4qt5-gstreamer/DEPENDS
+++ b/qt5-cmake/phonon4qt5-gstreamer/DEPENDS
@@ -1,9 +1 @@
-depends -sub CXX gcc &&
-depends cmake &&
-depends qtbase '-DPHONON_BUILD_PHONON4QT5=1' &&
-depends phonon &&
-depends OPENGL &&
-depends glib2 &&
-depends libxml2 &&
-depends gstreamer-1.0 &&
-depends gst-plugins-base-1.0
+depends phonon-backend-vlc
diff --git a/qt5-cmake/phonon4qt5-gstreamer/DETAILS
b/qt5-cmake/phonon4qt5-gstreamer/DETAILS
index f02e8ca..3213013 100755
--- a/qt5-cmake/phonon4qt5-gstreamer/DETAILS
+++ b/qt5-cmake/phonon4qt5-gstreamer/DETAILS
@@ -1,17 +1,8 @@
SPELL=phonon4qt5-gstreamer
- SPELLX=phonon-backend-gstreamer
- VERSION=4.10.0
- SOURCE=$SPELLX-$VERSION.tar.xz
-
SOURCE_URL[0]=https://download.kde.org/stable/phonon/$SPELLX/$VERSION/$SOURCE
- SOURCE2=$SOURCE.sig
- SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
- SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
- WEB_SITE=https://phonon.kde.org/
- LICENSE[0]=LGPL
- ENTERED=20110125
- SHORT="Phonon GStreamer backend"
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
cat << EOF
-Phonon GStreamer backend.
+deprecated spell [replaced by phonon-backend-vlc]
EOF
+
diff --git a/qt5-cmake/phonon4qt5-gstreamer/DOWNLOAD
b/qt5-cmake/phonon4qt5-gstreamer/DOWNLOAD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/qt5-cmake/phonon4qt5-gstreamer/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/qt5-cmake/phonon4qt5-gstreamer/HISTORY
b/qt5-cmake/phonon4qt5-gstreamer/HISTORY
index 7ae73b1..b0411a0 100644
--- a/qt5-cmake/phonon4qt5-gstreamer/HISTORY
+++ b/qt5-cmake/phonon4qt5-gstreamer/HISTORY
@@ -1,17 +1,4 @@
-2022-05-27 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: use phonon
-
-2019-09-02 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.10.0
- * DETAILS: add gpg checking
-
-2016-04-18 Treeve Jelbert <treeve AT sourceamge.org>
- * DETAILS: version 4.9.0
-
-2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
- * DEPENDS: depends -sub CXX gcc (half-automated)
-
-2014-12-31 Treeve Jelbert <treeve AT sourceamge.org>
- * DETAILS: version 4.8.2
- qt5 support
- * DEPENDS: now uses gstreamer-1.0, many exta depends
+2023-11-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0
+ PATCHLEVEL=9999
+ spell deprecated [replaced by phonon-backend-vlc]
diff --git a/qt5-cmake/phonon4qt5-gstreamer/INSTALL
b/qt5-cmake/phonon4qt5-gstreamer/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/qt5-cmake/phonon4qt5-gstreamer/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/qt5-cmake/phonon4qt5-gstreamer/PRE_BUILD
b/qt5-cmake/phonon4qt5-gstreamer/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/qt5-cmake/phonon4qt5-gstreamer/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/qt5-cmake/phonon4qt5-gstreamer/PROVIDES
b/qt5-cmake/phonon4qt5-gstreamer/PROVIDES
deleted file mode 100755
index d43e522..0000000
--- a/qt5-cmake/phonon4qt5-gstreamer/PROVIDES
+++ /dev/null
@@ -1 +0,0 @@
-PHONON_BACKEND
diff --git a/qt5-cmake/phonon4qt5-gstreamer/UP_TRIGGERS
b/qt5-cmake/phonon4qt5-gstreamer/UP_TRIGGERS
new file mode 100755
index 0000000..70ad86a
--- /dev/null
+++ b/qt5-cmake/phonon4qt5-gstreamer/UP_TRIGGERS
@@ -0,0 +1 @@
+up_trigger phonon-backend-vlc cast_self
diff --git a/qt5-cmake/phonon4qt5-vlc/CONFIGURE
b/qt5-cmake/phonon4qt5-vlc/CONFIGURE
deleted file mode 100755
index b2f02c3..0000000
--- a/qt5-cmake/phonon4qt5-vlc/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/qt5-cmake/phonon4qt5-vlc/DEPENDS
b/qt5-cmake/phonon4qt5-vlc/DEPENDS
deleted file mode 100755
index de4059c..0000000
--- a/qt5-cmake/phonon4qt5-vlc/DEPENDS
+++ /dev/null
@@ -1,5 +0,0 @@
-depends -sub CXX gcc &&
-depends cmake &&
-depends qtbase '-DPHONON_BUILD_PHONON4QT5=1'&&
-depends phonon &&
-depends vlc
diff --git a/qt5-cmake/phonon4qt5-vlc/DETAILS
b/qt5-cmake/phonon4qt5-vlc/DETAILS
deleted file mode 100755
index b354eec..0000000
--- a/qt5-cmake/phonon4qt5-vlc/DETAILS
+++ /dev/null
@@ -1,18 +0,0 @@
- SPELL=phonon4qt5-vlc
- SPELLX=phonon-backend-vlc
- VERSION=0.11.3
- SOURCE=$SPELLX-$VERSION.tar.xz
-
SOURCE_URL[0]=https://download.kde.org/stable/phonon/$SPELLX/$VERSION/$SOURCE
- SOURCE2=$SOURCE.sig
- SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
- SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
- WEB_SITE=https://phonon.kde.org/
- LICENSE[0]=LGPL
- ENTERED=20141104
- KEYWORDS="kde5 multimedia"
- SHORT="VLC backend for phonon4qt5"
-cat << EOF
-VLC backend for phonon
-EOF
diff --git a/qt5-cmake/phonon4qt5-vlc/HISTORY
b/qt5-cmake/phonon4qt5-vlc/HISTORY
deleted file mode 100644
index e1b57e4..0000000
--- a/qt5-cmake/phonon4qt5-vlc/HISTORY
+++ /dev/null
@@ -1,29 +0,0 @@
-2022-05-27 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: use phonon
-
-2021-03-31 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.11.3
-
-2021-02-16 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.11.2
-
-2019-09-02 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.11.0
-
-2018-03-07 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.10.1
-
-2017-02-23 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.9.1
-
- * DETAILS: add gpg checking
-
-2016=-4-18 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.9.0
-
-2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
- * DEPENDS: depends -sub CXX gcc (half-automated)
-
-2014-11-04 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.8.1
- new spell
diff --git a/video/ffmpeg6/BUILD b/video/ffmpeg6/BUILD
new file mode 100755
index 0000000..05f91fa
--- /dev/null
+++ b/video/ffmpeg6/BUILD
@@ -0,0 +1,49 @@
+disable_pic &&
+
+if list_find "$FFMPEG_PROGRAMS" "none"; then
+ OPTS="--disable-programs $OPTS"
+elif list_find "$FFMPEG_PROGRAMS" "all"; then
+ :
+else
+ for program in $FFMPEG_PROGRAM_LIST; do
+ if ! list_find "$FFMPEG_PROGRAMS" "$program"; then
+ OPTS="--disable-$program $OPTS"
+ fi
+ done &&
+
+ persistent_remove FFMPEG_PROGRAM_LIST &&
+ persistent_save &&
+ persistent_load
+fi &&
+
+OPTS="$FFMPEG_OPTS $OPTS" &&
+
+if echo "$CFLAGS" | grep -q "\-Os"; then
+ OPTS="--enable-small $OPTS"
+fi &&
+
+if is_depends_enabled $SPELL opencore-amr; then
+ OPTS="--enable-version3 $OPTS"
+fi &&
+
+# fixing issue #381
+if is_depends_enabled $SPELL openjpeg; then
+ CFLAGS="$CFLAGS -I${INSTALL_ROOT}/usr/include/openjpeg-1.5"
+fi &&
+
+LDFLAGS=${LDFLAGS//-Wl,--as-needed/} &&
+
+OPTS="--disable-cuda --disable-cuvid $OPTS" &&
+
+check_tmp_noexec /tmp &&
+./configure --prefix=${INSTALL_ROOT}/usr \
+ --mandir=${INSTALL_ROOT}/usr/share/man \
+ --enable-shared \
+ --disable-static \
+ --enable-pthreads \
+ --enable-postproc \
+ --enable-gpl \
+ $OPTS &&
+check_tmp_noexec /tmp &&
+make V=1 &&
+make V=1 tools/qt-faststart
diff --git a/video/ffmpeg6/CONFIGURE b/video/ffmpeg6/CONFIGURE
new file mode 100755
index 0000000..4a29277
--- /dev/null
+++ b/video/ffmpeg6/CONFIGURE
@@ -0,0 +1,24 @@
+. $GRIMOIRE/config_query_multi.function &&
+default_configure &&
+
+config_query_option FFMPEG_OPTS "Enable software scaler support?" y \
+ "--enable-swscale" \
+ "--disable-swscale" &&
+
+config_query_option FFMPEG_OPTS "Enable debugging symbols?" y \
+ "--enable-debug" \
+ "--disable-debug" &&
+
+config_query_option FFMPEG_OPTS "Enable support for Blackmagick Decklink
output?" n \
+ "--enable-decklink" \
+ "--disable-decklink" &&
+
+persistent_add FFMPEG_PROGRAM_LIST &&
+local FFMPEG_PROGRAM_LIST="ffmpeg ffprobe" &&
+config_query_multi FFMPEG_PROGRAMS "Which command line programs would you
like to build?" \
+ $FFMPEG_PROGRAM_LIST \
+ all \
+ none &&
+
+config_query_list FFMPEG_HTTPS "how to support https"\
+ gnutls SSL none
diff --git a/video/ffmpeg6/CONFLICTS b/video/ffmpeg6/CONFLICTS
new file mode 100755
index 0000000..ee80314
--- /dev/null
+++ b/video/ffmpeg6/CONFLICTS
@@ -0,0 +1,3 @@
+conflicts ffmpeg-svn
+conflicts ffmpeg
+conflicts ffmpeg5
diff --git a/video/ffmpeg6/DEPENDS b/video/ffmpeg6/DEPENDS
new file mode 100755
index 0000000..983ec52
--- /dev/null
+++ b/video/ffmpeg6/DEPENDS
@@ -0,0 +1,289 @@
+#optional_depends libmpx \
+# "--enable-mfx" \
+# "--disable-mfx" \
+# "for hardware acceleration through libmfx" &&
+
+#optional_depends openh264 \
+# "--enable-openh264" \
+# "--disable-openh264" \
+# "for H.264 support through OpenH264" &&
+
+optional_depends dav1d \
+ "--enable-libdav1d" \
+ "--disable-libdav1d" \
+ "enable AV1-codec support" &&
+
+optional_depends chromaprint \
+ "--enable-chromaprint" \
+ "--disable-chromaprint" \
+ "enable audio-fingerprinting support" &&
+
+optional_depends codec2 \
+ "--enable-libcodec2" \
+ "--disable-libcodec2" \
+ "enable codec2 support" &&
+
+optional_depends ladspa \
+ "--enable-ladspa" \
+ "--disable-ladspa" \
+ "enable ladspa support" &&
+
+optional_depends libdrm \
+ "--enable-libdrm" \
+ "--disable-libdrm" \
+ "enable DRM code" &&
+
+#optional_depends libdc1394 \
+# "--enable-libdc1394" \
+# "--disable-libdc1394" \
+# "enable IIDC-1394 grabbing support" &&
+
+optional_depends alsa-lib \
+ "--enable-alsa" \
+ "--disable-alsa" \
+ "for alsa sound support" &&
+
+optional_depends JACK-DRIVER "--enable-libjack" "" "for libjack sound
support" &&
+
+optional_depends librsvg2 \
+ "--enable-librsvg" \
+ "--disable-librsvg" \
+ "for svg support" &&
+
+optional_depends libxcb \
+ "--enable-libxcb --enable-libxcb-shm --enable-libxcb-xfixes
--enable-libxcb-shape" \
+ "--disable-libxcb" \
+ "for X11 grabbing using xcb" &&
+
+optional_depends LZMA \
+ "--enable-lzma" \
+ "--disable-lzma" \
+ "for lzma support" &&
+
+optional_depends zlib \
+ "--enable-zlib" \
+ "--disable-zlib" \
+ "for zlib support" &&
+
+optional_depends X86-ASSEMBLER \
+ "" \
+ "--disable-x86asm" \
+ "for some assembler optimizations" &&
+
+optional_depends celt \
+ "--enable-libcelt" \
+ "" \
+ "for celt codec support" &&
+
+optional_depends frei0r-plugins \
+ "--enable-frei0r" \
+ "" \
+ "to use frei0r for video filtering" &&
+
+ case $FFMPEG_HTTPS in
+ gnutls) depends gnutls "--enable-gnutls" ;;
+ SSL) depends SSL "--enable-nonfree --enable-openssl" &&
+ message "Open/Libre SSL ${PROBLEM_COLOR}nonfree${DEFAULT_COLOR}" ;;
+ esac &&
+
+ optional_depends fontconfig \
+ "--enable-libfontconfig" \
+ "" \
+ "to enable fontconfig" &&
+
+ optional_depends libass \
+ "--enable-libass" \
+ "" \
+ "use libass for subtitle rendering" &&
+
+ optional_depends libmodplug \
+ "--enable-libmodplug" \
+ "" \
+ "to enable libmodplug support for playing mod files" &&
+
+ optional_depends twolame \
+ "--enable-libtwolame" \
+ "" \
+ "for MP2 encoding" &&
+
+ optional_depends libcdio \
+ "--enable-libcdio" \
+ "" \
+ "for audio CD grabbing" &&
+
+ if is_depends_enabled $SPELL libcdio; then
+ depends libcdio-paranoia
+ fi &&
+
+ optional_depends libiec61883 \
+ "--enable-libiec61883" \
+ "" \
+ "to enable iec61883" &&
+
+ optional_depends flite \
+ "--enable-libflite" \
+ "" \
+ "for voice synthesis support" &&
+
+ optional_depends libcaca \
+ "--enable-libcaca" \
+ "" \
+ "for textual display support" &&
+
+ optional_depends libbluray \
+ "--enable-libbluray" \
+ "" \
+ "for BluRay reading support" &&
+
+ optional_depends openal \
+ "--enable-openal" \
+ "" \
+ "for OpenAL 1.1 capture support" &&
+
+ optional_depends v4l-utils \
+ "--enable-libv4l2" \
+ "" \
+ "to enable v4l support" &&
+
+ optional_depends pulseaudio \
+ "--enable-libpulse" \
+ "" \
+ "for Pulseaudio input support" &&
+
+ optional_depends libwebp \
+ "--enable-libwebp" \
+ "" \
+ "for WebP encoding via libwebp" &&
+
+ optional_depends OPENGL \
+ "--enable-opengl" \
+ "" \
+ "for OpenGL rendering" &&
+
+#optional_depends libvmaf \
+# "--enable-libvmaf" \
+# "--disable-libvmaf" \
+# "to enable vmaf filter support" &&
+
+optional_depends libxml2 \
+ "--enable-libxml2" \
+ "--disable-libxml2" \
+ "to enable XML parsing code" &&
+
+optional_depends libvdpau \
+ "--enable-vdpau" \
+ "--disable-vdpau" \
+ "to enable VDPAU code" &&
+
+optional_depends OPENCV \
+ "--enable-libopencv" \
+ "" \
+ "to video filtering via libopencv" &&
+
+optional_depends libva '--enable-vaapi' '--disable-vaapi' 'Video
Acceleration API' &&
+
+optional_depends libvpx \
+ "--enable-libvpx" \
+ "" \
+ "for VP8 (and VP9 for stable branch) de/encoding support" &&
+
+optional_depends speex \
+ "--enable-libspeex" \
+ "" \
+ "for Speex codec support" &&
+
+optional_depends openjpeg \
+ "--enable-libopenjpeg" \
+ "--disable-libopenjpeg" \
+ "for JPEG 2000 support" &&
+
+optional_depends lame \
+ "--enable-libmp3lame" \
+ "" \
+ "for mp3 encoding" &&
+
+optional_depends libvorbis \
+ "--enable-libvorbis" \
+ "" \
+ "for ogg/vorbis support" &&
+
+optional_depends freetype2 \
+ "--enable-libfreetype" \
+ "" \
+ "for a text render plugin" &&
+
+optional_depends xvid \
+ "--enable-libxvid" \
+ "" \
+ "for xvid support" &&
+
+optional_depends sdl2 \
+ "" \
+ "--disable-sdl2" \
+ "for ffplay video player" &&
+
+optional_depends opencore-amr \
+ "--enable-libopencore-amrnb" \
+ "" \
+ "for AMR-NB de/encoding via libopencore-amrnb
(${PROBLEM_COLOR}GPLv3${DEFAULT_COLOR}) support" &&
+
+optional_depends libtheora \
+ "--enable-libtheora" \
+ "" \
+ "for Theora encoding" &&
+
+optional_depends x264 \
+ "--enable-libx264" \
+ "" \
+ "for H.264 encoding" &&
+
+optional_depends x265 \
+ "--enable-libx265" \
+ "" \
+ "for H.265 encoding" &&
+
+optional_depends gsm \
+ "--enable-libgsm" \
+ "" \
+ "for GSM de/encoding" &&
+
+optional_depends rtmpdump \
+ "--enable-librtmp" \
+ "" \
+ "for RTMP[E] support" &&
+
+#optional_depends libdc1394 \
+# "--enable-libdc1394" \
+# "" \
+# "for IIDC-1394 grabbing" &&
+
+optional_depends rubberband \
+ "--enable-librubberband" \
+ "" \
+ "for rubberband filter" &&
+
+optional_depends tesseract \
+ "--enable-libtesseract" \
+ "" \
+ "for OCR filter" &&
+
+
+optional_depends snappy \
+ "--enable-libsnappy" \
+ "" \
+ "for Snappy compression, needed for hap encoding" &&
+
+optional_depends libxvmc \
+ --enable-hwaccel=xvmc\
+ --disable-hwaccel=xvmc\
+ 'XVmc HW accelleration' &&
+optional_depends vulkan-headers \
+ --enable-vulkan \
+ --disable-vulkan \
+ 'Vulkan support'
+optional_depends texinfo '' \
+ '--disable-doc' \
+ 'build docs'
+
+
+
diff --git a/video/ffmpeg6/DETAILS b/video/ffmpeg6/DETAILS
new file mode 100755
index 0000000..cfd3be4
--- /dev/null
+++ b/video/ffmpeg6/DETAILS
@@ -0,0 +1,22 @@
+ SPELL=ffmpeg6
+ SPELLX=ffmpeg
+ VERSION=6.0
+ SOURCE=$SPELLX-$VERSION.tar.xz
+ SOURCE2=$SOURCE.asc
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
+ SOURCE_URL[0]=https://ffmpeg.org/releases/$SOURCE
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+ SOURCE_GPG=ffmpeg.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+ DOC_DIRS=""
+ WEB_SITE=https://ffmpeg.org/
+ ENTERED=20231008
+ LICENSE[0]=GPL
+ KEYWORDS="video"
+ SHORT="complete video and audio broadcasting solution"
+cat << EOF
+FFMpeg is a complete and free Internet live audio and video
+broadcasting solution for Linux/Unix. It also includes a digital VCR.
+It can encode in real time in many formats including MPEG1 audio and
+video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash.
+EOF
diff --git a/video/ffmpeg6/HISTORY b/video/ffmpeg6/HISTORY
new file mode 100644
index 0000000..de008f5
--- /dev/null
+++ b/video/ffmpeg6/HISTORY
@@ -0,0 +1,6 @@
+2023-10-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD: delete
+ * DEPENDS: cleanup
+ * DETAILS: version 6.0
+ new spell, derived from ffmpeg5
+ * Patches/&: from blfs
diff --git a/video/ffmpeg6/INSTALL b/video/ffmpeg6/INSTALL
new file mode 100755
index 0000000..be73a2f
--- /dev/null
+++ b/video/ffmpeg6/INSTALL
@@ -0,0 +1,5 @@
+make_single &&
+make V=1 install &&
+make_normal &&
+
+install -vm 755 "tools/qt-faststart" "$INSTALL_ROOT/usr/bin/qt-faststart"
diff --git a/video/ffmpeg6/PRE_BUILD b/video/ffmpeg6/PRE_BUILD
new file mode 100755
index 0000000..4604ffc
--- /dev/null
+++ b/video/ffmpeg6/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+apply_patch_dir patches
diff --git a/video/ffmpeg6/PROVIDES b/video/ffmpeg6/PROVIDES
new file mode 100755
index 0000000..f6a1ac4
--- /dev/null
+++ b/video/ffmpeg6/PROVIDES
@@ -0,0 +1 @@
+LIBAVCODEC
diff --git a/video/ffmpeg6/TRIGGERS b/video/ffmpeg6/TRIGGERS
new file mode 100755
index 0000000..d5bbf70
--- /dev/null
+++ b/video/ffmpeg6/TRIGGERS
@@ -0,0 +1,8 @@
+on_cast codec2 check_self
+on_cast dav1d check_self
+on_cast libass check_self
+on_cast libunibreak check_self
+on_cast snappy check_self
+on_cast tesseract check_self
+on_cast x264 check_self
+on_cast x265 check_self
diff --git a/video/ffmpeg6/UP_TRIGGERS b/video/ffmpeg6/UP_TRIGGERS
new file mode 100755
index 0000000..8fc029e
--- /dev/null
+++ b/video/ffmpeg6/UP_TRIGGERS
@@ -0,0 +1,19 @@
+# up_trigger everything on major version updates
+local NEW_SPELL_BRANCH="" &&
+local OLD_SPELL_BRANCH="" &&
+
+if spell_ok $SPELL; then
+ NEW_SPELL_BRANCH="$(echo $VERSION | cut -d. -f1,2)" &&
+ OLD_SPELL_BRANCH="$(installed_version $SPELL | cut -d. -f1,2)" &&
+
+ if test "${NEW_SPELL_BRANCH}" != "${OLD_SPELL_BRANCH}"; then
+ message "This is a possibly incompatible update of ${SPELL}..."
+ message "Figuring out what spells need to be recast, this may take a
while."
+ for each in $(show_up_depends $SPELL 1); do
+ if gaze install $each | xargs readelf -d 2> /dev/null |
+ grep -q
"NEEDED.*lib\(\(swscale\)\|\(avcodec\)\|\(avdevice\)\|\(avfilter\)\|\(avutil\)\|\(postproc\)\|\(swresample\)\)";
then
+ up_trigger $each cast_self
+ fi
+ done
+ fi
+fi
diff --git a/video/ffmpeg6/patches/ffmpeg-6.0-binutils_2.41-1.patch
b/video/ffmpeg6/patches/ffmpeg-6.0-binutils_2.41-1.patch
new file mode 100644
index 0000000..fdff725
--- /dev/null
+++ b/video/ffmpeg6/patches/ffmpeg-6.0-binutils_2.41-1.patch
@@ -0,0 +1,80 @@
+Submitted By: Bruce Dubbs (bdubbs AT linuxfromscratch.org)
+Date: 2023-08-06
+Initial Package Version: 6.0
+Origin: Upstream
+Upstream Status: Committed
+Description: Allow building with binutils-2.41.
+
+From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi AT remlab.net>
+Date: Sun, 16 Jul 2023 18:18:02 +0300
+Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift
+ instructions within inline assembly
+
+Fixes assembling with binutil as >= 2.41
+
+Signed-off-by: James Almer <jamrial AT gmail.com>
+---
+ libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++---
+ 1 file changed, 23 insertions(+), 3 deletions(-)
+
+diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
+index 6298f5ed1983..ca7e2dffc107 100644
+--- a/libavcodec/x86/mathops.h
++++ b/libavcodec/x86/mathops.h
+@@ -35,12 +35,20 @@
+ static av_always_inline av_const int MULL(int a, int b, unsigned shift)
+ {
+ int rt, dummy;
++ if (__builtin_constant_p(shift))
+ __asm__ (
+ "imull %3 \n\t"
+ "shrdl %4, %%edx, %%eax \n\t"
+ :"=a"(rt), "=d"(dummy)
+- :"a"(a), "rm"(b), "ci"((uint8_t)shift)
++ :"a"(a), "rm"(b), "i"(shift & 0x1F)
+ );
++ else
++ __asm__ (
++ "imull %3 \n\t"
++ "shrdl %4, %%edx, %%eax \n\t"
++ :"=a"(rt), "=d"(dummy)
++ :"a"(a), "rm"(b), "c"((uint8_t)shift)
++ );
+ return rt;
+ }
+
+@@ -113,19 +121,31 @@ __asm__ volatile(\
+ // avoid +32 for shift optimization (gcc should do that ...)
+ #define NEG_SSR32 NEG_SSR32
+ static inline int32_t NEG_SSR32( int32_t a, int8_t s){
++ if (__builtin_constant_p(s))
+ __asm__ ("sarl %1, %0\n\t"
+ : "+r" (a)
+- : "ic" ((uint8_t)(-s))
++ : "i" (-s & 0x1F)
+ );
++ else
++ __asm__ ("sarl %1, %0\n\t"
++ : "+r" (a)
++ : "c" ((uint8_t)(-s))
++ );
+ return a;
+ }
+
+ #define NEG_USR32 NEG_USR32
+ static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
++ if (__builtin_constant_p(s))
+ __asm__ ("shrl %1, %0\n\t"
+ : "+r" (a)
+- : "ic" ((uint8_t)(-s))
++ : "i" (-s & 0x1F)
+ );
++ else
++ __asm__ ("shrl %1, %0\n\t"
++ : "+r" (a)
++ : "c" ((uint8_t)(-s))
++ );
+ return a;
+ }
+
diff --git a/video/ffmpeg6/patches/ffmpeg-6.0-chromium_method-1.patch
b/video/ffmpeg6/patches/ffmpeg-6.0-chromium_method-1.patch
new file mode 100644
index 0000000..9aee44a
--- /dev/null
+++ b/video/ffmpeg6/patches/ffmpeg-6.0-chromium_method-1.patch
@@ -0,0 +1,42 @@
+Submitted By: Marty Jack (martyj19 at comcast dot net)
+Date: 2022-07-23
+Initial Package Version: 5.1.0
+Origin: Rediffed from ffmpeg-5.0.1-api_addition-1.patch
+Upstream Status: Not accepted
+Description: The ffmpeg upstream is not willing to take this as a
+permanent fix and suggests that Chromium should change to keep the
+information locally to Chromium. Until that happens it appears
+that many distros are carrying this patch as a temporary
+expedient to allow building with system ffmpeg.
+
+diff -Naur ffmpeg-5.1.orig/libavformat/avformat.h
ffmpeg-5.1/libavformat/avformat.h
+--- ffmpeg-5.1.orig/libavformat/avformat.h 2022-07-22 13:58:39.000000000
-0400
++++ ffmpeg-5.1/libavformat/avformat.h 2022-07-22 19:34:07.490051886 -0400
+@@ -1128,6 +1128,10 @@
+ */
+ int64_t av_stream_get_end_pts(const AVStream *st);
+
++// Chromium: We use the internal field first_dts vvv
++int64_t av_stream_get_first_dts(const AVStream *st);
++// Chromium: We use the internal field first_dts ^^^
++
+ #define AV_PROGRAM_RUNNING 1
+
+ /**
+diff -Naur ffmpeg-5.1.orig/libavformat/demux_utils.c
ffmpeg-5.1/libavformat/demux_utils.c
+--- ffmpeg-5.1.orig/libavformat/demux_utils.c 2022-07-22 13:58:39.000000000
-0400
++++ ffmpeg-5.1/libavformat/demux_utils.c 2022-07-22 19:36:39.646735587
-0400
+@@ -29,6 +29,13 @@
+ #include "demux.h"
+ #include "internal.h"
+
++// Chromium: We use the internal field first_dts vvv
++int64_t av_stream_get_first_dts(const AVStream *st)
++{
++ return cffstream(st)->first_dts;
++}
++// Chromium: We use the internal field first_dts ^^^
++
+ struct AVCodecParserContext *av_stream_get_parser(const AVStream *st)
+ {
+ return cffstream(st)->parser;



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (7c618bb4a8e652219c22427a9b40394f7567d91a), Treeve Jelbert, 11/02/2023

Archive powered by MHonArc 2.6.24.

Top of Page