[mixxx/f28] New upstream release 2.1.4
by Uwe Klotz
commit 25c91cb1b6cf59c52c03f153657682c373260966
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Thu Sep 6 11:50:24 2018 +0200
New upstream release 2.1.4
.gitignore | 1 +
mixxx.spec | 9 ++++++---
sources | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a4e9a5b..1a7e929 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ mixxx-1.11.0-src.tar.gz
/mixxx-release-2.1.1.tar.gz
/mixxx-release-2.1.2.0.tar.gz
/mixxx-release-2.1.3.tar.gz
+/mixxx-release-2.1.4.tar.gz
diff --git a/mixxx.spec b/mixxx.spec
index c3ed8c0..af8ddbf 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -2,7 +2,7 @@
#global extraver rc1
# Optional: Only used for untagged snapshot versions
-#global gitcommit 66028ddb1a16722285fcc999c2e7170c446b7c03
+#global gitcommit 66028ddb1a16722285fcc999c2e7170c446b7c03
# Format: <yyyymmdd>
#global gitcommitdate 20180407
@@ -16,7 +16,7 @@
%endif
Name: mixxx
-Version: 2.1.3
+Version: 2.1.4
Release: 1%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
Summary: Mixxx is open source software for DJ'ing
Group: Applications/Multimedia
@@ -150,6 +150,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}
%changelog
+* Thu Sep 06 2018 Uwe Klotz <uklotz(a)mixxx.org> - 2.1.4-1
+- New upstream release 2.1.4
+
* Mon Aug 20 2018 Uwe Klotz <uklotz(a)mixxx.org> - 2.1.3-1
- New upstream release 2.1.3
@@ -261,7 +264,7 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}
* Tue Nov 8 2011 John Brier <johnbrier(a)gmail.com> - 1.9.2-1
- Update to 1.9.2
- build with shoutcast support
-- remove -n option to setup since upstream source extracts
+- remove -n option to setup since upstream source extracts
into a directory of name-version format now
- remove old experimental build options that are no longer
relevant
diff --git a/sources b/sources
index 6fe8c91..6b123a3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-237ffa407bfec0cb36c2ed88564fd550 mixxx-release-2.1.3.tar.gz
+305dfb0dde73b9062d1d48f8ae07a370 mixxx-release-2.1.4.tar.gz
5 years, 9 months
[mixxx] New upstream release 2.1.4
by Uwe Klotz
commit c8dc7dd95f1edf9abca8aadeba1749e5df6a315d
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Thu Sep 6 11:50:24 2018 +0200
New upstream release 2.1.4
.gitignore | 1 +
mixxx.spec | 9 ++++++---
sources | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a4e9a5b..1a7e929 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ mixxx-1.11.0-src.tar.gz
/mixxx-release-2.1.1.tar.gz
/mixxx-release-2.1.2.0.tar.gz
/mixxx-release-2.1.3.tar.gz
+/mixxx-release-2.1.4.tar.gz
diff --git a/mixxx.spec b/mixxx.spec
index dedda4b..4f957b0 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -2,7 +2,7 @@
#global extraver rc1
# Optional: Only used for untagged snapshot versions
-#global gitcommit 66028ddb1a16722285fcc999c2e7170c446b7c03
+#global gitcommit 66028ddb1a16722285fcc999c2e7170c446b7c03
# Format: <yyyymmdd>
#global gitcommitdate 20180407
@@ -16,7 +16,7 @@
%endif
Name: mixxx
-Version: 2.1.3
+Version: 2.1.4
Release: 1%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
Summary: Mixxx is open source software for DJ'ing
Group: Applications/Multimedia
@@ -150,6 +150,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}
%changelog
+* Thu Sep 06 2018 Uwe Klotz <uklotz(a)mixxx.org> - 2.1.4-1
+- New upstream release 2.1.4
+
* Mon Aug 20 2018 Uwe Klotz <uklotz(a)mixxx.org> - 2.1.3-1
- New upstream release 2.1.3
@@ -264,7 +267,7 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}
* Tue Nov 8 2011 John Brier <johnbrier(a)gmail.com> - 1.9.2-1
- Update to 1.9.2
- build with shoutcast support
-- remove -n option to setup since upstream source extracts
+- remove -n option to setup since upstream source extracts
into a directory of name-version format now
- remove old experimental build options that are no longer
relevant
diff --git a/sources b/sources
index 6fe8c91..6b123a3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-237ffa407bfec0cb36c2ed88564fd550 mixxx-release-2.1.3.tar.gz
+305dfb0dde73b9062d1d48f8ae07a370 mixxx-release-2.1.4.tar.gz
5 years, 9 months
[telegram-desktop] Updated to 1.3.16 (alpha).
by Vitaly Zaitsev
commit 1489112e33c6a8b5d16027254cad99abdbab4483
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Wed Sep 5 19:10:28 2018 +0200
Updated to 1.3.16 (alpha).
.gitignore | 1 +
sources | 2 +-
telegram-desktop-api-tokens.patch | 2 +-
telegram-desktop-build-fixes.patch | 8 ++++----
telegram-desktop-system-fonts.patch | 2 +-
telegram-desktop.spec | 14 ++++++++++++--
6 files changed, 20 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b08a8fb..dbd9796 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,3 +57,4 @@
/crl-4291015.tar.gz
/tdesktop-1.3.14.tar.gz
/tdesktop-1.3.15.tar.gz
+/tdesktop-1.3.16.tar.gz
diff --git a/sources b/sources
index a3b1e26..7d2d611 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
b92e75c44c9d4c9fd96b1d19eb3a666d crl-4291015.tar.gz
-2d470428474d45b9a674970c04cf941b tdesktop-1.3.15.tar.gz
+4bd5b5c95e71db37aaea32f4da41c500 tdesktop-1.3.16.tar.gz
diff --git a/telegram-desktop-api-tokens.patch b/telegram-desktop-api-tokens.patch
index 807fd79..e19dbf4 100644
--- a/telegram-desktop-api-tokens.patch
+++ b/telegram-desktop-api-tokens.patch
@@ -1,4 +1,4 @@
-From db3fe59c48a45d5f6b27ff1abd422950e399c314 Mon Sep 17 00:00:00 2001
+From bbf9a796ebdd702b7b91e71679853e0b787fcb15 Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Mon, 9 Apr 2018 16:57:13 +0200
Subject: [PATCH 2/3] Changed default Telegram Desktop's test API keys to
diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch
index 79fe9d0..521af86 100644
--- a/telegram-desktop-build-fixes.patch
+++ b/telegram-desktop-build-fixes.patch
@@ -1,4 +1,4 @@
-From f31a8bbeca59889a98ee1416f6d1ebe26f3a5723 Mon Sep 17 00:00:00 2001
+From 735e4243af1ff8c41aedad34dfbffc683b41b5c9 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.
@@ -383,12 +383,12 @@ index b52a9d071..32b126682 100644
],
'message': 'codegen_scheme-ing scheme.tl..',
diff --git a/Telegram/gyp/lib_storage.gyp b/Telegram/gyp/lib_storage.gyp
-index d24a105d0..be52e4a1f 100644
+index 527713546..3856cd87a 100644
--- a/Telegram/gyp/lib_storage.gyp
+++ b/Telegram/gyp/lib_storage.gyp
@@ -15,8 +15,6 @@
'common.gypi',
- 'openssl.gypi',
+ 'openssl.gypi',
'qt.gypi',
- 'telegram_win.gypi',
- 'telegram_mac.gypi',
@@ -418,7 +418,7 @@ index d24a105d0..be52e4a1f 100644
+ '<!(rpm --eval "%{_includedir}")',
],
'sources': [
- '<(src_loc)/storage/storage_databases.cpp',
+ '<(src_loc)/storage/storage_clear_legacy.cpp',
diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi
index 0b783ec21..653562ffb 100644
--- a/Telegram/gyp/qt.gypi
diff --git a/telegram-desktop-system-fonts.patch b/telegram-desktop-system-fonts.patch
index 4ee412a..9a21292 100644
--- a/telegram-desktop-system-fonts.patch
+++ b/telegram-desktop-system-fonts.patch
@@ -1,4 +1,4 @@
-From 5f9087117e4e7d40e6da492275b435bbcdab23e5 Mon Sep 17 00:00:00 2001
+From 0fcc17fc216642941e5139299ab21fbac786d10e 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 3/3] Backported and rebased patch from Debian maintainer
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 337ec2a..aed7ca8 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -10,7 +10,7 @@
Summary: Telegram Desktop official messaging app
Name: telegram-desktop
-Version: 1.3.15
+Version: 1.3.16
Release: 1%{?dist}
# Application and 3rd-party modules licensing:
@@ -30,6 +30,7 @@ Patch0: %{name}-build-fixes.patch
Patch1: %{name}-api-tokens.patch
Patch2: %{name}-system-fonts.patch
+%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
Recommends: libappindicator-gtk3%{?_isa}
Requires: qt5-qtimageformats%{?_isa}
Requires: hicolor-icon-theme
@@ -48,6 +49,7 @@ BuildRequires: gyp
BuildRequires: guidelines-support-library-devel >= 1.0.0
BuildRequires: mapbox-variant-devel >= 0.3.6
BuildRequires: libtgvoip-devel >= 2.2.4
+BuildRequires: qt5-qtbase-private-devel
BuildRequires: libappindicator-devel
BuildRequires: ffmpeg-devel >= 3.1
BuildRequires: openal-soft-devel
@@ -55,7 +57,6 @@ BuildRequires: qt5-qtbase-devel
BuildRequires: libstdc++-devel
BuildRequires: range-v3-devel
BuildRequires: openssl-devel
-BuildRequires: minizip-devel
BuildRequires: xxhash-devel
BuildRequires: lzma-devel
BuildRequires: opus-devel
@@ -64,6 +65,12 @@ BuildRequires: dee-devel
BuildRequires: xz-devel
BuildRequires: python2
+%if 0%{?fedora} >= 30
+BuildRequires: minizip-compat-devel
+%else
+BuildRequires: minizip-devel
+%endif
+
%description
Telegram is a messaging app with a focus on speed and security, it’s super
fast, simple and free. You can use Telegram on all your devices at the same
@@ -136,6 +143,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_datadir}/metainfo/%{name}.
%{_datadir}/metainfo/%{name}.appdata.xml
%changelog
+* Wed Sep 05 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.3.16-1
+- Updated to 1.3.16 (alpha).
+
* Sat Sep 01 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.3.15-1
- Updated to 1.3.15 (alpha).
5 years, 9 months
[ffmpeg/f27] Disable nvenc for rhel
by Nicolas Chauvet
commit c4671249af3b665fb14d2c00e344db9ca75077db
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Sep 5 11:54:49 2018 +0200
Disable nvenc for rhel
ffmpeg.spec | 1 -
1 file changed, 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index f0969fe..da2098c 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -18,7 +18,6 @@
%global _without_opencv 1
%global _without_opus 1
%global _without_vpx 1
-%global _without_nvenc 1
%endif
# flavor nonfree
5 years, 9 months
[ffmpeg/f27] Add without opus for rhel
by Nicolas Chauvet
commit 9266ee54d327b79784fefc319139b0859c6bb8aa
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Sep 5 08:46:11 2018 +0200
Add without opus for rhel
ffmpeg.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 9ed5632..f0969fe 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -16,6 +16,7 @@
%if 0%{?rhel}
%global _without_frei0r 1
%global _without_opencv 1
+%global _without_opus 1
%global _without_vpx 1
%global _without_nvenc 1
%endif
5 years, 9 months
[ffmpeg/f27] Add without_opus switch
by Nicolas Chauvet
commit 5dc5d6b081e84887dbda9305398e59c2522ed2df
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Sep 5 08:45:38 2018 +0200
Add without_opus switch
ffmpeg.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 153663b..9ed5632 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -148,7 +148,7 @@ BuildRequires: opencl-headers ocl-icd-devel
%endif
%{!?_without_opencv:BuildRequires: opencv-devel}
BuildRequires: openjpeg2-devel
-BuildRequires: opus-devel
+%{!?_without_opus:BuildRequires: opus-devel}
%{!?_without_pulse:BuildRequires: pulseaudio-libs-devel}
BuildRequires: perl(Pod::Man)
%{?_with_rubberband:BuildRequires: rubberband-devel}
@@ -262,7 +262,7 @@ This package contains development files for %{name}
%{!?_without_opencv:--enable-libopencv} \\\
%{!?_without_opengl:--enable-opengl} \\\
--enable-libopenjpeg \\\
- --enable-libopus \\\
+ %{!?_without_opus:--enable-libopus} \\\
%{!?_without_pulse:--enable-libpulse} \\\
%{?_with_rtmp:--enable-librtmp} \\\
%{?_with_rubberband:--enable-librubberband} \\\
5 years, 9 months
[ffmpeg] Update Changelog
by Nicolas Chauvet
commit 17ffa15f0ba78dc64bf99a2ff781ebcead5ec119
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Sep 5 12:37:59 2018 +0200
Update Changelog
ffmpeg.spec | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 73dadd8..c76d7ac 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -73,7 +73,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 4.0.2
-Release: 3%{?date}%{?date:git}%{?rel}%{?dist}
+Release: 4%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -406,6 +406,11 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Wed Sep 05 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 4.0.2-4
+- Add without_opus
+- Add disable opus and mfx for rhel
+- Enable nvenc for rhel
+
* Sun Jul 29 2018 Julian Sikorski <belegdol(a)fedoraproject.org> - 4.0.2-3
- Add spec fixes from rfbz #4964
5 years, 9 months
[ffmpeg] Fixup without_mfx
by Nicolas Chauvet
commit 4e0582e29c6040bcd4da38f979669faec6e9bcbe
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Sep 5 12:17:55 2018 +0200
Fixup without_mfx
ffmpeg.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 65f7ea2..73dadd8 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -313,7 +313,7 @@ cp -pr doc/examples/{*.c,Makefile,README} _doc/examples/
--cpu=%{_target_cpu} \
%endif
%ifarch %{ix86} x86_64
- %{!?_without_qsv:--enable-libmfx} \
+ %{!?_without_mfx:--enable-libmfx} \
%endif
%ifarch %{ix86} x86_64 %{power64}
--enable-runtime-cpudetect \
5 years, 9 months