[telegram-desktop/f26] Updated to 1.2.16.
by Vitaly Zaitsev
commit b120152b89c4b34eab3c60f182d7a80cea8358f3
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Sun Apr 8 17:57:23 2018 +0200
Updated to 1.2.16.
.gitignore | 1 +
sources | 2 +-
telegram-desktop-build-fixes.patch | 2 +-
telegram-desktop.spec | 5 ++++-
4 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 939d5f9..dc727f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,4 @@
/tdesktop-1.2.13.tar.gz
/tdesktop-1.2.14.tar.gz
/tdesktop-1.2.15.tar.gz
+/tdesktop-1.2.16.tar.gz
diff --git a/sources b/sources
index 11e2199..a852da9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
ed3d3121418d32866ae348ce75042770 crl-344cbde.tar.gz
-da99c1885b82b26be5e267bff1aef34d tdesktop-1.2.15.tar.gz
+a310b719fd8465acd7b7f4b5cc93b17f tdesktop-1.2.16.tar.gz
diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch
index 876ef5e..38130ea 100644
--- a/telegram-desktop-build-fixes.patch
+++ b/telegram-desktop-build-fixes.patch
@@ -1,4 +1,4 @@
-From 01a3a6c8ca41a2c163d3065666dc5e78eb622880 Mon Sep 17 00:00:00 2001
+From ff1914aaef5cde44f38359ffa2169bf1d0ec2c64 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/telegram-desktop.spec b/telegram-desktop.spec
index 91bca2b..2fa71de 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -10,7 +10,7 @@
Summary: Telegram Desktop official messaging app
Name: telegram-desktop
-Version: 1.2.15
+Version: 1.2.16
Release: 1%{?dist}
# Application and 3rd-party modules licensing:
@@ -136,6 +136,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_datadir}/metainfo/%{name}.
%{_datadir}/metainfo/%{name}.appdata.xml
%changelog
+* Sun Apr 08 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.2.16-1
+- Updated to 1.2.16.
+
* Mon Mar 26 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.2.15-1
- Updated to 1.2.15.
6 years
[mixxx] Re-add missing dist macro
by Uwe Klotz
commit fa5d31b3f27b81db4d9a1662436ec667a3eb2b0c
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Wed Apr 4 19:15:55 2018 +0200
Re-add missing dist macro
mixxx.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index 71b6d50..e9e51b2 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -20,7 +20,7 @@
Name: mixxx
Version: 2.1.0
-Release: %{pkgrel}%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}
+Release: %{pkgrel}%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
Summary: Mixxx is open source software for DJ'ing
Group: Applications/Multimedia
License: GPLv2+
6 years
[mixxx] Disable FFmpeg
by Uwe Klotz
commit 0c28438cc9133e76332589add2f2dedc1a17a769
Author: Uwe Klotz <uwe_klotz(a)web.de>
Date: Wed Apr 4 17:38:05 2018 +0200
Disable FFmpeg
mixxx.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index c313c7f..71b6d50 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -103,7 +103,7 @@ scons %{?_smp_mflags} \
qtdir=%{_qt4_prefix} \
optimize=portable \
faad=1 \
- ffmpeg=1 \
+ ffmpeg=0 \
modplug=1 \
opus=1 \
shoutcast=1 \
6 years
[mixxx] Update to 2.1 snapshot
by Uwe Klotz
commit 61c3c474dd309977bc7ab9437142e0bfb78bfb6b
Author: Uwe Klotz <uwe_klotz(a)web.de>
Date: Wed Apr 4 15:45:54 2018 +0200
Update to 2.1 snapshot
Add support for Opus, WavPack, and Mod tracker files
Adjust and optimize build options
.gitignore | 1 +
mixxx-2.1.0-build.patch | 32 --------------
mixxx.spec | 110 +++++++++++++++++++++++++++++++-----------------
sources | 2 +-
4 files changed, 73 insertions(+), 72 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 591b51d..e9f05fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ mixxx-1.11.0-20130517bzr.tar.bz2
mixxx-1.11.0-src.tar.gz
/mixxx-2.0.0-src.tar.gz
/mixxx-22f78d299961a1b3910b80f161391a181b18265a.tar.gz
+/mixxx-f77cf966288ee481fb7f17cc56bed830b7137f54.tar.gz
diff --git a/mixxx.spec b/mixxx.spec
index 7a2ceac..c313c7f 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -1,80 +1,98 @@
-%global commit 22f78d299961a1b3910b80f161391a181b18265a
-%global date 20180204
-%global shortcommit0 %(c=%{commit}; echo ${c:0:7})
+# Manually modified with every package release
+%global pkgrel 0.3
+
+# Package version suffix: <undefined>, beta1, beta2, rc1, ...
+#global extraver
+
+# Only for untagged snapshot versions
+%global gitcommit f77cf966288ee481fb7f17cc56bed830b7137f54
+# <yyyymmdd>
+%global gitcommitdate 20180404
+
+%if %{gitcommit}
+%global snapinfo %{?gitcommit:%{gitcommitdate}git%{?gitcommit:%(c=%{gitcommit}; echo ${c:0:7})}}
+%global sources %{gitcommit}
+%else
+%global sources release-%{version}%{?extraver:-%{extraver}}}
+%endif
-%bcond_with bpm
-%bcond_with djconsole
%bcond_with libgpod
Name: mixxx
Version: 2.1.0
-Release: 0.2%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist}
+Release: %{pkgrel}%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}
Summary: Mixxx is open source software for DJ'ing
-
Group: Applications/Multimedia
License: GPLv2+
URL: http://www.mixxx.org
-Source0: https://github.com/mixxxdj/mixxx/archive/%{commit}.tar.gz#/%{name}-%{comm...
-Patch0: %{name}-%{version}-build.patch
+Source0: https://github.com/mixxxdj/%{name}/archive/%{sources}.tar.gz#/%{name}-%{s...
#Build tools
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
+BuildRequires: protobuf-compiler
BuildRequires: python2-scons
#Mandatory Requirements
BuildRequires: alsa-lib-devel >= 1.0.10
BuildRequires: faad2-devel
+BuildRequires: ffmpeg-devel
+BuildRequires: fftw-devel
+BuildRequires: flac-devel
#BuildRequires: jack-audio-connection-kit-devel >= 0.61.0 #jack seems deprecated to portaudio
-BuildRequires: qt4-devel >= 4.3
-BuildRequires: qt4-webkit-devel
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
+BuildRequires: libchromaprint-devel
BuildRequires: libid3tag-devel
BuildRequires: libmad-devel
+BuildRequires: libmodplug-devel
BuildRequires: libmp4v2-devel
+BuildRequires: libshout-devel
BuildRequires: libsndfile-devel
BuildRequires: libusb1-devel
BuildRequires: libvorbis-devel
+BuildRequires: opus-devel
+BuildRequires: opusfile-devel
BuildRequires: portaudio-devel
BuildRequires: portmidi-devel
-BuildRequires: protobuf-devel protobuf-compiler
-BuildRequires: taglib-devel
-BuildRequires: flac-devel
-BuildRequires: sqlite-devel
+BuildRequires: protobuf-devel
+BuildRequires: qt4-devel >= 4.3
BuildRequires: rubberband-devel
-BuildRequires: libchromaprint-devel
+BuildRequires: sqlite-devel
+BuildRequires: taglib-devel
BuildRequires: upower-devel
+BuildRequires: wavpack-devel
-#Optionals Requirements
-BuildRequires: libshout-devel
-BuildRequires: vamp-plugin-sdk-devel
+#Bundled Requirements
+#BuildRequires: libebur128-devel
+#BuildRequires: soundtouch-devel
+#BuildRequires: vamp-plugin-sdk-devel
+
+#Optional Requirements
#BuildRequires: python-devel
#BuildRequires: lua-devel, tolua++-devel
-%{?with_bpm:BuildRequires: fftw-devel}
-%{?with_djconsole:BuildRequires: idjc}
-BuildRequires: ladspa-devel
%{?with_libgpod:BuildRequires: libgpod-devel}
-BuildRequires: wavpack-devel
# workaround to use phonon-backend-gstreamer instead of phonon-backend-vlc since phonon-backend-vlc
# is broken in rpmfusion currently
BuildRequires: phonon-backend-gstreamer
+
%description
-Mixxx is open source software for DJ'ing. You can use MP3s,
-Ogg Vorbis files, and other formats as audio input. Mixxx
-can be controlled through the GUI and with external
-controllers including MIDI devices, and more.
+Mixxx is open source software for DJ'ing. You can use
+AIFF/FLAC/M4A/MP3/OggVorbis/Opus/WAV/WavPack files, and
+other formats as audio input. Playback can be controlled
+through the GUI or with external controllers including
+MIDI and HID devices.
%prep
-%autosetup -p1 -n %{name}-%{commit}
+%autosetup -p1 -n %{name}-%{sources}
-# TODO remove bundle libs
-#rm -rf lib/vamp-2.3 lib/xwax lib/gmock-1.7.0 lib/gtest-1.7.0
-
+# TODO remove bundle libs?
+#rm -rf lib/libebur128* lib/soundtouch* lib/vamp lib/xwax lib/gmock* lib/gtest*
+
%build
export CFLAGS=$RPM_OPT_FLAGS
@@ -83,10 +101,13 @@ export LIBDIR=%{_libdir}
scons %{?_smp_mflags} \
prefix=%{_prefix} \
qtdir=%{_qt4_prefix} \
+ optimize=portable \
faad=1 \
- ladspa=0 \
- shoutcast=1 hifieq=1 script=0 optimize=0 \
-
+ ffmpeg=1 \
+ modplug=1 \
+ opus=1 \
+ shoutcast=1 \
+ wv=1 \
%install
@@ -96,20 +117,25 @@ export LIBDIR=%{_libdir}
scons %{?_smp_mflags} \
install_root=$RPM_BUILD_ROOT%{_prefix} \
qtdir=%{_qt4_prefix} \
- prefix=%{_prefix} install
+ prefix=%{_prefix} \
+ install
-#Install udev rule
+# Install udev rule
install -d ${RPM_BUILD_ROOT}/%{_udevrulesdir}
install -p -m 0644 res/linux/mixxx.usb.rules ${RPM_BUILD_ROOT}/%{_udevrulesdir}/90-mixxx.usb.rules
-desktop-file-install --vendor "" \
+desktop-file-install \
+ --vendor "" \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--add-category=X-Synthesis \
res/linux/mixxx.desktop
-appstream-util validate-relax --nonet $RPM_BUILD_ROOT/%{_datadir}/appdata/%{name}.appdata.xml
+appstream-util \
+ validate-relax \
+ --nonet \
+ $RPM_BUILD_ROOT/%{_datadir}/appdata/%{name}.appdata.xml
-#Remove docdir
+# Remove docdir
rm -rf $RPM_BUILD_ROOT%{_docdir}
@@ -124,7 +150,13 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}
%{_datadir}/pixmaps/mixxx-icon.png
%{_datadir}/appdata/%{name}.appdata.xml
+
%changelog
+* Wed Apr 04 2018 Uwe Klotz <uklotz(a)mixxx.org> - 2.1.0-0.3.20180404gitf77cf96
+- Update to 2.1 snapshot
+- Add support for Opus, WavPack, and Mod tracker files
+- Adjust and optimize build options
+
* Thu Mar 01 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 2.1.0-0.2.20180204git22f78d2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
diff --git a/sources b/sources
index 677e3a4..0db623f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5e4f7fff024a541d3bdf3788b47379db mixxx-22f78d299961a1b3910b80f161391a181b18265a.tar.gz
+642b84524728f80bd16015a8f5ddc7af mixxx-f77cf966288ee481fb7f17cc56bed830b7137f54.tar.gz
6 years
[chromium-freeworld/el7] (65 commits) ...Merge Fedora, chromium-65.0.3325.181-1
by Miro Hrončok
Summary of changes:
faa2842... Update the chromium-lastest.py to always download the polic (*)
18ab5a5... Update the chromium-lastest.py to always download the polic (*)
b36884a... Improve the chromium-latest.py script (*)
404a6d2... Improve the chromium-latest.py script (*)
69e5304... 62.0.3202.62 (*)
3f324a0... Merge branch 'master' of ssh://pkgs.fedoraproject.org/rpms/ (*)
12bdf54... Merge branch 'master' into epel7 (*)
7abe45e... do not attempt to use std=c++14 on epel7 (*)
2abf30d... Fix the policy templates handling (*)
d8f6aaa... Fix the policy templates handling (*)
530c35b... instead use std=c++11 on epel7 (*)
6aefd88... Merge branch 'epel7' of ssh://pkgs.fedoraproject.org/rpms/c (*)
f6767a1... fix decay_t usage for gcc 4.8/c++11 (*)
2180bdb... more C++11 type handling (enable_if) (*)
2f12a92... even moar c++11 (*)
4bfd8da... Merge Fedora, chromium-62.0.3202.62-1 (*)
4b560f7... 62.0.3202.75 (*)
7d1b47a... fix merge (*)
bc9e77b... 62.0.3202.89 (*)
06edfb5... Merge Fedora, chromium-62.0.3202.89-1 (*)
db2acc0... Remove support for running the unit tests (*)
06c182b... Adapt to man page changes for Chromium 63 (*)
8a70ade... Remove unused patches (*)
b8d27d6... Remove unused AppData file (*)
b0b7736... Merge #4 `Remove unused patches and an AppData file` (*)
07c88ef... Merge #3 `Remove support for running the unit tests` (*)
6af85f9... 63.0.3239.84 (*)
42ed338... fix aarch64 patch (*)
b18325e... new sources for aarch64 (*)
70ab91a... moar aarch64 files (*)
b9fa76f... moar moar aarch64 files (*)
3698ffd... moar moar aarch64 files (*)
eac1e39... moar moar moar aarch64 files (*)
7bb0a21... Don't require libcanberra-gtk2 GTK+ 3 build is enabled (*)
7d49b3d... Add missing ffmpeg files on aarch64 (*)
41a8870... Update to 63.0.3239.108 (*)
dfd304e... Add python2 as BR (*)
5f230f1... Merge Fedora, chromium-63.0.3239.108-1 (*)
867ed1f... 64.0.3282.119 (*)
b75e5eb... correct source (*)
7bfd513... include user-session binary in chrome-remote-desktop subpac (*)
7451062... 64.0.3282.140 (*)
ff8eb29... update to 64.0.3282.167, include workaround for gcc8 bug in (*)
d1a8e0f... Merge Fedora, chromium-64.0.3282.119-1 (*)
62be16e... Merge Fedora, chromium-64.0.3282.167-1 (*)
c558cc1... 64.0.3282.186 (*)
e36a0c8... 65.0.3325.146 (*)
7c1ea9e... Merge Fedora, chromium-64.0.3282.186-1 (*)
c5342c3... this gets past prep... (*)
4e6c6ef... 65.0.3325.162 (*)
8ca12f1... clean sources (*)
fe5b552... version conditionalize gnome-keyring-devel (*)
3534f5e... use bundled libjpeg on epel7 (*)
8cfa28d... fix bool issue triggered by newer gcc (*)
61203bf... use normal bool cast (*)
9e38b7c... fix skia build issue on aarch64 (*)
bdba7c7... disable StartupNotify in chromium-browser.desktop (not in g (*)
6d9e418... use bundled freetype on epel7 (*)
f7e3b54... use bundled libdrm on epel7 (*)
e9b3537... Merge Fedora, chromium-65.0.3325.162-1 (*)
f525a51... try use_custom_libcxx=true on epel7 (*)
6113fdf... rhel 7 might need libc++ bundled (*)
0d818fb... force lstdc++ on epel7 (*)
c747d58... 65.0.3325.181 (*)
963e034... Merge Fedora, chromium-65.0.3325.181-1 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years
[chromium-freeworld/f26] (27 commits) ...Merge Fedora, chromium-65.0.3325.181-1
by Miro Hrončok
Summary of changes:
867ed1f... 64.0.3282.119 (*)
b75e5eb... correct source (*)
7bfd513... include user-session binary in chrome-remote-desktop subpac (*)
7451062... 64.0.3282.140 (*)
ff8eb29... update to 64.0.3282.167, include workaround for gcc8 bug in (*)
d1a8e0f... Merge Fedora, chromium-64.0.3282.119-1 (*)
62be16e... Merge Fedora, chromium-64.0.3282.167-1 (*)
c558cc1... 64.0.3282.186 (*)
e36a0c8... 65.0.3325.146 (*)
7c1ea9e... Merge Fedora, chromium-64.0.3282.186-1 (*)
c5342c3... this gets past prep... (*)
4e6c6ef... 65.0.3325.162 (*)
8ca12f1... clean sources (*)
fe5b552... version conditionalize gnome-keyring-devel (*)
3534f5e... use bundled libjpeg on epel7 (*)
8cfa28d... fix bool issue triggered by newer gcc (*)
61203bf... use normal bool cast (*)
9e38b7c... fix skia build issue on aarch64 (*)
bdba7c7... disable StartupNotify in chromium-browser.desktop (not in g (*)
6d9e418... use bundled freetype on epel7 (*)
f7e3b54... use bundled libdrm on epel7 (*)
e9b3537... Merge Fedora, chromium-65.0.3325.162-1 (*)
f525a51... try use_custom_libcxx=true on epel7 (*)
6113fdf... rhel 7 might need libc++ bundled (*)
0d818fb... force lstdc++ on epel7 (*)
c747d58... 65.0.3325.181 (*)
963e034... Merge Fedora, chromium-65.0.3325.181-1 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years
[chromium-freeworld/f27] (27 commits) ...Merge Fedora, chromium-65.0.3325.181-1
by Miro Hrončok
Summary of changes:
867ed1f... 64.0.3282.119 (*)
b75e5eb... correct source (*)
7bfd513... include user-session binary in chrome-remote-desktop subpac (*)
7451062... 64.0.3282.140 (*)
ff8eb29... update to 64.0.3282.167, include workaround for gcc8 bug in (*)
d1a8e0f... Merge Fedora, chromium-64.0.3282.119-1 (*)
62be16e... Merge Fedora, chromium-64.0.3282.167-1 (*)
c558cc1... 64.0.3282.186 (*)
e36a0c8... 65.0.3325.146 (*)
7c1ea9e... Merge Fedora, chromium-64.0.3282.186-1 (*)
c5342c3... this gets past prep... (*)
4e6c6ef... 65.0.3325.162 (*)
8ca12f1... clean sources (*)
fe5b552... version conditionalize gnome-keyring-devel (*)
3534f5e... use bundled libjpeg on epel7 (*)
8cfa28d... fix bool issue triggered by newer gcc (*)
61203bf... use normal bool cast (*)
9e38b7c... fix skia build issue on aarch64 (*)
bdba7c7... disable StartupNotify in chromium-browser.desktop (not in g (*)
6d9e418... use bundled freetype on epel7 (*)
f7e3b54... use bundled libdrm on epel7 (*)
e9b3537... Merge Fedora, chromium-65.0.3325.162-1 (*)
f525a51... try use_custom_libcxx=true on epel7 (*)
6113fdf... rhel 7 might need libc++ bundled (*)
0d818fb... force lstdc++ on epel7 (*)
c747d58... 65.0.3325.181 (*)
963e034... Merge Fedora, chromium-65.0.3325.181-1 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years