[ffmpeg/f34: 3/3] Merge branch 'master' into f34
by Leigh Scott
commit fb4a456ba82449c31c18ebd95d8bbffb5ae9afe4
Merge: 85374f4 02ac0d8
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Mar 23 20:36:12 2021 +0000
Merge branch 'master' into f34
.gitignore | 1 +
ffmpeg-snapshot.sh | 3 ++-
ffmpeg.spec | 10 +++++++---
sources | 2 +-
4 files changed, 11 insertions(+), 5 deletions(-)
---
3 years, 1 month
[ffmpeg/f34] (3 commits) ...Merge branch 'master' into f34
by Leigh Scott
Summary of changes:
b31c290... Switch to clang instead of nvcc (*)
02ac0d8... Update to 4.4-0.6.20210323git0be265e (*)
fb4a456... Merge branch 'master' into f34
(*) This commit already existed in another branch; no separate mail sent
3 years, 1 month
[ffmpeg] Update to 4.4-0.6.20210323git0be265e
by Leigh Scott
commit 02ac0d8814df6645288ddfc8ed0aaac2d7f576c0
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Mar 23 20:35:29 2021 +0000
Update to 4.4-0.6.20210323git0be265e
.gitignore | 1 +
ffmpeg-snapshot.sh | 3 ++-
ffmpeg.spec | 10 +++++++---
sources | 2 +-
4 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1d5909b..6cd8513 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ ffmpeg-*.rpm
/ffmpeg-20210125.tar.bz2
/ffmpeg-20210218.tar.bz2
/ffmpeg-20210312.tar.bz2
+/ffmpeg-20210323.tar.bz2
diff --git a/ffmpeg-snapshot.sh b/ffmpeg-snapshot.sh
index b6d07be..47dc104 100755
--- a/ffmpeg-snapshot.sh
+++ b/ffmpeg-snapshot.sh
@@ -17,6 +17,7 @@ date=$(date +%Y%m%d)
pushd "$tmp"
git clone git://git.ffmpeg.org/ffmpeg.git
cd ffmpeg
+git checkout release/4.4
git rev-parse HEAD
-git archive --prefix="ffmpeg-${date}/" --format=tar master | bzip2 > "$pwd"/ffmpeg-${date}.tar.bz2
+git archive --prefix="ffmpeg-${date}/" --format=tar release/4.4 | bzip2 > "$pwd"/ffmpeg-${date}.tar.bz2
popd
diff --git a/ffmpeg.spec b/ffmpeg.spec
index f99d034..1aeabc8 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -1,8 +1,8 @@
# TODO: add make test to %%check section
#global branch oldabi-
-%global date 20210312
-%global commit 51367267c8a9f1a840f5e810f8c788e6e03712a5
+%global date 20210323
+%global commit 0be265e9a100adc778c1c3cf52155a6326043b85
%global rel %(c=%{commit}; echo ${c:0:7})
%ifarch %{ix86}
@@ -111,7 +111,7 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 4.4
-Release: 0.5%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
+Release: 0.6%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -478,6 +478,10 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Tue Mar 23 2021 Leigh Scott <leigh123linux(a)gmail.com> - 4.4-0.6.20210323git0be265e
+- Update to 4.4-0.6.20210323git0be265e
+- Switch to release/4.4 branch
+
* Fri Mar 12 2021 Leigh Scott <leigh123linux(a)gmail.com> - 4.4-0.5.20210312git5136726
- Update to 20210312git5136726
diff --git a/sources b/sources
index 8b308ce..e35728c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ffmpeg-20210312.tar.bz2) = b13d43eb465d87944a7c7c335c046e1ee64993193a82eaf22abd0608df20c4f09c6a63a8dc69034e8990567958c195d4abd1e83ec16d87287296d840cec10b98
+SHA512 (ffmpeg-20210323.tar.bz2) = 44e35678d2d03288c820f6b8d9d2656ee50de3f38a0bd7a96f9ab094d55b07af0e78c3c70a300df0a07aabb7739fd299071cdc9cf7fda5185bfe96819db8fb8d
3 years, 1 month
[lpf-spotify-client] Update to 1.1.55.498.gf9a83c60
by Sérgio M. Basto
commit 319c459d7bc4edf7ed83ea31c53d1f9f81200a34
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Mar 23 19:57:57 2021 +0000
Update to 1.1.55.498.gf9a83c60
check_new_version.py | 9 ++++-----
lpf-spotify-client.spec | 5 ++++-
spotify-client.spec.in | 7 +++++--
3 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/check_new_version.py b/check_new_version.py
index 9140022..2e8a67e 100755
--- a/check_new_version.py
+++ b/check_new_version.py
@@ -57,13 +57,12 @@ if spec != spec3:
if runme(pkgcmd, enviro):
print('error running runme')
- print('rfpkg srpm && mock -r fedora-31-x86_64-rpmfusion_nonfree --no-clean --rebuild lpf-spotify-client-%s-1.fc34.src.rpm'
+ print('rfpkg srpm && mock -r fedora-32-x86_64-rpmfusion_nonfree --no-clean --rebuild lpf-spotify-client-%s-1.fc35.src.rpm'
% version64)
- print('rfpkg ci -c && git show')
else:
print("Already updated !")
-print('git show && echo Press enter to push and build; read dummy; rfpkg push && rfpkg build --nowait')
+print('rfpkg ci -c && git show && echo Press enter to push and build; read dummy; rfpkg push && rfpkg build --nowait')
+print('git checkout f34 && git merge master && git push && rfpkg build --nowait; git checkout master')
+print('git checkout f33 && git merge master && git push && rfpkg build --nowait; git checkout master')
print('git checkout f32 && git merge master && git push && rfpkg build --nowait; git checkout master')
-print('git checkout f31 && git merge master && git push && rfpkg build --nowait; git checkout master')
-print('git checkout f30 && git merge master && git push && rfpkg build --nowait; git checkout master')
diff --git a/lpf-spotify-client.spec b/lpf-spotify-client.spec
index 9d6cc47..f3f5f87 100644
--- a/lpf-spotify-client.spec
+++ b/lpf-spotify-client.spec
@@ -11,7 +11,7 @@
Name: lpf-spotify-client
# Upstream spotify version, verbatim.
-Version: 1.1.42.622
+Version: 1.1.55.498
Release: 1%{?dist}
Summary: Spotify music player native client package bootstrap
@@ -79,6 +79,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
%changelog
+* Tue Mar 23 2021 Sérgio Basto <sergio(a)serjux.com> - 1.1.55.498-1
+- Update to 1.1.55.498.gf9a83c60
+
* Fri Sep 18 2020 Sérgio Basto <sergio(a)serjux.com> - 1.1.42.622-1
- Update to 1.1.42.622.gbd112320
diff --git a/spotify-client.spec.in b/spotify-client.spec.in
index 878a6f2..7b45ca6 100644
--- a/spotify-client.spec.in
+++ b/spotify-client.spec.in
@@ -13,7 +13,7 @@
Name: spotify-client
-Version: 1.1.42.622
+Version: 1.1.55.498
Release: 1%{?dist}
Summary: Spotify music player native client
@@ -27,7 +27,7 @@ ExclusiveArch: %{ix86} x86_64
Source0: spotify-make-%{shortcommit}.tar.gz
%ifarch x86_64
-Source1: %{repo}/spotify-client_%{version}.gbd112320-37_amd64.deb
+Source1: %{repo}/spotify-client_%{version}.gf9a83c60_amd64.deb
%global spotify_pkg %{SOURCE1}
%global req_64 ()(64bit)
%else
@@ -109,6 +109,9 @@ ln -s ../libcurl.so.4 libcurl-gnutls.so.4
%changelog
+* Tue Mar 23 2021 Sérgio Basto <sergio(a)serjux.com> - 1.1.55.498-1
+- Update to 1.1.55.498.gf9a83c60
+
* Fri Sep 18 2020 Sérgio Basto <sergio(a)serjux.com> - 1.1.42.622-1
- Update to 1.1.42.622.gbd112320
3 years, 1 month
[telegram-desktop] Also add PulseAudio as upstream tg_owt have dropped it
by Alexey Gorgurov
commit 6e61d7091041f61169b414fa67dd5cb256f35f64
Author: Alexey Gorgurov <alexfails(a)fedoraproject.org>
Date: Tue Mar 23 19:40:05 2021 +0300
Also add PulseAudio as upstream tg_owt have dropped it
telegram-desktop.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 959e2c5..50d930f 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -95,6 +95,7 @@ Requires: gtk3%{?_isa}
BuildRequires: pkgconfig(tgvoip) >= 2.4.4
%else
BuildRequires: pkgconfig(alsa)
+BuildRequires: pkgconfig(libpulse)
Provides: bundled(libtgvoip) = 2.4.4
%endif
3 years, 1 month
