[tg_owt] Removed legacy use flags.
by Vitaly Zaitsev
commit a2225828450835b780b3968f5e36a2d2bcfdefbe
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Wed Apr 19 18:20:54 2023 +0200
Removed legacy use flags.
tg_owt.spec | 59 +++++++++++++++--------------------------------------------
1 file changed, 15 insertions(+), 44 deletions(-)
---
diff --git a/tg_owt.spec b/tg_owt.spec
index 966181d..2e7be94 100644
--- a/tg_owt.spec
+++ b/tg_owt.spec
@@ -1,6 +1,4 @@
%global debug_package %{nil}
-%global legacy_ffmpeg 0
-%global legacy_openssl 0
%global commit0 1a18da2ed4d5ce134e984d1586b915738e0da257
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
@@ -50,10 +48,17 @@ Patch100: %{name}-gcc13-fixes.patch
BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(epoxy)
BuildRequires: pkgconfig(gbm)
+BuildRequires: pkgconfig(libavcodec)
+BuildRequires: pkgconfig(libavfilter)
+BuildRequires: pkgconfig(libavformat)
+BuildRequires: pkgconfig(libavutil)
BuildRequires: pkgconfig(libdrm)
BuildRequires: pkgconfig(libjpeg)
BuildRequires: pkgconfig(libpipewire-0.3)
BuildRequires: pkgconfig(libpulse)
+BuildRequires: pkgconfig(libswresample)
+BuildRequires: pkgconfig(libswscale)
+BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(opus)
BuildRequires: pkgconfig(vpx)
BuildRequires: pkgconfig(x11)
@@ -66,36 +71,12 @@ BuildRequires: pkgconfig(xrender)
BuildRequires: pkgconfig(xtst)
BuildRequires: cmake
+BuildRequires: ffmpeg-devel
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: ninja-build
BuildRequires: yasm
-# Telegram Desktop has major issues when built against ffmpeg 5.x:
-# https://bugzilla.rpmfusion.org/show_bug.cgi?id=6273
-# Upstream refuses to fix this issue:
-# https://github.com/telegramdesktop/tdesktop/issues/24855
-# https://github.com/telegramdesktop/tdesktop/issues/23899
-%if %{legacy_ffmpeg}
-BuildRequires: compat-ffmpeg4-devel
-%else
-BuildRequires: pkgconfig(libavcodec)
-BuildRequires: pkgconfig(libavfilter)
-BuildRequires: pkgconfig(libavformat)
-BuildRequires: pkgconfig(libavutil)
-BuildRequires: pkgconfig(libswresample)
-BuildRequires: pkgconfig(libswscale)
-BuildRequires: ffmpeg-devel
-%endif
-
-# Video calls doesn't work when built against openssl 3.0:
-# https://github.com/telegramdesktop/tdesktop/issues/24698
-%if %{legacy_openssl}
-BuildRequires: openssl1.1-devel
-%else
-BuildRequires: pkgconfig(openssl)
-%endif
-
# Disabling all low-memory architectures.
ExclusiveArch: x86_64 aarch64
@@ -123,10 +104,17 @@ Provides: bundled(spl_sqrt_floor) = 0~git
Requires: pkgconfig(alsa)
Requires: pkgconfig(epoxy)
Requires: pkgconfig(gbm)
+Requires: pkgconfig(libavcodec)
+Requires: pkgconfig(libavfilter)
+Requires: pkgconfig(libavformat)
+Requires: pkgconfig(libavutil)
Requires: pkgconfig(libdrm)
Requires: pkgconfig(libjpeg)
Requires: pkgconfig(libpipewire-0.3)
Requires: pkgconfig(libpulse)
+Requires: pkgconfig(libswresample)
+Requires: pkgconfig(libswscale)
+Requires: pkgconfig(openssl)
Requires: pkgconfig(opus)
Requires: pkgconfig(vpx)
Requires: pkgconfig(x11)
@@ -137,24 +125,7 @@ Requires: pkgconfig(xfixes)
Requires: pkgconfig(xrandr)
Requires: pkgconfig(xrender)
Requires: pkgconfig(xtst)
-
-%if %{legacy_ffmpeg}
-Requires: compat-ffmpeg4-devel
-%else
-Requires: pkgconfig(libavcodec)
-Requires: pkgconfig(libavfilter)
-Requires: pkgconfig(libavformat)
-Requires: pkgconfig(libavutil)
-Requires: pkgconfig(libswresample)
-Requires: pkgconfig(libswscale)
Requires: ffmpeg-devel
-%endif
-
-%if %{legacy_openssl}
-Requires: openssl1.1-devel
-%else
-Requires: pkgconfig(openssl)
-%endif
%description devel
%{summary}.
1 year, 7 months
[vdr-markad/f36] Update to 3.2.3
by Martin Gansser
Summary of changes:
1bd04f4... Update to 3.2.3 (*)
(*) This commit already existed in another branch; no separate mail sent
1 year, 7 months
[VirtualBox-kmod] fix update_vbox.sh script
by Sérgio M. Basto
commit 2ea4f9c57f664f0851828f50da010f4c826a95b5
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Apr 19 01:29:02 2023 +0100
fix update_vbox.sh script
update_vbox.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/update_vbox.sh b/update_vbox.sh
index 4c584b2..53c9653 100755
--- a/update_vbox.sh
+++ b/update_vbox.sh
@@ -57,7 +57,7 @@ fi
echo Press enter tag-build $BRANCH1 to continue or n to skip; read dummy;
if [[ "$dummy" != "n" ]]; then
echo koji-rpmfusion tag-build $BRANCH1-free-override VirtualBox-$VERSION-$REL.$BRANCH2
-git checkout $BRANCH1 && git merge master
+git checkout $BRANCH1 && git merge master && git push
koji-rpmfusion tag-build $BRANCH1-free-override VirtualBox-$VERSION-$REL.$BRANCH2
(koji-rpmfusion wait-repo $BRANCH1-free-build --build=VirtualBox-$VERSION-$REL.$BRANCH2 && \
git checkout $BRANCH1 && rfpkg build --nowait; git checkout master) &
1 year, 7 months