[telegram-desktop] Add ALSA as build requirement w/o libtgvoip
by Alexey Gorgurov
commit 78b3a825dff86c163f67f905182127a0d28563e7
Author: Alexey <alexfails(a)fedoraproject.org>
Date: Tue Mar 23 19:35:31 2021 +0300
Add ALSA as build requirement w/o libtgvoip
There were in tg_owt, but upstream have dropped it.
telegram-desktop.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 0474a12..959e2c5 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -94,6 +94,7 @@ Requires: gtk3%{?_isa}
%if %{with libtgvoip}
BuildRequires: pkgconfig(tgvoip) >= 2.4.4
%else
+BuildRequires: pkgconfig(alsa)
Provides: bundled(libtgvoip) = 2.4.4
%endif
3 years, 1 month
[telegram-desktop] Update to version 2.7.1 with upstream patch for build
by Alexey Gorgurov
commit dfc1413b7acc1fc8af59d34422d684615310f7ad
Author: Alex Fails <afails(a)localhost.localdomain>
Date: Tue Mar 23 18:53:11 2021 +0300
Update to version 2.7.1 with upstream patch for build
.gitignore | 1 +
sources | 2 +-
telegram-desktop-build-fix.patch | 20 ++++++++++++++++++++
telegram-desktop.spec | 12 +++++++++++-
4 files changed, 33 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4452047..ace6b6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -161,3 +161,4 @@
/tdesktop-2.5.9-full.tar.gz
/tdesktop-2.6.0-full.tar.gz
/tdesktop-2.6.1-full.tar.gz
+/tdesktop-2.7.1-full.tar.gz
diff --git a/sources b/sources
index e66f371..6cfbee1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tdesktop-2.6.1-full.tar.gz) = 92506477ee1778f7528d8b914406cbf04abf1941d4f1a5d61b75dbf393df2184da1f4f83bbc343e221a539c7a01d3e3b3fe5286453d2bf1863b75ea922b70d5a
+SHA512 (tdesktop-2.7.1-full.tar.gz) = dffd184c4369c5c5947b1ca085add533e54313ce39aebcdca4f0958431a305aa5e95c2f2b48592f6992e666b2d33eeba5697f9e09f6048a53b807f2950fbd17b
diff --git a/telegram-desktop-build-fix.patch b/telegram-desktop-build-fix.patch
new file mode 100644
index 0000000..07d728c
--- /dev/null
+++ b/telegram-desktop-build-fix.patch
@@ -0,0 +1,20 @@
+--- a/Telegram/ThirdParty/tgcalls/tgcalls/group/StreamingPart.cpp
++++ b/Telegram/ThirdParty/tgcalls/tgcalls/group/StreamingPart.cpp
+@@ -12,7 +12,6 @@ extern "C" {
+ #include <string>
+ #include <set>
+ #include <map>
+-#include <stdint.h>
+
+ namespace tgcalls {
+
+--- a/Telegram/ThirdParty/tgcalls/tgcalls/group/StreamingPart.h
++++ b/Telegram/ThirdParty/tgcalls/tgcalls/group/StreamingPart.h
+@@ -3,6 +3,7 @@
+
+ #include "absl/types/optional.h"
+ #include <vector>
++#include <stdint.h>
+
+ namespace tgcalls {
+
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 9b15823..0474a12 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -18,7 +18,7 @@
%endif
Name: telegram-desktop
-Version: 2.6.1
+Version: 2.7.1
Release: 1%{?dist}
# Application and 3rd-party modules licensing:
@@ -30,6 +30,9 @@ URL: https://github.com/telegramdesktop/%{appname}
Summary: Telegram Desktop official messaging app
Source0: %{url}/releases/download/v%{version}/%{appname}-%{version}-full.tar.gz
+# https://github.com/TelegramMessenger/tgcalls/commit/eded7cc540123eaf26361...
+Patch100: %{name}-build-fix.patch
+
# Telegram Desktop require more than 8 GB of RAM on linking stage.
# Disabling all low-memory architectures.
ExclusiveArch: x86_64
@@ -49,6 +52,7 @@ BuildRequires: cmake(tl-expected)
BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(glibmm-2.4)
BuildRequires: pkgconfig(gobject-2.0)
BuildRequires: pkgconfig(hunspell)
BuildRequires: pkgconfig(libavcodec)
@@ -123,6 +127,9 @@ Requires: qt5-qtimageformats%{?_isa}
Provides: telegram = %{?epoch:%{epoch}:}%{version}-%{release}
Provides: telegram%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+# Obsolete shared version of tg_owt...
+Obsoletes: tg_owt < 0-8
+
%description
Telegram is a messaging app with a focus on speed and security, it’s super
fast, simple and free. You can use Telegram on all your devices at the same
@@ -214,6 +221,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{launcher}.desktop
%{_metainfodir}/%{launcher}.appdata.xml
%changelog
+* Sun Mar 21 2021 Alexey Gorgurov <alexfails(a)fedoraproject.org> - 2.7.1-1
+- Updated to version 2.7.1.
+
* Thu Feb 25 2021 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.6.1-1
- Updated to version 2.6.1.
3 years, 1 month
[telegram-desktop] Revert "https://lists.rpmfusion.org/archives/list/rpmfusion-developers@lists.rpmfusion.org/thread/5A
by Alexey Gorgurov
commit 9511f4391711d0c50d366ba3eeb661f8a7f36b44
Author: Alex Fails <afails(a)localhost.localdomain>
Date: Sat Mar 20 17:17:27 2021 +0300
Revert "https://lists.rpmfusion.org/archives/list/rpmfusion-developers@lists.rpmf..."
This reverts commit 0a028940d147e2c3e7e90816b33526bcd94989d9.
.gitignore | 163 ++++++++++++++++++++++++++++++++++++
dead.package | 1 -
sources | 1 +
telegram-desktop.spec | 224 ++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 388 insertions(+), 1 deletion(-)
---
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4452047
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,163 @@
+/GSL-3819df6.tar.gz
+/gyp-a7055b3.tar.gz
+/tdesktop-1.0.32.tar.gz
+/variant-916139a.tar.gz
+/tdesktop-1.0.33.tar.gz
+/tdesktop-1.0.34.tar.gz
+/tdesktop-1.0.35.tar.gz
+/gyp-a478c1a.tar.gz
+/libtgvoip-61eeaba.tar.gz
+/tdesktop-1.0.37.tar.gz
+/libtgvoip-6dcf281.tar.gz
+/tdesktop-1.0.38.tar.gz
+/tdesktop-1.1.0.tar.gz
+/GSL-c5851a8.tar.gz
+/libtgvoip-2ed5a50.tar.gz
+/tdesktop-1.1.1.tar.gz
+/variant-550ac2f.tar.gz
+/tdesktop-1.1.2.tar.gz
+/libtgvoip-2993da5.tar.gz
+/tdesktop-1.1.7.tar.gz
+/tdesktop-1.1.9.tar.gz
+/libtgvoip-445433f.tar.gz
+/tdesktop-1.1.10.tar.gz
+/tdesktop-1.1.11.tar.gz
+/libtgvoip-de33700.tar.gz
+/tdesktop-1.1.13.tar.gz
+/tdesktop-1.1.14.tar.gz
+/libtgvoip-e42287b.tar.gz
+/tdesktop-1.1.15.tar.gz
+/tdesktop-1.1.17.tar.gz
+/tdesktop-1.1.18.tar.gz
+/tdesktop-1.1.19.tar.gz
+/tdesktop-1.1.22.tar.gz
+/tdesktop-1.1.23.tar.gz
+/tdesktop-1.2.0.tar.gz
+/tdesktop-1.2.1.tar.gz
+/crl-9e11a5c.tar.gz
+/tdesktop-1.2.6.tar.gz
+/crl-344cbde.tar.gz
+/tdesktop-1.2.8.tar.gz
+/tdesktop-1.2.10.tar.gz
+/tdesktop-1.2.12.tar.gz
+/tdesktop-1.2.13.tar.gz
+/tdesktop-1.2.14.tar.gz
+/tdesktop-1.2.15.tar.gz
+/tdesktop-1.2.16.tar.gz
+/tdesktop-1.2.17.tar.gz
+/tdesktop-1.3.0.tar.gz
+/crl-c739b14.tar.gz
+/tdesktop-1.3.7.tar.gz
+/crl-9bc641f.tar.gz
+/tdesktop-1.3.8.tar.gz
+/tdesktop-1.3.9.tar.gz
+/tdesktop-1.3.10.tar.gz
+/tdesktop-1.3.11.tar.gz
+/tdesktop-1.3.12.tar.gz
+/crl-4291015.tar.gz
+/tdesktop-1.3.14.tar.gz
+/tdesktop-1.3.15.tar.gz
+/tdesktop-1.3.16.tar.gz
+/tdesktop-1.3.17.tar.gz
+/tdesktop-1.4.0.tar.gz
+/tdesktop-1.4.2.tar.gz
+/tdesktop-1.4.3.tar.gz
+/tdesktop-1.5.1.tar.gz
+/tdesktop-1.5.2.tar.gz
+/tdesktop-1.5.3.tar.gz
+/tdesktop-1.5.4.tar.gz
+/crl-9b7c6b5.tar.gz
+/tdesktop-1.5.7.tar.gz
+/tdesktop-1.5.8.tar.gz
+/tdesktop-1.5.11.tar.gz
+/crl-40063ab.tar.gz
+/tdesktop-1.5.12.tar.gz
+/tdesktop-1.5.13.tar.gz
+/tdesktop-1.5.15.tar.gz
+/crl-84072fb.tar.gz
+/tdesktop-1.6.0.tar.gz
+/tdesktop-1.6.1.tar.gz
+/tdesktop-1.6.2.tar.gz
+/tdesktop-1.6.3.tar.gz
+/tdesktop-1.6.7.tar.gz
+/tdesktop-1.7.0.tar.gz
+/crl-d259aeb.tar.gz
+/qtlottie-6cd5e32.tar.gz
+/tdesktop-1.7.1.tar.gz
+/qtlottie-ddccffe.tar.gz
+/tdesktop-1.7.3.tar.gz
+/qtlottie-a3fac9d.tar.gz
+/tdesktop-1.7.7.tar.gz
+/qtlottie-eeeb4ed.tar.gz
+/tdesktop-1.7.9.tar.gz
+/tdesktop-1.7.10.tar.gz
+/crl-9ea8700.tar.gz
+/tdesktop-1.7.14.tar.gz
+/crl-52baf11.tar.gz
+/rlottie-d08a03b.tar.gz
+/tdesktop-1.8.0.tar.gz
+/tdesktop-1.8.1.tar.gz
+/tdesktop-1.8.2.tar.gz
+/tdesktop-1.8.3.tar.gz
+/tdesktop-1.8.4.tar.gz
+/rlottie-589db02.tar.gz
+/tdesktop-1.8.8.tar.gz
+/tdesktop-1.8.9.tar.gz
+/tdesktop-1.8.12.tar.gz
+/tdesktop-1.8.13.tar.gz
+/tdesktop-1.8.15.tar.gz
+/cmake_helpers-652bbaf.tar.gz
+/codegen-d14ae77.tar.gz
+/lib_base-baae6cd.tar.gz
+/lib_crl-5a740bf.tar.gz
+/lib_lottie-a0a0269.tar.gz
+/lib_qr-9877397.tar.gz
+/lib_rpl-2888aab.tar.gz
+/lib_spellcheck-d305de6.tar.gz
+/lib_storage-b0388a1.tar.gz
+/lib_storage-cb56ad4.tar.gz
+/lib_ui-4ec9e32.tar.gz
+/rlottie-c490c7a.tar.gz
+/tdesktop-1.9.3.tar.gz
+/cmake_helpers-458fec9.tar.gz
+/lib_base-8ba8607.tar.gz
+/lib_spellcheck-4784796.tar.gz
+/lib_ui-c0b0745.tar.gz
+/tdesktop-1.9.4.tar.gz
+/tdesktop-1.9.7-full.tar.gz
+/tdesktop-1.9.8-full.tar.gz
+/tdesktop-1.9.9-full.tar.gz
+/tdesktop-1.9.12-full.tar.gz
+/tdesktop-1.9.13-full.tar.gz
+/tdesktop-1.9.14-full.tar.gz
+/tdesktop-1.9.21-full.tar.gz
+/tdesktop-2.0.0-full.tar.gz
+/tdesktop-2.0.1-full.tar.gz
+/tdesktop-2.1.0-full.tar.gz
+/tdesktop-2.1.1-full.tar.gz
+/tdesktop-2.1.2-full.tar.gz
+/tdesktop-2.1.3-full.tar.gz
+/tdesktop-2.1.4-full.tar.gz
+/tdesktop-2.1.5-full.tar.gz
+/tdesktop-2.1.6-full.tar.gz
+/tdesktop-2.1.7-full.tar.gz
+/tdesktop-2.1.10-full.tar.gz
+/tdesktop-2.1.11-full.tar.gz
+/tdesktop-2.1.12-full.tar.gz
+/tdesktop-2.1.13-full.tar.gz
+/tdesktop-2.2.0-full.tar.gz
+/owt-a803835.tar.gz
+/tdesktop-2.3.2-full.tar.gz
+/owt-7a9d4bd.tar.gz
+/tdesktop-2.4.1-full.tar.gz
+/tdesktop-2.4.2-full.tar.gz
+/tdesktop-2.4.3-full.tar.gz
+/owt-c73a471.tar.gz
+/tdesktop-2.4.4-full.tar.gz
+/tdesktop-2.4.6-full.tar.gz
+/tdesktop-2.4.7-full.tar.gz
+/tdesktop-2.5.1-full.tar.gz
+/tdesktop-2.5.8-full.tar.gz
+/tdesktop-2.5.9-full.tar.gz
+/tdesktop-2.6.0-full.tar.gz
+/tdesktop-2.6.1-full.tar.gz
diff --git a/sources b/sources
new file mode 100644
index 0000000..e66f371
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (tdesktop-2.6.1-full.tar.gz) = 92506477ee1778f7528d8b914406cbf04abf1941d4f1a5d61b75dbf393df2184da1f4f83bbc343e221a539c7a01d3e3b3fe5286453d2bf1863b75ea922b70d5a
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
new file mode 100644
index 0000000..9b15823
--- /dev/null
+++ b/telegram-desktop.spec
@@ -0,0 +1,224 @@
+%undefine __cmake_in_source_build
+
+# Build conditionals (with - OFF, without - ON)...
+%bcond_with clang
+%bcond_with gtk3
+%bcond_with libtgvoip
+%bcond_with rlottie
+%bcond_with wayland
+%bcond_without x11
+
+# Telegram Desktop's constants...
+%global appname tdesktop
+%global launcher telegramdesktop
+
+# Applying toolchain configuration...
+%if %{with clang}
+%global toolchain clang
+%endif
+
+Name: telegram-desktop
+Version: 2.6.1
+Release: 1%{?dist}
+
+# Application and 3rd-party modules licensing:
+# * Telegram Desktop - GPLv3+ with OpenSSL exception -- main tarball;
+# * rlottie - LGPLv2+ -- static dependency;
+# * qt_functions.cpp - LGPLv3 -- build-time dependency.
+License: GPLv3+ and LGPLv2+ and LGPLv3
+URL: https://github.com/telegramdesktop/%{appname}
+Summary: Telegram Desktop official messaging app
+Source0: %{url}/releases/download/v%{version}/%{appname}-%{version}-full.tar.gz
+
+# Telegram Desktop require more than 8 GB of RAM on linking stage.
+# Disabling all low-memory architectures.
+ExclusiveArch: x86_64
+
+BuildRequires: cmake(Microsoft.GSL)
+BuildRequires: cmake(OpenAL)
+BuildRequires: cmake(Qt5Core)
+BuildRequires: cmake(Qt5DBus)
+BuildRequires: cmake(Qt5Gui)
+BuildRequires: cmake(Qt5Network)
+BuildRequires: cmake(Qt5Widgets)
+BuildRequires: cmake(Qt5XkbCommonSupport)
+BuildRequires: cmake(dbusmenu-qt5)
+BuildRequires: cmake(range-v3)
+BuildRequires: cmake(tg_owt)
+BuildRequires: cmake(tl-expected)
+
+BuildRequires: pkgconfig(gio-2.0)
+BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(gobject-2.0)
+BuildRequires: pkgconfig(hunspell)
+BuildRequires: pkgconfig(libavcodec)
+BuildRequires: pkgconfig(libavformat)
+BuildRequires: pkgconfig(libavresample)
+BuildRequires: pkgconfig(libavutil)
+BuildRequires: pkgconfig(libcrypto)
+BuildRequires: pkgconfig(liblz4)
+BuildRequires: pkgconfig(liblzma)
+BuildRequires: pkgconfig(libswscale)
+BuildRequires: pkgconfig(libxxhash)
+BuildRequires: pkgconfig(openssl)
+BuildRequires: pkgconfig(opus)
+
+BuildRequires: cmake
+BuildRequires: desktop-file-utils
+BuildRequires: gcc
+BuildRequires: gcc-c++
+BuildRequires: libappstream-glib
+BuildRequires: libatomic
+BuildRequires: libqrcodegencpp-devel
+BuildRequires: libstdc++-devel
+BuildRequires: minizip-compat-devel
+BuildRequires: ninja-build
+BuildRequires: python3
+BuildRequires: qt5-qtbase-private-devel
+
+%if %{with clang}
+BuildRequires: compiler-rt
+BuildRequires: clang
+BuildRequires: llvm
+%endif
+
+%if %{with gtk3}
+BuildRequires: pkgconfig(gtk+-3.0)
+Requires: gtk3%{?_isa}
+%endif
+
+%if %{with libtgvoip}
+BuildRequires: pkgconfig(tgvoip) >= 2.4.4
+%else
+Provides: bundled(libtgvoip) = 2.4.4
+%endif
+
+%if %{with rlottie}
+BuildRequires: cmake(rlottie)
+%else
+Provides: bundled(rlottie) = 0~git
+%endif
+
+%if %{with wayland}
+BuildRequires: cmake(KF5Wayland)
+BuildRequires: cmake(Qt5WaylandClient)
+BuildRequires: pkgconfig(wayland-client)
+BuildRequires: qt5-qtbase-static
+%endif
+
+%if %{with x11}
+BuildRequires: pkgconfig(xcb)
+BuildRequires: pkgconfig(xcb-keysyms)
+BuildRequires: pkgconfig(xcb-record)
+BuildRequires: pkgconfig(xcb-screensaver)
+%endif
+
+# Telegram Desktop require exact version of Qt due to Qt private API usage.
+%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
+Requires: hicolor-icon-theme
+Requires: open-sans-fonts
+Requires: qt5-qtimageformats%{?_isa}
+
+# Short alias for the main package...
+Provides: telegram = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: telegram%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description
+Telegram is a messaging app with a focus on speed and security, it’s super
+fast, simple and free. You can use Telegram on all your devices at the same
+time — your messages sync seamlessly across any number of your phones,
+tablets or computers.
+
+With Telegram, you can send messages, photos, videos and files of any type
+(doc, zip, mp3, etc), as well as create groups for up to 50,000 people or
+channels for broadcasting to unlimited audiences. You can write to your
+phone contacts and find people by their usernames. As a result, Telegram is
+like SMS and email combined — and can take care of all your personal or
+business messaging needs.
+
+%prep
+# Unpacking Telegram Desktop source archive...
+%autosetup -n %{appname}-%{version}-full -p1
+
+# Unbundling libraries...
+rm -rf Telegram/ThirdParty/{Catch,GSL,QR,SPMediaKeyTap,expected,fcitx-qt5,fcitx5-qt,hime,hunspell,libdbusmenu-qt,lz4,materialdecoration,minizip,nimf,qt5ct,range-v3,xxHash}
+
+# Unbundling rlottie if build against packaged version...
+%if %{with rlottie}
+rm -rf Telegram/ThirdParty/rlottie
+%endif
+
+# Unbundling libtgvoip if build against packaged version...
+%if %{with libtgvoip}
+rm -rf Telegram/ThirdParty/libtgvoip
+%endif
+
+%build
+# Building Telegram Desktop using cmake...
+%cmake -G Ninja \
+ -DCMAKE_BUILD_TYPE=Release \
+%if %{with clang}
+ -DCMAKE_C_COMPILER=%{_bindir}/clang \
+ -DCMAKE_CXX_COMPILER=%{_bindir}/clang++ \
+ -DCMAKE_AR=%{_bindir}/llvm-ar \
+ -DCMAKE_RANLIB=%{_bindir}/llvm-ranlib \
+ -DCMAKE_LINKER=%{_bindir}/llvm-ld \
+ -DCMAKE_OBJDUMP=%{_bindir}/llvm-objdump \
+ -DCMAKE_NM=%{_bindir}/llvm-nm \
+%else
+ -DCMAKE_AR=%{_bindir}/gcc-ar \
+ -DCMAKE_RANLIB=%{_bindir}/gcc-ranlib \
+ -DCMAKE_NM=%{_bindir}/gcc-nm \
+%endif
+ -DTDESKTOP_API_ID=611335 \
+ -DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c \
+ -DDESKTOP_APP_USE_PACKAGED:BOOL=ON \
+ -DDESKTOP_APP_USE_PACKAGED_FONTS:BOOL=ON \
+ -DDESKTOP_APP_USE_GLIBC_WRAPS:BOOL=OFF \
+ -DDESKTOP_APP_DISABLE_CRASH_REPORTS:BOOL=ON \
+ -DDESKTOP_APP_DISABLE_WEBRTC_INTEGRATION:BOOL=OFF \
+%if %{with gtk3}
+ -DDESKTOP_APP_DISABLE_GTK_INTEGRATION:BOOL=OFF \
+%else
+ -DDESKTOP_APP_DISABLE_GTK_INTEGRATION:BOOL=ON \
+%endif
+%if %{with wayland}
+ -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION:BOOL=OFF \
+%else
+ -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION:BOOL=ON \
+%endif
+%if %{with x11}
+ -DDESKTOP_APP_DISABLE_X11_INTEGRATION:BOOL=OFF \
+%else
+ -DDESKTOP_APP_DISABLE_X11_INTEGRATION:BOOL=ON \
+%endif
+%if %{with rlottie}
+ -DDESKTOP_APP_LOTTIE_USE_CACHE:BOOL=OFF \
+%endif
+ -DTDESKTOP_LAUNCHER_BASENAME=%{launcher}
+%cmake_build
+
+%install
+%cmake_install
+
+%check
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{launcher}.appdata.xml
+desktop-file-validate %{buildroot}%{_datadir}/applications/%{launcher}.desktop
+
+%files
+%doc README.md changelog.txt
+%license LICENSE LEGAL
+%{_bindir}/%{name}
+%{_datadir}/applications/%{launcher}.desktop
+%{_datadir}/icons/hicolor/*/apps/*.png
+%{_metainfodir}/%{launcher}.appdata.xml
+
+%changelog
+* Thu Feb 25 2021 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.6.1-1
+- Updated to version 2.6.1.
+
+* Wed Feb 24 2021 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.6.0-1
+- Updated to version 2.6.0.
+
+* Thu Feb 18 2021 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.5.9-1
+- Updated to version 2.5.9.
3 years, 1 month
[libva-intel-driver/f34] Bump
by Nicolas Chauvet
Summary of changes:
ad93ea9... Bump (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 1 month
[libva-intel-driver] Bump
by Nicolas Chauvet
commit ad93ea9eeb5f2290974d331039f90a73122b9f58
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Mar 23 09:12:45 2021 +0100
Bump
libva-intel-driver.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/libva-intel-driver.spec b/libva-intel-driver.spec
index f98db77..1a48b38 100644
--- a/libva-intel-driver.spec
+++ b/libva-intel-driver.spec
@@ -5,7 +5,7 @@
Name: libva-intel-driver
Version: 2.4.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: HW video decode support for Intel integrated graphics
License: MIT and EPL
URL: https://github.com/intel/intel-vaapi-driver
@@ -91,7 +91,7 @@ fn=%{buildroot}%{_datadir}/appdata/intel-vaapi-driver.metainfo.xml
%changelog
-* Tue Mar 23 2021 Nicolas Chauvet <kwizart(a)gmail.com> - 2.4.1-4
+* Tue Mar 23 2021 Nicolas Chauvet <kwizart(a)gmail.com> - 2.4.1-5
- Add patch from !530
* Wed Feb 03 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.4.1-4
3 years, 1 month
[libva-intel-driver/el8: 8/8] Merge branch 'master' into el8
by Nicolas Chauvet
commit ca5ffece3d3ed6384dee2d066bc6876a4068edea
Merge: d80a5aa 987871d
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Mar 23 09:11:06 2021 +0100
Merge branch 'master' into el8
d03fd1f86a9aeee0b33447aee3578aadb3a93f8a.patch | 123 +++++++++++++++++++++++++
libva-intel-driver.spec | 12 ++-
2 files changed, 134 insertions(+), 1 deletion(-)
---
3 years, 1 month
[libva-intel-driver] Update changelog
by Nicolas Chauvet
commit 987871d6b88c42b5f2a5a590f87c21fd903f340e
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Mar 23 08:57:03 2021 +0100
Update changelog
d03fd1f86a9aeee0b33447aee3578aadb3a93f8a.patch | 123 +++++++++++++++++++++++++
libva-intel-driver.spec | 3 +
2 files changed, 126 insertions(+)
---
diff --git a/d03fd1f86a9aeee0b33447aee3578aadb3a93f8a.patch b/d03fd1f86a9aeee0b33447aee3578aadb3a93f8a.patch
new file mode 100644
index 0000000..6d05438
--- /dev/null
+++ b/d03fd1f86a9aeee0b33447aee3578aadb3a93f8a.patch
@@ -0,0 +1,123 @@
+From d03fd1f86a9aeee0b33447aee3578aadb3a93f8a Mon Sep 17 00:00:00 2001
+From: Dmitry Osipenko <digetx(a)gmail.com>
+Date: Tue, 9 Feb 2021 00:51:49 +0300
+Subject: [PATCH] gen7/8_jpeg_decoder: Correct component ID calculation
+
+The VAAPI driver fails to decode JPEG if encoded data has component ID
+set to 255 (-1) and selector to 0 because this produces a wrong result of
+the final ID calculation since the component value is expanded to a 32bit
+signed integer by compiler instead of keeping it unsigned 8bit, thus the
+result is calculated as "0 - 255 + 1 = -254" instead of "0 - (-1) + 1 = 2".
+
+Example output from FFmpeg:
+
+...
+[mjpeg @ 0x56156be1cc40] component 0 1:1 id: -1 quant:0
+[mjpeg @ 0x56156be1cc40] component 1 1:1 id: 0 quant:1
+[mjpeg @ 0x56156be1cc40] component 2 1:1 id: 1 quant:1
+...
+src/gen7_mfd.c:2549: gen7_mfd_jpeg_bsd_object: Assertion `0' failed.
+
+This patch fixes the offending integer expansion, JPEG is successfully
+decoded now.
+
+Signed-off-by: Dmitry Osipenko <digetx(a)gmail.com>
+---
+ src/gen75_mfd.c | 6 ++++--
+ src/gen7_mfd.c | 6 ++++--
+ src/gen8_mfd.c | 6 ++++--
+ 3 files changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/src/gen75_mfd.c b/src/gen75_mfd.c
+index fc979e386..275a9f552 100644
+--- a/src/gen75_mfd.c
++++ b/src/gen75_mfd.c
+@@ -2844,7 +2844,7 @@ gen75_mfd_jpeg_qm_state(VADriverContextP ctx,
+ assert(pic_param->num_components <= 3);
+
+ for (index = 0; index < pic_param->num_components; index++) {
+- int id = pic_param->components[index].component_id - pic_param->components[0].component_id + 1;
++ unsigned char id = pic_param->components[index].component_id - pic_param->components[0].component_id + 1;
+ int qm_type;
+ unsigned char *qm = iq_matrix->quantiser_table[pic_param->components[index].quantiser_table_selector];
+ unsigned char raster_qm[64];
+@@ -2875,6 +2875,7 @@ gen75_mfd_jpeg_bsd_object(VADriverContextP ctx,
+ {
+ struct intel_batchbuffer *batch = gen7_mfd_context->base.batch;
+ int scan_component_mask = 0;
++ unsigned char id;
+ int i;
+
+ assert(slice_param->num_components > 0);
+@@ -2882,7 +2883,8 @@ gen75_mfd_jpeg_bsd_object(VADriverContextP ctx,
+ assert(slice_param->num_components <= pic_param->num_components);
+
+ for (i = 0; i < slice_param->num_components; i++) {
+- switch (slice_param->components[i].component_selector - pic_param->components[0].component_id + 1) {
++ id = slice_param->components[i].component_selector - pic_param->components[0].component_id + 1;
++ switch (id) {
+ case 1:
+ scan_component_mask |= (1 << 0);
+ break;
+diff --git a/src/gen7_mfd.c b/src/gen7_mfd.c
+index effc95829..7d4afaeaa 100644
+--- a/src/gen7_mfd.c
++++ b/src/gen7_mfd.c
+@@ -2497,7 +2497,7 @@ gen7_mfd_jpeg_qm_state(VADriverContextP ctx,
+ assert(pic_param->num_components <= 3);
+
+ for (index = 0; index < pic_param->num_components; index++) {
+- int id = pic_param->components[index].component_id - pic_param->components[0].component_id + 1;
++ unsigned char id = pic_param->components[index].component_id - pic_param->components[0].component_id + 1;
+ int qm_type;
+ unsigned char *qm = iq_matrix->quantiser_table[pic_param->components[index].quantiser_table_selector];
+ unsigned char raster_qm[64];
+@@ -2528,6 +2528,7 @@ gen7_mfd_jpeg_bsd_object(VADriverContextP ctx,
+ {
+ struct intel_batchbuffer *batch = gen7_mfd_context->base.batch;
+ int scan_component_mask = 0;
++ unsigned char id;
+ int i;
+
+ assert(slice_param->num_components > 0);
+@@ -2535,7 +2536,8 @@ gen7_mfd_jpeg_bsd_object(VADriverContextP ctx,
+ assert(slice_param->num_components <= pic_param->num_components);
+
+ for (i = 0; i < slice_param->num_components; i++) {
+- switch (slice_param->components[i].component_selector - pic_param->components[0].component_id + 1) {
++ id = slice_param->components[i].component_selector - pic_param->components[0].component_id + 1;
++ switch (id) {
+ case 1:
+ scan_component_mask |= (1 << 0);
+ break;
+diff --git a/src/gen8_mfd.c b/src/gen8_mfd.c
+index 9d866aa4d..6aef7bf6b 100644
+--- a/src/gen8_mfd.c
++++ b/src/gen8_mfd.c
+@@ -2550,7 +2550,7 @@ gen8_mfd_jpeg_qm_state(VADriverContextP ctx,
+ assert(pic_param->num_components <= 3);
+
+ for (index = 0; index < pic_param->num_components; index++) {
+- int id = pic_param->components[index].component_id - pic_param->components[0].component_id + 1;
++ unsigned char id = pic_param->components[index].component_id - pic_param->components[0].component_id + 1;
+ int qm_type;
+ unsigned char *qm = iq_matrix->quantiser_table[pic_param->components[index].quantiser_table_selector];
+ unsigned char raster_qm[64];
+@@ -2581,6 +2581,7 @@ gen8_mfd_jpeg_bsd_object(VADriverContextP ctx,
+ {
+ struct intel_batchbuffer *batch = gen7_mfd_context->base.batch;
+ int scan_component_mask = 0;
++ unsigned char id;
+ int i;
+
+ assert(slice_param->num_components > 0);
+@@ -2588,7 +2589,8 @@ gen8_mfd_jpeg_bsd_object(VADriverContextP ctx,
+ assert(slice_param->num_components <= pic_param->num_components);
+
+ for (i = 0; i < slice_param->num_components; i++) {
+- switch (slice_param->components[i].component_selector - pic_param->components[0].component_id + 1) {
++ id = slice_param->components[i].component_selector - pic_param->components[0].component_id + 1;
++ switch (id) {
+ case 1:
+ scan_component_mask |= (1 << 0);
+ break;
diff --git a/libva-intel-driver.spec b/libva-intel-driver.spec
index c323479..f98db77 100644
--- a/libva-intel-driver.spec
+++ b/libva-intel-driver.spec
@@ -91,6 +91,9 @@ fn=%{buildroot}%{_datadir}/appdata/intel-vaapi-driver.metainfo.xml
%changelog
+* Tue Mar 23 2021 Nicolas Chauvet <kwizart(a)gmail.com> - 2.4.1-4
+- Add patch from !530
+
* Wed Feb 03 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.4.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
3 years, 1 month