[xpra-codecs-freeworld/f39] Sync with Fedora
by Sérgio M. Basto
commit e61ab741c1705b11a585ff1698a92a3d558d954f
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Sep 26 00:04:58 2023 +0100
Sync with Fedora
.gitignore | 1 +
sources | 2 +-
xpra-codecs-freeworld.spec | 50 ++++++++++++++++++++++++++--------------------
3 files changed, 30 insertions(+), 23 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dd29463..88a11f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,3 +67,4 @@ xpra-0.16.3.tar.xz
/xpra-4.4.6.tar.gz
/xpra-5.0.tar.gz
/xpra-5.0.1.tar.gz
+/xpra-5.0.2.tar.gz
diff --git a/sources b/sources
index 2fdb546..17ff60f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xpra-5.0.1.tar.gz) = 202c05fb191fdc462a07c5659b33763b2090435ca16cfe2dd5261394a7092fdca432c8ac66a016cbe945802a3ecd8863b88c0822317739cbd477b37b8a3494cd
+SHA512 (xpra-5.0.2.tar.gz) = 66dfa31d4cdab078d2b6447b4b57ca1a51dab0b2911430ea3b96c6cf124b4a9a064d4fbe70e96faaf522f7a190374f12bafa7e97c9496d52733c56fa52bdbdfd
diff --git a/xpra-codecs-freeworld.spec b/xpra-codecs-freeworld.spec
index b3cae4c..a9b83f3 100644
--- a/xpra-codecs-freeworld.spec
+++ b/xpra-codecs-freeworld.spec
@@ -1,19 +1,12 @@
%bcond_without enc_x264
%bcond_with enc_x265
-# Theses settings requires 64bit
-%if 0%{?__isa_bits} == 64
-%bcond_without dec_avcodec2
-%bcond_without csc_swscale
+%bcond_with dec_avcodec2
+%bcond_with csc_swscale
%if 0%{?fedora}
%bcond_without openh264
%else
%bcond_with openh264
%endif
-%endif
-%if 0%{?__isa_bits} == 32
-%bcond_with dec_avcodec2
-%bcond_with csc_swscale
-%endif
# For debugging only
%bcond_with debug
@@ -46,8 +39,8 @@
%endif
Name: xpra-codecs-freeworld
-Version: 5.0.1
-Release: 2%{?dist}.1
+Version: 5.0.2
+Release: 3%{?dist}
Summary: Additional codecs for xpra using x264 and ffmpeg
License: GPLv2+
URL: https://www.xpra.org/
@@ -60,7 +53,6 @@ BuildRequires: libXtst-devel
BuildRequires: libxkbfile-devel
BuildRequires: lz4-devel
BuildRequires: python3-Cython
-BuildRequires: python3-cups
BuildRequires: ack
BuildRequires: desktop-file-utils
BuildRequires: libvpx-devel
@@ -70,7 +62,7 @@ BuildRequires: cups-devel
BuildRequires: python3-cups
BuildRequires: redhat-rpm-config
BuildRequires: python3-rpm-macros
-BuildRequires: gcc, gcc-c++
+BuildRequires: gcc-c++
BuildRequires: pam-devel
BuildRequires: pandoc
# needs by setup.py to detect systemd `sd_listen_ENABLED = POSIX and pkg_config_ok("--exists", "libsystemd")`
@@ -102,12 +94,11 @@ BuildRequires: libasan
%if %{with enc_x264}
BuildRequires: x264-devel
%endif
-# While ffmpeg-devel should only be needed in theses conditions, setup.py requires it anyway
-#if %%{with dec_avcodec2} || %%{with csc_swscale}
+
+%if %{with dec_avcodec2} || %{with csc_swscale}
BuildRequires: ffmpeg-devel
-#endif
+%endif
-#BuildRequires: pygtk2-devel
BuildRequires: xvidcore-devel
%if %{with enc_x265}
BuildRequires: x265-devel
@@ -134,6 +125,7 @@ sed -i 's|-mfpmath=387|-mfloat-abi=hard|' setup.py
%endif
%build
+%set_build_flags
%py3_build -- \
--without-nvidia --without-pandoc_lua \
--with-verbose \
@@ -147,10 +139,16 @@ sed -i 's|-mfpmath=387|-mfloat-abi=hard|' setup.py
--with-Xdummy \
--with-Xdummy_wrapper \
--without-strict \
- --with-enc_ffmpeg \
+%if %{without dec_avcodec2} || %{without csc_swscale}
+ --without-ffmpeg \
+%endif
+ --without-csc_cython \
+ --without-evdi \
+ --without-printing \
+ --without-cuda_kernels \
+ --without-cuda_rebuild \
--without-tests \
- --without-docs \
- --without-printing --without-cuda_kernels
+ --without-docs
%install
# We are interested to additional codecs only
@@ -192,8 +190,16 @@ find %{buildroot}%{python3_sitearch}/xpra -name '*.so' \
%license COPYING
%changelog
-* Fri Sep 22 2023 Antonio Trande <sagitter(a)fedoraproject.org> - 5.0.1-2
-- Disable x265 encoder
+* Mon Sep 25 2023 Sérgio Basto <sergio(a)serjux.com> - 5.0.2-3
+- Sync with Fedora
+
+* Sun Sep 24 2023 Antonio Trande <sagitter(a)fedoraproject.org> - 5.0.2-2
+- FFmpeg codecs disabled (provided by xpra in Fedora)
+
+* Tue Sep 19 2023 Antonio Trande <sagitter(a)fedoraproject.org> - 5.0.2-1
+- Release 5.0.2
+
+* Sun Sep 17 2023 Antonio Trande <sagitter(a)fedoraproject.org> - 5.0.1-2
- Disable openh264 on EPEL
* Sat Sep 02 2023 Antonio Trande <sagitter(a)fedoraproject.org> - 5.0.1-1
7 months, 2 weeks
[xpra-codecs-freeworld] Sync with Fedora
by Sérgio M. Basto
commit 2d947a7ca758b18e5eea5f9e4c9029393d9afc96
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Sep 25 23:23:04 2023 +0100
Sync with Fedora
xpra-codecs-freeworld.spec | 28 +++++++++++++++-------------
1 file changed, 15 insertions(+), 13 deletions(-)
---
diff --git a/xpra-codecs-freeworld.spec b/xpra-codecs-freeworld.spec
index 500b048..a9b83f3 100644
--- a/xpra-codecs-freeworld.spec
+++ b/xpra-codecs-freeworld.spec
@@ -1,7 +1,5 @@
%bcond_without enc_x264
%bcond_with enc_x265
-# Theses settings requires 64bit
-%if 0%{?__isa_bits} == 64
%bcond_with dec_avcodec2
%bcond_with csc_swscale
%if 0%{?fedora}
@@ -9,11 +7,6 @@
%else
%bcond_with openh264
%endif
-%endif
-%if 0%{?__isa_bits} == 32
-%bcond_with dec_avcodec2
-%bcond_with csc_swscale
-%endif
# For debugging only
%bcond_with debug
@@ -47,7 +40,7 @@
Name: xpra-codecs-freeworld
Version: 5.0.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Additional codecs for xpra using x264 and ffmpeg
License: GPLv2+
URL: https://www.xpra.org/
@@ -60,7 +53,6 @@ BuildRequires: libXtst-devel
BuildRequires: libxkbfile-devel
BuildRequires: lz4-devel
BuildRequires: python3-Cython
-BuildRequires: python3-cups
BuildRequires: ack
BuildRequires: desktop-file-utils
BuildRequires: libvpx-devel
@@ -70,7 +62,7 @@ BuildRequires: cups-devel
BuildRequires: python3-cups
BuildRequires: redhat-rpm-config
BuildRequires: python3-rpm-macros
-BuildRequires: gcc, gcc-c++
+BuildRequires: gcc-c++
BuildRequires: pam-devel
BuildRequires: pandoc
# needs by setup.py to detect systemd `sd_listen_ENABLED = POSIX and pkg_config_ok("--exists", "libsystemd")`
@@ -107,7 +99,6 @@ BuildRequires: x264-devel
BuildRequires: ffmpeg-devel
%endif
-#BuildRequires: pygtk2-devel
BuildRequires: xvidcore-devel
%if %{with enc_x265}
BuildRequires: x265-devel
@@ -134,6 +125,7 @@ sed -i 's|-mfpmath=387|-mfloat-abi=hard|' setup.py
%endif
%build
+%set_build_flags
%py3_build -- \
--without-nvidia --without-pandoc_lua \
--with-verbose \
@@ -144,12 +136,19 @@ sed -i 's|-mfpmath=387|-mfloat-abi=hard|' setup.py
%{?_with_csc_swscale} \
%{?_with_openh264} \
%{?_with_debug} \
- --with-Xdummy --without-Xdummy_wrapper --without-csc_cython --without-evdi --without-enc_x265 --without-cuda_rebuild \
+ --with-Xdummy \
+ --with-Xdummy_wrapper \
--without-strict \
%if %{without dec_avcodec2} || %{without csc_swscale}
--without-ffmpeg \
%endif
- --without-printing --without-cuda_kernels --without-tests --without-docs
+ --without-csc_cython \
+ --without-evdi \
+ --without-printing \
+ --without-cuda_kernels \
+ --without-cuda_rebuild \
+ --without-tests \
+ --without-docs
%install
# We are interested to additional codecs only
@@ -191,6 +190,9 @@ find %{buildroot}%{python3_sitearch}/xpra -name '*.so' \
%license COPYING
%changelog
+* Mon Sep 25 2023 Sérgio Basto <sergio(a)serjux.com> - 5.0.2-3
+- Sync with Fedora
+
* Sun Sep 24 2023 Antonio Trande <sagitter(a)fedoraproject.org> - 5.0.2-2
- FFmpeg codecs disabled (provided by xpra in Fedora)
7 months, 2 weeks
[wl-kmod/el7: 4/4] Merge branch 'master' into el7
by Nicolas Viéville
commit c148c08834c219dabb556d0653eacb9807c4e3fa
Merge: a14beb2 55824b4
Author: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
Date: Mon Sep 25 21:14:22 2023 +0200
Merge branch 'master' into el7
wl-kmod-025_kernel_6.5_adaptation.patch | 208 ++++++++++++++++++++++++++++++++
wl-kmod.spec | 85 +++++++++----
2 files changed, 268 insertions(+), 25 deletions(-)
---
7 months, 2 weeks
[wl-kmod] Spec fix build release tag
by Nicolas Viéville
commit 55824b440200a2ff7c1ccf289d717ec4da5dfe32
Author: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
Date: Mon Sep 25 20:28:35 2023 +0200
Spec fix build release tag
Fix SPEC file for RHEL 9.x and RHEL 8.x
wl-kmod.spec | 29 +++++++++++++++++++++++++++--
1 file changed, 27 insertions(+), 2 deletions(-)
---
diff --git a/wl-kmod.spec b/wl-kmod.spec
index a0aca9e..da8ed2e 100644
--- a/wl-kmod.spec
+++ b/wl-kmod.spec
@@ -10,7 +10,7 @@
Name: wl-kmod
Version: 6.30.223.271
-Release: 48%{?dist}
+Release: 49%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -298,6 +298,19 @@ pushd %{name}-%{version}-src
# Apply to EL 8.5 point release and later
# > No changes currently needed for EL 8.5 point release
%endif
+ %if %{kvr} >= 372
+ # Apply to EL 8.6 point release and later
+ # > No changes currently needed for EL 8.6 point release
+ %endif
+ %if %{kvr} >= 425
+ # Apply to EL 8.7 point release and later
+ # > No changes currently needed for EL 8.7 point release
+ %endif
+ %if %{kvr} >= 477
+ # Apply to EL 8.8 point release and later
+ %{__sed} -i 's/ >= KERNEL_VERSION(6, 0, 0)/ >= KERNEL_VERSION(4, 18, 0)/g' src/wl/sys/wl_cfg80211_hybrid.c
+ %{__sed} -i 's/ >= KERNEL_VERSION(6, 1, 0)/ >= KERNEL_VERSION(4, 18, 0)/g' src/wl/sys/wl_cfg80211_hybrid.c
+ %endif
%endif
%endif
%if 0%{?rhel} == 9
@@ -319,6 +332,14 @@ pushd %{name}-%{version}-src
%{__sed} -i 's/ < KERNEL_VERSION(5, 17, 0)/ < KERNEL_VERSION(5, 14, 0)/g' src/wl/sys/wl_iw.h
%{__sed} -i 's/ >= KERNEL_VERSION(5, 17, 0)/ >= KERNEL_VERSION(5, 14, 0)/g' src/wl/sys/wl_linux.c
%endif
+ %if %{kvr} >= 162
+ # Apply to EL 9.1 point release and later
+ # > No changes currently needed for EL 9.1 point release
+ %endif
+ %if %{kvr} >= 284
+ # Apply to EL 9.2 point release and later
+ # > No changes currently needed for EL 9.2 point release
+ %endif
%endif
%endif
popd
@@ -347,7 +368,11 @@ chmod 0755 $RPM_BUILD_ROOT%{kmodinstdir_prefix}*%{kmodinstdir_postfix}/* || :
%{?akmod_install}
%changelog
-* Mon Sep 25 2023 Nicolas Viéville <nicolas.vieville(a)uphf.fr> - 6.30.223.271-47
+* Mon Sep 25 2023 Nicolas Viéville <nicolas.vieville(a)uphf.fr> - 6.30.223.271-49
+- Spec fix build release tag
+- Fix SPEC file for RHEL 9.x and RHEL 8.x
+
+* Mon Sep 25 2023 Nicolas Viéville <nicolas.vieville(a)uphf.fr> - 6.30.223.271-48
- Spec file clean-up - Fix patchN macro is deprecated
- Add patch for kernel >= 6.5
Based loosely on https://gist.github.com/joanbm/9cd5fda1dcfab9a67b42cc6195b7b269 by Joan Bruguera
7 months, 2 weeks