[xorg-x11-drv-nvidia] Update udev rules
by Leigh Scott
commit 85820364e47847d504e24f040029e38e815b80d8
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Mar 10 09:32:49 2023 +0000
Update udev rules
60-nvidia.rules | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/60-nvidia.rules b/60-nvidia.rules
index 97fd5b9..63eb682 100644
--- a/60-nvidia.rules
+++ b/60-nvidia.rules
@@ -1,6 +1,7 @@
-KERNEL=="nvidia", RUN+="/usr/bin/bash -c '/usr/bin/mknod -Z -m 666 /dev/nvidiactl c 195 255'"
-KERNEL=="nvidia", RUN+="/usr/bin/bash -c 'for i in $$(cat /proc/driver/nvidia/gpus/*/information | grep Minor | cut -d \ -f 4); do /usr/bin/mknod -Z -m 666 /dev/nvidia$${i} c 195 $${i}; done'"
-KERNEL=="nvidia_modeset", RUN+="/usr/bin/bash -c '/usr/bin/mknod -Z -m 666 /dev/nvidia-modeset c 195 254'"
+# Make sure device nodes are present even when the DDX is not started for the Wayland/EGLStream case
+KERNEL=="nvidia", RUN+="/usr/bin/bash -c '/usr/bin/mknod -Z -m 666 /dev/nvidiactl c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) 255'"
+KERNEL=="nvidia", RUN+="/usr/bin/bash -c 'for i in $$(cat /proc/driver/nvidia/gpus/*/information | grep Minor | cut -d \ -f 4); do /usr/bin/mknod -Z -m 666 /dev/nvidia$${i} c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) $${i}; done'"
+KERNEL=="nvidia_modeset", RUN+="/usr/bin/bash -c '/usr/bin/mknod -Z -m 666 /dev/nvidia-modeset c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) 254'"
# Enable runtime PM for NVIDIA VGA/3D controller devices on driver bind
ACTION=="bind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030000", TEST=="power/control", ATTR{power/control}="auto"
1 year, 1 month
[ffmpeg/f38] fix
by Leigh Scott
Summary of changes:
0290969... fix (*)
(*) This commit already existed in another branch; no separate mail sent
1 year, 1 month
[ffmpeg] fix
by Leigh Scott
commit 0290969c46da2bf3552a3d06ca6edc10f78f013c
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Mar 19 10:06:49 2023 +0000
fix
.gitignore | 1 +
ffmpeg-6.0.tar.xz.asc | 11 -----------
sources | 1 +
3 files changed, 2 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 057275a..74cab64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
ffmpeg-*.tar.xz
ffmpeg-*.rpm
ffmpeg-*.tar.bz2
+ffmpeg-*.tar.xz.asc
diff --git a/sources b/sources
index 9b86570..026e08d 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
SHA512 (ffmpeg-6.0.tar.xz) = 4d0e8f635d5a1633710f30cb3e0a854b6ca3bf85e33a289d1ec7aca2ad55dc4910010bc9cf3f13eee9f6decb9d50a0df6d7aa5a342f308c3868d2730f3a6b980
+SHA512 (ffmpeg-6.0.tar.xz.asc) = a64cd0f8578fcea4537f5a38634c930d66c8ba4abd3e8e9dcffaeb95c3ad2e754d7bc4fbb5272409d4d32abf8180ef83f7204c6a570b52a37e635efd96cb94ed
1 year, 1 month
[ffmpeg] verify upstream source signature
by Leigh Scott
commit 7ed6a99f0e1fad7ab463812fa997d52afc606482
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Mar 19 10:00:50 2023 +0000
verify upstream source signature
.gitignore | 29 +----------------------------
ffmpeg-6.0.tar.xz.asc | 11 +++++++++++
ffmpeg-devel.asc | 30 ++++++++++++++++++++++++++++++
ffmpeg.spec | 13 ++++++++++---
4 files changed, 52 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 86d9c3f..057275a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,30 +1,3 @@
ffmpeg-*.tar.xz
ffmpeg-*.rpm
-/ffmpeg-20180116.tar.bz2
-/ffmpeg-20180211.tar.bz2
-/ffmpeg-20180305.tar.bz2
-/ffmpeg-20180419.tar.bz2
-/ffmpeg-20200222.tar.bz2
-/ffmpeg-20200225.tar.bz2
-/ffmpeg-20200305.tar.bz2
-/ffmpeg-20200313.tar.bz2
-/ffmpeg-20200321.tar.bz2
-/ffmpeg-20200401.tar.bz2
-/ffmpeg-20200412.tar.bz2
-/ffmpeg-20200419.tar.bz2
-/ffmpeg-20200423.tar.bz2
-/ffmpeg-20200501.tar.bz2
-/ffmpeg-20200508.tar.bz2
-/ffmpeg-20200516.tar.bz2
-/ffmpeg-20200523.tar.bz2
-/ffmpeg-20200524.tar.bz2
-/ffmpeg-20200531.tar.bz2
-/ffmpeg-20200606.tar.bz2
-/ffmpeg-20201231.tar.bz2
-/ffmpeg-20210125.tar.bz2
-/ffmpeg-20210218.tar.bz2
-/ffmpeg-20210312.tar.bz2
-/ffmpeg-20210323.tar.bz2
-/ffmpeg-20210408.tar.bz2
-/ffmpeg-20211108.tar.bz2
-/ffmpeg-20220104.tar.bz2
+ffmpeg-*.tar.bz2
diff --git a/ffmpeg-6.0.tar.xz.asc b/ffmpeg-6.0.tar.xz.asc
new file mode 100644
index 0000000..63fb0af
--- /dev/null
+++ b/ffmpeg-6.0.tar.xz.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQFMBAABCAA2FiEE/PmG6hXm4pOlZE8QtDIvBNZ2WNgFAmP9FsUYHGZmbXBlZy1k
+ZXZlbEBmZm1wZWcub3JnAAoJELQyLwTWdljYLVcIAItlwTpkDPwv8WwoQFPeh4J0
+ydHN31+6A6KqHwCa8CT8sUH3yILXUh5/4zNFgHsXEdOsnGmxoMmE+jLuz68CKDEF
+esPwamBGcilEK1MNSQcZ1M/7bn2DMJDyC276Q2wxISNocusUe+1+bPoCw7IbXUON
+qqXTU0Ale4l88WoTgWQiFX01oTlfPTqmDfl0h6uYftpw49fyrkYK0D5dnsslQht4
+yhvZ0+8KAO+ahR0YnmI4BeCQvJDcD9JD3bePJ3cIoiH9P3xz7GaiIroxpm5lr3z4
+gdH8xQkBhZkmCQ0HpPg4Zhv42rvE7qDAZkJcr3x2yodrrrEgBzu5gQ9yjESgdFo=
+=gTpy
+-----END PGP SIGNATURE-----
diff --git a/ffmpeg-devel.asc b/ffmpeg-devel.asc
new file mode 100644
index 0000000..3a4d521
--- /dev/null
+++ b/ffmpeg-devel.asc
@@ -0,0 +1,30 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBE22rV0BCAC3DzRmA2XlhrqYv9HKoEvNHHf+PzosmCTHmYhWHDqvBxPkSvCl
+ipkbvJ4pBnVvcX6mW5QyKhspHm5j1X5ibe9Bt9/chS/obnIobmvF8shSUgjQ0qRW
+9c1aWOjvT26SxYQ1y9TmYCFwixeydGFHYKjAim+evGUccni5KMlfPoT3VTPtim78
+ufkr3E9Nco/Mobn/8APO0NmLEGWAM6ln/8J/c9h6a1QKnQyBqWfT0YnAaebafFaZ
+YwOtRdDG54VbJ4xwcHbCj5cKhTABk/QtBzDvnW4bG+uSpqdHbFZEY2JpURDuj/T3
+NudKQGzn0bYNpY1XY2l0pqs/btKHnBW0fVMjABEBAAG0NEZGbXBlZyByZWxlYXNl
+IHNpZ25pbmcga2V5IDxmZm1wZWctZGV2ZWxAZmZtcGVnLm9yZz6JATgEEwECACIF
+Ak22rV0CGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJELQyLwTWdljYKxUH
+/1fqzl7SKie2g4t4PJbqUbkLuMsC+CP6gp0dcVZOHkuUYAoD3PM3iVxpLBVyKIXI
+g7wMSTAtlIcYnzhWIpnoCBes6/O2Mrq6xHgGeTp6CDcm3LmmSYR1f5KdD8KUaA+l
+c/M/1fEnwrSs/UGDk6R6iUmbqwxPsbozlOvmUHOLbDZBnKrk9XfAJdUhAuFACrSA
+T+KF1jniz0OfNGd23SaHWRCphoRW9pXDc5FfkdaueBUvBvGv19ZNcDhcxT3/u6z2
+DaUFC0rLWqk8obo951jVvi/zOhB94Pw6u1SLvcTq3V1q5URWJtgSbpih9VRqxUbQ
+NbXduKGzbHz6Vwpkupz4JRe5AQ0ETbatXQEIANjYrygJi/fn1nlSg5Mz0l9KHDm4
+yfWtaOrXUjJcyiGe4G0XXJLGh45qxJ0DOKzi9id+9W4jby+kKuzG9O6Vn0iDeODO
+aOGnz4ua7Vu6d0AbYfNXZPWge/GCodo/ZD/qri1tPkLmRtT/sniahwy6LruPNHfF
+SRoNIjwbcD/IL+EbY1pL1/IFSzEAA1ZZamgmHgB7o9pwDIkK6HuvHMR/Y5MsoMfV
+fWV3ZGtA6v9z51CvnHsHPsADRSnUp7aYtR412SiAO4XodMLTA92L3LxgYhI4ma7D
+XZ8jgKg4JkKO+DXmoU63HtRdq/HZjeXJKk1JGJF3zCvP3DyIzZ8LWIjN8t0AEQEA
+AYkBHwQYAQIACQUCTbatXQIbDAAKCRC0Mi8E1nZY2LS8B/0bMoUAl4X9D0WQbL4l
+U0czCIOKOsvbHpIxivjCnOQxU23+PV5WZdoCCpSuAHGv+2OHzhNrij++P9BNTJeQ
+skxdS9FH4MZwy1IRSPrxegSxbCUpBI1rd0Zf7qb9BNPrHPTueWFV1uExOSB2Apsv
+WrKo2D8mR0uZAPYfYl2ToFVoa5PR7/+ii9WiJr/flF6qm7hoLpI5Bm4VcZh2GPsJ
+9Vo/8x/qOGwtdWHqBykYloKsrwD4U69rjn+d9feLoPBRgoVroXWQttt0sUnyoudz
++x8ETJgPoNK3kQoDagApj4qAt83Ayac3HzNIuEJ7LdvfINIOprujnJ9vH4n04XLg
+I4EZ
+=Rjbw
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 2c9440b..012a72f 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -111,13 +111,15 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 6.0
-Release: 4%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
+Release: 5%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
License: %{ffmpeg_license}
-URL: http://ffmpeg.org/
+URL: https://ffmpeg.org/
%if 0%{?date}
Source0: ffmpeg-%{?branch}%{date}.tar.bz2
%else
-Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
+Source0: https://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
+Source1: https://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz.asc
+Source2: https://ffmpeg.org/ffmpeg-devel.asc
%endif
Conflicts: %{name}-free
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
@@ -135,6 +137,7 @@ BuildRequires: freetype-devel
BuildRequires: fribidi-devel
%{!?_without_frei0r:BuildRequires: frei0r-devel}
%{?_with_gme:BuildRequires: game-music-emu-devel}
+BuildRequires: gnupg2
BuildRequires: gnutls-devel
BuildRequires: gsm-devel
%{?_with_ilbc:BuildRequires: ilbc-devel}
@@ -395,6 +398,7 @@ Freeworld libavcodec to complement the distro counterparts
%autosetup -p1 -n ffmpeg-%{?branch}%{date}
echo "git-snapshot-%{?branch}%{date}-rpmfusion" > VERSION
%else
+%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
%autosetup -p1 -n ffmpeg-%{version}
%endif
# fix -O3 -g in host_cflags
@@ -522,6 +526,9 @@ strip %{buildroot}%{_libdir}/%{name}/libavcodec.so.*
%changelog
+* Sat Mar 18 2023 Todd Zullinger <tmz(a)pobox.com> - 6.0-5
+- verify upstream source signature
+
* Sun Mar 12 2023 Leigh Scott <leigh123linux(a)gmail.com> - 6.0-4
- Rebuild against new nvcodec-headers
1 year, 1 month
[mpd] Enable mpcdec for f38+
by Leigh Scott
commit 055633c95e52755522d329d8ad10eda025c9a3e1
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Mar 18 13:51:28 2023 +0000
Enable mpcdec for f38+
mpd.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/mpd.spec b/mpd.spec
index 230805d..8795c38 100644
--- a/mpd.spec
+++ b/mpd.spec
@@ -82,8 +82,10 @@ BuildRequires: mpg123-devel
BuildRequires: openal-soft-devel
BuildRequires: python3-sphinx
BuildRequires: twolame-devel
+%if 0%{?fedora} && 0%{?fedora} >= 38
# Need new version with SV8
-# BuildRequires: libmpcdec-devel
+BuildRequires: libmpcdec-devel
+%endif
BuildRequires: libogg-devel
BuildRequires: libsamplerate-devel
@@ -165,7 +167,9 @@ sed -i -e 's@>= 0.56.0@>= 0.55.0@g' meson.build
-Dsndio=disabled \
-Dchromaprint=disabled \
-Dgme=disabled \
+%if 0%{?fedora} && 0%{?fedora} < 38
-Dmpcdec=disabled \
+%endif
-Dshine=disabled \
-Dtremor=disabled
1 year, 1 month
[etlegacy] Modify laucher to be able run 32 or 64 bit variant
by Petr Menšík
commit 4ee3a96c980d989bff276753f7429c7c8acf7707
Author: Petr Menšík <pemensik(a)redhat.com>
Date: Fri Mar 17 12:41:24 2023 +0100
Modify laucher to be able run 32 or 64 bit variant
Pass variant as the first parameter of etl-laucher. All following
parameters are passed to etl executable.
etl-launcher | 9 ++++++---
etlegacy.spec | 3 ++-
2 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/etl-launcher b/etl-launcher
index f476a0d..a6d6e31 100755
--- a/etl-launcher
+++ b/etl-launcher
@@ -28,8 +28,11 @@ show_instructions() {
exec xdg-open "$DATAPAGE"
}
+# First option argument is variant. Others are passed to the executable
start_game() {
- exec /usr/bin/etl
+ local VARIANT="${1:-}"
+ [ "$#" -gt 0 ] && shift
+ exec /usr/bin/etl${VARIANT} "$@"
}
start_installer() {
@@ -68,11 +71,11 @@ done
if [ -z "$FOUNDPAK" ]; then
echo "pak[012].pk3 data not found!"
if [ -x "$INSTALLER"]; then
- start_installer && start_game
+ start_installer && start_game "$@"
# Would terminate here on success
fi
if [ -f "$DATAPAGE" ]; then
show_instructions
fi
fi
-start_game
+start_game "$@"
diff --git a/etlegacy.spec b/etlegacy.spec
index e957a39..f47ca81 100644
--- a/etlegacy.spec
+++ b/etlegacy.spec
@@ -102,7 +102,8 @@ install -m 0755 %{SOURCE2} %{buildroot}%{_bindir}/etl-launcher
install -m 0755 %{SOURCE3} %{buildroot}%{_bindir}/etl-installer
install misc/etlegacy*.service %{buildroot}%{_unitdir}/
install %{SOURCE4} %{buildroot}%{_datadir}/applications/com.etlegacy.ETLegacy.installer.desktop
-sed -e 's/^Exec=etl /Exec=etl-launcher /' -i %{buildroot}%{_datadir}/applications/com.etlegacy.ETLegacy*.desktop
+sed -e 's/^Exec=etl\(\.[a-z_0-9]\+\)\?\s/Exec=etl-launcher "\1" /' \
+ -i %{buildroot}%{_datadir}/applications/com.etlegacy.ETLegacy*.desktop
%check
desktop-file-validate %{buildroot}%{_datadir}/applications/com.etlegacy.ETLegacy*.desktop
1 year, 1 month
[etlegacy] Update to 2.81.1
by Petr Menšík
commit 4a8c78597e59a93ff54741112252796967ed3c37
Author: Petr Menšík <pemensik(a)redhat.com>
Date: Fri Mar 17 12:35:42 2023 +0100
Update to 2.81.1
Breaks automatic first-time laucher at cost of allowing multiple
architecture client installation on single system.
.gitignore | 1 +
etlegacy-2.81-bin-arch.patch | 72 --------------------------------------------
etlegacy.spec | 21 +++++++------
sources | 2 +-
4 files changed, 13 insertions(+), 83 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 516cbc3..a612149 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/etlegacy-2.80.2.tar.gz
/etlegacy-2.81.0.tar.gz
+/etlegacy-2.81.1.tar.gz
diff --git a/etlegacy.spec b/etlegacy.spec
index 13e075c..e957a39 100644
--- a/etlegacy.spec
+++ b/etlegacy.spec
@@ -14,7 +14,7 @@
%global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$
Name: etlegacy
-Version: 2.81.0
+Version: 2.81.1
Release: 1%{?snapinfo:.%{snapinfo}}%{?dist}
Summary: Fully compatible client and server for the game Wolfenstein: Enemy Territory
@@ -27,7 +27,6 @@ Source2: https://raw.githubusercontent.com/pemensik/etlegacy-tools/instal
Source3: https://raw.githubusercontent.com/pemensik/etlegacy-tools/installer/linux...
Source4: com.etlegacy.ETLegacy.installer.desktop
-Patch1: etlegacy-2.81-bin-arch.patch
# https://github.com/etlegacy/etlegacy/pull/2289
Patch2: etlegacy-2.81-cjson-devel.patch
@@ -83,8 +82,6 @@ the original game. Can be removed after game data installation.
# Use system flags for all products
sed -e 's,^\s*SET(CMAKE_BUILD_TYPE "Release"),# &,' -i cmake/ETLCommon.cmake
-mv misc/com.etlegacy.ETLegacy{.x86_64,}.desktop
-
%build
%cmake -DBUNDLED_LIBS=OFF -DCROSS_COMPILE32=OFF -DBUILD_MOD=ON \
-DCLIENT_GLVND=ON \
@@ -103,12 +100,12 @@ touch %{buildroot}%{_libdir}/%{name}/etmain/pak{0,1,2}.pk3
install %{SOURCE1} %{buildroot}%{_datadir}/%{name}/
install -m 0755 %{SOURCE2} %{buildroot}%{_bindir}/etl-launcher
install -m 0755 %{SOURCE3} %{buildroot}%{_bindir}/etl-installer
-install misc/etlegacy-x86_64.service %{buildroot}%{_unitdir}/%{name}.service
+install misc/etlegacy*.service %{buildroot}%{_unitdir}/
install %{SOURCE4} %{buildroot}%{_datadir}/applications/com.etlegacy.ETLegacy.installer.desktop
-sed -e 's/^Exec=etl /Exec=etl-launcher /' -i %{buildroot}%{_datadir}/applications/com.etlegacy.ETLegacy.desktop
+sed -e 's/^Exec=etl /Exec=etl-launcher /' -i %{buildroot}%{_datadir}/applications/com.etlegacy.ETLegacy*.desktop
%check
-desktop-file-validate %{buildroot}%{_datadir}/applications/com.etlegacy.ETLegacy.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/com.etlegacy.ETLegacy*.desktop
desktop-file-validate %{buildroot}%{_datadir}/applications/com.etlegacy.ETLegacy.installer.desktop
appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.etlegacy.ETLegacy.metainfo.xml
@@ -116,13 +113,14 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.etlegacy.E
%files
%license COPYING.txt
%doc README.md docs/INSTALL.txt
-%{_bindir}/etl{,ded,-launcher}
+%{_bindir}/etl{,ded}.*
+%{_bindir}/etl-launcher
%{_mandir}/man6/etl*.6*
%{_datadir}/icons/hicolor/scalable/apps/etl*
-%{_datadir}/applications/com.etlegacy.ETLegacy.desktop
+%{_datadir}/applications/com.etlegacy.ETLegacy*.desktop
%{_metainfodir}/com.etlegacy.ETLegacy.metainfo.xml
%{_datadir}/mime/packages/etlegacy.xml
-%{_unitdir}/%{name}.service
+%{_unitdir}/%{name}*.service
%{_datadir}/%{name}
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/legacy
@@ -139,6 +137,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.etlegacy.E
%{_datadir}/applications/com.etlegacy.ETLegacy.installer.desktop
%changelog
+* Fri Mar 17 2023 Petr Menšík <pemensik(a)redhat.com> - 2.81.1-1
+- Update to 2.81.1
+
* Wed Mar 01 2023 Petr Menšík <pemensik(a)fedoraproject.org> - 2.81.0-1
- Update to 2.81.0
- Address feedback from review rfbz#5824
diff --git a/sources b/sources
index 8f5c4c2..ae4d440 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (etlegacy-2.81.0.tar.gz) = c37f6c6740c0da67dccdb1bdd3b72641f2fbfeb3aac7c018e1cba5fdb2052039d7b56c60119ad92df47f8ff4046b10e9bb770a5614d50a4ca3e308e1df058a03
+SHA512 (etlegacy-2.81.1.tar.gz) = 70cb61148ff7903b5fe3d08a6e94316f0ef4c736a076969f897092549f1c6fdb25174bf98e0b7e71a6ac9ffd68af5e9dcb469dbdec84b511fd7c6e548b2b78ee
1 year, 1 month