[gstreamer1-plugins-bad-freeworld] Update to 1.12.4
by Leigh Scott
commit f0f248a890d202943dee43a2dc6c3f9870694c38
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Dec 11 11:43:51 2017 +0000
Update to 1.12.4
gstreamer1-plugins-bad-freeworld.spec | 7 +++++--
sources | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/gstreamer1-plugins-bad-freeworld.spec b/gstreamer1-plugins-bad-freeworld.spec
index 544bfc4..5810fd9 100644
--- a/gstreamer1-plugins-bad-freeworld.spec
+++ b/gstreamer1-plugins-bad-freeworld.spec
@@ -4,8 +4,8 @@
Summary: GStreamer 1.0 streaming media framework "bad" plug-ins
Name: gstreamer1-plugins-bad-freeworld
-Version: 1.12.3
-Release: 2%{?dist}
+Version: 1.12.4
+Release: 1%{?dist}
License: LGPLv2+
Group: Applications/Multimedia
URL: http://gstreamer.freedesktop.org/
@@ -93,6 +93,9 @@ rm %{buildroot}%{_libdir}/gstreamer-1.0/*.la
%changelog
+* Mon Dec 11 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1.12.4-1
+- Update to 1.12.4
+
* Mon Oct 16 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1.12.3-2
- Rebuild for ffmpeg update
diff --git a/sources b/sources
index 802be5d..d808e70 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-594a818b13fa89960b6e7c414340db38 gst-plugins-bad-1.12.3.tar.xz
+64bf16cf15edaab1c0e02c8dee7170d0 gst-plugins-bad-1.12.4.tar.xz
6 years, 11 months
[gstreamer1-libav/f27] (3 commits) ...Update to 1.12.4
by Leigh Scott
Summary of changes:
ead8c83... Rebuild for ffmpeg update (*)
419d0a8... Temporary patch for FFMpeg 3.4 APIs. (*)
b5e9596... Update to 1.12.4 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 11 months
[gstreamer1-libav] Update to 1.12.4
by Leigh Scott
commit b5e9596926bac9898051822c091db5769d4dca8e
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Dec 11 11:36:32 2017 +0000
Update to 1.12.4
gstreamer1-libav-temp-ffmpeg-3.4-api.patch | 25 -------------------------
gstreamer1-libav.spec | 11 ++++++-----
sources | 2 +-
3 files changed, 7 insertions(+), 31 deletions(-)
---
diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec
index fe27d80..df992a8 100644
--- a/gstreamer1-libav.spec
+++ b/gstreamer1-libav.spec
@@ -1,15 +1,12 @@
Name: gstreamer1-libav
-Version: 1.12.3
-Release: 3%{?dist}
+Version: 1.12.4
+Release: 1%{?dist}
Summary: GStreamer 1.0 libav-based plug-ins
Group: Applications/Multimedia
License: LGPLv2+
URL: http://gstreamer.freedesktop.org/
Source0: http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-%{version}.tar.xz
Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch
-%if 0%{?fedora} > 27 || 0%{?rhel} > 8
-Patch1: %{name}-temp-ffmpeg-3.4-api.patch
-%endif
BuildRequires: gstreamer1-devel >= %{version}
BuildRequires: gstreamer1-plugins-base-devel >= %{version}
BuildRequires: orc-devel
@@ -75,6 +72,10 @@ rm %{buildroot}%{_libdir}/gstreamer-1.0/libgst*.la
%changelog
+* Mon Dec 11 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1.12.4-1
+- Update to 1.12.4
+- Remove patch for FFMpeg 3.4 APIs (fixed in ffmpeg-3.4.1)
+
* Sat Nov 18 2017 Simone Caronni <negativo17(a)gmail.com> - 1.12.3-3
- Temporary patch for FFMpeg 3.4 APIs.
diff --git a/sources b/sources
index e247d09..caf32b2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-81f62d58279108698b321209fc6696ce gst-libav-1.12.3.tar.xz
+8a851bf2e475e90a3fdac9506e3e4dbd gst-libav-1.12.4.tar.xz
6 years, 11 months
[ffmpeg] Backport patch for arm neon
by Nicolas Chauvet
commit 6ada76fbe3a59785257bee738022e7fd9695ce0d
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Dec 11 10:42:03 2017 +0100
Backport patch for arm neon
ffmpeg.spec | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 7857002..42a3bf6 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -71,7 +71,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 3.4.1
-Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
+Release: 2%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -79,6 +79,8 @@ Source0: ffmpeg-%{?branch}%{date}.tar.bz2
%else
Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
%endif
+#Backport patch for arm neon
+Patch0: 0001-arm-Fix-SIGBUS-on-ARM-when-compiled-with-binutils-2..patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%{?_with_cuda:BuildRequires: cuda-driver-dev-8-0 cuda-misc-headers-8-0 cuda-drivers-devel%{_isa}}
%{?_with_libnpp:BuildRequires: cuda-cudart-dev-8-0 cuda-misc-headers-8-0 cuda-npp-dev-8-0}
@@ -293,6 +295,8 @@ echo "git-snapshot-%{?branch}%{date}-RPMFusion" > VERSION
%else
%setup -q -n ffmpeg-%{version}
%endif
+# backport patch for arm neon
+%patch0 -p1
# fix -O3 -g in host_cflags
sed -i "s|check_host_cflags -O3|check_host_cflags %{optflags}|" configure
mkdir -p _doc/examples
@@ -404,6 +408,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Mon Dec 11 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.4.1-2
+- Backport patch for arm neon rfbz#4727
+
* Mon Dec 11 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.4.1-1
- Updated to 3.4.1
6 years, 11 months
[ffmpeg] Add backported patch for recent binutils on arm neon
by Nicolas Chauvet
commit c82c7ec123a1670606098c8d59fd02a00bdebf0a
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Dec 11 10:39:33 2017 +0100
Add backported patch for recent binutils on arm neon
...BUS-on-ARM-when-compiled-with-binutils-2..patch | 108 +++++++++++++++++++++
1 file changed, 108 insertions(+)
---
diff --git a/0001-arm-Fix-SIGBUS-on-ARM-when-compiled-with-binutils-2..patch b/0001-arm-Fix-SIGBUS-on-ARM-when-compiled-with-binutils-2..patch
new file mode 100644
index 0000000..4440cb2
--- /dev/null
+++ b/0001-arm-Fix-SIGBUS-on-ARM-when-compiled-with-binutils-2..patch
@@ -0,0 +1,108 @@
+From 9dde6ab06c48f9447cd16f39bee33569cddb7be4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin(a)martin.st>
+Date: Thu, 31 Aug 2017 12:06:44 +0300
+Subject: [PATCH] arm: Fix SIGBUS on ARM when compiled with binutils 2.29
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In binutils 2.29, the behavior of the ADR instruction changed so that 1 is
+added to the address of a Thumb function (previously nothing was added). This
+allows the loaded address to be passed to a BLX instruction and the correct
+mode change will occur.
+
+See: https://sourceware.org/bugzilla/show_bug.cgi?id=21458
+
+By using adr with a label that isn't annotated as a thumb function,
+we avoid the new behaviour in binutils 2.29 and get the same behaviour
+as in prior releases, and as in other assemblers (ms armasm.exe,
+clang's built in assembler) - an idea that Janne Grunau came up with.
+
+Signed-off-by: Martin Storsjö <martin(a)martin.st>
+---
+ libavcodec/arm/h264idct_neon.S | 20 ++++++++++++--------
+ 1 file changed, 12 insertions(+), 8 deletions(-)
+
+diff --git a/libavcodec/arm/h264idct_neon.S b/libavcodec/arm/h264idct_neon.S
+index f588f3e744..b078cf25f9 100644
+--- a/libavcodec/arm/h264idct_neon.S
++++ b/libavcodec/arm/h264idct_neon.S
+@@ -21,6 +21,7 @@
+ #include "libavutil/arm/asm.S"
+
+ function ff_h264_idct_add_neon, export=1
++h264_idct_add_neon_nothumb:
+ vld1.64 {d0-d3}, [r1,:128]
+ vmov.i16 q15, #0
+
+@@ -73,6 +74,7 @@ function ff_h264_idct_add_neon, export=1
+ endfunc
+
+ function ff_h264_idct_dc_add_neon, export=1
++h264_idct_dc_add_neon_nothumb:
+ mov r3, #0
+ vld1.16 {d2[],d3[]}, [r1,:16]
+ strh r3, [r1]
+@@ -113,8 +115,8 @@ function ff_h264_idct_add16_neon, export=1
+ movne lr, #0
+ cmp lr, #0
+ ite ne
+- adrne lr, X(ff_h264_idct_dc_add_neon) + CONFIG_THUMB
+- adreq lr, X(ff_h264_idct_add_neon) + CONFIG_THUMB
++ adrne lr, h264_idct_dc_add_neon_nothumb + CONFIG_THUMB
++ adreq lr, h264_idct_add_neon_nothumb + CONFIG_THUMB
+ blx lr
+ 2: subs ip, ip, #1
+ add r1, r1, #32
+@@ -138,8 +140,8 @@ function ff_h264_idct_add16intra_neon, export=1
+ cmp r8, #0
+ ldrsh r8, [r1]
+ iteet ne
+- adrne lr, X(ff_h264_idct_add_neon) + CONFIG_THUMB
+- adreq lr, X(ff_h264_idct_dc_add_neon) + CONFIG_THUMB
++ adrne lr, h264_idct_add_neon_nothumb + CONFIG_THUMB
++ adreq lr, h264_idct_dc_add_neon_nothumb + CONFIG_THUMB
+ cmpeq r8, #0
+ blxne lr
+ subs ip, ip, #1
+@@ -166,8 +168,8 @@ function ff_h264_idct_add8_neon, export=1
+ cmp r8, #0
+ ldrsh r8, [r1]
+ iteet ne
+- adrne lr, X(ff_h264_idct_add_neon) + CONFIG_THUMB
+- adreq lr, X(ff_h264_idct_dc_add_neon) + CONFIG_THUMB
++ adrne lr, h264_idct_add_neon_nothumb + CONFIG_THUMB
++ adreq lr, h264_idct_dc_add_neon_nothumb + CONFIG_THUMB
+ cmpeq r8, #0
+ blxne lr
+ add r12, r12, #1
+@@ -267,6 +269,7 @@ endfunc
+ .endm
+
+ function ff_h264_idct8_add_neon, export=1
++h264_idct8_add_neon_nothumb:
+ vmov.i16 q3, #0
+ vld1.16 {q8-q9}, [r1,:128]
+ vst1.16 {q3}, [r1,:128]!
+@@ -328,6 +331,7 @@ function ff_h264_idct8_add_neon, export=1
+ endfunc
+
+ function ff_h264_idct8_dc_add_neon, export=1
++h264_idct8_dc_add_neon_nothumb:
+ mov r3, #0
+ vld1.16 {d30[],d31[]},[r1,:16]
+ strh r3, [r1]
+@@ -388,8 +392,8 @@ function ff_h264_idct8_add4_neon, export=1
+ movne lr, #0
+ cmp lr, #0
+ ite ne
+- adrne lr, X(ff_h264_idct8_dc_add_neon) + CONFIG_THUMB
+- adreq lr, X(ff_h264_idct8_add_neon) + CONFIG_THUMB
++ adrne lr, h264_idct8_dc_add_neon_nothumb + CONFIG_THUMB
++ adreq lr, h264_idct8_add_neon_nothumb + CONFIG_THUMB
+ blx lr
+ 2: subs r12, r12, #4
+ add r1, r1, #128
+--
+2.13.6
+
6 years, 11 months
[ffmpeg] Updated to 3.4.1
by Leigh Scott
commit cf91e90421f8d22f9f91212f8c859aff03b4389f
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Dec 11 09:23:35 2017 +0000
Updated to 3.4.1
.gitignore | 1 +
ffmpeg.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f656912..55e149d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
ffmpeg-*.tar.xz
+ffmpeg-*.rpm
diff --git a/ffmpeg.spec b/ffmpeg.spec
index e91d7b7..7857002 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -70,8 +70,8 @@
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
-Version: 3.4
-Release: 6%{?date}%{?date:git}%{?rel}%{?dist}
+Version: 3.4.1
+Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -404,6 +404,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Mon Dec 11 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.4.1-1
+- Updated to 3.4.1
+
* Tue Nov 28 2017 Dominik Mierzejewski <rpm(a)greysector.net> - 3.4-6
- enable support for vid.stab (rfbz#4713)
- rebuild against new libmfx (rhbz#1471768)
diff --git a/sources b/sources
index ee7e29f..c1004bb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c64ba7247bb91e516f6a5789348fd5b5 ffmpeg-3.4.tar.xz
+726212db1b8a7eff6c25a2bc2e6fa75c ffmpeg-3.4.1.tar.xz
6 years, 11 months
[telegram-desktop/f26] Updated to version 1.2.0.
by Vitaly Zaitsev
commit a3f393e54b90221e03979a9223052ccd731ff0dc
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Sun Dec 10 22:25:55 2017 +0100
Updated to version 1.2.0.
.gitignore | 1 +
sources | 3 +-
telegram-desktop-build-fixes.patch | 188 +++++++++++++++++-------------
telegram-desktop-cve-2016-10351.patch | 30 -----
telegram-desktop-ffmpeg-build-fixes.patch | 35 ------
telegram-desktop-gccw.patch | 96 ---------------
telegram-desktop-gccw2.patch | 47 --------
telegram-desktop-ime-fix.patch | 31 -----
telegram-desktop-openssl11-fix.patch | 171 ---------------------------
telegram-desktop.spec | 68 +++++------
10 files changed, 142 insertions(+), 528 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 77f53bf..2277030 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,4 @@
/tdesktop-1.1.19.tar.gz
/tdesktop-1.1.22.tar.gz
/tdesktop-1.1.23.tar.gz
+/tdesktop-1.2.0.tar.gz
diff --git a/sources b/sources
index 3615c06..06c123e 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-ba90e749953f2ac1c013011601a58598 GSL-c5851a8.tar.gz
0373c28165f86474f8abdce278320c1a gyp-a478c1a.tar.gz
-713f9da983ac028a5fae7d538b122c64 tdesktop-1.1.23.tar.gz
+b6381dfdd5603064322b3b38ef4179fa tdesktop-1.2.0.tar.gz
diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch
index c58bb92..f6fc15c 100644
--- a/telegram-desktop-build-fixes.patch
+++ b/telegram-desktop-build-fixes.patch
@@ -1,4 +1,4 @@
-From dba8b962c805af477ceee699aa1c05143aa19d43 Mon Sep 17 00:00:00 2001
+From 8fe6c649fe8267be83d573aafb303266855220cd 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] Fixed build under Fedora using rpmbuild and mock.
@@ -11,16 +11,16 @@ Subject: [PATCH] Fixed build under Fedora using rpmbuild and mock.
Telegram/SourceFiles/ui/text/text_block.cpp | 2 +-
Telegram/SourceFiles/ui/twidget.cpp | 4 +-
Telegram/gyp/PrecompiledHeader.cmake | 4 +-
- Telegram/gyp/Telegram.gyp | 22 ++-----
- Telegram/gyp/qt.gypi | 80 +++++++-----------------
+ Telegram/gyp/Telegram.gyp | 27 ++-------
+ Telegram/gyp/qt.gypi | 81 +++++++------------------
+ Telegram/gyp/qt_moc.gypi | 3 +-
Telegram/gyp/qt_rcc.gypi | 2 +-
- Telegram/gyp/settings_linux.gypi | 8 +--
- Telegram/gyp/telegram_linux.gypi | 60 +++++-------------
+ Telegram/gyp/settings_linux.gypi | 5 --
+ Telegram/gyp/telegram_linux.gypi | 85 ++++++--------------------
Telegram/gyp/telegram_sources.txt | 8 +--
- Telegram/gyp/utils.gyp | 4 +-
lib/xdg/telegramdesktop.appdata.xml | 2 +-
lib/xdg/telegramdesktop.desktop | 6 +-
- 16 files changed, 166 insertions(+), 157 deletions(-)
+ 16 files changed, 168 insertions(+), 182 deletions(-)
create mode 100644 Telegram/SourceFiles/qt_functions.cpp
diff --git a/Telegram/SourceFiles/main.cpp b/Telegram/SourceFiles/main.cpp
@@ -173,10 +173,10 @@ index b975c7a8..f2f876b3 100644
-Q_IMPORT_PLUGIN(QHimePlatformInputContextPlugin)
#endif // Q_OS_WIN | Q_OS_MAC | Q_OS_LINUX
diff --git a/Telegram/SourceFiles/ui/text/text.cpp b/Telegram/SourceFiles/ui/text/text.cpp
-index d18a8ea5..2c58287e 100644
+index 710277fe..5eb4465d 100644
--- a/Telegram/SourceFiles/ui/text/text.cpp
+++ b/Telegram/SourceFiles/ui/text/text.cpp
-@@ -1689,11 +1689,11 @@ private:
+@@ -1707,11 +1707,11 @@ private:
if (item == -1)
return;
@@ -205,10 +205,10 @@ index f89644e1..35230cfc 100644
layout.createLine();
diff --git a/Telegram/SourceFiles/ui/twidget.cpp b/Telegram/SourceFiles/ui/twidget.cpp
-index e9848ef2..dcee47ee 100644
+index a78af59d..feee450e 100644
--- a/Telegram/SourceFiles/ui/twidget.cpp
+++ b/Telegram/SourceFiles/ui/twidget.cpp
-@@ -191,9 +191,9 @@ void sendSynteticMouseEvent(QWidget *widget, QEvent::Type type, Qt::MouseButton
+@@ -234,9 +234,9 @@ void sendSynteticMouseEvent(QWidget *widget, QEvent::Type type, Qt::MouseButton
, button
, QGuiApplication::mouseButtons() | button
, QGuiApplication::keyboardModifiers()
@@ -243,7 +243,7 @@ index 5d6830e9..c3f08d3f 100644
IMPLICIT_DEPENDS CXX "${_pch_header}"
COMMENT "Precompiling ${_name} for ${_target} (C++)")
diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp
-index 0d1f38aa..f275c105 100644
+index 31480945..ffd5d6a6 100644
--- a/Telegram/gyp/Telegram.gyp
+++ b/Telegram/gyp/Telegram.gyp
@@ -31,7 +31,6 @@
@@ -254,7 +254,16 @@ index 0d1f38aa..f275c105 100644
'sp_media_key_tap_loc': '<(submodules_loc)/SPMediaKeyTap',
'emoji_suggestions_loc': '<(submodules_loc)/emoji_suggestions',
'style_files': [
-@@ -79,33 +78,24 @@
+@@ -67,8 +66,6 @@
+ 'includes': [
+ 'common_executable.gypi',
+ 'telegram_qrc.gypi',
+- 'telegram_win.gypi',
+- 'telegram_mac.gypi',
+ 'telegram_linux.gypi',
+ 'qt.gypi',
+ 'qt_moc.gypi',
+@@ -81,33 +78,22 @@
'codegen.gyp:codegen_lang',
'codegen.gyp:codegen_numbers',
'codegen.gyp:codegen_style',
@@ -281,21 +290,29 @@ index 0d1f38aa..f275c105 100644
'<(SHARED_INTERMEDIATE_DIR)',
- '<(libs_loc)/breakpad/src',
- '<(libs_loc)/lzma/C',
-- '<(libs_loc)/libexif-0.6.20',
-- '<(libs_loc)/zlib-1.2.8',
+- '<(libs_loc)/zlib',
- '<(libs_loc)/ffmpeg',
- '<(libs_loc)/openal-soft/include',
- '<(libs_loc)/opus/include',
+- '<(libs_loc)/range-v3/include',
- '<(minizip_loc)',
- '<(sp_media_key_tap_loc)',
+- '<(sp_media_key_tap_loc)',
'<(emoji_suggestions_loc)',
- '<(submodules_loc)/GSL/include',
+- '<(submodules_loc)/GSL/include',
- '<(submodules_loc)/variant/include',
],
'sources': [
'<@(qrc_files)',
+@@ -124,7 +110,6 @@
+ 'CUSTOM_API_ID',
+ ],
+ 'dependencies': [
+- 'utils.gyp:Packer',
+ ],
+ }],
+ ],
diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi
-index 6032d066..e98f0804 100644
+index dea127a3..bea656f1 100644
--- a/Telegram/gyp/qt.gypi
+++ b/Telegram/gyp/qt.gypi
@@ -27,25 +27,21 @@
@@ -326,7 +343,7 @@ index 6032d066..e98f0804 100644
}]
]
},
-@@ -85,32 +81,12 @@
+@@ -85,32 +81,13 @@
],
}],
[ 'build_linux', {
@@ -343,7 +360,7 @@ index 6032d066..e98f0804 100644
- 'qgenericbearer',
- 'qnmbearer',
'<@(qt_libs)',
-- 'Qt5DBus',
+ 'Qt5DBus',
'Qt5Core',
- 'qtpcre',
- 'Xi',
@@ -362,7 +379,7 @@ index 6032d066..e98f0804 100644
],
}],
],
-@@ -135,16 +111,11 @@
+@@ -135,16 +112,11 @@
'qt_loc': '<(qt_loc_unix)',
}],
],
@@ -375,17 +392,18 @@ index 6032d066..e98f0804 100644
- 'linux_path_xkbcommon%': '/usr/local',
- 'linux_lib_ssl%': '/usr/local/ssl/lib/libssl.a',
- 'linux_lib_crypto%': '/usr/local/ssl/lib/libcrypto.a',
-- 'linux_lib_icu%': '/usr/lib/libicutu.a /usr/lib/libicui18n.a /usr/lib/libicuuc.a /usr/lib/libicudata.a',
+- 'linux_lib_icu%': 'libicutu.a libicui18n.a libicuuc.a libicudata.a',
},
'configurations': {
-@@ -193,20 +164,20 @@
+@@ -193,21 +165,21 @@
},
'include_dirs': [
- '<(qt_loc)/include',
- '<(qt_loc)/include/QtCore',
- '<(qt_loc)/include/QtGui',
+- '<(qt_loc)/include/QtDBus',
- '<(qt_loc)/include/QtCore/<(qt_version)',
- '<(qt_loc)/include/QtGui/<(qt_version)',
- '<(qt_loc)/include/QtCore/<(qt_version)/QtCore',
@@ -393,6 +411,7 @@ index 6032d066..e98f0804 100644
+ '<!(rpm --eval "%{_includedir}")/qt5',
+ '<!(rpm --eval "%{_includedir}")/qt5/QtCore',
+ '<!(rpm --eval "%{_includedir}")/qt5/QtGui',
++ '<!(rpm --eval "%{_includedir}")/qt5/QtDBus',
+ '<!(rpm --eval "%{_includedir}")/qt5/QtCore/<(qt_version)',
+ '<!(rpm --eval "%{_includedir}")/qt5/QtGui/<(qt_version)',
+ '<!(rpm --eval "%{_includedir}")/qt5/QtCore/<(qt_version)/QtCore',
@@ -412,21 +431,25 @@ index 6032d066..e98f0804 100644
],
'defines': [
'QT_WIDGETS_LIB',
-@@ -217,28 +188,19 @@
+@@ -218,32 +190,21 @@
'conditions': [
[ 'build_linux', {
+ 'dependencies': [
+- '<(DEPTH)/linux_glibc_wraps.gyp:linux_glibc_wraps',
+ ],
'library_dirs': [
- '<(qt_loc)/plugins/platforminputcontexts',
+ '<(qt_loc)/qt5/plugins/platforminputcontexts',
],
'libraries': [
+- '<(PRODUCT_DIR)/obj.target/liblinux_glibc_wraps.a',
- '<(linux_path_xkbcommon)/lib/libxkbcommon.a',
'<@(qt_libs_release)',
- '<(linux_lib_ssl)',
- '<(linux_lib_crypto)',
- '<!@(python -c "for s in \'<(linux_lib_icu)\'.split(\' \'): print(s)")',
- '-lxcb',
-+ 'crypto',
++ '-lcrypto',
'-lX11',
- '-lX11-xcb',
- '-ldbus-1',
@@ -442,9 +465,13 @@ index 6032d066..e98f0804 100644
'ldflags': [
- '-static-libstdc++',
'-pthread',
- '-g',
'-rdynamic',
-@@ -260,7 +222,7 @@
+ ],
+diff --git a/Telegram/gyp/qt_moc.gypi b/Telegram/gyp/qt_moc.gypi
+index fae668dc..7c62da2f 100644
+--- a/Telegram/gyp/qt_moc.gypi
++++ b/Telegram/gyp/qt_moc.gypi
+@@ -25,11 +25,12 @@
'<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/moc/moc_<(RULE_INPUT_ROOT).cpp',
],
'action': [
@@ -453,6 +480,11 @@ index 6032d066..e98f0804 100644
# Silence "Note: No relevant classes found. No output generated."
'--no-notes',
+
++ '<!@(rpm --eval "%{optflags}" | grep -Po "[-]([IDU]\s*\S*|E)")',
+ '<!@(python -c "for s in \'<@(_defines)\'.split(\' \'): print(\'-D\' + s)")',
+ # '<!@(python -c "for s in \'<@(_include_dirs)\'.split(\' \'): print(\'-I\' + s)")',
+ '<(RULE_INPUT_PATH)',
diff --git a/Telegram/gyp/qt_rcc.gypi b/Telegram/gyp/qt_rcc.gypi
index eebc6967..3efa7d05 100644
--- a/Telegram/gyp/qt_rcc.gypi
@@ -467,22 +499,21 @@ index eebc6967..3efa7d05 100644
'-no-compress',
'<(RULE_INPUT_PATH)',
diff --git a/Telegram/gyp/settings_linux.gypi b/Telegram/gyp/settings_linux.gypi
-index fde88dcd..7d603220 100644
+index b93bace4..1a637e93 100644
--- a/Telegram/gyp/settings_linux.gypi
+++ b/Telegram/gyp/settings_linux.gypi
-@@ -22,11 +22,6 @@
+@@ -22,10 +22,6 @@
[ 'build_linux', {
'variables': {
'linux_common_flags': [
- '-pipe',
-- '-g',
- '-Wall',
- '-Werror',
- '-W',
'-fPIC',
'-Wno-unused-variable',
'-Wno-unused-parameter',
-@@ -61,7 +56,6 @@
+@@ -60,7 +56,6 @@
],
'defines': [
'_REENTRANT',
@@ -490,30 +521,21 @@ index fde88dcd..7d603220 100644
'QT_PLUGIN',
],
'cflags_c': [
-@@ -72,6 +66,8 @@
- '<@(linux_common_flags)',
- '-std=gnu++14',
- ],
-+ 'ldflags': [
-+ ],
- 'configurations': {
- 'Debug': {
- },
diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi
-index 2c464928..3566d002 100644
+index f6918c22..5307a518 100644
--- a/Telegram/gyp/telegram_linux.gypi
+++ b/Telegram/gyp/telegram_linux.gypi
-@@ -27,73 +27,45 @@
+@@ -28,99 +28,54 @@
# QApplication() -> createPlatformIntegration -> QXcbIntegrationPlugin::create
#'xkbcommon',
],
- 'linux_path_ffmpeg%': '/usr/local',
- 'linux_path_openal%': '/usr/local',
-- 'linux_path_libexif_lib%': '<(libs_loc)/libexif-0.6.20/libexif/.libs',
- 'linux_path_va%': '/usr/local',
- 'linux_path_vdpau%': '/usr/local',
-- 'linux_path_breakpad%': '<(libs_loc)/breakpad',
+- 'linux_path_breakpad%': '/usr/local',
- 'linux_path_opus_include%': '<(libs_loc)/opus/include',
+- 'linux_path_range%': '/usr/local',
},
'include_dirs': [
- '/usr/local/include',
@@ -521,17 +543,19 @@ index 2c464928..3566d002 100644
- '<(linux_path_openal)/include',
- '<(linux_path_breakpad)/include/breakpad',
- '<(linux_path_opus_include)',
+- '<(linux_path_range)/include',
+ '<!(rpm --eval "%{_includedir}")',
+ '<!(rpm --eval "%{_includedir}")/ffmpeg',
+ '<!(rpm --eval "%{_includedir}")/minizip',
+ '<!(rpm --eval "%{_includedir}")/opus',
+ '<!(rpm --eval "%{_includedir}")/libtgvoip',
++ '<!(rpm --eval "%{_includedir}")/guidelines-support-library',
++ '<!(rpm --eval "%{_includedir}")/range-v3',
],
'library_dirs': [
- '/usr/local/lib',
- '<(linux_path_ffmpeg)/lib',
- '<(linux_path_openal)/lib',
-- '<(linux_path_libexif_lib)',
- '<(linux_path_va)/lib',
- '<(linux_path_vdpau)/lib',
- '<(linux_path_breakpad)/lib',
@@ -569,35 +593,63 @@ index 2c464928..3566d002 100644
# '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))',
],
'cflags_cc': [
- '<!(pkg-config 2> /dev/null --cflags appindicator-0.1)',
-- '<!(pkg-config 2> /dev/null --cflags gtk+-2.0)',
-- '<!(pkg-config 2> /dev/null --cflags glib-2.0)',
-+ '<!(pkg-config 2> /dev/null --cflags gtk+-3.0)',
- '<!(pkg-config 2> /dev/null --cflags dee-1.0)',
+ '-Wno-strict-overflow',
+ ],
+ 'ldflags': [
+- '-Wl,-wrap,aligned_alloc',
+- '-Wl,-wrap,secure_getenv',
+- '-Wl,-wrap,clock_gettime',
+- '-Wl,--no-as-needed,-lrt',
++ '-Wl,-z,relro -specs=/usr/lib/rpm/redhat/redhat-hardened-ld',
],
'configurations': {
'Release': {
- 'cflags': [
+ 'cflags_c': [
- '-Ofast',
- '-flto',
'-fno-strict-aliasing',
],
'cflags_cc': [
- '-Ofast',
- '-flto',
'-fno-strict-aliasing',
],
'ldflags': [
- '-Ofast',
-- '-flto',
],
},
},
+ 'conditions': [
+- [ '"<!(uname -p)" == "x86_64"', {
+- # 32 bit version can't be linked with debug info or LTO,
+- # virtual memory exhausted :(
+- 'cflags_c': [ '-g' ],
+- 'cflags_cc': [ '-g' ],
+- 'ldflags': [ '-g' ],
+- 'configurations': {
+- 'Release': {
+- 'cflags_c': [ '-flto' ],
+- 'cflags_cc': [ '-flto' ],
+- 'ldflags': [ '-flto' ],
+- },
+- },
+- }, {
+- 'ldflags': [
+- '-Wl,-wrap,__divmoddi4',
+- ],
+- }], ['not_need_gtk!="True"', {
++ ['not_need_gtk!="True"', {
+ 'cflags_cc': [
+ '<!(pkg-config 2> /dev/null --cflags appindicator-0.1)',
+- '<!(pkg-config 2> /dev/null --cflags gtk+-2.0)',
+- '<!(pkg-config 2> /dev/null --cflags glib-2.0)',
++ '<!(pkg-config 2> /dev/null --cflags gtk+-3.0)',
+ '<!(pkg-config 2> /dev/null --cflags dee-1.0)',
+ ],
+ }]
diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt
-index ef66965f..854e8706 100644
+index e90614da..b2c9395d 100644
--- a/Telegram/gyp/telegram_sources.txt
+++ b/Telegram/gyp/telegram_sources.txt
-@@ -599,13 +599,7 @@
+@@ -681,13 +681,7 @@
<(emoji_suggestions_loc)/emoji_suggestions.h
platforms: !win
@@ -612,28 +664,6 @@ index ef66965f..854e8706 100644
platforms: mac
<(sp_media_key_tap_loc)/SPMediaKeyTap.m
-diff --git a/Telegram/gyp/utils.gyp b/Telegram/gyp/utils.gyp
-index 209c7370..27ce77f5 100644
---- a/Telegram/gyp/utils.gyp
-+++ b/Telegram/gyp/utils.gyp
-@@ -134,7 +134,7 @@
- '<(libs_loc)/openssl-xcode/include'
- ],
- 'library_dirs': [
-- '/usr/local/lib',
-+ '<!(rpm --eval "%{_libdir}")',
- ],
- }]
- ],
-@@ -156,7 +156,7 @@
- '<(libs_loc)/openssl-xcode/include'
- ],
- 'library_dirs': [
-- '/usr/local/lib',
-+ '<!(rpm --eval "%{_libdir}")',
- ],
- }]
- ],
diff --git a/lib/xdg/telegramdesktop.appdata.xml b/lib/xdg/telegramdesktop.appdata.xml
index 7bcf8d83..4508c01c 100644
--- a/lib/xdg/telegramdesktop.appdata.xml
@@ -665,5 +695,5 @@ index 0a806951..550b9f78 100644
StartupWMClass=TelegramDesktop
Type=Application
--
-2.13.5
+2.14.3
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index df08ec6..9e5efde 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -5,38 +5,31 @@
%global commit1 a478c1ab51ea3e04e79791ac3d1dad01b3f57434
%global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
-# Git revision of GSL...
-%global commit2 c5851a8161938798c5594a66420cb814fea92711
-%global shortcommit2 %(c=%{commit2}; echo ${c:0:7})
+# Decrease debuginfo verbosity to reduce memory consumption...
+%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
Summary: Telegram is a new era of messaging
Name: telegram-desktop
-Version: 1.1.23
-Release: 4%{?dist}
+Version: 1.2.0
+Release: 1%{?dist}
# Application and 3rd-party modules licensing:
# * S0 (Telegram Desktop) - GPLv3+ with OpenSSL exception -- main source;
# * S1 (GYP) - BSD -- build-time dependency;
-# * S2 (GSL) - MIT -- build-time dependency;
# * P0 (qt_functions.cpp) - LGPLv3 -- build-time dependency.
-License: GPLv3+ and LGPLv3 and BSD and MIT
+License: GPLv3+ and LGPLv3 and BSD
Group: Applications/Internet
URL: https://github.com/telegramdesktop/%{appname}
+
+# Warning! Builds on i686 may fail due to technical limitations of this
+# architecture: https://github.com/telegramdesktop/tdesktop/issues/4101
ExclusiveArch: i686 x86_64
Source0: %{url}/archive/v%{version}.tar.gz#/%{appname}-%{version}.tar.gz
Source1: https://chromium.googlesource.com/external/gyp/+archive/%{commit1}.tar.gz...
-Source2: https://github.com/Microsoft/GSL/archive/%{commit2}.tar.gz#/GSL-%{shortco...
Patch0: %{name}-build-fixes.patch
-Patch101: %{name}-ffmpeg-build-fixes.patch
-Patch102: %{name}-cve-2016-10351.patch
-Patch103: %{name}-openssl11-fix.patch
-Patch104: %{name}-ime-fix.patch
-Patch105: %{name}-gccw.patch
-Patch106: %{name}-gccw2.patch
-
Requires: qt5-qtimageformats%{?_isa}
Requires: hicolor-icon-theme
Requires: gtk3%{?_isa}
@@ -53,6 +46,7 @@ BuildRequires: cmake
BuildRequires: gcc
# Development packages for Telegram Desktop...
+BuildRequires: guidelines-support-library-devel
BuildRequires: libappindicator-devel
BuildRequires: mapbox-variant-devel
BuildRequires: ffmpeg-devel >= 3.1
@@ -60,6 +54,7 @@ BuildRequires: openal-soft-devel
BuildRequires: qt5-qtbase-devel
BuildRequires: libtgvoip-devel
BuildRequires: libstdc++-devel
+BuildRequires: range-v3-devel
BuildRequires: openssl-devel
BuildRequires: minizip-devel
BuildRequires: opus-devel
@@ -90,13 +85,6 @@ pushd Telegram/ThirdParty/gyp
patch -p1 -i ../../../Telegram/Patches/gyp.diff
popd
-# Unpacking GSL...
-pushd Telegram/ThirdParty
- rm -rf GSL
- tar -xf %{SOURCE2}
- mv GSL-%{commit2} GSL
-popd
-
%build
# Generating cmake script using GYP...
pushd Telegram/gyp
@@ -138,30 +126,15 @@ install -m 0644 -p lib/xdg/telegramdesktop.appdata.xml "%{buildroot}%{_datadir}/
appstream-util validate-relax --nonet "%{buildroot}%{_datadir}/appdata/%{name}.appdata.xml"
%post
-%if (0%{?fedora} && 0%{?fedora} <= 23) || (0%{?rhel} && 0%{?rhel} <= 7)
-/bin/touch --no-create %{_datadir}/mime/packages &>/dev/null || :
-%endif
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-%if (0%{?fedora} && 0%{?fedora} <= 24) || (0%{?rhel} && 0%{?rhel} <= 7)
-/usr/bin/update-desktop-database &> /dev/null || :
-%endif
%postun
if [ $1 -eq 0 ] ; then
- %if (0%{?fedora} && 0%{?fedora} <= 23) || (0%{?rhel} && 0%{?rhel} <= 7)
- /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
- %endif
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
-%if (0%{?fedora} && 0%{?fedora} <= 24) || (0%{?rhel} && 0%{?rhel} <= 7)
-/usr/bin/update-desktop-database &> /dev/null || :
-%endif
%posttrans
-%if (0%{?fedora} && 0%{?fedora} <= 23) || (0%{?rhel} && 0%{?rhel} <= 7)
-/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
-%endif
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
@@ -174,6 +147,27 @@ fi
%{_datadir}/appdata/%{name}.appdata.xml
%changelog
+* Sun Dec 10 2017 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.2.0-1
+- Updated to 1.2.0.
+
+* Sat Dec 09 2017 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.1.29-1
+- Updated to 1.1.29 (alpha).
+
+* Sat Dec 09 2017 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.1.28-1
+- Updated to 1.1.28 (alpha).
+
+* Wed Dec 06 2017 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.1.27-1
+- Updated to 1.1.27 (alpha).
+
+* Sat Dec 02 2017 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.1.26-1
+- Updated to 1.1.26 (alpha).
+
+* Fri Dec 01 2017 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.1.25-1
+- Updated to 1.1.25 (alpha).
+
+* Thu Nov 30 2017 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.1.24-1
+- Updated to 1.1.24 (alpha).
+
* Sat Nov 18 2017 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.1.23-4
- Rebuild against libtgvoip 1.0.1.
6 years, 11 months