From e944123f71c8836ca80096d04bab1e90859ff176 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 3 Mar 2013 21:40:16 +0000 Subject: [PATCH] * Sun Mar 03 2013 Nicolas Chauvet - 1.0.0-0.2_pre3 - Mass rebuilt for Fedora 19 Features --- ...-solve-alignment-issues-with-dvbpsi_.patch | 35 +++++++++++++++++-- libdvbpsi.spec | 7 +++- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/0001-dvbpsi_decoder_t-solve-alignment-issues-with-dvbpsi_.patch b/0001-dvbpsi_decoder_t-solve-alignment-issues-with-dvbpsi_.patch index 2470f09..aeca157 100644 --- a/0001-dvbpsi_decoder_t-solve-alignment-issues-with-dvbpsi_.patch +++ b/0001-dvbpsi_decoder_t-solve-alignment-issues-with-dvbpsi_.patch @@ -1,17 +1,20 @@ -From 9d20b904c0649cae0c71cef5177113821dfcc71f Mon Sep 17 00:00:00 2001 +From 61b43151b3ee99ebba38b038e9e92d34766cf897 Mon Sep 17 00:00:00 2001 From: Jean-Paul Saman Date: Tue, 16 Oct 2012 10:56:26 +0200 -Subject: [PATCH] dvbpsi_decoder_t: solve alignment issues with +Subject: [PATCH 1/2] dvbpsi_decoder_t: solve alignment issues with dvbpsi_decoder_t casting. Repack DVBPSI_DECODER_COMMON to be byte aligned and add some checks to do clever casting. +The TOT and SIS table structure definition need to be packed explicitly for use on ARM and MIPS platforms. --- src/dvbpsi.c | 3 +- src/dvbpsi.h | 82 +++++++++++++++++++++++++++++++++++------------- src/tables/nit_private.h | 4 +-- src/tables/pmt_private.h | 4 +-- - 4 files changed, 66 insertions(+), 27 deletions(-) + src/tables/sis.h | 2 +- + src/tables/tot.h | 2 +- + 6 files changed, 68 insertions(+), 29 deletions(-) diff --git a/src/dvbpsi.c b/src/dvbpsi.c index ffbfaca..d45802e 100644 @@ -204,6 +207,32 @@ index ed75a8b..4f10ecc 100644 } dvbpsi_pmt_decoder_t; /***************************************************************************** +diff --git a/src/tables/sis.h b/src/tables/sis.h +index 16f2298..a339a6c 100644 +--- a/src/tables/sis.h ++++ b/src/tables/sis.h +@@ -97,7 +97,7 @@ typedef struct dvbpsi_sis_s + /* FIXME: alignment stuffing */ + uint32_t i_ecrc; /*!< CRC 32 of decrypted splice_info_section */ + +-} dvbpsi_sis_t; ++} __attribute__((packed)) dvbpsi_sis_t; + + /***************************************************************************** + * Splice Commands +diff --git a/src/tables/tot.h b/src/tables/tot.h +index bb2a760..6ccf009 100644 +--- a/src/tables/tot.h ++++ b/src/tables/tot.h +@@ -67,7 +67,7 @@ typedef struct dvbpsi_tot_s + + uint32_t i_crc; /*!< CRC_32 (TOT only) */ + +-} dvbpsi_tot_t; ++} __attribute__((packed)) dvbpsi_tot_t; + + /***************************************************************************** + * dvbpsi_tot_callback -- 1.7.11.7 diff --git a/libdvbpsi.spec b/libdvbpsi.spec index a1674ad..833e92c 100644 --- a/libdvbpsi.spec +++ b/libdvbpsi.spec @@ -4,12 +4,13 @@ Summary: Library for MPEG TS and DVB PSI tables decoding and generation Name: libdvbpsi Version: 1.0.0 -Release: 0.1%{?pre}%{?dist} +Release: 0.2%{?pre}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.videolan.org/developers/libdvbpsi.html Source0: http://download.videolan.org/pub/libdvbpsi/%{version}/%{name}-%{version}%{?pre}.tar.bz2 Patch0: 0001-dvbpsi_decoder_t-solve-alignment-issues-with-dvbpsi_.patch +Patch1: 0002-dvbinfo-udp.c-use-sockaddr_storage-type-instead-of-s.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: graphviz doxygen @@ -34,6 +35,7 @@ This package contains development files for %{name} %prep %setup -q -n %{name}-%{version}%{?pre} %patch0 -p1 +%patch1 -p1 # ----------------------------------------------------------------------------- @@ -75,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT # ----------------------------------------------------------------------------- %changelog +* Sun Mar 03 2013 Nicolas Chauvet - 1.0.0-0.2_pre3 +- Mass rebuilt for Fedora 19 Features + * Thu Oct 18 2012 Nicolas Chauvet - 1.0.0-0.1_pre2 - Update to 1.0.0_pre2