[telegram-desktop/el7] Updated to version 1.1.15.
by Vitaly Zaitsev
commit 3ae000cabcfbeec79285101b447b37e637689212
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Mon Jul 24 03:05:58 2017 +0500
Updated to version 1.1.15.
.gitignore | 2 ++
fix_build_under_fedora.patch | 2 +-
fix_libtgvoip.patch | 4 ++--
sources | 4 ++--
telegram-desktop.spec | 11 +++++++----
5 files changed, 14 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8c672ff..0c27351 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,5 @@
/libtgvoip-de33700.tar.gz
/tdesktop-1.1.13.tar.gz
/tdesktop-1.1.14.tar.gz
+/libtgvoip-e42287b.tar.gz
+/tdesktop-1.1.15.tar.gz
diff --git a/fix_build_under_fedora.patch b/fix_build_under_fedora.patch
index 1ae0a56..b77d918 100644
--- a/fix_build_under_fedora.patch
+++ b/fix_build_under_fedora.patch
@@ -1,4 +1,4 @@
-From d962adafed6e0b840b507e6c0e7537d5e993dc2f Mon Sep 17 00:00:00 2001
+From 77590c03db287b241e41cfcd0af600b3071621a5 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.
diff --git a/fix_libtgvoip.patch b/fix_libtgvoip.patch
index 9283fa3..97252d7 100644
--- a/fix_libtgvoip.patch
+++ b/fix_libtgvoip.patch
@@ -1,4 +1,4 @@
-From 28e80ce3b5f63ce9e5bf41136e5b2413e50d1ea4 Mon Sep 17 00:00:00 2001
+From 71f383ae61493f921a4fcfe9d4ca49a278b23909 Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Thu, 6 Jul 2017 17:27:01 +0200
Subject: [PATCH] Fixed build of libtgvoip under Fedora as shared library.
@@ -36,5 +36,5 @@ index 52fbea1..e3dc413 100644
'direct_dependent_settings': {
'include_dirs': [
--
-2.9.4
+2.13.3
diff --git a/sources b/sources
index 493bc18..a47c1f9 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
ba90e749953f2ac1c013011601a58598 GSL-c5851a8.tar.gz
0373c28165f86474f8abdce278320c1a gyp-a478c1a.tar.gz
-64d96402e97bc7bd11e36668d4e129e9 libtgvoip-de33700.tar.gz
-cec5c09cd3f4d36ed33ee74023a6a325 tdesktop-1.1.14.tar.gz
+c54cfa5050035c2f981aec6731829926 libtgvoip-e42287b.tar.gz
+31ac72b577c2fe533b949501ce74eb44 tdesktop-1.1.15.tar.gz
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index d8b3a16..27a374e 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -1,6 +1,6 @@
# Telegram Desktop's constants...
%global appname tdesktop
-%global voipver 0.4.1
+%global voipver 1.0
# Git revision of GYP...
%global commit1 a478c1ab51ea3e04e79791ac3d1dad01b3f57434
@@ -11,12 +11,12 @@
%global shortcommit2 %(c=%{commit2}; echo ${c:0:7})
# Git revision of libtgvoip...
-%global commit3 de33700312e3676a520b5a79d51e953fcf23cf51
+%global commit3 e42287b6f4a520b7ddabc6cdcff205f4e7e216ec
%global shortcommit3 %(c=%{commit3}; echo ${c:0:7})
Summary: Telegram is a new era of messaging
Name: telegram-desktop
-Version: 1.1.14
+Version: 1.1.15
Release: 1%{?dist}
# Application and 3rd-party modules licensing:
@@ -145,7 +145,7 @@ install -m 0755 -p out/Release/Telegram "%{buildroot}%{_bindir}/%{name}"
# Installing shared libraries...
mkdir -p "%{buildroot}%{_libdir}"
install -m 0755 -p out/Release/lib.target/libtgvoip.so.%{voipver} "%{buildroot}%{_libdir}/libtgvoip.so.%{voipver}"
-ln -s libtgvoip.so.%{voipver} "%{buildroot}%{_libdir}/libtgvoip.so.0"
+ln -s libtgvoip.so.%{voipver} "%{buildroot}%{_libdir}/libtgvoip.so.1"
ln -s libtgvoip.so.%{voipver} "%{buildroot}%{_libdir}/libtgvoip.so"
# Installing desktop shortcut...
@@ -210,6 +210,9 @@ fi
%{_datadir}/appdata/%{name}.appdata.xml
%changelog
+* Sun Jul 23 2017 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.1.15-1
+- Updated to 1.1.15.
+
* Wed Jul 19 2017 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.1.14-1
- Updated to 1.1.14 (alpha).
6 years, 10 months
[xorg-x11-drv-nvidia/el7] Fix non-glvnd build
by Leigh Scott
commit 0ee3df7539c29faac35c3397662bffa1b5e371dd
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sun Jul 23 12:37:35 2017 +0100
Fix non-glvnd build
xorg-x11-drv-nvidia.spec | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index ddd1992..f04d234 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -159,11 +159,11 @@ which is generated during the build of main package.
%package libs
Summary: Libraries for %{name}
Requires: libvdpau%{?_isa} >= 0.5
+%if 0%{?fedora} >= 25
Requires: libglvnd-egl%{?_isa} >= 0.2
Requires: libglvnd-gles%{?_isa} >= 0.2
Requires: libglvnd-glx%{?_isa} >= 0.2
Requires: libglvnd-opengl%{?_isa} >= 0.2
-%if 0%{?fedora} >= 25
Requires: egl-wayland%{?_isa} >= 1.0.0
Requires: mesa-libEGL%{?_isa} >= 13.0.3-3
Requires: mesa-libGL%{?_isa} >= 13.0.3-3
@@ -227,6 +227,16 @@ cp -a \
libnvidia-ptxjitcompiler.so.%{version} \
%{buildroot}%{_libdir}/
+%if 0%{?rhel} || 0%{?fedora} == 24
+mkdir -p %{buildroot}%{_nvidia_libdir}
+cp -a \
+ libEGL.so.%{version} \
+ libGL.so.%{version} \
+ libGLdispatch.so.0 \
+ %{buildroot}%{_nvidia_libdir}/
+ldconfig -vn %{buildroot}%{_nvidia_libdir}/
+%endif
+
# Use the correct TLS implementation for x86_64/i686, already ok on ARM
# OpenCL is only available on x86_64/i686.
%ifarch x86_64 i686
@@ -259,7 +269,7 @@ ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_indirect.so.0
ln -s libGLX_nvidia.so.%{version} %{buildroot}%{_libdir}/libGLX_indirect.so.0
# ld.so.conf.d file
install -m 0755 -d %{buildroot}%{_sysconfdir}/ld.so.conf.d/
-echo -e "%{_nvidia_libdir} \n%{_glvnd_libdir} \n" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
+echo -e "%{_nvidia_libdir} \n" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
%endif
# X DDX driver and GLX extension
@@ -342,7 +352,7 @@ install -pm 0644 %{SOURCE5} %{buildroot}%{_datadir}/X11/xorg.conf.d
sed -i -e 's|@LIBDIR@|%{_libdir}|g' %{buildroot}%{_datadir}/X11/xorg.conf.d/99-nvidia.conf
touch -r %{SOURCE4} %{buildroot}%{_datadir}/X11/xorg.conf.d/99-nvidia.conf
# back to non-glvnd version for vulkan
-#sed -i -e 's|libGLX_nvidia.so.0|libGL.so.1|' %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json
+sed -i -e 's|libGLX_nvidia.so.0|libGL.so.1|' %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json
touch -r nvidia_icd.json %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json
%endif
#Ghost Xorg nvidia.conf files
@@ -526,6 +536,11 @@ fi ||:
%files libs
%if 0%{?rhel} || 0%{?fedora} == 24
%config %{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
+%{_nvidia_libdir}/libEGL.so.1
+%{_nvidia_libdir}/libEGL.so.%{version}
+%{_nvidia_libdir}/libGL.so.1
+%{_nvidia_libdir}/libGL.so.%{version}
+%{_nvidia_libdir}/libGLdispatch.so.0
%endif
%ifarch x86_64 i686
%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json
6 years, 10 months
[xorg-x11-drv-nvidia] Fix non-glvnd build
by Leigh Scott
commit 6fd243564174086929b2ed9176406632a29b77ee
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sun Jul 23 12:37:35 2017 +0100
Fix non-glvnd build
xorg-x11-drv-nvidia.spec | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index ddd1992..f04d234 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -159,11 +159,11 @@ which is generated during the build of main package.
%package libs
Summary: Libraries for %{name}
Requires: libvdpau%{?_isa} >= 0.5
+%if 0%{?fedora} >= 25
Requires: libglvnd-egl%{?_isa} >= 0.2
Requires: libglvnd-gles%{?_isa} >= 0.2
Requires: libglvnd-glx%{?_isa} >= 0.2
Requires: libglvnd-opengl%{?_isa} >= 0.2
-%if 0%{?fedora} >= 25
Requires: egl-wayland%{?_isa} >= 1.0.0
Requires: mesa-libEGL%{?_isa} >= 13.0.3-3
Requires: mesa-libGL%{?_isa} >= 13.0.3-3
@@ -227,6 +227,16 @@ cp -a \
libnvidia-ptxjitcompiler.so.%{version} \
%{buildroot}%{_libdir}/
+%if 0%{?rhel} || 0%{?fedora} == 24
+mkdir -p %{buildroot}%{_nvidia_libdir}
+cp -a \
+ libEGL.so.%{version} \
+ libGL.so.%{version} \
+ libGLdispatch.so.0 \
+ %{buildroot}%{_nvidia_libdir}/
+ldconfig -vn %{buildroot}%{_nvidia_libdir}/
+%endif
+
# Use the correct TLS implementation for x86_64/i686, already ok on ARM
# OpenCL is only available on x86_64/i686.
%ifarch x86_64 i686
@@ -259,7 +269,7 @@ ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_indirect.so.0
ln -s libGLX_nvidia.so.%{version} %{buildroot}%{_libdir}/libGLX_indirect.so.0
# ld.so.conf.d file
install -m 0755 -d %{buildroot}%{_sysconfdir}/ld.so.conf.d/
-echo -e "%{_nvidia_libdir} \n%{_glvnd_libdir} \n" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
+echo -e "%{_nvidia_libdir} \n" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
%endif
# X DDX driver and GLX extension
@@ -342,7 +352,7 @@ install -pm 0644 %{SOURCE5} %{buildroot}%{_datadir}/X11/xorg.conf.d
sed -i -e 's|@LIBDIR@|%{_libdir}|g' %{buildroot}%{_datadir}/X11/xorg.conf.d/99-nvidia.conf
touch -r %{SOURCE4} %{buildroot}%{_datadir}/X11/xorg.conf.d/99-nvidia.conf
# back to non-glvnd version for vulkan
-#sed -i -e 's|libGLX_nvidia.so.0|libGL.so.1|' %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json
+sed -i -e 's|libGLX_nvidia.so.0|libGL.so.1|' %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json
touch -r nvidia_icd.json %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json
%endif
#Ghost Xorg nvidia.conf files
@@ -526,6 +536,11 @@ fi ||:
%files libs
%if 0%{?rhel} || 0%{?fedora} == 24
%config %{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
+%{_nvidia_libdir}/libEGL.so.1
+%{_nvidia_libdir}/libEGL.so.%{version}
+%{_nvidia_libdir}/libGL.so.1
+%{_nvidia_libdir}/libGL.so.%{version}
+%{_nvidia_libdir}/libGLdispatch.so.0
%endif
%ifarch x86_64 i686
%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json
6 years, 10 months
[xorg-x11-drv-nvidia/el7] fix up vulkan as there is no libGL.so.1 currently installad on epel7
by Leigh Scott
commit 37851596a2fda5e3d3b2691411709b7e62d73de5
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Jul 22 17:36:51 2017 +0100
fix up vulkan as there is no libGL.so.1 currently installad on epel7
xorg-x11-drv-nvidia.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index ef89af7..ddd1992 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -342,7 +342,7 @@ install -pm 0644 %{SOURCE5} %{buildroot}%{_datadir}/X11/xorg.conf.d
sed -i -e 's|@LIBDIR@|%{_libdir}|g' %{buildroot}%{_datadir}/X11/xorg.conf.d/99-nvidia.conf
touch -r %{SOURCE4} %{buildroot}%{_datadir}/X11/xorg.conf.d/99-nvidia.conf
# back to non-glvnd version for vulkan
-sed -i -e 's|libGLX_nvidia.so.0|libGL.so.1|' %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json
+#sed -i -e 's|libGLX_nvidia.so.0|libGL.so.1|' %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json
touch -r nvidia_icd.json %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json
%endif
#Ghost Xorg nvidia.conf files
6 years, 10 months
[xorg-x11-drv-nvidia/el7] fix up glvnd support for epel7
by Leigh Scott
commit f1742f14c7aa68ea0acf154a1d65244390aa6bb1
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Jul 22 17:11:28 2017 +0100
fix up glvnd support for epel7
xorg-x11-drv-nvidia.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 4ebedf2..ef89af7 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -159,11 +159,11 @@ which is generated during the build of main package.
%package libs
Summary: Libraries for %{name}
Requires: libvdpau%{?_isa} >= 0.5
-%if 0%{?fedora} >= 25
Requires: libglvnd-egl%{?_isa} >= 0.2
Requires: libglvnd-gles%{?_isa} >= 0.2
Requires: libglvnd-glx%{?_isa} >= 0.2
Requires: libglvnd-opengl%{?_isa} >= 0.2
+%if 0%{?fedora} >= 25
Requires: egl-wayland%{?_isa} >= 1.0.0
Requires: mesa-libEGL%{?_isa} >= 13.0.3-3
Requires: mesa-libGL%{?_isa} >= 13.0.3-3
@@ -259,7 +259,7 @@ ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_indirect.so.0
ln -s libGLX_nvidia.so.%{version} %{buildroot}%{_libdir}/libGLX_indirect.so.0
# ld.so.conf.d file
install -m 0755 -d %{buildroot}%{_sysconfdir}/ld.so.conf.d/
-echo -e "%{_nvidia_libdir} \n" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
+echo -e "%{_nvidia_libdir} \n%{_glvnd_libdir} \n" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
%endif
# X DDX driver and GLX extension
6 years, 10 months
[xorg-x11-drv-nvidia] fix up vulkan as there is no libGL.so.1 currently installad on epel7
by Leigh Scott
commit 3ff1f90f294eab7eebe64624edce1cb8885c6346
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Jul 22 17:36:51 2017 +0100
fix up vulkan as there is no libGL.so.1 currently installad on epel7
xorg-x11-drv-nvidia.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index ef89af7..ddd1992 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -342,7 +342,7 @@ install -pm 0644 %{SOURCE5} %{buildroot}%{_datadir}/X11/xorg.conf.d
sed -i -e 's|@LIBDIR@|%{_libdir}|g' %{buildroot}%{_datadir}/X11/xorg.conf.d/99-nvidia.conf
touch -r %{SOURCE4} %{buildroot}%{_datadir}/X11/xorg.conf.d/99-nvidia.conf
# back to non-glvnd version for vulkan
-sed -i -e 's|libGLX_nvidia.so.0|libGL.so.1|' %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json
+#sed -i -e 's|libGLX_nvidia.so.0|libGL.so.1|' %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json
touch -r nvidia_icd.json %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json
%endif
#Ghost Xorg nvidia.conf files
6 years, 10 months
[xorg-x11-drv-nvidia] fix up glvnd support for epel7
by Leigh Scott
commit 55491dfc7af341fdc6ad2eced8ebb81785c019d1
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Jul 22 17:11:28 2017 +0100
fix up glvnd support for epel7
xorg-x11-drv-nvidia.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 4ebedf2..ef89af7 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -159,11 +159,11 @@ which is generated during the build of main package.
%package libs
Summary: Libraries for %{name}
Requires: libvdpau%{?_isa} >= 0.5
-%if 0%{?fedora} >= 25
Requires: libglvnd-egl%{?_isa} >= 0.2
Requires: libglvnd-gles%{?_isa} >= 0.2
Requires: libglvnd-glx%{?_isa} >= 0.2
Requires: libglvnd-opengl%{?_isa} >= 0.2
+%if 0%{?fedora} >= 25
Requires: egl-wayland%{?_isa} >= 1.0.0
Requires: mesa-libEGL%{?_isa} >= 13.0.3-3
Requires: mesa-libGL%{?_isa} >= 13.0.3-3
@@ -259,7 +259,7 @@ ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_indirect.so.0
ln -s libGLX_nvidia.so.%{version} %{buildroot}%{_libdir}/libGLX_indirect.so.0
# ld.so.conf.d file
install -m 0755 -d %{buildroot}%{_sysconfdir}/ld.so.conf.d/
-echo -e "%{_nvidia_libdir} \n" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
+echo -e "%{_nvidia_libdir} \n%{_glvnd_libdir} \n" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
%endif
# X DDX driver and GLX extension
6 years, 10 months
