From f0a44c4191813ca478fa473a99bc2a65cdde9610 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 26 Sep 2016 14:54:20 +0000 Subject: [PATCH 01/45] Initial setup of the repo --- .gitignore | 0 sources | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From 780aaaaf0c4f8ebd3d48ca2e16af0c74981c808c Mon Sep 17 00:00:00 2001 From: Thorsten Leemhuis Date: Mon, 4 Aug 2008 19:00:28 +0000 Subject: [PATCH 02/45] initial import from livna --- .gitignore | 1 + libdvbpsi.spec | 116 +++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 118 insertions(+) create mode 100644 libdvbpsi.spec diff --git a/.gitignore b/.gitignore index e69de29..2b8d1ba 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +libdvbpsi5-0.1.6.tar.bz2 diff --git a/libdvbpsi.spec b/libdvbpsi.spec new file mode 100644 index 0000000..448dccb --- /dev/null +++ b/libdvbpsi.spec @@ -0,0 +1,116 @@ +%define real_name libdvbpsi5 + +Summary: Library for MPEG TS and DVB PSI tables decoding and generation +Name: libdvbpsi +Version: 0.1.6 +Release: 3%{?dist} +License: GPLv2+ +Group: System Environment/Libraries +URL: http://www.videolan.org/developers/libdvbpsi.html +Source0: http://download.videolan.org/pub/libdvbpsi/%{version}/%{real_name}-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: graphviz doxygen + +%package devel +Summary: Development package for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +# ----------------------------------------------------------------------------- + +%description +libdvbpsi is a very simple and fully portable library designed for +MPEG TS and DVB PSI table decoding and generation. + +%description devel +libdvbpsi is a very simple and fully portable library designed for +MPEG TS and DVB PSI table decoding and generation. +This package contains development files for %{name} + +# ----------------------------------------------------------------------------- + +%prep +%setup -q -n %{real_name}-%{version} + + + +# ----------------------------------------------------------------------------- + +%build +%configure --disable-dependency-tracking --disable-static +make %{?_smp_mflags} +make doc + +# ----------------------------------------------------------------------------- + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la + +# ----------------------------------------------------------------------------- + +%clean +rm -rf $RPM_BUILD_ROOT + +# ----------------------------------------------------------------------------- + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING ChangeLog README +%{_libdir}/%{name}.so.* + +%files devel +%defattr(-,root,root,-) +%doc doc/doxygen/html +%{_includedir}/dvbpsi/ +%{_libdir}/lib*.so + +# ----------------------------------------------------------------------------- + +%changelog +* Mon Aug 04 2008 Thorsten Leemhuis - 0.1.6-2 +- Rebuild for gcc43 + +* Mon Oct 22 2007 kwizart < kwizart at gmail.com > - 0.1.6-1 +- Update to 0.1.6 + +* Sun Oct 14 2007 kwizart < kwizart at gmail.com > - 0.1.5-3 +- Rpmfusion Merge Review + +* Mon Mar 13 2006 Thorsten Leemhuis 0.1.5-2 +- Drop Epoch completely + +* Thu Mar 09 2006 Andreas Bierfert +- switch to new release field + +* Tue Feb 28 2006 Andreas Bierfert +- add dist + +* Tue Jul 12 2005 Ville Skyttä - 0:0.1.5-0.lvn.1 +- 0.1.5. +- Build with dependency tracking disabled. +- Miscellaneous specfile cleanups. + +* Mon May 17 2004 Dams - 0:0.1.3-0.lvn.4 +- Added url in Source0 + +* Sun Sep 28 2003 Dams 0:0.1.3-0.fdr.3 +- Removed comment after scriptlets + +* Mon Aug 18 2003 Dams 0:0.1.3-0.fdr.2 +- Moved some doc to devel package + +* Sat Aug 16 2003 Dams 0:0.1.3-0.fdr.1 +- Added post/postun scriptlets +- Using RPM_OPT_FLAGS +- Updated to 0.1.3 + +* Sun Jun 29 2003 Dams +- Initial build. diff --git a/sources b/sources index e69de29..9649050 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +bd2d9861be3311e1e03c91cd9345f542 libdvbpsi5-0.1.6.tar.bz2 From 49b2423f7ad064bbc57695b677374c95a8a82349 Mon Sep 17 00:00:00 2001 From: Thorsten Leemhuis Date: Sun, 29 Mar 2009 13:25:13 +0000 Subject: [PATCH 03/45] * Sun Mar 29 2009 Thorsten Leemhuis - 0.1.6-4 - rebuild for new F11 features --- libdvbpsi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdvbpsi.spec b/libdvbpsi.spec index 448dccb..cf566d6 100644 --- a/libdvbpsi.spec +++ b/libdvbpsi.spec @@ -3,7 +3,7 @@ Summary: Library for MPEG TS and DVB PSI tables decoding and generation Name: libdvbpsi Version: 0.1.6 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.videolan.org/developers/libdvbpsi.html @@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT # ----------------------------------------------------------------------------- %changelog +* Sun Mar 29 2009 Thorsten Leemhuis - 0.1.6-4 +- rebuild for new F11 features + * Mon Aug 04 2008 Thorsten Leemhuis Date: Sun, 5 Apr 2009 20:26:17 +0000 Subject: [PATCH 04/45] Rebuild for i586 problem --- libdvbpsi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdvbpsi.spec b/libdvbpsi.spec index cf566d6..da4d57e 100644 --- a/libdvbpsi.spec +++ b/libdvbpsi.spec @@ -3,7 +3,7 @@ Summary: Library for MPEG TS and DVB PSI tables decoding and generation Name: libdvbpsi Version: 0.1.6 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.videolan.org/developers/libdvbpsi.html @@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT # ----------------------------------------------------------------------------- %changelog +* Sun Apr 5 2009 kwizart < kwizart at gmail.com > - 0.1.6-5 +- Rebuild + * Sun Mar 29 2009 Thorsten Leemhuis - 0.1.6-4 - rebuild for new F11 features From 7b7a1f96f3ba4b886df92dced7dd8817974a460f Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 16 Oct 2009 22:16:03 +0000 Subject: [PATCH 05/45] Rebuild for F-12 --- libdvbpsi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdvbpsi.spec b/libdvbpsi.spec index da4d57e..2ffae88 100644 --- a/libdvbpsi.spec +++ b/libdvbpsi.spec @@ -3,7 +3,7 @@ Summary: Library for MPEG TS and DVB PSI tables decoding and generation Name: libdvbpsi Version: 0.1.6 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.videolan.org/developers/libdvbpsi.html @@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT # ----------------------------------------------------------------------------- %changelog +* Sat Oct 17 2009 kwizart < kwizart at gmail.com > - 0.1.6-6 +- Rebuild + * Sun Apr 5 2009 kwizart < kwizart at gmail.com > - 0.1.6-5 - Rebuild From b4fe9485be4312839d11f7530f206fa28a9fd590 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 1 May 2010 12:36:28 +0000 Subject: [PATCH 06/45] Update to 0.1.7 --- .gitignore | 2 +- libdvbpsi.spec | 14 ++++++++------ sources | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 2b8d1ba..9ad454c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -libdvbpsi5-0.1.6.tar.bz2 +libdvbpsi-0.1.7.tar.bz2 diff --git a/libdvbpsi.spec b/libdvbpsi.spec index 2ffae88..a354c9e 100644 --- a/libdvbpsi.spec +++ b/libdvbpsi.spec @@ -1,13 +1,11 @@ -%define real_name libdvbpsi5 - Summary: Library for MPEG TS and DVB PSI tables decoding and generation Name: libdvbpsi -Version: 0.1.6 -Release: 6%{?dist} +Version: 0.1.7 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.videolan.org/developers/libdvbpsi.html -Source0: http://download.videolan.org/pub/libdvbpsi/%{version}/%{real_name}-%{version}.tar.bz2 +Source0: http://download.videolan.org/pub/libdvbpsi/%{version}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: graphviz doxygen @@ -30,7 +28,7 @@ This package contains development files for %{name} # ----------------------------------------------------------------------------- %prep -%setup -q -n %{real_name}-%{version} +%setup -q @@ -68,10 +66,14 @@ rm -rf $RPM_BUILD_ROOT %doc doc/doxygen/html %{_includedir}/dvbpsi/ %{_libdir}/lib*.so +%{_libdir}/pkgconfig/libdvbpsi.pc # ----------------------------------------------------------------------------- %changelog +* Sat Apr 24 2010 Nicolas Chauvet - 0.1.7-1 +- Update to 0.1.7 + * Sat Oct 17 2009 kwizart < kwizart at gmail.com > - 0.1.6-6 - Rebuild diff --git a/sources b/sources index 9649050..702420c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bd2d9861be3311e1e03c91cd9345f542 libdvbpsi5-0.1.6.tar.bz2 +af419575719e356b908b0c6946499052 libdvbpsi-0.1.7.tar.bz2 From bc0c7a7a42054b089524f27e606f0d948f0e844b Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 10 May 2011 15:36:31 +0000 Subject: [PATCH 07/45] Update to 0.2.0 --- .gitignore | 2 +- libdvbpsi.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9ad454c..5d218ae 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -libdvbpsi-0.1.7.tar.bz2 +libdvbpsi-0.2.0.tar.bz2 diff --git a/libdvbpsi.spec b/libdvbpsi.spec index a354c9e..b2ebb85 100644 --- a/libdvbpsi.spec +++ b/libdvbpsi.spec @@ -1,8 +1,8 @@ Summary: Library for MPEG TS and DVB PSI tables decoding and generation Name: libdvbpsi -Version: 0.1.7 +Version: 0.2.0 Release: 1%{?dist} -License: GPLv2+ +License: LGPLv2+ Group: System Environment/Libraries URL: http://www.videolan.org/developers/libdvbpsi.html Source0: http://download.videolan.org/pub/libdvbpsi/%{version}/%{name}-%{version}.tar.bz2 @@ -71,6 +71,10 @@ rm -rf $RPM_BUILD_ROOT # ----------------------------------------------------------------------------- %changelog +* Tue May 10 2011 Nicolas Chauvet - 0.2.0-1 +- Update to 0.2.0 +- Switch to LGPLv2+ + * Sat Apr 24 2010 Nicolas Chauvet - 0.1.7-1 - Update to 0.1.7 diff --git a/sources b/sources index 702420c..cce924e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -af419575719e356b908b0c6946499052 libdvbpsi-0.1.7.tar.bz2 +b80f3fb7fd58d35276cc4c4a84b6ac03 libdvbpsi-0.2.0.tar.bz2 From 4c280b76145644e28ffd49c06d3cd130503e5157 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 4 Nov 2011 23:16:12 +0000 Subject: [PATCH 08/45] Update libdvbpsi to latest bugfix --- .gitignore | 2 +- libdvbpsi.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5d218ae..57e823d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -libdvbpsi-0.2.0.tar.bz2 +libdvbpsi-0.2.2.tar.bz2 diff --git a/libdvbpsi.spec b/libdvbpsi.spec index b2ebb85..88af858 100644 --- a/libdvbpsi.spec +++ b/libdvbpsi.spec @@ -1,6 +1,6 @@ Summary: Library for MPEG TS and DVB PSI tables decoding and generation Name: libdvbpsi -Version: 0.2.0 +Version: 0.2.2 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT # ----------------------------------------------------------------------------- %changelog +* Sat Nov 05 2011 Nicolas Chauvet - 0.2.2-1 +- Update to 0.2.2 + * Tue May 10 2011 Nicolas Chauvet - 0.2.0-1 - Update to 0.2.0 - Switch to LGPLv2+ diff --git a/sources b/sources index cce924e..3d80cfa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b80f3fb7fd58d35276cc4c4a84b6ac03 libdvbpsi-0.2.0.tar.bz2 +b387e07ffd844b61c7a050c47307c0f7 libdvbpsi-0.2.2.tar.bz2 From 8e922f24e586f890b9722b3823b905fe65257cce Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Wed, 25 Jan 2012 14:50:19 +0000 Subject: [PATCH 09/45] * Wed Jan 25 2012 Nicolas Chauvet - 0.2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- libdvbpsi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdvbpsi.spec b/libdvbpsi.spec index 88af858..ba18b9e 100644 --- a/libdvbpsi.spec +++ b/libdvbpsi.spec @@ -1,7 +1,7 @@ Summary: Library for MPEG TS and DVB PSI tables decoding and generation Name: libdvbpsi Version: 0.2.2 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.videolan.org/developers/libdvbpsi.html @@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT # ----------------------------------------------------------------------------- %changelog +* Wed Jan 25 2012 Nicolas Chauvet - 0.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Sat Nov 05 2011 Nicolas Chauvet - 0.2.2-1 - Update to 0.2.2 From 7547523e70d84dc13f06c1f3bb1ef45b87524725 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 18 Oct 2012 19:54:22 +0000 Subject: [PATCH 10/45] Update to 1.0.0_pre2 Known to not work on ARM - been worked on --- .gitignore | 2 +- ...ecoder_t-align-DVBPSI_DECODER_COMMON.patch | 83 +++++++ ...-solve-alignment-issues-with-dvbpsi_.patch | 209 ++++++++++++++++++ libdvbpsi.spec | 19 +- sources | 2 +- 5 files changed, 308 insertions(+), 7 deletions(-) create mode 100644 0001-dvbpsi_decoder_t-align-DVBPSI_DECODER_COMMON.patch create mode 100644 0001-dvbpsi_decoder_t-solve-alignment-issues-with-dvbpsi_.patch diff --git a/.gitignore b/.gitignore index 57e823d..79c83a0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -libdvbpsi-0.2.2.tar.bz2 +libdvbpsi-1.0.0_pre3.tar.bz2 diff --git a/0001-dvbpsi_decoder_t-align-DVBPSI_DECODER_COMMON.patch b/0001-dvbpsi_decoder_t-align-DVBPSI_DECODER_COMMON.patch new file mode 100644 index 0000000..c411370 --- /dev/null +++ b/0001-dvbpsi_decoder_t-align-DVBPSI_DECODER_COMMON.patch @@ -0,0 +1,83 @@ +From 259e2a12fafe4c09ea3265fd686f308db4c31a60 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: align DVBPSI_DECODER_COMMON + +--- + src/dvbpsi.h | 11 ++++++----- + src/tables/nit_private.h | 4 ++-- + src/tables/pmt_private.h | 4 ++-- + 3 files changed, 10 insertions(+), 9 deletions(-) + +diff --git a/src/dvbpsi.h b/src/dvbpsi.h +index 3118da8..f373103 100644 +--- a/src/dvbpsi.h ++++ b/src/dvbpsi.h +@@ -197,16 +197,17 @@ typedef void (* dvbpsi_callback_gather_t)(dvbpsi_t *p_dvbpsi, /*!< pointer to d + * decoder. + */ + #define DVBPSI_DECODER_COMMON \ +- dvbpsi_callback_gather_t pf_gather;/*!< PSI decoder's callback */ \ +- int i_section_max_size; /*!< Max size of a section for this decoder */ \ +- uint8_t i_continuity_counter; /*!< Continuity counter */ \ + bool b_discontinuity; /*!< Discontinuity flag */ \ +- dvbpsi_psi_section_t *p_current_section; /*!< Current section */ \ + bool b_current_valid; /*!< Current valid indicator */ \ ++ uint8_t i_continuity_counter; /*!< Continuity counter */ \ + uint8_t i_last_section_number;/*!< Last received section number */ \ ++ dvbpsi_psi_section_t *p_current_section; /*!< Current section */ \ + dvbpsi_psi_section_t *p_sections; /*!< List of received PSI sections */ \ ++ dvbpsi_callback_gather_t pf_gather;/*!< PSI decoder's callback */ \ ++ int i_section_max_size; /*!< Max size of a section for this decoder */ \ + int i_need; /*!< Bytes needed */ \ +- bool b_complete_header; /*!< Flag for header completion */ ++ bool b_complete_header; /*!< Flag for header completion */ \ ++ uint8_t i_reserved[3]; /*!< Reserved */ + + struct dvbpsi_decoder_s + { +diff --git a/src/tables/nit_private.h b/src/tables/nit_private.h +index 8eadce7..6c80e35 100644 +--- a/src/tables/nit_private.h ++++ b/src/tables/nit_private.h +@@ -39,14 +39,14 @@ typedef struct dvbpsi_nit_decoder_s + { + DVBPSI_DECODER_COMMON + +- uint16_t i_network_id; +- + dvbpsi_nit_callback pf_nit_callback; + void * p_cb_data; + + dvbpsi_nit_t current_nit; + dvbpsi_nit_t * p_building_nit; + ++ uint16_t i_network_id; ++ + } dvbpsi_nit_decoder_t; + + /***************************************************************************** +diff --git a/src/tables/pmt_private.h b/src/tables/pmt_private.h +index ed75a8b..4f10ecc 100644 +--- a/src/tables/pmt_private.h ++++ b/src/tables/pmt_private.h +@@ -37,14 +37,14 @@ typedef struct dvbpsi_pmt_decoder_s + { + DVBPSI_DECODER_COMMON + +- uint16_t i_program_number; +- + dvbpsi_pmt_callback pf_pmt_callback; + void * p_cb_data; + + dvbpsi_pmt_t current_pmt; + dvbpsi_pmt_t * p_building_pmt; + ++ uint16_t i_program_number; ++ + } dvbpsi_pmt_decoder_t; + + /***************************************************************************** +-- +1.7.11.7 + diff --git a/0001-dvbpsi_decoder_t-solve-alignment-issues-with-dvbpsi_.patch b/0001-dvbpsi_decoder_t-solve-alignment-issues-with-dvbpsi_.patch new file mode 100644 index 0000000..2470f09 --- /dev/null +++ b/0001-dvbpsi_decoder_t-solve-alignment-issues-with-dvbpsi_.patch @@ -0,0 +1,209 @@ +From 9d20b904c0649cae0c71cef5177113821dfcc71f 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 + dvbpsi_decoder_t casting. + +Repack DVBPSI_DECODER_COMMON to be byte aligned and add some checks to +do clever casting. +--- + 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(-) + +diff --git a/src/dvbpsi.c b/src/dvbpsi.c +index ffbfaca..d45802e 100644 +--- a/src/dvbpsi.c ++++ b/src/dvbpsi.c +@@ -170,7 +170,7 @@ void dvbpsi_delete(dvbpsi_t *p_dvbpsi) + * dvbpsi_decoder_new + *****************************************************************************/ + #define DVBPSI_INVALID_CC (0xFF) +-dvbpsi_decoder_t *dvbpsi_decoder_new(dvbpsi_callback_gather_t pf_gather, ++void *dvbpsi_decoder_new(dvbpsi_callback_gather_t pf_gather, + const int i_section_max_size, const bool b_discontinuity, const size_t psi_size) + { + assert(psi_size >= sizeof(dvbpsi_decoder_t)); +@@ -179,6 +179,7 @@ dvbpsi_decoder_t *dvbpsi_decoder_new(dvbpsi_callback_gather_t pf_gather, + if (p_decoder == NULL) + return NULL; + ++ memcpy(&p_decoder->i_magic[0], "psi", 3); + p_decoder->pf_gather = pf_gather; + p_decoder->p_current_section = NULL; + p_decoder->i_section_max_size = i_section_max_size; +diff --git a/src/dvbpsi.h b/src/dvbpsi.h +index 3118da8..8a019e3 100644 +--- a/src/dvbpsi.h ++++ b/src/dvbpsi.h +@@ -43,6 +43,16 @@ extern "C" { + #endif + + /***************************************************************************** ++ * Helper for GCC version checks borrowed from VLC. ++ *****************************************************************************/ ++#ifdef __GNUC__ ++# define DVBPSI_GCC_VERSION(maj,min) \ ++ ((__GNUC__ > (maj)) || (__GNUC__ == (maj) && __GNUC_MINOR__ >= (min))) ++#else ++# define DVBPSI_GCC_VERSION(maj,min) (0) ++#endif ++ ++/***************************************************************************** + * dvbpsi_t + *****************************************************************************/ + /*! +@@ -90,7 +100,22 @@ typedef struct dvbpsi_decoder_s dvbpsi_decoder_t; + * \def DVBPSI_DECODER(x) + * \brief Helper macro for casting a private decoder into a dvbpsi_decoder_t + */ +-#define DVBPSI_DECODER(x) ((dvbpsi_decoder_t *)(x)) ++/* Clever cast borrowed from VLC */ ++#if DVBPSI_GCC_VERSION(4,0) ++# ifndef __cplusplus ++# define DVBPSI_DECODER( x ) \ ++ __builtin_choose_expr( \ ++ __builtin_offsetof(__typeof__(*(x)), i_magic), \ ++ (void)0, \ ++ (dvbpsi_decoder_t *)(x)) ++# else ++# define DVBPSI_DECODER( x ) \ ++ ((dvbpsi_decoder_t *)(x) \ ++ + 0 * __builtin_offsetof(__typeof__(*(x)), i_magic)) ++# endif ++#else ++# define DVBPSI_DECODER(x) ((dvbpsi_decoder_t *)(x)) ++#endif + + /***************************************************************************** + * dvbpsi_t +@@ -187,6 +212,28 @@ typedef void (* dvbpsi_callback_gather_t)(dvbpsi_t *p_dvbpsi, /*!< pointer to d + dvbpsi_psi_section_t* p_section); /*!< pointer to psi section */ + + /***************************************************************************** ++ * DVBPSI_DECODER_COMMON ++ *****************************************************************************/ ++#define DVBPSI_DECODER_COMMON \ ++/*! \ ++ * \name DVBPSI_DECODER_COMMON \ ++ * these members are common for all dvbpsi_decoder_t \ ++ */ \ ++/**@{*/ \ ++ uint8_t i_magic[3]; /*!< Reserved magic value */ \ ++ bool b_complete_header; /*!< Flag for header completion */ \ ++ bool b_discontinuity; /*!< Discontinuity flag */ \ ++ bool b_current_valid; /*!< Current valid indicator */ \ ++ uint8_t i_continuity_counter; /*!< Continuity counter */ \ ++ uint8_t i_last_section_number;/*!< Last received section number */ \ ++ dvbpsi_psi_section_t *p_current_section; /*!< Current section */ \ ++ dvbpsi_psi_section_t *p_sections; /*!< List of received PSI sections */ \ ++ dvbpsi_callback_gather_t pf_gather;/*!< PSI decoder's callback */ \ ++ int i_section_max_size; /*!< Max size of a section for this decoder */ \ ++ int i_need; /*!< Bytes needed */ \ ++/**@}*/ ++ ++/***************************************************************************** + * struct dvbpsi_decoder_s + *****************************************************************************/ + /*! +@@ -196,18 +243,6 @@ typedef void (* dvbpsi_callback_gather_t)(dvbpsi_t *p_dvbpsi, /*!< pointer to d + * This structure shouldn't be used but if you want to write an external + * decoder. + */ +-#define DVBPSI_DECODER_COMMON \ +- dvbpsi_callback_gather_t pf_gather;/*!< PSI decoder's callback */ \ +- int i_section_max_size; /*!< Max size of a section for this decoder */ \ +- uint8_t i_continuity_counter; /*!< Continuity counter */ \ +- bool b_discontinuity; /*!< Discontinuity flag */ \ +- dvbpsi_psi_section_t *p_current_section; /*!< Current section */ \ +- bool b_current_valid; /*!< Current valid indicator */ \ +- uint8_t i_last_section_number;/*!< Last received section number */ \ +- dvbpsi_psi_section_t *p_sections; /*!< List of received PSI sections */ \ +- int i_need; /*!< Bytes needed */ \ +- bool b_complete_header; /*!< Flag for header completion */ +- + struct dvbpsi_decoder_s + { + DVBPSI_DECODER_COMMON +@@ -217,22 +252,25 @@ struct dvbpsi_decoder_s + * dvbpsi_decoder_new + *****************************************************************************/ + /*! +- * \fn dvbpsi_decoder_t *dvbpsi_decoder_new(dvbpsi_callback_gather_t pf_gather, ++ * \fn void *dvbpsi_decoder_new(dvbpsi_callback_gather_t pf_gather, + * const int i_section_max_size, const bool b_discontinuity, const size_t psi_size); +- * \brief Create a new dvbpsi_decoder_t. ++ * \brief Create a new (private) dvbpsi decoder. + * \param pf_gather pointer to gather function for PSI decoder. + * \param i_section_max_size Max size of a section for this decoder + * \param b_discontinuity Discontinuity flag + * \param psi_size size of new PSI struct, eg: sizeof(dvbpsi_pat_t) +- * \return pointer to dvbpsi_decoder_t ++ * \return pointer to memory of size 'psi_size' that can be casted into a dvbpsi_decoder_t. + * +- * Creates a dvbpsi_decoder_t pointer to struct dvbpsi_decoder_s. It should be +- * delete with @see dvbpsi_decoder_delete() function. ++ * Creates a void pointer that points to a private dvbpsi decoder struct (eg: dvbpsi_pat_t). ++ * The first elements in this newly created decoder should contain DVBPSI_DECODER_COMMON, which ++ * corresponds to a dvbpsi_decoder_t. ++ * Upon return the pointer should be casted to the correct type. Delete the pointer ++ * with @see dvbpsi_decoder_delete() function. + */ +-dvbpsi_decoder_t *dvbpsi_decoder_new(dvbpsi_callback_gather_t pf_gather, +- const int i_section_max_size, +- const bool b_discontinuity, +- const size_t psi_size); ++void *dvbpsi_decoder_new(dvbpsi_callback_gather_t pf_gather, ++ const int i_section_max_size, ++ const bool b_discontinuity, ++ const size_t psi_size); + + /***************************************************************************** + * dvbpsi_decoder_delete +diff --git a/src/tables/nit_private.h b/src/tables/nit_private.h +index 8eadce7..6c80e35 100644 +--- a/src/tables/nit_private.h ++++ b/src/tables/nit_private.h +@@ -39,14 +39,14 @@ typedef struct dvbpsi_nit_decoder_s + { + DVBPSI_DECODER_COMMON + +- uint16_t i_network_id; +- + dvbpsi_nit_callback pf_nit_callback; + void * p_cb_data; + + dvbpsi_nit_t current_nit; + dvbpsi_nit_t * p_building_nit; + ++ uint16_t i_network_id; ++ + } dvbpsi_nit_decoder_t; + + /***************************************************************************** +diff --git a/src/tables/pmt_private.h b/src/tables/pmt_private.h +index ed75a8b..4f10ecc 100644 +--- a/src/tables/pmt_private.h ++++ b/src/tables/pmt_private.h +@@ -37,14 +37,14 @@ typedef struct dvbpsi_pmt_decoder_s + { + DVBPSI_DECODER_COMMON + +- uint16_t i_program_number; +- + dvbpsi_pmt_callback pf_pmt_callback; + void * p_cb_data; + + dvbpsi_pmt_t current_pmt; + dvbpsi_pmt_t * p_building_pmt; + ++ uint16_t i_program_number; ++ + } dvbpsi_pmt_decoder_t; + + /***************************************************************************** +-- +1.7.11.7 + diff --git a/libdvbpsi.spec b/libdvbpsi.spec index ba18b9e..10455f4 100644 --- a/libdvbpsi.spec +++ b/libdvbpsi.spec @@ -1,11 +1,16 @@ +%global pre _pre3 +%global _default_patch_fuzz 2 + Summary: Library for MPEG TS and DVB PSI tables decoding and generation Name: libdvbpsi -Version: 0.2.2 -Release: 2%{?dist} +Version: 1.0.0 +Release: 0.1%{?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}.tar.bz2 +Source0: http://download.videolan.org/pub/libdvbpsi/%{version}/%{name}-%{version}%{?pre}.tar.bz2 +Patch0: 0001-dvbpsi_decoder_t-align-DVBPSI_DECODER_COMMON.patch +Patch1: 0001-dvbpsi_decoder_t-solve-alignment-issues-with-dvbpsi_.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: graphviz doxygen @@ -28,8 +33,9 @@ This package contains development files for %{name} # ----------------------------------------------------------------------------- %prep -%setup -q - +%setup -q -n %{name}-%{version}%{?pre} +#patch0 -p1 +%patch1 -p1 # ----------------------------------------------------------------------------- @@ -71,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT # ----------------------------------------------------------------------------- %changelog +* Sat Oct 06 2012 Nicolas Chauvet - 1.0.0-0.1_pre2 +- Update to 1.0.0_pre2 + * Wed Jan 25 2012 Nicolas Chauvet - 0.2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index 3d80cfa..a73b0cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b387e07ffd844b61c7a050c47307c0f7 libdvbpsi-0.2.2.tar.bz2 +58ee643c11c0da05e616d6876f849547 libdvbpsi-1.0.0_pre3.tar.bz2 From fcd9897319aefb5809589bcd8b7acfdeb239676a Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 18 Oct 2012 19:58:47 +0000 Subject: [PATCH 11/45] Rsync with current src.rpm --- ...ecoder_t-align-DVBPSI_DECODER_COMMON.patch | 83 ------------------- libdvbpsi.spec | 8 +- 2 files changed, 3 insertions(+), 88 deletions(-) delete mode 100644 0001-dvbpsi_decoder_t-align-DVBPSI_DECODER_COMMON.patch diff --git a/0001-dvbpsi_decoder_t-align-DVBPSI_DECODER_COMMON.patch b/0001-dvbpsi_decoder_t-align-DVBPSI_DECODER_COMMON.patch deleted file mode 100644 index c411370..0000000 --- a/0001-dvbpsi_decoder_t-align-DVBPSI_DECODER_COMMON.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 259e2a12fafe4c09ea3265fd686f308db4c31a60 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: align DVBPSI_DECODER_COMMON - ---- - src/dvbpsi.h | 11 ++++++----- - src/tables/nit_private.h | 4 ++-- - src/tables/pmt_private.h | 4 ++-- - 3 files changed, 10 insertions(+), 9 deletions(-) - -diff --git a/src/dvbpsi.h b/src/dvbpsi.h -index 3118da8..f373103 100644 ---- a/src/dvbpsi.h -+++ b/src/dvbpsi.h -@@ -197,16 +197,17 @@ typedef void (* dvbpsi_callback_gather_t)(dvbpsi_t *p_dvbpsi, /*!< pointer to d - * decoder. - */ - #define DVBPSI_DECODER_COMMON \ -- dvbpsi_callback_gather_t pf_gather;/*!< PSI decoder's callback */ \ -- int i_section_max_size; /*!< Max size of a section for this decoder */ \ -- uint8_t i_continuity_counter; /*!< Continuity counter */ \ - bool b_discontinuity; /*!< Discontinuity flag */ \ -- dvbpsi_psi_section_t *p_current_section; /*!< Current section */ \ - bool b_current_valid; /*!< Current valid indicator */ \ -+ uint8_t i_continuity_counter; /*!< Continuity counter */ \ - uint8_t i_last_section_number;/*!< Last received section number */ \ -+ dvbpsi_psi_section_t *p_current_section; /*!< Current section */ \ - dvbpsi_psi_section_t *p_sections; /*!< List of received PSI sections */ \ -+ dvbpsi_callback_gather_t pf_gather;/*!< PSI decoder's callback */ \ -+ int i_section_max_size; /*!< Max size of a section for this decoder */ \ - int i_need; /*!< Bytes needed */ \ -- bool b_complete_header; /*!< Flag for header completion */ -+ bool b_complete_header; /*!< Flag for header completion */ \ -+ uint8_t i_reserved[3]; /*!< Reserved */ - - struct dvbpsi_decoder_s - { -diff --git a/src/tables/nit_private.h b/src/tables/nit_private.h -index 8eadce7..6c80e35 100644 ---- a/src/tables/nit_private.h -+++ b/src/tables/nit_private.h -@@ -39,14 +39,14 @@ typedef struct dvbpsi_nit_decoder_s - { - DVBPSI_DECODER_COMMON - -- uint16_t i_network_id; -- - dvbpsi_nit_callback pf_nit_callback; - void * p_cb_data; - - dvbpsi_nit_t current_nit; - dvbpsi_nit_t * p_building_nit; - -+ uint16_t i_network_id; -+ - } dvbpsi_nit_decoder_t; - - /***************************************************************************** -diff --git a/src/tables/pmt_private.h b/src/tables/pmt_private.h -index ed75a8b..4f10ecc 100644 ---- a/src/tables/pmt_private.h -+++ b/src/tables/pmt_private.h -@@ -37,14 +37,14 @@ typedef struct dvbpsi_pmt_decoder_s - { - DVBPSI_DECODER_COMMON - -- uint16_t i_program_number; -- - dvbpsi_pmt_callback pf_pmt_callback; - void * p_cb_data; - - dvbpsi_pmt_t current_pmt; - dvbpsi_pmt_t * p_building_pmt; - -+ uint16_t i_program_number; -+ - } dvbpsi_pmt_decoder_t; - - /***************************************************************************** --- -1.7.11.7 - diff --git a/libdvbpsi.spec b/libdvbpsi.spec index 10455f4..a1674ad 100644 --- a/libdvbpsi.spec +++ b/libdvbpsi.spec @@ -9,8 +9,7 @@ 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-align-DVBPSI_DECODER_COMMON.patch -Patch1: 0001-dvbpsi_decoder_t-solve-alignment-issues-with-dvbpsi_.patch +Patch0: 0001-dvbpsi_decoder_t-solve-alignment-issues-with-dvbpsi_.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: graphviz doxygen @@ -34,8 +33,7 @@ This package contains development files for %{name} %prep %setup -q -n %{name}-%{version}%{?pre} -#patch0 -p1 -%patch1 -p1 +%patch0 -p1 # ----------------------------------------------------------------------------- @@ -77,7 +75,7 @@ rm -rf $RPM_BUILD_ROOT # ----------------------------------------------------------------------------- %changelog -* Sat Oct 06 2012 Nicolas Chauvet - 1.0.0-0.1_pre2 +* Thu Oct 18 2012 Nicolas Chauvet - 1.0.0-0.1_pre2 - Update to 1.0.0_pre2 * Wed Jan 25 2012 Nicolas Chauvet - 0.2.2-2 From e944123f71c8836ca80096d04bab1e90859ff176 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 3 Mar 2013 21:40:16 +0000 Subject: [PATCH 12/45] * 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 From f316022eaa48bf4f05298b1438a38180b9ecbe50 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 28 Apr 2013 17:34:19 +0000 Subject: [PATCH 13/45] Pre-update to 1.1.0 --- .gitignore | 2 +- ...-solve-alignment-issues-with-dvbpsi_.patch | 238 ------------------ libdvbpsi.spec | 37 +-- sources | 2 +- 4 files changed, 14 insertions(+), 265 deletions(-) delete mode 100644 0001-dvbpsi_decoder_t-solve-alignment-issues-with-dvbpsi_.patch diff --git a/.gitignore b/.gitignore index 79c83a0..8920522 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -libdvbpsi-1.0.0_pre3.tar.bz2 +libdvbpsi-1.1.0.tar.bz2 diff --git a/0001-dvbpsi_decoder_t-solve-alignment-issues-with-dvbpsi_.patch b/0001-dvbpsi_decoder_t-solve-alignment-issues-with-dvbpsi_.patch deleted file mode 100644 index aeca157..0000000 --- a/0001-dvbpsi_decoder_t-solve-alignment-issues-with-dvbpsi_.patch +++ /dev/null @@ -1,238 +0,0 @@ -From 61b43151b3ee99ebba38b038e9e92d34766cf897 Mon Sep 17 00:00:00 2001 -From: Jean-Paul Saman -Date: Tue, 16 Oct 2012 10:56:26 +0200 -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 +-- - 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 ---- a/src/dvbpsi.c -+++ b/src/dvbpsi.c -@@ -170,7 +170,7 @@ void dvbpsi_delete(dvbpsi_t *p_dvbpsi) - * dvbpsi_decoder_new - *****************************************************************************/ - #define DVBPSI_INVALID_CC (0xFF) --dvbpsi_decoder_t *dvbpsi_decoder_new(dvbpsi_callback_gather_t pf_gather, -+void *dvbpsi_decoder_new(dvbpsi_callback_gather_t pf_gather, - const int i_section_max_size, const bool b_discontinuity, const size_t psi_size) - { - assert(psi_size >= sizeof(dvbpsi_decoder_t)); -@@ -179,6 +179,7 @@ dvbpsi_decoder_t *dvbpsi_decoder_new(dvbpsi_callback_gather_t pf_gather, - if (p_decoder == NULL) - return NULL; - -+ memcpy(&p_decoder->i_magic[0], "psi", 3); - p_decoder->pf_gather = pf_gather; - p_decoder->p_current_section = NULL; - p_decoder->i_section_max_size = i_section_max_size; -diff --git a/src/dvbpsi.h b/src/dvbpsi.h -index 3118da8..8a019e3 100644 ---- a/src/dvbpsi.h -+++ b/src/dvbpsi.h -@@ -43,6 +43,16 @@ extern "C" { - #endif - - /***************************************************************************** -+ * Helper for GCC version checks borrowed from VLC. -+ *****************************************************************************/ -+#ifdef __GNUC__ -+# define DVBPSI_GCC_VERSION(maj,min) \ -+ ((__GNUC__ > (maj)) || (__GNUC__ == (maj) && __GNUC_MINOR__ >= (min))) -+#else -+# define DVBPSI_GCC_VERSION(maj,min) (0) -+#endif -+ -+/***************************************************************************** - * dvbpsi_t - *****************************************************************************/ - /*! -@@ -90,7 +100,22 @@ typedef struct dvbpsi_decoder_s dvbpsi_decoder_t; - * \def DVBPSI_DECODER(x) - * \brief Helper macro for casting a private decoder into a dvbpsi_decoder_t - */ --#define DVBPSI_DECODER(x) ((dvbpsi_decoder_t *)(x)) -+/* Clever cast borrowed from VLC */ -+#if DVBPSI_GCC_VERSION(4,0) -+# ifndef __cplusplus -+# define DVBPSI_DECODER( x ) \ -+ __builtin_choose_expr( \ -+ __builtin_offsetof(__typeof__(*(x)), i_magic), \ -+ (void)0, \ -+ (dvbpsi_decoder_t *)(x)) -+# else -+# define DVBPSI_DECODER( x ) \ -+ ((dvbpsi_decoder_t *)(x) \ -+ + 0 * __builtin_offsetof(__typeof__(*(x)), i_magic)) -+# endif -+#else -+# define DVBPSI_DECODER(x) ((dvbpsi_decoder_t *)(x)) -+#endif - - /***************************************************************************** - * dvbpsi_t -@@ -187,6 +212,28 @@ typedef void (* dvbpsi_callback_gather_t)(dvbpsi_t *p_dvbpsi, /*!< pointer to d - dvbpsi_psi_section_t* p_section); /*!< pointer to psi section */ - - /***************************************************************************** -+ * DVBPSI_DECODER_COMMON -+ *****************************************************************************/ -+#define DVBPSI_DECODER_COMMON \ -+/*! \ -+ * \name DVBPSI_DECODER_COMMON \ -+ * these members are common for all dvbpsi_decoder_t \ -+ */ \ -+/**@{*/ \ -+ uint8_t i_magic[3]; /*!< Reserved magic value */ \ -+ bool b_complete_header; /*!< Flag for header completion */ \ -+ bool b_discontinuity; /*!< Discontinuity flag */ \ -+ bool b_current_valid; /*!< Current valid indicator */ \ -+ uint8_t i_continuity_counter; /*!< Continuity counter */ \ -+ uint8_t i_last_section_number;/*!< Last received section number */ \ -+ dvbpsi_psi_section_t *p_current_section; /*!< Current section */ \ -+ dvbpsi_psi_section_t *p_sections; /*!< List of received PSI sections */ \ -+ dvbpsi_callback_gather_t pf_gather;/*!< PSI decoder's callback */ \ -+ int i_section_max_size; /*!< Max size of a section for this decoder */ \ -+ int i_need; /*!< Bytes needed */ \ -+/**@}*/ -+ -+/***************************************************************************** - * struct dvbpsi_decoder_s - *****************************************************************************/ - /*! -@@ -196,18 +243,6 @@ typedef void (* dvbpsi_callback_gather_t)(dvbpsi_t *p_dvbpsi, /*!< pointer to d - * This structure shouldn't be used but if you want to write an external - * decoder. - */ --#define DVBPSI_DECODER_COMMON \ -- dvbpsi_callback_gather_t pf_gather;/*!< PSI decoder's callback */ \ -- int i_section_max_size; /*!< Max size of a section for this decoder */ \ -- uint8_t i_continuity_counter; /*!< Continuity counter */ \ -- bool b_discontinuity; /*!< Discontinuity flag */ \ -- dvbpsi_psi_section_t *p_current_section; /*!< Current section */ \ -- bool b_current_valid; /*!< Current valid indicator */ \ -- uint8_t i_last_section_number;/*!< Last received section number */ \ -- dvbpsi_psi_section_t *p_sections; /*!< List of received PSI sections */ \ -- int i_need; /*!< Bytes needed */ \ -- bool b_complete_header; /*!< Flag for header completion */ -- - struct dvbpsi_decoder_s - { - DVBPSI_DECODER_COMMON -@@ -217,22 +252,25 @@ struct dvbpsi_decoder_s - * dvbpsi_decoder_new - *****************************************************************************/ - /*! -- * \fn dvbpsi_decoder_t *dvbpsi_decoder_new(dvbpsi_callback_gather_t pf_gather, -+ * \fn void *dvbpsi_decoder_new(dvbpsi_callback_gather_t pf_gather, - * const int i_section_max_size, const bool b_discontinuity, const size_t psi_size); -- * \brief Create a new dvbpsi_decoder_t. -+ * \brief Create a new (private) dvbpsi decoder. - * \param pf_gather pointer to gather function for PSI decoder. - * \param i_section_max_size Max size of a section for this decoder - * \param b_discontinuity Discontinuity flag - * \param psi_size size of new PSI struct, eg: sizeof(dvbpsi_pat_t) -- * \return pointer to dvbpsi_decoder_t -+ * \return pointer to memory of size 'psi_size' that can be casted into a dvbpsi_decoder_t. - * -- * Creates a dvbpsi_decoder_t pointer to struct dvbpsi_decoder_s. It should be -- * delete with @see dvbpsi_decoder_delete() function. -+ * Creates a void pointer that points to a private dvbpsi decoder struct (eg: dvbpsi_pat_t). -+ * The first elements in this newly created decoder should contain DVBPSI_DECODER_COMMON, which -+ * corresponds to a dvbpsi_decoder_t. -+ * Upon return the pointer should be casted to the correct type. Delete the pointer -+ * with @see dvbpsi_decoder_delete() function. - */ --dvbpsi_decoder_t *dvbpsi_decoder_new(dvbpsi_callback_gather_t pf_gather, -- const int i_section_max_size, -- const bool b_discontinuity, -- const size_t psi_size); -+void *dvbpsi_decoder_new(dvbpsi_callback_gather_t pf_gather, -+ const int i_section_max_size, -+ const bool b_discontinuity, -+ const size_t psi_size); - - /***************************************************************************** - * dvbpsi_decoder_delete -diff --git a/src/tables/nit_private.h b/src/tables/nit_private.h -index 8eadce7..6c80e35 100644 ---- a/src/tables/nit_private.h -+++ b/src/tables/nit_private.h -@@ -39,14 +39,14 @@ typedef struct dvbpsi_nit_decoder_s - { - DVBPSI_DECODER_COMMON - -- uint16_t i_network_id; -- - dvbpsi_nit_callback pf_nit_callback; - void * p_cb_data; - - dvbpsi_nit_t current_nit; - dvbpsi_nit_t * p_building_nit; - -+ uint16_t i_network_id; -+ - } dvbpsi_nit_decoder_t; - - /***************************************************************************** -diff --git a/src/tables/pmt_private.h b/src/tables/pmt_private.h -index ed75a8b..4f10ecc 100644 ---- a/src/tables/pmt_private.h -+++ b/src/tables/pmt_private.h -@@ -37,14 +37,14 @@ typedef struct dvbpsi_pmt_decoder_s - { - DVBPSI_DECODER_COMMON - -- uint16_t i_program_number; -- - dvbpsi_pmt_callback pf_pmt_callback; - void * p_cb_data; - - dvbpsi_pmt_t current_pmt; - dvbpsi_pmt_t * p_building_pmt; - -+ uint16_t i_program_number; -+ - } 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 833e92c..c10c74d 100644 --- a/libdvbpsi.spec +++ b/libdvbpsi.spec @@ -1,17 +1,13 @@ -%global pre _pre3 -%global _default_patch_fuzz 2 +#global pre _pre3 Summary: Library for MPEG TS and DVB PSI tables decoding and generation Name: libdvbpsi -Version: 1.0.0 -Release: 0.2%{?pre}%{?dist} +Version: 1.1.0 +Release: 1%{?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 %package devel @@ -19,7 +15,6 @@ Summary: Development package for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} -# ----------------------------------------------------------------------------- %description libdvbpsi is a very simple and fully portable library designed for @@ -30,55 +25,47 @@ libdvbpsi is a very simple and fully portable library designed for MPEG TS and DVB PSI table decoding and generation. This package contains development files for %{name} -# ----------------------------------------------------------------------------- %prep %setup -q -n %{name}-%{version}%{?pre} -%patch0 -p1 -%patch1 -p1 -# ----------------------------------------------------------------------------- %build %configure --disable-dependency-tracking --disable-static make %{?_smp_mflags} make doc -# ----------------------------------------------------------------------------- %install -rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la -# ----------------------------------------------------------------------------- - -%clean -rm -rf $RPM_BUILD_ROOT - -# ----------------------------------------------------------------------------- %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -%defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README %{_libdir}/%{name}.so.* %files devel -%defattr(-,root,root,-) %doc doc/doxygen/html %{_includedir}/dvbpsi/ %{_libdir}/lib*.so %{_libdir}/pkgconfig/libdvbpsi.pc -# ----------------------------------------------------------------------------- %changelog -* Sun Mar 03 2013 Nicolas Chauvet - 1.0.0-0.2_pre3 -- Mass rebuilt for Fedora 19 Features +* Sun Apr 28 2013 Nicolas Chauvet - 1.1.0-1 +- Update to 1.1.0 + +* Sun Mar 10 2013 Nicolas Chauvet - 1.0.0-1 +- Update to 1.0.0 +- Clean-up spec file + +* Sun Nov 11 2012 Nicolas Chauvet - 1.0.0-0.2_pre3 +- Update to _pre3 as tagged in git * Thu Oct 18 2012 Nicolas Chauvet - 1.0.0-0.1_pre2 - Update to 1.0.0_pre2 diff --git a/sources b/sources index a73b0cf..28e4260 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -58ee643c11c0da05e616d6876f849547 libdvbpsi-1.0.0_pre3.tar.bz2 +1f84f9d1de08e15f94e6ff9957278064 libdvbpsi-1.1.0.tar.bz2 From 904ac5126b5bbc0659ba85084b6ac929d266aaae Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 10 Nov 2013 23:21:17 +0000 Subject: [PATCH 14/45] Update to 1.1.2 --- .gitignore | 2 +- libdvbpsi.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8920522..217c25b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -libdvbpsi-1.1.0.tar.bz2 +libdvbpsi-1.1.2.tar.bz2 diff --git a/libdvbpsi.spec b/libdvbpsi.spec index c10c74d..c7c6c93 100644 --- a/libdvbpsi.spec +++ b/libdvbpsi.spec @@ -2,7 +2,7 @@ Summary: Library for MPEG TS and DVB PSI tables decoding and generation Name: libdvbpsi -Version: 1.1.0 +Version: 1.1.2 Release: 1%{?pre}%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -57,6 +57,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la %changelog +* Sun Nov 10 2013 Nicolas Chauvet - 1.1.2-1 +- Update to 1.1.2 + * Sun Apr 28 2013 Nicolas Chauvet - 1.1.0-1 - Update to 1.1.0 diff --git a/sources b/sources index 28e4260..767620b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1f84f9d1de08e15f94e6ff9957278064 libdvbpsi-1.1.0.tar.bz2 +0d8ffb38d0ebfeb55c40ce6fe232f5d3 libdvbpsi-1.1.2.tar.bz2 From e7fca82763569d884922644e1f56c1ce2da83660 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 31 Aug 2014 04:17:35 +0000 Subject: [PATCH 15/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- libdvbpsi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdvbpsi.spec b/libdvbpsi.spec index c7c6c93..c762930 100644 --- a/libdvbpsi.spec +++ b/libdvbpsi.spec @@ -3,7 +3,7 @@ Summary: Library for MPEG TS and DVB PSI tables decoding and generation Name: libdvbpsi Version: 1.1.2 -Release: 1%{?pre}%{?dist} +Release: 2%{?pre}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.videolan.org/developers/libdvbpsi.html @@ -57,6 +57,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la %changelog +* Sun Aug 31 2014 Sérgio Basto - 1.1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sun Nov 10 2013 Nicolas Chauvet - 1.1.2-1 - Update to 1.1.2 From b433a673ce2453e475ce292e50ab897d4a011ed1 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 15 Nov 2014 17:08:27 +0000 Subject: [PATCH 16/45] Update to 1.2.0 --- .gitignore | 2 +- libdvbpsi.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 217c25b..6a6a941 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -libdvbpsi-1.1.2.tar.bz2 +libdvbpsi-1.2.0.tar.bz2 diff --git a/libdvbpsi.spec b/libdvbpsi.spec index c762930..f11dd22 100644 --- a/libdvbpsi.spec +++ b/libdvbpsi.spec @@ -2,8 +2,8 @@ Summary: Library for MPEG TS and DVB PSI tables decoding and generation Name: libdvbpsi -Version: 1.1.2 -Release: 2%{?pre}%{?dist} +Version: 1.2.0 +Release: 1%{?pre}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.videolan.org/developers/libdvbpsi.html @@ -57,6 +57,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la %changelog +* Sat Nov 15 2014 Nicolas Chauvet - 1.2.0-1 +- Update to 1.2.0 + * Sun Aug 31 2014 Sérgio Basto - 1.1.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 767620b..463147d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0d8ffb38d0ebfeb55c40ce6fe232f5d3 libdvbpsi-1.1.2.tar.bz2 +69e38e93c4db4f2a58cbd0b6f9f38228 libdvbpsi-1.2.0.tar.bz2 From 700d5e020c73f59f26c45d98d5d017f281505c35 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 26 Apr 2015 17:18:06 +0000 Subject: [PATCH 17/45] Fix for f22 --- libdvbpsi-backport-werror_on_debug.patch | 28 ++++++++++++++++++++++++ libdvbpsi.spec | 11 ++++++++-- 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 libdvbpsi-backport-werror_on_debug.patch diff --git a/libdvbpsi-backport-werror_on_debug.patch b/libdvbpsi-backport-werror_on_debug.patch new file mode 100644 index 0000000..74c6655 --- /dev/null +++ b/libdvbpsi-backport-werror_on_debug.patch @@ -0,0 +1,28 @@ +commit 09f9fad68e34975f8a90de564f3f12820947f22e +Author: Jean-Paul Saman +Date: Mon Sep 8 12:27:07 2014 +0200 + + configure.ac: specify -Werror on debug builds only. + +diff --git a/configure.ac b/configure.ac +index 66e5fec..2585a8f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -22,7 +22,7 @@ dnl store CFLAGS from user + CFLAGS_save="${CFLAGS}" + + dnl add features to CFLAGS +-CFLAGS_dist="-Wall -Werror --std=gnu99 -D_GNU_SOURCE" ++CFLAGS_dist="-Wall -std=gnu99 -D_GNU_SOURCE" + CFLAGS_dist="${CFLAGS_dist} -Wpointer-arith -Wcast-align -Wstrict-prototypes -Wshadow -Waggregate-return -Wmissing-prototypes -Wnested-externs -Wsign-compare" + + dnl check the operating system +@@ -52,7 +52,7 @@ AC_ARG_ENABLE(debug, + esac],[debug=false]) + if test "$debug" = "true" + then +- CFLAGS_dist="${CFLAGS_dist} -ggdb3" ++ CFLAGS_dist="${CFLAGS_dist} -Werror -ggdb3" + fi + + dnl --enable-gcc-sanitize diff --git a/libdvbpsi.spec b/libdvbpsi.spec index f11dd22..54d182d 100644 --- a/libdvbpsi.spec +++ b/libdvbpsi.spec @@ -1,14 +1,17 @@ #global pre _pre3 +%global _default_patch_fuzz 3 Summary: Library for MPEG TS and DVB PSI tables decoding and generation Name: libdvbpsi Version: 1.2.0 -Release: 1%{?pre}%{?dist} +Release: 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: libdvbpsi-backport-werror_on_debug.patch BuildRequires: graphviz doxygen +BuildRequires: libtool %package devel Summary: Development package for %{name} @@ -28,7 +31,8 @@ This package contains development files for %{name} %prep %setup -q -n %{name}-%{version}%{?pre} - +%patch0 -p1 +autoreconf -vif %build @@ -57,6 +61,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la %changelog +* Sun Apr 26 2015 Nicolas Chauvet - 1.2.0-2 +- Backport patch to disable Werror - fix f22 + * Sat Nov 15 2014 Nicolas Chauvet - 1.2.0-1 - Update to 1.2.0 From c82477fe225be2ad87a3ad454803dd4d50cb99ac Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 24 Oct 2015 11:07:43 +0000 Subject: [PATCH 18/45] Backport patch --- libdvbpsi-calloc.patch | 24 ++++++++++++++++++++++++ libdvbpsi.spec | 7 ++++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 libdvbpsi-calloc.patch diff --git a/libdvbpsi-calloc.patch b/libdvbpsi-calloc.patch new file mode 100644 index 0000000..7000bbc --- /dev/null +++ b/libdvbpsi-calloc.patch @@ -0,0 +1,24 @@ +From 5058ea22730a67f03dd253dce89d513bc430bfb6 Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Rafa=C3=ABl=20Carr=C3=A9?= +Date: Fri, 5 Sep 2014 12:11:49 +0200 +Subject: [PATCH] dr_50: fix off-by-6 + +--- + src/descriptors/dr_50.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/descriptors/dr_50.c b/src/descriptors/dr_50.c +index a2e491c..9933b08 100644 +--- a/src/descriptors/dr_50.c ++++ b/src/descriptors/dr_50.c +@@ -70,7 +70,7 @@ dvbpsi_component_dr_t* dvbpsi_DecodeComponentDr(dvbpsi_descriptor_t * p_descript + if (p_descriptor->i_length > 6) + { + p_decoded->i_text_length = p_descriptor->i_length - 6; +- p_decoded->i_text = calloc(p_decoded->i_text_length - 6, sizeof(uint8_t)); ++ p_decoded->i_text = calloc(1, p_decoded->i_text_length); + if (!p_decoded->i_text) + { + free(p_decoded); +-- +1.7.10.4 diff --git a/libdvbpsi.spec b/libdvbpsi.spec index 54d182d..f7d6050 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.2.0 -Release: 2%{?pre}%{?dist} +Release: 3%{?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: libdvbpsi-backport-werror_on_debug.patch +Patch1: libdvbpsi-calloc.patch BuildRequires: graphviz doxygen BuildRequires: libtool @@ -32,6 +33,7 @@ This package contains development files for %{name} %prep %setup -q -n %{name}-%{version}%{?pre} %patch0 -p1 +%patch1 -p1 autoreconf -vif @@ -61,6 +63,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la %changelog +* Sat Oct 24 2015 Nicolas Chauvet - 1.2.0-3 +- backport patch - rfbz#3729 + * Sun Apr 26 2015 Nicolas Chauvet - 1.2.0-2 - Backport patch to disable Werror - fix f22 From 47cb31ed1dcb92be99583f6292ce5e718308a965 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 24 Oct 2015 13:31:00 +0200 Subject: [PATCH 19/45] Update to 1.3.0 --- libdvbpsi-backport-werror_on_debug.patch | 28 ------------------------ libdvbpsi-calloc.patch | 24 -------------------- libdvbpsi.spec | 14 +++++------- 3 files changed, 5 insertions(+), 61 deletions(-) delete mode 100644 libdvbpsi-backport-werror_on_debug.patch delete mode 100644 libdvbpsi-calloc.patch diff --git a/libdvbpsi-backport-werror_on_debug.patch b/libdvbpsi-backport-werror_on_debug.patch deleted file mode 100644 index 74c6655..0000000 --- a/libdvbpsi-backport-werror_on_debug.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit 09f9fad68e34975f8a90de564f3f12820947f22e -Author: Jean-Paul Saman -Date: Mon Sep 8 12:27:07 2014 +0200 - - configure.ac: specify -Werror on debug builds only. - -diff --git a/configure.ac b/configure.ac -index 66e5fec..2585a8f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -22,7 +22,7 @@ dnl store CFLAGS from user - CFLAGS_save="${CFLAGS}" - - dnl add features to CFLAGS --CFLAGS_dist="-Wall -Werror --std=gnu99 -D_GNU_SOURCE" -+CFLAGS_dist="-Wall -std=gnu99 -D_GNU_SOURCE" - CFLAGS_dist="${CFLAGS_dist} -Wpointer-arith -Wcast-align -Wstrict-prototypes -Wshadow -Waggregate-return -Wmissing-prototypes -Wnested-externs -Wsign-compare" - - dnl check the operating system -@@ -52,7 +52,7 @@ AC_ARG_ENABLE(debug, - esac],[debug=false]) - if test "$debug" = "true" - then -- CFLAGS_dist="${CFLAGS_dist} -ggdb3" -+ CFLAGS_dist="${CFLAGS_dist} -Werror -ggdb3" - fi - - dnl --enable-gcc-sanitize diff --git a/libdvbpsi-calloc.patch b/libdvbpsi-calloc.patch deleted file mode 100644 index 7000bbc..0000000 --- a/libdvbpsi-calloc.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 5058ea22730a67f03dd253dce89d513bc430bfb6 Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Rafa=C3=ABl=20Carr=C3=A9?= -Date: Fri, 5 Sep 2014 12:11:49 +0200 -Subject: [PATCH] dr_50: fix off-by-6 - ---- - src/descriptors/dr_50.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/descriptors/dr_50.c b/src/descriptors/dr_50.c -index a2e491c..9933b08 100644 ---- a/src/descriptors/dr_50.c -+++ b/src/descriptors/dr_50.c -@@ -70,7 +70,7 @@ dvbpsi_component_dr_t* dvbpsi_DecodeComponentDr(dvbpsi_descriptor_t * p_descript - if (p_descriptor->i_length > 6) - { - p_decoded->i_text_length = p_descriptor->i_length - 6; -- p_decoded->i_text = calloc(p_decoded->i_text_length - 6, sizeof(uint8_t)); -+ p_decoded->i_text = calloc(1, p_decoded->i_text_length); - if (!p_decoded->i_text) - { - free(p_decoded); --- -1.7.10.4 diff --git a/libdvbpsi.spec b/libdvbpsi.spec index f7d6050..20c9c73 100644 --- a/libdvbpsi.spec +++ b/libdvbpsi.spec @@ -1,16 +1,11 @@ -#global pre _pre3 -%global _default_patch_fuzz 3 - Summary: Library for MPEG TS and DVB PSI tables decoding and generation Name: libdvbpsi -Version: 1.2.0 -Release: 3%{?pre}%{?dist} +Version: 1.3.0 +Release: 1%{?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: libdvbpsi-backport-werror_on_debug.patch -Patch1: libdvbpsi-calloc.patch BuildRequires: graphviz doxygen BuildRequires: libtool @@ -32,8 +27,6 @@ This package contains development files for %{name} %prep %setup -q -n %{name}-%{version}%{?pre} -%patch0 -p1 -%patch1 -p1 autoreconf -vif @@ -63,6 +56,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la %changelog +* Sat Oct 24 2015 Nicolas Chauvet - 1.3.0-1 +- Update to 1.3.0 + * Sat Oct 24 2015 Nicolas Chauvet - 1.2.0-3 - backport patch - rfbz#3729 From f32692f8b67016ec1aa56d6e3c775e51e622c993 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 15 Sep 2016 15:01:58 +0200 Subject: [PATCH 20/45] Spec file clean-up --- libdvbpsi.spec | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/libdvbpsi.spec b/libdvbpsi.spec index 20c9c73..2a44fd8 100644 --- a/libdvbpsi.spec +++ b/libdvbpsi.spec @@ -1,18 +1,20 @@ Summary: Library for MPEG TS and DVB PSI tables decoding and generation Name: libdvbpsi Version: 1.3.0 -Release: 1%{?pre}%{?dist} +Release: 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 + +BuildRequires: gcc BuildRequires: graphviz doxygen BuildRequires: libtool %package devel Summary: Development package for %{name} Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{_isa} = %{version}-%{release} %description @@ -32,20 +34,21 @@ autoreconf -vif %build %configure --disable-dependency-tracking --disable-static -make %{?_smp_mflags} +%make_build make doc %install -make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" -rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la +%make_install INSTALL="install -p" +rm -f %{buildroot}%{_libdir}/lib*.la %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -%doc AUTHORS COPYING ChangeLog README +%doc AUTHORS ChangeLog README +%license COPYING %{_libdir}/%{name}.so.* %files devel @@ -56,6 +59,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la %changelog +* Thu Sep 15 2016 Nicolas Chauvet - 1.3.0-2 +- Spec file clean-up + * Sat Oct 24 2015 Nicolas Chauvet - 1.3.0-1 - Update to 1.3.0 From dd012a3c42365d6c21651df54c91572a0ee8eb01 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 15 Sep 2016 15:07:17 +0200 Subject: [PATCH 21/45] Update sources --- .gitignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6a6a941..c85e7fc 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -libdvbpsi-1.2.0.tar.bz2 +/libdvbpsi-*.tar.bz2 diff --git a/sources b/sources index 463147d..2f3541f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -69e38e93c4db4f2a58cbd0b6f9f38228 libdvbpsi-1.2.0.tar.bz2 +2b217039a1299000c39423441f77e76a libdvbpsi-1.3.0.tar.bz2 From b26cd2d3d461682a84933aec3a98d0aaf153746f Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 26 Sep 2016 11:38:16 +0200 Subject: [PATCH 22/45] retab --- libdvbpsi.spec | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/libdvbpsi.spec b/libdvbpsi.spec index 2a44fd8..c3daa6a 100644 --- a/libdvbpsi.spec +++ b/libdvbpsi.spec @@ -1,20 +1,20 @@ -Summary: Library for MPEG TS and DVB PSI tables decoding and generation -Name: libdvbpsi -Version: 1.3.0 -Release: 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 +Summary: Library for MPEG TS and DVB PSI tables decoding and generation +Name: libdvbpsi +Version: 1.3.0 +Release: 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 BuildRequires: gcc BuildRequires: graphviz doxygen BuildRequires: libtool %package devel -Summary: Development package for %{name} -Group: Development/Libraries -Requires: %{name}%{_isa} = %{version}-%{release} +Summary: Development package for %{name} +Group: Development/Libraries +Requires: %{name}%{_isa} = %{version}-%{release} %description From 4eaf1a6eba379b710ed6c3fa7fa7584a765ca40e Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 26 Sep 2016 11:38:50 +0200 Subject: [PATCH 23/45] Add %%{?_smp_mflags} for doc --- libdvbpsi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libdvbpsi.spec b/libdvbpsi.spec index c3daa6a..704a2ef 100644 --- a/libdvbpsi.spec +++ b/libdvbpsi.spec @@ -35,7 +35,7 @@ autoreconf -vif %build %configure --disable-dependency-tracking --disable-static %make_build -make doc +make %{?_smp_mflags} doc %install From 762545b95804aa958b69beb9b5851762dbb30a3e Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 26 Sep 2016 11:39:11 +0200 Subject: [PATCH 24/45] Remove groups --- libdvbpsi.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/libdvbpsi.spec b/libdvbpsi.spec index 704a2ef..9cce14e 100644 --- a/libdvbpsi.spec +++ b/libdvbpsi.spec @@ -3,7 +3,6 @@ Name: libdvbpsi Version: 1.3.0 Release: 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 @@ -13,7 +12,6 @@ BuildRequires: libtool %package devel Summary: Development package for %{name} -Group: Development/Libraries Requires: %{name}%{_isa} = %{version}-%{release} From 567cf1fa61aa51519bd7d03eb6ef4a09564a8cfc Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 26 Sep 2016 11:42:25 +0200 Subject: [PATCH 25/45] Add doc sub-package --- libdvbpsi.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/libdvbpsi.spec b/libdvbpsi.spec index 9cce14e..b3c9579 100644 --- a/libdvbpsi.spec +++ b/libdvbpsi.spec @@ -14,6 +14,9 @@ BuildRequires: libtool Summary: Development package for %{name} Requires: %{name}%{_isa} = %{version}-%{release} +%package doc +Summary: Documentation for %{name} + %description libdvbpsi is a very simple and fully portable library designed for @@ -24,6 +27,9 @@ libdvbpsi is a very simple and fully portable library designed for MPEG TS and DVB PSI table decoding and generation. This package contains development files for %{name} +%description doc +Documentation for %{name}. + %prep %setup -q -n %{name}-%{version}%{?pre} @@ -50,11 +56,13 @@ rm -f %{buildroot}%{_libdir}/lib*.la %{_libdir}/%{name}.so.* %files devel -%doc doc/doxygen/html %{_includedir}/dvbpsi/ %{_libdir}/lib*.so %{_libdir}/pkgconfig/libdvbpsi.pc +%files doc +%doc doc/doxygen/html + %changelog * Thu Sep 15 2016 Nicolas Chauvet - 1.3.0-2 From 4c717c244d8dae87bfcf6179e1d6c0e2489c4847 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 26 Sep 2016 11:44:02 +0200 Subject: [PATCH 26/45] Add changelog --- libdvbpsi.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libdvbpsi.spec b/libdvbpsi.spec index b3c9579..e83a42c 100644 --- a/libdvbpsi.spec +++ b/libdvbpsi.spec @@ -1,7 +1,7 @@ Summary: Library for MPEG TS and DVB PSI tables decoding and generation Name: libdvbpsi Version: 1.3.0 -Release: 2%{?pre}%{?dist} +Release: 3%{?pre}%{?dist} License: LGPLv2+ URL: http://www.videolan.org/developers/libdvbpsi.html Source0: http://download.videolan.org/pub/libdvbpsi/%{version}/%{name}-%{version}%{?pre}.tar.bz2 @@ -65,6 +65,11 @@ rm -f %{buildroot}%{_libdir}/lib*.la %changelog +* Mon Sep 26 2016 Nicolas Chauvet - 1.3.0-3 +- Add doc sub-package +- clean mixed tab and space +- add %%{?_smp_mflags} for doc + * Thu Sep 15 2016 Nicolas Chauvet - 1.3.0-2 - Spec file clean-up From 2053131c9d085bf605bcd052afa487347960f19d Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 26 Sep 2016 12:14:36 +0200 Subject: [PATCH 27/45] Fixup retab --- libdvbpsi.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libdvbpsi.spec b/libdvbpsi.spec index e83a42c..05dea62 100644 --- a/libdvbpsi.spec +++ b/libdvbpsi.spec @@ -6,9 +6,9 @@ License: LGPLv2+ URL: http://www.videolan.org/developers/libdvbpsi.html Source0: http://download.videolan.org/pub/libdvbpsi/%{version}/%{name}-%{version}%{?pre}.tar.bz2 -BuildRequires: gcc +BuildRequires: gcc BuildRequires: graphviz doxygen -BuildRequires: libtool +BuildRequires: libtool %package devel Summary: Development package for %{name} From 3971903c6a730db6d1378440afe58966fd1626a1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 18:33:54 +0000 Subject: [PATCH 28/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- libdvbpsi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdvbpsi.spec b/libdvbpsi.spec index 05dea62..78221dd 100644 --- a/libdvbpsi.spec +++ b/libdvbpsi.spec @@ -1,7 +1,7 @@ Summary: Library for MPEG TS and DVB PSI tables decoding and generation Name: libdvbpsi Version: 1.3.0 -Release: 3%{?pre}%{?dist} +Release: 4%{?pre}%{?dist} License: LGPLv2+ URL: http://www.videolan.org/developers/libdvbpsi.html Source0: http://download.videolan.org/pub/libdvbpsi/%{version}/%{name}-%{version}%{?pre}.tar.bz2 @@ -65,6 +65,9 @@ rm -f %{buildroot}%{_libdir}/lib*.la %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Mon Sep 26 2016 Nicolas Chauvet - 1.3.0-3 - Add doc sub-package - clean mixed tab and space From a4ce0e316ad3360fc0114d9bb96d28be7b8edadf Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 16 Feb 2017 10:40:52 +0100 Subject: [PATCH 29/45] Update to 1.3.1 --- libdvbpsi.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libdvbpsi.spec b/libdvbpsi.spec index 78221dd..27fe68c 100644 --- a/libdvbpsi.spec +++ b/libdvbpsi.spec @@ -1,7 +1,7 @@ Summary: Library for MPEG TS and DVB PSI tables decoding and generation Name: libdvbpsi -Version: 1.3.0 -Release: 4%{?pre}%{?dist} +Version: 1.3.1 +Release: 1%{?pre}%{?dist} License: LGPLv2+ URL: http://www.videolan.org/developers/libdvbpsi.html Source0: http://download.videolan.org/pub/libdvbpsi/%{version}/%{name}-%{version}%{?pre}.tar.bz2 @@ -65,6 +65,9 @@ rm -f %{buildroot}%{_libdir}/lib*.la %changelog +* Thu Feb 16 2017 Nicolas Chauvet - 1.3.1-1 +- Update to 1.3.1 + * Fri Feb 10 2017 Fedora Release Engineering - 1.3.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 2f3541f..b18481c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2b217039a1299000c39423441f77e76a libdvbpsi-1.3.0.tar.bz2 +SHA512 (libdvbpsi-1.3.1.tar.bz2) = 015d586d1ef1fd35fc4b6a5b79d1ce4570e07070840d7070938c38be64853fb987172ad225f000156166559709061de6f901237bfc0f7f26f219b5950b57c27a From 05ef05f0e57026cc5c6f683f7ee4ae5e4b299130 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 18:44:31 +0000 Subject: [PATCH 30/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- libdvbpsi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdvbpsi.spec b/libdvbpsi.spec index 27fe68c..33ac036 100644 --- a/libdvbpsi.spec +++ b/libdvbpsi.spec @@ -1,7 +1,7 @@ Summary: Library for MPEG TS and DVB PSI tables decoding and generation Name: libdvbpsi Version: 1.3.1 -Release: 1%{?pre}%{?dist} +Release: 2%{?pre}%{?dist} License: LGPLv2+ URL: http://www.videolan.org/developers/libdvbpsi.html Source0: http://download.videolan.org/pub/libdvbpsi/%{version}/%{name}-%{version}%{?pre}.tar.bz2 @@ -65,6 +65,9 @@ rm -f %{buildroot}%{_libdir}/lib*.la %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Thu Feb 16 2017 Nicolas Chauvet - 1.3.1-1 - Update to 1.3.1 From 2b0583559d52c3ea6c5726e8d2f3b7b6382a4848 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 01:22:20 +0000 Subject: [PATCH 31/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- libdvbpsi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdvbpsi.spec b/libdvbpsi.spec index 33ac036..bdf4422 100644 --- a/libdvbpsi.spec +++ b/libdvbpsi.spec @@ -1,7 +1,7 @@ Summary: Library for MPEG TS and DVB PSI tables decoding and generation Name: libdvbpsi Version: 1.3.1 -Release: 2%{?pre}%{?dist} +Release: 3%{?pre}%{?dist} License: LGPLv2+ URL: http://www.videolan.org/developers/libdvbpsi.html Source0: http://download.videolan.org/pub/libdvbpsi/%{version}/%{name}-%{version}%{?pre}.tar.bz2 @@ -65,6 +65,9 @@ rm -f %{buildroot}%{_libdir}/lib*.la %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 1.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 3532d185f1d59a0d8ddfa2720beea8a2030f3aeb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 21:29:35 +0000 Subject: [PATCH 32/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libdvbpsi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdvbpsi.spec b/libdvbpsi.spec index bdf4422..bbfbe07 100644 --- a/libdvbpsi.spec +++ b/libdvbpsi.spec @@ -1,7 +1,7 @@ Summary: Library for MPEG TS and DVB PSI tables decoding and generation Name: libdvbpsi Version: 1.3.1 -Release: 3%{?pre}%{?dist} +Release: 4%{?pre}%{?dist} License: LGPLv2+ URL: http://www.videolan.org/developers/libdvbpsi.html Source0: http://download.videolan.org/pub/libdvbpsi/%{version}/%{name}-%{version}%{?pre}.tar.bz2 @@ -65,6 +65,9 @@ rm -f %{buildroot}%{_libdir}/lib*.la %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 1.3.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From f3378687473a098459d5289f7e7c395d8c474ad6 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 19 Feb 2018 21:36:03 +0100 Subject: [PATCH 33/45] Update to 1.3.2 --- libdvbpsi.spec | 11 +++++++---- sources | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/libdvbpsi.spec b/libdvbpsi.spec index bbfbe07..91be003 100644 --- a/libdvbpsi.spec +++ b/libdvbpsi.spec @@ -1,7 +1,7 @@ Summary: Library for MPEG TS and DVB PSI tables decoding and generation Name: libdvbpsi -Version: 1.3.1 -Release: 4%{?pre}%{?dist} +Version: 1.3.2 +Release: 1%{?dist} License: LGPLv2+ URL: http://www.videolan.org/developers/libdvbpsi.html Source0: http://download.videolan.org/pub/libdvbpsi/%{version}/%{name}-%{version}%{?pre}.tar.bz2 @@ -47,8 +47,8 @@ make %{?_smp_mflags} doc rm -f %{buildroot}%{_libdir}/lib*.la -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets + %files %doc AUTHORS ChangeLog README @@ -65,6 +65,9 @@ rm -f %{buildroot}%{_libdir}/lib*.la %changelog +* Mon Feb 19 2018 Nicolas Chauvet - 1.3.2-1 +- Update to 1.3.2 + * Wed Feb 07 2018 Fedora Release Engineering - 1.3.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index b18481c..a6971ff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libdvbpsi-1.3.1.tar.bz2) = 015d586d1ef1fd35fc4b6a5b79d1ce4570e07070840d7070938c38be64853fb987172ad225f000156166559709061de6f901237bfc0f7f26f219b5950b57c27a +SHA512 (libdvbpsi-1.3.2.tar.bz2) = cb59c2e66a214cad7bb96aa1f80a178399fcd80da9fc05b22c72763f2cd818bfab3724d36eee4c6467fb8bc8bae18b1d8afec64c02e8e47cd7a6e887f0230309 From 932dc1b1520e0eb0ef1ab25523051e254d06014c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 08:00:35 +0000 Subject: [PATCH 34/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libdvbpsi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdvbpsi.spec b/libdvbpsi.spec index 91be003..10d9075 100644 --- a/libdvbpsi.spec +++ b/libdvbpsi.spec @@ -1,7 +1,7 @@ Summary: Library for MPEG TS and DVB PSI tables decoding and generation Name: libdvbpsi Version: 1.3.2 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ URL: http://www.videolan.org/developers/libdvbpsi.html Source0: http://download.videolan.org/pub/libdvbpsi/%{version}/%{name}-%{version}%{?pre}.tar.bz2 @@ -65,6 +65,9 @@ rm -f %{buildroot}%{_libdir}/lib*.la %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 1.3.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Feb 19 2018 Nicolas Chauvet - 1.3.2-1 - Update to 1.3.2 From 91c6564e0f384e8ebaaf9dbadcfa2cc350ea6cd7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 06:58:42 +0000 Subject: [PATCH 35/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libdvbpsi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdvbpsi.spec b/libdvbpsi.spec index 10d9075..be4c59a 100644 --- a/libdvbpsi.spec +++ b/libdvbpsi.spec @@ -1,7 +1,7 @@ Summary: Library for MPEG TS and DVB PSI tables decoding and generation Name: libdvbpsi Version: 1.3.2 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ URL: http://www.videolan.org/developers/libdvbpsi.html Source0: http://download.videolan.org/pub/libdvbpsi/%{version}/%{name}-%{version}%{?pre}.tar.bz2 @@ -65,6 +65,9 @@ rm -f %{buildroot}%{_libdir}/lib*.la %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 1.3.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 1.3.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 1d6ac2d7ed0c1e0adb010fe5a5cd2ec7177e719e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 13:07:15 +0000 Subject: [PATCH 36/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libdvbpsi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdvbpsi.spec b/libdvbpsi.spec index be4c59a..72322b1 100644 --- a/libdvbpsi.spec +++ b/libdvbpsi.spec @@ -1,7 +1,7 @@ Summary: Library for MPEG TS and DVB PSI tables decoding and generation Name: libdvbpsi Version: 1.3.2 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ URL: http://www.videolan.org/developers/libdvbpsi.html Source0: http://download.videolan.org/pub/libdvbpsi/%{version}/%{name}-%{version}%{?pre}.tar.bz2 @@ -65,6 +65,9 @@ rm -f %{buildroot}%{_libdir}/lib*.la %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 1.3.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 1.3.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 82bc9b5db38291773ac72451406011f3e8b68096 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 22 Aug 2019 12:02:03 +0200 Subject: [PATCH 37/45] Update to 1.3.3 --- .gitignore | 1 + libdvbpsi.spec | 16 +++++++++++----- sources | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index c85e7fc..f7b1bea 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /libdvbpsi-*.tar.bz2 +/libdvbpsi-26bdfd4.tar.gz diff --git a/libdvbpsi.spec b/libdvbpsi.spec index 72322b1..0813829 100644 --- a/libdvbpsi.spec +++ b/libdvbpsi.spec @@ -1,10 +1,13 @@ +%global commit0 26bdfd4c0dc58f0f4917461cdf31dae24f9e1463 +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) + Summary: Library for MPEG TS and DVB PSI tables decoding and generation Name: libdvbpsi -Version: 1.3.2 -Release: 4%{?dist} +Version: 1.3.3 +Release: 1%{?dist} License: LGPLv2+ URL: http://www.videolan.org/developers/libdvbpsi.html -Source0: http://download.videolan.org/pub/libdvbpsi/%{version}/%{name}-%{version}%{?pre}.tar.bz2 +Source0: https://code.videolan.org/videolan/libdvbpsi/-/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz BuildRequires: gcc BuildRequires: graphviz doxygen @@ -32,7 +35,7 @@ Documentation for %{name}. %prep -%setup -q -n %{name}-%{version}%{?pre} +%setup -q -n %{name}-%{commit0} autoreconf -vif @@ -43,7 +46,7 @@ make %{?_smp_mflags} doc %install -%make_install INSTALL="install -p" +%make_install rm -f %{buildroot}%{_libdir}/lib*.la @@ -65,6 +68,9 @@ rm -f %{buildroot}%{_libdir}/lib*.la %changelog +* Thu Aug 22 2019 Nicolas Chauvet - 1.3.3-1 +- Update to 1.3.3 + * Thu Jul 25 2019 Fedora Release Engineering - 1.3.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index a6971ff..357280c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libdvbpsi-1.3.2.tar.bz2) = cb59c2e66a214cad7bb96aa1f80a178399fcd80da9fc05b22c72763f2cd818bfab3724d36eee4c6467fb8bc8bae18b1d8afec64c02e8e47cd7a6e887f0230309 +SHA512 (libdvbpsi-26bdfd4.tar.gz) = 1972ac41b0d97e034941b5807c5d7128f60e599c28b55af55873d8cf77cc08b0bf07952de812ac90f26f68952f57ee9193fc1f5bb03f952ee891e0aeea50891e From 0d9c3c5f74953e93f8297b68dc2bd91e75e94bb9 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 22 Aug 2019 12:07:56 +0200 Subject: [PATCH 38/45] Update gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f7b1bea..bbd856e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /libdvbpsi-*.tar.bz2 -/libdvbpsi-26bdfd4.tar.gz +/libdvbpsi-*.tar.gz From 98cce397c9bafce7e31d95eb678842af7652578d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 08:57:36 +0000 Subject: [PATCH 39/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libdvbpsi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdvbpsi.spec b/libdvbpsi.spec index 0813829..e6200e1 100644 --- a/libdvbpsi.spec +++ b/libdvbpsi.spec @@ -4,7 +4,7 @@ Summary: Library for MPEG TS and DVB PSI tables decoding and generation Name: libdvbpsi Version: 1.3.3 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ URL: http://www.videolan.org/developers/libdvbpsi.html Source0: https://code.videolan.org/videolan/libdvbpsi/-/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz @@ -68,6 +68,9 @@ rm -f %{buildroot}%{_libdir}/lib*.la %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 1.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Aug 22 2019 Nicolas Chauvet - 1.3.3-1 - Update to 1.3.3 From 1057086bd7d23d63a21fb43404ae5aa1af56b663 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 5 Apr 2020 19:00:05 +0200 Subject: [PATCH 40/45] Fix make_build for doc --- libdvbpsi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libdvbpsi.spec b/libdvbpsi.spec index e6200e1..e3eff70 100644 --- a/libdvbpsi.spec +++ b/libdvbpsi.spec @@ -42,7 +42,7 @@ autoreconf -vif %build %configure --disable-dependency-tracking --disable-static %make_build -make %{?_smp_mflags} doc +%make_build doc %install From e0526e599cd02e071da9f9ad2adae357dddc6452 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 04:31:14 +0000 Subject: [PATCH 41/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libdvbpsi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdvbpsi.spec b/libdvbpsi.spec index e3eff70..de25e8a 100644 --- a/libdvbpsi.spec +++ b/libdvbpsi.spec @@ -4,7 +4,7 @@ Summary: Library for MPEG TS and DVB PSI tables decoding and generation Name: libdvbpsi Version: 1.3.3 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ URL: http://www.videolan.org/developers/libdvbpsi.html Source0: https://code.videolan.org/videolan/libdvbpsi/-/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz @@ -68,6 +68,9 @@ rm -f %{buildroot}%{_libdir}/lib*.la %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 1.3.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jan 29 2020 Fedora Release Engineering - 1.3.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 34bca83d2b8cc868dcbef8bfa86fce538cf45b9f Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 5 Jan 2021 01:41:49 +0000 Subject: [PATCH 42/45] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- libdvbpsi.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libdvbpsi.spec b/libdvbpsi.spec index de25e8a..275cacc 100644 --- a/libdvbpsi.spec +++ b/libdvbpsi.spec @@ -12,6 +12,7 @@ Source0: https://code.videolan.org/videolan/libdvbpsi/-/archive/%{commit0 BuildRequires: gcc BuildRequires: graphviz doxygen BuildRequires: libtool +BuildRequires: make %package devel Summary: Development package for %{name} From ea2876ec04e92af2b473cdbc70fa892916e35b91 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 16:56:15 +0000 Subject: [PATCH 43/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libdvbpsi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdvbpsi.spec b/libdvbpsi.spec index 275cacc..9d4e5a3 100644 --- a/libdvbpsi.spec +++ b/libdvbpsi.spec @@ -4,7 +4,7 @@ Summary: Library for MPEG TS and DVB PSI tables decoding and generation Name: libdvbpsi Version: 1.3.3 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ URL: http://www.videolan.org/developers/libdvbpsi.html Source0: https://code.videolan.org/videolan/libdvbpsi/-/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz @@ -69,6 +69,9 @@ rm -f %{buildroot}%{_libdir}/lib*.la %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.3.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 1.3.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From fa712676026c582ee6d94c8140f77e42a2fcb37f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 11:14:41 +0000 Subject: [PATCH 44/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libdvbpsi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdvbpsi.spec b/libdvbpsi.spec index 9d4e5a3..4675cf2 100644 --- a/libdvbpsi.spec +++ b/libdvbpsi.spec @@ -4,7 +4,7 @@ Summary: Library for MPEG TS and DVB PSI tables decoding and generation Name: libdvbpsi Version: 1.3.3 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2+ URL: http://www.videolan.org/developers/libdvbpsi.html Source0: https://code.videolan.org/videolan/libdvbpsi/-/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz @@ -69,6 +69,9 @@ rm -f %{buildroot}%{_libdir}/lib*.la %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1.3.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 1.3.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From bfc05d5d9bf9f250d2e0011084e454f2cc488370 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 23:02:50 +0300 Subject: [PATCH 45/45] Remove unnecessary files --- sources | 1 - 1 file changed, 1 deletion(-) delete mode 100644 sources diff --git a/sources b/sources deleted file mode 100644 index 357280c..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (libdvbpsi-26bdfd4.tar.gz) = 1972ac41b0d97e034941b5807c5d7128f60e599c28b55af55873d8cf77cc08b0bf07952de812ac90f26f68952f57ee9193fc1f5bb03f952ee891e0aeea50891e