[mythtv] Bump release back down to 3 for other releases.
by Richard Shaw
commit da8e95ac0e79d3575f1f96846ecd033a885bedd0
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Thu Jun 1 17:40:27 2017 -0500
Bump release back down to 3 for other releases.
mythtv.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/mythtv.spec b/mythtv.spec
index bf27ddf..dbb8b3f 100644
--- a/mythtv.spec
+++ b/mythtv.spec
@@ -85,7 +85,7 @@ Version: 0.28.1
%if "%{branch}" == "master"
Release: 0.5.git.%{_gitrev}%{?dist}
%else
-Release: 4%{?dist}
+Release: 3%{?dist}
%endif
# The primary license is GPLv2+, but bits are borrowed from a number of
7 years, 5 months
[mythtv] Revert use ppc patch since it doesn't work.
by Richard Shaw
commit 9edf02d2f4e98f3683d9fbee199153ce77d3bc53
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Thu Jun 1 17:39:40 2017 -0500
Revert use ppc patch since it doesn't work.
mythtv.spec | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
---
diff --git a/mythtv.spec b/mythtv.spec
index 26f7b2e..bf27ddf 100644
--- a/mythtv.spec
+++ b/mythtv.spec
@@ -1,6 +1,6 @@
# Does not currently build on ppc
# https://code.mythtv.org/trac/ticket/13049
-#ExcludeArch: ppc64 ppc64le
+ExcludeArch: ppc64 ppc64le
# Specfile for building MythTV and MythPlugins RPMs from a git checkout.
#
@@ -1355,9 +1355,6 @@ exit 0
%changelog
-* Thu Jun 1 2017 Richard Shaw <hobbes1069(a)gmail.com> - 0.28.1-4
-- Add patch from upstream to fix ppc bug.
-
* Mon Apr 24 2017 Richard Shaw <hobbes1069(a)gmail.com> - 0.28.1-3
- Update to latest fixes/0.28.
- Exclude ppc64 and ppc64le due to failed builds:
7 years, 5 months
[tvheadend/f26] Fix system DTV scan tables path
by Mohamed ElMorabity
commit 2adf80054c25f8e3c71d1a1c3c70f838a359a197
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Thu Jun 1 22:36:29 2017 +0200
Fix system DTV scan tables path
...-dtv_scan_tables.patch => tvheadend-4.2.2-dtv_scan_tables.patch | 6 +++---
tvheadend.spec | 7 +++++--
2 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/tvheadend-4.2.1-dtv_scan_tables.patch b/tvheadend-4.2.2-dtv_scan_tables.patch
similarity index 65%
rename from tvheadend-4.2.1-dtv_scan_tables.patch
rename to tvheadend-4.2.2-dtv_scan_tables.patch
index f3426c0..5131026 100644
--- a/tvheadend-4.2.1-dtv_scan_tables.patch
+++ b/tvheadend-4.2.2-dtv_scan_tables.patch
@@ -1,12 +1,12 @@
diff -up ./src/input/mpegts/scanfile.c.orig ./src/input/mpegts/scanfile.c
---- ./src/input/mpegts/scanfile.c.orig 2017-04-21 10:32:22.000000000 +0200
-+++ ./src/input/mpegts/scanfile.c 2017-04-23 13:26:56.676950919 +0200
+--- ./src/input/mpegts/scanfile.c.orig 2017-05-16 13:15:24.000000000 +0200
++++ ./src/input/mpegts/scanfile.c 2017-06-01 22:30:29.150834135 +0200
@@ -903,7 +903,7 @@ scanfile_init ( const char *muxconf_path
#elif defined(PLATFORM_FREEBSD)
path = "/usr/local/share/dtv-scan-tables";
#else
- path = "/usr/share/dvb";
-+ path = "/usr/share/dvb5";
++ path = "/usr/share/dvbv5";
#endif
if (!initialized) {
diff --git a/tvheadend.spec b/tvheadend.spec
index c7e52f3..ec52a02 100644
--- a/tvheadend.spec
+++ b/tvheadend.spec
@@ -3,7 +3,7 @@
Name: tvheadend
Version: 4.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: TV streaming server and digital video recorder
Group: Applications/Multimedia
@@ -20,7 +20,7 @@ Patch1: %{name}-4.2.1-service.patch
# Use system queue.h header
Patch2: %{name}-4.0.9-use_system_queue.patch
# Fix system DTV scan tables path
-Patch3: %{name}-4.2.1-dtv_scan_tables.patch
+Patch3: %{name}-4.2.2-dtv_scan_tables.patch
# Enforcing system crypto policies, see
# https://fedoraproject.org/wiki/Packaging:CryptoPolicies
Patch4: %{name}-4.2.1-crypto_policies.patch
@@ -137,6 +137,9 @@ exit 0
%changelog
+* Thu Jun 01 2017 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 4.2.2-2
+- Fix system DTV scan tables path
+
* Tue May 23 2017 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 4.2.2-1
- Update to 4.2.2
- Drop patch for GCC7 (merged upstream)
7 years, 5 months
[tvheadend] Fix system DTV scan tables path
by Mohamed ElMorabity
commit 72fb9796b98a806b87770ae311bed324f671e7aa
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Thu Jun 1 22:36:29 2017 +0200
Fix system DTV scan tables path
...-dtv_scan_tables.patch => tvheadend-4.2.2-dtv_scan_tables.patch | 6 +++---
tvheadend.spec | 7 +++++--
2 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/tvheadend-4.2.1-dtv_scan_tables.patch b/tvheadend-4.2.2-dtv_scan_tables.patch
similarity index 65%
rename from tvheadend-4.2.1-dtv_scan_tables.patch
rename to tvheadend-4.2.2-dtv_scan_tables.patch
index f3426c0..5131026 100644
--- a/tvheadend-4.2.1-dtv_scan_tables.patch
+++ b/tvheadend-4.2.2-dtv_scan_tables.patch
@@ -1,12 +1,12 @@
diff -up ./src/input/mpegts/scanfile.c.orig ./src/input/mpegts/scanfile.c
---- ./src/input/mpegts/scanfile.c.orig 2017-04-21 10:32:22.000000000 +0200
-+++ ./src/input/mpegts/scanfile.c 2017-04-23 13:26:56.676950919 +0200
+--- ./src/input/mpegts/scanfile.c.orig 2017-05-16 13:15:24.000000000 +0200
++++ ./src/input/mpegts/scanfile.c 2017-06-01 22:30:29.150834135 +0200
@@ -903,7 +903,7 @@ scanfile_init ( const char *muxconf_path
#elif defined(PLATFORM_FREEBSD)
path = "/usr/local/share/dtv-scan-tables";
#else
- path = "/usr/share/dvb";
-+ path = "/usr/share/dvb5";
++ path = "/usr/share/dvbv5";
#endif
if (!initialized) {
diff --git a/tvheadend.spec b/tvheadend.spec
index c7e52f3..ec52a02 100644
--- a/tvheadend.spec
+++ b/tvheadend.spec
@@ -3,7 +3,7 @@
Name: tvheadend
Version: 4.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: TV streaming server and digital video recorder
Group: Applications/Multimedia
@@ -20,7 +20,7 @@ Patch1: %{name}-4.2.1-service.patch
# Use system queue.h header
Patch2: %{name}-4.0.9-use_system_queue.patch
# Fix system DTV scan tables path
-Patch3: %{name}-4.2.1-dtv_scan_tables.patch
+Patch3: %{name}-4.2.2-dtv_scan_tables.patch
# Enforcing system crypto policies, see
# https://fedoraproject.org/wiki/Packaging:CryptoPolicies
Patch4: %{name}-4.2.1-crypto_policies.patch
@@ -137,6 +137,9 @@ exit 0
%changelog
+* Thu Jun 01 2017 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 4.2.2-2
+- Fix system DTV scan tables path
+
* Tue May 23 2017 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 4.2.2-1
- Update to 4.2.2
- Drop patch for GCC7 (merged upstream)
7 years, 5 months
[mythtv] Add patch from upstream to fix ppc bug.
by Richard Shaw
commit f464c528f89fb99472a71a5b0f1130f4fe1f6268
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Thu Jun 1 06:43:21 2017 -0500
Add patch from upstream to fix ppc bug.
mythtv.spec | 9 +++++++--
ticket13049-bswap-guard.diff | 13 +++++++++++++
2 files changed, 20 insertions(+), 2 deletions(-)
---
diff --git a/mythtv.spec b/mythtv.spec
index 119b561..26f7b2e 100644
--- a/mythtv.spec
+++ b/mythtv.spec
@@ -1,6 +1,6 @@
# Does not currently build on ppc
# https://code.mythtv.org/trac/ticket/13049
-ExcludeArch: ppc64 ppc64le
+#ExcludeArch: ppc64 ppc64le
# Specfile for building MythTV and MythPlugins RPMs from a git checkout.
#
@@ -85,7 +85,7 @@ Version: 0.28.1
%if "%{branch}" == "master"
Release: 0.5.git.%{_gitrev}%{?dist}
%else
-Release: 3%{?dist}
+Release: 4%{?dist}
%endif
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -137,6 +137,7 @@ Source0: https://github.com/MythTV/%{name}/archive/v%{version}.tar.gz#/%{name}
# Also update ChangeLog with git log v0.28..HEAD > ChangeLog
# and update define vers_string to v0.28-52-ge6a60f7 with git describe
Patch0: mythtv-0.28-fixes.patch
+Patch1: ticket13049-bswap-guard.diff
Source10: PACKAGE-LICENSING
Source11: ChangeLog
@@ -787,6 +788,7 @@ on demand content.
#find -name *.pyc -exec rm -f {} \;
%patch0 -p1
+%patch1 -p1
# Install ChangeLog
install -m 0644 %{SOURCE11} .
@@ -1353,6 +1355,9 @@ exit 0
%changelog
+* Thu Jun 1 2017 Richard Shaw <hobbes1069(a)gmail.com> - 0.28.1-4
+- Add patch from upstream to fix ppc bug.
+
* Mon Apr 24 2017 Richard Shaw <hobbes1069(a)gmail.com> - 0.28.1-3
- Update to latest fixes/0.28.
- Exclude ppc64 and ppc64le due to failed builds:
diff --git a/ticket13049-bswap-guard.diff b/ticket13049-bswap-guard.diff
new file mode 100644
index 0000000..ca1ac92
--- /dev/null
+++ b/ticket13049-bswap-guard.diff
@@ -0,0 +1,13 @@
+diff --git a/mythtv/libs/libmythbase/bswap.h b/mythtv/libs/libmythbase/bswap.h
+index ccbe27a..b608641 100644
+--- a/mythtv/libs/libmythbase/bswap.h
++++ b/mythtv/libs/libmythbase/bswap.h
+@@ -25,7 +25,7 @@
+ # error Byte swapping functions not defined for this platform
+ #endif
+
+-#ifdef bswap_32
++#if defined(bswap_32) && !defined(bswap_dbl)
+ // TODO: Any reason we choose not to use bswap_64 for this?
+ static __inline__ double bswap_dbl(double x)
+ {
7 years, 5 months
[vlc/el7] Add patch
by Nicolas Chauvet
commit 0ee8a6934c6570a99508f6c64011b844bc2827e0
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Jun 1 11:16:46 2017 +0200
Add patch
...fix-heap-write-overflow-on-frame-format-c.patch | 158 +++++++++++++++++++++
1 file changed, 158 insertions(+)
---
diff --git a/0001-codec-flac-fix-heap-write-overflow-on-frame-format-c.patch b/0001-codec-flac-fix-heap-write-overflow-on-frame-format-c.patch
new file mode 100644
index 0000000..e0158f8
--- /dev/null
+++ b/0001-codec-flac-fix-heap-write-overflow-on-frame-format-c.patch
@@ -0,0 +1,158 @@
+From 55a82442cfea9dab8b853f3a4610f2880c5fadf3 Mon Sep 17 00:00:00 2001
+From: Francois Cartegnie <fcvlcdev(a)free.fr>
+Date: Wed, 31 May 2017 13:02:29 +0200
+Subject: [PATCH] codec: flac: fix heap write overflow on frame format change
+
+bp of 83b646f1e8fb89f99064d9aaef3754ccc77bbeac
+---
+ modules/codec/flac.c | 92 +++++++++++++++++++++++++++++++++++-----------------
+ 1 file changed, 63 insertions(+), 29 deletions(-)
+
+diff --git a/modules/codec/flac.c b/modules/codec/flac.c
+index 87c1e6cb7b..fb12e6cab8 100644
+--- a/modules/codec/flac.c
++++ b/modules/codec/flac.c
+@@ -64,6 +64,8 @@ struct decoder_sys_t
+ */
+ FLAC__StreamDecoder *p_flac;
+ FLAC__StreamMetadata_StreamInfo stream_info;
++
++ uint8_t rgi_channels_reorder[AOUT_CHAN_MAX];
+ bool b_stream_info;
+ };
+
+@@ -87,6 +89,19 @@ static const int pi_channels_maps[9] =
+ | AOUT_CHAN_LFE
+ };
+
++/* XXX it supposes our internal format is WG4 */
++static const uint8_t ppi_reorder[1+8][8] = {
++ { },
++ { 0, },
++ { 0, 1 },
++ { 0, 1, 2 },
++ { 0, 1, 2, 3 },
++ { 0, 1, 3, 4, 2 },
++ { 0, 1, 4, 5, 2, 3 },
++ { 0, 1, 5, 6, 4, 2, 3 },
++ { 0, 1, 6, 7, 4, 5, 2, 3 },
++};
++
+ /*****************************************************************************
+ * Local prototypes
+ *****************************************************************************/
+@@ -143,6 +158,29 @@ static void Interleave( int32_t *p_out, const int32_t * const *pp_in,
+ }
+
+ /*****************************************************************************
++ * DecoderSetOutputFormat: helper function to convert and check frame format
++ *****************************************************************************/
++static int DecoderSetOutputFormat( unsigned i_channels, unsigned i_rate,
++ unsigned i_streaminfo_rate,
++ unsigned i_bitspersample,
++ audio_format_t *fmt,
++ uint8_t *pi_channels_reorder )
++{
++ if( i_channels == 0 || i_channels > FLAC__MAX_CHANNELS ||
++ i_bitspersample == 0 || (i_rate == 0 && i_streaminfo_rate == 0) )
++ return VLC_EGENERIC;
++
++ fmt->i_channels = i_channels;
++ fmt->i_rate = (i_rate > 0 ) ? i_rate : i_streaminfo_rate;
++ fmt->i_physical_channels =
++ fmt->i_original_channels = pi_channels_maps[i_channels];
++ memcpy( pi_channels_reorder, ppi_reorder[i_channels], i_channels );
++ fmt->i_bitspersample = i_bitspersample;
++
++ return VLC_SUCCESS;
++}
++
++/*****************************************************************************
+ * DecoderWriteCallback: called by libflac to output decoded samples
+ *****************************************************************************/
+ static FLAC__StreamDecoderWriteStatus
+@@ -150,30 +188,31 @@ DecoderWriteCallback( const FLAC__StreamDecoder *decoder,
+ const FLAC__Frame *frame,
+ const FLAC__int32 *const buffer[], void *client_data )
+ {
+- /* XXX it supposes our internal format is WG4 */
+- static const unsigned char ppi_reorder[1+8][8] = {
+- { },
+- { 0, },
+- { 0, 1 },
+- { 0, 1, 2 },
+- { 0, 1, 2, 3 },
+- { 0, 1, 3, 4, 2 },
+- { 0, 1, 4, 5, 2, 3 },
+- { 0, 1, 5, 6, 4, 2, 3 },
+- { 0, 1, 6, 7, 4, 5, 2, 3 },
+- };
+-
+ VLC_UNUSED(decoder);
+ decoder_t *p_dec = (decoder_t *)client_data;
+ decoder_sys_t *p_sys = p_dec->p_sys;
+
+- if( p_dec->fmt_out.audio.i_channels <= 0 ||
+- p_dec->fmt_out.audio.i_channels > 8 )
++ if( DecoderSetOutputFormat( frame->header.channels,
++ frame->header.sample_rate,
++ p_sys->b_stream_info ? p_sys->stream_info.sample_rate : 0,
++ frame->header.bits_per_sample,
++ &p_dec->fmt_out.audio,
++ p_sys->rgi_channels_reorder ) )
+ return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
+- if( date_Get( &p_sys->end_date ) <= VLC_TS_INVALID )
++
++ if( p_sys->end_date.i_divider_num != p_dec->fmt_out.audio.i_rate )
++ {
++ if( p_sys->end_date.i_divider_num > 0 )
++ date_Change( &p_sys->end_date, p_dec->fmt_out.audio.i_rate, 1 );
++ else
++ date_Init( &p_sys->end_date, p_dec->fmt_out.audio.i_rate, 1 );
++ }
++
++ if( decoder_UpdateAudioFormat( p_dec ) )
+ return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
+
+- const unsigned char *pi_reorder = ppi_reorder[p_dec->fmt_out.audio.i_channels];
++ if( date_Get( &p_sys->end_date ) <= VLC_TS_INVALID )
++ return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
+
+ p_sys->p_aout_buffer =
+ decoder_NewAudioBuffer( p_dec, frame->header.blocksize );
+@@ -181,7 +220,8 @@ DecoderWriteCallback( const FLAC__StreamDecoder *decoder,
+ if( p_sys->p_aout_buffer == NULL )
+ return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
+
+- Interleave( (int32_t *)p_sys->p_aout_buffer->p_buffer, buffer, pi_reorder,
++ Interleave( (int32_t *)p_sys->p_aout_buffer->p_buffer, buffer,
++ p_sys->rgi_channels_reorder ,
+ frame->header.channels, frame->header.blocksize,
+ frame->header.bits_per_sample );
+
+@@ -233,17 +273,11 @@ static void DecoderMetadataCallback( const FLAC__StreamDecoder *decoder,
+ decoder_sys_t *p_sys = p_dec->p_sys;
+
+ /* Setup the format */
+- p_dec->fmt_out.audio.i_rate = metadata->data.stream_info.sample_rate;
+- p_dec->fmt_out.audio.i_channels = metadata->data.stream_info.channels;
+- if(metadata->data.stream_info.channels < 9)
+- {
+- p_dec->fmt_out.audio.i_physical_channels =
+- p_dec->fmt_out.audio.i_original_channels =
+- pi_channels_maps[metadata->data.stream_info.channels];
+- }
+- if (!p_dec->fmt_out.audio.i_bitspersample)
+- p_dec->fmt_out.audio.i_bitspersample =
+- metadata->data.stream_info.bits_per_sample;
++ DecoderSetOutputFormat( metadata->data.stream_info.channels,
++ metadata->data.stream_info.sample_rate,
++ metadata->data.stream_info.sample_rate,
++ metadata->data.stream_info.bits_per_sample,
++ &p_dec->fmt_out.audio, p_sys->rgi_channels_reorder );
+
+ msg_Dbg( p_dec, "channels:%d samplerate:%d bitspersamples:%d",
+ p_dec->fmt_out.audio.i_channels, p_dec->fmt_out.audio.i_rate,
+--
+2.13.0
+
7 years, 5 months
[vlc/el7] Fix for flac crash
by Nicolas Chauvet
commit ea58a18a75f5b0ba2a9599a157e51d3cd81c0ec6
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Jun 1 11:16:15 2017 +0200
Fix for flac crash
vlc.spec | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
---
diff --git a/vlc.spec b/vlc.spec
index b95e449..b2e3736 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -32,12 +32,14 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: 2.2.6
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}%{...
+Patch0: 0001-codec-flac-fix-heap-write-overflow-on-frame-format-c.patch
+
BuildRequires: desktop-file-utils
%{?_with_bootstrap:
@@ -219,6 +221,7 @@ JACK audio plugin for the VLC media player.
%prep
%setup -q -n %{name}-%{version}
+%patch0 -p1
%{?_with_bootstrap:
rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
./bootstrap
@@ -495,6 +498,9 @@ fi || :
%changelog
+* Thu Jun 01 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2.2.6-2
+- Backport fix for flac crash
+
* Wed May 24 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2.2.6-1
- Update to 2.2.6
7 years, 5 months
[vlc/f24] Update verrel
by Nicolas Chauvet
commit 81006fa5dd5faf3751e4b1e6cb9953d47c67b373
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Jun 1 08:37:09 2017 +0200
Update verrel
vlc.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/vlc.spec b/vlc.spec
index 9a7a9d5..0e4c882 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -39,7 +39,7 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: 3.0.0
-Release: 0.26%{?vlc_date:%{vlc_date}git}%{?dist}
+Release: 0.26%{?vlc_date:snap.%{vlc_date}git}%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
7 years, 5 months
