[mythtv] Update to v29.1-18-g5f20e4f3f7 from branch fixes/29
by Richard Shaw
commit abacd1634dfacb9a8b0c3febdaee95b03c119a81
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Thu May 10 08:47:26 2018 -0500
Update to v29.1-18-g5f20e4f3f7 from branch fixes/29
.gitignore | 1 +
mythtv.spec | 11 +++++++----
sources | 2 +-
update_fixes.sh | 2 +-
4 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6854319..38488f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ mythtv-0.27.5.tar.gz
/mythtv-29.0-771115f47d.tar.gz
/mythtv-29.1-9b7b962834.tar.gz
/mythtv-29.1-925ceea0fb.tar.gz
+/mythtv-29.1-5f20e4f3f7.tar.gz
diff --git a/mythtv.spec b/mythtv.spec
index 3f7c4b7..443b6da 100644
--- a/mythtv.spec
+++ b/mythtv.spec
@@ -57,10 +57,10 @@
%define desktop_applications mythfrontend mythtv-setup
# MythTV Version string -- preferably the output from git describe
-%define githash 925ceea0fb269b005ae94381374419b1c8389f5e
+%define githash 5f20e4f3f7e1dc3199888e9004d91b835a78f302
%define shorthash %(c=%{githash}; echo ${c:0:10})
-%define vers_string v29.1-8-g925ceea0fb
-%define rel_string .20180228.8.g925ceea0fb
+%define vers_string v29.1-18-g5f20e4f3f7
+%define rel_string .20180509.18.g5f20e4f3f7
%define branch fixes/29
@@ -72,7 +72,7 @@
#
Name: mythtv
Version: 29.1
-Release: 15%{?rel_string}%{?dist}
+Release: 16%{?rel_string}%{?dist}
Summary: A digital video recorder (DVR) application
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -1396,6 +1396,9 @@ exit 0
%changelog
+* Thu May 10 2018 Richard Shaw <hobbes1069(a)gmail.com> - 29.1-16.20180509.18.g5f20e4f3f7
+- Update to v29.1-18-g5f20e4f3f7 from branch fixes/29
+
* Fri Mar 09 2018 Sérgio Basto <sergio(a)serjux.com> - 29.1-15.20180228.8.g925ceea0fb
- Fixes nothing provides mythnetvision needed by mythplugins on epel7
diff --git a/sources b/sources
index a5f09ca..05c974b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-14a9c7932412f5eff7fa4d81836ea094 mythtv-29.1-925ceea0fb.tar.gz
+89bbcf212417fb3f16c70058dd2ee58c mythtv-29.1-5f20e4f3f7.tar.gz
diff --git a/update_fixes.sh b/update_fixes.sh
index 4c605e0..7fb106a 100755
--- a/update_fixes.sh
+++ b/update_fixes.sh
@@ -1,4 +1,4 @@
-git clone git://github.com/MythTV/mythtv.git
+#git clone git://github.com/MythTV/mythtv.git
version=29.1
branch=fixes/29
pushd mythtv
5 years, 11 months
[deadbeef] Update patches to use upstream code.
by Vasiliy Glazov
commit 10d04f45334afca2b9dc14c42a966220fd6ea8b0
Author: Vasiliy Glazov <vascom2(a)gmail.com>
Date: Thu May 10 15:15:42 2018 +0300
Update patches to use upstream code.
adplug-2.2.1-signed-char.patch | 24 +++++++++++++++++-------
deadbeef.spec | 7 +++++--
desktop.patch | 5 +++--
sidplay-libs-gcc6.patch | 30 +++++++++++-------------------
4 files changed, 36 insertions(+), 30 deletions(-)
---
diff --git a/adplug-2.2.1-signed-char.patch b/adplug-2.2.1-signed-char.patch
index ec3be43..2a138ed 100644
--- a/adplug-2.2.1-signed-char.patch
+++ b/adplug-2.2.1-signed-char.patch
@@ -1,22 +1,32 @@
---- plugins/adplug/adplug/s3m.cpp
-+++ plugins/adplug/adplug/s3m.cpp
+diff -uNdr deadbeef-0.7.2_orig/plugins/adplug/adplug/s3m.cpp deadbeef-0.7.2_new/plugins/adplug/adplug/s3m.cpp
+--- deadbeef-0.7.2_orig/plugins/adplug/adplug/s3m.cpp 2016-06-19 14:26:18.000000000 +0300
++++ deadbeef-0.7.2_new/plugins/adplug/adplug/s3m.cpp 2018-05-10 14:08:22.481231976 +0300
@@ -26,7 +26,7 @@
#include <string.h>
#include "s3m.h"
-const char Cs3mPlayer::chnresolv[] = // S3M -> adlib channel conversion
-+const signed char Cs3mPlayer::chnresolv[] = // S3M -> adlib channel conversion
++const int8_t Cs3mPlayer::chnresolv[] = // S3M -> adlib channel conversion
{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,1,2,3,4,5,6,7,8,-1,-1,-1,-1,-1,-1,-1};
const unsigned short Cs3mPlayer::notetable[12] = // S3M adlib note table
---- plugins/adplug/adplug/s3m.h
-+++ plugins/adplug/adplug/s3m.h
-@@ -92,7 +92,7 @@ class Cs3mPlayer: public CPlayer
+diff -uNdr deadbeef-0.7.2_orig/plugins/adplug/adplug/s3m.h deadbeef-0.7.2_new/plugins/adplug/adplug/s3m.h
+--- deadbeef-0.7.2_orig/plugins/adplug/adplug/s3m.h 2016-06-19 14:26:18.000000000 +0300
++++ deadbeef-0.7.2_new/plugins/adplug/adplug/s3m.h 2018-05-10 14:07:39.071591002 +0300
+@@ -23,6 +23,7 @@
+ #define H_ADPLUG_S3M
+
+ #include "player.h"
++#include <cstdint>
+
+ class Cs3mPlayer: public CPlayer
+ {
+@@ -92,7 +93,7 @@
char filetype[30];
private:
- static const char chnresolv[];
-+ static const signed char chnresolv[];
++ static const int8_t chnresolv[];
static const unsigned short notetable[12];
static const unsigned char vibratotab[32];
diff --git a/deadbeef.spec b/deadbeef.spec
index 995782b..9af52d9 100644
--- a/deadbeef.spec
+++ b/deadbeef.spec
@@ -1,6 +1,6 @@
Name: deadbeef
Version: 0.7.2
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: An audio player for GNU/Linux
Summary(ru): Музыкальный проигрыватель для GNU/Linux
@@ -78,7 +78,7 @@ This package contains plugins for %{name}
%prep
-%autosetup -p0
+%autosetup -p1
# Remove exec permission from source files
find . \( -name '*.cpp' -or -name '*.hpp' -or -name '*.h' \) -and -executable -exec chmod -x {} \;
@@ -134,6 +134,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
%changelog
+* Thu May 10 2018 Vasiliy N. Glazov <vascom2(a)gmail.com> - 0.7.2-6
+- Correct patches as in upstream
+
* Fri May 04 2018 Vasiliy N. Glazov <vascom2(a)gmail.com> - 0.7.2-5
- Rebuild with new ffmpeg
diff --git a/desktop.patch b/desktop.patch
index 5527b17..147f71f 100644
--- a/desktop.patch
+++ b/desktop.patch
@@ -1,5 +1,6 @@
---- deadbeef.desktop.in 2016-04-27 09:19:10.000000000 -0600
-+++ deadbeef.desktop-1.in 2016-04-27 12:52:26.510991183 -0600
+diff -uNdr deadbeef-0.7.2_orig/deadbeef.desktop.in deadbeef-0.7.2_new/deadbeef.desktop.in
+--- deadbeef-0.7.2_orig/deadbeef.desktop.in 2016-06-19 14:26:18.000000000 +0300
++++ deadbeef-0.7.2_new/deadbeef.desktop.in 2018-05-10 14:00:34.981900715 +0300
@@ -18,60 +18,60 @@
X-Ayatana-Desktop-Shortcuts=Play;Pause;Stop;Next;Prev
diff --git a/sidplay-libs-gcc6.patch b/sidplay-libs-gcc6.patch
index f189cff..2f8f7cf 100644
--- a/sidplay-libs-gcc6.patch
+++ b/sidplay-libs-gcc6.patch
@@ -1,22 +1,14 @@
---- plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.cpp.orig
-+++ plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.cpp
-@@ -94,7 +94,7 @@
- '\x08', '\x19', '\x2a', '\x3b', '\x4c', '\x5d', '\x6e', '\x7f'
- };
+diff -uNdr deadbeef-0.7.2_orig/plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.cpp deadbeef-0.7.2_new/plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.cpp
+--- deadbeef-0.7.2_orig/plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.cpp 2016-06-19 14:26:18.000000000 +0300
++++ deadbeef-0.7.2_new/plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.cpp 2018-05-10 13:46:50.910531570 +0300
+@@ -83,8 +83,8 @@
*/
--const int8_t XSID::sampleConvertTable[16] =
-+const char XSID::sampleConvertTable[16] =
+ const int8_t XSID::sampleConvertTable[16] =
{
- '\x80', '\x94', '\xa9', '\xbc', '\xce', '\xe1', '\xf2', '\x03',
- '\x1b', '\x2a', '\x3b', '\x49', '\x58', '\x66', '\x73', '\x7f'
---- plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.h.orig
-+++ plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.h
-@@ -238,7 +238,7 @@
- uint8_t sidData0x18;
- bool _sidSamples;
- int8_t sampleOffset;
-- static const int8_t sampleConvertTable[16];
-+ static const char sampleConvertTable[16];
- bool wasRunning;
+- '\x80', '\x94', '\xa9', '\xbc', '\xce', '\xe1', '\xf2', '\x03',
+- '\x1b', '\x2a', '\x3b', '\x49', '\x58', '\x66', '\x73', '\x7f'
++ -128, -108, -87, -68, -50, -31, -14,
++ 3, 27, 42, 59, 73, 88, 102, 115, 127
+ };
- private:
+ const char *XSID::credit =
5 years, 11 months
[live555] fix date
by Alexandre Detiste
commit bd4206cc53baf39509ccc15598c874da5e4082d6
Author: Alexandre Detiste <alexandre.detiste(a)gmail.com>
Date: Thu May 10 14:11:07 2018 +0200
fix date
live555.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/live555.spec b/live555.spec
index dae8382..3f226fe 100644
--- a/live555.spec
+++ b/live555.spec
@@ -117,7 +117,7 @@ chmod +x %{buildroot}%{_libdir}/*.so*
%changelog
-* Tue May 09 2018 Alexandre Detiste <alexandre(a)detiste.be> - 2018.04.25-1
+* Thu May 10 2018 Alexandre Detiste <alexandre(a)detiste.be> - 2018.04.25-1
- Update to 2018.04.25
* Sun Mar 11 2018 Alexandre Detiste <alexandre(a)detiste.be> - 2018.02.28-1
5 years, 11 months
[live555] add sources
by Alexandre Detiste
commit 80341a797c813ba56382e0d7f2b993f63fd5b444
Author: Alexandre Detiste <alexandre.detiste(a)gmail.com>
Date: Thu May 10 14:10:29 2018 +0200
add sources
sources | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/sources b/sources
index 00cd3b0..bbdd1f5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4480fa0d559ea04d8a478fcfd0dc5dd2 live.2018.02.28.tar.gz
+9b58a5d62659eb29b9bd85d1b29c3a75 live.2018.04.25.tar.gz
5 years, 11 months
[game-data-packager] new upstream release
by Alexandre Detiste
commit 62c00f12dac3ec0e10ab3ebbc08d9701eaa91995
Author: Alexandre Detiste <alexandre.detiste(a)gmail.com>
Date: Thu May 10 14:03:05 2018 +0200
new upstream release
.gitignore | 1 +
game-data-packager.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3f22753..8fe21fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
/game-data-packager_56.tar.xz
/game-data-packager_57.tar.xz
/game-data-packager_58.tar.xz
+/game-data-packager_59.tar.xz
diff --git a/game-data-packager.spec b/game-data-packager.spec
index 43d9f12..29d38bf 100644
--- a/game-data-packager.spec
+++ b/game-data-packager.spec
@@ -18,8 +18,8 @@
%endif
Name: game-data-packager
-Version: 58
-Release: 2%{?gver}%{?dist}
+Version: 59
+Release: 1%{?gver}%{?dist}
Summary: Installer for game data files
License: GPLv2 and GPLv2+
Url: https://wiki.debian.org/Games/GameDataPackager
@@ -128,6 +128,9 @@ rm -v $RPM_BUILD_ROOT/usr/share/man/man6/quake*.6
%license COPYING
%changelog
+* Thu May 10 2018 Alexandre Detiste <alexandre.detiste(a)gmail.com> - 59-1
+- New upstream release
+
* Thu Mar 01 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 58-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
diff --git a/sources b/sources
index 3c0c6c7..aa611bc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dfbdbbeb940329ca9c25b763ce6c5e4e game-data-packager_58.tar.xz
+65de19bf50373506037783bc03b44d92 game-data-packager_59.tar.xz
5 years, 11 months
[qtox/f28] Rebuild with new Toxcore
by Robert-André Mauchin
commit 3502319b5f67d628b8abec9c715dd224d3b67d88
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Thu May 10 12:58:31 2018 +0200
Rebuild with new Toxcore
qtox.spec | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/qtox.spec b/qtox.spec
index 7ffaab0..f4d37a8 100644
--- a/qtox.spec
+++ b/qtox.spec
@@ -1,6 +1,6 @@
Name: qtox
Version: 1.15.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Feature-rich Tox client
# Main program: GPLv3+
@@ -23,7 +23,7 @@ BuildRequires: libappstream-glib
BuildRequires: pkgconfig(Qt5)
BuildRequires: pkgconfig(Qt5Svg)
BuildRequires: qtsingleapplication
-BuildRequires: pkgconfig(libtoxcore)
+BuildRequires: pkgconfig(toxcore)
BuildRequires: pkgconfig(libavcodec)
BuildRequires: pkgconfig(openal)
BuildRequires: pkgconfig(libqrencode)
@@ -87,15 +87,15 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/qTox.appd
%changelog
+* Thu May 10 2018 Robert-André Mauchin <zebob.m(a)gmail.com> - 1.15.0-2
+- Rebuild with new Toxcore
+
* Thu Apr 19 2018 Robert-André Mauchin <zebob.m(a)gmail.com> - 1.15.0-1
- Upstream release 1.15.0
* Thu Apr 19 2018 Robert-André Mauchin <zebob.m(a)gmail.com> - 1.14.1-1
- Upstream release 1.14.1
-* Thu Mar 08 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 1.13.0-3
-- Rebuilt for new ffmpeg snapshot
-
* Fri Feb 16 2018 Robert-André Mauchin <zebob.m(a)gmail.com> 1.13.0-2
- Spec file refresh
- Move Appdata to metainfo
5 years, 11 months