Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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

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 (725bb5331ae2ae442b5858af028241e940d42fce)
  • Date: Sat, 11 Nov 2023 12:56:12 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

LXQT_VERSION | 18 ++
graphics/exiv2/DETAILS | 6
graphics/exiv2/HISTORY | 4
lxqt/libfm-qt/DEPENDS | 2
lxqt/libfm-qt/DETAILS | 10 -
lxqt/liblxqt/DEPENDS | 3
lxqt/liblxqt/DETAILS | 10 -
lxqt/libqtxdg/DEPENDS | 2
lxqt/libqtxdg/DETAILS | 9 -
lxqt/libsysstat/DEPENDS | 2
lxqt/libsysstat/DETAILS | 9 -
lxqt/lximage-qt/DEPENDS | 2
lxqt/lximage-qt/DETAILS | 10 -
lxqt/lxqt-about/DEPENDS | 2
lxqt/lxqt-about/DETAILS | 10 -
lxqt/lxqt-build-tools/DEPENDS | 2
lxqt/lxqt-build-tools/DETAILS | 9 -
lxqt/lxqt-config/DEPENDS | 2
lxqt/lxqt-config/DETAILS | 10 -
lxqt/lxqt-globalkeys/DEPENDS | 2
lxqt/lxqt-globalkeys/DETAILS | 10 -
lxqt/lxqt-menu-data/DEPENDS | 2
lxqt/lxqt-menu-data/DETAILS | 10 -
lxqt/lxqt-notificationd/DEPENDS | 2
lxqt/lxqt-notificationd/DETAILS | 10 -
lxqt/lxqt-panel/DEPENDS | 2
lxqt/lxqt-panel/DETAILS | 10 -
lxqt/lxqt-powermanagement/DEPENDS | 2
lxqt/lxqt-powermanagement/DETAILS | 10 -
lxqt/lxqt-runner/DEPENDS | 2
lxqt/lxqt-runner/DETAILS | 10 -
lxqt/lxqt-session/DEPENDS | 2
lxqt/lxqt-session/DETAILS | 10 -
lxqt/lxqt-session/HISTORY | 3
lxqt/lxqt-session/PRE_BUILD | 3
lxqt/lxqt-session/patches/lxqt-session-1.2.0-procps-ng-4.0.patch | 52
------
lxqt/lxqt-themes/DEPENDS | 2
lxqt/lxqt-themes/DETAILS | 10 -
lxqt/lxqt_wallet/DEPENDS | 2
lxqt/lxqt_wallet/DETAILS | 9 -
lxqt/pcmanfm-qt/DEPENDS | 2
lxqt/pcmanfm-qt/DETAILS | 10 -
lxqt/qterminal/DEPENDS | 2
lxqt/qterminal/DETAILS | 10 -
lxqt/qtermwidget/DEPENDS | 2
lxqt/qtermwidget/DETAILS | 10 -
lxqt/qtxdg-tools/DEPENDS | 2
lxqt/qtxdg-tools/DETAILS | 9 -
video/ffmpeg6/DETAILS | 2
video/ffmpeg6/HISTORY | 4
video/ffmpeg6/PRE_BUILD | 3
video/ffmpeg6/patches/ffmpeg-6.0-binutils_2.41-1.patch | 80
----------
video/ffmpeg6/patches/ffmpeg-6.0-chromium_method-1.patch | 42 -----
53 files changed, 75 insertions(+), 390 deletions(-)

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

exiv2: => 0.28.1 SECURITY FIX

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

ffmpeg6: => 6.1

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

lxqt-session - delete patches

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

lxqt* - use QT_DEPENDS

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

