- Fix building with gcc 4.3

epel8
Hans de Goede 17 years ago
parent f51b199f68
commit 69474b1603

@ -0,0 +1,37 @@
diff -up libebml-0.7.7/ebml/EbmlEndian.h~ libebml-0.7.7/ebml/EbmlEndian.h
--- libebml-0.7.7/ebml/EbmlEndian.h~ 2008-01-08 22:53:31.000000000 +0100
+++ libebml-0.7.7/ebml/EbmlEndian.h 2008-01-08 22:53:31.000000000 +0100
@@ -39,6 +39,7 @@
#define LIBEBML_ENDIAN_H
#include <algorithm>
+#include <cstring>
#include "EbmlConfig.h" // contains _ENDIANESS_
diff -up libebml-0.7.7/ebml/EbmlBinary.h~ libebml-0.7.7/ebml/EbmlBinary.h
--- libebml-0.7.7/ebml/EbmlBinary.h~ 2008-01-08 22:50:40.000000000 +0100
+++ libebml-0.7.7/ebml/EbmlBinary.h 2008-01-08 22:50:40.000000000 +0100
@@ -38,6 +38,7 @@
#define LIBEBML_BINARY_H
#include <string>
+#include <cstring>
#include "EbmlTypes.h"
#include "EbmlElement.h"
diff -up libebml-0.7.7/ebml/c/libebml_t.h~ libebml-0.7.7/ebml/c/libebml_t.h
--- libebml-0.7.7/ebml/c/libebml_t.h~ 2008-01-08 22:53:02.000000000 +0100
+++ libebml-0.7.7/ebml/c/libebml_t.h 2008-01-08 22:53:02.000000000 +0100
@@ -123,9 +123,9 @@ typedef enum open_mode {
MODE_SAFE
} open_mode;
-#if !defined(min)
+/* #if !defined(min)
#define min(x,y) ((x)<(y) ? (x) : (y))
-#endif
+#endif */
#ifdef __cplusplus
}

@ -1,11 +1,12 @@
Summary: Extensible Binary Meta Language library
Name: libebml
Version: 0.7.7
Release: 3%{?dist}
Release: 4%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://www.matroska.org/
Source: http://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.bz2
Patch0: libebml-0.7.7-gcc43.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
%description
@ -30,6 +31,7 @@ will use the Extensible Binary Meta Language library.
%prep
%setup -q
%patch0 -p1
%build
@ -68,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Tue Jan 8 2008 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.7-4
- Fix building with gcc 4.3
* Mon Aug 13 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.7-3
- Update License tag for new Licensing Guidelines compliance

Loading…
Cancel
Save