[qarte/f31] Update to 4.7.0
by Martin Gansser
Summary of changes:
0d06893... Update to 4.7.0 (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 1 month
[qarte] Update to 4.7.0
by Martin Gansser
commit 0d06893dca443c39a695f3fe2f8efd03e6957b0e
Author: Martin Gansser <mgansser(a)online.de>
Date: Sat Nov 30 10:56:41 2019 +0100
Update to 4.7.0
qarte.spec | 7 +++++--
sources | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/qarte.spec b/qarte.spec
index b2f3e87..597ae4b 100644
--- a/qarte.spec
+++ b/qarte.spec
@@ -2,8 +2,8 @@
%global __python %{__python3}
Name: qarte
-Version: 4.6.0
-Release: 3%{?dist}
+Version: 4.7.0
+Release: 1%{?dist}
License: GPLv3+
URL: https://launchpad.net/qarte
Source0: http://oqapy.eu/releases/%{name}-%{version}.tar.gz
@@ -48,6 +48,9 @@ cp -pR locale %{buildroot}%{_datadir}
%{_datadir}/icons/hicolor/96x96/apps/%{name}.png
%changelog
+* Fri Nov 29 2019 Martin Gansser <martinkg(a)fedoraproject.org> - 4.7.0-1
+- Update to 4.7.0
+
* Fri Aug 09 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 4.6.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
diff --git a/sources b/sources
index d70b76d..3a8205b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-27c64aec631cb8be341e33c1532d919c qarte-4.6.0.tar.gz
+SHA512 (qarte-4.7.0.tar.gz) = e9928f1c39dc3f458201050911566d6411a75c7c359c8497abb1a2d9ab4f5f3aed15b2e65f397baaf031b89d7a893ce384cbd74c744e8408839205d7b67ec8b9
5 years, 1 month
[audacity-freeworld/f31: 3/3] merge master except the ffmpeg conditional.
by David Timms
commit 9db26d6ac3ce1a55330f44d0c5dc290ff1dde0d3
Author: David Timms <dtimms(a)iinet.net.au>
Date: Fri Nov 29 23:01:59 2019 +1100
merge master except the ffmpeg conditional.
audacity-freeworld.spec | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
---
diff --git a/audacity-freeworld.spec b/audacity-freeworld.spec
index b57840c..0a6be4b 100644
--- a/audacity-freeworld.spec
+++ b/audacity-freeworld.spec
@@ -134,9 +134,8 @@ export WX_CONFIG=wx-config-3.0-gtk2
export WX_CONFIG=wx-config-3.0
%endif
-%if %{with ffmpeg} && %{with compat_ffmpeg}
export PKG_CONFIG_PATH=%{_libdir}/compat-ffmpeg28/pkgconfig
-%endif
+
%if 0%{?rhel} == 7
. /opt/rh/devtoolset-7/enable
5 years, 1 month
[audacity-freeworld] Update to Audacity 2.3.3. Modify wxWidgets build require to wxGTK3 (gtk3 version). Modify libdir pat
by David Timms
commit 8eb6c033f30f616867f13afc21d90076e9bc9374
Author: David Timms <dtimms(a)iinet.net.au>
Date: Fri Nov 29 21:11:52 2019 +1100
Update to Audacity 2.3.3.
Modify wxWidgets build require to wxGTK3 (gtk3 version).
Modify libdir patch for 2.3.3.
Fix -manual file archive dropping the leading help/ in path.
Disable twolame for EPEL-8 as the -devel package isn't available.
.gitignore | 3 ++-
audacity-2.3.2-libdir.patch | 11 -----------
audacity-2.3.3-libdir.patch | 15 +++++++++++++++
audacity-freeworld.spec | 38 +++++++++++++++++++++++++++++++++-----
sources | 2 +-
5 files changed, 51 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e448c42..964bc38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-/audacity-minsrc-2.3.2.tar.xz
+/audacity-minsrc-2.3.3.tar.xz
+
diff --git a/audacity-2.3.3-libdir.patch b/audacity-2.3.3-libdir.patch
new file mode 100644
index 0000000..2659a0c
--- /dev/null
+++ b/audacity-2.3.3-libdir.patch
@@ -0,0 +1,15 @@
+--- ./src/effects/ladspa/LadspaEffect.cpp.orig 2019-10-22 07:29:41.000000000 +1100
++++ ./src/effects/ladspa/LadspaEffect.cpp 2019-11-10 09:44:41.865684664 +1100
+@@ -378,11 +378,10 @@
+ #else
+
+ pathList.push_back(wxGetHomeDir() + wxFILE_SEP_PATH + wxT(".ladspa"));
++ pathList.push_back(wxT("/usr/%{_lib}/ladspa"));
+ #if defined(__LP64__)
+- pathList.push_back(wxT("/usr/local/lib64/ladspa"));
+ pathList.push_back(wxT("/usr/lib64/ladspa"));
+ #endif
+- pathList.push_back(wxT("/usr/local/lib/ladspa"));
+ pathList.push_back(wxT("/usr/lib/ladspa"));
+ pathList.push_back(wxT(LIBDIR) wxT("/ladspa"));
+
diff --git a/audacity-freeworld.spec b/audacity-freeworld.spec
index 02b5bf0..b57840c 100644
--- a/audacity-freeworld.spec
+++ b/audacity-freeworld.spec
@@ -8,8 +8,8 @@
Name: audacity-freeworld
-Version: 2.3.2
-Release: 2%{?dist}
+Version: 2.3.3
+Release: 1%{?dist}
Summary: Multitrack audio editor
License: GPLv2
URL: https://www.audacityteam.org
@@ -28,7 +28,7 @@ Source0: http://www.fosshub.com/Audacity.html/%{realname}-minsrc-%{version}.tar.
# manual can be installed from the base Fedora Audacity package.
Patch1: audacity-2.2.1-libmp3lame-default.patch
-Patch2: audacity-2.3.2-libdir.patch
+Patch2: audacity-2.3.3-libdir.patch
# add audio/x-flac
# remove audio/mpeg, audio/x-mp3
# enable startup notification
@@ -42,6 +42,9 @@ Obsoletes: audacity-nonfree < %{version}-%{release}
BuildRequires: automake
BuildRequires: autoconf
BuildRequires: gettext-devel
+%if 0%{?rhel} == 7
+BuildRequires: devtoolset-7-toolchain, devtoolset-7-libatomic-devel
+%endif
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: libtool
@@ -56,7 +59,11 @@ BuildRequires: lame-devel
BuildRequires: libid3tag-devel
BuildRequires: libmad-devel
BuildRequires: taglib-devel
+%if 0%{?rhel} && 0%{?rhel} == 8
+#note: epel-8 currently doesn't have twolame-devel.
+%else
BuildRequires: twolame-devel
+%endif
BuildRequires: libogg-devel
BuildRequires: libsndfile-devel
BuildRequires: libvorbis-devel
@@ -75,12 +82,13 @@ BuildRequires: soxr-devel
BuildRequires: vamp-plugin-sdk-devel >= 2.0
BuildRequires: zip
BuildRequires: zlib-devel
+BuildRequires: python2
#BuildRequires: wxGTK3-devel
# But we will actually use the --toolkit=gtk2 version using --with-wx-version
-BuildRequires: compat-wxGTK3-gtk2-devel
+#BuildRequires: compat-wxGTK3-gtk2-devel
+BuildRequires: wxGTK3-devel
%if 0%{?rhel} >= 8 || 0%{?fedora}
BuildRequires: libappstream-glib
-BuildRequires: python2
%endif
%if %{with ffmpeg}
@@ -122,8 +130,17 @@ grep -q -s libmp3lame.so\| * -R && exit 1
%if (0%{?fedora} && 0%{?fedora} < 28)
export WX_CONFIG=wx-config-3.0-gtk2
%endif
+%if 0%{?rhel} == 7
+export WX_CONFIG=wx-config-3.0
+%endif
+%if %{with ffmpeg} && %{with compat_ffmpeg}
export PKG_CONFIG_PATH=%{_libdir}/compat-ffmpeg28/pkgconfig
+%endif
+
+%if 0%{?rhel} == 7
+. /opt/rh/devtoolset-7/enable
+%endif
aclocal -I m4
autoconf
@@ -140,7 +157,11 @@ autoconf
--without-libsamplerate \
--with-lame=system \
--with-libmad=system \
+%if 0%{?rhel} == 8
+ --without-libtwolame \
+%else
--with-libtwolame=system \
+%endif
--with-libflac=system \
--with-ladspa \
--with-vorbis=system \
@@ -226,6 +247,13 @@ rm %{buildroot}%{_datadir}/doc/%{realname}/LICENSE.txt
%changelog
+* Sat Nov 23 2019 David Timms <iinet.net.au@dtimms> - 2.3.3-1
+- Update to Audacity 2.3.3.
+- Modify wxWidgets build require to wxGTK3 (gtk3 version).
+- Modify libdir patch for 2.3.3.
+- Fix -manual file archive dropping the leading help/ in path.
+- Disable twolame for EPEL-8 as the -devel package isn't available.
+
* Wed Aug 07 2019 Leigh Scott <leigh123linux(a)gmail.com> - 2.3.2-2
- Rebuild for new ffmpeg version
diff --git a/sources b/sources
index 1acec05..163c219 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1ddafe07f4ecb6c650b371bfd016cfa2 audacity-minsrc-2.3.2.tar.xz
+SHA512 (audacity-minsrc-2.3.3.tar.xz) = 4be5f766e9d68d71e83bb1c972dc0390da3736228a5d4af514913aec103a0b4bc9858e77b0377681ae9137ab92596bcedc93221a71c32876e4838d00d5681806
5 years, 1 month
[vlc-bittorrent] Add fix for rfbz#5433
by Leigh Scott
commit 58b875d7e834ead2f9e80ee9bafb1c7d3bef5877
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Nov 29 09:16:20 2019 +0000
Add fix for rfbz#5433
fix-one-past-end-issue.patch | 24 ++++++++++++++++++++++++
vlc-bittorrent.spec | 8 ++++++--
2 files changed, 30 insertions(+), 2 deletions(-)
---
diff --git a/fix-one-past-end-issue.patch b/fix-one-past-end-issue.patch
new file mode 100644
index 0000000..d11853d
--- /dev/null
+++ b/fix-one-past-end-issue.patch
@@ -0,0 +1,24 @@
+From eed8cef593635bf9232b0fc74d9df260e5ca3e32 Mon Sep 17 00:00:00 2001
+From: Leigh Scott <leigh123linux(a)gmail.com>
+Date: Fri, 29 Nov 2019 09:05:26 +0000
+Subject: [PATCH] fix one-past-end issue
+
+See issue for details.
+https://github.com/arvidn/libtorrent/issues/4126
+---
+ src/download.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/download.cpp b/src/download.cpp
+index 432dcd5..64d2792 100644
+--- a/src/download.cpp
++++ b/src/download.cpp
+@@ -318,7 +318,7 @@ Download::move_window(int piece)
+ return;
+
+ // Move to first unfinished piece
+- for (; m_torrent_handle.have_piece(piece) && piece < np; piece++);
++ for (; piece < np && m_torrent_handle.have_piece(piece) ; piece++);
+
+ m_window_start = piece;
+
diff --git a/vlc-bittorrent.spec b/vlc-bittorrent.spec
index f8e5174..81412ec 100644
--- a/vlc-bittorrent.spec
+++ b/vlc-bittorrent.spec
@@ -1,11 +1,12 @@
Name: vlc-bittorrent
Version: 2.7
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Bittorrent plugin for VLC
License: GPLv3+
URL: https://github.com/johang/vlc-bittorrent
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
+Patch0: %{url}/pull/37.patch#/fix-one-past-end-issue.patch
BuildRequires: gcc-c++
BuildRequires: libtool
@@ -27,7 +28,7 @@ VLC and stream any media that it contains.
%prep
-%autosetup
+%autosetup -p1
autoreconf -vif
%build
@@ -66,6 +67,9 @@ fi || :
%changelog
+* Fri Nov 29 2019 Leigh Scott <leigh123linux(a)gmail.com> - 2.7-3
+- Add fix for rfbz#5433
+
* Mon Oct 28 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 2.7-2
- Rebuild for libtorrent SONAME bump
5 years, 1 month
[gimp-heif-plugin] Rebuild for new libheif version
by Leigh Scott
commit b0a3f7bf031ab059afbd8cfdc88632c657451bba
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Thu Nov 28 13:05:17 2019 +0000
Rebuild for new libheif version
gimp-heif-plugin.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/gimp-heif-plugin.spec b/gimp-heif-plugin.spec
index db292bb..c1f306a 100644
--- a/gimp-heif-plugin.spec
+++ b/gimp-heif-plugin.spec
@@ -1,6 +1,6 @@
Name: gimp-heif-plugin
Version: 1.1.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: A plugin for loading and saving HEIF images
License: GPLv3
@@ -42,6 +42,9 @@ intltoolize --copy --force --automake
%changelog
+* Thu Nov 28 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 1.1.0-6
+- Rebuild for new libheif version
+
* Sun Nov 03 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 1.1.0-5
- Rebuild for new libheif version
5 years, 1 month