[gstreamer1-plugins-ugly] Remove locale files
by Leigh Scott
commit 04f838669f4acb1cb51e3e1a75e497d5dc484df6
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Thu May 11 19:38:11 2017 +0100
Remove locale files
gstreamer1-plugins-ugly.spec | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/gstreamer1-plugins-ugly.spec b/gstreamer1-plugins-ugly.spec
index ccfac06..7ff551a 100644
--- a/gstreamer1-plugins-ugly.spec
+++ b/gstreamer1-plugins-ugly.spec
@@ -18,6 +18,9 @@ BuildRequires: twolame-devel
BuildRequires: x264-devel >= 0.0.0-0.28
BuildRequires: opencore-amr-devel
+# Provided locale files
+Requires: gstreamer1-plugins-ugly-free%{?_isa} = %{version}
+
%description
GStreamer is a streaming media framework, based on graphs of elements which
operate on media data.
@@ -66,11 +69,11 @@ be shipped in gstreamer-plugins-good because:
%install
%make_install V=1
-%find_lang gst-plugins-ugly-1.0
rm %{buildroot}%{_libdir}/gstreamer-1.0/*.la
+rm -rf %{buildroot}%{_datadir}/locale/
-%files -f gst-plugins-ugly-1.0.lang
+%files
%doc AUTHORS README REQUIREMENTS
%license COPYING
%{_datadir}/gstreamer-1.0
@@ -95,8 +98,8 @@ rm %{buildroot}%{_libdir}/gstreamer-1.0/*.la
%changelog
* Thu May 11 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1.12.0-1
- Update to 1.12.0
-- remove a52dec, cdio, dvdread and xingmux plugins,
- moved to gstreamer1-plugins-ugly-free package.
+- Add requires gstreamer1-plugins-ugly-free
+- Remove locale files
* Tue Apr 18 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1.11.90-1
- Update to 1.11.90
7 years
[gstreamer1-plugins-ugly] Update to 1.12.0
by Leigh Scott
commit 66c1a3599a8f3d7e29367294ec3ecb6babaf9f03
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Thu May 11 19:18:36 2017 +0100
Update to 1.12.0
gstreamer1-plugins-ugly.spec | 20 +++++++++++---------
sources | 2 +-
2 files changed, 12 insertions(+), 10 deletions(-)
---
diff --git a/gstreamer1-plugins-ugly.spec b/gstreamer1-plugins-ugly.spec
index 6a607a7..ccfac06 100644
--- a/gstreamer1-plugins-ugly.spec
+++ b/gstreamer1-plugins-ugly.spec
@@ -1,6 +1,6 @@
Summary: GStreamer 1.0 streaming media framework "ugly" plug-ins
Name: gstreamer1-plugins-ugly
-Version: 1.11.90
+Version: 1.12.0
Release: 1%{?dist}
License: LGPLv2+
Group: Applications/Multimedia
@@ -10,13 +10,10 @@ Source0: http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugin
BuildRequires: gstreamer1-devel >= %{version}
BuildRequires: gstreamer1-plugins-base-devel >= %{version}
BuildRequires: gettext-devel gtk-doc
-BuildRequires: a52dec-devel >= 0.7.3
-BuildRequires: libdvdread-devel >= 0.9.0
BuildRequires: lame-devel >= 3.89
BuildRequires: libid3tag-devel >= 0.15.0
BuildRequires: mpeg2dec-devel >= 0.4.0
BuildRequires: orc-devel >= 0.4.5
-BuildRequires: libcdio-devel >= 0.82
BuildRequires: twolame-devel
BuildRequires: x264-devel >= 0.0.0-0.28
BuildRequires: opencore-amr-devel
@@ -59,7 +56,11 @@ be shipped in gstreamer-plugins-good because:
--with-package-origin="http://rpmfusion.org/" \
--enable-debug \
--enable-gtk-doc \
- --disable-mpg123
+ --disable-mpg123 \
+ --disable-cdio \
+ --disable-dvdread \
+ --disable-a52dec \
+ --disable-xingmux
%make_build V=1
@@ -78,13 +79,9 @@ rm %{buildroot}%{_libdir}/gstreamer-1.0/*.la
%{_libdir}/gstreamer-1.0/libgstdvdlpcmdec.so
%{_libdir}/gstreamer-1.0/libgstdvdsub.so
%{_libdir}/gstreamer-1.0/libgstrealmedia.so
-%{_libdir}/gstreamer-1.0/libgstxingmux.so
# Plugins with external dependencies
-%{_libdir}/gstreamer-1.0/libgsta52dec.so
%{_libdir}/gstreamer-1.0/libgstamrnb.so
%{_libdir}/gstreamer-1.0/libgstamrwbdec.so
-%{_libdir}/gstreamer-1.0/libgstcdio.so
-%{_libdir}/gstreamer-1.0/libgstdvdread.so
%{_libdir}/gstreamer-1.0/libgstlame.so
%{_libdir}/gstreamer-1.0/libgstmpeg2dec.so
%{_libdir}/gstreamer-1.0/libgsttwolame.so
@@ -96,6 +93,11 @@ rm %{buildroot}%{_libdir}/gstreamer-1.0/*.la
%changelog
+* Thu May 11 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1.12.0-1
+- Update to 1.12.0
+- remove a52dec, cdio, dvdread and xingmux plugins,
+ moved to gstreamer1-plugins-ugly-free package.
+
* Tue Apr 18 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1.11.90-1
- Update to 1.11.90
- Upstream renamed libgstrmdemux.so to libgstrealmedia.so
diff --git a/sources b/sources
index 408ffa1..1813439 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ee77bed21e4dbe35e220675b91deca8e gst-plugins-ugly-1.11.90.tar.xz
+30e815834819a4890eb1ef6ef67cf68d gst-plugins-ugly-1.12.0.tar.xz
7 years
[telegram-desktop/el7] Updated to 1.0.37.
by Vitaly Zaitsev
commit 1670aabe19a818d1c643d268ff7fac0eb589f36e
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Thu May 11 20:29:03 2017 +0500
Updated to 1.0.37.
.gitignore | 3 +++
fix_build_under_fedora.patch | 46 +++++++++++++++++++++------------------
fix_libtgvoip.patch | 34 +++++++++++++++++++++++++++++
sources | 5 +++--
telegram-desktop.spec | 51 ++++++++++++++++++++++++++++++++++++--------
5 files changed, 107 insertions(+), 32 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7516b8e..f079a32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,6 @@
/tdesktop-1.0.33.tar.gz
/tdesktop-1.0.34.tar.gz
/tdesktop-1.0.35.tar.gz
+/gyp-a478c1a.tar.gz
+/libtgvoip-61eeaba.tar.gz
+/tdesktop-1.0.37.tar.gz
diff --git a/fix_build_under_fedora.patch b/fix_build_under_fedora.patch
index 11f1a55..e1363aa 100644
--- a/fix_build_under_fedora.patch
+++ b/fix_build_under_fedora.patch
@@ -1,4 +1,4 @@
-From c477e7a08c753247b78d28fdf7bda64690411a09 Mon Sep 17 00:00:00 2001
+From 243f9116a93f1a176626b84a57018616847be004 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,17 +11,17 @@ 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 | 16 ++---
+ Telegram/gyp/Telegram.gyp | 18 ++----
Telegram/gyp/qt.gypi | 80 +++++++-----------------
Telegram/gyp/qt_rcc.gypi | 2 +-
Telegram/gyp/refresh.sh | 6 +-
Telegram/gyp/settings_linux.gypi | 14 ++++-
- Telegram/gyp/telegram_linux.gypi | 79 ++++++++++++------------
+ Telegram/gyp/telegram_linux.gypi | 80 ++++++++++++------------
Telegram/gyp/telegram_sources.txt | 8 +--
Telegram/gyp/utils.gyp | 4 +-
lib/xdg/telegramdesktop.appdata.xml | 2 +-
lib/xdg/telegramdesktop.desktop | 6 +-
- 17 files changed, 197 insertions(+), 145 deletions(-)
+ 17 files changed, 198 insertions(+), 147 deletions(-)
create mode 100644 Telegram/SourceFiles/qt_functions.cpp
diff --git a/Telegram/SourceFiles/main.cpp b/Telegram/SourceFiles/main.cpp
@@ -200,7 +200,7 @@ index f89644e..35230cf 100644
layout.createLine();
diff --git a/Telegram/SourceFiles/ui/twidget.cpp b/Telegram/SourceFiles/ui/twidget.cpp
-index 5162ac9..0acc77b 100644
+index 04fad32..688cd8e 100644
--- a/Telegram/SourceFiles/ui/twidget.cpp
+++ b/Telegram/SourceFiles/ui/twidget.cpp
@@ -187,9 +187,9 @@ void sendSynteticMouseEvent(QWidget *widget, QEvent::Type type, Qt::MouseButton
@@ -238,22 +238,24 @@ index 5d6830e..c3f08d3 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 5b7ead4..91a6eb6 100644
+index 80160d1..1c0ab91 100644
--- a/Telegram/gyp/Telegram.gyp
+++ b/Telegram/gyp/Telegram.gyp
-@@ -32,7 +32,6 @@
+@@ -31,7 +31,6 @@
+ 'src_loc': '../SourceFiles',
'res_loc': '../Resources',
- 'submodules_loc': '../../third_party',
- 'third_party_loc': '../ThirdParty',
-- 'minizip_loc': '<(third_party_loc)/minizip',
- 'sp_media_key_tap_loc': '<(third_party_loc)/SPMediaKeyTap',
+ 'submodules_loc': '../ThirdParty',
+- 'minizip_loc': '<(submodules_loc)/minizip',
+ 'sp_media_key_tap_loc': '<(submodules_loc)/SPMediaKeyTap',
'style_files': [
'<(res_loc)/colors.palette',
-@@ -82,20 +81,17 @@
+@@ -83,23 +82,18 @@
],
'defines': [
- 'AL_LIBTYPE_STATIC',
+- 'AL_ALEXT_PROTOTYPES',
+ 'TGVOIP_USE_CXX11_LIB',
- '<!@(python -c "for s in \'<(build_defines)\'.split(\',\'): print(s)")',
+ '__STDC_FORMAT_MACROS',
+ 'TDESKTOP_DISABLE_AUTOUPDATE',
@@ -272,12 +274,13 @@ index 5b7ead4..91a6eb6 100644
- '<(libs_loc)/zlib-1.2.8',
- '<(libs_loc)/ffmpeg',
- '<(libs_loc)/openal-soft/include',
+- '<(libs_loc)/opus/include',
- '<(minizip_loc)',
'<(sp_media_key_tap_loc)',
'<(submodules_loc)/GSL/include',
'<(submodules_loc)/variant/include',
diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi
-index c12e450..f244fa6 100644
+index 81c13a1..899af14 100644
--- a/Telegram/gyp/qt.gypi
+++ b/Telegram/gyp/qt.gypi
@@ -27,25 +27,21 @@
@@ -449,15 +452,15 @@ index eebc696..3efa7d0 100644
'-no-compress',
'<(RULE_INPUT_PATH)',
diff --git a/Telegram/gyp/refresh.sh b/Telegram/gyp/refresh.sh
-index 87f16da..cfd93d8 100755
+index cd96456..63aa7ab 100755
--- a/Telegram/gyp/refresh.sh
+++ b/Telegram/gyp/refresh.sh
-@@ -9,11 +9,11 @@ MySystem=`uname -s`
+@@ -17,11 +17,11 @@ MySystem=`uname -s`
cd $FullScriptPath
if [ "$MySystem" == "Linux" ]; then
-- ../../../Libraries/gyp/gyp --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp --format=cmake
-+ ../../third_party/gyp/gyp --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp --format=cmake
+- ../../../Libraries/gyp/gyp --depth=. --generator-output=../.. -Goutput_dir=out -Dofficial_build_target=$BuildTarget Telegram.gyp --format=cmake
++ ../ThirdParty/gyp/gyp --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp --format=cmake
cd ../../out/Debug
- ../../../Libraries/cmake-3.6.2/bin/cmake .
+ cmake .
@@ -519,10 +522,10 @@ index fde88dc..f45fc09 100644
'Debug': {
},
diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi
-index b42e744..d89d9cd 100644
+index b42e744..29a26e7 100644
--- a/Telegram/gyp/telegram_linux.gypi
+++ b/Telegram/gyp/telegram_linux.gypi
-@@ -27,70 +27,69 @@
+@@ -27,70 +27,70 @@
# QApplication() -> createPlatformIntegration -> QXcbIntegrationPlugin::create
#'xkbcommon',
],
@@ -541,6 +544,7 @@ index b42e744..d89d9cd 100644
+ '<!(rpm --eval "%{_includedir}")',
+ '<!(rpm --eval "%{_includedir}")/ffmpeg',
+ '<!(rpm --eval "%{_includedir}")/minizip',
++ '<!(rpm --eval "%{_includedir}")/opus',
],
'library_dirs': [
- '/usr/local/lib',
@@ -633,10 +637,10 @@ index b42e744..d89d9cd 100644
},
},
diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt
-index a08b77b..e9cdfdd 100644
+index c970f98..fab0268 100644
--- a/Telegram/gyp/telegram_sources.txt
+++ b/Telegram/gyp/telegram_sources.txt
-@@ -535,13 +535,7 @@
+@@ -553,13 +553,7 @@
<(src_loc)/structs.h
platforms: !win
diff --git a/fix_libtgvoip.patch b/fix_libtgvoip.patch
new file mode 100644
index 0000000..66df290
--- /dev/null
+++ b/fix_libtgvoip.patch
@@ -0,0 +1,34 @@
+From 43b4f14ac18ba18d97e1b08d61034aa9058bc977 Mon Sep 17 00:00:00 2001
+From: Vitaly Zaitsev <vitaly(a)easycoding.org>
+Date: Wed, 10 May 2017 13:19:54 +0200
+Subject: [PATCH] Fixed build of libtgvoip under Fedora as shared library.
+
+---
+ libtgvoip.gyp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Telegram/ThirdParty/libtgvoip/libtgvoip.gyp b/Telegram/ThirdParty/libtgvoip/libtgvoip.gyp
+index 1ec9a62..ab2e577 100644
+--- a/Telegram/ThirdParty/libtgvoip/libtgvoip.gyp
++++ b/Telegram/ThirdParty/libtgvoip/libtgvoip.gyp
+@@ -4,7 +4,7 @@
+ 'targets': [
+ {
+ 'target_name': 'libtgvoip',
+- 'type': 'static_library',
++ 'type': 'shared_library',
+ 'dependencies': [],
+ 'defines': [
+ 'WEBRTC_APM_DEBUG_DUMP=0',
+@@ -16,7 +16,7 @@
+ },
+ 'include_dirs': [
+ '<(tgvoip_src_loc)/webrtc_dsp',
+- '<(DEPTH)/../../../Libraries/opus/include',
++ '<!(rpm --eval "%{_includedir}/opus")',
+ ],
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+--
+2.9.3
+
diff --git a/sources b/sources
index 9e2dacf..1792322 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,5 @@
1ac9a7ddda444ccaa53f26887dd07700 GSL-3819df6.tar.gz
-48687b677c5724aa513278672d6e674b gyp-a7055b3.tar.gz
-8fbb8870d6b8fb84e5715023f938dc99 tdesktop-1.0.35.tar.gz
+0373c28165f86474f8abdce278320c1a gyp-a478c1a.tar.gz
+1f87e0ebf3dc76efd0ef924e0de695ff libtgvoip-61eeaba.tar.gz
+1aa67accc4026b083e7e104ab52668da tdesktop-1.0.37.tar.gz
8cb2c878f46705b0295f77e9f1a8890c variant-916139a.tar.gz
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index c8460e1..12fd9bf 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -1,8 +1,9 @@
# Telegram Desktop's constants...
%global appname tdesktop
+%global voipver 0.4.1
# Git revision of GYP...
-%global commit1 a7055b3989c1074adca03b4b4829e7f0e57f6efd
+%global commit1 a478c1ab51ea3e04e79791ac3d1dad01b3f57434
%global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
# Git revision of GSL...
@@ -13,9 +14,13 @@
%global commit3 916139a2e51e125816efce6e19d428385601273f
%global shortcommit3 %(c=%{commit3}; echo ${c:0:7})
+# Git revision of libtgvoip...
+%global commit4 61eeaba937943ee5fea7a4d310413c4261587fa9
+%global shortcommit4 %(c=%{commit4}; echo ${c:0:7})
+
Summary: Telegram is a new era of messaging
Name: telegram-desktop
-Version: 1.0.35
+Version: 1.0.37
Release: 1%{?dist}
# Application and 3rd-party modules licensing:
@@ -23,6 +28,7 @@ Release: 1%{?dist}
# * S1 (GYP) - BSD -- build-time dependency;
# * S2 (GSL) - MIT -- build-time dependency;
# * S3 (Variant) - BSD -- build-time dependency;
+# * S4 (libtgvoip) - Public Domain -- shared library;
# * P0 (qt_functions.cpp) - LGPLv3 -- build-time dependency.
License: GPLv3+ and LGPLv3 and BSD and MIT
Group: Applications/Internet
@@ -33,8 +39,10 @@ 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...
Source3: https://github.com/mapbox/variant/archive/%{commit3}.tar.gz#/variant-%{sh...
+Source4: https://github.com/telegramdesktop/libtgvoip/archive/%{commit4}.tar.gz#/l...
Patch0: fix_build_under_fedora.patch
+Patch1: fix_libtgvoip.patch
Requires: hicolor-icon-theme
Requires: qt5-qtimageformats%{?_isa}
@@ -103,29 +111,40 @@ personal or business messaging needs.
%prep
# Unpacking Telegram Desktop source archive...
-%autosetup -n %{appname}-%{version} -p1
+%setup -qn %{appname}-%{version}
# Unpacking GYP...
-mkdir -p third_party/gyp
-pushd third_party/gyp
+mkdir -p Telegram/ThirdParty/gyp
+pushd Telegram/ThirdParty/gyp
tar -xf %{SOURCE1}
- patch -p1 -i ../../Telegram/Patches/gyp.diff
+ patch -p1 -i ../../../Telegram/Patches/gyp.diff
popd
# Unpacking GSL...
-pushd third_party
+pushd Telegram/ThirdParty
rm -rf GSL
tar -xf %{SOURCE2}
mv GSL-%{commit2} GSL
popd
# Unpacking Variant...
-pushd third_party
+pushd Telegram/ThirdParty
rm -rf variant
tar -xf %{SOURCE3}
mv variant-%{commit3} variant
popd
+# Unpacking libtgvoip...
+pushd Telegram/ThirdParty
+ rm -rf libtgvoip
+ tar -xf %{SOURCE4}
+ mv libtgvoip-%{commit4} libtgvoip
+popd
+
+# Applying patches with different fixes...
+%patch0 -p1
+%patch1 -p1
+
%build
# Exporting correct build flags...
export CFLAGS="%{optflags}"
@@ -148,6 +167,11 @@ mkdir -p "%{buildroot}%{_bindir}"
chrpath -d out/Release/Telegram
install -m 755 out/Release/Telegram "%{buildroot}%{_bindir}/%{name}"
+# Installing shared libraries...
+mkdir -p "%{buildroot}%{_libdir}"
+install -m 755 out/Release/lib.target/libtgvoip.so "%{buildroot}%{_libdir}/libtgvoip.so.%{voipver}"
+ln -s libtgvoip.so.%{voipver} %{buildroot}%{_libdir}/libtgvoip.so
+
# Installing desktop shortcut...
mv lib/xdg/telegramdesktop.desktop lib/xdg/%{name}.desktop
desktop-file-install --dir="%{buildroot}%{_datadir}/applications" lib/xdg/%{name}.desktop
@@ -171,6 +195,7 @@ install -m 644 -p lib/xdg/telegramdesktop.appdata.xml "%{buildroot}%{_datadir}/a
appstream-util validate-relax --nonet "%{buildroot}%{_datadir}/appdata/%{name}.appdata.xml"
%post
+/sbin/ldconfig
%if 0%{?fedora} <= 23 || 0%{?rhel} == 7
/bin/touch --no-create %{_datadir}/mime/packages &>/dev/null || :
%endif
@@ -180,6 +205,7 @@ appstream-util validate-relax --nonet "%{buildroot}%{_datadir}/appdata/%{name}.a
%endif
%postun
+/sbin/ldconfig
if [ $1 -eq 0 ] ; then
%if 0%{?fedora} <= 23 || 0%{?rhel} == 7
/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
@@ -199,14 +225,21 @@ fi
%files
%doc README.md changelog.txt
-%license LICENSE
+%license LICENSE Telegram/ThirdParty/libtgvoip/UNLICENSE
%{_bindir}/%{name}
+%{_libdir}/libtgvoip.*
%{_datadir}/applications/%{name}.desktop
%{_datadir}/kde4/services/tg.protocol
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_datadir}/appdata/%{name}.appdata.xml
%changelog
+* Wed May 10 2017 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.0.37-1
+- Updated to 1.0.37 (alpha).
+
+* Wed May 10 2017 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.0.36-1
+- Updated to 1.0.36 (alpha).
+
* Sun Apr 30 2017 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.0.35-1
- Updated to 1.0.35 (alpha).
7 years