[telegram-desktop/f35] Fixed version of bundled kf5-wayland.
by Vitaly Zaitsev
commit 9ec5e75ad1731a16e30fcbd87878c504822bb63a
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Thu Jan 20 11:18:31 2022 +0100
Fixed version of bundled kf5-wayland.
telegram-desktop.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 78ea303..79fe506 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -145,7 +145,7 @@ BuildRequires: cmake(Qt6Concurrent)
BuildRequires: cmake(Qt6WaylandClient)
BuildRequires: pkgconfig(wayland-protocols)
BuildRequires: qt6-qtbase-static
-Provides: bundled(kf5-kwayland) = 5.89.0
+Provides: bundled(kf5-kwayland) = 5.90.0
%endif
BuildRequires: pkgconfig(wayland-client)
BuildRequires: extra-cmake-modules
2 years, 3 months
[telegram-desktop/f35] Always use packaged kwayland stuff.
by Vitaly Zaitsev
commit 51f9e99d1d4b362a19683f88c135baa8e3dfe47b
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Thu Jan 20 11:15:28 2022 +0100
Always use packaged kwayland stuff.
telegram-desktop-desktop-validation-fix.patch | 17 +++++
telegram-desktop-downgrade-ecm-version.patch | 13 ++++
telegram-desktop-unbundled-kwayland-stuff.patch | 86 +++++++++++++++++++++++++
telegram-desktop.spec | 22 +++----
4 files changed, 127 insertions(+), 11 deletions(-)
---
diff --git a/telegram-desktop-desktop-validation-fix.patch b/telegram-desktop-desktop-validation-fix.patch
new file mode 100644
index 0000000..aaca23b
--- /dev/null
+++ b/telegram-desktop-desktop-validation-fix.patch
@@ -0,0 +1,17 @@
+--- a/lib/xdg/telegramdesktop.desktop
++++ b/lib/xdg/telegramdesktop.desktop
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Version=1.5
++Version=1.0
+ Name=Telegram Desktop
+ Comment=Official desktop version of Telegram messaging app
+ TryExec=telegram-desktop
+@@ -12,7 +12,6 @@ Categories=Chat;Network;InstantMessaging;Qt;
+ MimeType=x-scheme-handler/tg;
+ Keywords=tg;chat;im;messaging;messenger;sms;tdesktop;
+ Actions=Quit;
+-SingleMainWindow=true
+ X-GNOME-UsesNotifications=true
+ X-GNOME-SingleWindow=true
+
diff --git a/telegram-desktop-downgrade-ecm-version.patch b/telegram-desktop-downgrade-ecm-version.patch
new file mode 100644
index 0000000..c786b59
--- /dev/null
+++ b/telegram-desktop-downgrade-ecm-version.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3ce9c88..63d652c 100644
+--- a/Telegram/ThirdParty/kwayland/CMakeLists.txt
++++ b/Telegram/ThirdParty/kwayland/CMakeLists.txt
+@@ -5,7 +5,7 @@ project(KWayland VERSION ${KF_VERSION})
+
+ # ECM setup
+ include(FeatureSummary)
+-find_package(ECM 5.90.0 NO_MODULE)
++find_package(ECM 5.89.0 NO_MODULE)
+ set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules")
+ feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES)
+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/Modules)
diff --git a/telegram-desktop-unbundled-kwayland-stuff.patch b/telegram-desktop-unbundled-kwayland-stuff.patch
new file mode 100644
index 0000000..0a141c8
--- /dev/null
+++ b/telegram-desktop-unbundled-kwayland-stuff.patch
@@ -0,0 +1,86 @@
+--- a/cmake/external/kwayland/CMakeLists.txt
++++ b/cmake/external/kwayland/CMakeLists.txt
+@@ -20,62 +20,6 @@ add_library(external_kwayland_bundled STATIC IMPORTED)
+
+ include(ExternalProject)
+
+-ExternalProject_Add(extra-cmake-modules
+- URL ${third_party_loc}/extra-cmake-modules
+- CMAKE_GENERATOR Ninja
+- CMAKE_ARGS
+- -DCMAKE_BUILD_TYPE=Release
+- -DCMAKE_INSTALL_PREFIX=<BINARY_DIR>
+- -DCMAKE_INSTALL_DATADIR=share
+- -DBUILD_TESTING=OFF
+- BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR>
+- COMMAND ${CMAKE_COMMAND} --install <BINARY_DIR>
+- STEP_TARGETS build
+- EXCLUDE_FROM_ALL TRUE
+- BUILD_BYPRODUCTS <BINARY_DIR>/share/ECM/cmake/ECMConfig.cmake
+-)
+-
+-ExternalProject_Get_property(extra-cmake-modules BINARY_DIR)
+-set(extra_cmake_modules_binary_dir ${BINARY_DIR})
+-
+-ExternalProject_Add(wayland-protocols
+- URL ${third_party_loc}/wayland-protocols
+- CONFIGURE_COMMAND meson
+- --prefix=<BINARY_DIR>
+- --libdir=lib
+- --buildtype=release
+- -Dtests=false
+- <BINARY_DIR> <SOURCE_DIR>
+- BUILD_COMMAND meson compile -C <BINARY_DIR>
+- COMMAND meson install -C <BINARY_DIR>
+- STEP_TARGETS build
+- EXCLUDE_FROM_ALL TRUE
+- BUILD_BYPRODUCTS <BINARY_DIR>/lib/wayland-protocols.pc
+-)
+-
+-ExternalProject_Get_property(wayland-protocols BINARY_DIR)
+-set(wayland_protocols_binary_dir ${BINARY_DIR})
+-
+-ExternalProject_Add(plasma-wayland-protocols
+- URL ${third_party_loc}/plasma-wayland-protocols
+- CMAKE_GENERATOR Ninja
+- CMAKE_ARGS
+- -DCMAKE_BUILD_TYPE=Release
+- -DCMAKE_INSTALL_PREFIX=<BINARY_DIR>
+- -DCMAKE_INSTALL_LIBDIR=lib
+- -DECM_DIR=${extra_cmake_modules_binary_dir}/share/ECM/cmake
+- BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR>
+- COMMAND ${CMAKE_COMMAND} --install <BINARY_DIR>
+- STEP_TARGETS build
+- EXCLUDE_FROM_ALL TRUE
+- BUILD_BYPRODUCTS <BINARY_DIR>/lib/cmake/PlasmaWaylandProtocols/PlasmaWaylandProtocolsConfig.cmake
+-)
+-
+-ExternalProject_Add_StepDependencies(plasma-wayland-protocols configure extra-cmake-modules-build)
+-
+-ExternalProject_Get_property(plasma-wayland-protocols BINARY_DIR)
+-set(plasma_wayland_protocols_binary_dir ${BINARY_DIR})
+-
+ set(kwayland_patch_command)
+ if (DESKTOP_APP_QT6)
+ set(kwayland_patch_command PATCH_COMMAND patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/kwayland-qt6.patch)
+@@ -88,9 +32,6 @@ ExternalProject_Add(kwayland
+ -DCMAKE_BUILD_TYPE=Release
+ -DBUILD_SHARED_LIBS=OFF
+ -DBUILD_TESTING=OFF
+- -DCMAKE_PREFIX_PATH=${wayland_protocols_binary_dir}
+- -DECM_DIR=${extra_cmake_modules_binary_dir}/share/ECM/cmake
+- -DPlasmaWaylandProtocols_DIR=${plasma_wayland_protocols_binary_dir}/lib/cmake/PlasmaWaylandProtocols
+ ${kwayland_patch_command}
+ BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --target KF5WaylandClient
+ STEP_TARGETS build
+@@ -98,9 +39,6 @@ ExternalProject_Add(kwayland
+ BUILD_BYPRODUCTS <BINARY_DIR>/lib/libKF5WaylandClient.a
+ )
+
+-ExternalProject_Add_StepDependencies(kwayland configure extra-cmake-modules-build)
+-ExternalProject_Add_StepDependencies(kwayland configure wayland-protocols-build)
+-ExternalProject_Add_StepDependencies(kwayland configure plasma-wayland-protocols-build)
+
+ ExternalProject_Get_property(kwayland SOURCE_DIR)
+ ExternalProject_Get_property(kwayland BINARY_DIR)
+
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 845d9a8..78ea303 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -37,6 +37,11 @@ URL: https://github.com/telegramdesktop/%{appname}
Summary: Telegram Desktop official messaging app
Source0: %{url}/releases/download/v%{version}/%{appname}-%{version}-full.tar.gz
+# Downstream patches.
+Patch0: %{name}-desktop-validation-fix.patch
+Patch1: %{name}-unbundled-kwayland-stuff.patch
+Patch2: %{name}-downgrade-ecm-version.patch
+
# Telegram Desktop require more than 8 GB of RAM on linking stage.
# Disabling all low-memory architectures.
ExclusiveArch: x86_64 aarch64
@@ -133,19 +138,17 @@ Provides: bundled(rlottie) = 0~git
BuildRequires: cmake(KF5Wayland)
BuildRequires: cmake(Qt5Concurrent)
BuildRequires: cmake(Qt5WaylandClient)
-BuildRequires: extra-cmake-modules
BuildRequires: qt5-qtbase-static
%else
+BuildRequires: cmake(PlasmaWaylandProtocols)
BuildRequires: cmake(Qt6Concurrent)
BuildRequires: cmake(Qt6WaylandClient)
-BuildRequires: meson
+BuildRequires: pkgconfig(wayland-protocols)
BuildRequires: qt6-qtbase-static
-Provides: bundled(extra-cmake-modules) = 5.90.0
-Provides: bundled(kf5-kwayland) = 5.90.0
-Provides: bundled(plasma-wayland-protocols) = 1.6.0
-Provides: bundled(wayland-protocols) = 1.24
+Provides: bundled(kf5-kwayland) = 5.89.0
%endif
BuildRequires: pkgconfig(wayland-client)
+BuildRequires: extra-cmake-modules
%endif
%if %{enable_x11}
@@ -190,11 +193,11 @@ business messaging needs.
%autosetup -n %{appname}-%{version}-full -p1
# Unbundling libraries...
-rm -rf Telegram/ThirdParty/{GSL,QR,SPMediaKeyTap,dispatch,expected,fcitx-qt5,fcitx5-qt,jemalloc,hime,hunspell,lz4,materialdecoration,minizip,nimf,qt5ct,range-v3,xxHash}
+rm -rf Telegram/ThirdParty/{GSL,QR,SPMediaKeyTap,dispatch,expected,extra-cmake-modules,fcitx-qt5,fcitx5-qt,jemalloc,hime,hunspell,lz4,materialdecoration,minizip,nimf,plasma-wayland-protocols,qt5ct,range-v3,wayland-protocols,xxHash}
# Unbundling kwayland and libdbusmenu-qt if build against Qt5...
%if %{use_qt5}
-rm -rf Telegram/ThirdParty/{extra-cmake-modules,kwayland,plasma-wayland-protocols,libdbusmenu-qt,wayland-protocols}
+rm -rf Telegram/ThirdParty/{kwayland,libdbusmenu-qt}
%endif
# Unbundling rlottie if build against packaged version...
@@ -207,9 +210,6 @@ rm -rf Telegram/ThirdParty/rlottie
rm -rf Telegram/ThirdParty/libtgvoip
%endif
-# Patching metainfo file to pass automatic checks...
-sed -e 's/Version=1.5/Version=1.0/g' -e '/SingleMainWindow/d' -i lib/xdg/telegramdesktop.desktop
-
%build
# Building Telegram Desktop using cmake...
%cmake -G Ninja \
2 years, 3 months
[telegram-desktop/f35] Updated to version 3.4.8.
by Vitaly Zaitsev
commit e1a75124094d525091026c12addb4ad9855230ff
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Thu Jan 20 10:39:42 2022 +0100
Updated to version 3.4.8.
.gitignore | 1 +
sources | 2 +-
telegram-desktop.spec | 23 +++++++++++++++++------
3 files changed, 19 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a318145..40b7998 100644
--- a/.gitignore
+++ b/.gitignore
@@ -170,3 +170,4 @@
/tdesktop-3.4.0-full.tar.gz
/tdesktop-3.4.2-full.tar.gz
/tdesktop-3.4.3-full.tar.gz
+/tdesktop-3.4.8-full.tar.gz
diff --git a/sources b/sources
index 0653e88..0b07938 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tdesktop-3.4.3-full.tar.gz) = 6b27eb14570b55fb14c77f1d557591985a4791712897c2e144196c54c2a98b10c7ece9dac7d039a6bb56f39e3062e4fbfbb60f6822e52b76f927bbf419d88a6b
+SHA512 (tdesktop-3.4.8-full.tar.gz) = cdeb5a83a375a494d805bf4198beee1c4bfc94bd9626535721a0cf04a590c70bfdb20e76baaa2a4c8c6db54c5813f22ce2a8c6291786b6b6db3dcde10b266fe1
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 1bc9994..845d9a8 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -25,7 +25,7 @@
%endif
Name: telegram-desktop
-Version: 3.4.3
+Version: 3.4.8
Release: 1%{?dist}
# Application and 3rd-party modules licensing:
@@ -133,17 +133,19 @@ Provides: bundled(rlottie) = 0~git
BuildRequires: cmake(KF5Wayland)
BuildRequires: cmake(Qt5Concurrent)
BuildRequires: cmake(Qt5WaylandClient)
+BuildRequires: extra-cmake-modules
BuildRequires: qt5-qtbase-static
%else
-BuildRequires: cmake(PlasmaWaylandProtocols)
BuildRequires: cmake(Qt6Concurrent)
BuildRequires: cmake(Qt6WaylandClient)
-BuildRequires: pkgconfig(wayland-protocols)
+BuildRequires: meson
BuildRequires: qt6-qtbase-static
-Provides: bundled(kf5-kwayland) = 5.89.0
+Provides: bundled(extra-cmake-modules) = 5.90.0
+Provides: bundled(kf5-kwayland) = 5.90.0
+Provides: bundled(plasma-wayland-protocols) = 1.6.0
+Provides: bundled(wayland-protocols) = 1.24
%endif
BuildRequires: pkgconfig(wayland-client)
-BuildRequires: extra-cmake-modules
%endif
%if %{enable_x11}
@@ -192,7 +194,7 @@ rm -rf Telegram/ThirdParty/{GSL,QR,SPMediaKeyTap,dispatch,expected,fcitx-qt5,fci
# Unbundling kwayland and libdbusmenu-qt if build against Qt5...
%if %{use_qt5}
-rm -rf Telegram/ThirdParty/{kwayland,libdbusmenu-qt}
+rm -rf Telegram/ThirdParty/{extra-cmake-modules,kwayland,plasma-wayland-protocols,libdbusmenu-qt,wayland-protocols}
%endif
# Unbundling rlottie if build against packaged version...
@@ -205,6 +207,9 @@ rm -rf Telegram/ThirdParty/rlottie
rm -rf Telegram/ThirdParty/libtgvoip
%endif
+# Patching metainfo file to pass automatic checks...
+sed -e 's/Version=1.5/Version=1.0/g' -e '/SingleMainWindow/d' -i lib/xdg/telegramdesktop.desktop
+
%build
# Building Telegram Desktop using cmake...
%cmake -G Ninja \
@@ -243,7 +248,10 @@ rm -rf Telegram/ThirdParty/libtgvoip
-DDESKTOP_APP_DISABLE_X11_INTEGRATION:BOOL=ON \
%endif
%if %{system_rlottie}
+ -DDESKTOP_APP_USE_PACKAGED_RLOTTIE:BOOL=ON \
-DDESKTOP_APP_LOTTIE_USE_CACHE:BOOL=OFF \
+%else
+ -DDESKTOP_APP_USE_PACKAGED_RLOTTIE:BOOL=OFF \
%endif
-DTDESKTOP_LAUNCHER_BASENAME=%{launcher}
%cmake_build
@@ -264,6 +272,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{launcher}.desktop
%{_metainfodir}/%{launcher}.metainfo.xml
%changelog
+* Thu Jan 20 2022 Vitaly Zaitsev <vitaly(a)easycoding.org> - 3.4.8-1
+- Updated to version 3.4.8.
+
* Tue Jan 04 2022 Vitaly Zaitsev <vitaly(a)easycoding.org> - 3.4.3-1
- Updated to version 3.4.3.
2 years, 3 months
[nvidia-kmod] Add patch
by Nicolas Chauvet
commit 9c9e0b2b640511c46c8da850094cdcd42a2fc059
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Jan 19 14:44:49 2022 +0100
Add patch
nvidia-kmod-pci-request-regions.patch | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
---
diff --git a/nvidia-kmod-pci-request-regions.patch b/nvidia-kmod-pci-request-regions.patch
new file mode 100644
index 0000000..8bc66a0
--- /dev/null
+++ b/nvidia-kmod-pci-request-regions.patch
@@ -0,0 +1,21 @@
+diff -up kernel/nvidia/linux_nvswitch.c.orig kernel/nvidia/linux_nvswitch.c
+--- kernel/nvidia/linux_nvswitch.c.orig 2021-12-31 13:53:49.000000000 +0100
++++ kernel/nvidia/linux_nvswitch.c 2022-01-19 13:17:53.955709286 +0100
+@@ -1320,6 +1320,9 @@ nvswitch_probe
+
+ pci_set_master(pci_dev);
+
++// Don't call pci_request_regions if CONFIG_SYSFB_SIMPLEFB - see also
++// https://patchwork.kernel.org/project/dri-devel/patch/20220117180359.18114...
++#if ! defined(CONFIG_SYSFB_SIMPLEFB)
+ rc = pci_request_regions(pci_dev, nvswitch_dev->name);
+ if (rc)
+ {
+@@ -1328,6 +1331,7 @@ nvswitch_probe
+ rc);
+ goto pci_request_regions_failed;
+ }
++#endif
+
+ nvswitch_dev->bar0 = pci_iomap(pci_dev, 0, 0);
+ if (!nvswitch_dev->bar0)
2 years, 3 months
[nvidia-kmod] Update changelog
by Nicolas Chauvet
commit 7e8b24b4e11fa17c16e93b79cd9442cb36a30da2
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Jan 19 14:23:46 2022 +0100
Update changelog
nvidia-kmod.spec | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index ca1b46d..4993131 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -12,12 +12,13 @@ Name: nvidia-kmod
Epoch: 3
Version: 510.39.01
# Taken over by kmodtool
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA display driver kernel module
License: Redistributable, no modification permitted
URL: http://www.nvidia.com/
Source11: nvidia-kmodtool-excludekernel-filterfile
+Patch0: nvidia-kmod-pci-request-regions.patch
# needed for plague to make sure it builds for i586 and i686
ExclusiveArch: x86_64
@@ -41,6 +42,7 @@ kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterf
%setup -T -c
tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}-%{_target_cpu}.tar.xz
# patch loop
+%patch0 -p0
for kernel_version in %{?kernel_versions} ; do
cp -a kernel _kmod_build_${kernel_version%%___*}
@@ -75,6 +77,9 @@ done
%changelog
+* Wed Jan 19 2022 Nicolas Chauvet <kwizart(a)gmail.com> - 3:510.39.01-2
+- Add fix for FB
+
* Wed Jan 12 2022 Leigh Scott <leigh123linux(a)gmail.com> - 3:510.39.01-1
- Update to 510.39.01 beta
2 years, 3 months
[xine-lib] Fix build with libcaca > 0.99beta20
by Leigh Scott
commit 76f31a6882e361387c04e8882b01422bfe496aeb
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Jan 19 12:18:18 2022 +0000
Fix build with libcaca > 0.99beta20
Fix_build_with_libcaca.patch | 118 +++++++++++++++++++++++++++++++++++++++++++
xine-lib.spec | 3 ++
2 files changed, 121 insertions(+)
---
diff --git a/Fix_build_with_libcaca.patch b/Fix_build_with_libcaca.patch
new file mode 100644
index 0000000..e79cc4f
--- /dev/null
+++ b/Fix_build_with_libcaca.patch
@@ -0,0 +1,118 @@
+diff -r aae538a10133 -r 3f383e140270 m4/video_out.m4
+--- a/m4/video_out.m4 Wed Oct 06 18:03:30 2021 +0200
++++ b/m4/video_out.m4 Fri Oct 29 18:25:20 2021 +0200
+@@ -103,6 +103,7 @@
+ if test x"$have_caca$have_cucul" = x"yesyes"; then
+ HAVE_CUCUL=1
+ AC_SUBST([HAVE_CUCUL])
++ AC_DEFINE([HAVE_CUCUL], [], [Define this if you have the legacy libcaca with separate libcucul.])
+ fi
+
+
+diff -r aae538a10133 -r 3f383e140270 src/video_out/video_out_caca.c
+--- a/src/video_out/video_out_caca.c Wed Oct 06 18:03:30 2021 +0200
++++ b/src/video_out/video_out_caca.c Fri Oct 29 18:25:20 2021 +0200
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2003-2019 the xine project
++ * Copyright (C) 2003-2021 the xine project
+ *
+ * This file is part of xine, a free video player.
+ *
+@@ -35,13 +35,21 @@
+ #include <sys/stat.h>
+ #include <sys/mman.h>
+ #include <sys/time.h>
++
+ #ifdef HAVE_CUCUL
+-#include <cucul.h>
++# include <cucul.h>
++# define caca_canvas_t cucul_canvas_t
++# define caca_create_canvas cucul_create_canvas
++# define caca_get_canvas_width cucul_get_canvas_width
++# define caca_get_canvas_height cucul_get_canvas_height
++# define caca_free_canvas cucul_free_canvas
++# define caca_dither_t cucul_dither_t
++# define caca_create_dither define cucul_create_dither
++# define caca_dither_bitmap cucul_dither_bitmap
++# define caca_free_dither cucul_free_dither
+ #endif
+ #include <caca.h>
+
+-
+-
+ #include "xine.h"
+ #include <xine/video_out.h>
+ #include <xine/xine_internal.h>
+@@ -56,7 +64,7 @@
+
+ vo_frame_t vo_frame;
+
+- cucul_dither_t *pixmap_s; /* pixmap info structure */
++ caca_dither_t *pixmap_s; /* pixmap info structure */
+ uint8_t *pixmap_d; /* pixmap data */
+ unsigned int width, height;
+
+@@ -74,7 +82,7 @@
+
+ yuv2rgb_factory_t *yuv2rgb_factory;
+
+- cucul_canvas_t *cv;
++ caca_canvas_t *cv;
+ caca_display_t *dp;
+
+ } caca_driver_t;
+@@ -104,7 +112,7 @@
+
+ free (frame->pixmap_d);
+ if (frame->pixmap_s)
+- cucul_free_dither (frame->pixmap_s);
++ caca_free_dither (frame->pixmap_s);
+
+ frame->yuv2rgb->dispose (frame->yuv2rgb);
+
+@@ -163,7 +171,7 @@
+ _x_freep (&frame->pixmap_d);
+
+ if (frame->pixmap_s) {
+- cucul_free_dither (frame->pixmap_s);
++ caca_free_dither (frame->pixmap_s);
+ frame->pixmap_s = NULL;
+ }
+
+@@ -172,7 +180,7 @@
+ frame->format = format;
+
+ frame->pixmap_d = (uint8_t *) calloc (height, width * 4);
+- frame->pixmap_s = cucul_create_dither (32, width, height, width * 4,
++ frame->pixmap_s = caca_create_dither (32, width, height, width * 4,
+ 0xff0000, 0xff00, 0xff, 0);
+
+ if (format == XINE_IMGFMT_YV12) {
+@@ -214,7 +222,7 @@
+
+ frame->vo_frame.free (&frame->vo_frame);
+
+- cucul_dither_bitmap(this->cv, 0, 0, cucul_get_canvas_width(this->cv)-1, cucul_get_canvas_height(this->cv)-1,
++ caca_dither_bitmap(this->cv, 0, 0, caca_get_canvas_width(this->cv)-1, caca_get_canvas_height(this->cv)-1,
+ frame->pixmap_s, frame->pixmap_d);
+ caca_refresh_display (this->dp);
+ }
+@@ -262,7 +270,7 @@
+ caca_driver_t *this = (caca_driver_t*) this_gen;
+ this->yuv2rgb_factory->dispose (this->yuv2rgb_factory);
+ caca_free_display(this->dp);
+- cucul_free_canvas(this->cv);
++ caca_free_canvas(this->cv);
+
+ free(this);
+ }
+@@ -309,7 +317,7 @@
+ this->cv = caca_get_canvas(dp);
+ this->dp = dp;
+ } else {
+- this->cv = cucul_create_canvas(0, 0);
++ this->cv = caca_create_canvas(0, 0);
+ this->dp = caca_create_display(this->cv);
+ }
+
diff --git a/xine-lib.spec b/xine-lib.spec
index ddfb6cb..41ace96 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -35,6 +35,8 @@ Source0: xine-lib-%{version}-%{date}hg%{revision}.tar.xz
# Script to make a snapshot
Source1: make_xinelib_snapshot.sh
+Patch0: Fix_build_with_libcaca.patch
+
Provides: xine-lib(plugin-abi) = %{plugin_abi}
%{?_isa:Provides: xine-lib(plugin-abi)%{?_isa} = %{plugin_abi}}
@@ -129,6 +131,7 @@ This package contains extra plugins for %{name}:
%else
%setup -q -n %{name}-%{version}-%{date}hg%{revision}
%endif
+%patch0 -p1
autoreconf -ivf
2 years, 3 months
[xine-lib] rebuilt
by Nicolas Chauvet
commit ed745cc8df7c6904861802cc4c3a0502109cc3ed
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Jan 19 12:35:41 2022 +0100
rebuilt
xine-lib.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/xine-lib.spec b/xine-lib.spec
index 7deb6a3..ddfb6cb 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -24,7 +24,7 @@
Summary: A multimedia engine
Name: xine-lib
Version: 1.2.11
-Release: 11%{?snapshot:.%{date}hg%{revision}}%{?dist}
+Release: 12%{?snapshot:.%{date}hg%{revision}}%{?dist}
License: GPLv2+
URL: http://www.xine-project.org/
%if ! 0%{?snapshot}
@@ -323,6 +323,9 @@ mkdir -p %{buildroot}%{codecdir}
%changelog
+* Wed Jan 19 2022 Nicolas Chauvet <kwizart(a)gmail.com> - 1.2.11-12
+- Rebuilt
+
* Sat Dec 11 2021 Sérgio Basto <sergio(a)serjux.com> - 1.2.11-11
- Rebuilt for new ImageMagick on F34
2 years, 3 months
[intel-media-driver] Update to 22.1.1
by Nicolas Chauvet
commit b2fda4def741eb12e97a997b61728512cfb1adf5
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Jan 19 10:27:12 2022 +0100
Update to 22.1.1
intel-media-driver.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/intel-media-driver.spec b/intel-media-driver.spec
index bee740a..e698d9e 100644
--- a/intel-media-driver.spec
+++ b/intel-media-driver.spec
@@ -1,7 +1,7 @@
#global pre .pre8
Name: intel-media-driver
-Version: 21.4.3
+Version: 22.1.1
Release: 1%{?dist}
Summary: The Intel Media Driver for VAAPI
License: MIT and BSD
@@ -94,6 +94,9 @@ rm -rf %{buildroot}%{_libdir}/pkgconfig
%changelog
+* Wed Jan 19 2022 Nicolas Chauvet <kwizart(a)gmail.com> - 22.1.1-1
+- Update to 22.1.1
+
* Sun Dec 19 2021 Nicolas Chauvet <kwizart(a)gmail.com> - 21.4.3-1
- Update to 21.4.3
diff --git a/sources b/sources
index 41ec263..bb74f35 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (intel-media-21.4.3.tar.gz) = d2e2db1ddc2cbdc022273f53d873f2156e992420d382285de0b9559340d912e847a4780ed2adfe67f06a7c4bcac83aadca1104cf051b9a3d43b3ffd931a3db22
+SHA512 (intel-media-22.1.1.tar.gz) = 8ab0e5671d90d00b94c42ae6ef7712d20ba6fcd0e67a55a9daa1193ffc8c78455a02c7d3730e8d865ab15e3659e761898da6142348d16f04614a01dc75ae1260
2 years, 3 months