lxqt/* - use LXQT_VERSION

diff --git a/LXQT_VERSION b/LXQT_VERSION
new file mode 100755
index 0000000..b729f18
--- /dev/null
+++ b/LXQT_VERSION
@@ -0,0 +1,18 @@
+# simplify version updates for lxqt in one place
+
+if [[ -z ${SPELLX} ]];then
+ SPELLX=$SPELL
+fi &&
+
+if [[ -z $VERSION ]];then
+ VERSION=1.4.0
+fi
+ SOURCE=$SPELLX-$VERSION.tar.xz
+ SOURCE2=$SOURCE.asc
+
SOURCE_URL=https://github.com/lxqt/$SPELL/releases/download/$VERSION/$SOURCE
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+ SOURCE_GPG=lxqt.gpg:$SOURCE.asc:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+
+ WEB_SITE=https://lxqt-project.org
diff --git a/graphics/exiv2/DETAILS b/graphics/exiv2/DETAILS
index e4e32e9..5c111c5 100755
--- a/graphics/exiv2/DETAILS
+++ b/graphics/exiv2/DETAILS
@@ -1,8 +1,8 @@
SPELL=exiv2
- VERSION=0.28.0
+ VERSION=0.28.1
PATCHLEVEL=1
-
SOURCE_HASH=sha512:35e483c6123f099167ed8647fae7c6e5512434c24d0afe684180ba6a5114068d5678280a01c8e6cfee0d1e555e1dc2a1606989d46950ce3ef1a3859caeed4dad
- SECURITY_PATCH=5
+
SOURCE_HASH=sha512:7b872a3c0cbe343014b1ca4618cecaf6ee8d78dec7ef83accfce95cb8eadc6b52116977a41e1f1be5c6149a47bdd9457fadc08d73708aa2a6ab69795fd3de23b
+ SECURITY_PATCH=6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=https://www.exiv2.org
diff --git a/graphics/exiv2/HISTORY b/graphics/exiv2/HISTORY
index 400c550..eda349d 100644
--- a/graphics/exiv2/HISTORY
+++ b/graphics/exiv2/HISTORY
@@ -1,3 +1,7 @@
+2023-11-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.28.1
+ SECURITY_PATCH++ fixes CVE-2023-44398
+
2023-05-19 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.28.0
* DEPENDS: add several optional depends, fixes build
diff --git a/lxqt/libfm-qt/DEPENDS b/lxqt/libfm-qt/DEPENDS
index adce6da..2bd1fe6 100755
--- a/lxqt/libfm-qt/DEPENDS
+++ b/lxqt/libfm-qt/DEPENDS
@@ -1,4 +1,4 @@
-source $GRIMOIRE/QT5_DEPENDS &&
+source $GRIMOIRE/QT_DEPENDS &&
depends lxqt-build-tools &&
depends qttools &&
depends glib2 &&
diff --git a/lxqt/libfm-qt/DETAILS b/lxqt/libfm-qt/DETAILS
index bc0f693..641b3ae 100755
--- a/lxqt/libfm-qt/DETAILS
+++ b/lxqt/libfm-qt/DETAILS
@@ -1,14 +1,6 @@
SPELL=libfm-qt
- VERSION=1.4.0
- SOURCE=$SPELL-$VERSION.tar.xz
- SOURCE2=$SOURCE.asc
-
SOURCE_URL=https://github.com/lxqt/libfm-qt/releases/download/$VERSION/$SOURCE
- SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
- SOURCE_GPG=lxqt.gpg:$SOURCE.asc:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- WEB_SITE=https://lxqt-project.org
LICENSE[0]=LGPL2
+source $GRIMOIRE/LXQT_VERSION
ENTERED=20220306
KEYWORDS=""
SHORT=""
diff --git a/lxqt/liblxqt/DEPENDS b/lxqt/liblxqt/DEPENDS
index 68188ed..b54a71e 100755
--- a/lxqt/liblxqt/DEPENDS
+++ b/lxqt/liblxqt/DEPENDS
@@ -1,9 +1,8 @@
-source $GRIMOIRE/QT5_DEPENDS &&
+source $GRIMOIRE/QT_DEPENDS &&
depends lxqt-build-tools &&
depends libqtxdg &&
depends qttools &&
depends kwindowsystem &&
depends libxscrnsaver &&
-depends qtx11extras &&

optional_depends polkit-qt-1 '' '-DBUILD_BACKLIGHT_LINUX_BACKEND=0' 'build
backlight backend'
diff --git a/lxqt/liblxqt/DETAILS b/lxqt/liblxqt/DETAILS
index a65a090..0427c0d 100755
--- a/lxqt/liblxqt/DETAILS
+++ b/lxqt/liblxqt/DETAILS
@@ -1,14 +1,6 @@
SPELL=liblxqt
- VERSION=1.4.0
- SOURCE=$SPELL-$VERSION.tar.xz
- SOURCE2=$SOURCE.asc
-
SOURCE_URL=https://github.com/lxqt/liblxqt/releases/download/$VERSION/$SOURCE
- SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
- SOURCE_GPG=lxqt.gpg:$SOURCE.asc:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

- WEB_SITE=https://lxqt-project.org/
+source $GRIMOIRE/LXQT_VERSION
LICENSE[0]=LGPL2
ENTERED=20220306
KEYWORDS=""
diff --git a/lxqt/libqtxdg/DEPENDS b/lxqt/libqtxdg/DEPENDS
index a9310e0..6ca101d 100755
--- a/lxqt/libqtxdg/DEPENDS
+++ b/lxqt/libqtxdg/DEPENDS
@@ -1,4 +1,4 @@
-source $GRIMOIRE/QT5_DEPENDS &&
+source $GRIMOIRE/QT_DEPENDS &&
depends lxqt-build-tools &&
depends qtsvg &&
depends glib2 &&
diff --git a/lxqt/libqtxdg/DETAILS b/lxqt/libqtxdg/DETAILS
index e7dfcce..fd6c5ab 100755
--- a/lxqt/libqtxdg/DETAILS
+++ b/lxqt/libqtxdg/DETAILS
@@ -1,14 +1,7 @@
SPELL=libqtxdg
VERSION=3.11.0
- SOURCE=$SPELL-$VERSION.tar.xz
- SOURCE2=$SOURCE.asc
-
SOURCE_URL=https://github.com/lxqt/libqtxdg/releases/download/$VERSION/$SOURCE
- SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
- SOURCE_GPG=lxqt.gpg:$SOURCE.asc:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+source $GRIMOIRE/LXQT_VERSION

- WEB_SITE=https://lxqt-project.org/
LICENSE[0]=LGPL2
ENTERED=20220306
KEYWORDS=""
diff --git a/lxqt/libsysstat/DEPENDS b/lxqt/libsysstat/DEPENDS
index 4350114..7c1815f 100755
--- a/lxqt/libsysstat/DEPENDS
+++ b/lxqt/libsysstat/DEPENDS
@@ -1,2 +1,2 @@
-source $GRIMOIRE/QT5_DEPENDS &&
+source $GRIMOIRE/QT_DEPENDS &&
depends lxqt-build-tools
diff --git a/lxqt/libsysstat/DETAILS b/lxqt/libsysstat/DETAILS
index 6b4c7d2..a8874ff 100755
--- a/lxqt/libsysstat/DETAILS
+++ b/lxqt/libsysstat/DETAILS
@@ -1,14 +1,7 @@
SPELL=libsysstat
VERSION=0.4.6
- SOURCE=$SPELL-$VERSION.tar.xz
- SOURCE2=$SOURCE.asc
-
SOURCE_URL=https://github.com/lxqt/libsysstat/releases/download/$VERSION/$SOURCE
- SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
- SOURCE_GPG=lxqt.gpg:$SOURCE.asc:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+source $GRIMOIRE/LXQT_VERSION

- WEB_SITE=https://lxqt-project.org/
LICENSE[0]=LGPL2
ENTERED=20220306
KEYWORDS=""
diff --git a/lxqt/lximage-qt/DEPENDS b/lxqt/lximage-qt/DEPENDS
index da8de2a..5cd848c 100755
--- a/lxqt/lximage-qt/DEPENDS
+++ b/lxqt/lximage-qt/DEPENDS
@@ -1,4 +1,4 @@
-source $GRIMOIRE/QT5_DEPENDS &&
+source $GRIMOIRE/QT_DEPENDS &&
depends lxqt-build-tools &&
depends qttools &&
depends libfm-qt
diff --git a/lxqt/lximage-qt/DETAILS b/lxqt/lximage-qt/DETAILS
index b68467d..0e9aa02 100755
--- a/lxqt/lximage-qt/DETAILS
+++ b/lxqt/lximage-qt/DETAILS
@@ -1,14 +1,6 @@
SPELL=lximage-qt
- VERSION=1.4.0
- SOURCE=$SPELL-$VERSION.tar.xz
- SOURCE2=$SOURCE.asc
-
SOURCE_URL=https://github.com/lxqt/lximage-qt/releases/download/$VERSION/$SOURCE
- SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
- SOURCE_GPG=lxqt.gpg:$SOURCE.asc:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

- WEB_SITE=https://lxqt-project.org/
+source $GRIMOIRE/LXQT_VERSION
LICENSE[0]=GPL2
ENTERED=20220306
KEYWORDS=""
diff --git a/lxqt/lxqt-about/DEPENDS b/lxqt/lxqt-about/DEPENDS
index f19899d..6a28190 100755
--- a/lxqt/lxqt-about/DEPENDS
+++ b/lxqt/lxqt-about/DEPENDS
@@ -1,3 +1,3 @@
-source $GRIMOIRE/QT5_DEPENDS &&
+source $GRIMOIRE/QT_DEPENDS &&
depends lxqt-build-tools &&
depends liblxqt
diff --git a/lxqt/lxqt-about/DETAILS b/lxqt/lxqt-about/DETAILS
index 873ddae..048e7e8 100755
--- a/lxqt/lxqt-about/DETAILS
+++ b/lxqt/lxqt-about/DETAILS
@@ -1,14 +1,6 @@
SPELL=lxqt-about
- VERSION=1.4.0
- SOURCE=$SPELL-$VERSION.tar.xz
- SOURCE2=$SOURCE.asc
-
SOURCE_URL=https://github.com/lxqt/lxqt-about/releases/download/$VERSION/$SOURCE
- SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
- SOURCE_GPG=lxqt.gpg:$SOURCE.asc:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

- WEB_SITE=https://lxqt-project.org/
+source $GRIMOIRE/LXQT_VERSION
LICENSE[0]=LGPL2
ENTERED=20220306
KEYWORDS=""
diff --git a/lxqt/lxqt-build-tools/DEPENDS b/lxqt/lxqt-build-tools/DEPENDS
index 6d7d390..955a11b 100755
--- a/lxqt/lxqt-build-tools/DEPENDS
+++ b/lxqt/lxqt-build-tools/DEPENDS
@@ -1 +1 @@
-source $GRIMOIRE/CMAKE_DEPENDS
+source $GRIMOIRE/QT_DEPENDS
diff --git a/lxqt/lxqt-build-tools/DETAILS b/lxqt/lxqt-build-tools/DETAILS
index b2ddd83..2d5aabf 100755
--- a/lxqt/lxqt-build-tools/DETAILS
+++ b/lxqt/lxqt-build-tools/DETAILS
@@ -1,14 +1,7 @@
SPELL=lxqt-build-tools
VERSION=0.13.0
- SOURCE=$SPELL-$VERSION.tar.xz
- SOURCE2=$SOURCE.asc
-
SOURCE_URL=https://github.com/lxqt/lxqt-build-tools/releases/download/$VERSION/$SOURCE
- SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
- SOURCE_GPG=lxqt.gpg:$SOURCE.asc:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+source $GRIMOIRE/LXQT_VERSION

- WEB_SITE=https://lxqt-project.org
LICENSE[0]=GPL2
ENTERED=20220306
KEYWORDS=""
diff --git a/lxqt/lxqt-config/DEPENDS b/lxqt/lxqt-config/DEPENDS
index 0bea6f1..4b6adba 100755
--- a/lxqt/lxqt-config/DEPENDS
+++ b/lxqt/lxqt-config/DEPENDS
@@ -1,4 +1,4 @@
-source $GRIMOIRE/QT5_DEPENDS &&
+source $GRIMOIRE/QT_DEPENDS &&
depends lxqt-build-tools &&
depends lxqt-menu-data &&
depends qttools &&
diff --git a/lxqt/lxqt-config/DETAILS b/lxqt/lxqt-config/DETAILS
index d498d58..5ca729f 100755
--- a/lxqt/lxqt-config/DETAILS
+++ b/lxqt/lxqt-config/DETAILS
@@ -1,14 +1,6 @@
SPELL=lxqt-config
- VERSION=1.4.0
- SOURCE=$SPELL-$VERSION.tar.xz
- SOURCE2=$SOURCE.asc
-
SOURCE_URL=https://github.com/lxqt/lxqt-config/releases/download/$VERSION/$SOURCE
- SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
- SOURCE_GPG=lxqt.gpg:$SOURCE.asc:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

- WEB_SITE=https://lxqt-project.org/
+source $GRIMOIRE/LXQT_VERSION
LICENSE[0]=LGPL2
ENTERED=20220309
KEYWORDS=""
diff --git a/lxqt/lxqt-globalkeys/DEPENDS b/lxqt/lxqt-globalkeys/DEPENDS
index b41ba7c..64d78b0 100755
--- a/lxqt/lxqt-globalkeys/DEPENDS
+++ b/lxqt/lxqt-globalkeys/DEPENDS
@@ -1,4 +1,4 @@
-source $GRIMOIRE/QT5_DEPENDS &&
+source $GRIMOIRE/QT_DEPENDS &&
depends lxqt-build-tools &&
depends liblxqt &&
depends qttools &&
diff --git a/lxqt/lxqt-globalkeys/DETAILS b/lxqt/lxqt-globalkeys/DETAILS
index 2806ada..4e8d77b 100755
--- a/lxqt/lxqt-globalkeys/DETAILS
+++ b/lxqt/lxqt-globalkeys/DETAILS
@@ -1,14 +1,6 @@
SPELL=lxqt-globalkeys
- VERSION=1.4.0
- SOURCE=$SPELL-$VERSION.tar.xz
- SOURCE2=$SOURCE.asc
-
SOURCE_URL=https://github.com/lxqt/lxqt-globalkeys/releases/download/$VERSION/$SOURCE
- SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
- SOURCE_GPG=lxqt.gpg:$SOURCE.asc:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

- WEB_SITE=https://lxqt-project.org/
+source $GRIMOIRE/LXQT_VERSION
LICENSE[0]=LGPL2
ENTERED=20220306
KEYWORDS=""
diff --git a/lxqt/lxqt-menu-data/DEPENDS b/lxqt/lxqt-menu-data/DEPENDS
index 4350114..7c1815f 100755
--- a/lxqt/lxqt-menu-data/DEPENDS
+++ b/lxqt/lxqt-menu-data/DEPENDS
@@ -1,2 +1,2 @@
-source $GRIMOIRE/QT5_DEPENDS &&
+source $GRIMOIRE/QT_DEPENDS &&
depends lxqt-build-tools
diff --git a/lxqt/lxqt-menu-data/DETAILS b/lxqt/lxqt-menu-data/DETAILS
index a1138d8..570546e 100755
--- a/lxqt/lxqt-menu-data/DETAILS
+++ b/lxqt/lxqt-menu-data/DETAILS
@@ -1,14 +1,6 @@
SPELL=lxqt-menu-data
- VERSION=1.4.0
- SOURCE=$SPELL-$VERSION.tar.xz
- SOURCE2=$SOURCE.asc
-
SOURCE_URL=https://github.com/lxqt/$SPELL/releases/download/$VERSION/$SOURCE
- SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
- SOURCE_GPG=lxqt.gpg:$SOURCE.asc:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

- WEB_SITE=https://lxqt-project.org/
+source $GRIMOIRE/LXQT_VERSION
LICENSE[0]=LGPL2
ENTERED=20231109
KEYWORDS=""
diff --git a/lxqt/lxqt-notificationd/DEPENDS b/lxqt/lxqt-notificationd/DEPENDS
index fe85e8e..aec1b8e 100755
--- a/lxqt/lxqt-notificationd/DEPENDS
+++ b/lxqt/lxqt-notificationd/DEPENDS
@@ -1,4 +1,4 @@
-source $GRIMOIRE/QT5_DEPENDS &&
+source $GRIMOIRE/QT_DEPENDS &&
depends lxqt-build-tools &&
depends qttools &&
depends liblxqt &&
diff --git a/lxqt/lxqt-notificationd/DETAILS b/lxqt/lxqt-notificationd/DETAILS
index 43c969d..e2ecb81 100755
--- a/lxqt/lxqt-notificationd/DETAILS
+++ b/lxqt/lxqt-notificationd/DETAILS
@@ -1,14 +1,6 @@
SPELL=lxqt-notificationd
- VERSION=1.4.0
- SOURCE=$SPELL-$VERSION.tar.xz
- SOURCE2=$SOURCE.asc
-
SOURCE_URL=https://github.com/lxqt/lxqt-notificationd/releases/download/$VERSION/$SOURCE
- SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
- SOURCE_GPG=lxqt.gpg:$SOURCE.asc:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

- WEB_SITE=https://lxqt-project.org/
+source $GRIMOIRE/LXQT_VERSION
LICENSE[0]=LGPL2
ENTERED=20220309
KEYWORDS=""
diff --git a/lxqt/lxqt-panel/DEPENDS b/lxqt/lxqt-panel/DEPENDS
index ce739db3..74b7521 100755
--- a/lxqt/lxqt-panel/DEPENDS
+++ b/lxqt/lxqt-panel/DEPENDS
@@ -1,4 +1,4 @@
-source $GRIMOIRE/QT5_DEPENDS &&
+source $GRIMOIRE/QT_DEPENDS &&
depends lxqt-build-tools &&
depends lxqt-globalkeys &&
depends lxqt-menu-data
diff --git a/lxqt/lxqt-panel/DETAILS b/lxqt/lxqt-panel/DETAILS
index 82778ad..8fd5ea0 100755
--- a/lxqt/lxqt-panel/DETAILS
+++ b/lxqt/lxqt-panel/DETAILS
@@ -1,14 +1,6 @@
SPELL=lxqt-panel
- VERSION=1.4.0
- SOURCE=$SPELL-$VERSION.tar.xz
- SOURCE2=$SOURCE.asc
-
SOURCE_URL=https://github.com/lxqt/lxqt-panel/releases/download/$VERSION/$SOURCE
- SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
- SOURCE_GPG=lxqt.gpg:$SOURCE.asc:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

- WEB_SITE=https://lxqt-project.org/
+source $GRIMOIRE/LXQT_VERSION
LICENSE[0]=LGPL2
ENTERED=20220306
KEYWORDS=""
diff --git a/lxqt/lxqt-powermanagement/DEPENDS
b/lxqt/lxqt-powermanagement/DEPENDS
index e6703d5..eedd424 100755
--- a/lxqt/lxqt-powermanagement/DEPENDS
+++ b/lxqt/lxqt-powermanagement/DEPENDS
@@ -1,4 +1,4 @@
-source $GRIMOIRE/QT5_DEPENDS &&
+source $GRIMOIRE/QT_DEPENDS &&
depends lxqt-build-tools &&
depends lxqt-globalkeys &&
depends liblxqt &&
diff --git a/lxqt/lxqt-powermanagement/DETAILS
b/lxqt/lxqt-powermanagement/DETAILS
index 4de31ab..47b6f8d 100755
--- a/lxqt/lxqt-powermanagement/DETAILS
+++ b/lxqt/lxqt-powermanagement/DETAILS
@@ -1,14 +1,6 @@
SPELL=lxqt-powermanagement
- VERSION=1.4.0
- SOURCE=$SPELL-$VERSION.tar.xz
- SOURCE2=$SOURCE.asc
-
SOURCE_URL=https://github.com/lxqt/lxqt-powermanagement/releases/download/$VERSION/$SOURCE
- SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
- SOURCE_GPG=lxqt.gpg:$SOURCE.asc:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

- WEB_SITE=https://lxqt-project.org/
+source $GRIMOIRE/LXQT_VERSION
LICENSE[0]=LGPL2
ENTERED=20220306
KEYWORDS=""
diff --git a/lxqt/lxqt-runner/DEPENDS b/lxqt/lxqt-runner/DEPENDS
index 2892d61..8d51db7 100755
--- a/lxqt/lxqt-runner/DEPENDS
+++ b/lxqt/lxqt-runner/DEPENDS
@@ -1,4 +1,4 @@
-source $GRIMOIRE/QT5_DEPENDS &&
+source $GRIMOIRE/QT_DEPENDS &&
depends lxqt-build-tools &&
depends lxqt-globalkeys &&
depends liblxqt &&
diff --git a/lxqt/lxqt-runner/DETAILS b/lxqt/lxqt-runner/DETAILS
index f41e3e5..145c96b 100755
--- a/lxqt/lxqt-runner/DETAILS
+++ b/lxqt/lxqt-runner/DETAILS
@@ -1,14 +1,6 @@
SPELL=lxqt-runner
- VERSION=1.4.0
- SOURCE=$SPELL-$VERSION.tar.xz
- SOURCE2=$SOURCE.asc
-
SOURCE_URL=https://github.com/lxqt/lxqt-runner/releases/download/$VERSION/$SOURCE
- SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
- SOURCE_GPG=lxqt.gpg:$SOURCE.asc:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

- WEB_SITE=https://lxqt-project.org
+source $GRIMOIRE/LXQT_VERSION
LICENSE[0]=LGPL2
ENTERED=20220311
KEYWORDS=""
diff --git a/lxqt/lxqt-session/DEPENDS b/lxqt/lxqt-session/DEPENDS
index a415fba..b01aefa 100755
--- a/lxqt/lxqt-session/DEPENDS
+++ b/lxqt/lxqt-session/DEPENDS
@@ -1,4 +1,4 @@
-source $GRIMOIRE/QT5_DEPENDS &&
+source $GRIMOIRE/QT_DEPENDS &&
depends lxqt-build-tools &&
depends lxqt-session &&
depends xdg-user-dirs &&
diff --git a/lxqt/lxqt-session/DETAILS b/lxqt/lxqt-session/DETAILS
index 5ce6c97..540d29a 100755
--- a/lxqt/lxqt-session/DETAILS
+++ b/lxqt/lxqt-session/DETAILS
@@ -1,14 +1,6 @@
SPELL=lxqt-session
- VERSION=1.4.0
- SOURCE=$SPELL-$VERSION.tar.xz
- SOURCE2=$SOURCE.asc
-
SOURCE_URL=https://github.com/lxqt/lxqt-session/releases/download/$VERSION/$SOURCE
- SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
- SOURCE_GPG=lxqt.gpg:$SOURCE.asc:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

- WEB_SITE=https://lxqt-project.org/
+source $GRIMOIRE/LXQT_VERSION
LICENSE[0]=LGPL2
ENTERED=20220309
KEYWORDS=""
diff --git a/lxqt/lxqt-session/HISTORY b/lxqt/lxqt-session/HISTORY
index f9aed3f..d0d1970 100644
--- a/lxqt/lxqt-session/HISTORY
+++ b/lxqt/lxqt-session/HISTORY
@@ -1,3 +1,6 @@
+2023-11-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD patches: deleted
+
2023-11-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.4.0

diff --git a/lxqt/lxqt-session/PRE_BUILD b/lxqt/lxqt-session/PRE_BUILD
deleted file mode 100755
index 2e132eb..0000000
--- a/lxqt/lxqt-session/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-apply_patch_dir patches
diff --git a/lxqt/lxqt-session/patches/lxqt-session-1.2.0-procps-ng-4.0.patch
b/lxqt/lxqt-session/patches/lxqt-session-1.2.0-procps-ng-4.0.patch
deleted file mode 100644
index 81e6e32..0000000
--- a/lxqt/lxqt-session/patches/lxqt-session-1.2.0-procps-ng-4.0.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -up lxqt-session-1.2.0/lxqt-session/src/procreaper.cpp.omv~
lxqt-session-1.2.0/lxqt-session/src/procreaper.cpp
---- lxqt-session-1.2.0/lxqt-session/src/procreaper.cpp.omv~ 2022-06-19
02:12:01.835293407 +0200
-+++ lxqt-session-1.2.0/lxqt-session/src/procreaper.cpp 2022-06-19
02:29:22.297426001 +0200
-@@ -29,7 +29,7 @@
- #include "log.h"
- #if defined(Q_OS_LINUX)
- #include <sys/prctl.h>
--#include <proc/readproc.h>
-+#include <procps/pids.h>
- #elif defined(Q_OS_FREEBSD)
- #include <sys/procctl.h>
- #include <libutil.h>
-@@ -109,16 +109,21 @@ void ProcReaper::stop(const std::set<int
- const pid_t my_pid = ::getpid();
- std::vector<pid_t> children;
- #if defined(Q_OS_LINUX)
-- PROCTAB * proc_dir = ::openproc(PROC_FILLSTAT);
-- while (proc_t * proc = ::readproc(proc_dir, nullptr))
-+ struct pids_info *info = NULL;
-+ enum pids_item items[] = { PIDS_ID_PPID, PIDS_ID_TGID };
-+ enum rel_items { rel_ppid, rel_tgid };
-+ struct pids_stack *stack;
-+ procps_pids_new(&info, items, 2);
-+ while ((stack = procps_pids_get(info, PIDS_FETCH_TASKS_ONLY)))
- {
-- if (proc->ppid == my_pid)
-+ const int ppid = PIDS_VAL(rel_ppid, s_int, stack, info);
-+ if (ppid == my_pid)
- {
-- children.push_back(proc->tgid);
-+ const int tgid = PIDS_VAL(rel_tgid, s_int, stack, info);
-+ children.push_back(tgid);
- }
-- ::freeproc(proc);
- }
-- ::closeproc(proc_dir);
-+ procps_pids_unref(&info);
- #elif defined(Q_OS_FREEBSD)
- int cnt = 0;
- if (kinfo_proc *proc_info = kinfo_getallproc(&cnt))
-diff -up lxqt-session-1.2.0/CMakeLists.txt.omv~
lxqt-session-1.2.0/CMakeLists.txt
---- lxqt-session-1.2.0/CMakeLists.txt.omv~ 2022-06-19 02:30:44.594909306
+0200
-+++ lxqt-session-1.2.0/CMakeLists.txt 2022-06-19 02:30:49.965940879 +0200
-@@ -35,7 +35,7 @@ find_package(X11 REQUIRED)
- message(STATUS "Building with Qt${Qt5Core_VERSION}")
- find_package(PkgConfig REQUIRED)
- if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-- pkg_search_module(PROCPS REQUIRED libprocps)
-+ pkg_search_module(PROCPS REQUIRED libproc-2)
- endif()
-
- # Please don't move, must be after lxqt
diff --git a/lxqt/lxqt-themes/DEPENDS b/lxqt/lxqt-themes/DEPENDS
index 40402da..7c1815f 100755
--- a/lxqt/lxqt-themes/DEPENDS
+++ b/lxqt/lxqt-themes/DEPENDS
@@ -1,2 +1,2 @@
-source $GRIMOIRE/CMAKE_DEPENDS &&
+source $GRIMOIRE/QT_DEPENDS &&
depends lxqt-build-tools
diff --git a/lxqt/lxqt-themes/DETAILS b/lxqt/lxqt-themes/DETAILS
index 3776f9c..081d02e 100755
--- a/lxqt/lxqt-themes/DETAILS
+++ b/lxqt/lxqt-themes/DETAILS
@@ -1,14 +1,6 @@
SPELL=lxqt-themes
- VERSION=1.4.0
- SOURCE=$SPELL-$VERSION.tar.xz
- SOURCE2=$SOURCE.asc
-
SOURCE_URL=https://github.com/lxqt/lxqt-themes/releases/download/$VERSION/$SOURCE
- SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
- SOURCE_GPG=lxqt.gpg:$SOURCE.asc:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

- WEB_SITE=https://lxqt-project.org
+source $GRIMOIRE/LXQT_VERSION
LICENSE[0]=LGPL3
ENTERED=20220311
KEYWORDS=""
diff --git a/lxqt/lxqt_wallet/DEPENDS b/lxqt/lxqt_wallet/DEPENDS
index e3a950a..46ab5fd 100755
--- a/lxqt/lxqt_wallet/DEPENDS
+++ b/lxqt/lxqt_wallet/DEPENDS
@@ -1,4 +1,4 @@
-source $GRIMOIRE/QT5_DEPENDS &&
+source $GRIMOIRE/QT_DEPENDS &&
depends lxqt-build-tools &&
depends qttools &&
depends libgcrypt &&
diff --git a/lxqt/lxqt_wallet/DETAILS b/lxqt/lxqt_wallet/DETAILS
index be5cdaa..4f2857a 100755
--- a/lxqt/lxqt_wallet/DETAILS
+++ b/lxqt/lxqt_wallet/DETAILS
@@ -1,15 +1,8 @@
SPELL=lxqt_wallet
SPELLX=${SPELL/_/-}
VERSION=3.2.2
- SOURCE=$SPELLX-$VERSION.tar.xz
- SOURCE2=$SOURCE.asc
-
SOURCE_URL=https://github.com/lxqt/lxqt_wallet/releases/download/$VERSION/$SOURCE
- SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
- SOURCE_GPG=lxqt.gpg:$SOURCE.asc:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+source $GRIMOIRE/LXQT_VERSION

- WEB_SITE=https://lxqt-project.org/
LICENSE[0]=LGPL2
ENTERED=20220309
KEYWORDS=""
diff --git a/lxqt/pcmanfm-qt/DEPENDS b/lxqt/pcmanfm-qt/DEPENDS
index eb2de4e..2f21e46 100755
--- a/lxqt/pcmanfm-qt/DEPENDS
+++ b/lxqt/pcmanfm-qt/DEPENDS
@@ -1,4 +1,4 @@
-source $GRIMOIRE/QT5_DEPENDS &&
+source $GRIMOIRE/QT_DEPENDS &&
depends lxqt-build-tools &&
depends lxqt-menu-data &&
depends qttools &&
diff --git a/lxqt/pcmanfm-qt/DETAILS b/lxqt/pcmanfm-qt/DETAILS
index 2e3a5b4..8c2b219 100755
--- a/lxqt/pcmanfm-qt/DETAILS
+++ b/lxqt/pcmanfm-qt/DETAILS
@@ -1,14 +1,6 @@
SPELL=pcmanfm-qt
- VERSION=1.4.0
- SOURCE=$SPELL-$VERSION.tar.xz
- SOURCE2=$SOURCE.asc
-
SOURCE_URL=https://github.com/lxqt/pcmanfm-qt/releases/download/$VERSION/$SOURCE
- SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
- SOURCE_GPG=lxqt.gpg:$SOURCE.asc:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

- WEB_SITE=https://lxqt-project.org/
+source $GRIMOIRE/LXQT_VERSION
LICENSE[0]=GPL2
ENTERED=20220306
KEYWORDS=""
diff --git a/lxqt/qterminal/DEPENDS b/lxqt/qterminal/DEPENDS
index 4999582..9dbd796 100755
--- a/lxqt/qterminal/DEPENDS
+++ b/lxqt/qterminal/DEPENDS
@@ -1,4 +1,4 @@
-source $GRIMOIRE/QT5_DEPENDS &&
+source $GRIMOIRE/QT_DEPENDS &&
depends lxqt-build-tools &&
depends qttools &&
depends qtermwidget &&
diff --git a/lxqt/qterminal/DETAILS b/lxqt/qterminal/DETAILS
index 695ef96..00f0a42 100755
--- a/lxqt/qterminal/DETAILS
+++ b/lxqt/qterminal/DETAILS
@@ -1,14 +1,6 @@
SPELL=qterminal
- VERSION=1.4.0
- SOURCE=$SPELL-$VERSION.tar.xz
- SOURCE2=$SOURCE.asc
-
SOURCE_URL=https://github.com/lxqt/qterminal/releases/download/$VERSION/$SOURCE
- SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
- SOURCE_GPG=lxqt.gpg:$SOURCE.asc:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

- WEB_SITE=https://lxqt-project.org/
+source $GRIMOIRE/LXQT_VERSION
LICENSE[0]=LGPL2
ENTERED=20220306
KEYWORDS=""
diff --git a/lxqt/qtermwidget/DEPENDS b/lxqt/qtermwidget/DEPENDS
index 0a9f3be..18c0e15 100755
--- a/lxqt/qtermwidget/DEPENDS
+++ b/lxqt/qtermwidget/DEPENDS
@@ -1,3 +1,3 @@
-source $GRIMOIRE/QT5_DEPENDS &&
+source $GRIMOIRE/QT_DEPENDS &&
depends lxqt-build-tools &&
depends qttools
diff --git a/lxqt/qtermwidget/DETAILS b/lxqt/qtermwidget/DETAILS
index 9349dac..d8f7bf8 100755
--- a/lxqt/qtermwidget/DETAILS
+++ b/lxqt/qtermwidget/DETAILS
@@ -1,14 +1,6 @@
SPELL=qtermwidget
- VERSION=1.4.0
- SOURCE=$SPELL-$VERSION.tar.xz
- SOURCE2=$SOURCE.asc
-
SOURCE_URL=https://github.com/lxqt/qtermwidget/releases/download/$VERSION/$SOURCE
- SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
- SOURCE_GPG=lxqt.gpg:$SOURCE.asc:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

- WEB_SITE=https://lxqt-project.org/
+source $GRIMOIRE/LXQT_VERSION
LICENSE[0]=LGPL2
ENTERED=20220306
KEYWORDS=""
diff --git a/lxqt/qtxdg-tools/DEPENDS b/lxqt/qtxdg-tools/DEPENDS
index 1e50f85..967d9b0 100755
--- a/lxqt/qtxdg-tools/DEPENDS
+++ b/lxqt/qtxdg-tools/DEPENDS
@@ -1,2 +1,2 @@
-source $GRIMOIRE/QT5_DEPENDS &&
+source $GRIMOIRE/QT_DEPENDS &&
depends libqtxdg
diff --git a/lxqt/qtxdg-tools/DETAILS b/lxqt/qtxdg-tools/DETAILS
index c41301f..641b087 100755
--- a/lxqt/qtxdg-tools/DETAILS
+++ b/lxqt/qtxdg-tools/DETAILS
@@ -1,14 +1,7 @@
SPELL=qtxdg-tools
VERSION=3.12.0
- SOURCE=$SPELL-$VERSION.tar.xz
- SOURCE2=$SOURCE.asc
-
SOURCE_URL=https://github.com/lxqt/$SPELL/releases/download/$VERSION/$SOURCE
- SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
- SOURCE_GPG=lxqt.gpg:$SOURCE.asc:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+source $GRIMOIRE/LXQT_VERSION

- WEB_SITE=https://lxqt-project.org/
LICENSE[0]=LGPL2
ENTERED=20220717
KEYWORDS=""
diff --git a/video/ffmpeg6/DETAILS b/video/ffmpeg6/DETAILS
index cfd3be4..8d6da14 100755
--- a/video/ffmpeg6/DETAILS
+++ b/video/ffmpeg6/DETAILS
@@ -1,6 +1,6 @@
SPELL=ffmpeg6
SPELLX=ffmpeg
- VERSION=6.0
+ VERSION=6.1
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/video/ffmpeg6/HISTORY b/video/ffmpeg6/HISTORY
index de008f5..8a66367 100644
--- a/video/ffmpeg6/HISTORY
+++ b/video/ffmpeg6/HISTORY
@@ -1,3 +1,7 @@
+2023-11-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 6.1
+ * PRE_BUILD patches/*: deleted
+
2023-10-25 Treeve Jelbert <treeve AT sourcemage.org>
* PRE_BUILD: delete
* DEPENDS: cleanup
diff --git a/video/ffmpeg6/PRE_BUILD b/video/ffmpeg6/PRE_BUILD
deleted file mode 100755
index 4604ffc..0000000
--- a/video/ffmpeg6/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-apply_patch_dir patches
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
deleted file mode 100644
index fdff725..0000000
--- a/video/ffmpeg6/patches/ffmpeg-6.0-binutils_2.41-1.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-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
deleted file mode 100644
index 9aee44a..0000000
--- a/video/ffmpeg6/patches/ffmpeg-6.0-chromium_method-1.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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 (725bb5331ae2ae442b5858af028241e940d42fce), Treeve Jelbert, 11/11/2023

Archive powered by MHonArc 2.6.24.

Top of Page