[telegram-desktop/f31] Removed useless linker flag.
by Vitaly Zaitsev
commit ed814efbbed9493f4c329f74d44f98ee63e69280
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Tue Dec 17 12:13:32 2019 +0100
Removed useless linker flag.
telegram-desktop-build-fixes.patch | 13 ++++++-------
telegram-desktop-system-fonts.patch | 2 +-
telegram-desktop-unbundle-minizip.patch | 4 ++--
3 files changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch
index 04270a6..934edd3 100644
--- a/telegram-desktop-build-fixes.patch
+++ b/telegram-desktop-build-fixes.patch
@@ -1,4 +1,4 @@
-From 74a5e11947529b3a1754b4f8d8e6e6d801342baf Mon Sep 17 00:00:00 2001
+From 7c42bf1c3db9aabce1f11f6a576e799831b75042 Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Fri, 31 Mar 2017 14:29:58 +0200
Subject: [PATCH 1/3] Fixed build under Fedora using rpmbuild and mock.
@@ -23,12 +23,12 @@ Subject: [PATCH 1/3] Fixed build under Fedora using rpmbuild and mock.
Telegram/gyp/modules/qt.gypi | 87 +++++-------------
Telegram/gyp/modules/qt_moc.gypi | 5 +-
Telegram/gyp/modules/qt_rcc.gypi | 2 +-
- Telegram/gyp/telegram/linux.gypi | 34 ++-----
+ Telegram/gyp/telegram/linux.gypi | 33 ++-----
Telegram/gyp/telegram/sources.txt | 2 +-
Telegram/gyp/telegram/telegram.gypi | 23 +----
lib/xdg/telegramdesktop.appdata.xml | 2 +-
lib/xdg/telegramdesktop.desktop | 5 +-
- 24 files changed, 183 insertions(+), 209 deletions(-)
+ 24 files changed, 182 insertions(+), 209 deletions(-)
create mode 100644 Telegram/SourceFiles/qt_functions.cpp
create mode 100644 Telegram/gyp/CMakeLists.inj
@@ -715,7 +715,7 @@ index f5624a82b..b644ce29f 100644
'-no-compress',
'<(RULE_INPUT_PATH)',
diff --git a/Telegram/gyp/telegram/linux.gypi b/Telegram/gyp/telegram/linux.gypi
-index 385f2b89f..ed20a849f 100644
+index 385f2b89f..b32c45bf2 100644
--- a/Telegram/gyp/telegram/linux.gypi
+++ b/Telegram/gyp/telegram/linux.gypi
@@ -10,7 +10,7 @@
@@ -740,7 +740,7 @@ index 385f2b89f..ed20a849f 100644
'-llzma',
'-lopenal',
'-lavformat',
-@@ -34,12 +28,11 @@
+@@ -34,12 +28,10 @@
'-lswscale',
'-lavutil',
'-lopus',
@@ -753,11 +753,10 @@ index 385f2b89f..ed20a849f 100644
+ '-ltgvoip',
+ '-lxxhash',
+ '-llz4',
-+ '-lwebp',
# '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))',
],
'cflags_cc': [
-@@ -47,36 +40,23 @@
+@@ -47,36 +39,23 @@
'-Wno-maybe-uninitialized',
],
'ldflags': [
diff --git a/telegram-desktop-system-fonts.patch b/telegram-desktop-system-fonts.patch
index 5e39e1e..c4ab9ff 100644
--- a/telegram-desktop-system-fonts.patch
+++ b/telegram-desktop-system-fonts.patch
@@ -1,4 +1,4 @@
-From 65714d5659182d75ea8f67e78b0910d4aed2d56a Mon Sep 17 00:00:00 2001
+From 75ffaa10720678f6776c9da690ab78e84e2a9d4c Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Sun, 24 Jun 2018 22:59:34 +0200
Subject: [PATCH 2/3] Backported and rebased patch from Debian maintainer
diff --git a/telegram-desktop-unbundle-minizip.patch b/telegram-desktop-unbundle-minizip.patch
index 925d64e..1b5d36a 100644
--- a/telegram-desktop-unbundle-minizip.patch
+++ b/telegram-desktop-unbundle-minizip.patch
@@ -1,4 +1,4 @@
-From b0a1116bebfbe573646f28cb34e78ad93cbeacd9 Mon Sep 17 00:00:00 2001
+From 91740b4965c378195e7dd19f331f7170b98db067 Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Wed, 17 Oct 2018 17:57:59 +0200
Subject: [PATCH 3/3] Use packaged version of minizip on Fedora <= 29.
@@ -23,7 +23,7 @@ index 919eb3c8a..d7d5f6c12 100644
'<!(rpm --eval "%{_includedir}")/libtgvoip',
'<!(rpm --eval "%{_includedir}")/guidelines-support-library',
diff --git a/Telegram/gyp/telegram/linux.gypi b/Telegram/gyp/telegram/linux.gypi
-index ed20a849f..0ac159d8a 100644
+index b32c45bf2..009e54c3f 100644
--- a/Telegram/gyp/telegram/linux.gypi
+++ b/Telegram/gyp/telegram/linux.gypi
@@ -29,6 +29,7 @@
4 years, 11 months
[telegram-desktop/f31] Fixed issue with menu bar on Gnome. Rebuilt due to Qt 5.13.2 update on Rawhide.
by Vitaly Zaitsev
commit b7982fd7c15ab87ad721b91e0c8d1d2713225456
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Tue Dec 17 11:14:53 2019 +0100
Fixed issue with menu bar on Gnome. Rebuilt due to Qt 5.13.2 update on Rawhide.
telegram-desktop-build-fixes.patch | 36 ++++++++++-----------------------
telegram-desktop-system-fonts.patch | 4 ++--
telegram-desktop-unbundle-minizip.patch | 12 +++++------
telegram-desktop.spec | 18 +++++------------
4 files changed, 24 insertions(+), 46 deletions(-)
---
diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch
index 78bb616..04270a6 100644
--- a/telegram-desktop-build-fixes.patch
+++ b/telegram-desktop-build-fixes.patch
@@ -1,4 +1,4 @@
-From 6540384e5d22e87c3df80b210562cacd04f2ee64 Mon Sep 17 00:00:00 2001
+From 74a5e11947529b3a1754b4f8d8e6e6d801342baf Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Fri, 31 Mar 2017 14:29:58 +0200
Subject: [PATCH 1/3] Fixed build under Fedora using rpmbuild and mock.
@@ -6,7 +6,6 @@ Subject: [PATCH 1/3] Fixed build under Fedora using rpmbuild and mock.
---
Telegram/Resources/qrc/linux.qrc | 6 --
Telegram/Resources/qrc/telegram/telegram.qrc | 3 -
- Telegram/SourceFiles/core/launcher.cpp | 1 +
Telegram/SourceFiles/qt_functions.cpp | 97 ++++++++++++++++++++
Telegram/gyp/CMakeLists.inj | 8 ++
Telegram/gyp/PrecompiledHeader.cmake | 4 +-
@@ -24,12 +23,12 @@ Subject: [PATCH 1/3] Fixed build under Fedora using rpmbuild and mock.
Telegram/gyp/modules/qt.gypi | 87 +++++-------------
Telegram/gyp/modules/qt_moc.gypi | 5 +-
Telegram/gyp/modules/qt_rcc.gypi | 2 +-
- Telegram/gyp/telegram/linux.gypi | 36 ++------
+ Telegram/gyp/telegram/linux.gypi | 34 ++-----
Telegram/gyp/telegram/sources.txt | 2 +-
Telegram/gyp/telegram/telegram.gypi | 23 +----
lib/xdg/telegramdesktop.appdata.xml | 2 +-
lib/xdg/telegramdesktop.desktop | 5 +-
- 25 files changed, 184 insertions(+), 211 deletions(-)
+ 24 files changed, 183 insertions(+), 209 deletions(-)
create mode 100644 Telegram/SourceFiles/qt_functions.cpp
create mode 100644 Telegram/gyp/CMakeLists.inj
@@ -60,18 +59,6 @@ index 87ee77587..ae30de1a9 100644
<qresource prefix="/misc">
<file alias="default_shortcuts-custom.json">../../default_shortcuts-custom.json</file>
</qresource>
-diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp
-index 3ba28309b..0fc14253d 100644
---- a/Telegram/SourceFiles/core/launcher.cpp
-+++ b/Telegram/SourceFiles/core/launcher.cpp
-@@ -272,6 +272,7 @@ int Launcher::exec() {
- Logs::start(this); // must be started before Platform is started
- Platform::start(); // must be started before Sandbox is created
-
-+ unsetenv("QT_QPA_PLATFORMTHEME");
- auto result = executeApplication();
-
- DEBUG_LOG(("Telegram finished, result: %1").arg(result));
diff --git a/Telegram/SourceFiles/qt_functions.cpp b/Telegram/SourceFiles/qt_functions.cpp
new file mode 100644
index 000000000..a7c697f25
@@ -728,7 +715,7 @@ index f5624a82b..b644ce29f 100644
'-no-compress',
'<(RULE_INPUT_PATH)',
diff --git a/Telegram/gyp/telegram/linux.gypi b/Telegram/gyp/telegram/linux.gypi
-index 385f2b89f..9875d7bf8 100644
+index 385f2b89f..ed20a849f 100644
--- a/Telegram/gyp/telegram/linux.gypi
+++ b/Telegram/gyp/telegram/linux.gypi
@@ -10,7 +10,7 @@
@@ -740,7 +727,7 @@ index 385f2b89f..9875d7bf8 100644
'pkgconfig_libs': [
# In order to work libxkbcommon must be linked statically,
# PKGCONFIG links it like "-L/usr/local/lib -lxkbcommon"
-@@ -20,26 +20,17 @@
+@@ -20,12 +20,6 @@
],
},
'libraries': [
@@ -750,14 +737,13 @@ index 385f2b89f..9875d7bf8 100644
- '-lfcitxplatforminputcontextplugin',
- '-lhimeplatforminputcontextplugin',
- '-lnimfplatforminputcontextplugin',
-- '-llzma',
+ '-llzma',
'-lopenal',
'-lavformat',
- '-lavcodec',
- '-lswresample',
+@@ -34,12 +28,11 @@
'-lswscale',
'-lavutil',
-- '-lopus',
+ '-lopus',
- '-lva-x11',
- '-lva-drm',
- '-lva',
@@ -765,13 +751,13 @@ index 385f2b89f..9875d7bf8 100644
- '-ldrm',
'-lz',
+ '-ltgvoip',
-+ '-llzma',
+ '-lxxhash',
+ '-llz4',
++ '-lwebp',
# '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))',
],
'cflags_cc': [
-@@ -47,36 +38,23 @@
+@@ -47,36 +40,23 @@
'-Wno-maybe-uninitialized',
],
'ldflags': [
@@ -926,5 +912,5 @@ index bb2a8ea79..960eaef0f 100644
StartupWMClass=TelegramDesktop
Type=Application
--
-2.21.0
+2.23.0
diff --git a/telegram-desktop-system-fonts.patch b/telegram-desktop-system-fonts.patch
index 3dba448..5e39e1e 100644
--- a/telegram-desktop-system-fonts.patch
+++ b/telegram-desktop-system-fonts.patch
@@ -1,4 +1,4 @@
-From eb3fe9e6ad1f3a52c5f8e7c104114a48a5609aaf Mon Sep 17 00:00:00 2001
+From 65714d5659182d75ea8f67e78b0910d4aed2d56a Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Sun, 24 Jun 2018 22:59:34 +0200
Subject: [PATCH 2/3] Backported and rebased patch from Debian maintainer
@@ -40,5 +40,5 @@ index 653dbfff0..62527327f 100644
#ifdef Q_OS_WIN
// Attempt to workaround a strange font bug with Open Sans Semibold not loading.
--
-2.21.0
+2.23.0
diff --git a/telegram-desktop-unbundle-minizip.patch b/telegram-desktop-unbundle-minizip.patch
index ec4a0c9..925d64e 100644
--- a/telegram-desktop-unbundle-minizip.patch
+++ b/telegram-desktop-unbundle-minizip.patch
@@ -1,4 +1,4 @@
-From caa1132fb7f615e86088799b04e5f06b86fb8970 Mon Sep 17 00:00:00 2001
+From b0a1116bebfbe573646f28cb34e78ad93cbeacd9 Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Wed, 17 Oct 2018 17:57:59 +0200
Subject: [PATCH 3/3] Use packaged version of minizip on Fedora <= 29.
@@ -23,17 +23,17 @@ index 919eb3c8a..d7d5f6c12 100644
'<!(rpm --eval "%{_includedir}")/libtgvoip',
'<!(rpm --eval "%{_includedir}")/guidelines-support-library',
diff --git a/Telegram/gyp/telegram/linux.gypi b/Telegram/gyp/telegram/linux.gypi
-index 9875d7bf8..694adbc4d 100644
+index ed20a849f..0ac159d8a 100644
--- a/Telegram/gyp/telegram/linux.gypi
+++ b/Telegram/gyp/telegram/linux.gypi
-@@ -27,6 +27,7 @@
- '-lswscale',
+@@ -29,6 +29,7 @@
'-lavutil',
+ '-lopus',
'-lz',
+ '-lminizip',
'-ltgvoip',
- '-llzma',
'-lxxhash',
+ '-llz4',
diff --git a/Telegram/gyp/telegram/sources.txt b/Telegram/gyp/telegram/sources.txt
index e69292202..547e9861a 100644
--- a/Telegram/gyp/telegram/sources.txt
@@ -74,5 +74,5 @@ index fe4df2c2d..22649c077 100644
'<(submodules_loc)/crl/src',
],
--
-2.21.0
+2.23.0
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 4955089..125cfc9 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -29,7 +29,7 @@
Summary: Telegram Desktop official messaging app
Name: telegram-desktop
Version: 1.8.15
-Release: 1%{?dist}
+Release: 2%{?dist}
# Application and 3rd-party modules licensing:
# * S0 (Telegram Desktop) - GPLv3+ with OpenSSL exception -- main source;
@@ -216,20 +216,12 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat
%{_metainfodir}/%{name}.appdata.xml
%changelog
+* Tue Dec 17 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.8.15-2
+- Fixed issue with menu bar on Gnome.
+- Rebuilt due to Qt 5.13.2 update on Rawhide.
+
* Wed Oct 09 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.8.15-1
- Updated to version 1.8.15.
* Thu Oct 03 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.8.13-1
- Updated to version 1.8.13.
-
-* Wed Oct 02 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.8.12-1
-- Updated to version 1.8.12.
-
-* Wed Oct 02 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.8.11-1
-- Updated to version 1.8.11.
-
-* Sat Sep 28 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.8.9-1
-- Updated to version 1.8.9.
-
-* Tue Sep 10 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.8.8-1
-- Updated to version 1.8.8.
4 years, 11 months
[x264] Rebuild without bootstrap
by Leigh Scott
commit 7cadd65f58abc247a86bf1074afb3477e79ac2d5
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Dec 17 10:02:47 2019 +0000
Rebuild without bootstrap
x264.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/x264.spec b/x264.spec
index 3a6fe7d..5575727 100644
--- a/x264.spec
+++ b/x264.spec
@@ -7,7 +7,7 @@
%global gver .%{gitdate}git%{gitversion}
%global branch stable
-%global _with_bootstrap 1
+#global _with_bootstrap 1
%{?_with_bootstrap:
%global _without_gpac 1
@@ -31,7 +31,7 @@
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.%{api}
-Release: 2%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
+Release: 3%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
License: GPLv2+
URL: https://www.videolan.org/developers/x264.html
Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2
@@ -207,6 +207,9 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/
%endif
%changelog
+* Tue Dec 17 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 0.159-3.20191127git1771b55
+- Rebuild without bootstrap
+
* Tue Dec 17 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 0.159-2.20191127git1771b55_bootstrap
- DO A BOOTSTRAP BUILD
4 years, 11 months
[gpac] Mass rebuild for x264
by Leigh Scott
commit f2a703eff6a4d78c7c326959c394afa808bc1b15
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Dec 17 09:59:05 2019 +0000
Mass rebuild for x264
gpac.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/gpac.spec b/gpac.spec
index fc531c4..9da624c 100644
--- a/gpac.spec
+++ b/gpac.spec
@@ -9,7 +9,7 @@
Name: gpac
Summary: MPEG-4 multimedia framework
Version: 0.8.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv2+
URL: http://gpac.sourceforge.net/
Source0: https://github.com/gpac/gpac/archive/v%{version}/gpac-%{version}.tar.gz
@@ -174,6 +174,9 @@ rm %{buildroot}%{_includedir}/wince/errno.h
%changelog
+* Tue Dec 17 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 0.8.0-2
+- Mass rebuild for x264
+
* Tue Aug 06 2019 Sérgio Basto <sergio(a)serjux.com> - 0.8.0-1
- Update GPAC to 0.8.0
4 years, 11 months
[x264] DO A BOOTSTRAP BUILD
by Leigh Scott
commit 458809a4cd02f3ee1827bc11f47cba25438cf77a
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Dec 17 07:43:33 2019 +0000
DO A BOOTSTRAP BUILD
x264.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/x264.spec b/x264.spec
index 6875050..3a6fe7d 100644
--- a/x264.spec
+++ b/x264.spec
@@ -7,7 +7,7 @@
%global gver .%{gitdate}git%{gitversion}
%global branch stable
-#global _with_bootstrap 1
+%global _with_bootstrap 1
%{?_with_bootstrap:
%global _without_gpac 1
@@ -31,7 +31,7 @@
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.%{api}
-Release: 1%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
+Release: 2%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
License: GPLv2+
URL: https://www.videolan.org/developers/x264.html
Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2
@@ -207,6 +207,9 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/
%endif
%changelog
+* Tue Dec 17 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 0.159-2.20191127git1771b55_bootstrap
+- DO A BOOTSTRAP BUILD
+
* Mon Dec 16 2019 Sérgio Monteiro Basto <sergio(a)serjux.com> - 0.159-1.20191127git1771b55
- Update to 0.159-20191127-git1771b55 (stable branch)
4 years, 11 months
[ffmpeg] Mass rebuild for x264
by Sérgio M. Basto
commit 25a6a7419d13d0f64f4424924bc6f50f7c36b14b
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Dec 17 04:34:04 2019 +0000
Mass rebuild for x264
ffmpeg.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index e3c909b..f07a4d6 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -83,7 +83,7 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 4.2.1
-Release: 4%{?date}%{?date:git}%{?rel}%{?dist}
+Release: 5%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -427,6 +427,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Tue Dec 17 2019 Sérgio Monteiro Basto <sergio(a)serjux.com> - 4.2.1-5
+- Mass rebuild for x264
+
* Thu Nov 28 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 4.2.1-4
- Rebuilt for x265
4 years, 11 months
[x264] Update to 0.159-20191127-git1771b55 (stable branch)
by Sérgio M. Basto
commit f3694eb6d319f7ce98d6d6014ef7ae9259ce3135
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Dec 17 02:59:57 2019 +0000
Update to 0.159-20191127-git1771b55 (stable branch)
.gitignore | 1 +
sources | 2 +-
x264-nover.patch | 10 +++++-----
x264-snapshot.sh | 4 ++--
x264.spec | 15 +++++++++------
5 files changed, 18 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4a0df74..8b6d9fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ x264-0.148-20160118-5c65704.tar.bz2
/x264-0.155-20180806-0a84d98.tar.bz2
/x264-0.157-20190303-72db437.tar.bz2
/x264-0.157-20190717-34c06d1.tar.bz2
+/x264-0.159-20191127git1771b55.tar.bz2
diff --git a/sources b/sources
index bc45139..1071ce7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-95f0dcc097601cfd0f86c8e007022b2e x264-0.157-20190717-34c06d1.tar.bz2
+SHA512 (x264-0.159-20191127git1771b55.tar.bz2) = b7e78eae1dc5c0a44a4fa3748b34858b3ba6d33aa1e917ba70800c1fcf175fb023fd935aac3f8f780400636b499ba05c6cf17bfdc1e6bb522c08e2b1e0b0040a
diff --git a/x264-nover.patch b/x264-nover.patch
index f0a3806..139fd89 100644
--- a/x264-nover.patch
+++ b/x264-nover.patch
@@ -1,11 +1,11 @@
---- ./configure.orig 2015-10-21 19:24:34.933238254 +0100
-+++ ./configure 2015-10-21 19:25:53.907124640 +0100
-@@ -1236,7 +1236,7 @@ cat > x264_config.h << EOF
+--- ./configure.orig 2019-12-17 02:19:30.000000000 +0000
++++ ./configure 2019-12-17 02:31:06.483935577 +0000
+@@ -1390,7 +1390,7 @@ cat > x264_config.h << EOF
#define X264_CHROMA_FORMAT $config_chroma_format
EOF
-${SRCPATH}/version.sh >> x264_config.h
+cat ${SRCPATH}/version.h >> ${SRCPATH}/x264_config.h
- if [ "$cli_libx264" = "system" ] ; then
- if [ "$shared" = "yes" ]; then
+ if [ "$shared" = "yes" ]; then
+ CFLAGSSO="$CFLAGSSO -DX264_API_EXPORTS"
diff --git a/x264-snapshot.sh b/x264-snapshot.sh
index cbd9521..c247fc0 100755
--- a/x264-snapshot.sh
+++ b/x264-snapshot.sh
@@ -28,10 +28,10 @@ API="$(grep '#define X264_BUILD' < x264.h | sed 's/^.* \([1-9][0-9]*\).*$/\1/')"
date=$(git log -1 --format=%cd --date=short | tr -d \-)
git add version.h
git commit -m "generated version.h" version.h
-git archive --prefix="${package}-0.$API-${date}-${tag}/" --format=tar rpmfusion | bzip2 > "$pwd"/${package}-0.$API-${date}-${tag}.tar.bz2
+git archive --prefix="${package}-0.$API-${date}git${tag}/" --format=tar rpmfusion | bzip2 > "$pwd"/${package}-0.$API-${date}git${tag}.tar.bz2
popd >/dev/null
-echo \# globals for x264-0.$API-$date-$tag.tar.bz2
+echo \# globals for x264-0.$API-${date}git${tag}.tar.bz2
echo %global api $API
echo %global gitdate ${date}
echo %global gitversion ${tag}
diff --git a/x264.spec b/x264.spec
index a66337c..6875050 100644
--- a/x264.spec
+++ b/x264.spec
@@ -1,9 +1,9 @@
-# globals for x264-0.157-20190717-34c06d1.tar.bz2
-%global api 157
-%global gitdate 20190717
-%global gitversion 34c06d1
+# globals for x264-0.159-20191127git1771b55.tar.bz2
+%global api 159
+%global gitdate 20191127
+%global gitversion 1771b55
-%global snapshot %{gitdate}-%{gitversion}
+%global snapshot %{gitdate}git%{gitversion}
%global gver .%{gitdate}git%{gitversion}
%global branch stable
@@ -31,7 +31,7 @@
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.%{api}
-Release: 12%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
+Release: 1%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
License: GPLv2+
URL: https://www.videolan.org/developers/x264.html
Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2
@@ -207,6 +207,9 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/
%endif
%changelog
+* Mon Dec 16 2019 Sérgio Monteiro Basto <sergio(a)serjux.com> - 0.159-1.20191127git1771b55
+- Update to 0.159-20191127-git1771b55 (stable branch)
+
* Fri Oct 04 2019 Dominik Mierzejewski <rpm(a)greysector.net> - 0.157-12.20190717git34c06d1
- don't overwrite generic headers with 10bit on simdarch (rfbz#5071)
4 years, 11 months
[unrar/el8] Update to 5.8.5
by Leigh Scott
Summary of changes:
934fc5f... Update to 5.8.5 (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 11 months