packages: libmediainfo/libmediainfo.spec, libmediainfo/libmediainfo-tinyxml...

[arekm]

Author: arekm                        Date: Sun Feb 13 10:40:50 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; fix build

---- Files affected:
packages/libmediainfo:
   libmediainfo.spec (1.7 -> 1.8) , libmediainfo-tinyxml.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libmediainfo/libmediainfo.spec
diff -u packages/libmediainfo/libmediainfo.spec:1.7 packages/libmediainfo/libmediainfo.spec:1.8
--- packages/libmediainfo/libmediainfo.spec:1.7	Sat Feb 12 23:42:54 2011
+++ packages/libmediainfo/libmediainfo.spec	Sun Feb 13 11:40:44 2011
@@ -3,12 +3,13 @@
 Summary:	Supplies technical and tag information about a video or audio file
 Name:		libmediainfo
 Version:	0.7.39
-Release:	1
+Release:	2
 License:	GPL
 Group:		Libraries
 URL:		http://mediainfo.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/project/mediainfo/source/libmediainfo/%{version}/%{name}_%{version}.tar.bz2
 # Source0-md5:	111bb16f4515c5e58235272650ab4b35
+Patch0:		%{name}-tinyxml.patch
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	dos2unix
@@ -17,6 +18,7 @@
 BuildRequires:	libtool
 BuildRequires:	libzen-devel >= %{libzen_ver}
 BuildRequires:	pkgconfig
+BuildRequires:	tinyxml-devel
 BuildRequires:	zlib-devel
 Requires:	libzen >= %{libzen_ver}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -65,6 +67,7 @@
 
 %prep
 %setup -q -n MediaInfoLib
+%patch0 -p1
 cp           Release/ReadMe_DLL_Linux.txt ReadMe.txt
 mv           History_DLL.txt History.txt
 dos2unix     *.txt *.html Source/Doc/*.html
@@ -140,6 +143,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2011/02/13 10:40:44  arekm
+- rel 2; fix build
+
 Revision 1.7  2011/02/12 22:42:54  arekm
 - up to 0.7.39
 

================================================================
Index: packages/libmediainfo/libmediainfo-tinyxml.patch
diff -u /dev/null packages/libmediainfo/libmediainfo-tinyxml.patch:1.1
--- /dev/null	Sun Feb 13 11:40:50 2011
+++ packages/libmediainfo/libmediainfo-tinyxml.patch	Sun Feb 13 11:40:44 2011
@@ -0,0 +1,24 @@
+--- MediaInfoLib/Source/MediaInfo/Multiple/File_P2_Clip.cpp~	2011-01-03 19:29:58.000000000 +0100
++++ MediaInfoLib/Source/MediaInfo/Multiple/File_P2_Clip.cpp	2011-02-13 11:13:40.125000209 +0100
+@@ -35,7 +35,8 @@
+ #include "MediaInfo/MediaInfo_Internal.h"
+ #include "ZenLib/Dir.h"
+ #include "ZenLib/FileName.h"
+-#include "ZenLib/TinyXml/tinyxml.h"
++#define TIXML_USE_STL 1
++#include "tinyxml.h"
+ //---------------------------------------------------------------------------
+ 
+ namespace MediaInfoLib
+--- MediaInfoLib/Source/MediaInfo/Multiple/File_Xdcam_Clip.cpp~	2011-01-03 19:29:59.000000000 +0100
++++ MediaInfoLib/Source/MediaInfo/Multiple/File_Xdcam_Clip.cpp	2011-02-13 11:13:59.596902256 +0100
+@@ -36,7 +36,8 @@
+ #include "ZenLib/Dir.h"
+ #include "ZenLib/File.h"
+ #include "ZenLib/FileName.h"
+-#include "ZenLib/TinyXml/tinyxml.h"
++#define TIXML_USE_STL 1
++#include "tinyxml.h"
+ //---------------------------------------------------------------------------
+ 
+ namespace MediaInfoLib
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libmediainfo/libmediainfo.spec?r1=1.7&r2=1.8&f=u