[mythtv] fix rfbz #4684, Use mariadb-connector-c-devel instead of mysql-devel or mariadb-devel
by Sérgio M. Basto
commit 818832e15d10f7928df83ce43c5baa52ec579011
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sat Jan 20 02:25:15 2018 +0000
fix rfbz #4684, Use mariadb-connector-c-devel instead of mysql-devel or
mariadb-devel
mythtv.spec | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/mythtv.spec b/mythtv.spec
index 2acefd9..e60a799 100644
--- a/mythtv.spec
+++ b/mythtv.spec
@@ -78,7 +78,7 @@
#
Name: mythtv
Version: 29.0
-Release: 8%{?rel_string}%{?dist}
+Release: 9%{?rel_string}%{?dist}
Summary: A digital video recorder (DVR) application
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -166,7 +166,7 @@ BuildRequires: qt5-qtbase-devel >= 5.2
BuildRequires: qt5-qtscript-devel >= 5.2
BuildRequires: qt5-qtwebkit-devel >= 5.2
BuildRequires: freetype-devel >= 2
-%if 0%{?fedora} >= 28
+%if 0%{?fedora} > 24
BuildRequires: mariadb-connector-c-devel
%else
BuildRequires: mariadb-devel >= 5
@@ -357,7 +357,7 @@ Requires: python-MythTV = %{version}-%{release}
Requires: mythplugins = %{version}-%{release}
Requires: mythweb = %{version}
Requires: mythffmpeg = %{version}-%{release}
-Requires: mariadb-server >= 5, mariadb >= 5
+Requires: mysql-compat-server >= 5, mysql >= 5
%{?fedora:Recommends: xmltv}
# Generate the required mythtv-frontend-api version string here so we only
@@ -420,8 +420,11 @@ Summary: Development files for mythtv
Requires: mythtv-libs = %{version}-%{release}
Requires: freetype-devel >= 2
-Requires: mariadb-devel >= 5
-#Requires: mariadb-connector-c-devel
+%if 0%{?fedora} > 24
+BuildRequires: mariadb-connector-c-devel
+%else
+BuildRequires: mariadb-devel >= 5
+%endif
Requires: qt5-qtbase-devel >= 5.2
Requires: qt5-qtscript-devel >= 5.2
Requires: qt5-qtwebkit-devel >= 5.2
@@ -507,7 +510,7 @@ Requires: freetype, lame
Requires: perl(XML::Simple)
Requires: mythtv-common = %{version}-%{release}
Requires: mythtv-base-themes = %{version}
-Requires: mariadb >= 5
+Requires: mysql >= 5
Requires: python-MythTV
%if 0%{?fedora}
Recommends: libaacs
@@ -1373,6 +1376,10 @@ exit 0
%changelog
+* Sat Jan 20 2018 Sérgio Basto <sergio(a)serjux.com> - 29.0-9.20180111.77.g771115f47d
+- fix rfbz #4684, Use mariadb-connector-c-devel instead of mysql-devel or
+ mariadb-devel
+
* Tue Jan 16 2018 Richard Shaw <hobbes1069(a)gmail.com> - 29.0-8.20180111.77.g771115f47d
- Update to v29.0-77-g771115f47d from branch fixes/29
6 years, 4 months
[mythtv] Update ChangeLog
by Sérgio M. Basto
commit 4fc84807a9e69699724ad1ea26c47468aa60253d
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sat Jan 20 01:50:59 2018 +0000
Update ChangeLog
ChangeLog | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 64 insertions(+)
---
diff --git a/ChangeLog b/ChangeLog
index 89d076f..b7c7f63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,67 @@
+commit 771115f47d39095652f8f660d3477008a0cbce12
+Author: David Hampton <mythtv(a)love2code.net>
+Date: Tue Jan 9 08:56:00 2018 -0500
+
+ Update qmake project files for a minimum 5.2 version.
+
+ Remove all clauses related to Qt4. Remove any checks for Qt5, keeping
+ the needed changes to the QT variable.
+
+ (cherry picked from commit d6e2e23dedd28dd4dec70ac39efaf09207f5d175)
+
+commit 993468df3882934f2bc1e29248cbc0cc2a958e4c
+Author: David Hampton <mythtv(a)love2code.net>
+Date: Tue Jan 9 00:30:02 2018 -0500
+
+ Clean up Qt version checking in 'configure'.
+
+ Make mythtv/configure the "one true source of truth" for the minimum
+ Qt version. Make it easier to compare Qt version numbers by
+ converting them from strings to numbers before comparison. Remove Qt4
+ related checks (since the minimum Qt version is already 5.2).
+
+ (cherry picked from commit 85aa2363451fefa2abd9af1cd886a7a86a7cd9a1)
+
+commit 5d976d25a75c955584a3f9b67034b9ef86f6d94c
+Author: David Hampton <mythtv(a)love2code.net>
+Date: Mon Jan 8 19:09:18 2018 -0500
+
+ Clean up the checks for finding the qmake executable.
+
+ Throw away error output from the 'which' command so that garbage
+ doesn't get into the list of possible locations for qmake. Make the
+ tests for qmake in the mythplugins directory the same as in the mythtv
+ directory.
+
+ (cherry picked from commit 3f5aa0c9f2425e7c54d79ce23d239f1afd29b220)
+
+commit 72a9c64c7f92b21bd9a0d230ed9a6c78e7f837de
+Author: Peter Bennett <pbennett(a)mythtv.org>
+Date: Sat Jan 6 13:57:34 2018 -0500
+
+ Fix crash when invoking Interactive TV (MHEG) pages
+
+ Fixes #13194
+
+ (cherry picked from commit 5dea615d059984e52404c242d1af33ca97b19023)
+
+commit e2956d025f40ad7c8c69db4de477a0bd6448057e
+Author: Paul Harrison <pharrison(a)mythtv.org>
+Date: Sun Oct 22 11:02:03 2017 +0100
+
+ MythMusic: stop the player on first error when playing radio streams
+
+ (cherry picked from commit 33671e75d4ea8464386011002f7688154addeb15)
+
+commit 9dbf6706337b72b132f34d6c8e9f305609a44d7e
+Author: Mark Spieth <mspieth(a)digivation.com.au>
+Date: Thu Jan 4 09:54:47 2018 +1100
+
+ ttvdb.py: Handle missing banners gracefully
+
+ fixes #13199
+ (cherry picked from commit 6c0c90a27bc287d19abeef7fb1d3a17f02369aa3)
+
commit 339b08e4677135ad57b2f1e43e5535878143a65b
Author: Peter Bennett <pbennett(a)mythtv.org>
Date: Tue Dec 26 13:53:47 2017 -0500
6 years, 4 months
[lives] fix patch
by Leigh Scott
commit b9ed4e800f8aa6fbebc6b7389448613dda2d427f
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Jan 19 22:54:39 2018 +0000
fix patch
ffmpeg35_buildfix.patch | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/ffmpeg35_buildfix.patch b/ffmpeg35_buildfix.patch
index 6beefb5..9be72a1 100644
--- a/ffmpeg35_buildfix.patch
+++ b/ffmpeg35_buildfix.patch
@@ -184,7 +184,7 @@
get_samps_and_signed(cc->sample_fmt, &cdata->asamps, &cdata->asigned);
- sprintf(cdata->audio_name, "%s", cc->codec_name);
-+ sprintf(cdata->audio_name, "%s", cc->codec_type);
++ sprintf(cdata->audio_name, "%s", avcodec_get_name(cc->codec_id));
priv->astream = i;
break;
@@ -193,7 +193,7 @@
}
- sprintf(cdata->video_name, "%s", cc->codec_name);
-+ sprintf(cdata->video_name, "%s", cc->codec_type);
++ sprintf(cdata->video_name, "%s", avcodec_get_name(cc->codec_id));
cdata->par = cc->sample_aspect_ratio.num / cc->sample_aspect_ratio.den;
if (cdata->par == 0) cdata->par = 1;
6 years, 4 months
[dwarffortress] Update to Dwarf Fortress 0.44.05.
by Ben Rosser
commit ae133ba3166068e761cf19fb9cc39fd09b57cd0f
Author: Ben Rosser <rosser.bjr(a)gmail.com>
Date: Fri Jan 19 14:46:19 2018 -0500
Update to Dwarf Fortress 0.44.05.
.gitignore | 3 +++
dwarffortress.spec | 9 ++++++---
sources | 6 +++---
3 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fec22fb..b6930eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,6 @@
/df_44_04_linux.tar.bz2
/df_44_04_linux32.tar.bz2
/0.44.04.zip
+/df_44_05_linux.tar.bz2
+/df_44_05_linux32.tar.bz2
+/0.44.05.zip
diff --git a/dwarffortress.spec b/dwarffortress.spec
index e242704..350a2f3 100644
--- a/dwarffortress.spec
+++ b/dwarffortress.spec
@@ -4,15 +4,15 @@
%global __strip /bin/true
Name: dwarffortress
-Version: 0.44.04
+Version: 0.44.05
Release: 1%{?dist}
Summary: A single-player procedurally generated fantasy game
License: Dwarf Fortress
URL: http://www.bay12games.com/dwarves/
-Source0: http://www.bay12games.com/dwarves/df_44_04_linux.tar.bz2
-Source1: http://www.bay12games.com/dwarves/df_44_04_linux32.tar.bz2
+Source0: http://www.bay12games.com/dwarves/df_44_05_linux.tar.bz2
+Source1: http://www.bay12games.com/dwarves/df_44_05_linux32.tar.bz2
Source2: https://github.com/svenstaro/dwarf_fortress_unfuck/archive/%{version}.zip
Source3: https://mars.arosser.com/fedora/dwarffortress/rpmfusion/dwarffortress-lau...
@@ -129,6 +129,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%{_datadir}/appdata/dwarffortress.appdata.xml
%changelog
+* Fri Jan 19 2018 Ben Rosser <rosser.bjr(a)gmail.com> 0.44.05-1
+- Updated to latest upstream release.
+
* Fri Jan 12 2018 Ben Rosser <rosser.bjr(a)gmail.com> 0.44.04-1
- Updated to latest upstream release.
diff --git a/sources b/sources
index c984f52..8df021f 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
df7f7f5f00c918504c3fa2147566154f dwarffortress-launcher.tar.xz
-d63ffc24ea3170565b3fcf822da7e34e df_44_04_linux.tar.bz2
-23a1a434b422ea790558476e04f40bdb df_44_04_linux32.tar.bz2
-120a9de16e8e3c687877da2ccc6a2f08 0.44.04.zip
+a46e71621073c4c01b6f6b0ef79e4537 df_44_05_linux.tar.bz2
+f5fd53ac10cc74f4828b35697896615d df_44_05_linux32.tar.bz2
+f3663c7746b85335a1e1af26bd07297b 0.44.05.zip
6 years, 4 months
[lives] Add build fix for ffmpeg-3.5 git
by Leigh Scott
commit 4cefa42ac25f14a2be76d40449733ade316ffd4d
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Jan 19 19:06:09 2018 +0000
Add build fix for ffmpeg-3.5 git
ffmpeg35_buildfix.patch | 200 ++++++++++++++++++++++++++++++++++++++++++++++++
lives.spec | 7 +-
2 files changed, 206 insertions(+), 1 deletion(-)
---
diff --git a/ffmpeg35_buildfix.patch b/ffmpeg35_buildfix.patch
new file mode 100644
index 0000000..6beefb5
--- /dev/null
+++ b/ffmpeg35_buildfix.patch
@@ -0,0 +1,200 @@
+--- a/lives-plugins/plugins/decoders/asf_decoder.c
++++ b/lives-plugins/plugins/decoders/asf_decoder.c
+@@ -439,7 +439,7 @@
+
+
+ if (tdts == -1) {
+- priv->avpkt.size = priv->def_packet_size + FF_INPUT_BUFFER_PADDING_SIZE;
++ priv->avpkt.size = priv->def_packet_size + AV_INPUT_BUFFER_PADDING_SIZE;
+ priv->avpkt.data = malloc(priv->avpkt.size);
+ memset(priv->avpkt.data, 0, priv->avpkt.size);
+ }
+@@ -714,10 +714,10 @@
+ fprintf(stderr, "asf_decoder: buffer overflow reading vid packet (%d + %d > %d),\n increasing buffer size\n",
+ asf->packet_frag_offset, asf->packet_frag_size, priv->avpkt.size);
+
+- priv->avpkt.data = realloc(priv->avpkt.data, priv->def_packet_size * 2 + FF_INPUT_BUFFER_PADDING_SIZE);
++ priv->avpkt.data = realloc(priv->avpkt.data, priv->def_packet_size * 2 + AV_INPUT_BUFFER_PADDING_SIZE);
+ memset(priv->avpkt.data + priv->avpkt.size, 0, priv->def_packet_size);
+ priv->def_packet_size *= 2;
+- priv->avpkt.size = priv->def_packet_size + FF_INPUT_BUFFER_PADDING_SIZE;
++ priv->avpkt.size = priv->def_packet_size + AV_INPUT_BUFFER_PADDING_SIZE;
+ }
+
+ if (read(priv->fd, priv->avpkt.data + asf->packet_frag_offset, asf->packet_frag_size)
+@@ -1436,8 +1436,8 @@
+ if (!got_vidst) {
+ priv->st->codec->extradata_size = size - 40;
+
+- priv->st->codec->extradata = malloc(priv->st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
+- memset(priv->st->codec->extradata, 0, priv->st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
++ priv->st->codec->extradata = malloc(priv->st->codec->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);
++ memset(priv->st->codec->extradata, 0, priv->st->codec->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);
+
+ if (read(priv->fd, priv->st->codec->extradata,
+ priv->st->codec->extradata_size) < priv->st->codec->extradata_size) {
+
+--- a/lives-plugins/plugins/decoders/mpegts_decoder.c
++++ b/lives-plugins/plugins/decoders/mpegts_decoder.c
+@@ -125,7 +125,7 @@
+
+ /**
+ * init GetBitContext.
+- * @param buffer bitstream buffer, must be FF_INPUT_BUFFER_PADDING_SIZE bytes larger than the actual read bits
++ * @param buffer bitstream buffer, must be AV_INPUT_BUFFER_PADDING_SIZE bytes larger than the actual read bits
+ * because some optimized bitstream readers read 32 or 64 bit at once and could read over the end
+ * @param bit_size the size of the buffer in bits
+ *
+@@ -1035,7 +1035,7 @@
+ fprintf(stderr, "mpegts_decoder: PES packet size mismatch\n");
+ //pes->flags |= AV_PKT_FLAG_CORRUPT;
+ }
+- memset(pkt->data + pkt->size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
++ memset(pkt->data + pkt->size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
+
+ // Separate out the AC3 substream from an HDMV combined TrueHD/AC3 PID
+ if (pes->sub_st && pes->stream_type == 0x83 && pes->extended_stream_id == 0x76)
+@@ -1192,7 +1192,7 @@
+ pes->total_size = MAX_PES_PAYLOAD;
+
+ /* allocate pes buffer */
+- pes->buffer = av_malloc(pes->total_size + FF_INPUT_BUFFER_PADDING_SIZE);
++ pes->buffer = av_malloc(pes->total_size + AV_INPUT_BUFFER_PADDING_SIZE);
+ if (!pes->buffer)
+ return AVERROR(ENOMEM);
+
+@@ -1289,7 +1289,7 @@
+ if (pes->data_index > 0 && pes->data_index + buf_size > pes->total_size) {
+ new_pes_packet(pes, ts->pkt);
+ pes->total_size = MAX_PES_PAYLOAD;
+- pes->buffer = av_malloc(pes->total_size + FF_INPUT_BUFFER_PADDING_SIZE);
++ pes->buffer = av_malloc(pes->total_size + AV_INPUT_BUFFER_PADDING_SIZE);
+ if (!pes->buffer)
+ return AVERROR(ENOMEM);
+ ts->stop_parse = 1;
+@@ -1454,7 +1454,7 @@
+ if (!len || (uint64_t)len > (1 << 30))
+ return -1;
+ av_free(st->codec->extradata);
+- st->codec->extradata = av_mallocz(len + FF_INPUT_BUFFER_PADDING_SIZE);
++ st->codec->extradata = av_mallocz(len + AV_INPUT_BUFFER_PADDING_SIZE);
+ if (!st->codec->extradata)
+ return AVERROR(ENOMEM);
+ memcpy(st->codec->extradata, p, len);
+@@ -1802,7 +1802,7 @@
+ //if (st->codec->extradata_size == 4 && memcmp(st->codec->extradata, *pp, 4))
+ //av_log_ask_for_sample(fc, "DVB sub with multiple IDs\n");
+ //} else {
+- st->codec->extradata = av_malloc(4 + FF_INPUT_BUFFER_PADDING_SIZE);
++ st->codec->extradata = av_malloc(4 + AV_INPUT_BUFFER_PADDING_SIZE);
+ if (st->codec->extradata) {
+ st->codec->extradata_size = 4;
+ memcpy(st->codec->extradata, *pp, 4);
+@@ -3141,8 +3141,8 @@
+
+ priv->codec = codec;
+
+- if (codec->capabilities & CODEC_CAP_TRUNCATED)
+- ctx->flags |= CODEC_FLAG_TRUNCATED;
++ if (codec->capabilities & AV_CODEC_CAP_TRUNCATED)
++ ctx->flags |= AV_CODEC_FLAG_TRUNCATED;
+
+ // re-scan with avcodec; priv->data_start holds video data start position
+
+--- a/lives-plugins/plugins/decoders/flv_decoder.c
++++ b/lives-plugins/plugins/decoders/flv_decoder.c
+@@ -465,7 +465,7 @@
+ lives_flv_priv_t *priv = cdata->priv;
+
+ av_free(priv->ctx->extradata);
+- priv->ctx->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
++ priv->ctx->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
+ if (priv->ctx->extradata == NULL) return AVERROR(ENOMEM);
+ priv->ctx->extradata_size = size;
+ dummy = read(priv->fd, priv->ctx->extradata, priv->ctx->extradata_size);
+@@ -1143,12 +1143,12 @@
+
+ if (isclone) return TRUE;
+
+- pack.data = malloc(pack.size - priv->pack_offset + FF_INPUT_BUFFER_PADDING_SIZE);
++ pack.data = malloc(pack.size - priv->pack_offset + AV_INPUT_BUFFER_PADDING_SIZE);
+
+ av_init_packet(&priv->avpkt);
+
+ priv->avpkt.size = read(priv->fd, pack.data, pack.size - priv->pack_offset);
+- memset(pack.data + priv->avpkt.size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
++ memset(pack.data + priv->avpkt.size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
+ priv->input_position += pack.size + 4;
+ priv->avpkt.data = pack.data;
+ priv->avpkt.dts = priv->avpkt.pts = pack.dts;
+@@ -1206,10 +1206,10 @@
+ continue;
+ }
+
+- pack.data = malloc(pack.size - priv->pack_offset + FF_INPUT_BUFFER_PADDING_SIZE);
++ pack.data = malloc(pack.size - priv->pack_offset + AV_INPUT_BUFFER_PADDING_SIZE);
+ if (priv->pack_offset != 5) lseek(priv->fd, priv->pack_offset - 5, SEEK_CUR);
+ priv->avpkt.size = read(priv->fd, pack.data, pack.size - priv->pack_offset);
+- memset(pack.data + priv->avpkt.size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
++ memset(pack.data + priv->avpkt.size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
+ priv->avpkt.data = pack.data;
+ break;
+ }
+@@ -1709,12 +1709,12 @@
+ continue;
+ }
+
+- pack.data = malloc(pack.size - priv->pack_offset + FF_INPUT_BUFFER_PADDING_SIZE);
++ pack.data = malloc(pack.size - priv->pack_offset + AV_INPUT_BUFFER_PADDING_SIZE);
+
+ if (priv->pack_offset != 1) lseek(priv->fd, priv->pack_offset - 1, SEEK_CUR);
+
+ priv->avpkt.size = read(priv->fd, pack.data, pack.size - priv->pack_offset);
+- memset(pack.data + priv->avpkt.size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
++ memset(pack.data + priv->avpkt.size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
+ priv->avpkt.data = pack.data;
+ priv->avpkt.dts = priv->avpkt.pts = pack.dts;
+
+
+--- a/lives-plugins/plugins/decoders/mkv_decoder.c
++++ b/lives-plugins/plugins/decoders/mkv_decoder.c
+@@ -883,7 +883,7 @@
+ es = ec / 100;
+ ec -= 100 * es;
+ *ptr++ = '\0';
+- len = 50 + end - ptr + FF_INPUT_BUFFER_PADDING_SIZE;
++ len = 50 + end - ptr + AV_INPUT_BUFFER_PADDING_SIZE;
+ if (!(line = malloc(len)))
+ return;
+ snprintf(line, len, "Dialogue: %s,%d:%02d:%02d.%02d,%d:%02d:%02d.%02d,%s\r\n",
+@@ -1544,7 +1544,7 @@
+ st->codec->extradata_size = extradata_size;
+ } else if (track->codec_priv.data && track->codec_priv.size > 0) {
+ st->codec->extradata = calloc(track->codec_priv.size +
+- FF_INPUT_BUFFER_PADDING_SIZE, 1);
++ AV_INPUT_BUFFER_PADDING_SIZE, 1);
+ if (st->codec->extradata == NULL) {
+ fprintf(stderr,
+ "mkv_decoder: Out of memory\n");
+
+--- a/lives-plugins/plugins/decoders/avformat_decoder.c
++++ b/lives-plugins/plugins/decoders/avformat_decoder.c
+@@ -368,7 +368,7 @@
+
+ get_samps_and_signed(cc->sample_fmt, &cdata->asamps, &cdata->asigned);
+
+- sprintf(cdata->audio_name, "%s", cc->codec_name);
++ sprintf(cdata->audio_name, "%s", cc->codec_type);
+
+ priv->astream = i;
+ break;
+@@ -408,7 +408,7 @@
+ return FALSE;
+ }
+
+- sprintf(cdata->video_name, "%s", cc->codec_name);
++ sprintf(cdata->video_name, "%s", cc->codec_type);
+
+ cdata->par = cc->sample_aspect_ratio.num / cc->sample_aspect_ratio.den;
+ if (cdata->par == 0) cdata->par = 1;
+
diff --git a/lives.spec b/lives.spec
index 8882abe..0166270 100644
--- a/lives.spec
+++ b/lives.spec
@@ -13,13 +13,14 @@
Name: lives
Version: 2.8.7
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Video editor and VJ tool
License: GPLv3+ and LGPLv3+
URL: http://lives-video.com
Source0: http://lives-video.com/releases/LiVES-%{version}.tar.bz2
## Appdata file
Source1: LiVES.appdata.xml
+Patch0: ffmpeg35_buildfix.patch
BuildRequires: pkgconfig(jack)
BuildRequires: pkgconfig(sdl)
@@ -92,6 +93,7 @@ It is small in size, yet it has many advanced features.
%prep
%setup -q -n lives-%{version}
+%patch0 -p1
##Remove spurious executable permissions
for i in `find . -type f \( -name "*.c" -o -name "*.h" -o -name "*.txt" \)`; do
@@ -184,6 +186,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.
%{_datadir}/appdata/LiVES.appdata.xml
%changelog
+* Fri Jan 19 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2.8.7-7
+- Add build fix for ffmpeg-3.5 git
+
* Thu Jan 18 2018 Antonio Trande <sagitterATfedoraproject.org> - 2.8.7-6
- Add tirpc BR package
6 years, 4 months
[mythtv/f26] (10 commits) ...Update updates_fixes.sh with more ideas :)
by Richard Shaw
Summary of changes:
affb8a3... Mass rebuild for x264 and x265 (*)
cbe3ef5... Update to v29.0-71-g339b08e467 from branch fixes/29 (*)
ce80210... Updates for EPEL 7. Disable mythnetvision temporarily and p (*)
b853d3b... Add patch for configure problems with QT 5.10.x (*)
93119ab... rebuilt (*)
9c1bba5... Update to v29.0-77-g771115f47d from branch fixes/29 (*)
020f1b9... Update to v29.0-77-g771115f47d from branch fixes/29 (*)
5658e7a... Update to v29.0-77-g771115f47d from branch fixes/29 (*)
becb551... Fix git hash variables for %%setup. (*)
c74c243... Update updates_fixes.sh with more ideas :) (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 4 months
[mythtv/f27] (10 commits) ...Update updates_fixes.sh with more ideas :)
by Richard Shaw
Summary of changes:
affb8a3... Mass rebuild for x264 and x265 (*)
cbe3ef5... Update to v29.0-71-g339b08e467 from branch fixes/29 (*)
ce80210... Updates for EPEL 7. Disable mythnetvision temporarily and p (*)
b853d3b... Add patch for configure problems with QT 5.10.x (*)
93119ab... rebuilt (*)
9c1bba5... Update to v29.0-77-g771115f47d from branch fixes/29 (*)
020f1b9... Update to v29.0-77-g771115f47d from branch fixes/29 (*)
5658e7a... Update to v29.0-77-g771115f47d from branch fixes/29 (*)
becb551... Fix git hash variables for %%setup. (*)
c74c243... Update updates_fixes.sh with more ideas :) (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 4 months
[lives] Fix links of the libraries
by Antonio
commit 47ef0668cdbbff62bb32b426e6e5d28154b51b5e
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Fri Jan 19 14:34:42 2018 +0100
Fix links of the libraries
lives.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/lives.spec b/lives.spec
index 6d7d16b..8882abe 100644
--- a/lives.spec
+++ b/lives.spec
@@ -103,7 +103,7 @@ done
--enable-largefile --enable-threads --disable-rpath --enable-profiling \
--enable-doxygen --disable-libvisual --disable-projectM
-%make_build CPPFLAGS=-I%{_includedir}/tirpc LIBS=-ltirpc
+%make_build CPPFLAGS=-I%{_includedir}/tirpc LIBS="-ltirpc -ldl"
%install
%make_install
6 years, 4 months
[mplayer] fix version
by Leigh Scott
commit 977ac27fbc84fdccb689edfea746891cc6826a48
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Jan 19 13:21:50 2018 +0000
fix version
mplayer.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/mplayer.spec b/mplayer.spec
index c34dc27..fdd5c84 100644
--- a/mplayer.spec
+++ b/mplayer.spec
@@ -7,7 +7,7 @@
Name: mplayer
Version: 1.3.0
%if 0%{?svn}
-Release: 46.%{?pre}%{?dist}
+Release: 16.%{?pre}%{?dist}
%else
Release: 16%{?dist}
%endif
@@ -383,7 +383,7 @@ update-desktop-database &>/dev/null || :
%{_datadir}/mplayer/*.fp
%changelog
-* Fri Jan 19 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.3.0-46.20180119svn
+* Fri Jan 19 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.3.0-16.20180119svn
- Update to latest svn
* Thu Jan 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.3.0-15
6 years, 4 months
