[packages/matroska-foundation] - export autogenerated *_Class symbols - package required corec headers - rename mkclean to mkvclean

[qboosh]

commit e2064ac00fa8146cc0b661efb7cc82d7398b1a79
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Jul 30 15:27:49 2015 +0200

    - export autogenerated *_Class symbols
    - package required corec headers
    - rename mkclean to mkvclean (original name potentially too common)

 matroska-foundation-shared.patch | 14 ++++++++++++++
 matroska-foundation.spec         | 18 +++++++++++++++---
 2 files changed, 29 insertions(+), 3 deletions(-)
---
diff --git a/matroska-foundation.spec b/matroska-foundation.spec
index a570986..0bdc65d 100644
--- a/matroska-foundation.spec
+++ b/matroska-foundation.spec
@@ -82,7 +82,7 @@ cd spectool
 %{__mv} matroska_sem.h ../libmatroska2/matroska
 cd ..
 
-%{__make} \
+%{__make} -j1 \
 	V=1 \
 	CC="%{__cc}" \
 	CXX="%{__cxx}" \
@@ -93,7 +93,7 @@ cd ..
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_includedir}}
 
-install release/gcc_linux*/mkclean $RPM_BUILD_ROOT%{_bindir}
+install release/gcc_linux*/mkclean $RPM_BUILD_ROOT%{_bindir}/mkvclean
 install release/gcc_linux*/mkvalidator $RPM_BUILD_ROOT%{_bindir}
 install release/gcc_linux*/mkvtree $RPM_BUILD_ROOT%{_bindir}
 install release/gcc_linux*/libebml2.so $RPM_BUILD_ROOT%{_libdir}
@@ -101,6 +101,17 @@ install release/gcc_linux*/libmatroska2.so $RPM_BUILD_ROOT%{_libdir}
 
 cp -a libebml2/ebml $RPM_BUILD_ROOT%{_includedir}
 cp -a libmatroska2/matroska $RPM_BUILD_ROOT%{_includedir}
+install -d $RPM_BUILD_ROOT%{_includedir}/corec/{array,helpers/charconvert,helpers/date,helpers/file,helpers/parser,multithread,node,str}
+cp -p config.h corec/corec/{corec,err,helper,memalloc,memheap,portab}.h $RPM_BUILD_ROOT%{_includedir}/corec
+cp -p corec/tools/coremake/config_helper.h $RPM_BUILD_ROOT%{_includedir}/corec
+cp -p corec/corec/array/array.h $RPM_BUILD_ROOT%{_includedir}/corec/array
+cp -p corec/corec/helpers/charconvert/charconvert.h $RPM_BUILD_ROOT%{_includedir}/corec/helpers/charconvert
+cp -p corec/corec/helpers/date/date.h $RPM_BUILD_ROOT%{_includedir}/corec/helpers/date
+cp -p corec/corec/helpers/file/{file,streams}.h $RPM_BUILD_ROOT%{_includedir}/corec/helpers/file
+cp -p corec/corec/helpers/parser/{buffer,dataheap,hotkey,nodelookup,parser,strtab,strtypes,urlpart}.h $RPM_BUILD_ROOT%{_includedir}/corec/helpers/parser
+cp -p corec/corec/multithread/multithread.h $RPM_BUILD_ROOT%{_includedir}/corec/multithread
+cp -p corec/corec/node/{node,nodebase,nodetools,nodetree}.h $RPM_BUILD_ROOT%{_includedir}/corec/node
+cp -p corec/corec/str/str.h $RPM_BUILD_ROOT%{_includedir}/corec/str
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -110,7 +121,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/mkclean
+%attr(755,root,root) %{_bindir}/mkvclean
 %attr(755,root,root) %{_bindir}/mkvalidator
 %attr(755,root,root) %{_bindir}/mkvtree
 %attr(755,root,root) %{_libdir}/libebml2.so
@@ -118,5 +129,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
+%{_includedir}/corec
 %{_includedir}/ebml
 %{_includedir}/matroska
diff --git a/matroska-foundation-shared.patch b/matroska-foundation-shared.patch
index 9fe5efc..c43223a 100644
--- a/matroska-foundation-shared.patch
+++ b/matroska-foundation-shared.patch
@@ -219,3 +219,17 @@
    USE matroska2
    SOURCE mkvtree.c
  }
+--- foundation-source-29d8f2b2d0e939adfe6941af5f7f7f02344252fb/corec/corec/node/nodebase.h.orig	2015-03-25 11:01:01.000000000 +0100
++++ foundation-source-29d8f2b2d0e939adfe6941af5f7f7f02344252fb/corec/corec/node/nodebase.h	2015-07-29 21:30:39.189950173 +0200
+@@ -211,9 +211,9 @@
+ } nodemeta;
+ 
+ #ifdef __cplusplus
+-#define META_START(name,id) extern "C" { extern const nodemeta name[]; } const nodemeta name[] = { META_START_CONTINUE(id)
++#define META_START(name,id) extern "C" { extern const nodemeta name[]; } DLLEXPORT const nodemeta name[] = { META_START_CONTINUE(id)
+ #else
+-#define META_START(name,id) const nodemeta name[] = { META_START_CONTINUE(id)
++#define META_START(name,id) DLLEXPORT const nodemeta name[] = { META_START_CONTINUE(id)
+ #endif
+ #define META_START_CONTINUE(id) META_CLASS(CLASS_ID,id) 
+ #define META_CLASS(meta,data) { META_CLASS_##meta,0,(uintptr_t)(data) },
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/matroska-foundation.git/commitdiff/e2064ac00fa8146cc0b661efb7cc82d7398b1a79