From f3d2e82d5d1c1017af37d71c06434e50a9efc8ac Mon Sep 17 00:00:00 2001 From: cvsextras Date: Mon, 8 Nov 2004 04:44:59 +0000 Subject: [PATCH 01/75] Setup of module libmatroska --- .cvsignore | 0 Makefile | 21 +++++++++++++++++++++ sources | 0 3 files changed, 21 insertions(+) create mode 100644 .cvsignore create mode 100644 Makefile create mode 100644 sources diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..e69de29 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..a0af24f --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# Makefile for source rpm: libmatroska +# $Id$ +NAME := libmatroska +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Rootx && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From e5ddaffc35eba2b0988c56d1d7280981d460bb15 Mon Sep 17 00:00:00 2001 From: cvsextras Date: Mon, 8 Nov 2004 04:45:01 +0000 Subject: [PATCH 02/75] auto-import changelog data from libmatroska-0.6.3-0.fdr.3.rh80.src.rpm 0.6.3-0.fdr.3 - Typo in description 0.6.3-0.fdr.2 - Added license files as doc - Requires libebml-devel (headers needed) Sat Feb 28 2004 Dams - Initial build. --- .cvsignore | 1 + libmatroska.spec | 66 ++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 68 insertions(+) create mode 100644 libmatroska.spec diff --git a/.cvsignore b/.cvsignore index e69de29..9efcbf9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +libmatroska-0.6.3.tar.gz diff --git a/libmatroska.spec b/libmatroska.spec new file mode 100644 index 0000000..ded37ab --- /dev/null +++ b/libmatroska.spec @@ -0,0 +1,66 @@ +Summary: An open Audio/Video container format +Name: libmatroska +Version: 0.6.3 +Release: 0.fdr.3.rh80 +Epoch: 0 +License: GPL/QPL +Group: Development/Libraries +URL: http://matroska.org/ +# http://dl.matroska.org/downloads/libmatroska/libmatroska-0.6.3.tar.gz +Source0: %{name}-%{version}.tar.gz +Provides: %{name}-devel = %{epoch}:%{version}-%{release} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) +BuildRequires: libebml-devel +Requires: libebml-devel + +# ----------------------------------------------------------------------------- + +%description +An extensible open standard Audio/Video container format Matroska is +aiming to become the standard of Multimedia Container Formats one +day. It is based on EBML (Extensible Binary Meta Language), a kind of +binary version of XML. This way the significant advantages in terms of +future format extensibility + +# ----------------------------------------------------------------------------- + +%prep +%setup -q + +# ----------------------------------------------------------------------------- + +%build +make -C make/linux %{?_smp_mflags} prefix=%{_prefix} library + +# ----------------------------------------------------------------------------- + +%install +rm -rf $RPM_BUILD_ROOT +make -C make/linux %{?_smp_mflags} prefix=$RPM_BUILD_ROOT%{_prefix} install + +# ----------------------------------------------------------------------------- + +%clean +rm -rf $RPM_BUILD_ROOT + +# ----------------------------------------------------------------------------- + +%files +%defattr(-,root,root,-) +%doc LICENSE.QPL LICENSE.GPL +%{_includedir}/matroska +%{_libdir}/libmatroska.a + +# ----------------------------------------------------------------------------- + +%changelog +* Sat Apr 3 2004 Dams 0:0.6.3-0.fdr.3 +- Typo in description + +* Sun Feb 29 2004 Dams 0:0.6.3-0.fdr.2 +- Added license files as doc +- Requires libebml-devel (headers needed) + +* Sat Feb 28 2004 Dams +- Initial build. + diff --git a/sources b/sources index e69de29..fb0103b 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +196801f6321badf0461c8760edd86841 libmatroska-0.6.3.tar.gz From b7b60255c98b9fd9e6e8e9c083cfc61cd01addea Mon Sep 17 00:00:00 2001 From: cvsextras Date: Mon, 8 Nov 2004 04:45:07 +0000 Subject: [PATCH 03/75] auto-import changelog data from libmatroska-0.7.0-0.fdr.1.rh90.src.rpm 0.7.0-0.fdr.1 - Update to 0.7.0. - Improved 64-bit arch build fix. 0.6.3-0.fdr.4 - Change linux makefile to use lib64 ifarch x86_64 for sane build --- .cvsignore | 2 +- libmatroska.spec | 23 +++++++++++++++-------- sources | 2 +- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9efcbf9..73b7a74 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libmatroska-0.6.3.tar.gz +libmatroska-0.7.0.tar.bz2 diff --git a/libmatroska.spec b/libmatroska.spec index ded37ab..fcd6513 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,13 +1,12 @@ Summary: An open Audio/Video container format Name: libmatroska -Version: 0.6.3 -Release: 0.fdr.3.rh80 +Version: 0.7.0 +Release: 0.fdr.1.rh90 Epoch: 0 -License: GPL/QPL +License: LGPL Group: Development/Libraries URL: http://matroska.org/ -# http://dl.matroska.org/downloads/libmatroska/libmatroska-0.6.3.tar.gz -Source0: %{name}-%{version}.tar.gz +Source0: http://dl.matroska.org/downloads/libmatroska/libmatroska-0.7.0.tar.bz2 Provides: %{name}-devel = %{epoch}:%{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) BuildRequires: libebml-devel @@ -30,13 +29,14 @@ future format extensibility # ----------------------------------------------------------------------------- %build -make -C make/linux %{?_smp_mflags} prefix=%{_prefix} library +make -C make/linux %{?_smp_mflags} # ----------------------------------------------------------------------------- %install rm -rf $RPM_BUILD_ROOT -make -C make/linux %{?_smp_mflags} prefix=$RPM_BUILD_ROOT%{_prefix} install +make -C make/linux \ + prefix=$RPM_BUILD_ROOT%{_prefix} libdir=$RPM_BUILD_ROOT%{_libdir} install # ----------------------------------------------------------------------------- @@ -47,13 +47,20 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc LICENSE.QPL LICENSE.GPL +%doc ChangeLog LICENSE.LGPL %{_includedir}/matroska %{_libdir}/libmatroska.a # ----------------------------------------------------------------------------- %changelog +* Mon Jul 12 2004 Ville Skyttä - 0:0.7.0-0.fdr.1 +- Update to 0.7.0. +- Improved 64-bit arch build fix. + +* Wed May 19 2004 Justin M. Forbes <64bit_fedora@comcast.net> 0:0.6.3-0.fdr.4 +- Change linux makefile to use lib64 ifarch x86_64 for sane build + * Sat Apr 3 2004 Dams 0:0.6.3-0.fdr.3 - Typo in description diff --git a/sources b/sources index fb0103b..41c1366 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -196801f6321badf0461c8760edd86841 libmatroska-0.6.3.tar.gz +a475bb70d6a07b3ecd56e6cc3a6770e3 libmatroska-0.7.0.tar.bz2 From 019fd5371ad19ba1e7f941d4571494bfbbd76c1f Mon Sep 17 00:00:00 2001 From: cvsextras Date: Mon, 8 Nov 2004 04:45:13 +0000 Subject: [PATCH 04/75] auto-import changelog data from libmatroska-0.7.3-0.fdr.1.1.src.rpm 0.7.3-0.fdr.1 - Update to 0.7.3. - Honor $RPM_OPT_FLAGS. --- .cvsignore | 2 +- libmatroska.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 73b7a74..d83b098 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libmatroska-0.7.0.tar.bz2 +libmatroska-0.7.3.tar.bz2 diff --git a/libmatroska.spec b/libmatroska.spec index fcd6513..c2c6791 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,12 +1,12 @@ Summary: An open Audio/Video container format Name: libmatroska -Version: 0.7.0 -Release: 0.fdr.1.rh90 +Version: 0.7.3 +Release: 0.fdr.1.1 Epoch: 0 License: LGPL Group: Development/Libraries URL: http://matroska.org/ -Source0: http://dl.matroska.org/downloads/libmatroska/libmatroska-0.7.0.tar.bz2 +Source0: http://dl.matroska.org/downloads/libmatroska/libmatroska-0.7.3.tar.bz2 Provides: %{name}-devel = %{epoch}:%{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) BuildRequires: libebml-devel @@ -29,7 +29,7 @@ future format extensibility # ----------------------------------------------------------------------------- %build -make -C make/linux %{?_smp_mflags} +CXXFLAGS="$RPM_OPT_FLAGS" make -C make/linux %{?_smp_mflags} # ----------------------------------------------------------------------------- @@ -54,6 +54,10 @@ rm -rf $RPM_BUILD_ROOT # ----------------------------------------------------------------------------- %changelog +* Sun Aug 29 2004 Ville Skyttä - 0:0.7.3-0.fdr.1 +- Update to 0.7.3. +- Honor $RPM_OPT_FLAGS. + * Mon Jul 12 2004 Ville Skyttä - 0:0.7.0-0.fdr.1 - Update to 0.7.0. - Improved 64-bit arch build fix. diff --git a/sources b/sources index 41c1366..0872af9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a475bb70d6a07b3ecd56e6cc3a6770e3 libmatroska-0.7.0.tar.bz2 +d3248068de3f34739de8ff81a6651162 libmatroska-0.7.3.tar.bz2 From 9b9ae471acdaaecca1da433daf6c8e12de31a53b Mon Sep 17 00:00:00 2001 From: cvsextras Date: Mon, 8 Nov 2004 04:45:19 +0000 Subject: [PATCH 05/75] auto-import libmatroska-0.7.3-0.fdr.1.2 from libmatroska-0.7.3-0.fdr.1.2.src.rpm --- libmatroska.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libmatroska.spec b/libmatroska.spec index c2c6791..49bbbf5 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,7 +1,7 @@ Summary: An open Audio/Video container format Name: libmatroska Version: 0.7.3 -Release: 0.fdr.1.1 +Release: 0.fdr.1.2 Epoch: 0 License: LGPL Group: Development/Libraries From 4d9dfb7c85543d548f580fe0a2bc2d84015da712 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Thu, 11 Nov 2004 19:21:37 +0000 Subject: [PATCH 06/75] Release bumping to provide upgrade path from non-fedora.us packages. A few minor tweaks here and there. --- libmatroska.spec | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/libmatroska.spec b/libmatroska.spec index 49bbbf5..537b9cb 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,19 +1,16 @@ -Summary: An open Audio/Video container format -Name: libmatroska -Version: 0.7.3 -Release: 0.fdr.1.2 -Epoch: 0 -License: LGPL -Group: Development/Libraries -URL: http://matroska.org/ +Summary: An open Audio/Video container format +Name: libmatroska +Version: 0.7.4 +Release: 2 +License: LGPL +Group: Development/Libraries +URL: http://matroska.org/ Source0: http://dl.matroska.org/downloads/libmatroska/libmatroska-0.7.3.tar.bz2 -Provides: %{name}-devel = %{epoch}:%{version}-%{release} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) +Provides: %{name}-devel = %{version}-%{release} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) BuildRequires: libebml-devel Requires: libebml-devel -# ----------------------------------------------------------------------------- - %description An extensible open standard Audio/Video container format Matroska is aiming to become the standard of Multimedia Container Formats one @@ -21,29 +18,24 @@ day. It is based on EBML (Extensible Binary Meta Language), a kind of binary version of XML. This way the significant advantages in terms of future format extensibility -# ----------------------------------------------------------------------------- %prep %setup -q -# ----------------------------------------------------------------------------- %build CXXFLAGS="$RPM_OPT_FLAGS" make -C make/linux %{?_smp_mflags} -# ----------------------------------------------------------------------------- %install rm -rf $RPM_BUILD_ROOT make -C make/linux \ prefix=$RPM_BUILD_ROOT%{_prefix} libdir=$RPM_BUILD_ROOT%{_libdir} install -# ----------------------------------------------------------------------------- %clean rm -rf $RPM_BUILD_ROOT -# ----------------------------------------------------------------------------- %files %defattr(-,root,root,-) @@ -51,9 +43,13 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/matroska %{_libdir}/libmatroska.a -# ----------------------------------------------------------------------------- %changelog +* Wed Nov 10 2004 Matthias Saou 0.7.4-2 +- Update to 0.7.4. +- Bump release to provide Extras upgrade path. +- Fix spaces/tabs uglyness. + * Sun Aug 29 2004 Ville Skyttä - 0:0.7.3-0.fdr.1 - Update to 0.7.3. - Honor $RPM_OPT_FLAGS. From c923d75cbecffe702ea93272b474b1b788f3d93e Mon Sep 17 00:00:00 2001 From: gafton Date: Wed, 24 Nov 2004 04:24:47 +0000 Subject: [PATCH 07/75] Fix braindead typo from the original import --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a0af24f..d0948dd 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common -test -f CVS/Rootx && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) From 95a6f471e1f701740f63209b7577ea2e4d318813 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Thu, 25 Nov 2004 22:28:00 +0000 Subject: [PATCH 08/75] Fix Source + Merge update changes from Ville, libmatroska-0.7.4-0.fdr.1.2.src.rpm --- libmatroska.spec | 6 +++--- sources | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libmatroska.spec b/libmatroska.spec index 537b9cb..5245ec1 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -5,11 +5,11 @@ Release: 2 License: LGPL Group: Development/Libraries URL: http://matroska.org/ -Source0: http://dl.matroska.org/downloads/libmatroska/libmatroska-0.7.3.tar.bz2 +Source0: http://dl.matroska.org/downloads/libmatroska/libmatroska-%{version}.tar.bz2 Provides: %{name}-devel = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) -BuildRequires: libebml-devel -Requires: libebml-devel +BuildRequires: libebml-devel >= 0.7.2 +Requires: libebml-devel >= 0.7.2 %description An extensible open standard Audio/Video container format Matroska is diff --git a/sources b/sources index 0872af9..f65d1f9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d3248068de3f34739de8ff81a6651162 libmatroska-0.7.3.tar.bz2 +a91b7a30141122edb02f9e42bbae69d9 libmatroska-0.7.4.tar.bz2 From de117400347ed3477775c173c37bf3e31032a567 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 27 Feb 2005 18:29:38 +0000 Subject: [PATCH 09/75] 0.7.5 --- .cvsignore | 2 +- libmatroska.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index d83b098..ffac72a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libmatroska-0.7.3.tar.bz2 +libmatroska-0.7.5.tar.bz2 diff --git a/libmatroska.spec b/libmatroska.spec index 5245ec1..8c2d5c7 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,6 +1,6 @@ Summary: An open Audio/Video container format Name: libmatroska -Version: 0.7.4 +Version: 0.7.5 Release: 2 License: LGPL Group: Development/Libraries @@ -8,8 +8,8 @@ URL: http://matroska.org/ Source0: http://dl.matroska.org/downloads/libmatroska/libmatroska-%{version}.tar.bz2 Provides: %{name}-devel = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) -BuildRequires: libebml-devel >= 0.7.2 -Requires: libebml-devel >= 0.7.2 +BuildRequires: libebml-devel >= 0.7.3 +Requires: libebml-devel >= 0.7.3 %description An extensible open standard Audio/Video container format Matroska is @@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Feb 27 2005 Ville Skyttä - 0.7.5-2 +- 0.7.5. + * Wed Nov 10 2004 Matthias Saou 0.7.4-2 - Update to 0.7.4. - Bump release to provide Extras upgrade path. diff --git a/sources b/sources index f65d1f9..f7f36b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a91b7a30141122edb02f9e42bbae69d9 libmatroska-0.7.4.tar.bz2 +8f034dc9253dbb1f8a214dafa12785ae libmatroska-0.7.5.tar.bz2 From 1e22c1afd797eb8eb29c4717b0eadcff36b92445 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Sat, 5 Mar 2005 21:10:22 +0000 Subject: [PATCH 10/75] Further mass cleanup. One or more apply : - Remove (hopefully) all zero epoch remains. - Remove trailing spaces and tabs. - Keep consistency between tabs and spaces. - Clean up summary. --- libmatroska.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libmatroska.spec b/libmatroska.spec index 8c2d5c7..0c84ffa 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,4 +1,4 @@ -Summary: An open Audio/Video container format +Summary: Open Audio/Video container format Name: libmatroska Version: 0.7.5 Release: 2 @@ -71,6 +71,6 @@ rm -rf $RPM_BUILD_ROOT - Added license files as doc - Requires libebml-devel (headers needed) -* Sat Feb 28 2004 Dams +* Sat Feb 28 2004 Dams - Initial build. From 3ad5bcb48273a55649cc973cffe424a2a7b403f9 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Sun, 22 May 2005 23:12:12 +0000 Subject: [PATCH 11/75] - rebuild on all arches --- libmatroska.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmatroska.spec b/libmatroska.spec index 0c84ffa..43b6cc7 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,7 +1,7 @@ Summary: Open Audio/Video container format Name: libmatroska Version: 0.7.5 -Release: 2 +Release: 3 License: LGPL Group: Development/Libraries URL: http://matroska.org/ @@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun May 22 2005 Jeremy Katz - 0.7.5-3 +- rebuild on all arches + * Sun Feb 27 2005 Ville Skyttä - 0.7.5-2 - 0.7.5. From 1c66f50cb7e1ca687fc5327d482f3aa05a2e130d Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Wed, 25 May 2005 20:44:52 +0000 Subject: [PATCH 12/75] - update to 0.7.7 (fixes x86_64 build) - include shared libs --- .cvsignore | 2 +- libmatroska.spec | 13 +++++++++---- sources | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index ffac72a..430d40f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libmatroska-0.7.5.tar.bz2 +libmatroska-0.7.7.tar.bz2 diff --git a/libmatroska.spec b/libmatroska.spec index 43b6cc7..2152cb3 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,15 +1,15 @@ Summary: Open Audio/Video container format Name: libmatroska -Version: 0.7.5 -Release: 3 +Version: 0.7.7 +Release: 1 License: LGPL Group: Development/Libraries URL: http://matroska.org/ Source0: http://dl.matroska.org/downloads/libmatroska/libmatroska-%{version}.tar.bz2 Provides: %{name}-devel = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) -BuildRequires: libebml-devel >= 0.7.3 -Requires: libebml-devel >= 0.7.3 +BuildRequires: libebml-devel >= 0.7.5 +Requires: libebml-devel >= 0.7.5 %description An extensible open standard Audio/Video container format Matroska is @@ -42,9 +42,14 @@ rm -rf $RPM_BUILD_ROOT %doc ChangeLog LICENSE.LGPL %{_includedir}/matroska %{_libdir}/libmatroska.a +%{_libdir}/libmatroska.so* %changelog +* Wed May 25 2005 Jeremy Katz - 0.7.7-1 +- update to 0.7.7 (fixes x86_64 build) +- include shared libs + * Sun May 22 2005 Jeremy Katz - 0.7.5-3 - rebuild on all arches diff --git a/sources b/sources index f7f36b9..111f790 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8f034dc9253dbb1f8a214dafa12785ae libmatroska-0.7.5.tar.bz2 +801a81baaa970595b3e9692ec4dd12f9 libmatroska-0.7.7.tar.bz2 From f5689c0f5081e55b8d54e1967e37c7e964cc4768 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 5 Jun 2005 08:37:04 +0000 Subject: [PATCH 13/75] Split -devel, run ldconfig, fix *.so modes, improve description. --- libmatroska.spec | 45 +++++++++++++++++++++++++++++++++------------ 1 file changed, 33 insertions(+), 12 deletions(-) diff --git a/libmatroska.spec b/libmatroska.spec index 2152cb3..9361721 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,22 +1,28 @@ -Summary: Open Audio/Video container format +Summary: Open audio/video container format library Name: libmatroska Version: 0.7.7 -Release: 1 +Release: 2 License: LGPL -Group: Development/Libraries +Group: System Environment/Libraries URL: http://matroska.org/ Source0: http://dl.matroska.org/downloads/libmatroska/libmatroska-%{version}.tar.bz2 -Provides: %{name}-devel = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) BuildRequires: libebml-devel >= 0.7.5 -Requires: libebml-devel >= 0.7.5 %description -An extensible open standard Audio/Video container format Matroska is -aiming to become the standard of Multimedia Container Formats one -day. It is based on EBML (Extensible Binary Meta Language), a kind of -binary version of XML. This way the significant advantages in terms of -future format extensibility +Matroska is an extensible open standard Audio/Video container. It +aims to become THE standard of multimedia container formats. Matroska +is usually found as .mkv files (matroska video) and .mka files +(matroska audio). + +%package devel +Summary: Matroska development files +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: libebml-devel >= 0.7.5 + +%description devel +%{summary}. %prep @@ -31,21 +37,36 @@ CXXFLAGS="$RPM_OPT_FLAGS" make -C make/linux %{?_smp_mflags} rm -rf $RPM_BUILD_ROOT make -C make/linux \ prefix=$RPM_BUILD_ROOT%{_prefix} libdir=$RPM_BUILD_ROOT%{_libdir} install +chmod +x $RPM_BUILD_ROOT%{_libdir}/libmatroska.so* %clean rm -rf $RPM_BUILD_ROOT +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + + %files %defattr(-,root,root,-) %doc ChangeLog LICENSE.LGPL -%{_includedir}/matroska +%{_libdir}/libmatroska.so.* + +%files devel +%defattr(-,root,root,-) +%{_includedir}/matroska/ %{_libdir}/libmatroska.a -%{_libdir}/libmatroska.so* +%{_libdir}/libmatroska.so %changelog +* Sun Jun 5 2005 Ville Skyttä - 0.7.7-2 +- Split development files into a devel subpackage. +- Run ldconfig at post (un)install time. +- Fix shared library file modes. +- Improve description. + * Wed May 25 2005 Jeremy Katz - 0.7.7-1 - update to 0.7.7 (fixes x86_64 build) - include shared libs From d608aa55b9a6b6f97ac61199f3ac038b1b30def3 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Tue, 29 Nov 2005 09:56:55 +0000 Subject: [PATCH 14/75] Update to 0.8.0. --- .cvsignore | 2 +- libmatroska.spec | 37 ++++++++++++++++++++++++++----------- sources | 2 +- 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/.cvsignore b/.cvsignore index 430d40f..4b0a295 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libmatroska-0.7.7.tar.bz2 +libmatroska-0.8.0.tar.bz2 diff --git a/libmatroska.spec b/libmatroska.spec index 9361721..2115ecb 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,13 +1,13 @@ Summary: Open audio/video container format library Name: libmatroska -Version: 0.7.7 -Release: 2 +Version: 0.8.0 +Release: 1%{?dist} License: LGPL Group: System Environment/Libraries -URL: http://matroska.org/ +URL: http://www.matroska.org/ Source0: http://dl.matroska.org/downloads/libmatroska/libmatroska-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) -BuildRequires: libebml-devel >= 0.7.5 +BuildRequires: libebml-devel >= 0.7.6 %description Matroska is an extensible open standard Audio/Video container. It @@ -15,14 +15,21 @@ aims to become THE standard of multimedia container formats. Matroska is usually found as .mkv files (matroska video) and .mka files (matroska audio). + %package devel -Summary: Matroska development files +Summary: Matroska container format library development files Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: libebml-devel >= 0.7.5 +Requires: libebml-devel >= 0.7.6 %description devel -%{summary}. +Matroska is an extensible open standard Audio/Video container. It +aims to become THE standard of multimedia container formats. Matroska +is usually found as .mkv files (matroska video) and .mka files +(matroska audio). + +This package contains the files required to rebuild applications which +will use the Matroska container format. %prep @@ -36,8 +43,11 @@ CXXFLAGS="$RPM_OPT_FLAGS" make -C make/linux %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make -C make/linux \ - prefix=$RPM_BUILD_ROOT%{_prefix} libdir=$RPM_BUILD_ROOT%{_libdir} install -chmod +x $RPM_BUILD_ROOT%{_libdir}/libmatroska.so* + prefix=$RPM_BUILD_ROOT%{_prefix} \ + libdir=$RPM_BUILD_ROOT%{_libdir} \ + install +# Needed for proper stripping of the library (still in 0.8.0) +chmod +x $RPM_BUILD_ROOT%{_libdir}/libmatroska.so.* %clean @@ -49,18 +59,23 @@ rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root,-) +%defattr(-,root,root,0755) %doc ChangeLog LICENSE.LGPL %{_libdir}/libmatroska.so.* %files devel -%defattr(-,root,root,-) +%defattr(-,root,root,0755) %{_includedir}/matroska/ %{_libdir}/libmatroska.a %{_libdir}/libmatroska.so %changelog +* Tue Nov 29 2005 Matthias Saou 0.8.0-1 +- Update to 0.8.0. +- Add a full description for the devel package. +- Some other minor spec file changes. + * Sun Jun 5 2005 Ville Skyttä - 0.7.7-2 - Split development files into a devel subpackage. - Run ldconfig at post (un)install time. diff --git a/sources b/sources index 111f790..e62660b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -801a81baaa970595b3e9692ec4dd12f9 libmatroska-0.7.7.tar.bz2 +ee822ea811e5db25de87c3662c53953a libmatroska-0.8.0.tar.bz2 From 4fee0a1e51ff7b686501c91ec90c9d853c6fe828 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dams=20Nad=C3=A9?= Date: Thu, 16 Mar 2006 18:44:26 +0000 Subject: [PATCH 15/75] libmatroska: release bump --- libmatroska.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmatroska.spec b/libmatroska.spec index 2115ecb..94f1eb0 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,7 +1,7 @@ Summary: Open audio/video container format library Name: libmatroska Version: 0.8.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Mar 16 2006 Dams - 0.8.0-2.fc5 +- Rebuild + * Tue Nov 29 2005 Matthias Saou 0.8.0-1 - Update to 0.8.0. - Add a full description for the devel package. From b8174de9f9d85b45919ff9ef284c5bcad824040d Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 23 Jul 2006 09:31:08 +0000 Subject: [PATCH 16/75] - Taking over as maintainer since Anvil has other priorities - Long long due rebuild with new gcc for FC-5, it seems this may have already been done, since the last rebuild was of March 16 and the Rebuild Request bug of March 19? Rebuilding anyway to be sure (bug 185875) --- libmatroska.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libmatroska.spec b/libmatroska.spec index 94f1eb0..77ed928 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,7 +1,7 @@ Summary: Open audio/video container format library Name: libmatroska Version: 0.8.0 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -71,6 +71,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jul 23 2006 Hans de Goede 0.8.0-3 +- Taking over as maintainer since Anvil has other priorities +- Long long due rebuild with new gcc for FC-5, it seems this may have already + been done, since the last rebuild was of March 16 and the Rebuild Request + bug of March 19? Rebuilding anyway to be sure (bug 185875) + * Thu Mar 16 2006 Dams - 0.8.0-2.fc5 - Rebuild From 52bc8743b6c992fb525f10b938b1ccf59b3d5a7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 27 Aug 2006 20:36:30 +0000 Subject: [PATCH 17/75] http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild --- needs.rebuild | 1 + 1 file changed, 1 insertion(+) create mode 100644 needs.rebuild diff --git a/needs.rebuild b/needs.rebuild new file mode 100644 index 0000000..815fd29 --- /dev/null +++ b/needs.rebuild @@ -0,0 +1 @@ +http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild From 00435d5f11e397faed75f935c283f709bb565c60 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 28 Aug 2006 11:50:25 +0000 Subject: [PATCH 18/75] - Drop static lib from -devel package - FE6 Rebuild --- libmatroska.spec | 21 +++++++++++++-------- needs.rebuild | 1 - 2 files changed, 13 insertions(+), 9 deletions(-) delete mode 100644 needs.rebuild diff --git a/libmatroska.spec b/libmatroska.spec index 77ed928..318d438 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,11 +1,11 @@ Summary: Open audio/video container format library Name: libmatroska Version: 0.8.0 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL Group: System Environment/Libraries URL: http://www.matroska.org/ -Source0: http://dl.matroska.org/downloads/libmatroska/libmatroska-%{version}.tar.bz2 +Source0: http://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) BuildRequires: libebml-devel >= 0.7.6 @@ -46,8 +46,9 @@ make -C make/linux \ prefix=$RPM_BUILD_ROOT%{_prefix} \ libdir=$RPM_BUILD_ROOT%{_libdir} \ install +rm $RPM_BUILD_ROOT%{_libdir}/%{name}.a # Needed for proper stripping of the library (still in 0.8.0) -chmod +x $RPM_BUILD_ROOT%{_libdir}/libmatroska.so.* +chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}.so.* %clean @@ -55,22 +56,26 @@ rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig + %postun -p /sbin/ldconfig %files -%defattr(-,root,root,0755) +%defattr(-,root,root,-) %doc ChangeLog LICENSE.LGPL -%{_libdir}/libmatroska.so.* +%{_libdir}/%{name}.so.* %files devel -%defattr(-,root,root,0755) +%defattr(-,root,root,-) %{_includedir}/matroska/ -%{_libdir}/libmatroska.a -%{_libdir}/libmatroska.so +%{_libdir}/%{name}.so %changelog +* Mon Aug 28 2006 Hans de Goede 0.8.0-4 +- Drop static lib from -devel package +- FE6 Rebuild + * Sun Jul 23 2006 Hans de Goede 0.8.0-3 - Taking over as maintainer since Anvil has other priorities - Long long due rebuild with new gcc for FC-5, it seems this may have already diff --git a/needs.rebuild b/needs.rebuild deleted file mode 100644 index 815fd29..0000000 --- a/needs.rebuild +++ /dev/null @@ -1 +0,0 @@ -http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild From f81642e3cd2088d30e390b7dc6703b2455ba05ac Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 19 Feb 2007 10:56:26 +0000 Subject: [PATCH 19/75] - New upstream release 0.8.1 --- .cvsignore | 2 +- libmatroska.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4b0a295..c867291 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libmatroska-0.8.0.tar.bz2 +libmatroska-0.8.1.tar.bz2 diff --git a/libmatroska.spec b/libmatroska.spec index 318d438..b290eed 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,7 +1,7 @@ Summary: Open audio/video container format library Name: libmatroska -Version: 0.8.0 -Release: 4%{?dist} +Version: 0.8.1 +Release: 1%{?dist} License: LGPL Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Feb 19 2007 Hans de Goede 0.8.1-1 +- New upstream release 0.8.1 + * Mon Aug 28 2006 Hans de Goede 0.8.0-4 - Drop static lib from -devel package - FE6 Rebuild diff --git a/sources b/sources index e62660b..45da70e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ee822ea811e5db25de87c3662c53953a libmatroska-0.8.0.tar.bz2 +20cf624ace0c58a54c7752eebfbc0b19 libmatroska-0.8.1.tar.bz2 From 86dac08e5eb9c897ccf975aae48ae9933c71a3b3 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 13 Aug 2007 20:20:33 +0000 Subject: [PATCH 20/75] - Update License tag for new Licensing Guidelines compliance --- libmatroska.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libmatroska.spec b/libmatroska.spec index b290eed..b417ca6 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,8 +1,8 @@ Summary: Open audio/video container format library Name: libmatroska Version: 0.8.1 -Release: 1%{?dist} -License: LGPL +Release: 2%{?dist} +License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ Source0: http://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.bz2 @@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Aug 13 2007 Hans de Goede 0.8.1-2 +- Update License tag for new Licensing Guidelines compliance + * Mon Feb 19 2007 Hans de Goede 0.8.1-1 - New upstream release 0.8.1 From 623f71a3c8128be43c18a61c7de0c71b08e6754d Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 19 Feb 2008 09:03:28 +0000 Subject: [PATCH 21/75] - Autorebuild for GCC 4.3 --- libmatroska.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmatroska.spec b/libmatroska.spec index b417ca6..d38b9c1 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,7 +1,7 @@ Summary: Open audio/video container format library Name: libmatroska Version: 0.8.1 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 19 2008 Fedora Release Engineering - 0.8.1-3 +- Autorebuild for GCC 4.3 + * Mon Aug 13 2007 Hans de Goede 0.8.1-2 - Update License tag for new Licensing Guidelines compliance From c0157dce9fe54a728eb36e8c0f3570e7d16862ca Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 16:11:40 +0000 Subject: [PATCH 22/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- libmatroska.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmatroska.spec b/libmatroska.spec index d38b9c1..9593a22 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,7 +1,7 @@ Summary: Open audio/video container format library Name: libmatroska Version: 0.8.1 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 0.8.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Tue Feb 19 2008 Fedora Release Engineering - 0.8.1-3 - Autorebuild for GCC 4.3 From 5f2d7450ad61f6219be05d784d55e0602f878218 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 25 Jul 2009 06:04:08 +0000 Subject: [PATCH 23/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- libmatroska.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmatroska.spec b/libmatroska.spec index 9593a22..94bad8d 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,7 +1,7 @@ Summary: Open audio/video container format library Name: libmatroska Version: 0.8.1 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 0.8.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Wed Feb 25 2009 Fedora Release Engineering - 0.8.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 8eeaba21ab54e4b1a900a6b0453ca84069637ce3 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:51:04 +0000 Subject: [PATCH 24/75] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d0948dd..6064d86 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := libmatroska SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From b7cea9b716606990d0300bd6baf22f70dcc2f8da Mon Sep 17 00:00:00 2001 From: Martin Sourada Date: Tue, 25 May 2010 15:58:40 +0000 Subject: [PATCH 25/75] update to 0.9.0 --- .cvsignore | 2 +- libmatroska.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index c867291..5ce9d67 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libmatroska-0.8.1.tar.bz2 +libmatroska-0.9.0.tar.bz2 diff --git a/libmatroska.spec b/libmatroska.spec index 94bad8d..fa6517e 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,13 +1,13 @@ Summary: Open audio/video container format library Name: libmatroska -Version: 0.8.1 -Release: 5%{?dist} +Version: 0.9.0 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ Source0: http://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) -BuildRequires: libebml-devel >= 0.7.6 +BuildRequires: libebml-devel >= 0.8.0 %description Matroska is an extensible open standard Audio/Video container. It @@ -20,7 +20,7 @@ is usually found as .mkv files (matroska video) and .mka files Summary: Matroska container format library development files Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: libebml-devel >= 0.7.6 +Requires: libebml-devel >= 0.8.0 %description devel Matroska is an extensible open standard Audio/Video container. It @@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon May 24 2010 Martin Sourada - 0.9.0-1 +- New release + * Fri Jul 24 2009 Fedora Release Engineering - 0.8.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 45da70e..097c0a6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -20cf624ace0c58a54c7752eebfbc0b19 libmatroska-0.8.1.tar.bz2 +1900b63866ac41a25bd536fdc5ce08c7 libmatroska-0.9.0.tar.bz2 From f042fc386be6efd0c637faa6d038bcc299894cc9 Mon Sep 17 00:00:00 2001 From: Martin Sourada Date: Fri, 18 Jun 2010 11:59:03 +0000 Subject: [PATCH 26/75] update to 1.0.0. Bumps soname, requires libebml >= 1.0.0. --- .cvsignore | 2 +- libmatroska.spec | 12 +++++++++--- sources | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5ce9d67..1fe4edd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libmatroska-0.9.0.tar.bz2 +libmatroska-1.0.0.tar.bz2 diff --git a/libmatroska.spec b/libmatroska.spec index fa6517e..ad43e06 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,13 +1,13 @@ Summary: Open audio/video container format library Name: libmatroska -Version: 0.9.0 +Version: 1.0.0 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ Source0: http://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) -BuildRequires: libebml-devel >= 0.8.0 +BuildRequires: libebml-devel >= 1.0.0 %description Matroska is an extensible open standard Audio/Video container. It @@ -20,7 +20,7 @@ is usually found as .mkv files (matroska video) and .mka files Summary: Matroska container format library development files Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: libebml-devel >= 0.8.0 +Requires: libebml-devel >= 1.0.0 %description devel Matroska is an extensible open standard Audio/Video container. It @@ -72,6 +72,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jun 18 2010 Martin Sourada - 1.0.0-1 +- New release +- Fixes issues with elements with an unknown size that have come up with the + recent popularity of WebM files +- Bumps version of libmatroska.so + * Mon May 24 2010 Martin Sourada - 0.9.0-1 - New release diff --git a/sources b/sources index 097c0a6..8c9a11c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1900b63866ac41a25bd536fdc5ce08c7 libmatroska-0.9.0.tar.bz2 +4efcf3945b17a6f0320cf1aaa326a4de libmatroska-1.0.0.tar.bz2 From 1f9148e1351664e59903cf310bbca8bf4f1a1d1f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 21:16:33 +0000 Subject: [PATCH 27/75] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 6064d86..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: libmatroska -# $Id$ -NAME := libmatroska -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From accba6ec6cb5c4af8f54dd55d55660899f402e1c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 01:40:35 -0600 Subject: [PATCH 28/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- libmatroska.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmatroska.spec b/libmatroska.spec index ad43e06..beb0a4b 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,7 +1,7 @@ Summary: Open audio/video container format library Name: libmatroska Version: 1.0.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 1.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Fri Jun 18 2010 Martin Sourada - 1.0.0-1 - New release - Fixes issues with elements with an unknown size that have come up with the From 30b1f7a5df942bbdf7b6a4a0da0b5e88d88162e0 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 15 Feb 2011 10:11:13 +0100 Subject: [PATCH 29/75] Update to 1.1.0 --- .gitignore | 1 + libmatroska.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 1fe4edd..2bed414 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ libmatroska-1.0.0.tar.bz2 +/libmatroska-1.1.0.tar.bz2 diff --git a/libmatroska.spec b/libmatroska.spec index beb0a4b..0f42f33 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,13 +1,13 @@ Summary: Open audio/video container format library Name: libmatroska -Version: 1.0.0 -Release: 2%{?dist} +Version: 1.1.0 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ Source0: http://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) -BuildRequires: libebml-devel >= 1.0.0 +BuildRequires: libebml-devel >= 1.2.0 %description Matroska is an extensible open standard Audio/Video container. It @@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Feb 14 2011 Nicolas Chauvet - 1.1.0-1 +- New release 1.1.0 + * Tue Feb 08 2011 Fedora Release Engineering - 1.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 8c9a11c..9b65315 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4efcf3945b17a6f0320cf1aaa326a4de libmatroska-1.0.0.tar.bz2 +21e5ee3e2573f0ae99db195348bdfb98 libmatroska-1.1.0.tar.bz2 From a4ffa8dfde8611be398914f18946e3256b94055c Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 14 Jul 2011 10:30:26 +0200 Subject: [PATCH 30/75] Update to 1.2.0 --- .gitignore | 1 + libmatroska.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 2bed414..2fcb129 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ libmatroska-1.0.0.tar.bz2 /libmatroska-1.1.0.tar.bz2 +/libmatroska-1.2.0.tar.bz2 diff --git a/libmatroska.spec b/libmatroska.spec index 0f42f33..ac9b2f8 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,13 +1,13 @@ Summary: Open audio/video container format library Name: libmatroska -Version: 1.1.0 +Version: 1.2.0 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ Source0: http://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) -BuildRequires: libebml-devel >= 1.2.0 +BuildRequires: libebml-devel >= 1.2.1 %description Matroska is an extensible open standard Audio/Video container. It @@ -20,7 +20,7 @@ is usually found as .mkv files (matroska video) and .mka files Summary: Matroska container format library development files Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: libebml-devel >= 1.0.0 +Requires: libebml-devel >= 1.2.1 %description devel Matroska is an extensible open standard Audio/Video container. It @@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jul 14 2011 Nicolas Chauvet - 1.2.0-1 +- Update to 1.2.0 + * Mon Feb 14 2011 Nicolas Chauvet - 1.1.0-1 - New release 1.1.0 diff --git a/sources b/sources index 9b65315..60b8409 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -21e5ee3e2573f0ae99db195348bdfb98 libmatroska-1.1.0.tar.bz2 +a4f967f9ade56d5181714f3199ffa241 libmatroska-1.2.0.tar.bz2 From 40f0a9d47a6aaab22b108be3b91c79f8dd5dc9e2 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 20 Nov 2011 20:18:58 +0100 Subject: [PATCH 31/75] Update to 1.3.0 --- libmatroska.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libmatroska.spec b/libmatroska.spec index ac9b2f8..fb9d670 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,13 +1,13 @@ Summary: Open audio/video container format library Name: libmatroska -Version: 1.2.0 +Version: 1.3.0 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ Source0: http://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) -BuildRequires: libebml-devel >= 1.2.1 +BuildRequires: libebml-devel >= 1.2.2 %description Matroska is an extensible open standard Audio/Video container. It @@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Nov 20 2011 Nicolas Chauvet - 1.3.0-1 +- Update to 1.3.0 + * Thu Jul 14 2011 Nicolas Chauvet - 1.2.0-1 - Update to 1.2.0 From 773e25effa218ae343324b1898603bc8fffd1924 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 20 Nov 2011 20:19:52 +0100 Subject: [PATCH 32/75] Update to 1.3.0 --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2fcb129..2c476b3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ libmatroska-1.0.0.tar.bz2 /libmatroska-1.1.0.tar.bz2 /libmatroska-1.2.0.tar.bz2 +/libmatroska-1.3.0.tar.bz2 diff --git a/sources b/sources index 60b8409..e840c20 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a4f967f9ade56d5181714f3199ffa241 libmatroska-1.2.0.tar.bz2 +f4a8c411f09d39c754eb726efd616043 libmatroska-1.3.0.tar.bz2 From 9835c5f1751cbf175fa7072d0e5aa29ad1f7d750 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 02:00:05 -0600 Subject: [PATCH 33/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- libmatroska.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmatroska.spec b/libmatroska.spec index fb9d670..4321111 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,7 +1,7 @@ Summary: Open audio/video container format library Name: libmatroska Version: 1.3.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 1.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Sun Nov 20 2011 Nicolas Chauvet - 1.3.0-1 - Update to 1.3.0 From 9c6eb66eaab55608cb01816719f884f54281dc1e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 15:23:50 -0500 Subject: [PATCH 34/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- libmatroska.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmatroska.spec b/libmatroska.spec index 4321111..13cdede 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,7 +1,7 @@ Summary: Open audio/video container format library Name: libmatroska Version: 1.3.0 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 1.3.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri Jan 13 2012 Fedora Release Engineering - 1.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 6a9d194e213b616b56f67f13f3847cc6bb1e9006 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 22:42:43 -0600 Subject: [PATCH 35/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- libmatroska.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmatroska.spec b/libmatroska.spec index 13cdede..5622950 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,7 +1,7 @@ Summary: Open audio/video container format library Name: libmatroska Version: 1.3.0 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 1.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Thu Jul 19 2012 Fedora Release Engineering - 1.3.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 8b8c23811b7100dbeae589a76a22f384da48b891 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Wed, 20 Mar 2013 13:34:22 +0100 Subject: [PATCH 36/75] Update to 1.4.0 SONAME change involved to be built later --- .gitignore | 1 + libmatroska.spec | 20 ++++++++------------ sources | 2 +- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 2c476b3..0b0df09 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ libmatroska-1.0.0.tar.bz2 /libmatroska-1.1.0.tar.bz2 /libmatroska-1.2.0.tar.bz2 /libmatroska-1.3.0.tar.bz2 +/libmatroska-1.4.0.tar.bz2 diff --git a/libmatroska.spec b/libmatroska.spec index 5622950..fa3a563 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,13 +1,12 @@ Summary: Open audio/video container format library Name: libmatroska -Version: 1.3.0 -Release: 4%{?dist} +Version: 1.4.0 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ Source0: http://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) -BuildRequires: libebml-devel >= 1.2.2 +BuildRequires: libebml-devel >= 1.3.0 %description Matroska is an extensible open standard Audio/Video container. It @@ -20,7 +19,7 @@ is usually found as .mkv files (matroska video) and .mka files Summary: Matroska container format library development files Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: libebml-devel >= 1.2.1 +Requires: libebml-devel >= 1.3.0 %description devel Matroska is an extensible open standard Audio/Video container. It @@ -41,7 +40,6 @@ CXXFLAGS="$RPM_OPT_FLAGS" make -C make/linux %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT make -C make/linux \ prefix=$RPM_BUILD_ROOT%{_prefix} \ libdir=$RPM_BUILD_ROOT%{_libdir} \ @@ -51,27 +49,25 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}.a chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}.so.* -%clean -rm -rf $RPM_BUILD_ROOT - - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -%defattr(-,root,root,-) %doc ChangeLog LICENSE.LGPL %{_libdir}/%{name}.so.* %files devel -%defattr(-,root,root,-) %{_includedir}/matroska/ %{_libdir}/%{name}.so %changelog +* Wed Mar 20 2013 Nicolas Chauvet - 1.4.0-1 +- Update to 1.4.0 +- Spec file clean-up + * Thu Feb 14 2013 Fedora Release Engineering - 1.3.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index e840c20..902e9f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f4a8c411f09d39c754eb726efd616043 libmatroska-1.3.0.tar.bz2 +5b83155019589b04a49f9db923b5bf74 libmatroska-1.4.0.tar.bz2 From d39c39c245fe604453e93bd8ecad6cada11afa77 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 01:08:28 -0500 Subject: [PATCH 37/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- libmatroska.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmatroska.spec b/libmatroska.spec index fa3a563..9b3a26a 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,7 +1,7 @@ Summary: Open audio/video container format library Name: libmatroska Version: 1.4.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -64,6 +64,9 @@ chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}.so.* %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 1.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Mar 20 2013 Nicolas Chauvet - 1.4.0-1 - Update to 1.4.0 - Spec file clean-up From 807fcb5a20eec24df7206cb717c17d632e7d8590 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 3 Oct 2013 14:44:09 +0200 Subject: [PATCH 38/75] Update to 1.4.1 --- .gitignore | 1 + libmatroska.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0b0df09..c2b9664 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ libmatroska-1.0.0.tar.bz2 /libmatroska-1.2.0.tar.bz2 /libmatroska-1.3.0.tar.bz2 /libmatroska-1.4.0.tar.bz2 +/libmatroska-1.4.1.tar.bz2 diff --git a/libmatroska.spec b/libmatroska.spec index 9b3a26a..00d151e 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,7 +1,7 @@ Summary: Open audio/video container format library Name: libmatroska -Version: 1.4.0 -Release: 2%{?dist} +Version: 1.4.1 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -64,6 +64,9 @@ chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}.so.* %changelog +* Thu Oct 03 2013 Nicolas Chauvet - 1.4.1-1 +- Update to 1.4.1 + * Sat Aug 03 2013 Fedora Release Engineering - 1.4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 902e9f0..95303a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5b83155019589b04a49f9db923b5bf74 libmatroska-1.4.0.tar.bz2 +f61b2e5086f4bb9d24a43cc8af43a719 libmatroska-1.4.1.tar.bz2 From 25453ef98203913a718cf73f150a4ec3b7c27f0c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 23:20:24 -0500 Subject: [PATCH 39/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- libmatroska.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmatroska.spec b/libmatroska.spec index 00d151e..fe46de5 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,7 +1,7 @@ Summary: Open audio/video container format library Name: libmatroska Version: 1.4.1 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -64,6 +64,9 @@ chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}.so.* %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Thu Oct 03 2013 Nicolas Chauvet - 1.4.1-1 - Update to 1.4.1 From c73446af00765ffa7e74e311c01a6f33230e9e14 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Aug 2014 04:29:19 +0000 Subject: [PATCH 40/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- libmatroska.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmatroska.spec b/libmatroska.spec index fe46de5..18cf8ed 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,7 +1,7 @@ Summary: Open audio/video container format library Name: libmatroska Version: 1.4.1 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -64,6 +64,9 @@ chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}.so.* %changelog +* Sun Aug 17 2014 Fedora Release Engineering - 1.4.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 1.4.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 7239900f72cb041efc7b14eb742dd802432ac47b Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Thu, 15 Jan 2015 15:04:37 +0100 Subject: [PATCH 41/75] Update to 1.4.2 - Bump min required libebml version to 1.3.1 - Adapt specfile to the new autotools-based build system --- .gitignore | 1 + libmatroska.spec | 26 ++++++++++++++------------ sources | 2 +- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index c2b9664..166e2f9 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ libmatroska-1.0.0.tar.bz2 /libmatroska-1.3.0.tar.bz2 /libmatroska-1.4.0.tar.bz2 /libmatroska-1.4.1.tar.bz2 +/libmatroska-1.4.2.tar.bz2 diff --git a/libmatroska.spec b/libmatroska.spec index 18cf8ed..588594b 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,12 +1,12 @@ Summary: Open audio/video container format library Name: libmatroska -Version: 1.4.1 -Release: 3%{?dist} +Version: 1.4.2 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ Source0: http://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.bz2 -BuildRequires: libebml-devel >= 1.3.0 +BuildRequires: libebml-devel >= 1.3.1 %description Matroska is an extensible open standard Audio/Video container. It @@ -19,7 +19,7 @@ is usually found as .mkv files (matroska video) and .mka files Summary: Matroska container format library development files Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: libebml-devel >= 1.3.0 +Requires: libebml-devel >= 1.3.1 %description devel Matroska is an extensible open standard Audio/Video container. It @@ -36,17 +36,13 @@ will use the Matroska container format. %build -CXXFLAGS="$RPM_OPT_FLAGS" make -C make/linux %{?_smp_mflags} +%configure --disable-static +make %{?_smp_mflags} %install -make -C make/linux \ - prefix=$RPM_BUILD_ROOT%{_prefix} \ - libdir=$RPM_BUILD_ROOT%{_libdir} \ - install -rm $RPM_BUILD_ROOT%{_libdir}/%{name}.a -# Needed for proper stripping of the library (still in 0.8.0) -chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}.so.* +%make_install +rm %{buildroot}%{_libdir}/%{name}.la %post -p /sbin/ldconfig @@ -61,9 +57,15 @@ chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}.so.* %files devel %{_includedir}/matroska/ %{_libdir}/%{name}.so +%{_libdir}/pkgconfig/%{name}.pc %changelog +* Wed Jan 14 2015 Dominik Mierzejewski - 1.4.2-1 +- Update to 1.4.2 +- Bump min required libebml version to 1.3.1 +- Adapt specfile to the new autotools-based build system + * Sun Aug 17 2014 Fedora Release Engineering - 1.4.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 95303a8..7c03f1e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f61b2e5086f4bb9d24a43cc8af43a719 libmatroska-1.4.1.tar.bz2 +f8fe42003e072a42a19ed40405f9efdb libmatroska-1.4.2.tar.bz2 From 671c336e60221eb3fff259c458b194da93ed460f Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Thu, 5 Mar 2015 00:19:09 +0100 Subject: [PATCH 42/75] rebuilt for gcc-5.0 --- libmatroska.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmatroska.spec b/libmatroska.spec index 588594b..765c309 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,7 +1,7 @@ Summary: Open audio/video container format library Name: libmatroska Version: 1.4.2 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -61,6 +61,9 @@ rm %{buildroot}%{_libdir}/%{name}.la %changelog +* Thu Mar 05 2015 Dominik Mierzejewski - 1.4.2-2 +- rebuilt for gcc-5.0 + * Wed Jan 14 2015 Dominik Mierzejewski - 1.4.2-1 - Update to 1.4.2 - Bump min required libebml version to 1.3.1 From 3cf04c55724ddbaac359491c9903d2fbfa114416 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Sun, 12 Apr 2015 00:24:53 +0200 Subject: [PATCH 43/75] rebuilt for gcc-5.0.0-0.22.fc23 --- libmatroska.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmatroska.spec b/libmatroska.spec index 765c309..44c69c5 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,7 +1,7 @@ Summary: Open audio/video container format library Name: libmatroska Version: 1.4.2 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -61,6 +61,9 @@ rm %{buildroot}%{_libdir}/%{name}.la %changelog +* Sat Apr 11 2015 Dominik Mierzejewski - 1.4.2-3 +- rebuilt for gcc-5.0.0-0.22.fc23 + * Thu Mar 05 2015 Dominik Mierzejewski - 1.4.2-2 - rebuilt for gcc-5.0 From dd2eae9d7045cccbf264c98ca359b95aa57ac6ce Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 16:03:57 +0000 Subject: [PATCH 44/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- libmatroska.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmatroska.spec b/libmatroska.spec index 44c69c5..942d0a2 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,7 +1,7 @@ Summary: Open audio/video container format library Name: libmatroska Version: 1.4.2 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -61,6 +61,9 @@ rm %{buildroot}%{_libdir}/%{name}.la %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 1.4.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat Apr 11 2015 Dominik Mierzejewski - 1.4.2-3 - rebuilt for gcc-5.0.0-0.22.fc23 From 88040f9b799acdef89a864d8ff266ed9d4350ad3 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Thu, 22 Oct 2015 15:31:47 +0200 Subject: [PATCH 45/75] Update to 1.4.4 - required by mkvtoolnix 8.5.x - Bump min required libebml version to 1.3.3 --- .gitignore | 1 + libmatroska.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 166e2f9..d7fb034 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ libmatroska-1.0.0.tar.bz2 /libmatroska-1.4.0.tar.bz2 /libmatroska-1.4.1.tar.bz2 /libmatroska-1.4.2.tar.bz2 +/libmatroska-1.4.4.tar.bz2 diff --git a/libmatroska.spec b/libmatroska.spec index 942d0a2..163ceb8 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,12 +1,12 @@ Summary: Open audio/video container format library Name: libmatroska -Version: 1.4.2 -Release: 4%{?dist} +Version: 1.4.4 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ Source0: http://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.bz2 -BuildRequires: libebml-devel >= 1.3.1 +BuildRequires: libebml-devel >= 1.3.3 %description Matroska is an extensible open standard Audio/Video container. It @@ -19,7 +19,7 @@ is usually found as .mkv files (matroska video) and .mka files Summary: Matroska container format library development files Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: libebml-devel >= 1.3.1 +Requires: libebml-devel >= 1.3.3 %description devel Matroska is an extensible open standard Audio/Video container. It @@ -61,6 +61,10 @@ rm %{buildroot}%{_libdir}/%{name}.la %changelog +* Thu Oct 22 2015 Dominik Mierzejewski - 1.4.4-1 +- Update to 1.4.4 (required by mkvtoolnix 8.5.x) +- Bump min required libebml version to 1.3.3 + * Wed Jun 17 2015 Fedora Release Engineering - 1.4.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 7c03f1e..cd2942f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f8fe42003e072a42a19ed40405f9efdb libmatroska-1.4.2.tar.bz2 +6a8e4528f713ec33faf4d793e61f883c libmatroska-1.4.4.tar.bz2 From 0f266caef866f69c98c201fa46c368e192ac50a3 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 4 Feb 2016 03:30:39 +0000 Subject: [PATCH 46/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- libmatroska.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmatroska.spec b/libmatroska.spec index 163ceb8..a59f31b 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,7 +1,7 @@ Summary: Open audio/video container format library Name: libmatroska Version: 1.4.4 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -61,6 +61,9 @@ rm %{buildroot}%{_libdir}/%{name}.la %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 1.4.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Thu Oct 22 2015 Dominik Mierzejewski - 1.4.4-1 - Update to 1.4.4 (required by mkvtoolnix 8.5.x) - Bump min required libebml version to 1.3.3 From ab725cbc3e022b6918885629618c7ab3f93dc2ec Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sat, 20 Aug 2016 02:29:20 +0200 Subject: [PATCH 47/75] Update to 1.4.5 (#1352477) - Bump min required libebml version to 1.3.4 - use https for URLs --- .gitignore | 1 + libmatroska.spec | 15 ++++++++++----- sources | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index d7fb034..8a895dc 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ libmatroska-1.0.0.tar.bz2 /libmatroska-1.4.1.tar.bz2 /libmatroska-1.4.2.tar.bz2 /libmatroska-1.4.4.tar.bz2 +/libmatroska-1.4.5.tar.bz2 diff --git a/libmatroska.spec b/libmatroska.spec index a59f31b..a419407 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,12 +1,12 @@ Summary: Open audio/video container format library Name: libmatroska -Version: 1.4.4 -Release: 2%{?dist} +Version: 1.4.5 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries -URL: http://www.matroska.org/ -Source0: http://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.bz2 -BuildRequires: libebml-devel >= 1.3.3 +URL: https://www.matroska.org/ +Source0: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.bz2 +BuildRequires: libebml-devel >= 1.3.4 %description Matroska is an extensible open standard Audio/Video container. It @@ -61,6 +61,11 @@ rm %{buildroot}%{_libdir}/%{name}.la %changelog +* Fri Aug 19 2016 Dominik Mierzejewski - 1.4.5-1 +- Update to 1.4.5 (#1352477) +- Bump min required libebml version to 1.3.4 +- use https for URLs + * Thu Feb 04 2016 Fedora Release Engineering - 1.4.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index cd2942f..1b6329d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6a8e4528f713ec33faf4d793e61f883c libmatroska-1.4.4.tar.bz2 +2e97a58717564896aba8168cdb577067 libmatroska-1.4.5.tar.bz2 From 9df2ad27af624c19a3c6d859726074f1b859dc29 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 19:01:29 +0000 Subject: [PATCH 48/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- libmatroska.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmatroska.spec b/libmatroska.spec index a419407..a169815 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,7 +1,7 @@ Summary: Open audio/video container format library Name: libmatroska Version: 1.4.5 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: https://www.matroska.org/ @@ -61,6 +61,9 @@ rm %{buildroot}%{_libdir}/%{name}.la %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1.4.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Aug 19 2016 Dominik Mierzejewski - 1.4.5-1 - Update to 1.4.5 (#1352477) - Bump min required libebml version to 1.3.4 From 76af0a58916aaf380d60e525c444c117e482e639 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Wed, 19 Apr 2017 07:28:09 +0200 Subject: [PATCH 49/75] Update to 1.4.7 (#1431305) Use license and make build macros Make -devel require the same arch of main package Sync libebml version requirement between main and -devel --- .gitignore | 1 + libmatroska.spec | 19 +++++++++++++------ sources | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 8a895dc..41f1424 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ libmatroska-1.0.0.tar.bz2 /libmatroska-1.4.2.tar.bz2 /libmatroska-1.4.4.tar.bz2 /libmatroska-1.4.5.tar.bz2 +/libmatroska-1.4.7.tar.bz2 diff --git a/libmatroska.spec b/libmatroska.spec index a169815..08234ff 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,7 +1,7 @@ Summary: Open audio/video container format library Name: libmatroska -Version: 1.4.5 -Release: 2%{?dist} +Version: 1.4.7 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: https://www.matroska.org/ @@ -18,8 +18,8 @@ is usually found as .mkv files (matroska video) and .mka files %package devel Summary: Matroska container format library development files Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: libebml-devel >= 1.3.3 +Requires: %{name}%{_isa} = %{version}-%{release} +Requires: libebml-devel >= 1.3.4 %description devel Matroska is an extensible open standard Audio/Video container. It @@ -37,7 +37,7 @@ will use the Matroska container format. %build %configure --disable-static -make %{?_smp_mflags} +%make_build %install @@ -51,7 +51,8 @@ rm %{buildroot}%{_libdir}/%{name}.la %files -%doc ChangeLog LICENSE.LGPL +%license LICENSE.LGPL +%doc ChangeLog %{_libdir}/%{name}.so.* %files devel @@ -61,6 +62,12 @@ rm %{buildroot}%{_libdir}/%{name}.la %changelog +* Tue Apr 18 2017 Dominik Mierzejewski - 1.4.7-1 +- Update to 1.4.7 (#1431305) +- Use license and make build macros +- Make -devel require the same arch of main package +- Sync libebml version requirement between main and -devel + * Fri Feb 10 2017 Fedora Release Engineering - 1.4.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 1b6329d..ff0bc56 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2e97a58717564896aba8168cdb577067 libmatroska-1.4.5.tar.bz2 +SHA512 (libmatroska-1.4.7.tar.bz2) = 75371a94c68a472fa55e2277b90a2717dd777b506ac89fb115fa83c5093aee6609eb4b01aa65c1d5a9ce9fc597684baff2ffc330a756050b2fb746abffc2417e From 6b55ebfdd3a243b683708d263f2c335b4cc39709 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 19:14:20 +0000 Subject: [PATCH 50/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- libmatroska.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmatroska.spec b/libmatroska.spec index 08234ff..b5670cd 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,7 +1,7 @@ Summary: Open audio/video container format library Name: libmatroska Version: 1.4.7 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: https://www.matroska.org/ @@ -62,6 +62,9 @@ rm %{buildroot}%{_libdir}/%{name}.la %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.4.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Tue Apr 18 2017 Dominik Mierzejewski - 1.4.7-1 - Update to 1.4.7 (#1431305) - Use license and make build macros From e386df5ecd3a16b873f825e163de591fb77fe9e1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 01:49:18 +0000 Subject: [PATCH 51/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- libmatroska.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmatroska.spec b/libmatroska.spec index b5670cd..7beda2f 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,7 +1,7 @@ Summary: Open audio/video container format library Name: libmatroska Version: 1.4.7 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: https://www.matroska.org/ @@ -62,6 +62,9 @@ rm %{buildroot}%{_libdir}/%{name}.la %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 1.4.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1.4.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From c8b293fb959c6a342d32e0ba0f98fceac8f866fb Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sun, 8 Oct 2017 18:43:37 +0200 Subject: [PATCH 52/75] Update to 1.4.8 (#1495383) --- .gitignore | 1 + libmatroska.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 41f1424..4af948f 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ libmatroska-1.0.0.tar.bz2 /libmatroska-1.4.4.tar.bz2 /libmatroska-1.4.5.tar.bz2 /libmatroska-1.4.7.tar.bz2 +/libmatroska-1.4.8.tar.xz diff --git a/libmatroska.spec b/libmatroska.spec index 08234ff..302720d 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,11 +1,11 @@ Summary: Open audio/video container format library Name: libmatroska -Version: 1.4.7 +Version: 1.4.8 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: https://www.matroska.org/ -Source0: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.bz2 +Source0: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz BuildRequires: libebml-devel >= 1.3.4 %description @@ -62,6 +62,9 @@ rm %{buildroot}%{_libdir}/%{name}.la %changelog +* Sat Oct 07 2017 Dominik Mierzejewski - 1.4.8-1 +- Update to 1.4.8 (#1495383) + * Tue Apr 18 2017 Dominik Mierzejewski - 1.4.7-1 - Update to 1.4.7 (#1431305) - Use license and make build macros diff --git a/sources b/sources index ff0bc56..b0e0c6f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libmatroska-1.4.7.tar.bz2) = 75371a94c68a472fa55e2277b90a2717dd777b506ac89fb115fa83c5093aee6609eb4b01aa65c1d5a9ce9fc597684baff2ffc330a756050b2fb746abffc2417e +SHA512 (libmatroska-1.4.8.tar.xz) = af3b8bfae891be77896b6afa2da3325ebba73a957cd43a4e6086b68e1237bb37b2e6d5eb57322c05ede0ad0c03464087b77fbdf06101314f09411648e1073cee From 32a4156078f19935d708d8218de378d0fb5959bf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 22:39:01 +0000 Subject: [PATCH 53/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libmatroska.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmatroska.spec b/libmatroska.spec index 6faa6b9..6780ca7 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,7 +1,7 @@ Summary: Open audio/video container format library Name: libmatroska Version: 1.4.8 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: https://www.matroska.org/ @@ -62,6 +62,9 @@ rm %{buildroot}%{_libdir}/%{name}.la %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.4.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sat Oct 07 2017 Dominik Mierzejewski - 1.4.8-1 - Update to 1.4.8 (#1495383) From 208bc43fbd5824896b9efbd6d702d8015d46e92d Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 10 Jul 2018 16:21:31 +0200 Subject: [PATCH 54/75] add BuildRequires: gcc-c++ Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- libmatroska.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libmatroska.spec b/libmatroska.spec index 6780ca7..bac3605 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -6,6 +6,7 @@ License: LGPLv2+ Group: System Environment/Libraries URL: https://www.matroska.org/ Source0: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz +BuildRequires: gcc-c++ BuildRequires: libebml-devel >= 1.3.4 %description From b23a95c1772392a09096af5f3619930de3fb7111 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 08:24:43 +0000 Subject: [PATCH 55/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libmatroska.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmatroska.spec b/libmatroska.spec index bac3605..3bf2f60 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,7 +1,7 @@ Summary: Open audio/video container format library Name: libmatroska Version: 1.4.8 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: https://www.matroska.org/ @@ -63,6 +63,9 @@ rm %{buildroot}%{_libdir}/%{name}.la %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 1.4.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 1.4.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 1ea5a11197db5f0295b1e289e7e4825e12c47c19 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Tue, 24 Jul 2018 12:13:37 +0200 Subject: [PATCH 56/75] update to 1.4.9 (#1570226) switch build system to cmake, add missing dependencies use ldconfig_scriptlets macro --- .gitignore | 1 + libmatroska.spec | 26 ++++++++++++++++++-------- sources | 2 +- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 4af948f..7c206af 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ libmatroska-1.0.0.tar.bz2 /libmatroska-1.4.5.tar.bz2 /libmatroska-1.4.7.tar.bz2 /libmatroska-1.4.8.tar.xz +/libmatroska-1.4.9.tar.xz diff --git a/libmatroska.spec b/libmatroska.spec index 6faa6b9..6fadc13 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,12 +1,14 @@ Summary: Open audio/video container format library Name: libmatroska -Version: 1.4.8 +Version: 1.4.9 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: https://www.matroska.org/ Source0: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz -BuildRequires: libebml-devel >= 1.3.4 +BuildRequires: cmake +BuildRequires: gcc-c++ +BuildRequires: libebml-devel >= 1.3.6 %description Matroska is an extensible open standard Audio/Video container. It @@ -19,7 +21,9 @@ is usually found as .mkv files (matroska video) and .mka files Summary: Matroska container format library development files Group: Development/Libraries Requires: %{name}%{_isa} = %{version}-%{release} -Requires: libebml-devel >= 1.3.4 +Requires: cmake-filesystem +Requires: libebml-devel >= 1.3.6 +Requires: pkgconfig %description devel Matroska is an extensible open standard Audio/Video container. It @@ -36,18 +40,15 @@ will use the Matroska container format. %build -%configure --disable-static +%cmake %make_build %install %make_install -rm %{buildroot}%{_libdir}/%{name}.la -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files @@ -59,9 +60,18 @@ rm %{buildroot}%{_libdir}/%{name}.la %{_includedir}/matroska/ %{_libdir}/%{name}.so %{_libdir}/pkgconfig/%{name}.pc +%{_libdir}/cmake/matroska/MatroskaConfig.cmake +%{_libdir}/cmake/matroska/MatroskaConfigVersion.cmake +%{_libdir}/cmake/matroska/MatroskaTargets-noconfig.cmake +%{_libdir}/cmake/matroska/MatroskaTargets.cmake %changelog +* Tue Jul 24 2018 Dominik Mierzejewski - 1.4.9-1 +- update to 1.4.9 (#1570226) +- switch build system to cmake, add missing dependencies +- use ldconfig_scriptlets macro + * Sat Oct 07 2017 Dominik Mierzejewski - 1.4.8-1 - Update to 1.4.8 (#1495383) diff --git a/sources b/sources index b0e0c6f..72990fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libmatroska-1.4.8.tar.xz) = af3b8bfae891be77896b6afa2da3325ebba73a957cd43a4e6086b68e1237bb37b2e6d5eb57322c05ede0ad0c03464087b77fbdf06101314f09411648e1073cee +SHA512 (libmatroska-1.4.9.tar.xz) = 281224b66ce7ef39daf0f186cda1144250e190b914e64f4f2524e8bf0170a3d18dbc50f204d4ca8d7eaffe183a61f96c92ba6ec4325bacb068272d62cdbcef33 From bec968dd22820aab23d46dc95da9d1302ab02e0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 23 Jan 2019 09:29:23 +0100 Subject: [PATCH 57/75] Append curdir to CMake invokation. (#1668512) --- libmatroska.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libmatroska.spec b/libmatroska.spec index 7839dce..0101d7d 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,7 +1,7 @@ Summary: Open audio/video container format library Name: libmatroska Version: 1.4.9 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: https://www.matroska.org/ @@ -40,7 +40,7 @@ will use the Matroska container format. %build -%cmake +%cmake . %make_build @@ -67,6 +67,9 @@ will use the Matroska container format. %changelog +* Wed Jan 23 2019 Björn Esser - 1.4.9-2 +- Append curdir to CMake invokation. (#1668512) + * Tue Jul 24 2018 Dominik Mierzejewski - 1.4.9-1 - update to 1.4.9 (#1570226) - switch build system to cmake, add missing dependencies From 780209a6ee8c5f096f69740f6b9b2171b45e2cf0 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:51 +0100 Subject: [PATCH 58/75] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- libmatroska.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/libmatroska.spec b/libmatroska.spec index 0101d7d..44734c1 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -3,7 +3,6 @@ Name: libmatroska Version: 1.4.9 Release: 2%{?dist} License: LGPLv2+ -Group: System Environment/Libraries URL: https://www.matroska.org/ Source0: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz BuildRequires: cmake @@ -19,7 +18,6 @@ is usually found as .mkv files (matroska video) and .mka files %package devel Summary: Matroska container format library development files -Group: Development/Libraries Requires: %{name}%{_isa} = %{version}-%{release} Requires: cmake-filesystem Requires: libebml-devel >= 1.3.6 From 00f662e9a0b3851b2d5864c52e0f10e642d636b6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 07:35:40 +0000 Subject: [PATCH 59/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libmatroska.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmatroska.spec b/libmatroska.spec index 44734c1..de4de0f 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,7 +1,7 @@ Summary: Open audio/video container format library Name: libmatroska Version: 1.4.9 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ URL: https://www.matroska.org/ Source0: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz @@ -65,6 +65,9 @@ will use the Matroska container format. %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 1.4.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Wed Jan 23 2019 Björn Esser - 1.4.9-2 - Append curdir to CMake invokation. (#1668512) From 362b6c68cab927aa1835d00a9b9ee1de28187dc5 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sun, 9 Jun 2019 23:03:42 +0200 Subject: [PATCH 60/75] update to 1.5.0 --- .gitignore | 1 + libmatroska.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 7c206af..30313c9 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ libmatroska-1.0.0.tar.bz2 /libmatroska-1.4.7.tar.bz2 /libmatroska-1.4.8.tar.xz /libmatroska-1.4.9.tar.xz +/libmatroska-1.5.0.tar.xz diff --git a/libmatroska.spec b/libmatroska.spec index 7839dce..4cd6198 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,6 +1,6 @@ Summary: Open audio/video container format library Name: libmatroska -Version: 1.4.9 +Version: 1.5.0 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -8,7 +8,8 @@ URL: https://www.matroska.org/ Source0: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: libebml-devel >= 1.3.6 +BuildRequires: libebml-devel >= 1.3.7 +Requires: libebml%{_isa} >= 1.3.7 %description Matroska is an extensible open standard Audio/Video container. It @@ -22,7 +23,7 @@ Summary: Matroska container format library development files Group: Development/Libraries Requires: %{name}%{_isa} = %{version}-%{release} Requires: cmake-filesystem -Requires: libebml-devel >= 1.3.6 +Requires: libebml-devel >= 1.3.7 Requires: pkgconfig %description devel @@ -54,7 +55,7 @@ will use the Matroska container format. %files %license LICENSE.LGPL %doc ChangeLog -%{_libdir}/%{name}.so.* +%{_libdir}/%{name}.so.6* %files devel %{_includedir}/matroska/ @@ -67,6 +68,9 @@ will use the Matroska container format. %changelog +* Sat Jun 08 2019 Dominik Mierzejewski - 1.5.0-1 +- update to 1.5.0 + * Tue Jul 24 2018 Dominik Mierzejewski - 1.4.9-1 - update to 1.4.9 (#1570226) - switch build system to cmake, add missing dependencies diff --git a/sources b/sources index 72990fa..4a9e637 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libmatroska-1.4.9.tar.xz) = 281224b66ce7ef39daf0f186cda1144250e190b914e64f4f2524e8bf0170a3d18dbc50f204d4ca8d7eaffe183a61f96c92ba6ec4325bacb068272d62cdbcef33 +SHA512 (libmatroska-1.5.0.tar.xz) = eb59b5afd9d510c2d6c7408b0053a261cee6669a9f5bbb1a939d98d96ac6c9b8f340691e95310268f59c954a1d9f72322fd0ec7b442a74c56cd2e2c22eb3a754 From 7aae903941c6e278372565211ca3e79ef4c11875 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sun, 9 Jun 2019 23:04:18 +0200 Subject: [PATCH 61/75] backport fixes for invalid memory access and null pointer dereference --- libmatroska.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libmatroska.spec b/libmatroska.spec index 4cd6198..3567c48 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -6,6 +6,7 @@ License: LGPLv2+ Group: System Environment/Libraries URL: https://www.matroska.org/ Source0: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz +Patch0: %{name}-memory.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: libebml-devel >= 1.3.7 @@ -38,6 +39,7 @@ will use the Matroska container format. %prep %setup -q +%patch0 -p1 -b .m %build @@ -70,6 +72,7 @@ will use the Matroska container format. %changelog * Sat Jun 08 2019 Dominik Mierzejewski - 1.5.0-1 - update to 1.5.0 +- backport fixes for invalid memory access and null pointer dereference * Tue Jul 24 2018 Dominik Mierzejewski - 1.4.9-1 - update to 1.4.9 (#1570226) From 8fe3f6f153f28686b90a3b2c30491919000c2cac Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 10 Jun 2019 01:08:32 +0200 Subject: [PATCH 62/75] support both EL7 and Fedora Use %cmake3 macro and %{_libdir}/cmake as dependency because there's no cmake3-filesystem package in EL7. Also, fix unowned %{_libdir}/cmake/ebml directory. --- libmatroska.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libmatroska.spec b/libmatroska.spec index 3567c48..1dfbac5 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -7,7 +7,7 @@ Group: System Environment/Libraries URL: https://www.matroska.org/ Source0: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz Patch0: %{name}-memory.patch -BuildRequires: cmake +BuildRequires: cmake3 BuildRequires: gcc-c++ BuildRequires: libebml-devel >= 1.3.7 Requires: libebml%{_isa} >= 1.3.7 @@ -23,7 +23,7 @@ is usually found as .mkv files (matroska video) and .mka files Summary: Matroska container format library development files Group: Development/Libraries Requires: %{name}%{_isa} = %{version}-%{release} -Requires: cmake-filesystem +Requires: %{_libdir}/cmake Requires: libebml-devel >= 1.3.7 Requires: pkgconfig @@ -43,7 +43,7 @@ will use the Matroska container format. %build -%cmake +%cmake3 . %make_build @@ -63,6 +63,7 @@ will use the Matroska container format. %{_includedir}/matroska/ %{_libdir}/%{name}.so %{_libdir}/pkgconfig/%{name}.pc +%dir %{_libdir}/cmake/matroska %{_libdir}/cmake/matroska/MatroskaConfig.cmake %{_libdir}/cmake/matroska/MatroskaConfigVersion.cmake %{_libdir}/cmake/matroska/MatroskaTargets-noconfig.cmake @@ -73,6 +74,7 @@ will use the Matroska container format. * Sat Jun 08 2019 Dominik Mierzejewski - 1.5.0-1 - update to 1.5.0 - backport fixes for invalid memory access and null pointer dereference +- fix unowned %{_libdir}/cmake/ebml directory * Tue Jul 24 2018 Dominik Mierzejewski - 1.4.9-1 - update to 1.4.9 (#1570226) From 8dc96a2ad2e4b143d2e08eefa9531ed696fcf20f Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 10 Jun 2019 10:32:59 +0200 Subject: [PATCH 63/75] Add patch missing from 7aae9039 --- libmatroska-memory.patch | 53 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 libmatroska-memory.patch diff --git a/libmatroska-memory.patch b/libmatroska-memory.patch new file mode 100644 index 0000000..e058353 --- /dev/null +++ b/libmatroska-memory.patch @@ -0,0 +1,53 @@ +diff -ruwbBd libmatroska-1.5.0/src/KaxBlock.cpp libmatroska-1.5.1/src/KaxBlock.cpp +--- libmatroska-1.5.0/src/KaxBlock.cpp 2019-03-12 20:54:34.000000000 +0100 ++++ libmatroska-1.5.1/src/KaxBlock.cpp 2019-05-25 12:16:54.000000000 +0200 +@@ -628,11 +628,12 @@ + // put all Frames in the list + if (mLacing != LACING_NONE) { + // read the number of frames in the lace +- uint32 LastBufferSize = GetSize() - BlockHeadSize - 1; // 1 for number of frame ++ const uint32 TotalLacedSize = GetSize() - BlockHeadSize - 1; // 1 for number of frame ++ uint32 LastBufferSize = TotalLacedSize; + uint8 FrameNum = _TempHead[0]; // number of frames in the lace - 1 + // read the list of frame sizes + uint8 Index; +- int32 FrameSize; ++ uint32 FrameSize; + uint32 SizeRead; + uint64 SizeUnknown; + +@@ -646,6 +647,8 @@ + do { + Result += input.read(_TempHead, 1); + FrameSize += uint8(_TempHead[0]); ++ if (FrameSize > TotalLacedSize) ++ throw SafeReadIOCallback::EndOfStreamX(0); + LastBufferSize--; + + FirstFrameLocation++; +@@ -662,6 +665,8 @@ + cursor = _tmpBuf = new binary[FrameNum*4]; /// \warning assume the mean size will be coded in less than 4 bytes + Result += input.read(cursor, FrameNum*4); + FrameSize = ReadCodedSizeValue(cursor, SizeRead, SizeUnknown); ++ if (FrameSize > TotalLacedSize) ++ throw SafeReadIOCallback::EndOfStreamX(0); + SizeList[0] = FrameSize; + cursor += SizeRead; + LastBufferSize -= FrameSize + SizeRead; +@@ -670,6 +675,8 @@ + // get the size of the frame + SizeRead = LastBufferSize; + FrameSize += ReadCodedSizeSignedValue(cursor, SizeRead, SizeUnknown); ++ if (FrameSize > TotalLacedSize) ++ throw SafeReadIOCallback::EndOfStreamX(0); + SizeList[Index] = FrameSize; + cursor += SizeRead; + LastBufferSize -= FrameSize + SizeRead; +@@ -703,7 +710,6 @@ + } catch (SafeReadIOCallback::EndOfStreamX &) { + SetValueIsSet(false); + +- std::memset(EbmlBinary::GetBuffer(), 0, GetSize()); + myBuffers.clear(); + SizeList.clear(); + Timecode = 0; From 7ebd623ff2830eb0cca996a3273056a2077f74ce Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 13:44:51 +0000 Subject: [PATCH 64/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libmatroska.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmatroska.spec b/libmatroska.spec index eda5d8b..02d542e 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,7 +1,7 @@ Summary: Open audio/video container format library Name: libmatroska Version: 1.5.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ URL: https://www.matroska.org/ Source0: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz @@ -69,6 +69,9 @@ will use the Matroska container format. %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 1.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sat Jun 08 2019 Dominik Mierzejewski - 1.5.0-1 - update to 1.5.0 - backport fixes for invalid memory access and null pointer dereference From 6f9c46db7e7a4ccc7c5ece607f1811853cd0fbdd Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Wed, 11 Sep 2019 10:10:47 +0200 Subject: [PATCH 65/75] update to 1.5.2 (#1688000) drop obsolete patch --- .gitignore | 1 + libmatroska-memory.patch | 53 ---------------------------------------- libmatroska.spec | 24 +++++++++--------- sources | 2 +- 4 files changed, 15 insertions(+), 65 deletions(-) delete mode 100644 libmatroska-memory.patch diff --git a/.gitignore b/.gitignore index 30313c9..30ad8e5 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ libmatroska-1.0.0.tar.bz2 /libmatroska-1.4.8.tar.xz /libmatroska-1.4.9.tar.xz /libmatroska-1.5.0.tar.xz +/libmatroska-1.5.2.tar.xz diff --git a/libmatroska-memory.patch b/libmatroska-memory.patch deleted file mode 100644 index e058353..0000000 --- a/libmatroska-memory.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff -ruwbBd libmatroska-1.5.0/src/KaxBlock.cpp libmatroska-1.5.1/src/KaxBlock.cpp ---- libmatroska-1.5.0/src/KaxBlock.cpp 2019-03-12 20:54:34.000000000 +0100 -+++ libmatroska-1.5.1/src/KaxBlock.cpp 2019-05-25 12:16:54.000000000 +0200 -@@ -628,11 +628,12 @@ - // put all Frames in the list - if (mLacing != LACING_NONE) { - // read the number of frames in the lace -- uint32 LastBufferSize = GetSize() - BlockHeadSize - 1; // 1 for number of frame -+ const uint32 TotalLacedSize = GetSize() - BlockHeadSize - 1; // 1 for number of frame -+ uint32 LastBufferSize = TotalLacedSize; - uint8 FrameNum = _TempHead[0]; // number of frames in the lace - 1 - // read the list of frame sizes - uint8 Index; -- int32 FrameSize; -+ uint32 FrameSize; - uint32 SizeRead; - uint64 SizeUnknown; - -@@ -646,6 +647,8 @@ - do { - Result += input.read(_TempHead, 1); - FrameSize += uint8(_TempHead[0]); -+ if (FrameSize > TotalLacedSize) -+ throw SafeReadIOCallback::EndOfStreamX(0); - LastBufferSize--; - - FirstFrameLocation++; -@@ -662,6 +665,8 @@ - cursor = _tmpBuf = new binary[FrameNum*4]; /// \warning assume the mean size will be coded in less than 4 bytes - Result += input.read(cursor, FrameNum*4); - FrameSize = ReadCodedSizeValue(cursor, SizeRead, SizeUnknown); -+ if (FrameSize > TotalLacedSize) -+ throw SafeReadIOCallback::EndOfStreamX(0); - SizeList[0] = FrameSize; - cursor += SizeRead; - LastBufferSize -= FrameSize + SizeRead; -@@ -670,6 +675,8 @@ - // get the size of the frame - SizeRead = LastBufferSize; - FrameSize += ReadCodedSizeSignedValue(cursor, SizeRead, SizeUnknown); -+ if (FrameSize > TotalLacedSize) -+ throw SafeReadIOCallback::EndOfStreamX(0); - SizeList[Index] = FrameSize; - cursor += SizeRead; - LastBufferSize -= FrameSize + SizeRead; -@@ -703,7 +710,6 @@ - } catch (SafeReadIOCallback::EndOfStreamX &) { - SetValueIsSet(false); - -- std::memset(EbmlBinary::GetBuffer(), 0, GetSize()); - myBuffers.clear(); - SizeList.clear(); - Timecode = 0; diff --git a/libmatroska.spec b/libmatroska.spec index 1dfbac5..d94bb3a 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,16 +1,15 @@ Summary: Open audio/video container format library Name: libmatroska -Version: 1.5.0 +Version: 1.5.2 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: https://www.matroska.org/ Source0: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz -Patch0: %{name}-memory.patch BuildRequires: cmake3 BuildRequires: gcc-c++ -BuildRequires: libebml-devel >= 1.3.7 -Requires: libebml%{_isa} >= 1.3.7 +BuildRequires: libebml-devel >= 1.3.8 +Requires: libebml%{_isa} >= 1.3.8 %description Matroska is an extensible open standard Audio/Video container. It @@ -24,7 +23,7 @@ Summary: Matroska container format library development files Group: Development/Libraries Requires: %{name}%{_isa} = %{version}-%{release} Requires: %{_libdir}/cmake -Requires: libebml-devel >= 1.3.7 +Requires: libebml-devel >= 1.3.8 Requires: pkgconfig %description devel @@ -39,7 +38,6 @@ will use the Matroska container format. %prep %setup -q -%patch0 -p1 -b .m %build @@ -63,14 +61,18 @@ will use the Matroska container format. %{_includedir}/matroska/ %{_libdir}/%{name}.so %{_libdir}/pkgconfig/%{name}.pc -%dir %{_libdir}/cmake/matroska -%{_libdir}/cmake/matroska/MatroskaConfig.cmake -%{_libdir}/cmake/matroska/MatroskaConfigVersion.cmake -%{_libdir}/cmake/matroska/MatroskaTargets-noconfig.cmake -%{_libdir}/cmake/matroska/MatroskaTargets.cmake +%dir %{_libdir}/cmake/Matroska +%{_libdir}/cmake/Matroska/MatroskaConfig.cmake +%{_libdir}/cmake/Matroska/MatroskaConfigVersion.cmake +%{_libdir}/cmake/Matroska/MatroskaTargets-noconfig.cmake +%{_libdir}/cmake/Matroska/MatroskaTargets.cmake %changelog +* Tue Sep 10 2019 Dominik Mierzejewski - 1.5.2-1 +- update to 1.5.2 (#1688000) +- drop obsolete patch + * Sat Jun 08 2019 Dominik Mierzejewski - 1.5.0-1 - update to 1.5.0 - backport fixes for invalid memory access and null pointer dereference diff --git a/sources b/sources index 4a9e637..b5f4619 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libmatroska-1.5.0.tar.xz) = eb59b5afd9d510c2d6c7408b0053a261cee6669a9f5bbb1a939d98d96ac6c9b8f340691e95310268f59c954a1d9f72322fd0ec7b442a74c56cd2e2c22eb3a754 +SHA512 (libmatroska-1.5.2.tar.xz) = 122b71b91ae89e2a7cc89db17655a006248d58f18d913b4f9ffc885aef7e39681a3a16eed43cd8ecd949c570a939007797c79829f5ee87d08562aee3f0224ba2 From 787a9999cdf12146764dd5f0c5d8fc779793c1d5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 09:40:25 +0000 Subject: [PATCH 66/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libmatroska.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmatroska.spec b/libmatroska.spec index 160d3fb..dd4b890 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,7 +1,7 @@ Summary: Open audio/video container format library Name: libmatroska Version: 1.5.2 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ URL: https://www.matroska.org/ Source0: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz @@ -67,6 +67,9 @@ will use the Matroska container format. %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 1.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Sep 10 2019 Dominik Mierzejewski - 1.5.2-1 - update to 1.5.2 (#1688000) - drop obsolete patch From c6857635fcaa5fd623e89a172c391a4136a933ea Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Fri, 17 Jul 2020 10:52:07 +0200 Subject: [PATCH 67/75] update to 1.6.0 (#1851594), ABI bump --- .gitignore | 1 + libmatroska.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 30ad8e5..1e160e1 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ libmatroska-1.0.0.tar.bz2 /libmatroska-1.4.9.tar.xz /libmatroska-1.5.0.tar.xz /libmatroska-1.5.2.tar.xz +/libmatroska-1.6.0.tar.xz diff --git a/libmatroska.spec b/libmatroska.spec index 160d3fb..ffae7b5 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,14 +1,14 @@ Summary: Open audio/video container format library Name: libmatroska -Version: 1.5.2 +Version: 1.6.0 Release: 1%{?dist} License: LGPLv2+ URL: https://www.matroska.org/ Source0: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz BuildRequires: cmake3 BuildRequires: gcc-c++ -BuildRequires: libebml-devel >= 1.3.8 -Requires: libebml%{_isa} >= 1.3.8 +BuildRequires: libebml-devel >= 1.4.0 +Requires: libebml%{_isa} >= 1.4.0 %description Matroska is an extensible open standard Audio/Video container. It @@ -21,7 +21,7 @@ is usually found as .mkv files (matroska video) and .mka files Summary: Matroska container format library development files Requires: %{name}%{_isa} = %{version}-%{release} Requires: %{_libdir}/cmake -Requires: libebml-devel >= 1.3.8 +Requires: libebml-devel >= 1.4.0 Requires: pkgconfig %description devel @@ -53,7 +53,7 @@ will use the Matroska container format. %files %license LICENSE.LGPL %doc ChangeLog -%{_libdir}/%{name}.so.6* +%{_libdir}/%{name}.so.7* %files devel %{_includedir}/matroska/ @@ -67,6 +67,9 @@ will use the Matroska container format. %changelog +* Tue Jul 07 2020 Dominik Mierzejewski - 1.6.0-1 +- update to 1.6.0 (#1851594), ABI bump + * Tue Sep 10 2019 Dominik Mierzejewski - 1.5.2-1 - update to 1.5.2 (#1688000) - drop obsolete patch diff --git a/sources b/sources index b5f4619..2fc490e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libmatroska-1.5.2.tar.xz) = 122b71b91ae89e2a7cc89db17655a006248d58f18d913b4f9ffc885aef7e39681a3a16eed43cd8ecd949c570a939007797c79829f5ee87d08562aee3f0224ba2 +SHA512 (libmatroska-1.6.0.tar.xz) = 7908730aeae426e3f7a90c6cc9151686b453e03cc7046b87a655e51c78c6e5fde5c37d7e0db18c2c237ce853dbe428671b983801104a0860ab0ab1919234f30f From 0d7e0381197d97558b6ecf35413a35a12387bc8b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 05:03:41 +0000 Subject: [PATCH 68/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libmatroska.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmatroska.spec b/libmatroska.spec index 5889a9a..ec83d4e 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,7 +1,7 @@ Summary: Open audio/video container format library Name: libmatroska Version: 1.6.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ URL: https://www.matroska.org/ Source0: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz @@ -67,6 +67,9 @@ will use the Matroska container format. %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 1.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 07 2020 Dominik Mierzejewski - 1.6.0-1 - update to 1.6.0 (#1851594), ABI bump From 494e2676a0e165f438e0e7883c092d15351d17c4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 04:01:03 +0000 Subject: [PATCH 69/75] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libmatroska.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libmatroska.spec b/libmatroska.spec index ec83d4e..8f1578e 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,7 +1,7 @@ Summary: Open audio/video container format library Name: libmatroska Version: 1.6.0 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ URL: https://www.matroska.org/ Source0: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz @@ -67,6 +67,10 @@ will use the Matroska container format. %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 1.6.0-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 1.6.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From cd94f2eb89aa57e9b00c2bc2fae497b216d8d7a4 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Fri, 21 Aug 2020 13:34:30 +0200 Subject: [PATCH 70/75] update to 1.6.2 (#1862780) use new cmake macros (#1864019) --- .gitignore | 1 + libmatroska.spec | 14 ++++++++++---- sources | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 1e160e1..38bd096 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ libmatroska-1.0.0.tar.bz2 /libmatroska-1.5.0.tar.xz /libmatroska-1.5.2.tar.xz /libmatroska-1.6.0.tar.xz +/libmatroska-1.6.2.tar.xz diff --git a/libmatroska.spec b/libmatroska.spec index ffae7b5..5b0bc4c 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,6 +1,8 @@ +%undefine __cmake_in_source_build + Summary: Open audio/video container format library Name: libmatroska -Version: 1.6.0 +Version: 1.6.2 Release: 1%{?dist} License: LGPLv2+ URL: https://www.matroska.org/ @@ -39,12 +41,12 @@ will use the Matroska container format. %build -%cmake3 . -%make_build +%cmake3 +%cmake3_build %install -%make_install +%cmake3_install %ldconfig_scriptlets @@ -67,6 +69,10 @@ will use the Matroska container format. %changelog +* Fri Aug 21 2020 Dominik Mierzejewski - 1.6.2-1 +- update to 1.6.2 (#1862780) +- use new cmake macros (#1864019) + * Tue Jul 07 2020 Dominik Mierzejewski - 1.6.0-1 - update to 1.6.0 (#1851594), ABI bump diff --git a/sources b/sources index 2fc490e..12ae0a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libmatroska-1.6.0.tar.xz) = 7908730aeae426e3f7a90c6cc9151686b453e03cc7046b87a655e51c78c6e5fde5c37d7e0db18c2c237ce853dbe428671b983801104a0860ab0ab1919234f30f +SHA512 (libmatroska-1.6.2.tar.xz) = c0b2b475f01e01b064348e96a4cd25f594e93b21ab6f66236d6872d1242b6076d501c155a19dedd642ded8338c0a71be09450fc086e77802099413c8849abab1 From cc99dc235a9124b21a958c54805388c47dab39ce Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 17:28:47 +0000 Subject: [PATCH 71/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libmatroska.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmatroska.spec b/libmatroska.spec index a8446e4..c34dcd7 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -3,7 +3,7 @@ Summary: Open audio/video container format library Name: libmatroska Version: 1.6.2 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ URL: https://www.matroska.org/ Source0: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz @@ -69,6 +69,9 @@ will use the Matroska container format. %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.6.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Aug 21 2020 Dominik Mierzejewski - 1.6.2-1 - update to 1.6.2 (#1862780) - use new cmake macros (#1864019) From d41c368f151b84cb95f4c1c908499d8f4c97f463 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Tue, 18 May 2021 22:35:20 +0200 Subject: [PATCH 72/75] update to 1.6.3 (#1930173) --- .gitignore | 1 + libmatroska.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 38bd096..07661de 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ libmatroska-1.0.0.tar.bz2 /libmatroska-1.5.2.tar.xz /libmatroska-1.6.0.tar.xz /libmatroska-1.6.2.tar.xz +/libmatroska-1.6.3.tar.xz diff --git a/libmatroska.spec b/libmatroska.spec index a8446e4..b2a1884 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -2,7 +2,7 @@ Summary: Open audio/video container format library Name: libmatroska -Version: 1.6.2 +Version: 1.6.3 Release: 1%{?dist} License: LGPLv2+ URL: https://www.matroska.org/ @@ -69,6 +69,9 @@ will use the Matroska container format. %changelog +* Tue May 18 2021 Dominik Mierzejewski - 1.6.3-1 +- update to 1.6.3 (#1930173) + * Fri Aug 21 2020 Dominik Mierzejewski - 1.6.2-1 - update to 1.6.2 (#1862780) - use new cmake macros (#1864019) diff --git a/sources b/sources index 12ae0a2..e20b928 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libmatroska-1.6.2.tar.xz) = c0b2b475f01e01b064348e96a4cd25f594e93b21ab6f66236d6872d1242b6076d501c155a19dedd642ded8338c0a71be09450fc086e77802099413c8849abab1 +SHA512 (libmatroska-1.6.3.tar.xz) = 271557c4f8836411782991c069a16cd49d7f9b6f209d1f96f6694f0e8bdfdcda3bbf76512c328555252a8c3e45c5adfcfab1e738304bb2ea85786a6f45af3f41 From 22b61f915d698a9afeda63225fe946b6213221b0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 11:48:34 +0000 Subject: [PATCH 73/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libmatroska.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmatroska.spec b/libmatroska.spec index b211929..72797f1 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -3,7 +3,7 @@ Summary: Open audio/video container format library Name: libmatroska Version: 1.6.3 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ URL: https://www.matroska.org/ Source0: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz @@ -69,6 +69,9 @@ will use the Matroska container format. %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1.6.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue May 18 2021 Dominik Mierzejewski - 1.6.3-1 - update to 1.6.3 (#1930173) From 9905819015c576c9d500496fdc4f28d600abf8f4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 16:39:51 +0000 Subject: [PATCH 74/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libmatroska.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmatroska.spec b/libmatroska.spec index 72797f1..013c9b3 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -3,7 +3,7 @@ Summary: Open audio/video container format library Name: libmatroska Version: 1.6.3 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ URL: https://www.matroska.org/ Source0: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz @@ -69,6 +69,9 @@ will use the Matroska container format. %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.6.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 1.6.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 97deefd9e397caa2ce12f1eca15ace80757cc492 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 23:10:31 +0300 Subject: [PATCH 75/75] 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 e20b928..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (libmatroska-1.6.3.tar.xz) = 271557c4f8836411782991c069a16cd49d7f9b6f209d1f96f6694f0e8bdfdcda3bbf76512c328555252a8c3e45c5adfcfab1e738304bb2ea85786a6f45af3f41