From: | "Tim Harder (radhermit)" <radhermit@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in media-libs/libmediainfo/files: libmediainfo-0.7.53-system-tinyxml.patch |
Date: | Sat, 04 Feb 2012 23:25:45 |
Message-Id: | 20120204232535.E2D7E2004C@flycatcher.gentoo.org |
1 | radhermit 12/02/04 23:25:35 |
2 | |
3 | Added: libmediainfo-0.7.53-system-tinyxml.patch |
4 | Log: |
5 | Version bump. |
6 | |
7 | (Portage version: 2.2.0_alpha84/cvs/Linux x86_64) |
8 | |
9 | Revision Changes Path |
10 | 1.1 media-libs/libmediainfo/files/libmediainfo-0.7.53-system-tinyxml.patch |
11 | |
12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmediainfo/files/libmediainfo-0.7.53-system-tinyxml.patch?rev=1.1&view=markup |
13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmediainfo/files/libmediainfo-0.7.53-system-tinyxml.patch?rev=1.1&content-type=text/plain |
14 | |
15 | Index: libmediainfo-0.7.53-system-tinyxml.patch |
16 | =================================================================== |
17 | --- MediaInfoLib/Project/GNU/Library/configure.ac.orig |
18 | +++ MediaInfoLib/Project/GNU/Library/configure.ac |
19 | @@ -521,16 +521,10 @@ |
20 | dnl libtinyxml |
21 | dnl |
22 | if test "$with_libtinyxml" = "yes"; then |
23 | - if pkg-config --exists tinyxml; then |
24 | - CXXFLAGS="$CXXFLAGS $(pkg-config --cflags tinyxml)" |
25 | - MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $(pkg-config --cflags tinyxml)" |
26 | - MediaInfoLib_LIBS="$MediaInfoLib_LIBS $(pkg-config --libs tinyxml)" |
27 | - MediaInfoLib_Requires="$MediaInfoLib_Requires tinyxml" |
28 | - using_libtinyxml="system" |
29 | - AM_CONDITIONAL(COMPILE_TINYXML, false) |
30 | - else |
31 | - AC_MSG_ERROR([libtinyxml is not found, please install development package of libtinyxml]) |
32 | - fi |
33 | + LIBS="$LIBS -ltinyxml" |
34 | + MediaInfoLib_LIBS="$MediaInfoLib_LIBS -ltinyxml" |
35 | + using_libtinyxml="system" |
36 | + AM_CONDITIONAL(COMPILE_TINYXML, false) |
37 | else |
38 | CXXFLAGS="$CXXFLAGS -I../../../Source/ThirdParty/tinyxml" |
39 | using_libtinyxml="internal" |