[obs-studio/el8] Update to 27.2.4
by Nicolas Chauvet
commit 9398305a6ef6fe3ba612ba39209cd0082d3c1e36
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Jan 5 11:37:38 2023 +0100
Update to 27.2.4
obs-studio.spec | 7 +++++--
sources | 4 ++--
2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/obs-studio.spec b/obs-studio.spec
index 9188e24..ceb0bb5 100644
--- a/obs-studio.spec
+++ b/obs-studio.spec
@@ -2,7 +2,7 @@
# bytecompile with Python 3
%global __python %{__python3}
-%global commit1 8ad3f64e702ac4f1799b209a511620eb1d096a01
+%global commit1 b28cdef1fb06ece14d6be023b0f08ec28bca972e
%global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
%ifarch %{power64}
@@ -13,7 +13,7 @@
%endif
Name: obs-studio
-Version: 27.2.1
+Version: 27.2.4
Release: 1%{?dist}
Summary: Open Broadcaster Software Studio
@@ -153,6 +153,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata
%{_includedir}/obs/
%changelog
+* Thu Jan 05 2023 Nicolas Chauvet <kwizart(a)gmail.com> - 27.2.4-1
+- Update to 27.2.4
+
* Sat Feb 26 2022 Neal Gompa <ngompa(a)fedoraproject.org> - 27.2.1-1
- Update to 27.2.1
- Revert all linux-capture changes after 27.1.3 for EL8 compatibility
diff --git a/sources b/sources
index 688ad6d..41f7a0f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (obs-studio-27.2.1.tar.gz) = 8992d2d8cb13e82e457a844d9ff63d57ab854a8c6f295563f86009cab801845fb093d39d315c14ef333a7a9908928ac15af4d0454ea570da4a98aff5f25f89af
-SHA512 (obs-vst-8ad3f64.tar.gz) = b3608e856668671d9e245c7bc5bfa24c5ed2a53cf78d71ca210885bea64d4057644e97d21c8ad0c08595c1ee7556a894a3684aa286279f75c618f60bd868505e
+SHA512 (obs-vst-b28cdef.tar.gz) = 5280a3de4a40d26b19401dfa44dfdb729458a3244e1aed14a278bcbd4efa3f33111509189744e1f6879ab3053a4d63fbd285e8fc0a4202776c98d214c38f1867
+SHA512 (obs-studio-27.2.4.tar.gz) = 575341dd3d9240b21881517a16d01ca11f833e08b40ca7990f0360b4cd1076e8217a9bb8dddf174eca5429e6eadaadb6cfdbd61d24e0eb13ebeaa7f29cfad8bf
1 year, 3 months
[HandBrake] Link only against vpl.
by Vitaly Zaitsev
commit 0b46db2d20d07b6f27f50faae9202a6589030729
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Thu Jan 5 10:56:14 2023 +0100
Link only against vpl.
HandBrake.spec | 2 +-
sources | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/HandBrake.spec b/HandBrake.spec
index f3db42e..ed921c9 100644
--- a/HandBrake.spec
+++ b/HandBrake.spec
@@ -165,7 +165,7 @@ export http_proxy=http://127.0.0.1
# By default the project is built with optimizations for speed and no debug.
# Override configure settings by passing RPM_OPT_FLAGS and disabling preset
# debug options.
-echo "GCC.args.O.speed = %{optflags} -I%{_includedir}/ffmpeg -ldl -lx265 %{?_with_fdk:-lfdk-aac} %{?_with_vpl:-lmfx -lvpl}" > custom.defs
+echo "GCC.args.O.speed = %{optflags} -I%{_includedir}/ffmpeg -ldl -lx265 %{?_with_fdk:-lfdk-aac} %{?_with_vpl:-lvpl}" > custom.defs
echo "GCC.args.g.none = " >> custom.defs
# Not an autotools configure script.
diff --git a/sources b/sources
index 573c5a9..6e015e8 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
SHA512 (HandBrake-1.6.0-source.tar.bz2) = 1984bff578037efd48e2f37175b958994bef19364547ded14f71f64a9843c936e621760ee3123a6d8d730baba617988da6710272c8e912ca528a92dc02ae8ffd
+SHA512 (HandBrake-1.6.0-source.tar.bz2.sig) = ab900b129a65cfb683ee9fc2678f574092813357b81755c2ff3d407eb5cbdea65c4c3d2eb7cc531e9f77a96e44995f14f6b4c2971fd05ef6489291ff80f7f1d5
1 year, 3 months
[HandBrake] Updated to version 1.6.0.
by Vitaly Zaitsev
commit db71ecd76b646b38bb0b02f5e8d90e4cb0280a11
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Thu Jan 5 10:50:42 2023 +0100
Updated to version 1.6.0.
.gitignore | 2 +
HandBrake-ffmpeg-5.0.patch | 40 ----------------
HandBrake-ffmpeg-5.1.patch | 109 ------------------------------------------
HandBrake-fix-wformat.patch | 61 +++++++++++++++++++++++
HandBrake-no-libvpl.patch | 84 --------------------------------
HandBrake-no-metainfo.patch | 30 ------------
HandBrake-no-nasm.patch | 11 -----
HandBrake-no_clip_id.patch | 14 ------
HandBrake-nostrip.patch | 2 +-
HandBrake-system-OpenCL.patch | 12 -----
HandBrake.spec | 104 ++++++++++++----------------------------
sources | 3 +-
12 files changed, 96 insertions(+), 376 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cab2526..4b96a27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,5 @@
/HandBrake-1.4.2-source.tar.bz2.sig
/HandBrake-1.5.1-source.tar.bz2
/HandBrake-1.5.1-source.tar.bz2.sig
+/HandBrake-1.6.0-source.tar.bz2
+/HandBrake-1.6.0-source.tar.bz2.sig
diff --git a/HandBrake-fix-wformat.patch b/HandBrake-fix-wformat.patch
new file mode 100644
index 0000000..b5d742e
--- /dev/null
+++ b/HandBrake-fix-wformat.patch
@@ -0,0 +1,61 @@
+From fa9e4bfd3a5be0b433d1a67cd4058d27fea9a061 Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos(a)foutrelis.com>
+Date: Wed, 28 Dec 2022 22:23:50 +0200
+Subject: [PATCH] LinGUI: fix build with -Werror=format-security
+
+Add missing format strings where needed.
+
+Fixes: f6c0971c0042 ("Added XDG color-scheme implementation")
+Fixes: 3c71841d7716 ("LinGUI: Add warning color to dialog buttons")
+Fixes: 23f067ef4186 ("LinGUI: Add subtitle and audio track names to queue")
+---
+ gtk/src/callbacks.c | 2 +-
+ gtk/src/color-scheme.c | 2 +-
+ gtk/src/queuehandler.c | 4 ++--
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
+index d815e10e22e..eed9a45103b 100644
+--- a/gtk/src/callbacks.c
++++ b/gtk/src/callbacks.c
+@@ -3790,7 +3790,7 @@ ghb_title_message_dialog(GtkWindow *parent, GtkMessageType type, const gchar *ti
+ type, GTK_BUTTONS_NONE,
+ "%s", title);
+ if (message)
+- gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), message);
++ gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), "%s", message);
+
+ gtk_dialog_add_buttons(GTK_DIALOG(dialog),
+ no, GTK_RESPONSE_NO,
+diff --git a/gtk/src/color-scheme.c b/gtk/src/color-scheme.c
+index 6fbf65e7159..0816d6808b4 100644
+--- a/gtk/src/color-scheme.c
++++ b/gtk/src/color-scheme.c
+@@ -173,7 +173,7 @@ DesktopColorScheme color_scheme_get_desktop_scheme (void)
+ DBUS_TIMEOUT, NULL, &error);
+ if (!result)
+ {
+- g_debug(error->message);
++ g_debug("%s", error->message);
+ return DESKTOP_NO_PREFERENCE;
+ }
+
+diff --git a/gtk/src/queuehandler.c b/gtk/src/queuehandler.c
+index db186fbe3c2..a2b3e96aa1e 100644
+--- a/gtk/src/queuehandler.c
++++ b/gtk/src/queuehandler.c
+@@ -682,12 +682,12 @@ queue_update_summary(GhbValue * queueDict, signal_user_data_t *ud)
+ def = ghb_dict_get_bool(subsettings, "Default");
+ name = ghb_dict_get_string(subsettings, "Name");
+
+- g_string_append_printf(str, sep);
++ g_string_append_printf(str, "%s", sep);
+ if (name)
+ {
+ g_string_append_printf(str, "%s - ", name);
+ }
+- g_string_append_printf(str, desc);
++ g_string_append_printf(str, "%s", desc);
+ free(desc);
+ if (force)
+ {
diff --git a/HandBrake-nostrip.patch b/HandBrake-nostrip.patch
index 9377325..b03dcc6 100644
--- a/HandBrake-nostrip.patch
+++ b/HandBrake-nostrip.patch
@@ -1,6 +1,6 @@
--- a/gtk/module.rules
+++ b/gtk/module.rules
-@@ -21,6 +21,7 @@ $(GTK.CONFIGURE.stamp): $(GTK.src/)confi
+@@ -21,6 +21,7 @@ $(GTK.CONFIGURE.stamp): $(GTK.src/)configure.ac $(GTK.src/)src/Makefile.am
CXX="$(GCC.gxx)" \
CFLAGS="$(call fn.ARGS,GTK.GCC,.g .O *D *W ?extra)" \
LDFLAGS="$(call fn.ARGS,GTK.GCC,?strip .g .O ?extra.exe)" \
diff --git a/HandBrake.spec b/HandBrake.spec
index 19aa617..f3db42e 100644
--- a/HandBrake.spec
+++ b/HandBrake.spec
@@ -1,5 +1,5 @@
-%global commit0 a8bc2549b3de632e2597cb133bc3aa20ca8a3629
-%global date 20210930
+%global commit0 9951c73a797b9c22814a1cfcbb0341d66853a262
+%global date 20221228
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
%global tag %{version}
@@ -11,14 +11,14 @@
%ifarch i686 x86_64
%global _with_asm 1
-%global _with_mfx 1
+%global _with_vpl 1
%endif
%global desktop_id fr.handbrake.ghb
Name: HandBrake
-Version: 1.5.1
-Release: 4%{!?tag:.%{date}git%{shortcommit0}}%{?dist}
+Version: 1.6.0
+Release: 1%{!?tag:.%{date}git%{shortcommit0}}%{?dist}
Summary: An open-source multiplatform video transcoder
License: GPLv2+
URL: http://handbrake.fr/
@@ -34,35 +34,21 @@ BuildRequires: gnupg2
Source0: https://github.com/%{name}/%{name}/archive/%{commit0}.tar.gz#/%{name}-%{s...
%endif
-%{?_without_ffmpeg:Source10: https://libav.org/releases/libav-12.tar.gz}
-
-# Build with unpatched libbluray (https://github.com/HandBrake/HandBrake/pull/458)
-# can be dropped with libbluray-1.0.0
-Patch1: %{name}-no_clip_id.patch
# Pass strip tool override to gtk/configure
Patch3: %{name}-nostrip.patch
# Don't link with libva unnecessarily
Patch4: %{name}-no-libva.patch
-# Fix build on non-x86 (without nasm)
-Patch6: %{name}-no-nasm.patch
-# rhel gettext is too old to support metainfo
-# https://github.com/HandBrake/HandBrake/pull/2884
-Patch7: %{name}-no-metainfo.patch
# Patch from Gentoo
-Patch8: %{name}-ffmpeg-5.0.patch
Patch9: %{name}-x265-link.patch
-# keep using MediaSDK
-Patch10: %{name}-no-libvpl.patch
-Patch11: https://github.com/%{name}/%{name}/commit/7c92fda45573425fb3873b48919f9de...
+# https://github.com/HandBrake/HandBrake/commit/fa9e4bfd3a5be0b433d1a67cd40...
+Patch11: %{name}-fix-wformat.patch
BuildRequires: a52dec-devel >= 0.7.4
-BuildRequires: cmake3
+BuildRequires: cmake
BuildRequires: dbus-glib-devel
BuildRequires: desktop-file-utils
-%if 0%{?fedora}
BuildRequires: libappstream-glib
-%endif
-%{!?_without_ffmpeg:BuildRequires: ffmpeg-devel >= 3.5}
+BuildRequires: ffmpeg-devel >= 3.5
# Should be >= 2.6:
BuildRequires: freetype-devel >= 2.4.11
# Should be >= 0.19.7:
@@ -84,8 +70,9 @@ BuildRequires: libdvdread-devel >= 5.0.0
# FDK is non-free
%{?_with_fdk:BuildRequires: fdk-aac-devel >= 0.1.4}
BuildRequires: libgudev-devel
-%if 0%{?_with_mfx:1}
-BuildRequires: libmfx-devel >= 1.23-1
+%if 0%{?_with_vpl:1}
+BuildRequires: intel-mediasdk-devel
+BuildRequires: oneVPL-devel
BuildRequires: libva-devel
%endif
BuildRequires: libmpeg2-devel >= 0.5.1
@@ -99,16 +86,13 @@ BuildRequires: libvorbis-devel
BuildRequires: libvpx-devel >= 1.3
BuildRequires: make
BuildRequires: meson
-%if 0%{?_with_asm:1}
BuildRequires: nasm
-%endif
-%ifnarch %{arm}
BuildRequires: numactl-devel
-%endif
BuildRequires: nv-codec-headers
BuildRequires: opus-devel
BuildRequires: python3
BuildRequires: speex-devel
+BuildRequires: svt-av1-devel
BuildRequires: x264-devel >= 0.148
BuildRequires: x265-devel >= 1.9
BuildRequires: xz-devel
@@ -151,28 +135,15 @@ This package contains the main program with a graphical interface.
gpgv2 --keyring %{S:2} %{S:1} %{S:0}
%endif
%setup -q %{!?tag:-n %{name}-%{commit0}}
-%if 0%{?rhel}
-%patch1 -p1
-%endif
%patch3 -p1
-%if 0%{!?_with_mfx}
+%if 0%{!?_with_vpl}
%patch4 -p1
-%else
-%patch10 -p1
-%endif
-%patch6 -p1
-%if 0%{?rhel}
-%patch7 -p1
%endif
-%patch8 -p1
%patch9 -p1
%patch11 -p1
-mkdir -p download
-%{?_without_ffmpeg:cp -p %{SOURCE10} download}
-
# Use system libraries in place of bundled ones
-for module in a52dec %{?_with_fdk:fdk-aac} %{!?_without_ffmpeg:ffmpeg} libdav1d libdvdnav libdvdread libbluray %{?_with_mfx:libmfx libvpl} nvenc libvpx x265; do
+for module in a52dec %{?_with_fdk:fdk-aac} ffmpeg libdav1d libdvdnav libdvdread libbluray %{?_with_vpl:libmfx libvpl} nvenc libvpx svt-av1 x265; do
sed -i -e "/MODULES += contrib\/$module/d" make/include/main.defs
done
@@ -194,7 +165,7 @@ export http_proxy=http://127.0.0.1
# By default the project is built with optimizations for speed and no debug.
# Override configure settings by passing RPM_OPT_FLAGS and disabling preset
# debug options.
-echo "GCC.args.O.speed = %{optflags} -I%{_includedir}/ffmpeg -ldl -lx265 %{?_with_fdk:-lfdk-aac} %{?_with_mfx:-lmfx}" > custom.defs
+echo "GCC.args.O.speed = %{optflags} -I%{_includedir}/ffmpeg -ldl -lx265 %{?_with_fdk:-lfdk-aac} %{?_with_vpl:-lmfx -lvpl}" > custom.defs
echo "GCC.args.g.none = " >> custom.defs
# Not an autotools configure script.
@@ -213,7 +184,7 @@ echo "GCC.args.g.none = " >> custom.defs
--disable-numa \
%endif
%{?_with_fdk:--enable-fdk-aac} \
- %{?_with_mfx:--enable-qsv}
+ %{?_with_vpl:--enable-qsv}
%make_build -C build V=1
@@ -221,45 +192,25 @@ echo "GCC.args.g.none = " >> custom.defs
%make_install -C build
# Desktop file, icons and AppStream metadata from FlatPak build (more complete)
-rm -f %{buildroot}/%{_datadir}/applications/ghb.desktop \
- %{buildroot}/%{_datadir}/icons/hicolor/scalable/apps/hb-icon.svg
+rm -f %{buildroot}%{_datadir}/applications/ghb.desktop \
+ %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/hb-icon.svg
install -D -p -m 644 gtk/src/%{desktop_id}.desktop \
- %{buildroot}/%{_datadir}/applications/%{desktop_id}.desktop
+ %{buildroot}%{_datadir}/applications/%{desktop_id}.desktop
install -D -p -m 644 gtk/src/%{desktop_id}.svg \
- %{buildroot}/%{_datadir}/icons/hicolor/scalable/apps/%{desktop_id}.svg
-
-desktop-file-validate %{buildroot}/%{_datadir}/applications/%{desktop_id}.desktop
-
-%if 0%{?fedora}
-appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{desktop_id}.metainfo.xml
-%endif
+ %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{desktop_id}.svg
%find_lang ghb
-%if 0%{?rhel} && 0%{?rhel} <= 7
-%post gui
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-/usr/bin/update-desktop-database &> /dev/null || :
-
-%postun gui
-if [ $1 -eq 0 ] ; then
- touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-/usr/bin/update-desktop-database &> /dev/null || :
-
-%posttrans gui
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-%endif
+%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/%{desktop_id}.desktop
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{desktop_id}.metainfo.xml
%files -f ghb.lang gui
%license COPYING
%doc AUTHORS.markdown NEWS.markdown README.markdown THANKS.markdown
%{_bindir}/ghb
-%if 0%{?fedora}
%{_metainfodir}/%{desktop_id}.metainfo.xml
-%endif
%{_datadir}/applications/%{desktop_id}.desktop
%{_datadir}/icons/hicolor/scalable/apps/%{desktop_id}.svg
@@ -269,6 +220,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_bindir}/HandBrakeCLI
%changelog
+* Thu Jan 05 2023 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.6.0-1
+- Updated to version 1.6.0.
+- Switched to intel-mediasdk-devel and oneVPL-devel as required by upstream.
+- Install metainfo manifest on EPEL too.
+- Removed the legacy scriptlets.
+- Added check section.
+
* Sat Aug 06 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 1.5.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg
5.1
diff --git a/sources b/sources
index 26bc0fc..573c5a9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (HandBrake-1.5.1-source.tar.bz2) = 63c5933f77d417a89512abd278a1d844f2b7a36ec9f8ab664c1a1348fd228ee389fc8e349b2df6cbf5d617b912d4634457ebea86490ff5ed4930f39a90dc7568
-SHA512 (HandBrake-1.5.1-source.tar.bz2.sig) = 8638f5a2a592213efaedcb76570bf960b6c01c05fc34b472685b4b8d7d067a96745c07e9fe1c01e7f20b193870d502cf2240096e49380b89606ad6c33f31c1b4
+SHA512 (HandBrake-1.6.0-source.tar.bz2) = 1984bff578037efd48e2f37175b958994bef19364547ded14f71f64a9843c936e621760ee3123a6d8d730baba617988da6710272c8e912ca528a92dc02ae8ffd
1 year, 3 months
[mesa-freeworld/f37] fix typo on conflict condition for vdpau sub-package
by Luya Tshimbalanga
commit b774a8e9a2f7f5ca9370875903f3eb75cc16ee0f
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Wed Jan 4 19:37:16 2023 -0800
fix typo on conflict condition for vdpau sub-package
mesa-freeworld.spec | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/mesa-freeworld.spec b/mesa-freeworld.spec
index 02b0853..0fdee7a 100644
--- a/mesa-freeworld.spec
+++ b/mesa-freeworld.spec
@@ -58,7 +58,7 @@ Name: %{srcname}-freeworld
Summary: Mesa graphics libraries
%global ver 22.3.2
Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
-Release: 2%{?dist}
+Release: 3%{?dist}
License: MIT
URL: http://www.mesa3d.org
@@ -166,7 +166,7 @@ Requires: %{srcname}-filesystem%{?_isa} >= %{?epoch:%{epoch}:}%{version}
Provides: %{srcname}-vdpau-drivers = %{?epoch:%{epoch}:}%{version}-%{release}
Provides: %{srcname}-vdpau-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
# Prevents mesa from fedora repo to overwrite the update
-Conflicts: %{srcname}-vdpau-drivers > %{?epoch:%{epoch}:}%{version}-%{release}
+Conflicts: %{srcname}-vdpau-drivers >= %{?epoch:%{epoch}:}%{version}-%{release}
Enhances: %{srcname}%{?_isa}
%description -n %{srcname}-vdpau-drivers-freeworld
@@ -295,8 +295,10 @@ rm -fr %{buildroot}%{_libdir}/libVkLayer_MESA_device_select.so
%{_metainfodir}/org.mesa3d.vdpau.freeworld.metainfo.xml
%license docs/license.rst
%endif
-
%changelog
+* Wed Jan 4 2023 Luya Tshimbalanga <luya(a)fedoraproject.org> - 22.3.2-3
+- fix typo on conflict condition for vdpau sub-package
+
* Sun Jan 1 2023 Luya Tshimbalanga <luya(a)fedoraproject.org> - 22.3.2-2
- Add conflicts to resolve dependencies from Fedora repo on update
1 year, 3 months
[mesa-freeworld] fix typo on conflict condition for vdpau sub-package
by Luya Tshimbalanga
commit 217741f2cf53f439c9b5ca824d3bd4ce3ce7a54f
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Wed Jan 4 19:37:16 2023 -0800
fix typo on conflict condition for vdpau sub-package
mesa-freeworld.spec | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/mesa-freeworld.spec b/mesa-freeworld.spec
index 02b0853..0fdee7a 100644
--- a/mesa-freeworld.spec
+++ b/mesa-freeworld.spec
@@ -58,7 +58,7 @@ Name: %{srcname}-freeworld
Summary: Mesa graphics libraries
%global ver 22.3.2
Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
-Release: 2%{?dist}
+Release: 3%{?dist}
License: MIT
URL: http://www.mesa3d.org
@@ -166,7 +166,7 @@ Requires: %{srcname}-filesystem%{?_isa} >= %{?epoch:%{epoch}:}%{version}
Provides: %{srcname}-vdpau-drivers = %{?epoch:%{epoch}:}%{version}-%{release}
Provides: %{srcname}-vdpau-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
# Prevents mesa from fedora repo to overwrite the update
-Conflicts: %{srcname}-vdpau-drivers > %{?epoch:%{epoch}:}%{version}-%{release}
+Conflicts: %{srcname}-vdpau-drivers >= %{?epoch:%{epoch}:}%{version}-%{release}
Enhances: %{srcname}%{?_isa}
%description -n %{srcname}-vdpau-drivers-freeworld
@@ -295,8 +295,10 @@ rm -fr %{buildroot}%{_libdir}/libVkLayer_MESA_device_select.so
%{_metainfodir}/org.mesa3d.vdpau.freeworld.metainfo.xml
%license docs/license.rst
%endif
-
%changelog
+* Wed Jan 4 2023 Luya Tshimbalanga <luya(a)fedoraproject.org> - 22.3.2-3
+- fix typo on conflict condition for vdpau sub-package
+
* Sun Jan 1 2023 Luya Tshimbalanga <luya(a)fedoraproject.org> - 22.3.2-2
- Add conflicts to resolve dependencies from Fedora repo on update
1 year, 3 months
[telegram-desktop/f36] Removed explicit dependency on compat-ffmpeg4.
by Vitaly Zaitsev
commit cde2d644348ac821386aa122a06c507567c8602c
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Wed Jan 4 20:50:51 2023 +0100
Removed explicit dependency on compat-ffmpeg4.
telegram-desktop.spec | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index e2637cc..b2c9da5 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -13,7 +13,7 @@
Name: telegram-desktop
Version: 4.5.2
-Release: 1%{?dist}
+Release: 2%{?dist}
# Application and 3rd-party modules licensing:
# * Telegram Desktop - GPL-3.0-or-later with OpenSSL exception -- main tarball;
@@ -117,7 +117,6 @@ Requires: webkit2gtk3%{?_isa}
# https://github.com/telegramdesktop/tdesktop/issues/23899
%if %{legacy_ffmpeg}
BuildRequires: compat-ffmpeg4-devel
-Requires: compat-ffmpeg4%{?_isa}
%else
BuildRequires: pkgconfig(libavcodec)
BuildRequires: pkgconfig(libavformat)
@@ -221,6 +220,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%{_metainfodir}/*.metainfo.xml
%changelog
+* Wed Jan 04 2023 Vitaly Zaitsev <vitaly(a)easycoding.org> - 4.5.2-2
+- Removed explicit dependency on compat-ffmpeg4.
+
* Tue Jan 03 2023 Vitaly Zaitsev <vitaly(a)easycoding.org> - 4.5.2-1
- Updated to version 4.5.2.
1 year, 3 months
[wl-kmod/el7: 2/2] Merge branch 'master' into el7
by Nicolas Viéville
commit a14beb27b6bafdfa3e83f0d04648f18be02a6cd0
Merge: aa333ba 376fcc7
Author: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
Date: Wed Jan 4 13:38:15 2023 +0100
Merge branch 'master' into el7
wl-kmod-024_kernel_6.1_adaptation.patch | 84 +++++++++++++++++++++++++++++++++
wl-kmod.spec | 11 +++--
2 files changed, 91 insertions(+), 4 deletions(-)
---
1 year, 3 months
